dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17713
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7160: Impl option for hiding left side menu. Hiding it in dashboard to make more space for charts/links...
------------------------------------------------------------
revno: 7160
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-06-03 19:20:55 +0200
message:
Impl option for hiding left side menu. Hiding it in dashboard to make more space for charts/links. Moved menu under title.
modified:
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/main.vm
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
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/menu.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/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-03-06 17:26:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-06-03 17:20:55 +0000
@@ -220,7 +220,7 @@
.menuDropDownBox
{
- list-style-type:none;
+ list-style-type: none;
margin-left: 0;
}
=== 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-06-01 19:40:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2012-06-03 17:20:55 +0000
@@ -120,6 +120,11 @@
</span>
</div>
+ #if( $hideMenu && $hideMenu == "true" )
+ <style type="text/css">
+ #mainPage { margin-left: 35px; }
+ </style>
+ #else
<div id="leftBar">
<span id="hideLeftBar">
<a href="index.action" title="$i18n.getString( "show_main_menu" )" id="showMainMenuLink">
@@ -132,6 +137,7 @@
#parse( $menu )
</div>
</div>
+ #end
<div id="headerMessage" class="bold"></div>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2012-06-03 16:26:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2012-06-03 17:20:55 +0000
@@ -45,7 +45,7 @@
<set>
<value>page</value>
<value>menu</value>
- <value>hideMenu</value>
+ <value>hideMenu</value>
<value>offline</value>
</set>
</property>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-06-03 16:26:12 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-06-03 17:20:55 +0000
@@ -13,7 +13,7 @@
<action name="index" class="org.hisp.dhis.dashboard.action.InitAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-dashboard-integration/mainForm.vm</param>
- <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="hideMenu">true</param>
<param name="stylesheets">style/dashboard.css</param>
<param name="javascripts">javascript/dropdown.js</param>
</action>
=== 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 2012-06-03 16:26:12 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-06-03 17:20:55 +0000
@@ -5,6 +5,10 @@
#if( $interpretationCount > 0 )• <a href="interpretation.action">$interpretationCount #if( $interpretationCount > 1 )$i18n.getString( "new_interpretations" )#else$i18n.getString( "new_interpretation" )#end</a> #end
</h3>
+<div id="subMenu">
+ <ul><li><a href="">Dashboard</a></li><li><a href="message.action">Messages</a></li><li><a href="interpretation.action">Interpretations</a></li></ul>
+</div>
+
<div id="contentDiv"></div>
<div id="chartView" style="display:none; padding:0; margin:0;">
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 2012-05-29 12:04:07 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 2012-06-03 17:20:55 +0000
@@ -1,6 +1,6 @@
#if ( $keyFlag )
-<img src="../dhis-web-commons/flags/${keyFlagImage}" style="margin-top: 16px; margin-left: 16px; border: 1px solid #D0D0D0;">
+<img src="../dhis-web-commons/flags/${keyFlagImage}" style="margin-top: 16px; margin-left: 16px; border: 1px solid #D0D0D0; border-radius: 2px;">
#end
<h2>$i18n.getString( "dashboard" ) </h2>
=== 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-06-01 10:21:32 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-06-03 17:20:55 +0000
@@ -15,6 +15,12 @@
border-bottom:1px solid #cad5e5;
}
+#contentDiv
+{
+ position:relative;
+ top: 38px;
+}
+
.linkArea
{
border:1px solid #d0d0d0;
@@ -30,11 +36,6 @@
position:absolute;
}
-.linkArea div
-{
- position:absolute;
-}
-
.chartArea
{
border:1px solid #d0d0d0;
@@ -61,6 +62,41 @@
padding:3px;
}
+#subMenu
+{
+ position:absolute;
+ margin-top: 22px;
+}
+
+#subMenu ul
+{
+ list-style-type:none;
+ margin: 0;
+}
+
+#subMenu li
+{
+ float:left;
+}
+
+#subMenu a
+{
+ padding: 6px 10px;
+ height: 25px;
+ border: 1px solid #aaa;
+ border-radius: 3px;
+ margin-right: 4px;
+ font-family: LiberationSansBold, arial;
+ color: #666;
+ background-color: #f3f3f3;
+}
+
+#subMenu a:hover
+{
+ text-decoration: none;
+ background-color: #f8f8f8;
+}
+
/*----------------------------------------------------------------------------*/
/* Message */
/*----------------------------------------------------------------------------*/
