dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30992
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15757: basic menus for search, program selection and registration are now put in one row
------------------------------------------------------------
revno: 15757
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-06-19 11:37:45 +0200
message:
basic menus for search, program selection and registration are now put in one row
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/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/search.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/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-06-17 07:48:20 +0000
+++ 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
@@ -51,10 +51,10 @@
"relationship": "Relationship",
"dataentry": "Data Entry",
"current_selections": "Current selections",
- "org_unit_mode": "Organisation units to search",
- "use_selected": "Use selected",
- "use_immediate_children": "Use immediate children",
- "use_all_children": "Use all children",
+ "org_unit": "Organisation unit",
+ "selected": "Selected",
+ "immediate_children": "Immediate children",
+ "all_children": "All children",
"data_element": "Data element",
"value": "Value",
"provided_elsewhere": "Provided elsewhere",
=== 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-19 09:14:09 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-19 09:37:45 +0000
@@ -565,11 +565,11 @@
}
.small-horizonal-spacing{
- margin-left: 5px;
+ margin-left: 2px;
}
.small-vertical-spacing{
- margin-top: 5px;
+ margin-top: 2px;
}
.search-container{
=== 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:14:09 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-06-19 09:37:45 +0000
@@ -11,17 +11,14 @@
<div class="page" id="mainPage" ng-show="selectedOrgUnit">
<!-- top bar begins -->
- <div class="row top-bar">
-
- <div class="col-md-12">
-
+ <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 ">
@@ -31,20 +28,18 @@
<li ng-show="trackedEntityList.rows.length > 0"><a href ng-click="showHideColumns()">{{'show_hide_columns'| translate}}</a></li>
</ul>
</div>
- </div>
-
- </div>
-
+ </div>
+ </div>
</div>
<!-- top bar ends -->
- <!--- Simple search field begins -->
+ <!--- selected org unit begins -->
<input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
- <!--- Simple search input field beings -->
+ <!--- selected org unit ends -->
- <!--- Advanced search input field begins -->
+ <!--- search and registration menu begins -->
<div class="row">
- <div id="searchDropDownParent" class="input-group col-md-6">
+ <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>
@@ -53,34 +48,8 @@
</form>
</div>
</div>
- </div>
- <div class="col-md-3 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)">
- {{'list_all'| translate}}
- </button>
- </div>
- </div>
- <!--- Advanced search input field begins -->
-
- <!--- Error display for search begins -->
- <div class="row" ng-if="emptySearchAttribute">
- <div class="col-md-6">
- <div class="alert alert-danger">{{'search_input_required'| translate}}</div>
</div>
- </div>
- <!--- Error display for search ends -->
-
- <div class="row vertical-spacing">
- <div id="selectDropDownParent" class="input-group col-md-6">
+ <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">
<button class="btn btn-default trim" type="button" title="{{'list_programs'| translate}}" data-toggle="dropdown"><i class="fa fa-caret-down"></i></button>
@@ -94,29 +63,43 @@
</ul>
</div>
</div>
-
- <div class="col-md-3 trim">
- <button type="button"
- class="btn btn-default"
+ <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)">
+ {{'list_all'| translate}}
+ </button>
+ <button type="button"
+ class="btn btn-default small-horizonal-spacing"
ng-click="showRegistration()">
{{'register'| translate}} {{selectedProgram.trackedEntity.name}}
</button>
- </div>
+ </div>
</div>
+ <!--- search and registration menu ends -->
- <div class="row vertical-spacing" ng-if="!searchText && emptySearchText">
- <div class="col-md-6">
+ <!--- Error display for search begins -->
+ <div class="row" ng-if="emptySearchAttribute || !searchText && emptySearchText">
+ <div class="col-md-4">
<div class="alert alert-danger">{{'search_input_required'| translate}}</div>
</div>
</div>
+ <!--- Error display for search ends -->
- <!--registration begins -->
+ <!--registration form begins -->
<div class="row" ng-if="showRegistrationDiv">
<div class="col-md-6">
<div ng-include="'components/registration/registration.html'"></div>
</div>
</div>
- <!-- registration ends -->
+ <!-- registration form ends -->
<!-- entity grid begins -->
<div class="row" ng-if="showTrackedEntityDiv">
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-17 07:48:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-19 09:37:45 +0000
@@ -1,11 +1,11 @@
<div class="search-container">
<table data-stop-propagation="true" class="table-borderless table-striped">
<tr>
- <td>{{'org_unit_mode'| translate}}</td>
+ <td>{{'org_unit'| translate}}</td>
<td>
- <input type="radio" ng-model="ouMode.name" id="selected" value="SELECTED"><label for="selected" class="radio-label">{{'use_selected'| translate}}</label><br/>
- <input type="radio" ng-model="ouMode.name" id="children" value="CHILDREN"><label for="children" class="radio-label">{{'use_immediate_children'| translate}}</label><br/>
- <input type="radio" ng-model="ouMode.name" id="descendants" value="DESCENDANTS"><label for="descendants" class="radio-label">{{'use_all_children'| translate}}</label>
+ <input type="radio" ng-model="ouMode.name" id="selected" value="SELECTED"> {{'selected'| translate}}<br/>
+ <input type="radio" ng-model="ouMode.name" id="children" value="CHILDREN"> {{'immediate_children'| translate}}<br/>
+ <input type="radio" ng-model="ouMode.name" id="descendants" value="DESCENDANTS"> {{'all_children'| translate}}
</td>
</tr>
<tr>
=== 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-06-19 09:14:09 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2014-06-19 09:37:45 +0000
@@ -34,8 +34,8 @@
</tbody>
</table>
</div>
- <paginator></paginator>
- <!-- entity ends -->
+ <!-- entity ends -->
+ <paginator></paginator>
</div>
</div>
</div>
