diff --git a/akvo/rsr/static/scripts-src/my-change-password.js b/akvo/rsr/static/scripts-src/my-change-password.js index 440070717f..2cf26059f2 100644 --- 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 index 65612d961f..aa09751c00 100644 --- 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 index 83f38a7010..e6af445d3b 100644 --- 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 index ca70f82854..edc5d9499e 100644 --- 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 index 3c915288fb..77f4e8101b 100644 --- a/akvo/templates/base.html +++ b/akvo/templates/base.html @@ -83,7 +83,8 @@ {% block react_js %} - + {# React v0.10.0 #} + {% endblock react_js %} {% compressed_js 'rsr' %} diff --git a/akvo/templates/myrsr/my_details.html b/akvo/templates/myrsr/my_details.html index ac11366111..95ee80b62b 100644 --- a/akvo/templates/myrsr/my_details.html +++ b/akvo/templates/myrsr/my_details.html @@ -60,9 +60,9 @@

{% trans 'Change your password' %}

{% block js %} {{ block.super }} - {# React #} - - + {# React 0.14.5 #} + + {# App data #} {# App data #} - @@ -122,7 +122,7 @@

{% trans 'Change your password' %}

} - {% compressed_js 'my_change_password' %} + {% compressed_js 'my_change_password' %} {% compressed_js 'react_typeahead_1_1_5' %} {% compressed_js 'my_details' %} {% endblock js %}