dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6175
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-03-05 13:23:01 +0100
message:
  Removed silly settings solution
removed:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/settings.vm
modified:
  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-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml


--
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/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-03-05 11:57:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-03-05 12:23:01 +0000
@@ -8,8 +8,6 @@
 
     <link type="image/png" rel="icon" href="../images/favicon.png" />
 
-    #parse( "settings.vm" )
-        
     #foreach ( $style in $stylesheets )
       <link type="text/css" rel="stylesheet" href="$style">
     #end
@@ -103,7 +101,8 @@
     #parse( "macros.vm" )
         
     <div id="header">
-      <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer">
+      <img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" 
+        onclick="window.location.href='../dhis-web-commons-about/modules.action'" style="cursor:pointer" title="$i18n.getString( 'go_to_system_overview' )">
       
       <img id="menuSeparator1" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">
       <img id="menuSeparator2" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_separator.png">

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/settings.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/settings.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/settings.vm	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-
-<style type="text/css">
-  #if ( $menuTreeHeight )    
-  #leftBarContents div#orgUnitTree 
-  {
-    height: ${menuTreeHeight}px;
-  }
-  #end    
-</style> 

=== 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-02-12 17:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2012-03-05 12:23:01 +0000
@@ -45,7 +45,6 @@
       <set>
         <value>page</value>
         <value>menu</value>
-        <value>menuTreeHeight</value>
         <value>offline</value>
       </set>
     </property>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-03-05 11:57:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-03-05 12:23:01 +0000
@@ -101,6 +101,7 @@
 hide_menu=Hide menu
 show_menu=Show menu
 show_main_menu=Show main menu
+go_to_system_overview=Go to system overview
 organisation_unit=Organisation unit
 dataelement=Data element
 start_date=Start date

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2012-02-21 18:45:10 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2012-03-05 12:23:01 +0000
@@ -13,7 +13,6 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-dataentry/select.vm</param>
       <param name="menu">/dhis-web-dataentry/menu.vm</param>
-      <param name="menuTreeHeight">420</param>
       <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/form.js,javascript/entry.js,javascript/history.js</param>
       <param name="stylesheets">style/dhis-web-dataentry.css</param>
       <param name="offline">true</param>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm	2011-08-11 07:20:39 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm	2012-03-05 12:23:01 +0000
@@ -1,8 +1,14 @@
 <script type="text/javascript">
-	jQuery(document).ready(function() {
-		selection.setListenerFunction( organisationUnitSelected );
-	});
+jQuery(document).ready(function() {
+	selection.setListenerFunction( organisationUnitSelected );
+});
 </script>
 
+<style type="text/css">
+#leftBarContents div#orgUnitTree {
+	height: 430px;
+}
+</style>
+
 <br>
 #parse( "/dhis-web-commons/ouwt/orgunittreesearch.vm" )

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-02-17 19:42:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2012-03-05 12:23:01 +0000
@@ -95,7 +95,6 @@
 
     <action name="displayViewReportForm" class="org.hisp.dhis.reporting.reportviewer.action.GetAllReportsAction">
       <result name="success" type="velocity">/main.vm</result>
-      <param name="menuTreeHeight">420</param>
       <param name="page">/dhis-web-reporting/viewReportForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">javascript/report.js</param>
@@ -234,7 +233,6 @@
 
     <action name="showDataSetReportForm" class="org.hisp.dhis.reporting.dataset.action.GetDataSetReportOptionsAction">
       <result name="success" type="velocity">/main.vm</result>
-      <param name="menuTreeHeight">420</param>
       <param name="page">/dhis-web-reporting/dataSetReportForm.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/dataSetReport.js</param>