dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6153
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-02 19:05:06 +0100
message:
  Made top menu items a bit more spacious
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-02-20 14:25:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-03-02 18:05:06 +0000
@@ -208,6 +208,16 @@
   border-bottom-right-radius: 3px;
 }
 
+.menuDropDownArea a
+{
+  color: #ffffff;
+}
+
+.menuDropDownArea a:hover
+{
+  text-decoration: none;
+}
+
 .menuDropDownBox
 {
   list-style-type:none;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2012-02-20 14:25:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2012-03-02 18:05:06 +0000
@@ -227,8 +227,16 @@
   opacity: 0.90;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
-  -moz-border-radius-bottomleft: 3px; /* Firefox */
-  -moz-border-radius-bottomright: 3px; /* Firefox */
+}
+
+.menuDropDownArea a
+{
+  color: #ffffff;
+}
+
+.menuDropDownArea a:hover
+{
+  text-decoration: none;
 }
 
 .menuDropDownBox
@@ -246,7 +254,6 @@
   border: 1px solid #518a0f;
   cursor: pointer;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 /*----------------------------------------------------------------------------*/
@@ -268,7 +275,6 @@
   filter: alpha(opacity=90);
   opacity: 0.90;
   border-bottom-right-radius: 5px;
-  -moz-border-radius-bottomright: 5px; /* Firefox */
 }
 
 #leftBarContents
@@ -289,7 +295,6 @@
   border-color: #ffffff;
   font-weight: normal;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 #leftBarContents ul
@@ -450,7 +455,6 @@
   padding-left: 5px;
   padding-right: 5px;
   border-radius: 5px;
-  -moz-border-radius: 5px; /* Firefox */
 }
 	
 .introItem
@@ -459,7 +463,6 @@
   cursor: pointer;
   border: 1px solid #d5efd5;
   border-radius: 3px;
-  -moz-border-radius: 3px; /* Firefox */
 }
 
 .introItemHeader

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-02-20 14:25:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-03-02 18:05:06 +0000
@@ -208,6 +208,16 @@
   border-bottom-right-radius: 3px;
 }
 
+.menuDropDownArea a
+{
+  color: #ffffff;
+}
+
+.menuDropDownArea a:hover
+{
+  text-decoration: none;
+}
+
 .menuDropDownBox
 {
   list-style-type:none;
@@ -216,9 +226,9 @@
 
 .menuDropDownItem
 {
-  padding-top: 6px;
+  padding-top: 8px;
   padding-left: 10px;
-  padding-bottom: 5px;
+  padding-bottom: 7px;
   padding-right: 10px;
   cursor: pointer;
   border-radius: 3px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2012-02-20 14:49:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2012-03-02 18:05:06 +0000
@@ -208,6 +208,16 @@
   border-bottom-right-radius: 3px;
 }
 
+.menuDropDownArea a
+{
+  color: #ffffff;
+}
+
+.menuDropDownArea a:hover
+{
+  text-decoration: none;
+}
+
 .menuDropDownBox
 {
   list-style-type:none;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-02-20 14:25:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-03-02 18:05:06 +0000
@@ -119,10 +119,10 @@
       <div id="menuDropDown1" class="menuDropDownArea" >
         <ul class="menuDropDownBox">
         #foreach( $module in $maintenanceModules )
-          #set( $i18nName = false )
-          #set( $i18nName = $i18n.getString( $module.name ) )
           #if( $auth.hasAccess( $module.name, "index" ) )
-            <li class="menuDropDownItem" onclick="window.location.href='$module.defaultAction'">#if( $i18nName )$i18nName #else$module.name #end&nbsp;</li>
+            <li class="menuDropDownItem" onclick="window.location.href='${module.defaultAction}'">
+            	<a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a>
+            </li>
           #end
         #end
         </ul>      
@@ -131,10 +131,10 @@
       <div id="menuDropDown2" class="menuDropDownArea">
         <ul class="menuDropDownBox">
         #foreach( $module in $serviceModules )
-          #set( $i18nName = false )
-          #set( $i18nName = $i18n.getString( $module.name ) )
           #if( $auth.hasAccess( $module.name, "index" ) )
-            <li class="menuDropDownItem" onclick="window.location.href='$module.defaultAction'">#if( $i18nName )$i18nName #else$module.name #end&nbsp;</li>
+            <li class="menuDropDownItem" onclick="window.location.href='${module.defaultAction}'">
+            	<a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a>
+            </li>
           #end
         #end
         </ul>      

=== 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	2012-02-10 17:39:17 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-03-02 18:05:06 +0000
@@ -93,18 +93,18 @@
   padding-bottom:15px;
 }
 
-a
+.page a
 {
   text-decoration:none;
   color:#3567cd;
 }
 
-a:hover
+.page a:hover
 {
   text-decoration:underline;
 }
 
-a:visited
+.page a:visited
 {
   color:#3567cd;
 }