dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11321
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-07-03 14:43:28 +0200
message:
  Dashboard, added search button to put more emphasis on the search feature
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-07-02 16:45:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-07-03 12:43:28 +0000
@@ -678,7 +678,7 @@
   margin-right: 4px;
   font-family: LiberationSansBold, arial;
   font-size: 13px;
-  background-color: #427DB8;
+  background-color: #3685D5;
   color: #fff !important;
   text-decoration: none !important;
 }
@@ -686,7 +686,7 @@
 .blueButtonLink:hover
 {
   text-decoration: none;
-  background-color: #3674B3;
+  background-color: #2C7CCE;
 }
 
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2013-03-13 10:08:45 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2013-07-03 12:43:28 +0000
@@ -102,4 +102,5 @@
 add_user_group=Add user group
 no_of_Users=Number of users
 user_group=User Group
-groups=Groups
\ No newline at end of file
+groups=Groups
+search=Search
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es.properties	2013-07-02 15:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es.properties	2013-07-03 12:43:28 +0000
@@ -95,4 +95,4 @@
 to_org_unit=A unidad organizativa
 to_user=A usuario
 update_profile=!Actualice su perfil!
-or=o
+or=o
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr.properties	2013-07-02 15:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr.properties	2013-07-03 12:43:28 +0000
@@ -109,3 +109,4 @@
 works_as=Travaille en tant que
 data_set_report=Rapport bas\u00E9 sur le formulaire
 meta_data=M\u00E9tadonn\u00E9es
+search=Chercher
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2013-04-17 12:40:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2013-07-03 12:43:28 +0000
@@ -121,7 +121,7 @@
 	} );
 }
 
-function search( e )
+function search()
 {
 	var query = $.trim( $( "#searchField" ).val() );
 	

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-06-06 09:55:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-07-03 12:43:28 +0000
@@ -25,6 +25,8 @@
 <div id="searchDiv"><input type="text" id="searchField" autocomplete="off" placeholder="$i18n.getString( 'search_for_users_charts_maps_reports' )"></div>
 <div id="hitDiv"></div>
 
+<div id="searchButton"><a class="blueButtonLink" href="javascript:search()">$i18n.getString( "search" )</a></div>
+
 <div id="contentDiv"></div>
 
 <div id="chartView">

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-07-03 12:12:51 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-07-03 12:43:28 +0000
@@ -93,11 +93,18 @@
   position: absolute;
   left: 411px;
   height: 22px;
-  width: 552px;
+  width: 486px;
   border: 1px solid #aaa;
   padding: 5px 6px 0 6px;
 }
 
+#searchButton
+{
+  position: absolute;
+  margin-top: 6px;
+  left: 915px;
+}
+
 #searchField
 {
   padding: 0;
@@ -114,7 +121,7 @@
   position: absolute;
   margin-top: 29px;
   left: 411px;
-  width: 564px;
+  width: 498px;
   border-right: 1px solid #bbb;
   border-bottom: 1px solid #bbb;
   border-left: 1px solid #bbb;