esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r934708 - in /incubator/esme/trunk/server/src/main: scala/org/apache/esme/model/ scala/org/apache/esme/snippet/ webapp/action_view/ webapp/info_view/ webapp/style/ webapp/templates-hidden/ webapp/track_view/
Date Fri, 16 Apr 2010 08:10:29 GMT
Author: rhirsch
Date: Fri Apr 16 08:10:29 2010
New Revision: 934708

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

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
    incubator/esme/trunk/server/src/main/webapp/action_view/index.html
    incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html
    incubator/esme/trunk/server/src/main/webapp/info_view/users.html
    incubator/esme/trunk/server/src/main/webapp/style/esme.css
    incubator/esme/trunk/server/src/main/webapp/style/style.css
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
    incubator/esme/trunk/server/src/main/webapp/track_view/index.html

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Fri Apr 16
08:10:29 2010
@@ -262,6 +262,7 @@ class User extends KeyedMapper[Long, Use
     case (_) => "/images/avatar.jpg"
   }
   
+ 
 
   def needsChange_? : Boolean = this.nickname.is.startsWith("chang") &&
   this.firstName.startsWith("Unkn") && this.lastName.startsWith("Unkn")

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Fri
Apr 16 08:10:29 2010
@@ -119,26 +119,23 @@ class UserSnip extends DispatchSnippet {
     map(_.child).firstOption.getOrElse(NodeSeq.Empty)
   }
 
-  // <img width="50px" href="{(u.image_url.is)openOr "/images/avatar.jpg"}" alt="Anonymous"
id="avatar" />
   def userFmt(u: User): Node = 
-  <li> <a href={"/user/"+urlEncode(u.nickname.is)}>{u.niceName}</a> {u.firstName}
{u.lastName}</li>
+   <li> <img width="30px" src={(u.image_url)} id="avatar" /> <a href={"/user/"+urlEncode(u.nickname.is)}>{u.niceName}</a>
{u.firstName} {u.lastName}</li>
+
+
 
   def calcUser: Box[User] =
   S.attr("userId").flatMap(s => User.find(toLong(s))) or User.currentUser
 
   def followers(in: NodeSeq): NodeSeq = 
-  <ul>
     {
       calcUser.toList.flatMap(_.followers.map(userFmt))
     }
-  </ul>
 
   def following(in: NodeSeq): NodeSeq =
-  <ul>
     {
       calcUser.toList.flatMap(_.following.map(userFmt))
     }
-  </ul>
 
   def loginForm(in: NodeSeq): NodeSeq =
   if (User.loggedIn_?) NodeSeq.Empty

Modified: incubator/esme/trunk/server/src/main/webapp/action_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/action_view/index.html?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/action_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/action_view/index.html Fri Apr 16 08:10:29
2010
@@ -109,9 +109,9 @@
 
 <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>
+     <input src="../images/new1.gif" id="create-user" onclick="javascript:$('#dialog-form').dialog('open')"
type="image" />
+</div>
+</div>							
 
 		
 

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html Fri Apr 16 08:10:29
2010
@@ -18,18 +18,13 @@
 -->
 
 <lift:surround with="base" at="left">
-    <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS  -->
-    <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />
-    <link rel="stylesheet" type="text/css" href="../style/grid.css" media="screen" />
+    <!-- STYLESHEETS  -->
     <link rel="stylesheet" type="text/css" href="../style/layout.css" media="screen" />
     <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.js">
     </script>
-    <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
 <div id="back-header">
 	<h1><lift:loc>base_profile_contacts</lift:loc></h1>
 	<div class="container-settings">
@@ -45,14 +40,18 @@
                 <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
                     <dl>
                         <dd class="b-contacts" style="height: 240px; overflow: auto">
+                          <ul>
                             <lift:UserSnip.following user:userId=""/>
+                             </ul>
                         </dd>
                     </dl>
                 </div>
                 <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"
id="tabs-2">
                     <dl>
                          <dd class="b-contacts" style="height: 240px; overflow: auto">
+                         <ul>
                             <lift:UserSnip.followers user:userId=""/>
+                            </ul>
                         </dd>
                     </dl>
                 </div>

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/users.html?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/users.html Fri Apr 16 08:10:29 2010
@@ -48,19 +48,19 @@
             <tbody>
                 <lift:displayUsers>
                     <disp:item>
-                        <tr>
+                        <tr class="user_row">
                             <td>
                                 <item:imageUrl/>
                             </td>
                             <td>
