dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23234
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11285: Moved css out of templates and into stylesheet
------------------------------------------------------------
revno: 11285
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-06-29 16:16:34 +0200
message:
Moved css out of templates and into stylesheet
renamed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm => dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm
modified:
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-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/attribute.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/constant.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/sqlView.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.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/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-06-28 18:14:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2013-06-29 14:16:34 +0000
@@ -60,6 +60,35 @@
}
/*----------------------------------------------------------------------------*/
+/* Details area */
+/*----------------------------------------------------------------------------*/
+
+#detailsData
+{
+ vertical-align: top;
+ width: 20em;
+ padding-left: 2em;
+}
+
+#detailsArea
+{
+ display: none;
+}
+
+#warningArea
+{
+ position: fixed;
+ right: 10px;
+ top: 200px;
+ display: none;
+}
+
+#hideDetailsArea
+{
+ float: right;
+}
+
+/*----------------------------------------------------------------------------*/
/* Help page */
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/attribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/attribute.vm 2013-05-22 13:50:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/attribute.vm 2013-06-29 14:16:34 +0000
@@ -68,9 +68,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -83,7 +84,7 @@
</div>
<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/constant.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/constant.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/constant.vm 2013-06-29 14:16:34 +0000
@@ -43,18 +43,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "value" ):</label><br/><span id="valueField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm 2013-05-31 04:56:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm 2013-06-29 14:16:34 +0000
@@ -48,18 +48,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br/><span id="optionCount"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/sqlView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/sqlView.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/sqlView.vm 2013-06-29 14:16:34 +0000
@@ -40,10 +40,10 @@
</tbody>
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
-
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -51,8 +51,8 @@
<p><label>$i18n.getString( "sql_statement" ):</label><br/><span id="sqlQueryField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2013-06-29 14:16:34 +0000
@@ -74,10 +74,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -86,7 +86,7 @@
</div>
<div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2013-04-03 12:25:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2013-06-29 14:16:34 +0000
@@ -86,10 +86,10 @@
</div>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -105,8 +105,8 @@
<p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2013-03-12 09:49:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2013-06-29 14:16:34 +0000
@@ -77,10 +77,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</div>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -89,8 +89,8 @@
<p><label>$i18n.getString( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2013-03-12 09:49:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2013-06-29 14:16:34 +0000
@@ -77,18 +77,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2013-06-29 14:16:34 +0000
@@ -93,10 +93,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -111,8 +111,8 @@
<p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2013-06-29 14:16:34 +0000
@@ -73,18 +73,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2013-06-29 14:16:34 +0000
@@ -73,18 +73,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_members" ):</label><br/><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2013-06-29 14:16:34 +0000
@@ -62,18 +62,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name"):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "factor" ):</label><br/><span id="factorField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2013-01-28 07:33:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2013-06-29 14:16:34 +0000
@@ -63,18 +63,18 @@
<p></p>
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_category_options" ):</label><br/><span id="categoryOptionsCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2013-04-03 12:25:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2013-06-29 14:16:34 +0000
@@ -46,18 +46,18 @@
<p></p>
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "number_of_categories" ):</label><br/><span id="dataElementCategoryCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2013-02-22 15:07:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2013-06-29 14:16:34 +0000
@@ -64,10 +64,10 @@
<p></p>
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -75,8 +75,8 @@
<p><label>$i18n.getString( "concept" ):</label><br/><span id="conceptField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2013-06-29 14:16:34 +0000
@@ -47,17 +47,17 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2013-05-25 06:24:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm 2013-06-29 14:16:34 +0000
@@ -99,10 +99,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -112,8 +112,8 @@
<p><label>$i18n.getString( "dataentryform" ):</label><br/><span id="dataEntryFormField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2013-02-03 09:53:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2013-06-29 14:16:34 +0000
@@ -68,14 +68,13 @@
</tbody>
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
- <!--p><label>$i18n.getString( "title" ):</label><br/><span id="titleField"></span></p-->
<p><label>$i18n.getString( "dataset" ):</label><br/><span id="dataSetField"></span></p>
<p><label>$i18n.getString( "category_combo" ):</label><br/><span id="categoryComboField"></span></p>
<p><label>$i18n.getString( "number_of_data_elements" ):</label><br/><span id="dataElementCountField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm 2013-06-29 14:16:34 +0000
@@ -56,10 +56,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -74,8 +74,8 @@
<p><label>$i18n.getString( "last_updated" ):</label><br/><span id="lastUpdatedField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm 2013-03-01 05:14:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm 2013-06-29 14:16:34 +0000
@@ -46,10 +46,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -58,8 +58,8 @@
<p><label>$i18n.getString( "number_of_group_members" ):</label><br/><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm 2013-06-29 14:16:34 +0000
@@ -49,10 +49,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
@@ -61,8 +61,8 @@
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-05-30 06:08:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2013-06-29 14:16:34 +0000
@@ -751,7 +751,7 @@
class="org.hisp.dhis.patient.action.patientidentifiertype.GetPatientIdentifierTypeListAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">
- /dhis-web-maintenance-patient/listPatientIdentifierType.vm</param>
+ /dhis-web-maintenance-patient/patientIdentifierType.vm</param>
<param name="menu">/dhis-web-maintenance-patient/menu.vm</param>
<param name="javascripts">javascript/patientIdentifierType.js</param>
</action>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2013-05-17 08:24:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/caseAggregation.vm 2013-06-29 14:16:34 +0000
@@ -42,10 +42,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" class="hidden">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2013-04-08 04:21:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttribute.vm 2013-06-29 14:16:34 +0000
@@ -42,10 +42,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2013-02-04 16:14:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAttributeGroup.vm 2013-06-29 14:16:34 +0000
@@ -40,10 +40,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" )</label><br><span id="nameField"></span></p>
=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/listPatientIdentifierType.vm 2013-02-13 15:58:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm 2013-06-29 14:16:34 +0000
@@ -37,9 +37,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm 2013-04-17 07:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programIndicator.vm 2013-06-29 14:16:34 +0000
@@ -44,9 +44,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-05-16 06:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-06-29 14:16:34 +0000
@@ -78,10 +78,10 @@
</tbody>
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm 2013-05-27 04:33:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm 2013-06-29 14:16:34 +0000
@@ -52,9 +52,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm 2013-02-04 03:09:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm 2013-06-29 14:16:34 +0000
@@ -42,9 +42,10 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none;">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails();" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-02-28 07:29:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-06-29 14:16:34 +0000
@@ -47,10 +47,10 @@
</tbody>
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="descriptionField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2013-02-18 03:04:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/relationshipType.vm 2013-06-29 14:16:34 +0000
@@ -42,9 +42,9 @@
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none;">
- <div style="float:right;">
+ <td id="detailsData">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "a_is_to_b" ):</label><br><span id="aIsToBField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2013-04-02 05:27:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/validationCriteria.vm 2013-06-29 14:16:34 +0000
@@ -37,9 +37,10 @@
</tbody>
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none;">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id='nameField'></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm 2013-06-05 08:02:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm 2013-06-29 14:16:34 +0000
@@ -43,10 +43,10 @@
</div>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
@@ -54,8 +54,8 @@
<p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2012-11-08 19:17:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm 2013-06-29 14:16:34 +0000
@@ -89,10 +89,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</div>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "username" ):</label><br><span id="usernameField"></span></p>
@@ -106,8 +106,8 @@
<p><label>$i18n.getString( "roles" ):</label><br/><span id="roleField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2013-06-29 14:16:34 +0000
@@ -75,17 +75,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <td id="detailsData">
+
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/hide.png" alt="$i18n.getString( "hide_details" )"></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label>$i18n.getString( "url" ):</label><br><span id="urlField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/hide.png" alt=$i18n.getString( "hide_warning" )'></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2013-03-13 11:47:27 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2013-06-29 14:16:34 +0000
@@ -72,18 +72,18 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
<p><label>$i18n.getString( "report_table" ):</label><br/><span id="reportTableNameField"></span></p>
<p><label>$i18n.getString( "include_organisation_unit_group_sets" ):</label><br/><span id="orgGroupSetsField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/hide.png" alt=$i18n.getString( "hide_warning" )'></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2013-05-22 13:50:17 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2013-06-29 14:16:34 +0000
@@ -56,10 +56,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/hide.png" alt="$i18n.getString( "hide_details" )"></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
@@ -71,8 +71,8 @@
<p><label>$i18n.getString( "crosstab_organisation_units" ):</label><br><span id="doUnitsField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/hide.png" alt=$i18n.getString( "hide_warning" )'></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm 2013-06-29 14:16:34 +0000
@@ -66,10 +66,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
@@ -79,8 +79,8 @@
<p><label>$i18n.getString( "right_side_description" ):</label><br><span id="rightSideDescriptionField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"></a>
</div>
<p><span id="warningField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm 2012-10-18 13:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm 2013-06-29 14:16:34 +0000
@@ -47,10 +47,10 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
+ <td id="detailsData">
- <div id="detailsArea" style="display:none">
- <div style="float:right">
+ <div id="detailsArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/hide.png" alt="$i18n.getString( "hide_details" )"></a>
</div>
<p><label>$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
@@ -58,8 +58,8 @@
<p><label>$i18n.getString( "number_of_members" ):</label><br><span id="memberCountField"></span></p>
</div>
- <div id="warningArea" style="position:fixed;right:10px;top:200px;display:none">
- <div style="float:right">
+ <div id="warningArea">
+ <div id="hideDetailsArea">
<a href="javascript:hideWarning()" title='$i18n.getString( 'hide_warning' )'><img src="../images/hide.png" alt=$i18n.getString( "hide_warning" )'></a>
</div>
<p><span id="warningField"></span></p>
