← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10718: Using header message for feedback in report generation

 

------------------------------------------------------------
revno: 10718
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-30 11:09:08 +0200
message:
  Using header message for feedback in report generation
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js


--
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/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-04-30 07:32:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2013-04-30 09:09:08 +0000
@@ -328,7 +328,7 @@
   left: 155px;
   position: fixed;
   display: none;
-  height: 29px;
+  height: 31px;
   width: 410px;
   background-color: #f9edbe;
   border: 1px solid #dbae56;
@@ -336,7 +336,7 @@
   font-size: 9pt;
   text-align: center;
   vertical-align: center;
-  line-height: 30px;
+  line-height: 32px;
   border-radius: 3px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2013-01-25 15:24:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2013-04-30 09:09:08 +0000
@@ -81,5 +81,3 @@
         </td>
     </tr>
 </table>
-
-<span id="message"></span>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js	2013-01-25 15:24:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/generateReport.js	2013-04-30 09:09:08 +0000
@@ -11,7 +11,7 @@
 {
     if ( $( "#selectionTree" ).length && !selectionTreeSelection.isSelected() )
     {
-        setMessage( i18n_please_select_unit );
+        setHeaderDelayMessage( i18n_please_select_unit );
         return true;
     }
 
@@ -35,7 +35,7 @@
     var mode = $( "#mode" ).val();
     var type = $( "#type" ).val();
 
-    setMessage( i18n_process_completed );
+    setHeaderMessage( i18n_process_completed );
 
     if ( MODE_REPORT == mode )
     {