dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 307
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Wed 2009-05-20 10:31:50 +0200
message:
  Improved style of report table data report
added:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseBlankReportTableData.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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseReportTableData.vm

=== 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	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2009-05-20 08:31:50 +0000
@@ -532,3 +532,20 @@
 {
   background-image: url('../images/calendar_icon.gif');
 }
+
+/*----------------------------------------------------------------------------*/
+/* ReportTable                                                                */
+/*----------------------------------------------------------------------------*/
+
+.reportTableHeader
+{
+  text-align: left;
+  color: #3f5d8e;
+  font-weight: bold;
+  border-style: solid;
+  border-width: 1px;
+  border-color: #cad5e5;
+  padding-left: 7px;
+  height: 19px;
+  background-color: #ebf0f6;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm	2009-05-19 15:32:14 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm	2009-05-20 08:31:50 +0000
@@ -6,7 +6,7 @@
     #foreach ( $table in $reportTables )
     <tr>
         <td>
-            <a href="../dhis-web-reporting/getTableData.action?id=${table.id}" target="_blank">$table.name</a>
+            <a href="../dhis-web-reporting/getBlankTableData.action?id=${table.id}" target="_blank">$table.name</a>
         </td>       
         <td style="width:16px">
             <a href="javascript:window.location.href='removeReportTable.action?id=$table.id'" title="$i18n.getString( 'remove' )">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml	2009-05-19 15:32:14 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml	2009-05-20 08:31:50 +0000
@@ -245,12 +245,15 @@
     </action>
     
     <action name="getTableData" class="org.hisp.dhis.reporting.tablecreator.action.GetTableDataAction">
-      <result name="blank" type="velocity">/dhis-web-reporting/responseReportTableData.vm</result>
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-reporting/responseReportTableData.vm</param>
       <param name="menu">/dhis-web-reporting/menu.vm</param>
     </action>
     
+    <action name="getBlankTableData" class="org.hisp.dhis.reporting.tablecreator.action.GetTableDataAction">
+      <result name="success" type="velocity">/dhis-web-reporting/responseBlankReportTableData.vm</result>
+    </action>
+    
     <action name="displayTable" class="org.hisp.dhis.reporting.tablecreator.action.GetDisplayTableOptionsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-reporting/displayTableForm.vm</param>

=== added file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseBlankReportTableData.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseBlankReportTableData.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseBlankReportTableData.vm	2009-05-20 08:31:50 +0000
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>DHIS 2</title>
+    <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/blue/blue.css">
+    <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css">
+  </head>
+  
+  <body>
+  	<div class="page" style="margin: 20px">  	
+  	  #parse( "dhis-web-reporting/responseReportTableData.vm" )
+  	</div>
+  </body>
+</html>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseReportTableData.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseReportTableData.vm	2009-04-30 11:38:35 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responseReportTableData.vm	2009-05-20 08:31:50 +0000
@@ -1,52 +1,28 @@
 
-<style type="text/css">
-	
-.reportTableHeader
-{
-  text-align: left;
-  color: #3f5d8e;
-  font-weight: bold;
-  border-style: solid;
-  border-width: 1px;
-  border-color: #cad5e5;
-  padding-left: 7px;
-  height: 19px;
-  background-color: #ebf0f6;
-}
- 
-</style>
-
 #macro( alternate $mark )
     #if( $mark ) class="listAlternateRow"#else class="listRow"#end
 #end
 
-<html>
-	<head>
-		<link type="text/css" rel="stylesheet" href="css/stylesheet.css">
-	</head>
-    <body>
-        <table class="listTable">
-            <tr>
-                <td style="text-align:center" colspan="$data.columns.values().size()"><h3>$data.name</h3></td>
-            </tr>
-            <tr>
-            #foreach( $column in $data.prettyPrintColumns )
-                <td class="reportTableHeader">$column</td>
-            #end
-            </tr>
+<table class="listTable">
+    <tr>
+        <td style="text-align:center" colspan="$data.columns.values().size()"><h3>$data.name</h3></td>
+    </tr>
+    <tr>
+    #foreach( $column in $data.prettyPrintColumns )
+        <td class="reportTableHeader">$column</td>
+    #end
+    </tr>
+    #set( $mark = false )
+    #foreach( $row in $data.rows )
+        <tr>
+        #foreach( $value in $row.values() )
+            <td#alternate( $mark )>$value</td>
+        #end
+        </tr>
+        #if( $mark )
             #set( $mark = false )
-            #foreach( $row in $data.rows )
-                <tr>
-                #foreach( $value in $row.values() )
-                    <td#alternate( $mark )>$value</td>
-                #end
-                </tr>
-                #if( $mark )
-                    #set( $mark = false )
-                #else
-                    #set( $mark = true )
-                #end
-            #end
-        </table>
-    </body>
-</html>
+        #else
+            #set( $mark = true )
+        #end
+    #end
+</table>



--
Trunk
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.