# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1489996637 -3600
# Node ID a9c710632863a1c12590979c0c4c2ff97c793a42
# Parent  7c296802980b44a17e764e135f75aed87f94aae0# Parent  1372d9f80c70bb284832510fb40456d1cb067cd2
Merge public heads

diff -r 7c296802980b -r a9c710632863 cubicweb/misc/migration/3.24.0_Any.py
--- a/cubicweb/misc/migration/3.24.0_Any.py	Fri Feb 24 09:18:08 2017 +0100
+++ b/cubicweb/misc/migration/3.24.0_Any.py	Mon Mar 20 08:57:17 2017 +0100
@@ -1,11 +1,6 @@
 from base64 import b64decode
 
 
-# Check the CW versions and add the entity only if needed ?
-add_entity_type('CWSession')
-rql('DELETE CWProperty X WHERE X pkey "system.version.pyramid"',
-    ask_confirm=False)
-
 # before removing extid, ensure it's coherent with cwuri
 for eid, etype, encoded_extid in sql(
         "SELECT eid, type, extid FROM entities, cw_CWSource "
@@ -21,3 +16,8 @@
 # force cw_schema deletion before CWSourceSchemaConfig to avoid nasty bug
 drop_relation_type('cw_schema')
 drop_entity_type('CWSourceSchemaConfig')
+
+# Check the CW versions and add the entity only if needed ?
+add_entity_type('CWSession')
+rql('DELETE CWProperty X WHERE X pkey "system.version.pyramid"',
+    ask_confirm=False)
diff -r 7c296802980b -r a9c710632863 cubicweb/web/data/cubicweb.ajax.js
--- a/cubicweb/web/data/cubicweb.ajax.js	Fri Feb 24 09:18:08 2017 +0100
+++ b/cubicweb/web/data/cubicweb.ajax.js	Mon Mar 20 08:57:17 2017 +0100
@@ -461,7 +461,9 @@
     }
     for (var i = 0; i < fragments.length; i++) {
         var fragment = fragments[i];
-        fragment.innerHTML = '<h3>' + LOADING_MSG + ' ... <img src="data/loading.gif" /></h3>';
+        fragment.innerHTML = (
+            '<h3>' + LOADING_MSG +
+                ' ... <img src="' + BASE_URL + 'data/loading.gif" /></h3>');
         var $fragment = jQuery(fragment);
         // if cubicweb:loadurl is set, just pick the url et send it to loadxhtml
         var url = $fragment.attr('cubicweb:loadurl');