incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r926962 - in /incubator/esme/trunk/server/src/main/webapp: index.html scripts/display_messages.js scripts/display_single_message.js templates-hidden/message.html
Date Wed, 24 Mar 2010 07:38:34 GMT
Author: rhirsch
Date: Wed Mar 24 07:38:34 2010
New Revision: 926962

URL: http://svn.apache.org/viewvc?rev=926962&view=rev
Log:
[ESME-100] Finish web UI
Daily hour / IE

Modified:
    incubator/esme/trunk/server/src/main/webapp/index.html
    incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
    incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html

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=926962&r1=926961&r2=926962&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/index.html Wed Mar 24 07:38:34 2010
@@ -20,6 +20,7 @@
 <lift:UserSnip.loggedIn>
 	<logged:in>
 		<lift:surround with="message" at="content"/>
+		<div id="messages"></div>
 		<lift:Msgs>
 			<lift:error_msg>Error:</lift:error_msg>
 			<lift:notice_msg>FYI:</lift:notice_msg>
@@ -32,69 +33,46 @@
 	</logged:in>
 	<logged:out>
 		<lift:surround with="default" at="content">
+			<head>
+			<script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
+			<script id="json" src="/classpath/json.js" type="text/javascript"/>
+			<script src="/scripts/display_single_message.js" type="text/javascript"/>
+			<script src="/scripts/pretty.js" type="text/javascript"/>
+			<link rel="stylesheet" href="../style/style.css" type="text/css" media="screen" />
+			</head>
 			<!---BLUE HEADER-->
 			<div id="container-2nd-level-bg">
-				<div width="623px" id="container-2nd-level">
+				<div id="container-2nd-level">
 					<h1>
 						<span>
 							<lift:loc>custom_opening_main_title</lift:loc>
 						</span>
 					</h1>
-					<p>
-						<lift:loc>custom_opening_main_body</lift:loc>
-					</p>
+					<lift:loc>custom_opening_main_body</lift:loc>
 				</div>
 				<!--container-2nd-level-->
-				<link rel="stylesheet" href="../style/style.css" type="text/css" media="screen" />
+				
 			</div>
 			<!--container-2nd-level-bg-->
 			<!--END BLUE HEADER-->
-			<script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
-			<script id="json" src="/classpath/json.js" type="text/javascript"/>
-			<script src="/scripts/display_single_message.js" type="text/javascript"/>
-			<script src="/scripts/pretty.js" type="text/javascript"/>
+
 			<lift:comet type="SinglePublicTimeline"/>
 			<!--updates-box -->
-			<lift:comet type="SinglePublicTimeline"/>
-			<div class="separator">                    </div>
+			<div class="gray-box">
+			<h1>Now on ESME</h1>
 			<table>
-				<tbody id="timeline_messages">
-					<tr id="message">
-						<div id="timeline_messages">
-							<div class="updates-box">
-								<div class="avatar">
-									<img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
-								</div>
-								<div class="update2">
-									<div class="info2" >
-										<a href="" id="author">-</a>
-									</div>
-									<div id="body">-</div>
-									<div class="time">
-										<table>
-											<tr>
-												<td>
-													<div id="pool"> -</div>
-												</td>
-												<td>   </td>
-												<td>
-													<div id="when"> -</div>
-												</td>
-												<td>
-													<div id="reason"> -</div>
-												</td>
-												<td>
-													<div id="source"> -</div>
-												</td>
-											</tr>
-										</table>
-									</div>
-								</div>
-							</div>
-						</div>
-					</tr>
+			   <tbody id="timeline_messages">
+				<tr 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 href="" id="author">-</a><div class="time"></div></div>
+				 </div>	
+				 <div class="time"> <div id="supp_data"> -</div> </div>	
+				</tr>
 				</tbody>
 			</table>
+			</div><!--gray-box-->
 		</lift:surround>
 	</logged:out>