-	                        	<div class="tb-sort-nickname">
+	                    <div class="user_name">
                                 	<item:nickname/>
 								</div>
                             </td>
                             <td>
                                 <item:firstName/> <item:lastName/>
                             </td>
-                            <td>
+                            <td class="user_message">
                                 <item:lastMsg/>
                             </td>
                             <td>

Modified: incubator/esme/trunk/server/src/main/webapp/style/esme.css
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/style/esme.css?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/esme.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/esme.css Fri Apr 16 08:10:29 2010
@@ -19,26 +19,6 @@
 
 @import url(layout.css);
 
-@import url(l-page.css);
-@import url(l-page-login.css);
-@import url(l-page-content.css);
-@import url(l-page-message.css);
-
-@import url(l-top.css);
-
-@import url(b-sign-on.css);
-@import url(b-open.css);
-@import url(b-content.css);
-@import url(b-primary.css);
-@import url(b-back.css);
-@import url(b-menu.css);
-
-@import url(b-list.css);
-@import url(b-view-menu.css);
-@import url(b-view.css);
-@import url(b-popup.css);
-@import url(b-popup-c.css);
-@import url(b-edit.css);
 
 /* Head (begin) */ /**/
     .head .logo img

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=934708&r1=934707&r2=934708&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 16 08:10:29 2010
@@ -45,7 +45,7 @@ a:link, a:visited { color: #114e93; text
 a:hover { color: #88abd2; text-decoration:underline; }
 
 
-/* Input box focus
+/* Input box focus like in twitter
 *
 */
 
@@ -55,6 +55,12 @@ input[type=text]:focus, input[type=passw
       outline: medium none);
 }
 
+.focus {
+  background-color: #FCFAE0 !important;
+}
+
+.aura-add-site li.focus, tr.esme-tr.highlight.focus, tr.esme-tr.focus {background:#fcfae0;}
+
 /* HEADER
 *******************************************************************************/
 #header { margin: 0px auto; padding: 0px; height: 72px; width: 871px; }
@@ -264,6 +270,7 @@ ul.main-links  {
 	list-style:none;
 	margin:20px 0 10px 15px;
 	padding:0;
+	color: #88abd2; 
 }
 .main-links li {
 	padding:3px 0;
@@ -508,6 +515,25 @@ ul#toc li.current a {
 	background: url(../images/bg-tabs.png) no-repeat; 
 	margin-bottom:20px; 
 }
+/* User messages
+*******************************************************************************/
+
+.user_name {
+	float:left;
+	width:60px;
+	word-wrap:break-word;
+}
+
+.user_message {
+	float:left;
+	width:300px;
+	background:#fff;
+	word-wrap:break-word;
+}
+
+.user_row {
+	background:#fff;
+}
 
 /* SIGNUP/SETTINGS FORM STYLE
 *******************************************************************************/
@@ -571,4 +597,5 @@ 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/base.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html Fri Apr 16 08:10:29
2010
@@ -33,9 +33,8 @@
         <meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
         <meta name="Robots" content="index,follow,noodp" />
         <link rel="stylesheet" href="../style/style.css" type="text/css" media="screen"
/>
-        <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"/>

-         <script src="/scripts/jquery.ifixpng.js" type="text/javascript"/>
-         <script src="/scripts/png_correct.js" type="text/javascript"/>
+        <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
+        <script id="json" src="/classpath/json.js" type="text/javascript"/>
     </head>
     <body id="back">
      <div id="messages" class="esme_message_bar" style="display: none"></div>

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=934708&r1=934707&r2=934708&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 16 08:10:29
2010
@@ -17,7 +17,14 @@
  under the License.                                           *
 -->
 
+
+
 <lift:surround with="base" at="left">
+<head>
+        <script src="/scripts/display_messages.js" type="text/javascript"/> 
+        <script src="/scripts/pretty.js" type="text/javascript"/> 
+</head>
+
 	<div id="left">
 		<div id="back-header">
 			<!---UPDATE BOX -->

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html Fri Apr
16 08:10:29 2010
@@ -18,6 +18,12 @@
 -->
 
 <div id="timeline_messages">
+<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 class="updates-box" id="message">
 		<div class="avatar">
 			<img id="avatar" width="50px"/>

Modified: incubator/esme/trunk/server/src/main/webapp/track_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/track_view/index.html?rev=934708&r1=934707&r2=934708&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/track_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/track_view/index.html Fri Apr 16 08:10:29
2010
@@ -56,7 +56,7 @@
 							</thead>
 							<tbody>
 								<disp:item>
-									<tr>
+									<tr class ="esme-tr">
 										<td>
 											<item:pattern/>
 										</td>



Mime
View raw message