← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2080: Minor fixed

 

------------------------------------------------------------
revno: 2080
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-11-16 17:50:56 +0100
message:
  Minor fixed
modified:
  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/style/dhis-web-dataentry.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-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2010-11-16 16:21:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2010-11-16 16:50:56 +0000
@@ -26,13 +26,11 @@
 		</action>
 
 		<action name="nextPeriods" class="org.hisp.dhis.de.action.NextPeriodsAction">
-			<result name="success" type="redirect">select.action
-			</result>
+			<result name="success" type="redirect">select.action</result>
 		</action>
 
 		<action name="previousPeriods" class="org.hisp.dhis.de.action.PreviousPeriodsAction">
-			<result name="success" type="redirect">select.action
-			</result>
+			<result name="success" type="redirect">select.action</result>
 		</action>
 
 		<action name="sectionform" class="org.hisp.dhis.de.action.SectionFormAction">
@@ -45,8 +43,7 @@
 			<param name="stylesheets">style/dhis-web-dataentry.css</param>
 		</action>
 
-		<action name="multidimensionalform"
-			class="org.hisp.dhis.de.action.FormAction">
+		<action name="multidimensionalform"	class="org.hisp.dhis.de.action.FormAction">
 			<interceptor-ref name="organisationUnitTreeStack" />
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-dataentry/form.vm</param>
@@ -56,8 +53,7 @@
 			<param name="stylesheets">style/dhis-web-dataentry.css</param>
 		</action>
 
-		<action name="saveMultiDimensionalValue"
-			class="org.hisp.dhis.de.action.SaveValueAction">
+		<action name="saveMultiDimensionalValue" class="org.hisp.dhis.de.action.SaveValueAction">
 			<result name="success" type="velocity">status.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 			<param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
@@ -99,24 +95,18 @@
 		</action>
 
 		<action name="minMaxGeneration" class="org.hisp.dhis.de.action.MinMaxGeneratingAction">
-			<result name="success" type="velocity-xml">responseMinMaxGeneration.vm
-			</result>
+			<result name="success" type="velocity-xml">responseMinMaxGeneration.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 			<param name="requiredAuthorities">F_DATAELEMENT_MINMAX_ADD,F_DATAELEMENT_MINMAX_UPDATE</param>
 		</action>
 
-		<action name="registerCompleteDataSet"
-			class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction">
-			<result name="success" type="velocity">
-				/dhis-web-dataentry/responseVoid.vm</result>
-			<result name="input" type="velocity-xml">
-				/dhis-web-dataentry/responseInput.vm</result>
+		<action name="registerCompleteDataSet" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction">
+			<result name="success" type="velocity">/dhis-web-dataentry/responseVoid.vm</result>
+			<result name="input" type="velocity-xml">/dhis-web-dataentry/responseInput.vm</result>
 		</action>
 
-		<action name="undoCompleteDataSet"
-			class="org.hisp.dhis.de.action.UndoCompleteDataSetAction">
-			<result name="success" type="velocity">
-				/dhis-web-dataentry/responseVoid.vm</result>
+		<action name="undoCompleteDataSet" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction">
+			<result name="success" type="velocity">/dhis-web-dataentry/responseVoid.vm</result>
 		</action>
 
 		<action name="validate" class="org.hisp.dhis.de.action.ValidationAction">
@@ -126,15 +116,13 @@
 		</action>
 
 		<action name="getValidationViolations" class="org.hisp.dhis.de.action.ValidationAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-dataentry/responseSuccess.vm</result>
+			<result name="success" type="velocity-xml">/dhis-web-dataentry/responseSuccess.vm</result>
 			<result name="none" type="velocity-xml">/dhis-web-dataentry/responseNone.vm
 			</result>
 		</action>
 
 		<action name="markValueForFollowup" class="org.hisp.dhis.de.action.MarkForFollowupAction">
-			<result name="success" type="velocity-xml">
-				/dhis-web-dataentry/responseSuccess.vm</result>
+			<result name="success" type="velocity-xml">/dhis-web-dataentry/responseSuccess.vm</result>
 		</action>
 
 		<action name="getHistoryChart" class="org.hisp.dhis.de.action.GetHistoryChartAction">

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2010-02-27 21:18:45 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2010-11-16 16:50:56 +0000
@@ -7,14 +7,16 @@
   border: 1px solid black;
   font-size: 14px;
   text-align: right;
-  position:fixed;
-  top:85px;
-  right:10px;
+  position: fixed;
+  top: 85px;
+  right: 10px;
+  filter: alpha(opacity=90);
+  opacity: 0.90;
 }
 
 #selectForm 
 {
-  padding-top: 32px;
+  padding-top: 15px;
 }
 
 #actions