dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7240
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-06-07 16:16:27 +0200
message:
  New remove icon in dashboard
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm
  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/style/dashboard.css


--
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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm	2012-03-10 10:09:51 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm	2012-06-07 14:16:27 +0000
@@ -13,9 +13,9 @@
             #end
             $document.name</a>
         </td>
-        <td style="width:16px">
+        <td style="width:10px">
             <a href="javascript:window.location.href='removeDocument.action?id=$document.id'" title="$i18n.getString( 'remove' )">
-            <img src="../images/close.png" alt="$i18n.getString( 'remove' )"></a>
+            <img class="removeIcon" src="../images/hide.png" alt="$i18n.getString( 'remove' )"></a>
         </td>
     </tr>
     #end

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm	2012-03-27 09:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm	2012-06-07 14:16:27 +0000
@@ -8,9 +8,9 @@
         <td>
             <a href="javascript:window.location.href='../dhis-web-mapping/mapping/index.html?id=${view.uid}'">$encoder.htmlEncode( $view.name )</a>
         </td>
-        <td style="width:16px">
+        <td style="width:10px">
             <a href="javascript:window.location.href='removeMapView.action?id=$view.id'" title="$i18n.getString( 'remove' )">
-            <img src="../images/close.png" alt="$i18n.getString( 'remove' )"></a>
+            <img class="removeIcon" src="../images/hide.png" alt="$i18n.getString( 'remove' )"></a>
         </td>
     </tr>
     #end

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm	2012-05-07 08:46:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm	2012-06-07 14:16:27 +0000
@@ -8,9 +8,9 @@
     	<td>
     		<a href="../dhis-web-reporting/getReportParams.action?uid=${report.uid}&mode=report">$encoder.htmlEncode( $report.name )</a>
     	</td>
-    	<td style="width:16px">
+    	<td style="width:10px">
     		<a href="javascript:window.location.href='removeReport.action?id=$report.id'" title="$i18n.getString( 'remove' )">
-    		<img src="../images/close.png" alt="$i18n.getString( 'remove' )"></a>
+    		<img class="removeIcon" src="../images/hide.png" alt="$i18n.getString( 'remove' )"></a>
     	</td>
     </tr>
     #end

=== 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	2012-05-07 08:46:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm	2012-06-07 14:16:27 +0000
@@ -8,9 +8,9 @@
         <td>
             <a href="../dhis-web-reporting/getReportParams.action?uid=${table.uid}&mode=table">$table.name</a>
         </td>       
-        <td style="width:16px">
+        <td style="width:10px">
             <a href="javascript:window.location.href='removeReportTable.action?id=$table.id'" title="$i18n.getString( 'remove' )">
-            <img src="../images/close.png" alt="$i18n.getString( 'remove' )"></a>
+            <img class="removeIcon" src="../images/hide.png" alt="$i18n.getString( 'remove' )"></a>
         </td>
     </tr>
     #end

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-06-05 21:31:46 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-06-07 14:16:27 +0000
@@ -21,6 +21,11 @@
   top: 38px;
 }
 
+.removeIcon
+{
+   padding:3px 3px 2px 3px;
+}
+
 .linkArea
 {
   border:1px solid #d0d0d0;