dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22635
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10935: Consistent markup for option set list ui
------------------------------------------------------------
revno: 10935
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-22 15:50:17 +0200
message:
Consistent markup for option set list ui
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.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/optionSet.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.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/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-05-22 10:32:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-05-22 13:50:17 +0000
@@ -361,20 +361,18 @@
font-size: 9pt;
}
-.page th, thead tr, .tabHead
+.page th
{
+ background-color: #cbddeb;
text-align: left;
color: #39547d;
- padding: 3px 0px 2px 6px;
- border-bottom: 1px solid #cad5e5;
+ padding: 3px 0 2px 6px;
+ border: 0;
font-family: LiberationSansBold, arial;
font-size: 13px;
font-weight: normal;
-}
-
-.page th
-{
- padding: 6px 0 3px 5px;
+ border-collapse: collapse;
+ min-height: 28px;
}
#mainPage
@@ -400,6 +398,13 @@
padding-top: 10px;
}
+.listTable th
+{
+ background-color: #fff;
+ border-bottom: 1px solid #cad5e5;
+ padding: 6px 0 3px 5px;
+}
+
.listTable td
{
padding: 2px 2px 2px 5px;
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-05-22 13:14:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-05-22 13:50:17 +0000
@@ -362,16 +362,18 @@
font-size: 9pt;
}
-.page th, thead tr, .tabHead
+.page th
{
- background-color: #ebf0f6;
+ background-color: #cbddeb;
text-align: left;
color: #39547d;
padding: 3px 0 2px 6px;
- border: 1px solid #cad5e5;
+ border: 0;
font-family: LiberationSansBold, arial;
font-size: 13px;
font-weight: normal;
+ border-collapse: collapse;
+ min-height: 28px;
}
#mainPage
@@ -392,10 +394,9 @@
padding-top: 10px;
}
-.listTable th, .listTable thead tr
+.listTable th
{
background-color: #fff;
- border: 0px solid #fff;
border-bottom: 1px solid #cad5e5;
padding: 6px 0 3px 5px;
}
=== 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 2012-11-20 22:33:00 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2013-05-22 13:50:17 +0000
@@ -57,6 +57,7 @@
border: solid 1px #f0f0f0;
outline: 0;
color: #333;
+ height: 14px;
}
.historyHeader
=== 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-01-28 06:47:36 +0000
+++ 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
@@ -44,7 +44,7 @@
<table class="listTable" id="listTable">
<col/>
<col width="120px"/>
- <thead>
+ <thead>
<tr>
<th>$i18n.getString( "name" )</th>
<th class="{sorter: false}">$i18n.getString( "operations" )</th>
=== 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-01-28 06:59:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm 2013-05-22 13:50:17 +0000
@@ -11,7 +11,7 @@
<table class="mainPageTable">
<tr>
<td style="vertical-align:top">
- <table class="listTable">
+ <table width="100%">
<col>
<col width="120">
<tr>
@@ -22,23 +22,29 @@
<input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='showAddOptionSetForm.action'" style="width:70px">
</td>
</tr>
- <tr>
- <th>$i18n.getString( "name" )</th>
- <th class="{sorter: false}">$i18n.getString( "operations" )</th>
- </tr>
- <tbody id="list">
- #foreach( $optionSet in $optionSets )
- <tr id="tr${optionSet.id}">
- <td>$encoder.htmlEncode( $optionSet.displayName )</td>
- <td style="text-align:right">
- <a href="showUpdateOptionSetForm.action?id=$optionSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
- <a href="javascript:translate( 'OptionSet', '$optionSet.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
- <a href="javascript:removeOptionSet( $optionSet.id, '$encoder.jsEncode( $optionSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
- <a href="javascript:showOptionSetDetails( $optionSet.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
- </td>
- </tr>
- #end
- </tbody>
+ </table>
+ <table class="listTable" id="listTable">
+ <col/>
+ <col width="120px"/>
+ <thead>
+ <tr>
+ <th>$i18n.getString( "name" )</th>
+ <th class="{sorter: false}">$i18n.getString( "operations" )</th>
+ </tr>
+ </thead>
+ <tbody id="list">
+ #foreach( $optionSet in $optionSets )
+ <tr id="tr${optionSet.id}">
+ <td>$encoder.htmlEncode( $optionSet.displayName )</td>
+ <td style="text-align:right">
+ <a href="showUpdateOptionSetForm.action?id=$optionSet.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
+ <a href="javascript:translate( 'OptionSet', '$optionSet.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
+ <a href="javascript:removeOptionSet( $optionSet.id, '$encoder.jsEncode( $optionSet.displayName )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+ <a href="javascript:showOptionSetDetails( $optionSet.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
+ </td>
+ </tr>
+ #end
+ </tbody>
</table>
</td>
=== 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:14:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm 2013-05-22 13:50:17 +0000
@@ -22,7 +22,7 @@
<td style="vertical-align:top">
<table class="listTable" id="listTable">
<col>
- <col width="175">
+ <col width="120">
<thead>
<tr>
<th>$i18n.getString( "name" )</th>
