incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r935471 - in /incubator/esme/trunk/server/src/main: scala/bootstrap/liftweb/ scala/org/apache/esme/lib/ webapp/info_view/ webapp/pools_view/ webapp/scripts/ webapp/style/
Date Mon, 19 Apr 2010 08:22:14 GMT
Author: rhirsch
Date: Mon Apr 19 08:22:13 2010
New Revision: 935471

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

Modified:
    incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
    incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
    incubator/esme/trunk/server/src/main/webapp/info_view/public.html
    incubator/esme/trunk/server/src/main/webapp/info_view/streams.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/style/style.css

Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Mon Apr 19 08:22:13
2010
@@ -119,7 +119,7 @@ class Boot {
     LiftRules.dispatch.append(UrlStore.redirectizer)
 
 
-    LiftRules.siteMapFailRedirectLocation = List("index", "Home")
+    LiftRules.siteMapFailRedirectLocation = List("index")
 
     UserAuth.register(UserPwdAuthModule)
     UserAuth.register(OpenIDAuthModule)

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala?rev=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala Mon
Apr 19 08:22:13 2010
@@ -64,7 +64,7 @@ object ConversationMgr {
     Script(
       OnLoad(JsCrVar(jsId, JsArray(
           msgs.map(m => JsObj(("message", m.asJs)) ) :_*)) &
-      JsFunc("displayMessages", JsVar(jsId), jsId).cmd)
+      JsFunc(" displayMessages", JsVar(jsId), jsId).cmd)
     )
 
   }

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala Mon Apr
19 08:22:13 2010
@@ -71,7 +71,6 @@ object StreamMgr {
     val spanName = S.attr("the_id") openOr "StreamSpan"
     // get the current user
     val user = User.currentUser
-    println("displayStream"); 
 
     // bind the dynamic content to the incoming nodeseq
     def doRender(): NodeSeq = {

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html?rev=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html Mon Apr 19 08:22:13
2010
@@ -19,13 +19,17 @@
 <lift:surround with="base" at="left">
     <lift:Style.header/><lift:TableSorterSnip/>
     <link rel="stylesheet" type="text/css" href="../style/style.css" />
-    <script src="/scripts/display_messages.js" type="text/javascript"></script>
-        <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
+<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_messages.js" type="text/javascript"/> 
+        <script src="/scripts/pretty.js" type="text/javascript"/> 
+</head>
 
 <div id="back-header">
 	<h1><lift:loc>ui_default_conversation</lift:loc></h1>
 	<div class="container-settings">
-        <div class="b-list">
+        <div>
             <lift:displayConversation/>
 	    <lift:embed what="templates-hidden/message_core"/>
         </div>

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/public.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/public.html?rev=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/public.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/public.html Mon Apr 19 08:22:13
2010
@@ -21,7 +21,7 @@
 	<div id="left">
 	<div id="back-header">
 	<h1><lift:loc>ui_public_title</lift:loc></h1>
-<div class="container-settings">
+<div class="container-aux">
 		<!--updates-box -->
 		<lift:comet type="PublicTimeline"/>
 		<lift:embed what="templates-hidden/message_core"/>

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/streams.html?rev=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/streams.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/streams.html Mon Apr 19 08:22:13
2010
@@ -21,22 +21,20 @@
 	<lift:TableSorterSnip/>
 	<!-- STYLESHEETS  -->
 	<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet"
/>
-	<!--[if IE 6]>
-	<link rel="stylesheet" type="text/css" href="../style/ie6.css" media="screen" />
-	<![endif]-->
-	<!--[if gte IE 7]>
-	<link rel="stylesheet" type="text/css" href="../style/ie.css" media="screen" />
-	<![endif]-->
-	<!-- JAVASCRIPT -->
 	<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">   
</script>
-	<script type="text/javascript" src="../scripts/esme_table_sorter.js">    </script>
-	<script src="/scripts/display_messages.js" type="text/javascript"/>
-	<script src="/scripts/pretty.js" type="text/javascript"/>
 	<div id="back-header">
 	<h1><lift:loc>ui_streams_manage</lift:loc></h1>
 	<div class="container-settings">
 		<div id="messages"></div>
 		
+		 <span id="StreamSpan">
+					<lift:ignore>
+						<!--                        The displayStreams snippet *MUST* appear on the page
before                        the main snippet                        -->
+						</lift:ignore>
+						<lift:displayStream the_id="StreamSpan"/>
+						 <lift:embed what="templates-hidden/message_core"/>
+		</span>
+		<div id="StreamUI">
 		<lift:streamFilters>
 					<table class="tablesorter">
 						<thead>
@@ -67,16 +65,9 @@
 						</tr>
 					</table>
 				</lift:streamFilters>
+		</div>
 				
- 			<span id="StreamSpan">
-					<lift:ignore>
-						<!--                        The displayStreams snippet *MUST* appear on the page
before                        the main snippet                        -->
-						</lift:ignore>
-					<div class="b-list">
-						<lift:displayStream the_id="StreamSpan"/>
-						 <lift:embed what="templates-hidden/message_core"/>
-					</div>
-				</span>
+
 	</div>
 	</div>
 	<!-- End demo -->

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=935471&r1=935470&r2=935471&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 Mon Apr 19 08:22:13 2010
@@ -31,9 +31,10 @@
     </script>
     <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
 <div id="back-header">
-	<h1><lift:loc>ui_user_single_title</lift:loc></h1>
+       <lift:user_info>
+	<h1><lift:loc>ui_user_single_title</lift:loc> <i>'<user:nicename/>'</i></h1>
 	<div class="container-settings">
-        <lift:user_info>
+        <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">
                     <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
@@ -48,7 +49,6 @@
                 </ul>
                 <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
                     <dl class="messages">
-                        <span id="following"><user:followButton/></span>
                         <dd>
                             <table id="esme-table" class="tablesorter">
                                 <thead>
@@ -126,8 +126,9 @@
                     </dl>
                 </div>
             </div>
-        </lift:user_info>
+
 	</div>
+	        </lift:user_info>
 	</div>
 	<!-- End demo --> 
 </lift:surround>
\ No newline at end of file

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=935471&r1=935470&r2=935471&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 Mon Apr 19 08:22:13
2010
@@ -30,6 +30,14 @@
 	<div id="back-header">
 	<h1><lift:loc>ui_pool_manage</lift:loc></h1>
 	<div class="container-settings">
+	
+
+	
+			<div class="post-form-row">
+								<div class="submit-btn">
+<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-user"
src="../images/new1.gif" />
+							</div>
+							</div>
  
                 <span id="PoolDetailSpan">
                     <lift:ignore>
@@ -92,6 +100,8 @@
                         -->
                     </lift:ignore>
                     <lift:poolUsers the_id="PoolSpan">
+                    
+
                         <fieldset>
                             <legend>
                                 <lift:loc>ui_pool_list_users</lift:loc>
@@ -135,7 +145,7 @@
 
                 </span>
                 
-                 <fieldset>
+                <fieldset>
                     <lift:form>
                         <lift:editPool class="inputBox2">
                             <lift:loc>ui_pool_edit_label</lift:loc>
@@ -143,7 +153,8 @@
                         </lift:editPool>
                     </lift:form>
                 </fieldset>
-        
+                
+     
 
 <div id="dialog-form" title="Create new  pool" style="display: none">
 	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
@@ -176,11 +187,7 @@
 </div>
 
 
-		<div class="post-form-row">
-								<div class="submit-btn">
-<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-user"
src="../images/new1.gif" />
-							</div>
-							</div>
+
 
 	</div>
 	</div>

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=935471&r1=935470&r2=935471&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 Mon Apr 19 08:22:13
2010
@@ -14,7 +14,7 @@
  "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.                                           *
+ under the License.                                           * 
 */
 
 // <![CDATA[
@@ -29,7 +29,10 @@ function msgDateCompare(msg1, msg2)
 
 function displayMessages(msgArray, elementId)
 {
-  // Select the first element in table id="timeline_messages"
+	
+	//
+
+ // Select the first element in table id="timeline_messages"
   //  with id="message" as the message template
   if (msgTemplate == null) {
     //                                    var msgTemplate = jQuery('span.'+spanId+' message:first');

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=935471&r1=935470&r2=935471&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/style.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/style.css Mon Apr 19 08:22:13 2010
@@ -105,7 +105,7 @@ div#logo h1 a{
 	color:#2788e1;
 }
 
-#left, #right {
+#left, #right, #container-aux {
 	position:relative;
 }
 #home #left {
@@ -515,6 +515,15 @@ ul#toc li.current a {
 	background: url(../images/bg-tabs.png) no-repeat; 
 	margin-bottom:20px; 
 }
+
+.container-aux {
+	float:left; 
+	width: 563px; 
+	height:400px; 
+	padding:20px 30px; 
+	background: url(../images/bg-tabs.png) no-repeat; 
+	margin-bottom:20px; 
+}
 /* User messages
 *******************************************************************************/
 
@@ -580,6 +589,7 @@ img, img a {border:0px; }
 ******************************************************************************/
 
 .esme_message_bar {
+background:#fff;
 color:#7B4104;
 display:block;
 font-family:Arial;



Mime
View raw message