This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit 606b8a20ddaa07412f4bd1da9415dea52937c30f Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jun 25 14:41:57 2014 +0200 change directory bower to lib --- pollen-ui-angular/.bowerrc | 2 +- pollen-ui-angular/.gitignore | 2 +- pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 36 +++++++++++----------- .../src/main/webapp/js/controllers/pollCtrl.js | 4 ++- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/pollen-ui-angular/.bowerrc b/pollen-ui-angular/.bowerrc index 20d69e9..52e49a3 100644 --- a/pollen-ui-angular/.bowerrc +++ b/pollen-ui-angular/.bowerrc @@ -1,4 +1,4 @@ { - "directory" : "./src/main/webapp/bower" + "directory" : "./src/main/webapp/lib" } diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 9b808b5..951db95 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,3 +1,3 @@ *.iml -src/main/webapp/bower +src/main/webapp/lib diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 57deb61..8e8c94f 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -17,6 +17,7 @@ "angular-animate": "1.2.16", "bootstrap": "3.1.1", "jquery": "2.1.1", - "jqplot": "*" + "jqplot": "*", + "ckeditor": "4.4.2" } } diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 5b8200e..922dc6d 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -24,28 +24,28 @@ <title>Pollen</title> <meta charset="utf-8" /> - <link rel="stylesheet" type="text/css" href="bower/bootstrap/dist/css/bootstrap.min.css" /> - <link rel="stylesheet" type="text/css" href="bower/jqplot/jquery.jqplot.min.css" /> + <link rel="stylesheet" type="text/css" href="lib/bootstrap/dist/css/bootstrap.min.css" /> + <link rel="stylesheet" type="text/css" href="lib/jqplot/jquery.jqplot.min.css" /> <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="bower/jquery/dist/jquery.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/jquery.jqplot.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.barRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pieRenderer.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.pointLabels.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/jqplot/plugins/jqplot.highlighter.min.js"></script> - - <script language="javascript" type="text/javascript" src="bower/ckeditor/ckeditor.js"></script> - - <script language="javascript" type="text/javascript" src="bower/angular/angular.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-route/angular-route.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-resource/angular-resource.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-translate/angular-translate.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-animate/angular-animate.min.js"></script> - <script language="javascript" type="text/javascript" src="bower/angular-bootstrap/ui-bootstrap-tpls.min.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/jquery.jqplot.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.barRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.pieRenderer.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.categoryAxisRenderer.min.js"> </script> + <script language="javascript" type="text/javascript" src="lib/jqplot/plugins/jqplot.pointLabels.min.js"></script> + <script language="javascript" type="text/javascript" src="lib/jqplot/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="js/app.js"></script> <script language=javascript" type="text/javascript" src="js/directives.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 0cc82d8..6ff94fd 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -235,7 +235,8 @@ angular.module('pollControllers', []) return { name: '', date: $scope.globalVariables.lastDate, - choiceType: $scope.globalVariables.lastType + choiceType: $scope.globalVariables.lastType, + inputType:'checkbox' }; } @@ -673,6 +674,7 @@ angular.module('pollControllers', []) else { choice.voteValue = false; } + choice.inputType = 'checkbox'; }) }) }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.