Author: echatellier Date: 2014-05-07 17:19:53 +0200 (Wed, 07 May 2014) New Revision: 2969 Url: http://forge.chorem.org/projects/jtimer/repository/revisions/2969 Log: Update libs (bootstrap, angular-ui-bootstrap, momentjs) Modified: branches/ng-jtimer/pom.xml branches/ng-jtimer/src/main/config/wro.xml branches/ng-jtimer/src/main/webapp/index.html branches/ng-jtimer/src/main/webapp/js/controllers.js branches/ng-jtimer/src/main/webapp/partials/tasks.html Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2014-05-07 14:40:24 UTC (rev 2968) +++ branches/ng-jtimer/pom.xml 2014-05-07 15:19:53 UTC (rev 2969) @@ -48,27 +48,32 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angularjs</artifactId> - <version>1.3.0-beta.4-1</version> + <version>1.2.16-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-angular-ui-bootstrap</artifactId> + <version>0.11.0-1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery</artifactId> - <version>2.1.0-1</version> + <version>1.11.1-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-bootstrap</artifactId> - <version>2.3.2-1</version> + <version>3.1.1-1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-moment</artifactId> - <version>2.1.0-1-SNAPSHOT</version> + <version>2.6.0-1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-font-awesome</artifactId> - <version>3.2.1-1-SNAPSHOT</version> + <version>4.0.3-1-SNAPSHOT</version> </dependency> <dependency> <groupId>ro.isdc.wro4j</groupId> Modified: branches/ng-jtimer/src/main/config/wro.xml =================================================================== --- branches/ng-jtimer/src/main/config/wro.xml 2014-05-07 14:40:24 UTC (rev 2968) +++ branches/ng-jtimer/src/main/config/wro.xml 2014-05-07 15:19:53 UTC (rev 2969) @@ -5,6 +5,7 @@ <group-ref>angular-route</group-ref> <group-ref>angular-resource</group-ref> <group-ref>angular-animate</group-ref> + <group-ref>angular-ui-bootstrap</group-ref> <group-ref>bootstrap</group-ref> <group-ref>font-awesome</group-ref> <group-ref>moment</group-ref> Modified: branches/ng-jtimer/src/main/webapp/index.html =================================================================== --- branches/ng-jtimer/src/main/webapp/index.html 2014-05-07 14:40:24 UTC (rev 2968) +++ branches/ng-jtimer/src/main/webapp/index.html 2014-05-07 15:19:53 UTC (rev 2969) @@ -9,8 +9,6 @@ <link rel="stylesheet" href="css/jtimer.css"> <script src="js/jtimer.js"></script> - <script src="http://angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.6.0.js"></script> - <link rel="stylesheet" href="css/app.css"> <script src="js/app.js"></script> <script src="js/controllers.js"></script> Modified: branches/ng-jtimer/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-05-07 14:40:24 UTC (rev 2968) +++ branches/ng-jtimer/src/main/webapp/js/controllers.js 2014-05-07 15:19:53 UTC (rev 2969) @@ -523,11 +523,7 @@ wtWebsocket.send(JSON.stringify({idleStatus:true})); var modalInstance = $modal.open({ templateUrl: 'idleModalTemplate.html', - windowClass: 'idleModal', - controller: IdleModalCtrl, - backdropFade: true, - dialogFade: true, - keyboard: false // for cancel to not work + controller: IdleModalCtrl }); modalInstance.result.then($scope.restartFromIdleness); }; Modified: branches/ng-jtimer/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/src/main/webapp/partials/tasks.html 2014-05-07 14:40:24 UTC (rev 2968) +++ branches/ng-jtimer/src/main/webapp/partials/tasks.html 2014-05-07 15:19:53 UTC (rev 2969) @@ -1,15 +1,15 @@ <div id="header"> <!--Header partie gauche --> - <span class='left'> - <input class='search-query input-small' ng-model="query" placeholder="Search"> + <span class='left form-inline'> + <input class='search-query form-group form-control input-sm' ng-model="query" placeholder="Search"> <form ng-submit="addTask()"> - <input class='search-query input-small' ng-model="name" placeholder="New Task"> + <input class='search-query form-group form-group form-control input-sm' ng-model="name" placeholder="New Task"> </form> </span> <!--Header partie droite --> <span class="right"> - <a class="icon-plus-sign" ng-click="showMenu = !showMenu"> - <b class="caret"></b> + <a class="glyphicon glyphicon-plus-sign" ng-click="showMenu = !showMenu"> + </a> <ul class="dropdown-menu" ng-class="{'menu-show': showMenu}"> <li>Keep Tree opened <input type='checkbox' ng-model="forceExpanded"></li> @@ -18,7 +18,7 @@ <li>Total <input type='checkbox' ng-model='showGlobal'/></li> <li>Tags <input type='checkbox' ng-model='showTags'/></li> </ul> - <i class="icon-cloud" ng-class="{online: online, offline: !online}"></i> + <i class="glyphicon glyphicon-cloud" ng-class="{online: online, offline: !online}"></i> </span> </div> <div id="alerts"> @@ -57,9 +57,9 @@ <span class="spacer level{{$level}}"></span> <!--Task state icon--> - <i class="icon-ban-circle" ng-show="$state=='empty'"></i> - <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> - <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> + <i class="glyphicon glyphicon-ban-circle" ng-show="$state=='empty'"></i> + <i class="glyphicon glyphicon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> + <i class="glyphicon glyphicon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> <!--Project name visible and editable --> <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> @@ -69,12 +69,12 @@ <!-- Action button, add,remove activate task --> <span class="btn-group action"> - <a class="btn btn-mini" href="" ng-click="timeTask($node.task)" ng-show="$level > 1"> - <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> + <a class="btn btn-default btn-xs" href="" ng-click="timeTask($node.task)" ng-show="$level > 1"> + <i class="glyphicon" ng-class="{'glyphicon-play' : ($node.task != currentTask), 'glyphicon-stop' : ($node.task == currentTask)}"></i> </a> - <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> - <a class="btn btn-mini" href="" ng-really-message="La suppression de cette tâche nécessite une confirmation. " ng-really-click="removeTask($node)" ng-show="$node.task != currentTask"> - <i class="icon-minus"></i> + <a class="btn btn-default btn-xs" href="" ng-click="addSubTask($node)"><i class="glyphicon glyphicon-plus"></i></a> + <a class="btn btn-default btn-xs" href="" ng-really-message="La suppression de cette tâche nécessite une confirmation. " ng-really-click="removeTask($node)" ng-show="$node.task != currentTask"> + <i class="glyphicon glyphicon-minus"></i> </a> </span> </div> @@ -92,7 +92,7 @@ <!-- Tag of the task --> <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> - <input ng-model="$node.task.tags" ng-list> + <input class="form-control input-sm" ng-model="$node.task.tags" ng-list> </form> <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> @@ -112,15 +112,15 @@ <!-- Affichage pour l'inactivité --> <script type="text/ng-template" id="idleModalTemplate.html"> <div class="modal-header"> - <h3>Inactivité détectée</h3> + <h3 class="modal-title">Inactivité détectée</h3> </div> <div class="modal-body"> Vous êtes inactif depuis 42 minutes. Choisissez une option pour reprendre ou arrêter la tâche. </div> <div class="modal-footer"> - <button class="btn btn-primary icon-remove-circle" ng-click="close('stop')"> Arrêter</button> - <button class="btn btn-primary icon-arrow-right" ng-click="close('continue')"> Continuer</button> - <button class="btn btn-primary icon-ok-circle" ng-click="close('resume')"> Reprendre</button> + <button class="btn btn-primary glyphicon glyphicon-remove-circle" ng-click="close('stop')"> Arrêter</button> + <button class="btn btn-primary glyphicon glyphicon-arrow-right" ng-click="close('continue')"> Continuer</button> + <button class="btn btn-primary glyphicon glyphicon-ok-circle" ng-click="close('resume')"> Reprendre</button> </div> </script>