incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r993066 - in /incubator/esme/trunk/server/src/main/webapp: index.html scripts/display_single_message.js style/style.css
Date Mon, 06 Sep 2010 15:10:54 GMT
Author: rhirsch
Date: Mon Sep  6 15:10:53 2010
New Revision: 993066

URL: http://svn.apache.org/viewvc?rev=993066&view=rev
Log:
[ESME-265] Generic Task to prepare for 1.1 release
Fixing UI problem on first screen with layout

Modified:
    incubator/esme/trunk/server/src/main/webapp/index.html
    incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
    incubator/esme/trunk/server/src/main/webapp/style/style.css

Modified: incubator/esme/trunk/server/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/index.html?rev=993066&r1=993065&r2=993066&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/index.html Mon Sep  6 15:10:53 2010
@@ -56,20 +56,19 @@
 
 			<lift:comet type="SinglePublicTimeline"/>
 			<!--updates-box -->
-			<div class="gray-box">
 			<h1><lift:loc>ui_default_on_esme</lift:loc></h1>
-			<div class = "mesg-box">
-			   <div id="timeline_messages">
-				<div id="message">
-							
-				 <div class="avatar"> <img id="avatar" src="/images/avatar.jpg" alt="Anonymous"
width="50px"/></div>
-				   <div class="update"> <div id="body">-</div>
-				   <div class="info"><a id="author">-</a><div class="time"></div></div>
-				 </div>	
-				 <div class="time"> <div id="supp_data"> -</div> </div>	
-				</div>
-				</div>
-			</div>
+			<div id="timeline_messages" class="gray-box">
+			    <div class="updates-box" id="message" style ="">
+			            <div class="avatar">
+			                <img id="avatar" width="40px" />
+			            </div>
+			            <!--end avatar-->
+			            <div class="info2">
+			                <a href="" id="author" />
+			                <div id="msgbody" />
+			                <div class="supp_data_class" id="supp_data" />
+			            </div>
+			        </div>
 			</div><!--gray-box-->
 		</lift:surround>
 	</logged:out>

Modified: incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js?rev=993066&r1=993065&r2=993066&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js (original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js Mon Sep
 6 15:10:53 2010
@@ -114,11 +114,12 @@ function displayMessages(msgArray, eleme
       .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
 
 
-      newMsg.find('#body').html(msgBody);
-      newMsg.find('#supp_data').text(msgPool + " " + msgDateStr  + " " +  msgReason  + "
" +   msgSource);
-      //newMsg.find('#source').text(msgSource);
-      //newMsg.find('#reason').text(msgReason);
-      //newMsg.find('#when').text(msgDateStr);
+      newMsg.find('#msgbody').html(msgBody);
+      if (msgReason)
+         newMsg.find('#supp_data').text(msgPool + " " + msgDateStr  + " " +  msgReason );
+      else {
+      	 newMsg.find('#supp_data').text(msgPool + " " + msgDateStr  + " via "  +   msgSource);
+      }
       var id = cometMsg.id;
       var resendButton = newMsg.find('#resend');
       if (cometResent) {

Modified: incubator/esme/trunk/server/src/main/webapp/style/style.css
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/style/style.css?rev=993066&r1=993065&r2=993066&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/style.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/style.css Mon Sep  6 15:10:53 2010
@@ -420,7 +420,7 @@ ul.main-links  {
 .gray-box {
 	float:left;
 	background:#f9f9f9;
-	padding:20px;
+
 }
 
 .updates-box {
@@ -681,3 +681,4 @@ top: 100px
 }
 
 
+



Mime
View raw message