This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit f36b6f724313b0cd404245e12e0606a9c40dc0cb Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 14 16:24:09 2014 +0200 check if conf.restURL is set else print the error --- pollen-ui-angular/src/main/webapp/index.html | 75 +++++++++++----------- pollen-ui-angular/src/main/webapp/js/app.js | 12 ++++ .../webapp/js/{conf.js.exemple => conf.js.example} | 2 +- 3 files changed, 51 insertions(+), 38 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index ecf2891..a78a415 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -37,43 +37,6 @@ <!--<script language="javascript" type="text/javascript" src="lib/less/dist/less-1.7.3.min.js"></script>--> <link rel="stylesheet" type="text/css" href="css/style.css"/> - <script language="javascript" type="text/javascript" src="js/conf.js"></script> - - <script language="javascript" type="text/javascript" src="lib/jquery/dist/jquery.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//jquery.jqplot.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.barRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pieRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.categoryAxisRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pointLabels.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.highlighter.min.js"></script> - - <script language="javascript" type="text/javascript" src="lib/ckeditor/ckeditor.js"></script> - - <script language="javascript" type="text/javascript" src="lib/angular/angular.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/angular-route/angular-route.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/angular-resource/angular-resource.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/angular-translate/angular-translate.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/angular-animate/angular-animate.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - - <script language="javascript" type="text/javascript" src="lib/moment/min/moment.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/moment/min/locales.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/bootstrap/dist/js/bootstrap.min.js"></script> - <script language="javascript" type="text/javascript" src="lib/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script> - - <script language="javascript" type="text/javascript" src="js/app.js"></script> - <script language="javascript" type="text/javascript" src="js/directives.js"></script> - <script language="javascript" type="text/javascript" src="js/services.js"></script> - <script language="javascript" type="text/javascript" src="js/controllers/mainCtrl.js"></script> - <script language="javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> - <script language="javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> - <script language="javascript" type="text/javascript" src="js/controllers/favoriteListCtrl.js"></script> - <script language="javascript" type="text/javascript" src="js/controllers/localeCtrl.js"></script> - <script language="javascript" type="text/javascript" src="js/controllers/alertCtrl.js"></script> - - <script language="javascript" type="text/javascript" src="i18n/fr.js"></script> - <script language="javascript" type="text/javascript" src="i18n/en.js"></script> - </head> <body> @@ -186,6 +149,44 @@ <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">Support utilisateur</a> </footer> + + + <script language="javascript" type="text/javascript" src="js/conf.js"></script> + + <script language="javascript" type="text/javascript" src="lib/jquery/dist/jquery.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//jquery.jqplot.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.barRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pieRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.categoryAxisRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.pointLabels.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot-bower/dist//plugins/jqplot.highlighter.min.js"></script> + + <script language="javascript" type="text/javascript" src="lib/ckeditor/ckeditor.js"></script> + + <script language="javascript" type="text/javascript" src="lib/angular/angular.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-route/angular-route.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-resource/angular-resource.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-translate/angular-translate.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-animate/angular-animate.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> + + <script language="javascript" type="text/javascript" src="lib/moment/min/moment.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/moment/min/locales.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/bootstrap/dist/js/bootstrap.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script> + + <script language="javascript" type="text/javascript" src="js/app.js"></script> + <script language="javascript" type="text/javascript" src="js/directives.js"></script> + <script language="javascript" type="text/javascript" src="js/services.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/mainCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/pollCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/userCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/favoriteListCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/localeCtrl.js"></script> + <script language="javascript" type="text/javascript" src="js/controllers/alertCtrl.js"></script> + + <script language="javascript" type="text/javascript" src="i18n/fr.js"></script> + <script language="javascript" type="text/javascript" src="i18n/en.js"></script> </body> </html> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 359faae..253e6dd 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,6 +18,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ + +try { + if (conf.restURL === undefined) { + throw ""; + } +} catch (e) { + var message = "pollen need a global variable who define conf.restURL with the url of the server rest"; + document.getElementsByTagName("body")[0].innerHTML = message; + throw message; + +} + 'use strict'; angular.module('pollen', ['pollenDirective', 'pollenServices', 'ngRoute', 'PollenMainControllers', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.example similarity index 95% rename from pollen-ui-angular/src/main/webapp/js/conf.js.exemple rename to pollen-ui-angular/src/main/webapp/js/conf.js.example index 6d89a32..0f18813 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.example @@ -1,7 +1,7 @@ var conf = { // Rest-API Base Url // This value is Mandatory - restURL : "http://exemple.com/pollen-rest-api/v1", + restURL : "http://example.com/pollen-rest-api/v1", // Poll number per page pollDefaultPageSize : 10, -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.