Generalize root url of webserver

pepit-team · Nov 11, 2013 · 7732d43 · 7732d43
1 parent b5aea2f
commit 7732d43
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 37 deletions.
diff --git a/app/View/Pages/exercises/m/francais/lelales.ctp b/app/View/Pages/exercises/m/francais/lelales.ctp
@@ -13,8 +13,8 @@ echo $this->Html->script('exercises/m/francais/lelales/View');
 
 <script language="javascript">
     $(document).ready(function () {
-        var e = new engine('exercises/m/exercise-m');
-        var module = new m.francais.lelales.Module(e);
+        var e = new engine('exercises/m/exercise-m', '<?php echo $this->webroot; ?>');
+        var module = new m.francais.lelales.Module(e, '<?php echo $this->webroot; ?>');
 
         e.init(module);
     });

diff --git a/app/View/Pages/exercises/m/math/completeradditionner.ctp b/app/View/Pages/exercises/m/math/completeradditionner.ctp
@@ -13,8 +13,8 @@ echo $this->Html->script('exercises/m/math/completeradditionner/View');
 
 <script language="javascript">
     $(document).ready(function () {
-        var e = new engine('exercises/m/exercise-m');
-        var module = new m.math.completeradditionner.Module(e);
+        var e = new engine('exercises/m/exercise-m', '<?php echo $this->webroot; ?>');
+        var module = new m.math.completeradditionner.Module(e, '<?php echo $this->webroot; ?>');
 
         e.init(module);
     });

diff --git a/app/webroot/js/exercises/Engine.js b/app/webroot/js/exercises/Engine.js
@@ -20,7 +20,7 @@
  * @license       http://www.gnu.org/licenses/ GPLv3 License
  */
 
