dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14562
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-31 12:35:11 +0200
message:
  Approval, table width
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.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-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2014-02-15 19:15:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm	2014-03-31 10:35:11 +0000
@@ -4,6 +4,6 @@
     #introListImgItem( "systemGeneralSettings.action" "system_general_settings" "systemsettings" )
     #introListImgItem( "systemAppearanceSettings.action" "system_appearance_settings" "systemsettings" )
     #introListImgItem( "systemEmailSettings.action" "system_email_settings" "systemsettings" )
+    #introListImgItem( "systemAccessSettings.action" "system_access_settings" "systemsettings" )
     #introListImgItem( "systemApprovalSettings.action" "system_approval_settings" "systemsettings" )
-    #introListImgItem( "systemAccessSettings.action" "system_access_settings" "systemsettings" )
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2014-02-15 19:15:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm	2014-03-31 10:35:11 +0000
@@ -3,6 +3,6 @@
 	<li><a href="systemGeneralSettings.action">$i18n.getString( "general" )&nbsp;</a></li>
 	<li><a href="systemAppearanceSettings.action">$i18n.getString( "appearance" )&nbsp;</a></li>
     <li><a href="systemEmailSettings.action">$i18n.getString( "email" )&nbsp;</a></li>
+    <li><a href="systemAccessSettings.action">$i18n.getString( "access" )&nbsp;</a></li>
     <li><a href="systemApprovalSettings.action">$i18n.getString( "approval" )&nbsp;</a></li>
-    <li><a href="systemAccessSettings.action">$i18n.getString( "access" )&nbsp;</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm	2014-03-30 22:10:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm	2014-03-31 10:35:11 +0000
@@ -19,10 +19,10 @@
     </ul>
 </div>
 
-<table class="mainPageTable">
+<table class="mainPageTable" style="width:75%">
     <tr>
         <td style="vertical-align:top">
-            <table width="75%">
+            <table width="100%">
                 <tr>
                     <td><div class="settingLabel">$i18n.getString( "data_approval_levels" )</div></td>
                     <td style="text-align:right">