------------------------------------------------------------
revno: 13056
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-11-28 19:48:41 +0100
message:
minor cosmetic fix to lists in data-dictionary
modified:
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
--
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-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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm 2013-11-28 18:48:41 +0000
@@ -41,8 +41,8 @@
</thead>
<tbody id="list">
#foreach( $dataDictionary in $dataDictionaries )
- <tr id="tr${dataDictionary.id}" style="height: 40px;">
- <td data-id="$!dataDictionary.id" data-uid="$!dataDictionary.uid" data-type="DataDictionary" data-name="$encoder.htmlEncode( $!dataDictionary.displayName )">
+ <tr id="tr${dataDictionary.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!dataDictionary.id" data-uid="$!dataDictionary.uid" data-type="DataDictionary" data-name="$encoder.htmlEncode( $!dataDictionary.displayName )">
$encoder.htmlEncode( $!dataDictionary.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm 2013-11-28 18:48:41 +0000
@@ -70,8 +70,8 @@
</thead>
<tbody id="list">
#foreach( $dataElement in $dataElements )
- <tr id="tr${dataElement.id}" style="height: 40px;">
- <td data-id="$!dataElement.id" data-uid="$!dataElement.uid" data-type="DataElement" data-name="$encoder.htmlEncode( $!dataElement.displayName )">
+ <tr id="tr${dataElement.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!dataElement.id" data-uid="$!dataElement.uid" data-type="DataElement" data-name="$encoder.htmlEncode( $!dataElement.displayName )">
$encoder.htmlEncode( $!dataElement.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm 2013-11-28 18:48:41 +0000
@@ -38,8 +38,8 @@
</thead>
<tbody id="list">
#foreach( $dataElementGroup in $dataElementGroups )
- <tr id="tr${dataElementGroup.id}" style="height: 40px;">
- <td data-id="$!dataElementGroup.id" data-uid="$!dataElementGroup.uid" data-type="DataElementGroup" data-name="$encoder.htmlEncode( $!dataElementGroup.displayName )">
+ <tr id="tr${dataElementGroup.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!dataElementGroup.id" data-uid="$!dataElementGroup.uid" data-type="DataElementGroup" data-name="$encoder.htmlEncode( $!dataElementGroup.displayName )">
$encoder.htmlEncode( $!dataElementGroup.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm 2013-11-28 18:48:41 +0000
@@ -38,8 +38,8 @@
</thead>
<tbody id="list">
#foreach( $dataElementGroupSet in $dataElementGroupSets )
- <tr id="tr${dataElementGroupSet.id}" style="height: 40px;">
- <td data-id="$!dataElementGroupSet.id" data-uid="$!dataElementGroupSet.uid" data-type="DataElementGroupSet" data-name="$encoder.htmlEncode( $!dataElementGroupSet.displayName )">
+ <tr id="tr${dataElementGroupSet.id}">
+ <td style="padding: 12px 0 12px 5px;" ata-id="$!dataElementGroupSet.id" data-uid="$!dataElementGroupSet.uid" data-type="DataElementGroupSet" data-name="$encoder.htmlEncode( $!dataElementGroupSet.displayName )">
$encoder.htmlEncode( $!dataElementGroupSet.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm 2013-11-28 18:48:41 +0000
@@ -44,7 +44,7 @@
</div>
</td>
<td style="text-align:right">
- <input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortIndicatorForm.action'" style="width:80px"/>
+ <input type="button" value="$i18n.getString( 'sort' )" onclick="window.location.href='showSortIndicatorForm.action'" style="width:80px"/>
#if ( $dataDictionaryMode == "extended" )
<input type="button" value="$i18n.getString( 'add_new' )" onclick="window.location.href='showAddExtendedIndicatorForm.action'" style="width:80px"/>
#else
@@ -61,8 +61,8 @@
</thead>
<tbody id="list">
#foreach( $indicator in $indicators )
- <tr id="tr${indicator.id}" style="height: 40px;">
- <td data-id="$!indicator.id" data-uid="$!indicator.uid" data-type="Indicator" data-name="$encoder.htmlEncode( $!indicator.displayName )">
+ <tr id="tr${indicator.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!indicator.id" data-uid="$!indicator.uid" data-type="Indicator" data-name="$encoder.htmlEncode( $!indicator.displayName )">
$encoder.htmlEncode( $!indicator.displayName )
</td>
</tr>
@@ -74,29 +74,28 @@
</td>
<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 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( "short_name" ):</label><br/><span id="shortNameField"></span></p>
<p><label>$i18n.getString( "description" ):</label><br/><span id="descriptionField"></span></p>
<p><label>$i18n.getString( "annualized" ):</label><br/><span id="annualizedField"></span></p>
- <p><label>$i18n.getString( "indicator_type" ):</label><br/><span id="indicatorTypeNameField"></span></p>
- <p><label>$i18n.getString( "numerator_description" ):</label><br/><span id="numeratorDescriptionField"></span></p>
+ <p><label>$i18n.getString( "indicator_type" ):</label><br/><span id="indicatorTypeNameField"></span></p>
+ <p><label>$i18n.getString( "numerator_description" ):</label><br/><span id="numeratorDescriptionField"></span></p>
<p><label>$i18n.getString( "denominator_description" ):</label><br/><span id="denominatorDescriptionField"></span></p>
- <p><label>$i18n.getString( "url" ):</label><br/><span id="urlField"></span></p>
- <p><label>$i18n.getString( "last_updated" ):</label><br/><span id="lastUpdatedField"></span></p>
- <p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>
+ <p><label>$i18n.getString( "url" ):</label><br/><span id="urlField"></span></p>
+ <p><label>$i18n.getString( "last_updated" ):</label><br/><span id="lastUpdatedField"></span></p>
+ <p><label>$i18n.getString( "data_sets" ):</label><br/><span id="dataSetsField"></span></p>
</div>
<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>
- </div>
+ <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>
+ </div>
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm 2013-11-28 18:48:41 +0000
@@ -41,8 +41,8 @@
</thead>
<tbody id="list">
#foreach( $indicatorGroup in $indicatorGroups )
- <tr id="tr${indicatorGroup.id}" style="height: 40px;">
- <td data-id="$!indicatorGroup.id" data-uid="$!indicatorGroup.uid" data-type="IndicatorGroup" data-name="$encoder.htmlEncode( $!indicatorGroup.displayName )">
+ <tr id="tr${indicatorGroup.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!indicatorGroup.id" data-uid="$!indicatorGroup.uid" data-type="IndicatorGroup" data-name="$encoder.htmlEncode( $!indicatorGroup.displayName )">
$encoder.htmlEncode( $!indicatorGroup.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm 2013-11-28 18:48:41 +0000
@@ -41,8 +41,8 @@
</thead>
<tbody id="list">
#foreach( $indicatorGroupSet in $indicatorGroupSets )
- <tr id="tr${indicatorGroupSet.id}" style="height: 40px;">
- <td data-id="$!indicatorGroupSet.id" data-uid="$!indicatorGroupSet.uid" data-type="IndicatorGroupSet" data-name="$encoder.htmlEncode( $!indicatorGroupSet.displayName )">
+ <tr id="tr${indicatorGroupSet.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!indicatorGroupSet.id" data-uid="$!indicatorGroupSet.uid" data-type="IndicatorGroupSet" data-name="$encoder.htmlEncode( $!indicatorGroupSet.displayName )">
$encoder.htmlEncode( $!indicatorGroupSet.displayName )
</td>
</tr>
=== 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 2013-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm 2013-11-28 18:48:41 +0000
@@ -58,8 +58,8 @@
</thead>
<tbody id="list">
#foreach( $indicatorType in $indicatorTypes )
- <tr id="tr${indicatorType.id}" style="height: 40px;">
- <td data-id="$!indicatorType.id" data-uid="$!indicatorType.uid" data-type="IndicatorType" data-name="$encoder.htmlEncode( $!indicatorType.displayName )">
+ <tr id="tr${indicatorType.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!indicatorType.id" data-uid="$!indicatorType.uid" data-type="IndicatorType" data-name="$encoder.htmlEncode( $!indicatorType.displayName )">
$encoder.htmlEncode( $!indicatorType.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm 2013-11-28 18:48:41 +0000
@@ -59,8 +59,8 @@
<tbody id="list">
#foreach( $dataElementCategory in $dataElementCategories )
#if( $dataElementCategory.id != $defaultCategory.id )
- <tr id="tr${dataElementCategory.id}" style="height: 40px;">
- <td data-id="$!dataElementCategory.id" data-uid="$!dataElementCategory.uid" data-type="DataElementCategory" data-name="$encoder.htmlEncode( $!dataElementCategory.displayName )">
+ <tr id="tr${dataElementCategory.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!dataElementCategory.id" data-uid="$!dataElementCategory.uid" data-type="DataElementCategory" data-name="$encoder.htmlEncode( $!dataElementCategory.displayName )">
$encoder.htmlEncode( $!dataElementCategory.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm 2013-11-28 18:48:41 +0000
@@ -36,8 +36,8 @@
<tbody id="list">
#foreach( $dataElementCategoryCombo in $dataElementCategoryCombos )
#if( $dataElementCategoryCombo.id != $defaultCombo.id )
- <tr id="tr${dataElementCategoryCombo.id}" style="height: 40px;">
- <td data-id="$!dataElementCategoryCombo.id" data-uid="$!dataElementCategoryCombo.uid" data-type="DataElementCategoryCombo" data-name="$encoder.htmlEncode( $!dataElementCategoryCombo.displayName )">
+ <tr id="tr${dataElementCategoryCombo.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!dataElementCategoryCombo.id" data-uid="$!dataElementCategoryCombo.uid" data-type="DataElementCategoryCombo" data-name="$encoder.htmlEncode( $!dataElementCategoryCombo.displayName )">
$encoder.htmlEncode( $!dataElementCategoryCombo.displayName )
</td>
</tr>
=== 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-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm 2013-11-28 18:48:41 +0000
@@ -60,8 +60,8 @@
<tbody id="list">
#foreach( $dataElementCategoryOption in $dataElementCategoryOptions )
#if( $dataElementCategoryOption.id != $defaultCategory.id )
- <tr id="tr${dataElementCategoryOption.id}" style="height: 40px;">
- <td data-id="$!dataElementCategoryOption.id" data-uid="$!dataElementCategoryOption.uid" data-type="DataElementCategoryOption" data-name="$encoder.htmlEncode( $!dataElementCategoryOption.displayName )">
+ <tr id="tr${dataElementCategoryOption.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!dataElementCategoryOption.id" data-uid="$!dataElementCategoryOption.uid" data-type="DataElementCategoryOption" data-name="$encoder.htmlEncode( $!dataElementCategoryOption.displayName )">
$encoder.htmlEncode( $!dataElementCategoryOption.displayName )
</td>
</tr>
=== 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 2013-11-28 16:24:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm 2013-11-28 18:48:41 +0000
@@ -36,8 +36,8 @@
<tbody id="list">
#foreach( $concept in $concepts )
#if( $concept.id != $defaultConcept.id )
- <tr id="tr${concept.id}" style="height: 40px;">
- <td data-id="$!concept.id" data-uid="$!concept.uid" data-type="Concept" data-name="$encoder.htmlEncode( $!concept.displayName )">
+ <tr id="tr${concept.id}">
+ <td style="padding: 12px 0 12px 5px;" data-id="$!concept.id" data-uid="$!concept.uid" data-type="Concept" data-name="$encoder.htmlEncode( $!concept.displayName )">
$encoder.htmlEncode( $!concept.displayName )
</td>
</tr>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