-var engine = function (u) {
+var engine = function (u1, u2) {
 
 // public methods
     this.init = function (m) {
@@ -246,7 +246,7 @@ var engine = function (u) {
         });
         var copyright = $('<img/>', {
             class: 'col-md-2',
-            src: '/app/webroot/img/by-nc-nd.eu.png',
+            src: root + 'img/by-nc-nd.eu.png'
         });
         var title = $('<div/>', {
             style: 'font-size: 40px; text-align: center',
@@ -298,7 +298,8 @@ var engine = function (u) {
     };
 
 // private attributes
-    var url = u;
+    var url = u1;
+    var root = u2;
     var module;
     var view;
 

diff --git a/app/webroot/js/exercises/m/francais/lelales/Module.js b/app/webroot/js/exercises/m/francais/lelales/Module.js
@@ -1,4 +1,4 @@
-m.francais.lelales.Module = function (e) {
+m.francais.lelales.Module = function (e, u) {
 
 // public methods
     this.buildExercisePresentation = function (div) {
@@ -24,35 +24,35 @@ m.francais.lelales.Module = function (e) {
 
         if (currentExercise == 1) {
             if (!view) {
-                view = new m.francais.lelales.View(this, div, 25, 0, 24,
+                view = new m.francais.lelales.View(this, url, div, 25, 0, 24,
                     n * this.getQuestionNumber(currentExercise, n));
             } else {
                 view.restart(div, n * this.getQuestionNumber(currentExercise, currentModule));
             }
         } else if (currentExercise == 2) {
             if (!view) {
-                view = new m.francais.lelales.View(this, div, 25, 25, 49,
+                view = new m.francais.lelales.View(this, url, div, 25, 25, 49,
                     n * this.getQuestionNumber(currentExercise, currentModule));
             } else {
                 view.restart(div, n * this.getQuestionNumber(currentExercise, currentModule));
             }
         } else if (currentExercise == 3) {
             if (!view) {
-                view = new m.francais.lelales.View(this, div, 25, 50, 74,
+                view = new m.francais.lelales.View(this, url, div, 25, 50, 74,
                     n * this.getQuestionNumber(currentExercise, currentModule));
             } else {
                 view.restart(div, n * this.getQuestionNumber(currentExercise, currentModule));
             }
         } else if (currentExercise == 4) {
             if (!view) {
-                view = new m.francais.lelales.View(this, div, 25, 75, 99,
+                view = new m.francais.lelales.View(this, url, div, 25, 75, 99,
                     n * this.getQuestionNumber(currentExercise, currentModule));
             } else {
                 view.restart(div, n * this.getQuestionNumber(currentExercise, currentModule));
             }
         } else if (currentExercise == 5) {
             if (!view) {
-                view = new m.francais.lelales.View(this, div, 25, 100, 124,
+                view = new m.francais.lelales.View(this, url, div, 25, 100, 124,
                     n * this.getQuestionNumber(currentExercise, currentModule));
             } else {
                 view.restart(div, n * this.getQuestionNumber(currentExercise, currentModule));
@@ -151,17 +151,19 @@ m.francais.lelales.Module = function (e) {
     };
 
 // private methods
-    var init = function(e) {
-        engine = e;
+    var init = function(e, u) {
         view = undefined;
+        engine = e;
+        url = u;
     };
 
 // private attributes
     var view;
     var engine;
+    var url;
 
     var questionIndex;
     var currentScore;
 
-    init(e);
+    init(e, u);
 };
diff --git a/app/webroot/js/exercises/m/francais/lelales/View.js b/app/webroot/js/exercises/m/francais/lelales/View.js
@@ -1,16 +1,17 @@
-m.francais.lelales.View = function (mdl, div, number, min, max, sh) {
+m.francais.lelales.View = function (mdl, u, div, number, min, max, sh) {
 
 // public methods
     this.error = function () {
         module.error();
         bootstrap_alert.info('Erreur !', '');
     };
 
-    this.init = function (mdl, view, number, min, max, sh) {
+    this.init = function (mdl, u, view, number, min, max, sh) {
         height = window.innerHeight;
         width = window.innerWidth;
 
         module = mdl;
+        url = u;
         model = new m.francais.lelales.Model(number, min, max, sh);
         init_div(view);
         controller = new m.francais.lelales.Controller(model, this);
@@ -19,7 +20,7 @@ m.francais.lelales.View = function (mdl, div, number, min, max, sh) {
     this.next = function () {
         model.next();
         $('#image').attr('src',
-            '/app/webroot/img/exercises/m/francais/lelales/card_' + model.getImageIndex() + '.png');
+            url + 'img/exercises/m/francais/lelales/card_' + model.getImageIndex() + '.png');
         this.update();
     };
 
@@ -79,7 +80,7 @@ m.francais.lelales.View = function (mdl, div, number, min, max, sh) {
         });
         var img = $('<img/>', {
             style: 'background-color: #FFFFFF; padding: 10px; border-radius: 6px 6px 6px 6px; display: block; margin-left: auto; margin-right: auto; border: 1px solid #000000',
-            src: '/app/webroot/img/exercises/m/francais/lelales/card_' + i + '.png',
+            src: url + 'img/exercises/m/francais/lelales/card_' + i + '.png',
             height: height / 2,
             id: 'image'
         });
@@ -116,10 +117,11 @@ m.francais.lelales.View = function (mdl, div, number, min, max, sh) {
 // private attributes
     var height;
     var width;
+    var url;
 
     var module;
     var model;
     var controller;
 
-    this.init(mdl, div, number, min, max, sh);
+    this.init(mdl, u, div, number, min, max, sh);
 };
diff --git a/app/webroot/js/exercises/m/math/completeradditionner/Module.js b/app/webroot/js/exercises/m/math/completeradditionner/Module.js
@@ -1,4 +1,4 @@
-m.math.completeradditionner.Module = function (e) {
+m.math.completeradditionner.Module = function (e, u) {
 
 // public methods
     this.buildExercisePresentation = function (div) {
@@ -21,15 +21,15 @@ m.math.completeradditionner.Module = function (e) {
 
     this.buildQuestion = function (div, currentExercise, currentModule) {
         if (currentExercise == 1) {
-            view = new m.math.completeradditionner.View(this, div, 5, 5);
+            view = new m.math.completeradditionner.View(this, url, div, 5, 5);
         } else if (currentExercise == 2) {
-            view = new m.math.completeradditionner.View(this, div, 5, 6);
+            view = new m.math.completeradditionner.View(this, url, div, 5, 6);
         } else if (currentExercise == 3) {
-            view = new m.math.completeradditionner.View(this, div, 5, 8);
+            view = new m.math.completeradditionner.View(this, url, div, 5, 8);
         } else if (currentExercise == 4) {
-            view = new m.math.completeradditionner.View(this, div, 5, 10);
+            view = new m.math.completeradditionner.View(this, url, div, 5, 10);
         } else if (currentExercise == 5) {
-            view = new m.math.completeradditionner.View(this, div, 5, 12);
+            view = new m.math.completeradditionner.View(this, url, div, 5, 12);
         }
         questionIndex = 1;
         currentScore = this.getQuestionScore(currentExercise, currentModule);
@@ -119,16 +119,18 @@ m.math.completeradditionner.Module = function (e) {
     };
 
 // private methods
-    var init = function(e) {
+    var init = function(e, u) {
         engine = e;
+        url = u;
     };
 
 // private attributes
     var view;
     var engine;
+    var url;
 
     var questionIndex;
     var currentScore;
 
-    init(e);
+    init(e, u);
 };
diff --git a/app/webroot/js/exercises/m/math/completeradditionner/View.js b/app/webroot/js/exercises/m/math/completeradditionner/View.js
@@ -1,15 +1,16 @@
-m.math.completeradditionner.View = function (mdl, div, number, max) {
+m.math.completeradditionner.View = function (mdl, u, div, number, max) {
 
 // public methods
     this.error = function() {
         module.error();
     };
 
-    this.init = function (mdl, view, number, max) {
+    this.init = function (mdl, u, view, number, max) {
         height = window.innerHeight;
         width = window.innerWidth;
 
         module = mdl;
+        url = u;
         model = new m.math.completeradditionner.Model(number, max);
         init_div(view);
         controller = new m.math.completeradditionner.Controller(model, this);
@@ -18,11 +19,11 @@ m.math.completeradditionner.View = function (mdl, div, number, max) {
     this.next = function() {
         model.next();
         $('#img_operand_1').attr('src',
-            '/app/webroot/img/exercises/m/math/completeradditionner/card_' + model.getFirstOperand() + '.png');
+            url + 'img/exercises/m/math/completeradditionner/card_' + model.getFirstOperand() + '.png');
         $('#img_operand_2').attr('src',
-            '/app/webroot/img/exercises/m/math/completeradditionner/card_' + model.getSecondOperand() + '.png');
+            url + 'img/exercises/m/math/completeradditionner/card_' + model.getSecondOperand() + '.png');
         $('#img_result').attr('src',
-            '/app/webroot/img/exercises/m/math/completeradditionner/card_0.png');
+            url + 'img/exercises/m/math/completeradditionner/card_0.png');
         this.update();
     };
 
@@ -48,7 +49,7 @@ m.math.completeradditionner.View = function (mdl, div, number, max) {
         }
         if (model.isOkResult()) {
             $('#result').html(model.getResult());
-            $('#img_result').attr('src', '/app/webroot/img/exercises/m/math/completeradditionner/card_' +
+            $('#img_result').attr('src', url + 'img/exercises/m/math/completeradditionner/card_' +
                 model.getResult() + '.png');
             module.next();
         } else {
@@ -120,7 +121,7 @@ m.math.completeradditionner.View = function (mdl, div, number, max) {
     var build_image = function (i, name) {
         var img = document.createElement('img');
 
-        img.src = '/app/webroot/img/exercises/m/math/completeradditionner/card_' + i + '.png';
+        img.src = url + 'img/exercises/m/math/completeradditionner/card_' + i + '.png';
         img.height = height - 550 > 200 ? height - 550 : 200;
         img.id = 'img_' + name;
         return img;
@@ -220,9 +221,11 @@ m.math.completeradditionner.View = function (mdl, div, number, max) {
         'six', 'sept', 'huit', 'neuf', 'dix', 'onze', 'douze' ];
     var height;
     var width;
+    var url;
+
     var module;
     var model;
     var controller;
 
-    this.init(mdl, div[0], number, max);
+    this.init(mdl, u, div[0], number, max);
 };