-</lift:UserSnip.loggedIn>
\ No newline at end of file
+</lift:UserSnip.loggedIn>

Modified: incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js?rev=926962&r1=926961&r2=926962&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js (original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js Wed Mar 24 07:38:34
2010
@@ -96,10 +96,10 @@ function displayMessages(msgArray, eleme
       .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
 
       newMsg.find('#body').html(msgBody);
-      newMsg.find('#pool').text(msgPool);
-      newMsg.find('#source').text(msgSource);
-      newMsg.find('#reason').text(msgReason);
-      newMsg.find('#when').text(msgDateStr);
+      newMsg.find('#supp_data').text(msgPool + " " + msgDateStr  + " " +  msgReason  + "
" +   msgSource);
+      //newMsg.find('#source').text(msgSource);
+      //newMsg.find('#reason').text(msgReason);
+      //newMsg.find('#when').text(msgDateStr);
       var id = cometMsg.id;
       var resendButton = newMsg.find('#resend');
       if (cometResent) {

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=926962&r1=926961&r2=926962&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 Wed Mar
24 07:38:34 2010
@@ -103,11 +103,12 @@ function displayMessages(msgArray, eleme
       .attr('src', msgAuthor.imageurl)
       .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
 
+
       newMsg.find('#body').html(msgBody);
-      newMsg.find('#pool').text(msgPool);
-      newMsg.find('#source').text(msgSource);
-      newMsg.find('#reason').text(msgReason);
-      newMsg.find('#when').text(msgDateStr);
+      newMsg.find('#supp_data').text(msgPool + " " + msgDateStr  + " " +  msgReason  + "
" +   msgSource);
+      //newMsg.find('#source').text(msgSource);
+      //newMsg.find('#reason').text(msgReason);
+      //newMsg.find('#when').text(msgDateStr);
       var id = cometMsg.id;
       var resendButton = newMsg.find('#resend');
       if (cometResent) {
@@ -129,6 +130,7 @@ function displayMessages(msgArray, eleme
 
       // Remove any old tags from the template
       newMsg.find('*[id=tag]').remove();
+      
 
       // Insert the updated copy of the message into the page
       newMsg.prependTo(msgInsertPt).show();

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=926962&r1=926961&r2=926962&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Wed Mar 24 07:38:34
2010
@@ -89,37 +89,14 @@
 		<lift:comet type="Timeline"/>
 		<table>
 			<tbody id="personal_timeline_messages">
-				<tr id="message">
-					<div id="personal_timeline_messages">
-						<div class="updates-box">
-							<div class="avatar">
-								<img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
-							</div>
-							<div class="update2">
-								<div class="info2" >
-									<a href="" id="author">-</a>
-								</div>
-								<div id="body">-</div>
-								<div class="time">
-									<table>
-										<tr>
-											<td>
-												<div id="pool"> -</div>
-											</td>
-											<td>   </td>
-											<td>
-												<div id="when"> -</div>
-											</td>
-											<td>
-												<div id="reason"> -</div>
-											</td>
-											<td>
-												<div id="source"> -</div>
-											</td>
-										</tr>
-									</table>
-								</div>
-								<div class="actions">
+			<tr 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 href="" id="author">-</a><div class="time"><div
id="supp_data"> -</div></div></div>
+				 </div>	
+				 <div class="time">  </div>	
+									<div class="actions">
 									<a href="#"  id="resend">
 										<lift:loc>ui_messages_message_label_resend</lift:loc>
 									</a>
@@ -129,12 +106,12 @@
 									<a id="conversation">
 										|  <lift:loc>ui_messages_message_label_conversation</lift:loc>
 									</a>
-								</div>
-							</div>
-						</div>
-					</div>
+								</div>		
 				<div class="separator">                    </div>
 				</tr>
+			
+			
+				
 			</tbody>
 		</table>
 	</div>



Mime
View raw message