dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23809
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11602: Minor
------------------------------------------------------------
revno: 11602
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-08-07 12:03:12 +0200
message:
Minor
modified:
dhis-2/dhis-support/dhis-support-system/src/main/resources/grid-html.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.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-support/dhis-support-system/src/main/resources/grid-html.vm'
--- dhis-2/dhis-support/dhis-support-system/src/main/resources/grid-html.vm 2012-05-11 19:04:25 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/resources/grid-html.vm 2013-08-07 10:03:12 +0000
@@ -1,18 +1,6 @@
-<style type="text/css">
-.gridTable th, .gridTable td
-{
- text-align: center;
- width: 150px;
- line-height: 170%;
-}
-</style>
-
<h3>$!encoder.htmlEncode( $grid.title )</h3>
-
<h4>$!encoder.htmlEncode( $grid.subtitle )</h4>
-
<table class="listTable gridTable">
-
<thead>
<tr>
#foreach( $header in $grid.getVisibleHeaders() )
@@ -20,7 +8,6 @@
#end
</tr>
</thead>
-
<tbody>
#foreach( $row in $grid.getVisibleRows() )
<tr>
@@ -35,5 +22,4 @@
</tr>
#end
</tbody>
-
</table>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2013-08-07 09:49:32 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2013-08-07 10:03:12 +0000
@@ -7,6 +7,7 @@
dhis2.db.currentShareType;
dhis2.db.currentShareId;
+// TODO double horizontal size
// TODO dashboard list horizontal scroll
// TODO report type in link
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2013-08-06 18:33:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2013-08-07 10:03:12 +0000
@@ -32,17 +32,17 @@
</ul>
</div>
+<div id="searchDiv"><input type="text" id="searchField" autocomplete="off" placeholder="$i18n.getString( 'search_for_users_charts_maps_reports' )"></div>
+<div id="hitDiv"></div>
+
+<div id="searchButton"><a class="blueButtonLink" href="javascript:dhis2.db.search()">$i18n.getString( "search" )</a></div>
+
<div id="dashboardListContainer" class="horizontalMenu">
<div id="dashboardListWrapper">
<ul id="dashboardList"></ul>
</div>
</div>
-<div id="searchDiv"><input type="text" id="searchField" autocomplete="off" placeholder="$i18n.getString( 'search_for_users_charts_maps_reports' )"></div>
-<div id="hitDiv"></div>
-
-<div id="searchButton"><a class="blueButtonLink" href="javascript:dhis2.db.search()">$i18n.getString( "search" )</a></div>
-
<div id="contentDiv">
<ul id="contentList" class="horizontalMenu"></ul>
</div>