dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31208
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15886: tracked capture - applied coloring to some of the menus
------------------------------------------------------------
revno: 15886
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Fri 2014-06-27 16:49:34 +0200
message:
tracked capture - applied coloring to some of the menus
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html
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
--
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/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-06-27 14:49:34 +0000
@@ -1,8 +1,8 @@
-<div class="panel panel-default" ng-controller="DataEntryController">
+<div class="panel panel-info" ng-controller="DataEntryController">
<div class="panel-heading">
{{dataentryWidget.title| translate}}
<span class="nav-pills" ng-show="selectedEnrollment && allowEventCreation">
- | <span><a href ng-click="createNewEvent()" title="{{'create_new_event_repeatable'| translate}}">{{'create_new_event'| translate}}</a></span>
+ | <a href ng-click="createNewEvent()" title="{{'create_new_event_repeatable'| translate}}"><span class="bold">{{'create_new_event'| translate}}</span></a>
</span>
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(dataentryWidget)">
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2014-06-27 14:49:34 +0000
@@ -1,4 +1,4 @@
-<div class="panel panel-default" ng-controller="EnrollmentController">
+<div class="panel panel-info" ng-controller="EnrollmentController">
<div class="panel-heading">
{{enrollmentWidget.title| translate}}
<span class="pull-right">
@@ -45,13 +45,13 @@
<div class="vertical-spacing small-horizonal-spacing">
<button type="button"
- class="btn btn-default"
+ class="btn btn-primary"
ng-disabled="showSchedulingDiv"
ng-click="showScheduling()">
{{'reschedule'| translate}}
</button>
<button type="button"
- class="btn btn-default"
+ class="btn btn-primary"
ng-show="showSchedulingDiv"
ng-click="showScheduling()">
{{'save'| translate}}
@@ -127,7 +127,7 @@
<div class="vertical-spacing small-horizonal-spacing">
<button type="button"
- class="btn btn-default"
+ class="btn btn-primary"
ng-click="enroll()">
{{'enroll'| translate}}
</button>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-06-27 11:14:08 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-06-27 14:49:34 +0000
@@ -1,8 +1,8 @@
-<div class="panel panel-default" ng-controller="NotesController">
+<div class="panel panel-info" ng-controller="NotesController">
<div class="panel-heading">
{{notesWidget.title| translate}}
<span class="nav-pills" ng-show="selectedEnrollment">
- | <span><a href ng-click="showAddNote()" title="{{'add_note'| translate}}">{{'add'| translate}}</a></span>
+ | <a href ng-click="showAddNote()" title="{{'add_note'| translate}}"><span class="bold">{{'add'| translate}}</span></a>
</span>
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(notesWidget)">
@@ -17,7 +17,7 @@
<div class="add-note" ng-show="addNoteField">
<textarea class="form-control" rows="3" ng-model="note" placeholder="{{'add_your_note_here'| translate}}"></textarea>
<button type="button"
- class="btn btn-default"
+ class="btn btn-primary"
ng-click="addNote()">
{{'save'| translate}}
</button>
@@ -34,7 +34,7 @@
<tr ng-repeat="note in selectedEnrollment.notes| filter:noteSearchText">
<td class="over-flow-hidden">
<d2-pop-over content="note" template="note.html" details="{{'details'| translate}}">
- <div class="pop-over">{{note.value}}</div>
+ <div>{{note.value}}</div>
</d2-pop-over>
<script type="text/ng-template" id="note.html">
<p>{{content.value}}</p>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-06-27 14:49:34 +0000
@@ -1,8 +1,8 @@
-<div class="panel panel-default" ng-controller="ProfileController">
+<div class="panel panel-info" ng-controller="ProfileController">
<div class="panel-heading">
{{trackedEntity.name|| 'entity' | translate}} {{profileWidget.title| translate}}
<span class="nav-pills" ng-show="selectedTei.attributes.length">
- | <span><a href ng-click="enableEdit()" title="{{'edit_profile'| translate}}">{{'edit'| translate}}</a></span>
+ | <a href ng-click="enableEdit()" title="{{'edit_profile'| translate}}"><span class="bold">{{'edit'| translate}}</span></a>
</span>
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(profileWidget)">
@@ -55,7 +55,7 @@
<div ng-if="editProfile">
<button type="button"
- class="btn btn-default small-horizonal-spacing"
+ class="btn btn-primary small-horizonal-spacing"
ng-click="save()">
{{'save'| translate}}
</button>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2014-06-19 12:56:21 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2014-06-27 14:49:34 +0000
@@ -93,8 +93,8 @@
</div>
<div class="vertical-spacing">
- <button type="button" class="btn btn-default" ng-click="registerEntity(true)">{{'save_and_continue'| translate}}</button>
- <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="registerEntity(false)">{{'save_and_add_new'| translate}}</button>
+ <button type="button" class="btn btn-primary" ng-click="registerEntity(true)">{{'save_and_continue'| translate}}</button>
+ <button type="button" class="btn btn-success small-horizonal-spacing" ng-click="registerEntity(false)">{{'save_and_add_new'| translate}}</button>
<button type="button" class="btn btn-default small-horizonal-spacing" ng-click="showRegistration()">{{'cancel'| translate}}</button>
</div>
</form>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-06-27 14:49:34 +0000
@@ -1,4 +1,4 @@
-<div class="panel panel-default" ng-controller="RelationshipController">
+<div class="panel panel-info" ng-controller="RelationshipController">
<div class="panel-heading">
{{relationshipWidget.title| translate}}
<span class="pull-right">
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html 2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html 2014-06-27 14:49:34 +0000
@@ -1,4 +1,4 @@
-<div class="panel panel-default" ng-controller="SelectedInfoController">
+<div class="panel panel-info" ng-controller="SelectedInfoController">
<div class="panel-heading">
{{selectedWidget.title| translate}}
<span class="pull-right">
=== 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-27 13:33:07 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-27 14:49:34 +0000
@@ -925,4 +925,8 @@
.btn-link {
background-color: transparent;
border: none;
+}
+
+label{
+ font-weight:normal !important
}
\ No newline at end of file
=== 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-26 13:35:30 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-06-27 14:49:34 +0000
@@ -57,7 +57,7 @@
<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>
+ <button class="btn btn-primary 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>
@@ -66,13 +66,13 @@
</div>
<div class="col-md-4 trim">
<button type="button"
- class="btn btn-default"
+ class="btn btn-success"
ng-disabled="showRegistrationDiv"
ng-click="search(searchMode.listAll)">
{{'list_all'| translate}}
</button>
<button type="button"
- class="btn btn-default small-horizonal-spacing"
+ class="btn btn-primary small-horizonal-spacing"
ng-click="showRegistration()">
{{'register'| translate}} {{selectedProgram.trackedEntity.name}}
</button>
=== 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-27 13:33:07 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-27 14:49:34 +0000
@@ -1,112 +1,113 @@
<div class="search-container">
-
- <table data-stop-propagation="true" class="table-borderless table-striped">
- <tr>
- <td>{{'org_unit'| translate}}</td>
- <td>
- <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 ng-if="selectedProgram">
- <td>{{'enrollment_date'| translate}}</td>
- <td>
- <div class="dataelement-filter">
- <div class="filter-operator">
- <select ng-model="enrollment.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
- </select>
- </div>
- <div class="filter-value" ng-show="enrollment.operator === defaultOperators[0]">
- <input type="text" placeholder="{{'exact_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programExactDate"/>
- </div>
- <div class="filter-value" ng-show="enrollment.operator === defaultOperators[1]">
- <div class="container-1-2">
- <input type="text" placeholder="{{'start_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programStartDate"/>
- </div>
- <div class="container-1-2">
- <input type="text" placeholder="{{'end_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programEndDate"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- <tr ng-repeat="attribute in attributes">
- <td>
- {{attribute.name}}
- </td>
- <td>
- <div ng-switch="attribute.valueType">
- <div ng-switch-when="number">
- <div class="dataelement-filter">
- <div class="filter-operator">
- <select ng-model="attribute.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
- </select>
- </div>
- <div class="filter-value" ng-show="attribute.operator === defaultOperators[0]">
- <input type="number" placeholder="{{'exact_value'| translate}}" class="form-control-select2" ng-model="attribute.exactValue"/>
- </div>
- <div class="filter-value" ng-show="attribute.operator === defaultOperators[1]">
- <div class="container-1-2">
- <input type="number" placeholder="{{'from'| translate}}" class="form-control-select2" ng-model="attribute.startValue"/>
- </div>
- <div class="container-1-2">
- <input type="number" placeholder="{{'to'| translate}}" class="form-control-select2" ng-model="attribute.endValue"/>
- </div>
- </div>
- </div>
- </div>
- <div ng-switch-when="date">
- <div class="dataelement-filter">
- <div class="filter-operator">
- <select ng-model="attribute.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
- </select>
- </div>
- <div class="filter-value" ng-show="attribute.operator === defaultOperators[0]">
- <input type="text" placeholder="{{'exact_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.exactValue"/>
- </div>
- <div class="filter-value" ng-show="attribute.operator === defaultOperators[1]">
- <div class="container-1-2">
- <input type="text" placeholder="{{'start_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.startValue"/>
- </div>
- <div class="container-1-2">
- <input type="text" placeholder="{{'end_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.endValue"/>
- </div>
- </div>
- </div>
- </div>
- <div ng-switch-when="string">
- <input type="text" class="form-control-select2" ng-model="attribute.value" />
- </div>
- <div ng-switch-when="optionSet">
- <select multiple ui-select2 ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
- <option ng-repeat="option in attribute.optionSet.options" value="{{option}}">{{option}}</option>
- </select>
- </div>
- <div ng-switch-when="bool">
- <select multiple ui-select2 ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
- <option ng-repeat="option in boolOperators" value="{{option}}">{{option}}</option>
- </select>
- </div>
- </div>
- </td>
- </tr>
- </table>
-
- <button type="button"
- class="btn btn-default"
- ng-click="search(searchMode.attributeBased)">
- {{'search'| translate}}
- </button>
- <button type="button"
- class="btn btn-default small-horizonal-spacing"
- ng-click="search(searchMode.listAll)">
- {{'list_all'| translate}}
- </button>
- <button type="button"
- class="btn btn-default small-horizonal-spacing"
- ng-click="closeSearch()">
- {{'cancel'| translate}}
- </button>
-
+
+
+ <table data-stop-propagation="true" class="table-borderless table-striped">
+ <tr>
+ <td>{{'org_unit'| translate}}</td>
+ <td>
+ <label><input type="radio" ng-model="ouMode.name" name="selected" value="SELECTED">{{'selected'| translate}}</label><br/>
+ <label><input type="radio" ng-model="ouMode.name" name="children" value="CHILDREN"> {{'immediate_children'| translate}}</label><br/>
+ <label><input type="radio" ng-model="ouMode.name" name="descendants" value="DESCENDANTS"> {{'all_children'| translate}}</label>
+ </td>
+ </tr>
+ <tr ng-if="selectedProgram">
+ <td>{{'enrollment_date'| translate}}</td>
+ <td>
+ <div class="dataelement-filter">
+ <div class="filter-operator">
+ <select ng-model="enrollment.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
+ </select>
+ </div>
+ <div class="filter-value" ng-show="enrollment.operator === defaultOperators[0]">
+ <input type="text" placeholder="{{'exact_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programExactDate"/>
+ </div>
+ <div class="filter-value" ng-show="enrollment.operator === defaultOperators[1]">
+ <div class="container-1-2">
+ <input type="text" placeholder="{{'start_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programStartDate"/>
+ </div>
+ <div class="container-1-2">
+ <input type="text" placeholder="{{'end_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programEndDate"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr ng-repeat="attribute in attributes">
+ <td>
+ {{attribute.name}}
+ </td>
+ <td>
+ <div ng-switch="attribute.valueType">
+ <div ng-switch-when="number">
+ <div class="dataelement-filter">
+ <div class="filter-operator">
+ <select ng-model="attribute.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
+ </select>
+ </div>
+ <div class="filter-value" ng-show="attribute.operator === defaultOperators[0]">
+ <input type="number" placeholder="{{'exact_value'| translate}}" class="form-control-select2" ng-model="attribute.exactValue"/>
+ </div>
+ <div class="filter-value" ng-show="attribute.operator === defaultOperators[1]">
+ <div class="container-1-2">
+ <input type="number" placeholder="{{'from'| translate}}" class="form-control-select2" ng-model="attribute.startValue"/>
+ </div>
+ <div class="container-1-2">
+ <input type="number" placeholder="{{'to'| translate}}" class="form-control-select2" ng-model="attribute.endValue"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div ng-switch-when="date">
+ <div class="dataelement-filter">
+ <div class="filter-operator">
+ <select ng-model="attribute.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
+ </select>
+ </div>
+ <div class="filter-value" ng-show="attribute.operator === defaultOperators[0]">
+ <input type="text" placeholder="{{'exact_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.exactValue"/>
+ </div>
+ <div class="filter-value" ng-show="attribute.operator === defaultOperators[1]">
+ <div class="container-1-2">
+ <input type="text" placeholder="{{'start_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.startValue"/>
+ </div>
+ <div class="container-1-2">
+ <input type="text" placeholder="{{'end_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.endValue"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div ng-switch-when="string">
+ <input type="text" class="form-control-select2" ng-model="attribute.value" />
+ </div>
+ <div ng-switch-when="optionSet">
+ <select multiple ui-select2 ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
+ <option ng-repeat="option in attribute.optionSet.options" value="{{option}}">{{option}}</option>
+ </select>
+ </div>
+ <div ng-switch-when="bool">
+ <select multiple ui-select2 ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
+ <option ng-repeat="option in boolOperators" value="{{option}}">{{option}}</option>
+ </select>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ <button type="button"
+ class="btn btn-primary"
+ ng-click="search(searchMode.attributeBased)">
+ {{'search'| translate}}
+ </button>
+ <button type="button"
+ class="btn btn-success small-horizonal-spacing"
+ ng-click="search(searchMode.listAll)">
+ {{'list_all'| translate}}
+ </button>
+ <button type="button"
+ class="btn btn-default small-horizonal-spacing"
+ ng-click="closeSearch()">
+ {{'cancel'| translate}}
+ </button>
+
</div>
\ No newline at end of file
