Author: obruce Date: 2014-04-23 16:43:13 +0200 (Wed, 23 Apr 2014) New Revision: 2959 Url: http://forge.chorem.org/projects/jtimer/repository/revisions/2959 Log: UI supress button not shown when currentTask active Modified: branches/ng-jtimer/src/main/webapp/partials/tasks.html Modified: branches/ng-jtimer/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/src/main/webapp/partials/tasks.html 2014-04-23 14:37:57 UTC (rev 2958) +++ branches/ng-jtimer/src/main/webapp/partials/tasks.html 2014-04-23 14:43:13 UTC (rev 2959) @@ -1,10 +1,12 @@ <div id="header"> + <!--Header partie gauche --> <span class='left'> <input class='search-query input-small' ng-model="query" placeholder="Search"> <form ng-submit="addTask()"> <input class='search-query input-small' 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> @@ -40,6 +42,7 @@ <div class='th tags' ng-show="showTags">Tags</div> </div> + <!-- Div du body wt-tree-repeat Angular js directive in app.js--> <div class="tbody" wt-tree-repeat="tree | filter:query | orderBy:'task.name'" wt-force-open="query || forceExpanded"> @@ -48,33 +51,42 @@ ng-click="setSelectedTask($node.task)" ng-dblclick="timeTask($node.task)" ng-keydown="keyPressed($event)"> + <div class="td" ng-show="showName"> <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> - + + <!--Project name visible and editable --> <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> <input ng-model="$node.task.name"> </form> - <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> - + + <!-- Action button, add,remove activate task --> <span class="btn-group action"> <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-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-click="removeTask($node)"><i class="icon-minus"></i></a> + <a class="btn btn-mini" href="" ng-click="removeTask($node)" ng-show="$node.task != currentTask"> + <i class="icon-minus"></i> + </a> </span> </div> - + + <!-- Today time of the task --> <div class="td today" ng-show="showToday"> {{$node.getTime().today | time}} </div> - + + <!-- Global time of the task --> <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> - + + <!-- 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> @@ -88,9 +100,13 @@ </div> </div> </div> + + </div> </div> + +<!-- Affichage pour l'inactivité --> <script type="text/ng-template" id="idleModalTemplate.html"> <div class="modal-header"> <h3>Inactivité détectée</h3>