incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r937180 - in /incubator/esme/trunk/server/src/main: resources/ scala/org/apache/esme/model/ scala/org/apache/esme/snippet/ webapp/info_view/ webapp/pools_view/ webapp/scripts/ webapp/style/ webapp/templates-hidden/
Date Fri, 23 Apr 2010 08:01:04 GMT
Author: rhirsch
Date: Fri Apr 23 08:01:03 2010
New Revision: 937180

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

Added:
    incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_tag.js
Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala
    incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
    incubator/esme/trunk/server/src/main/webapp/info_view/user.html
    incubator/esme/trunk/server/src/main/webapp/pools_view/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/style/style.css
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html

Modified: incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEBase.properties?rev=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Fri Apr 23 08:01:03
2010
@@ -19,6 +19,7 @@
  
  base_nav_list_users=List all users
 base_signup_submit=Let me in
+base_user_thats_you=That's you!
 
 base_error_not_logged_in=Please logon to use this functionality
 base_error_general=An error has occurred. Please contact your ESME administrator

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Fri Apr
23 08:01:03 2010
@@ -390,7 +390,7 @@ class Message extends LongKeyedMapper[Me
         case e: Elem if e.label == "url" =>
           e.attribute("url").flatMap(url =>
             e.attribute("uniqueId").map(id =>
-              <xml:group> <a href={"/u/"+id}>{url}</a> </xml:group>)).
+              <xml:group> <a href={"/u/"+id} target="_blank">{url}</a>
</xml:group>)).
           getOrElse(Text("") )
 
         case e: Elem if e.label == "em" =>

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala?rev=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala Fri
Apr 23 08:01:03 2010
@@ -47,8 +47,6 @@ object TagDisplay {
    
     def updateFollow: JsCmd = SetHtml("following", followOrNot)
 
-
-
     def followOrNot: NodeSeq = {
       User.currentUser match {
         case Full(u) if u != user =>
@@ -56,17 +54,17 @@ object TagDisplay {
           ajaxButton(S.?("base_ui_unfollow"), () => {u.unfollow(user); updateFollow})
           else ajaxButton(S.?("base_ui_follow"), () => {u.follow(user); updateFollow})
 
-        case _ => NodeSeq.Empty
+        case _ => <xml:group> <div class="thatsyou">{S.?("base_user_thats_you")}</div></xml:group>

       }
     }
 
+
     bind("user", in,
          "nicename" -> user.niceName,
+         "nicename" -> user.niceName,
          "followButton" -> followOrNot,
          "timeline" -> bindTag(Mailbox.mostRecentMessagesFor(user.id, 50).map(_._1)) _,
-         "messages" -> bindTag(Message.findAll(In(Message.id, Mailbox.message, By(Mailbox.user,
user)),
-                                               MaxRows(50),
-                                               OrderBy(Message.id, Descending))) _,
+         "messages" -> bindTag(Message.findAll(By(Message.author, user), OrderBy(Message.id,
Descending), MaxRows(50))) _,
          AttrBindParam("userId", Text(user.id.toString),"userId")
     )
   

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/tag.html?rev=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/tag.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/tag.html Fri Apr 23 08:01:03 2010
@@ -17,12 +17,11 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-    <script type="text/javascript" src="../scripts/esme_table_sorter.js">
-    </script>
+    <script type="text/javascript" src="../scripts/esme_table_sorter_tag.js"></script>
     <lift:TableSorterSnip/>
     <lift:tag_display>
 <div id="back-header">
-	<h1><lift:loc>ui_tag_title</lift:loc> '<tag:name/>'</h1>
+	<h1><lift:loc>ui_tag_title</lift:loc><i> '<tag:name/>'</i></h1>
 <div class="container-settings">
 
               <table id="esme-table" class="tablesorter">

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/user.html?rev=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/user.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/user.html Fri Apr 23 08:01:03 2010
@@ -33,7 +33,7 @@
 <div id="back-header">
        <lift:user_info>
 	<h1><lift:loc>ui_user_single_title</lift:loc> <i>'<user:nicename/>'</i></h1>
-	<div class="container-settings">
+	<div class="container-aux">
         <span id="following"><user:followButton/></span>
             <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
                 <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header
ui-corner-all">
@@ -66,11 +66,11 @@
                                 </thead>
                                 <tbody>
                                     <user:timeline>
-                                        <tr>
+                                        <tr class="user_row">
                                             <td>
                                                 <item:author/>
                                             </td>
-                                            <td>
+                                            <td class ="user_message">
                                                 <item:body/>
                                             </td>
                                             <td>
@@ -99,8 +99,8 @@
                                 </thead>
                                 <tbody>
                                 <user:messages>
-                                    <tr>
-                                        <td>
+                                    <tr class="user_row">
+                                        <td class ="user_message">
                                             <item:body/>
                                         </td>
                                         <td>

Modified: incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/pools_view/index.html?rev=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/pools_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/pools_view/index.html Fri Apr 23 08:01:03
2010
@@ -48,7 +48,6 @@
 								<pool:name/>
 							</i>
 						</legend>
-						<br/>
 						<table class="tablesorter">
 							<thead>
 								<tr>
@@ -83,21 +82,16 @@
 								</tr>
 							</tbody>
 						</table>
-						<br/>
 					</fieldset>
-					<br/>
 				</lift:poolDetail>
 			</span>
 			<span id="PoolSpan">
+			     
 				<lift:ignore>
-					<!--                        The poolUsers snippet *MUST* appear on the page before
                       the editPool snippet                        -->
-					</lift:ignore>
+					<!--  The poolUsers snippet *MUST* appear on the page before the editPool snippet
                       -->
+				</lift:ignore>
 				<lift:poolUsers the_id="PoolSpan">
-					<fieldset>
-						<legend>
 							<b><lift:loc>ui_pool_list_users</lift:loc></b>
-						</legend>
-						<br/>
 						<table id="esme-table" class="tablesorter">
 							<thead>
 								<tr>
@@ -122,9 +116,6 @@
 								</pool:user>
 							</tbody>
 						</table>
-						<br/>
-					</fieldset>
-					<br/>
 					<div class="post-form-row">
 						<div class="submit-btn tipelement" title="Add a user to an existing pool." >
 							<input type="image" onclick="javascript:$('#dialog-form-user').dialog('open')"
id="create-user" src="../images/add1.gif"/>
@@ -132,14 +123,14 @@
 					</div>
 				</lift:poolUsers>
 			</span>
-			<fieldset>
+			<div class="pool_select">
 				<lift:form>
 					<lift:editPool class="inputBox2" >
 						<lift:loc>ui_pool_edit_label</lift:loc>
 						<edit:pool class="tipelement" title="Select a pool to edit"/>
 					</lift:editPool>
 				</lift:form>
-			</fieldset>
+			</div>
 			<div id="dialog-form" title="Create new  pool" style="display: none">
 				<p class="validateTips">
 					<lift:loc>ui_form_all_fields_required</lift:loc>

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=937180&r1=937179&r2=937180&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 Fri Apr 23 08:01:03
2010
@@ -73,6 +73,7 @@ function displayMessages(msgArray, eleme
       var msgConversation = cometMsg.conversation;
       var msgReason = ""
       for (r in cometReason) {
+      	msgSource = ""
         if (r == "resent_from")
           msgReason = "resent by " + cometReason[r].nickname;
         else

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=937180&r1=937179&r2=937180&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 Fri Apr
23 08:01:03 2010
@@ -84,10 +84,11 @@ function displayMessages(msgArray, eleme
       var msgConversation = cometMsg.conversation;
       var msgReason = ""
       for (r in cometReason) {
-        if (r == "resent_from")
-          msgReason = "resent by " + cometReason[r].nickname;
-        else
-          msgReason = "caused by " + r;
+      	  msgSource = ""
+          if (r == "resent_from")
+             msgReason = "resent by " + cometReason[r].nickname;
+          else
+            msgReason = "caused by " + r;
         break
       }
       

Added: incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_tag.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_tag.js?rev=937180&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_tag.js (added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter_tag.js Fri Apr 23
08:01:03 2010
@@ -0,0 +1,26 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one   *
+ or more contributor license agreements.  See the NOTICE file *
+ distributed with this work for additional information        *
+ regarding copyright ownership.  The ASF licenses this file   *
+ to you under the Apache License, Version 2.0 (the            *
+ "License"); you may not use this file except in compliance   *
+ with the License.  You may obtain a copy of the License at   *
+                                                              *
+   http://www.apache.org/licenses/LICENSE-2.0                 *
+                                                              *
+ Unless required by applicable law or agreed to in writing,   *
+ software distributed under the License is distributed on an  *
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ KIND, either express or implied.  See the License for the    *
+ specific language governing permissions and limitations      *
+ under the License.                                           *
+*/
+
+$(document).ready(function() 
+    { 
+      $("#esme-table").tablesorter({ headers: { 1: { sorter: false} } }); 
+    } 
+); 
+   
+

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=937180&r1=937179&r2=937180&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/style.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/style.css Fri Apr 23 08:01:03 2010
@@ -59,7 +59,11 @@ input[type=text]:focus, input[type=passw
   background-color: #FCFAE0 !important;
 }
 
-.aura-add-site li.focus, tr.esme-tr.highlight.focus, tr.esme-tr.focus {background:#fcfae0;}
+.thatsyou {
+	font-weight:bold;
+	color:#114e93;
+}
+
 
 /* HEADER
 *******************************************************************************/
@@ -368,6 +372,12 @@ ul.main-links  {
 *******************************************************************************/
 #content { margin:0 auto; display:block; width: 851px; padding:20px 10px 0px 10px; }
 
+.tr_hover {
+	background-color:#CCCCCC;
+	color:red; 
+}
+
+
 /* UPDATES
 *******************************************************************************/
 #back-header {
@@ -519,7 +529,6 @@ ul#toc li.current a {
 .container-aux {
 	float:left; 
 	width: 563px; 
-	height:400px; 
 	padding:20px 30px; 
 	background: url(../images/bg-tabs.png) no-repeat; 
 	margin-bottom:20px; 
@@ -589,7 +598,7 @@ img, img a {border:0px; }
 ******************************************************************************/
 
 .esme_message_bar {
-background:#fff;
+background:#07376d;
 color:#7B4104;
 display:block;
 font-family:Arial;
@@ -605,7 +614,3 @@ width:100%;
 z-index:10000;
 }
 
-/*
-.container-update, .container-tabs, .container-settings {behavior: url("src/iepngfix.htc");}
-*/epngfix.htc");}
-*/
\ No newline at end of file

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=937180&r1=937179&r2=937180&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 Fri Apr 23 08:01:03
2010
@@ -113,11 +113,13 @@
 					<a href="#"  id="resend">
 						<lift:loc>ui_messages_message_label_resend</lift:loc>
 					</a>
-					| <a href="#" id="reply">
+					<span id="resend">| </span>
+					 <a href="#" id="reply">
 						<lift:loc>ui_messages_message_label_reply</lift:loc>
 					</a>
+					<span id="conversation">| </span>
 					<a id="conversation">
-						|  <lift:loc>ui_messages_message_label_conversation</lift:loc>
+					<lift:loc>ui_messages_message_label_conversation</lift:loc>
 					</a>
 				</div>
 				<div class="separator">                    </div>



Mime
View raw message