dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3278
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-04-04 19:12:01 +0200
message:
  Used oust template for send message ui
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/message.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.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/oust/oust.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js	2011-04-04 16:47:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js	2011-04-04 17:12:01 +0000
@@ -277,7 +277,7 @@
 			if ( typeof ( window.addSelectedOrganisationUnit__ ) == 'function' )
 			{ 
 				addSelectedOrganisationUnit__( childId );// This code is bad and must be removed
-			} 
+			}
         }
 
         var childTag = document.createElement( 'li' );

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-03-12 10:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-04 17:12:01 +0000
@@ -386,7 +386,7 @@
 unselect_in_group	= Un-select in group
 select_children     = Select children
 unselect_children   = Un-select children
-organisation_unit_selection_tree  =  Organisation Unit Tree Selection
+organisation_unit_selection_tree  =  Organisation Unit Selection
 
 move_selected       = Move selected
 remove_selected     = Remove selected

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2011-04-01 19:47:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2011-04-04 17:12:01 +0000
@@ -23,7 +23,8 @@
 new_message = New message
 create_new_message = Create new message
 details = Details
-recipient = Recipient
+recipients = Recipients
 mark_unread = Mark as unread
 operations = Operations
-read = Read
\ No newline at end of file
+read = Read
+confirm_delete_message = Are you sure you want to delete the message? 
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/message.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/message.js	2011-04-01 19:47:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/message.js	2011-04-04 17:12:01 +0000
@@ -1,9 +1,5 @@
 
-function organisationUnitSelected( units )
-{
-}
-
 function removeMessage( id )
 {
-    removeItem( id, "", "Are you sure you want to delete this message?", "removeMessage.action" );
+    removeItem( id, "", i18n_confirm_delete_message, "removeMessage.action" );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2011-04-04 11:37:04 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2011-04-04 17:12:01 +0000
@@ -1,3 +1,6 @@
+<script type="text/javascript">
+	var i18n_confirm_delete_message = '$encoder.jsEscape( $i18n.getString( "confirm_delete_message" ) , "'" )';
+</script>
 
 <h3>$i18n.getString( "messages" )</h3>
 

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-04-04 11:37:04 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-04-04 17:12:01 +0000
@@ -1,7 +1,7 @@
 
 <h3>$encoder.htmlEncode( $message.message.subject )</h3>
 
-<div class="messageDiv"><span style="font-weight:bold;">$encoder.htmlEncode( $message.message.sender.name )</span>
+<div class="messageDiv"><span style="font-weight:bold;">$encoder.htmlEncode( $message.message.sender.name )</span>&nbsp;
 <span style="color:#606060">$format.formatDate( $message.messageDate )</span></div>
 
 <div style="margin-bottom:20px; width:50%;">$encoder.htmlEncode( $message.message.text )</div>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm	2011-04-01 15:44:51 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm	2011-04-04 17:12:01 +0000
@@ -6,30 +6,20 @@
 <table>
 
 <tr>
-<th colspan="2">$i18n.getString( "details" )</th>
-</tr>
-
-<tr>
-<td style="min-width:80px">$i18n.getString( "recipient" )</td>
+<td style="min-width:80px">$i18n.getString( "recipients" )</td>
 <td>
-<div id="selectionTree" style="width:350px; height:180px"></div>	            
-<script type="text/javascript">
-  selectionTreeSelection.setMultipleSelectionAllowed( true );
-  selectionTreeSelection.setListenerFunction( organisationUnitSelected );
-  selectionTree.clearSelectedOrganisationUnits();
-  selectionTree.buildSelectionTree();
-</script>
+#organisationUnitSelectionTree( true true true )
 </td>
 </tr>
 
 <tr>
 <td>$i18n.getString( "subject" )</td>
-<td><input type="text" name="subject" style="width:350px"></td>
+<td><input type="text" name="subject" style="width:495px"></td>
 </tr>
 
 <tr>
 <td>$i18n.getString( "text" )</td>
-<td><textarea name="text" style="width:350px;height:200px"></textarea></td>
+<td><textarea name="text" style="width:495px;height:200px"></textarea></td>
 </tr>
 
 <tr>

=== 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	2011-04-04 11:37:04 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2011-04-04 17:12:01 +0000
@@ -96,3 +96,8 @@
 {
   color:#3567cd;
 }
+
+div#selectionTree 
+{
+  height:200px;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm	2011-03-16 16:52:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm	2011-04-04 17:12:01 +0000
@@ -12,7 +12,7 @@
 <table>
 	<tr>
 		<td>
-			#organisationUnitSelectionTree( true, true, true )			
+			#organisationUnitSelectionTree( true true true )
 		</td>
 	</tr>
 </table>