← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11283: Top menu. Removed images for menu item separation. Changed from using divs to list and a tags for...

 

------------------------------------------------------------
revno: 11283
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-06-29 15:03:14 +0200
message:
  Top menu. Removed images for menu item separation. Changed from using divs to list and a tags for top menu items. Removed gradient.
removed:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_background.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_separator.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_background.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_separator.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png
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/india/logo_banner.png
  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.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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 18:14:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-06-29 13:03:14 +0000
@@ -39,12 +39,7 @@
 
 a:hover
 {
-  text-decoration:underline;
-}
-
-a:visited
-{
-  color:#3162C5;
+  text-decoration: underline;
 }
 
 input[type=text],input[type=password],textarea
@@ -57,135 +52,103 @@
 /* Header                                                                     */
 /*----------------------------------------------------------------------------*/
 
-div#header
+#header
 {
-  background: #639167; /* Old browsers */
-  background: -moz-linear-gradient(top,  #639167 0%, #405d43 96%, #67946c 98%, #3f5b41 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#639167), color-stop(96%,#405d43), color-stop(98%,#67946c), color-stop(100%,#3f5b41)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top,  #639167 0%,#405d43 96%,#67946c 98%,#3f5b41 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top,  #639167 0%,#405d43 96%,#67946c 98%,#3f5b41 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top,  #639167 0%,#405d43 96%,#67946c 98%,#3f5b41 100%); /* IE10+ */
-  background: linear-gradient(to bottom,  #639167 0%,#405d43 96%,#67946c 98%,#3f5b41 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#639167', endColorstr='#3f5b41',GradientType=0 ); /* IE6-9 */
-
+  background-color: #467e4a;
   height: 44px;
   position: absolute;
   top: 0px;
   left: 0px;
   right: 0px;
+  box-shadow: 0 0 2px #000;
 }
 
-img#headerBanner
+#headerBanner
 {
   position: absolute;
-  top: 12px;
+  top: 13px;
   left: 55px;
 }
 
-img#menuSeparator1
-{
-  position: absolute;
-  top: 0px;
-  left: 580px;
-}
-
-img#menuSeparator2
-{
-  position: absolute;
-  top: 0px;
-  left: 680px;
-}
-
-img#menuSeparator3
-{
-  position: absolute;
-  top: 0px;
-  left: 780px;
-}
-
-img#menuSeparator4
-{
-  position: absolute;
-  top: 0px;
-  left: 880px;
-}
-
-img#menuSeparator5
-{
-  position: absolute;
-  top: 0px;
-  left: 980px;
+#headerText
+{
+  position: absolute;
+  top: 12px;
+  left: 240px;
+  font-family: LiberationSansBold, arial;
+  color: #fff;
+  font-size: 16px;
+}
+
+#menuLinkArea
+{
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
 }
 
 .menuLink
 {
-  height: 47px;
-  width: 98px;
-  font-family: LiberationSansRegular, arial;
-  font-size: 13px;
-  color: #ffffff;
+  height: 44px;
+  width: 100px;
+  font-size: 9pt;
   text-align: center;
   line-height: 44px;
   cursor: pointer;
-}
-
-div#menuLink1
+  color: #fff;
+}
+
+a.menuLink:hover
+{
+  text-decoration: none;
+}
+
+#menuLink1
 {
   position: absolute;
   left: 582px;
 }
 
-div#menuLink2
+#menuLink2
 {
   position: absolute;
   left: 682px;
 }
 
-div#menuLink3
+#menuLink3
 {
   position: absolute;
   left: 782px;
 }
 
-div#menuLink4
+#menuLink4
 {
   position: absolute;
   left: 882px;
 }
 
-span#headerText
-{
-  position: absolute;
-  top: 12px;
-  left: 240px;
-  font-family: LiberationSansBold, arial;
-  font-weight: lighter;
-  color: white;
-  font-size: 16px;
-}
-
-div#menuDropDown1
+#menuDropDown1
 {
   position: absolute;
   top: 44px;
   left: 580px;
 }
 
-div#menuDropDown2
+#menuDropDown2
 {
   position: absolute;
   top: 44px;
   left: 680px;
 }
 
-div#menuDropDown3
+#menuDropDown3
 {
   position: absolute;
   top: 44px;
   left: 780px;
 }
 
-div#menuDropDown4
+#menuDropDown4
 {
   position: absolute;
   top: 44px;
@@ -194,19 +157,19 @@
 
 .menuDropDownArea
 {
-  font-size: 12px;
-  color: #ffffff;
+  font-size: 9pt;
+  color: #fff;
   border-right: 1px solid #3f5841;
   border-bottom: 1px solid #3f5841;
   border-left: 1px solid #3f5841;
   padding-left: 5px;
   padding-right: 5px;
   width: 189px;
-  background-color: #4a6f4d;
+  background-color: #467e4a;
   display: none;
   z-index: 10;
-  filter: alpha(opacity=90);
-  opacity: 0.90;
+  filter: alpha(opacity=94);
+  opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
@@ -226,7 +189,7 @@
   padding-left: 10px;
   padding-bottom: 7px;
   padding-right: 10px;
-  color: #ffffff;
+  color: #fff;
   border-radius: 3px;
   cursor: pointer;
 }

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_background.png	2012-05-02 15:08:10 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_background.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_separator.png	2012-09-21 16:03:27 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_separator.png	1970-01-01 00:00:00 +0000 differ
=== 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	2013-06-28 16:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-06-29 13:03:14 +0000
@@ -39,12 +39,7 @@
 
 a:hover
 {
-  text-decoration:underline;
-}
-
-a:visited
-{
-  color:#3b73b8;
+  text-decoration: underline;
 }
 
 input[type=text],input[type=password],textarea
@@ -57,166 +52,113 @@
 /* Header                                                                     */
 /*----------------------------------------------------------------------------*/
 
-div#header
+#header
 {
-  background: #ff8b4f; /* Old browsers */
-  background: -moz-linear-gradient(top,  #ff8b4f 0%, #fe8b4c 7%, #ff8445 18%, #fe691a 96%, #f96215 98%, #ea5911 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff8b4f), color-stop(7%,#fe8b4c), color-stop(18%,#ff8445), color-stop(96%,#fe691a), color-stop(98%,#f96215), color-stop(100%,#ea5911)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top,  #ff8b4f 0%,#fe8b4c 7%,#ff8445 18%,#fe691a 96%,#f96215 98%,#ea5911 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top,  #ff8b4f 0%,#fe8b4c 7%,#ff8445 18%,#fe691a 96%,#f96215 98%,#ea5911 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top,  #ff8b4f 0%,#fe8b4c 7%,#ff8445 18%,#fe691a 96%,#f96215 98%,#ea5911 100%); /* IE10+ */
-  background: linear-gradient(to bottom,  #ff8b4f 0%,#fe8b4c 7%,#ff8445 18%,#fe691a 96%,#f96215 98%,#ea5911 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff8b4f', endColorstr='#ea5911',GradientType=0 ); /* IE6-9 */
-
-  height: 46px;
+  background-color: #ea5911;
+  height: 44px;
   position: absolute;
   top: 0px;
   left: 0px;
   right: 0px;
-}
-
-img#headerBanner
-{
-  position: absolute;
-  top: 5px;
-  left: 59px;
-}
-
-img#menuSeparator1
-{
-  position: absolute;
-  top: 0px;
-  left: 580px;
-}
-
-img#menuSeparator2
-{
-  position: absolute;
-  top: 0px;
-  left: 680px;
-}
-
-img#menuSeparator3
-{
-  position: absolute;
-  top: 0px;
-  left: 780px;
-}
-
-img#menuSeparator4
-{
-  position: absolute;
-  top: 0px;
-  left: 880px;
-}
-
-img#menuSeparator5
-{
-  position: absolute;
-  top: 0px;
-  left: 980px;
+  box-shadow: 0 0 2px #000;
+}
+
+#headerBanner
+{
+  position: absolute;
+  top: 13px;
+  left: 55px;
+}
+
+#headerText
+{
+  position: absolute;
+  top: 12px;
+  left: 240px;
+  font-family: LiberationSansBold, arial;
+  color: #fff;
+  font-size: 16px;
+}
+
+#menuLinkArea
+{
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
 }
 
 .menuLink
 {
-  height: 47px;
-  width: 98px;
-  font-family: LiberationSansRegular, arial;
-  font-size: 13px;
-  color: #ffffff;
+  height: 44px;
+  width: 100px;
+  font-size: 9pt;
   text-align: center;
-  line-height: 45px;
+  line-height: 44px;
   cursor: pointer;
-}
-
-div#menuLink1
+  color: #fff;
+}
+
+a.menuLink:hover
+{
+  text-decoration: none;
+}
+
+#menuLink1
 {
   position: absolute;
   left: 582px;
 }
 
-div#menuLink2
+#menuLink2
 {
   position: absolute;
   left: 682px;
 }
 
-div#menuLink3
+#menuLink3
 {
   position: absolute;
   left: 782px;
 }
 
-div#menuLink4
+#menuLink4
 {
   position: absolute;
   left: 882px;
 }
 
-span#headerText
-{
-  position: absolute;
-  top: 13px;
-  left: 253px;
-  font-family: LiberationSansBold, arial;
-  font-weight: lighter;
-  color: white;
-  font-size: 16px;
-}
-
-div#popupHeader 
-{
-  background-color: #1d5288;
-  height: 34px;
-  width: 100%;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  border-bottom: 1px solid #202020;
-}
-
-span#popupHeaderText
-{
-  position: absolute;
-  top: 3px;
-  left: 218px;
-  font-size: 14px;
-  color: white;
-  margin: 5px;
-}
-
-div#menuDropDown1
-{
-  position: absolute;
-  top: 46px;
+#menuDropDown1
+{
+  position: absolute;
+  top: 44px;
   left: 580px;
 }
 
-div#menuDropDown2
+#menuDropDown2
 {
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 680px;
 }
 
-div#menuDropDown3
+#menuDropDown3
 {
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 780px;
 }
 
-div#menuDropDown4
+#menuDropDown4
 {
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 780px;
 }
 
 .menuDropDownArea
 {
-  font-size: 12px;
-  color: #ffffff;
+  font-size: 9pt;
+  color: #fff;
   border-right: 1px solid #282c35;
   border-bottom: 1px solid #282c35;
   border-left: 1px solid #282c35;
@@ -226,8 +168,8 @@
   background-color: #518a0f;
   display: none;
   z-index: 10;
-  filter: alpha(opacity=90);
-  opacity: 0.90;
+  filter: alpha(opacity=94);
+  opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
@@ -247,7 +189,7 @@
   padding-left: 10px;
   padding-bottom: 7px;
   padding-right: 10px;
-  color: #ffffff;
+  color: #fff;
   border-radius: 3px;
   cursor: pointer;
 }
@@ -268,7 +210,7 @@
   height: 535px;
   width: 235px;
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 0px;
   padding-top: 6px;
   border-right: 1px solid #343a47;

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_background.png	2012-02-20 14:36:11 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_background.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_banner.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_banner.png	2012-02-13 12:30:11 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_banner.png	2013-06-29 13:03:14 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_separator.png	2012-02-13 12:30:11 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/logo_separator.png	1970-01-01 00:00:00 +0000 differ
=== 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 18:14:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-06-29 13:03:14 +0000
@@ -39,12 +39,7 @@
 
 a:hover
 {
-  text-decoration:underline;
-}
-
-a:visited
-{
-  color: #3162C5;
+  text-decoration: underline;
 }
 
 input[type=text],input[type=password],textarea
@@ -57,17 +52,9 @@
 /* Header                                                                     */
 /*----------------------------------------------------------------------------*/
 
-div#header
+#header
 {
-  background: #4c7eb0; /* Old browsers */
-  background: -moz-linear-gradient(top,  #4c7eb0 0%, #1d5288 96%, #33669b 98%, #074a7d 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4c7eb0), color-stop(96%,#1d5288), color-stop(98%,#33669b), color-stop(100%,#074a7d)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top,  #4c7eb0 0%,#1d5288 96%,#33669b 98%,#074a7d 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top,  #4c7eb0 0%,#1d5288 96%,#33669b 98%,#074a7d 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top,  #4c7eb0 0%,#1d5288 96%,#33669b 98%,#074a7d 100%); /* IE10+ */
-  background: linear-gradient(to bottom,  #4c7eb0 0%,#1d5288 96%,#33669b 98%,#074a7d 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4c7eb0', endColorstr='#074a7d',GradientType=0 ); /* IE6-9 */
-
+  background-color: #276696;
   height: 44px;
   position: absolute;
   top: 0px;
@@ -76,117 +63,92 @@
   box-shadow: 0 0 2px #000;
 }
 
-img#headerBanner
+#headerBanner
 {
   position: absolute;
   top: 13px;
   left: 55px;
 }
 
-img#menuSeparator1
-{
-  position: absolute;
-  top: 0px;
-  left: 580px;
-}
-
-img#menuSeparator2
-{
-  position: absolute;
-  top: 0px;
-  left: 680px;
-}
-
-img#menuSeparator3
-{
-  position: absolute;
-  top: 0px;
-  left: 780px;
-}
-
-img#menuSeparator4
-{
-  position: absolute;
-  top: 0px;
-  left: 880px;
-}
-
-img#menuSeparator5
-{
-  position: absolute;
-  top: 0px;
-  left: 980px;
+#headerText
+{
+  position: absolute;
+  top: 12px;
+  left: 240px;
+  font-family: LiberationSansBold, arial;
+  color: #fff;
+  font-size: 16px;
+}
+
+#menuLinkArea
+{
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
 }
 
 .menuLink
 {
-  height: 47px;
-  width: 98px;
-  font-family: LiberationSansRegular, arial;
-  font-size: 13px;
-  color: #ffffff;
+  height: 44px;
+  width: 100px;
+  font-size: 9pt;
   text-align: center;
   line-height: 44px;
   cursor: pointer;
-}
-
-div#menuLink1
+  color: #fff;
+}
+
+a.menuLink:hover
+{
+  text-decoration: none;
+}
+
+#menuLink1
 {
   position: absolute;
   left: 582px;
 }
 
-div#menuLink2
+#menuLink2
 {
   position: absolute;
   left: 682px;
 }
 
-div#menuLink3
+#menuLink3
 {
   position: absolute;
   left: 782px;
 }
 
-div#menuLink4
+#menuLink4
 {
   position: absolute;
   left: 882px;
 }
 
-span#headerText
-{
-  position: absolute;
-  top: 12px;
-  left: 240px;
-  font-family: LiberationSansBold, arial;
-  font-weight: lighter;
-  color: white;
-  font-size: 16px;
-}
-
-div#menuDropDown1
+#menuDropDown1
 {
   position: absolute;
   top: 44px;
   left: 580px;
 }
 
-div#menuDropDown2
+#menuDropDown2
 {
   position: absolute;
   top: 44px;
   left: 680px;
 }
 
-div#menuDropDown3
+#menuDropDown3
 {
   position: absolute;
   top: 44px;
   left: 780px;
 }
 
-div#menuDropDown4
+#menuDropDown4
 {
   position: absolute;
   top: 44px;
@@ -195,19 +157,19 @@
 
 .menuDropDownArea
 {
-  font-size: 12px;
-  color: #ffffff;
-  border-right: 1px solid #282c35;
-  border-bottom: 1px solid #282c35;
-  border-left: 1px solid #282c35;
+  font-size: 9pt;
+  color: #fff;
+  border-right: 1px solid #888;
+  border-bottom: 1px solid #888;
+  border-left: 1px solid #888; 
   padding-left: 5px;
   padding-right: 5px;
   width: 189px;
-  background-color: #2a5a8a;
+  background-color: #276696;
   display: none;
   z-index: 10;
-  filter: alpha(opacity=90);
-  opacity: 0.90;
+  filter: alpha(opacity=94);
+  opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
@@ -227,7 +189,7 @@
   padding-left: 10px;
   padding-bottom: 7px;
   padding-right: 10px;
-  color: #ffffff;
+  color: #fff;
   border-radius: 3px;
   cursor: pointer;
 }

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png	2012-02-20 14:25:48 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png	2012-09-21 13:50:34 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png	2012-02-20 14:49:55 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_background.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png	2012-02-20 14:49:55 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/logo_separator.png	1970-01-01 00:00:00 +0000 differ
=== 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	2013-06-28 16:06:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-06-29 13:03:14 +0000
@@ -39,12 +39,7 @@
 
 a:hover
 {
-  text-decoration:underline;
-}
-
-a:visited
-{
-  color:#3b73b8;
+  text-decoration: underline;
 }
 
 input[type=text],input[type=password],textarea
@@ -57,135 +52,103 @@
 /* Header                                                                     */
 /*----------------------------------------------------------------------------*/
 
-div#header
+#header
 {
-  background: #c63635; /* Old browsers */
-  background: -moz-linear-gradient(top,  #c63635 0%, #b40303 96%, #c83b3b 98%, #b30100 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#c63635), color-stop(96%,#b40303), color-stop(98%,#c83b3b), color-stop(100%,#b30100)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top,  #c63635 0%,#b40303 96%,#c83b3b 98%,#b30100 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top,  #c63635 0%,#b40303 96%,#c83b3b 98%,#b30100 100%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top,  #c63635 0%,#b40303 96%,#c83b3b 98%,#b30100 100%); /* IE10+ */
-  background: linear-gradient(to bottom,  #c63635 0%,#b40303 96%,#c83b3b 98%,#b30100 100%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c63635', endColorstr='#b30100',GradientType=0 ); /* IE6-9 */
-
-  height: 46px;
+  background-color: #b40303;
+  height: 44px;
   position: absolute;
   top: 0px;
   left: 0px;
   right: 0px;
-}
-
-img#headerBanner
+  box-shadow: 0 0 2px #000;
+}
+
+#headerBanner
+{
+  position: absolute;
+  top: 13px;
+  left: 55px;
+}
+
+#headerText
 {
   position: absolute;
   top: 12px;
-  left: 55px;
-}
-
-img#menuSeparator1
-{
-  position: absolute;
-  top: 0px;
-  left: 580px;
-}
-
-img#menuSeparator2
-{
-  position: absolute;
-  top: 0px;
-  left: 680px;
-}
-
-img#menuSeparator3
-{
-  position: absolute;
-  top: 0px;
-  left: 780px;
-}
-
-img#menuSeparator4
-{
-  position: absolute;
-  top: 0px;
-  left: 880px;
-}
-
-img#menuSeparator5
-{
-  position: absolute;
-  top: 0px;
-  left: 980px;
+  left: 240px;
+  font-family: LiberationSansBold, arial;
+  color: #fff;
+  font-size: 16px;
+}
+
+#menuLinkArea
+{
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
 }
 
 .menuLink
 {
-  height: 47px;
-  width: 98px;
-  font-family: LiberationSansRegular, arial;
-  font-size: 13px;
-  color: #ffffff;
+  height: 44px;
+  width: 100px;
+  font-size: 9pt;
   text-align: center;
-  line-height: 45px;
+  line-height: 44px;
   cursor: pointer;
-}
-
-div#menuLink1
+  color: #fff;
+}
+
+a.menuLink:hover
+{
+  text-decoration: none;
+}
+
+#menuLink1
 {
   position: absolute;
   left: 582px;
 }
 
-div#menuLink2
+#menuLink2
 {
   position: absolute;
   left: 682px;
 }
 
-div#menuLink3
+#menuLink3
 {
   position: absolute;
   left: 782px;
 }
 
-div#menuLink4
+#menuLink4
 {
   position: absolute;
   left: 882px;
 }
 
-span#headerText
-{
-  position: absolute;
-  top: 13px;
-  left: 253px;
-  font-family: LiberationSansBold, arial;
-  font-weight: lighter;
-  color: white;
-  font-size: 16px;
-}
-
-div#menuDropDown1
-{
-  position: absolute;
-  top: 46px;
+#menuDropDown1
+{
+  position: absolute;
+  top: 44px;
   left: 580px;
 }
 
-div#menuDropDown2
+#menuDropDown2
 {
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 680px;
 }
 
-div#menuDropDown3
+#menuDropDown3
 {
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 780px;
 }
 
-div#menuDropDown4
+#menuDropDown4
 {
   position: absolute;
   top: 44px;
@@ -194,8 +157,8 @@
 
 .menuDropDownArea
 {
-  font-size: 12px;
-  color: #ffffff;
+  font-size: 9pt;
+  color: #fff;
   border-right: 1px solid #282c35;
   border-bottom: 1px solid #282c35;
   border-left: 1px solid #282c35;
@@ -205,8 +168,8 @@
   background-color: #b91010;
   display: none;
   z-index: 10;
-  filter: alpha(opacity=90);
-  opacity: 0.90;
+  filter: alpha(opacity=94);
+  opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
@@ -226,7 +189,7 @@
   padding-left: 10px;
   padding-bottom: 7px;
   padding-right: 10px;
-  color: #ffffff;
+  color: #fff;
   border-radius: 3px;
   cursor: pointer;
 }
@@ -247,7 +210,7 @@
   height: 535px;
   width: 235px;
   position: absolute;
-  top: 46px;
+  top: 44px;
   left: 0px;
   padding-top: 6px;
   border-right: 1px solid #aaa;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-03-14 19:05:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-06-29 13:03:14 +0000
@@ -19,24 +19,6 @@
     {
         $( this ).attr( "src", "../images/hide.png" );
     } );
-
-	// Set links on top menu items
-    
-    $( "#menuLink1" ).click( function() {
-    	window.location.href = "../dhis-web-commons-about/modules.action";
-    } );
-
-    $( "#menuLink2" ).click( function() {
-    	window.location.href = "../dhis-web-commons-about/modules.action";
-    } );
-
-    $( "#menuLink3" ).click( function() {
-    	window.location.href = "../dhis-web-commons-about/functions.action";
-    } );
-
-    $( "#menuLink4" ).click( function() {
-    	window.location.href = "../dhis-web-commons-about/functions.action";
-    } );
 	
 	// Set show and hide drop down events on top menu
 	

=== 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	2013-05-02 13:55:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2013-06-29 13:03:14 +0000
@@ -66,22 +66,16 @@
       <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png"
         onclick="window.location.href='../dhis-web-dashboard-integration/interpretation.action'" style="cursor:pointer" title="$i18n.getString( 'view_intepretations' )">
 
-      #if( $maintenanceModules.size() > 0 )
-      <img id="menuSeparator1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
-      #end
-      <img id="menuSeparator2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
-      <img id="menuSeparator3" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
-      <img id="menuSeparator4" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
-      <img id="menuSeparator5" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
-
-      #if( $maintenanceModules.size() > 0 )
-      <div id="menuLink1" class="menuLink">$i18n.getString( "maintenance" )</div>
+      <ul id="menuLinkArea">
+      #if( $maintenanceModules.size() > 0 )
+      <li><a id="menuLink1" href="../dhis-web-commons-about/modules.action" class="menuLink">$i18n.getString( "maintenance" )</a></li>
       #end
       #if( $serviceModules.size() > 0 )
-      <div id="menuLink2" class="menuLink">$i18n.getString( "services" )</div>
+      <li><a id="menuLink2" href="../dhis-web-commons-about/modules.action" class="menuLink">$i18n.getString( "services" )</a></li>
       #end
-      <div id="menuLink3" class="menuLink">$i18n.getString( "help" )</div>
-      <div id="menuLink4" class="menuLink">$i18n.getString( "profile" )</div>
+      <li><a id="menuLink3" href="../dhis-web-commons-about/functions.action" class="menuLink">$i18n.getString( "help" )</a></li>
+      <li><a id="menuLink4" href="../dhis-web-commons-about/functions.action" class="menuLink">$i18n.getString( "profile" )</a></li>
+      </ul>
 
       #if( $maintenanceModules.size() > 0 )
       <div id="menuDropDown1" class="menuDropDownArea" >