------------------------------------------------------------
revno: 11281
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Fri 2013-06-28 20:14:34 +0200
message:
Improved left side menu, cleaner and more modern look
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/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm
--
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 2013-06-28 16:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-06-28 18:14:34 +0000
@@ -243,59 +243,50 @@
#leftBar
{
- background-color: #4a6f4d;
- height: 535px;
+ height: 580px;
width: 235px;
position: absolute;
- top: 44px;
+ top: 46px;
left: 0px;
padding-top: 6px;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- filter: alpha(opacity=90);
- opacity: 0.90;
- border-bottom-right-radius: 5px;
+ border-right: 1px solid #ececec;
}
#leftBarContents
{
- font-size: 12px;
+ font-size: 9pt;
}
#leftBarContents h2
{
- font-size: 10px;
- text-transform: uppercase;
- background-color: #679a6d;
- margin: 16px 15px 0px 15px;
- padding: 7px 0px 5px 11px;
- color: white;
+ font-size: 9pt;
+ margin: 16px 20px 2px 20px;
+ padding: 7px 0 7px 0;
font-weight: normal;
- border-radius: 3px;
+ font-family: LiberationSansBold, arial;
}
#leftBarContents ul
{
- margin-left: 26px;
list-style-type: none;
- color: white;
-}
-
-#leftBarContents li
-{
- padding-top: 3px;
- padding-bottom: 3px;
-}
-
-#leftBarContents a
-{
- color: white;
+ padding: 0;
+ margin: 0 20px 0 20px;
+}
+
+#leftBarContents ul a
+{
+ display: block;
+ color: #333;
text-decoration: none;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ cursor: pointer;
+ border-bottom: 1px solid #ececec;
}
#leftBarContents a:hover
{
- color: #acc8de;
+ text-decoration: underline;
}
/*----------------------------------------------------------------------------*/
=== 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 2013-06-28 16:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-06-28 18:14:34 +0000
@@ -244,59 +244,50 @@
#leftBar
{
- background-color: #1f5489;
- height: 535px;
+ height: 580px;
width: 235px;
position: absolute;
- top: 44px;
+ top: 46px;
left: 0px;
padding-top: 6px;
- border-right: 1px solid #bbb;
- border-bottom: 1px solid #bbb;
- filter: alpha(opacity=90);
- opacity: 0.90;
- border-bottom-right-radius: 5px;
+ border-right: 1px solid #ececec;
}
#leftBarContents
{
- font-size: 12px;
+ font-size: 9pt;
}
#leftBarContents h2
{
- font-size: 10px;
- text-transform: uppercase;
- background-color: #4a89ba;
- margin: 16px 15px 0px 15px;
- padding: 7px 0px 5px 11px;
- color: white;
+ font-size: 9pt;
+ margin: 16px 20px 2px 20px;
+ padding: 7px 0 7px 0;
font-weight: normal;
- border-radius: 3px;
+ font-family: LiberationSansBold, arial;
}
#leftBarContents ul
{
- margin-left: 26px;
list-style-type: none;
- color: white;
-}
-
-#leftBarContents li
-{
- padding-top: 3px;
- padding-bottom: 3px;
-}
-
-#leftBarContents a
-{
- color: white;
+ padding: 0;
+ margin: 0 20px 0 20px;
+}
+
+#leftBarContents ul a
+{
+ display: block;
+ color: #333;
text-decoration: none;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ cursor: pointer;
+ border-bottom: 1px solid #ececec;
}
#leftBarContents a:hover
{
- color: #acc8de;
+ text-decoration: underline;
}
/*----------------------------------------------------------------------------*/
=== 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-05-03 15:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-06-28 18:14:34 +0000
@@ -141,18 +141,19 @@
div#orgUnitTree
{
- font-size: 9pt; /* Size to change */
+ font-size: 9pt;
padding-top: 4px;
}
#leftBarContents div#orgUnitTree
{
- font-size: 9pt; /* Size to change */
+ font-size: 9pt;
background-color: white;
overflow: auto;
width: 233px;
height: 298px;
- border: 1px inset #FFFFFF;
+ border-top: 1px solid #e3e3e3;
+ border-bottom: 1px solid #e3e3e3;
}
div#orgUnitTree ul
@@ -163,21 +164,15 @@
div#orgUnitTree ul li:last-child
{
- background-position: 0pt -1766px;
+ background-position: 0pt -1766px;
}
div#orgUnitTree li
{
list-style-type: none;
- white-space: nowrap; /* Makes list items never wrap */
- margin-top: 0pt;
- margin-right: 0pt;
- margin-bottom: 0pt;
- margin-left: 0pt;
- padding-top: 1px;
- padding-right: 0pt;
- padding-bottom: 1px;
- padding-left: 14px;
+ white-space: nowrap;
+ margin-top: 0;
+ padding: 1px 0 1px 15px;
background-color: transparent;
background-image: url('../../images/treeview-gray-line.gif');
background-repeat: no-repeat;
@@ -193,6 +188,9 @@
div#orgUnitTree a
{
+ display: inline;
+ border: 0;
+ padding: 0;
color: #5C0000;
text-decoration: none;
cursor: pointer;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2013-04-26 12:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm 2013-06-28 18:14:34 +0000
@@ -5,9 +5,9 @@
<li><a href="dataElementGroup.action">$i18n.getString( "data_element_group" ) </a></li>
<li><a href="dataElementGroupEditor.action">$i18n.getString( "data_element_group_editor" ) </a></li>
<li><a href="dataElementGroupSet.action">$i18n.getString( "data_element_group_set" ) </a></li>
- <li><a href="categoryOption.action">$i18n.getString( "data_element_category_option" ) </a></li>
- <li><a href="category.action">$i18n.getString( "data_element_category" ) </a></li>
- <li><a href="categoryCombo.action">$i18n.getString( "data_element_category_combo" ) </a></li>
+ <li><a href="categoryOption.action">$i18n.getString( "category_option" ) </a></li>
+ <li><a href="category.action">$i18n.getString( "category" ) </a></li>
+ <li><a href="categoryCombo.action">$i18n.getString( "category_combination" ) </a></li>
<li><a href="dataDictionary.action">$i18n.getString( "data_dictionary" ) </a></li>
<li><a href="concept.action">$i18n.getString( "concept" ) </a></li>
</ul>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
