esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r933589 - in /incubator/esme/trunk/server/src/main: resources/ scala/bootstrap/liftweb/ scala/org/apache/esme/snippet/ webapp/info_view/ webapp/scripts/ webapp/templates-hidden/
Date Tue, 13 Apr 2010 13:01:46 GMT
Author: rhirsch
Date: Tue Apr 13 13:01:46 2010
New Revision: 933589

URL: http://svn.apache.org/viewvc?rev=933589&view=rev
Log:
[ESME-100] Finish web UI
Daily hour - Extended - 'My Contacts' Page

Added:
    incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html
Removed:
    incubator/esme/trunk/server/src/main/webapp/scripts/dialog_test.js
Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
    incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.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=933589&r1=933588&r2=933589&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Tue Apr 13 13:01:46
2010
@@ -122,4 +122,6 @@ base_users_menu=Users
 
 base_profile_menu=My Profile
 base_profile_public=Public
+base_profile_contacts=My Contacts
+
 

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=933589&r1=933588&r2=933589&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 Tue Apr 13 13:01:46
2010
@@ -131,6 +131,7 @@ class Boot {
         Menu(Loc("about", List("static", "about"), S.?("base_menu_about"), Hidden)) ::
         Menu(Loc("tag", List("info_view", "tag"), "Tag", Hidden, Loc.Snippet("tag_display",
TagDisplay.display))) ::
         Menu(Loc("public", List("info_view", "public"), S.?("base_profile_public"))) ::
+        Menu(Loc("contacts", List("info_view", "contacts"), S.?("base_profile_contacts")))
::
         Menu(Loc("sign_up", List("signup"), S.?("base_menu_signup"),
           Snippet("signup", User.signupForm),
           Unless(User.loggedIn_? _, S.?("base_menu_sign_up_error")))) ::

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=933589&r1=933588&r2=933589&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 Tue
Apr 13 13:01:46 2010
@@ -94,7 +94,10 @@ object JsonResender extends JsonHandler{
   }
 }
 
+
+
 class UserSnip extends DispatchSnippet {
+
   def dispatch: DispatchIt = 
   Map("name" -> userName _,
       "userImage" -> userImage _,
@@ -116,8 +119,9 @@ 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> <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

Added: 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=933589&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html (added)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html Tue Apr 13 13:01:46
2010
@@ -0,0 +1,63 @@
+<!--
+ 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.                                           *
+-->
+
+<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" />
+    <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">
+            <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">
+                        <a href="#tabs-1"><lift:loc>ui_user_followers</lift:loc></a>
+                    </li>
+                    <li class="ui-state-default ui-corner-top">
+                        <a href="#tabs-2"><lift:loc>ui_user_followers</lift:loc></a>
+                    </li>
+                </ul>
+                <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+                    <dl>
+                        <dd class="b-contacts" style="height: 240px; overflow: auto">
+                            <lift:UserSnip.following user:userId=""/>
+                        </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">
+                            <lift:UserSnip.followers user:userId=""/>
+                        </dd>
+                    </dl>
+                </div>
+            </div>
+	</div>
+	</div>
+	<!-- End demo --> 
+</lift:surround>
\ 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=933589&r1=933588&r2=933589&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 Tue Apr 13 13:01:46
2010
@@ -34,6 +34,8 @@
         <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"/>
     </head>
     <body id="back">
      <div id="messages" class="esme_message_bar" style="display: none"></div>
@@ -91,6 +93,9 @@
                             <li>
                                 <lift:Menu.item donthide="true" name="accessPools"/>
                             </li>
+                            <li>
+                                <lift:Menu.item donthide="true" name="contacts"/>
+                            </li>
                         </ul><!--search form-->
                         <form action="/info_view/search" method="post">
                             <div id="search">



Mime
View raw message