Merge pull request #2019 from akvo/#2018-js-load-error

[Fixes #2013 #2018] Change Piwik URL, and remove ReactBootstrap partly
akvo · Feb 24, 2016 · 3e03220 · 3e03220
2 parents ab24027 + b3f10ce
commit 3e03220
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/akvo/rsr/static/scripts-src/my-change-password.js b/akvo/rsr/static/scripts-src/my-change-password.js
@@ -15,7 +15,7 @@ $(function() {
 
     $.ajax({
       type:"POST",
-      url: JSON.parse(document.getElementById("akvo-rsr-ajax-url").innerHTML).ajaxUrl,
+      url: JSON.parse(document.getElementById("akvo-rsr-password-url").innerHTML).ajaxUrl,
       data : JSON.stringify(serializedData),
       contentType : 'application/json; charset=UTF-8',
       success: function(response) {

diff --git a/akvo/rsr/static/scripts-src/my-details-employments.js b/akvo/rsr/static/scripts-src/my-details-employments.js
@@ -7,10 +7,7 @@
 
 
 /* Global variables */
-var Button = ReactBootstrap.Button,
-    Modal = ReactBootstrap.Modal,
-    ModalTrigger = ReactBootstrap.ModalTrigger,
-    Typeahead = ReactTypeahead.Typeahead;
+var Typeahead = ReactTypeahead.Typeahead;
 
 var countries,
     i18n,

diff --git a/akvo/rsr/static/scripts-src/my-details-employments.jsx b/akvo/rsr/static/scripts-src/my-details-employments.jsx
@@ -7,10 +7,7 @@
 
 
 /* Global variables */
-var Button = ReactBootstrap.Button,
-    Modal = ReactBootstrap.Modal,
-    ModalTrigger = ReactBootstrap.ModalTrigger,
-    Typeahead = ReactTypeahead.Typeahead;
+var Typeahead = ReactTypeahead.Typeahead;
 
 var countries,
     i18n,

diff --git a/akvo/settings/20-default.conf b/akvo/settings/20-default.conf
@@ -63,7 +63,7 @@ USE_L10N = True
 OLD_PROJECT_MAX_ID = 478
 
 # Piwik settings
-PIWIK_URL       = 'http://analytics.akvo.org/'
+PIWIK_URL       = '//analytics.akvo.org/'
 PIWIK_SITE_ID   = 1
 
 #Social media settings

diff --git a/akvo/templates/base.html b/akvo/templates/base.html
@@ -83,7 +83,8 @@
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
 
     {% block react_js %}
-    <script src="//fb.me/react-0.10.0.js"></script>
+        {# React v0.10.0 #}
+        <script src="//dragon.ak.fbcdn.net/hphotos-ak-prn1/t39.3284-6/851567_673854412678843_1478589082_n.js"></script>
     {% endblock react_js %}
 
     {% compressed_js 'rsr' %}

diff --git a/akvo/templates/myrsr/my_details.html b/akvo/templates/myrsr/my_details.html
@@ -60,9 +60,9 @@ <h4>{% trans 'Change your password' %}</h4>
 {% block js %}
   {{ block.super }}
 
-    {# React #}
-    <script src="https://fb.me/react-0.14.5.js"></script>
-    <script src="https://fb.me/react-dom-0.14.5.js"></script>
+    {# React 0.14.5 #}
+    <script src="//fbcdn-dragon-a.akamaihd.net/hphotos-ak-xpf1/t39.3284-6/12466399_996488240432099_737718532_n.js"></script>
+    <script src="//fbcdn-dragon-a.akamaihd.net/hphotos-ak-xpa1/t39.3284-6/12466398_928862397148834_43538167_n.js"></script>
 
   {# App data #}
   <script type="application/json" id="akvo-rsr-typeahead-thumbs">
@@ -110,7 +110,7 @@ <h4>{% trans 'Change your password' %}</h4>
         }
     </script>
   {# App data #}
-  <script type="application/json" id="akvo-rsr-ajax-url">
+  <script type="application/json" id="akvo-rsr-password-url">
     {"ajaxUrl": "{% url 'user_change_password' user.id %}?format=json"}
   </script>
 
@@ -122,7 +122,7 @@ <h4>{% trans 'Change your password' %}</h4>
     }
   </script>
 
-  {% compressed_js 'my_change_password' %}
+    {% compressed_js 'my_change_password' %}
     {% compressed_js 'react_typeahead_1_1_5' %}
     {% compressed_js 'my_details' %}
 {% endblock js %}