dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15755
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-06-19 11:14:09 +0200
message:
  replaced column show/hide button with gear icon
modified:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-06-17 07:48:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-06-19 09:14:09 +0000
@@ -31,6 +31,11 @@
     height: 75%;
 }
 
+.top-bar {
+    font-size: 16pt;
+    font-weight: normal;
+    color: #585D61;
+}
 
 /*----------------------------------------------------------------------------*/
 /* Form

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-06-17 07:48:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-06-19 09:14:09 +0000
@@ -9,23 +9,39 @@
     <img id="ouwt_loader" src="../images/ajax-loader-bar.gif"/>
 </div>
 <div class="page" id="mainPage" ng-show="selectedOrgUnit">
-    
-    <!-- Search heading begins -->
-    <h1>
-        <span ng-if='showSearchDiv || !showRegistrationDiv'>
-            {{'search'| translate}} {{selectedProgram.trackedEntity.name}}
-        </span>
-        <span ng-if='showRegistrationDiv'>
-            {{'register'| translate}} {{selectedProgram.trackedEntity.name}}
-        </span>          
-        <a href ng-click="getHelpContent()" title="{{'help'| translate}}"><i class="fa fa-question-circle"></i></a>
-    </h1>
-    <!-- Search heading ends -->
-    
+
+    <!-- top bar begins -->
+    <div class="row top-bar">
+        
+        <div class="col-md-12">
+            
+            <span ng-if='showSearchDiv || !showRegistrationDiv'>
+                {{'search'| translate}} {{selectedProgram.trackedEntity.name}}
+            </span>
+            <span ng-if='showRegistrationDiv'>
+                {{'register'| translate}} {{selectedProgram.trackedEntity.name}}
+            </span>        
+
+            <div class="pull-right">
+                <div class="btn-group" dropdown is-open="status.isopen">
+                    <button type="button" class="btn btn-default dropdown-toggle" ng-disabled="trackedEntityList.rows.length <=0 ">
+                        <i class="fa fa-cog"></i>
+                    </button>
+                    <ul class="dropdown-menu pull-right" role="menu">
+                        <li ng-show="trackedEntityList.rows.length > 0"><a href ng-click="showHideColumns()">{{'show_hide_columns'| translate}}</a></li>
+                    </ul>
+                </div>
+            </div>
+            
+        </div>
+        
+    </div>
+    <!-- top bar ends -->
+
     <!--- Simple search field begins -->
     <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
     <!--- Simple search input field beings -->
-    
+
     <!--- Advanced search input field begins -->
     <div class="row">        
         <div id="searchDropDownParent" class="input-group col-md-6">
@@ -54,7 +70,7 @@
         </div>        
     </div>
     <!--- Advanced search input field begins -->
-    
+
     <!--- Error display for search begins -->
     <div class="row" ng-if="emptySearchAttribute">
         <div class="col-md-6">
@@ -72,7 +88,7 @@
                     <li>
                         <a href ng-click="getProgramAttributes(null, true)">{{'please_select_a_program'| translate}}</a>
                     </li>
-                    <li ng-repeat="program in programs | orderBy: 'name'">
+                    <li ng-repeat="program in programs| orderBy: 'name'">
                         <a href ng-click="getProgramAttributes(program, true)">{{program.name}}</a>
                     </li>
                 </ul>
@@ -103,8 +119,8 @@
     <!-- registration ends -->
 
     <!-- entity grid begins -->
-    <div ng-if="showTrackedEntityDiv">
-        <div ng-include="'views/tei.html'"></div>  
+    <div class="row" ng-if="showTrackedEntityDiv">
+        <div class="col-md-12" ng-include="'views/tei.html'"></div>  
     </div>
     <!-- entity grid ends -->
 </div>           

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2014-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2014-06-19 09:14:09 +0000
@@ -1,4 +1,4 @@
-<div id="listDiv" ng-switch="trackedEntityList">                    
+<div ng-switch="trackedEntityList">                    
     <div ng-switch-when=""></div>
     <div ng-switch-default>        
         <div ng-switch="trackedEntityList.rows.length">
@@ -13,15 +13,6 @@
                 </p>
             </div>
             <div ng-switch-default>
-
-                <!-- show/hide grid colum begins-->
-                <div class="row" style="margin-right: 0;">
-                    <button class="btn btn-default pull-right" ng-click="showHideColumns()">
-                        {{'show_hide_columns'| translate}}
-                    </button>
-                </div>
-                <!-- show/hide grid colum ends-->
-
                 <!-- entity begins -->
                 <div class="vertical-spacing">
                     <table class="table table-striped dhis2-table-hover">