dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15761
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-06-19 12:31:04 +0200
message:
  replaced search button with icon+group-button
removed:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/search/
modified:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.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

=== removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/search'
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-06-19 09:37:45 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-06-19 10:31:04 +0000
@@ -12,7 +12,7 @@
     "search": "Search",
     "advanced_search": "Advanced search",
     "search_for": "Search for",
-    "your_search_input_here": "Your search here",
+    "your_search_criteria_here": "Your search criteria here",
     "search_input_required": "Please specify a search criteria",
     "registered_entities": "Registered entities",
     "empty_entity_list": "There are no registered entities",

=== 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-19 09:47:23 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-06-19 10:31:04 +0000
@@ -39,16 +39,6 @@
 
     <!--- search and registration menu begins -->
     <div class="row">        
-        <div id="searchDropDownParent" class="input-group col-md-4">
-            <input type="text" placeholder="{{'your_search_input_here'| translate}}" ng-model="searchText" class="form-control expanded" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="hideSearch()" ng-disabled="showRegistrationDiv">
-            <div class="input-group-btn">
-                <button class="btn btn-default trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-disabled="showRegistrationDiv"><i class="fa fa-caret-down"></i></button>
-                <div id="searchDropDown" class="dropdown-menu pull-right">
-                    <form ng-include="'views/search.html'">                       
-                    </form>                    
-                </div>
-            </div>                
-        </div>
         <div id="selectDropDownParent" class="input-group col-md-4">            
             <button type="button" class="select-drop-down-button form-control" >{{selectedProgram ? selectedProgram.name : 'please_select_a_program'| translate}}</button>
             <div class="input-group-btn">
@@ -63,14 +53,19 @@
                 </ul>
             </div>                
         </div>
+        <div id="searchDropDownParent" class="input-group col-md-4">
+            <input type="text" placeholder="{{'your_search_criteria_here'| translate}}" ng-model="searchText" class="form-control expanded" ng-class="{true: 'invalid - input'} [!searchText && emptySearchText]" ng-focus="hideSearch()" ng-disabled="showRegistrationDiv">
+            <div class="input-group-btn">
+                <button class="btn btn-default trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-disabled="showRegistrationDiv"><i class="fa fa-caret-down"></i></button>
+                <button class="btn btn-default trim" type="button" title="{{'search'| translate}}" ng-disabled="showRegistrationDiv" ng-click="search(searchMode.freeText)"><i class="fa fa-search"></i></button>
+                <div id="searchDropDown" class="dropdown-menu pull-right">
+                    <form ng-include="'views/search.html'">                       
+                    </form>                    
+                </div>
+            </div>                
+        </div>        
         <div class="col-md-4 trim">            
             <button type="button" 
-                    class="btn btn-default"
-                    ng-disabled="showRegistrationDiv"
-                    ng-click="search(searchMode.freeText)">
-                {{'search'| translate}}
-            </button>
-            <button type="button" 
                     class="btn btn-default small-horizonal-spacing"
                     ng-disabled="showRegistrationDiv"
                     ng-click="search(searchMode.listAll)">
@@ -87,7 +82,7 @@
 
     <!--- Error display for search begins -->
     <div class="row" ng-if="emptySearchAttribute || !searchText && emptySearchText">
-        <div class="col-md-4">
+        <div class="col-md-8">
             <div class="alert alert-danger">{{'search_input_required'| translate}}</div>         
         </div>
     </div>
@@ -95,7 +90,7 @@
 
     <!--registration form begins -->
     <div class="row" ng-if="showRegistrationDiv">
-        <div class="col-md-6">
+        <div class="col-md-8">
             <div ng-include="'components/registration/registration.html'"></div>             
         </div>
     </div>