← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1617: Work in progress on chart feedback bug

 

------------------------------------------------------------
revno: 1617
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-11 11:41:22 +0100
message:
  Work in progress on chart feedback bug
modified:
  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/util/commons.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2010-02-27 19:45:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2010-03-11 10:41:22 +0000
@@ -283,6 +283,32 @@
   padding: 0.5em;
 }
 
+div#headerMessageContainer
+{
+  top: 0px;
+  width: 100%;
+  height: 26px;
+  z-index: 20;
+}
+
+div#headerMessage
+{
+  display: none;
+  height: 26px;
+  width: 560px;
+  margin-left: auto;
+  margin-right: auto;
+  background-color: #ffffbf;
+  border-right: 1px solid #cccc00;
+  border-bottom: 1px solid #cccc00;
+  border-left: 1px solid #cccc00;
+  z-index: 21;
+  font-size: 9pt;
+  text-align: center;
+  vertical-align: center;
+  line-height: 25px;
+}
+
 /*----------------------------------------------------------------------------*/
 /* The main calendar widget. Div containing a table.                          */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-02-27 20:22:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-03-11 10:41:22 +0000
@@ -392,6 +392,17 @@
 	$( '#message' ).slideUp( 'fast' );
 }
 
+function setHeaderMessage( message )
+{
+    $( 'div#headerMessage' ).html( message );
+    $( 'div#headerMessage' ).slideDown( 'slow' );
+}
+
+function hideHeaderMessage()
+{
+    $( 'div#headerMessage' ).slideUp( 'slow' );
+}   
+
 function setInfo( message )
 {
     $( '#info' ).html( message );

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2010-03-08 09:25:52 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2010-03-11 10:41:22 +0000
@@ -109,6 +109,10 @@
       </div>      
     </div>
         
+    <div id="headerMessageContainer">
+      <div id="headerMessage"></div>
+    </div>        
+        
     <div class="page" id="mainPage">
       #if( !$page )
         <p>$i18n.getString( "no_page_specified" )</p>