dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21402
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-10 12:09:24 +0100
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-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-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2015-12-04 10:22:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js	2015-12-10 11:09:24 +0000
@@ -1094,10 +1094,10 @@
     };    
 })
 
-.factory('OperatorFactory', function(){
+.factory('OperatorFactory', function($translate){
     
-    var defaultOperators = ['IS', 'RANGE' ];
-    var boolOperators = ['yes', 'no'];
+    var defaultOperators = [$translate.instant('IS'), $translate.instant('RANGE') ];
+    var boolOperators = [$translate.instant('yes'), $translate.instant('no')];
     return{
         defaultOperators: defaultOperators,
         boolOperators: boolOperators

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-12-10 10:59:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-12-10 11:09:24 +0000
@@ -1173,7 +1173,6 @@
     line-height:1.0; 
     padding: 20px 6px;
     border-radius: 4px;
-    background-color: red;
 }
 
 .select2-container .select2-choice {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html	2015-10-07 15:13:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html	2015-12-10 11:09:24 +0000
@@ -86,7 +86,7 @@
                         </div>
                         <div ng-switch-when="BOOLEAN">
                             <select ui-select2 multiple ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
-                                <option ng-repeat="option in boolOperators" value="{{option}}">{{option| translate}}</option>
+                                <option ng-repeat="option in boolOperators" value="{{option}}">{{option}}</option>
                             </select>
                         </div> 
                         <div ng-switch-default>