dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5968
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-02-15 18:26:35 +0100
message:
  Messages minor fixed
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-02-15 17:10:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2012-02-15 17:26:35 +0000
@@ -321,7 +321,6 @@
 
         executeSql( "ALTER TABLE messageconversation DROP COLUMN messageconversationkey" );
         executeSql( "UPDATE messageconversation SET lastmessage=lastupdated WHERE lastmessage is null" );
-        executeSql( "ALTER TABLE messageconversation DROP COLUMN lastupdated" );
         executeSql( "ALTER TABLE message DROP COLUMN messagesubject" );
         executeSql( "ALTER TABLE message DROP COLUMN messagekey" );
         executeSql( "ALTER TABLE message DROP COLUMN sentdate" );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml	2012-02-15 17:10:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml	2012-02-15 17:26:35 +0000
@@ -13,6 +13,7 @@
     </id>
 	
     <property name="uid" column="uid" length="11" />
+	<property name="lastUpdated" type="timestamp"/>
 
     <property name="subject" column="subject" not-null="true" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png	2009-12-23 14:20:19 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked.png	2012-02-15 17:26:35 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png	2009-12-23 07:35:17 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/unmarked_large.png	2012-02-15 17:26:35 +0000 differ
=== 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	2012-02-15 17:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2012-02-15 17:26:35 +0000
@@ -20,7 +20,7 @@
 	</tr>
 	#foreach( $conversation in $conversations )
 	<tr id="tr${conversation.id}" #if( !$conversation.read )class="unread bold"#end>
-		<td style="width:40px" onclick="toggleFollowUp( '${conversation.id}' )">
+		<td style="width:40px;padding-left:5px;" onclick="toggleFollowUp( '${conversation.id}' )">
 			<img id="followUp${conversation.id}" #if( $conversation.followUp ) src="../images/marked.png"#else src="../images/unmarked.png"#end></td>		
 		<td style="width:200px" onclick="read( '${conversation.id}' )">$!encoder.htmlEncode( $conversation.lastSenderName )</td>
 		<td onclick="read( '${conversation.id}' )">$!encoder.htmlEncode( $conversation.subject )</td>