dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7084
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-05-29 21:30:37 +0200
message:
  Impl auto grow for message reply area
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js
  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/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/interpretation.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm	2012-05-29 19:08:34 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm	2012-05-29 19:30:37 +0000
@@ -44,7 +44,7 @@
 #end
 </div>
 
-<div id="userInfo" class="page"></div>
+<div id="userInfo" class="page" style="display:none"></div>
 
 <script type="text/javascript">
 var currentUser = {

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js	2012-05-29 19:08:34 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js	2012-05-29 19:30:37 +0000
@@ -5,12 +5,13 @@
 
 function showUserInfo( id )
 {
-	$( "#userInfo" ).load( "../dhis-web-commons-ajax-html/getUser.action?id=" + id );
-	$( "#userInfo" ).dialog( {
-		modal : true,
-		width : 350,
-		height : 350,
-		title : "User"
+	$( "#userInfo" ).load( "../dhis-web-commons-ajax-html/getUser.action?id=" + id, function() {
+		$( "#userInfo" ).dialog( {
+			modal : true,
+			width : 350,
+			height : 350,
+			title : "User"
+		} );
 	} );
 }
 

=== 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	2012-05-29 12:04:07 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2012-05-29 19:30:37 +0000
@@ -1,4 +1,8 @@
 <script type="text/javascript">
+$( document ).ready( function() {
+	$( '#text' ).autogrow();
+} );
+	
 var i18n_sender = '$encoder.jsEscape( $i18n.getString( "sender" ), "'")';
 var i18n_enter_text = '$encoder.jsEscape( $i18n.getString( "enter_text" ), "'")';
 var i18n_sending_message = '$encoder.jsEscape( $i18n.getString( "sending_message" ), "'")';
@@ -62,7 +66,7 @@
 #end
 
 <div>
-<textarea id="text" name="text" style="width:495px;height:125px"></textarea><br>
+<textarea id="text" name="text" class="replyArea"></textarea><br>
 <input type="button" id="replyButton" value="$i18n.getString( 'reply' )" onclick="sendReply()" style="width:120px">
 </div>
 

=== 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-05-29 19:08:34 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-05-29 19:30:37 +0000
@@ -99,6 +99,16 @@
   padding-bottom:15px;
 }
 
+.replyArea
+{
+  width:495px;
+  height:80px;
+  border: 1px solid #ccc;
+  resize: none;
+  overflow: auto;
+  padding: 4px 0px 0px 6px;
+}
+
 .page a
 {
   text-decoration:none;