dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15682
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-06-15 11:15:17 +0200
message:
  Tracker capture, made radio button labels clickable in 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/styles/style.css
  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/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-05-28 13:36:26 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-06-15 09:15:17 +0000
@@ -1,21 +1,21 @@
 {
-    "tracked_entity_management": "Tracked Entity Management",
+    "tracked_entity_management": "Tracked entity management",
     "registering_unit": "Registering unit",
     "program": "Program",
-    "please_select": "[Please Select]",
+    "please_select": "[Please select]",
     "please_select_a_program": "[Please select a program]",
-    "not_selected": "Not Selected",
-    "view_all": "[View All]",
-    "list_all_entities": "List All Entities",
+    "not_selected": "Not selected",
+    "view_all": "[View all]",
+    "list_all_entities": "List all entities",
     "list_all": "List all",
     "list": "List",
     "search": "Search",
     "advanced_search": "Advanced search",
     "search_for": "Search for",
-    "your_search_input_here": "Your search input here",
+    "your_search_input_here": "Your search here",
     "search_input_required": "Please specify a search criteria",
-    "registered_entities": "Registered Entities",
-    "empty_entity_list": "There are no reigstered entities",
+    "registered_entities": "Registered entities",
+    "empty_entity_list": "There are no registered entities",
     "empty": "Empty",
     "total_number_of_pages": "No. of pages",
     "rows_per_page": "No. of rows per page",
@@ -25,12 +25,12 @@
     "previous": "Previous",
     "next": "Next",
     "last": "Last",
-    "dashboard": "Go to Dashboard",
+    "dashboard": "Go to dashboard",
     "edit": "Edit",
     "edit_profile": "Edit profile",
-    "association": "Manage Associations",
-    "change_location": "Manage Location",
-    "details_history": "Details/History",
+    "association": "Manage associations",
+    "change_location": "Manage location",
+    "details_history": "Details/history",
     "remove": "Remove",
     "entity": "Entity",
     "add_new": "Add new",
@@ -51,16 +51,16 @@
     "relationship": "Relationship",
     "dataentry": "Data Entry",
     "current_selections": "Current selections",
-    "org_unit_mode": "Orgunit to search",
+    "org_unit_mode": "Organisation units to search",
     "use_selected": "Use selected",
-    "use_immediate_children": "Use immdiate children",
+    "use_immediate_children": "Use immediate children",
     "use_all_children": "Use all children",
     "data_element": "Data element",
     "value": "Value",
     "provided_elsewhere": "Provided elsewhere",
-    "show_hide_columns": "Show/Hide columns",
+    "show_hide_columns": "Show/hide columns",
     "select_columns_to_show": "Select columns to show",
-    "show_hide_widgets": "Show/Hide widgets",
+    "show_hide_widgets": "Show/hide widgets",
     "select_widgets_to_show": "Select widgets to show",
     "close": "Close",
     "list_programs": "List programs",
@@ -78,7 +78,7 @@
     "found": "Found",
     "move_to_selected": "Move to selected",
     "move_all_to_selected": "Move all to selected",
-    "add_new": "Add New",
+    "add_new": "Add new",
     "register_new": "Register new",
     "registration": "Registration",
     "registration_date": "Registration date",

=== 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-14 16:01:44 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-06-15 09:15:17 +0000
@@ -494,6 +494,10 @@
     background-color: #e5e5e5
 }
 
+.radio-label {
+	margin-left: 5px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Tracked entity
 /*----------------------------------------------------------------------------*/
@@ -708,12 +712,14 @@
 input[type=number] {
     border: 1px solid #aaa;
     padding: 4px 1px;
+    border-radius: 3px;
 }
 
-input[type=text], input[type=password], textarea {
+input[type=text], input[type=password], textarea, select {
     border: 1px solid #aaa;
     padding: 6px 12px;
     font-size: 14px;
+    border-radius: 3px;
 }
 
 /*----------------------------------------------------------------------------*/

=== 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-05-27 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html	2014-06-15 09:15:17 +0000
@@ -3,9 +3,9 @@
         <tr>
             <td>{{'org_unit_mode'| translate}}</td>
             <td>
-                <input type="radio" ng-model="ouMode.name" value="SELECTED">{{'use_selected'| translate}}<br/>
-                <input type="radio" ng-model="ouMode.name" value="CHILDREN">{{'use_immediate_children'| translate}}<br/>
-                <input type="radio" ng-model="ouMode.name" value="DESCENDANTS">{{'use_all_children'| translate}}
+                <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>
             </td>
         </tr>
         <tr>