esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r928647 - in /incubator/esme/trunk/server/src/main: resources/ scala/org/apache/esme/lib/ scala/org/apache/esme/snippet/ webapp/ webapp/auth_view/ webapp/profile_view/ webapp/templates-hidden/
Date Mon, 29 Mar 2010 08:52:45 GMT
Author: rhirsch
Date: Mon Mar 29 08:52:44 2010
New Revision: 928647

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

Removed:
    incubator/esme/trunk/server/src/main/webapp/settings.html
Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
    incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
    incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html

Modified: incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEUI.properties?rev=928647&r1=928646&r2=928647&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Mon Mar 29 08:52:44 2010
@@ -82,6 +82,7 @@ ui_action_help=Help
 ui_login_openID=Open ID
 
 ui_edit_profile=Edit your profile
+ui_profile_title=Settings
 
 ui_user_timeline='s Timeline
 ui_user_messages='s Messages
@@ -149,7 +150,7 @@ ui_messages_message_label_message_tag_no
 ui_messages_message_update=Update
 ui_messages_message_label_message_pool=Access pool
 ui_messages_message_label_message_pool_public=--public--
-ui_messages_message_label_tag_cloud=Tag Cloud
+ui_messages_message_label_tag_cloud=Tags
 ui_messages_message_label_popular=Popular messages
 ui_messages_message_header_popular_resent=Resent
 ui_messages_message_header_popular_message=Message

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ProfileMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ProfileMgr.scala?rev=928647&r1=928646&r2=928647&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ProfileMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ProfileMgr.scala Mon Mar
29 08:52:44 2010
@@ -130,17 +130,17 @@ object ProfileMgr {
         }
       }
       
-      bind("user", in, "nickname" -> text(user.nickname, {_ =>}, "disabled" -> "true"),
-                       "lastName" -> user.lastName.toForm,
-                       "imageURL" -> user.imageUrl.toForm,
-                       "firstName" -> user.firstName.toForm,
-                       "timezone" -> user.timezone.toForm,
-                       "locale" -> user.locale.toForm,
-                       "email" -> text(email, e => email = e.trim.toLowerCase),
-                       "password" -> password(pwd, p => pwd = p.trim),
-                       "confirm" -> password(pwd, p => checkEmailPassword(p.trim)),
-                       "openid" -> text(openIdUrl, registerOpenID(_)),
-                       "save" -> submit("Save", user.save))
+      bind("user", in, "nickname" -%> text(user.nickname, {_ =>}, "disabled" ->
"true"),
+                       "lastName" -%> user.lastName.toForm,
+                       "imageURL" -%> user.imageUrl.toForm,
+                       "firstName" -%> user.firstName.toForm,
+                       "timezone" -%> user.timezone.toForm,
+                       "locale" -%> user.locale.toForm,
+                       "email" -%> text(email, e => email = e.trim.toLowerCase),
+                       "password" -%> password(pwd, p => pwd = p.trim),
+                       "confirm" -%> password(pwd, p => checkEmailPassword(p.trim)),
+                       "openid" -%> text(openIdUrl, registerOpenID(_)),
+                       "save" -%> submit("Save", user.save))
     }).getOrElse(NodeSeq.Empty)
 
   }

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=928647&r1=928646&r2=928647&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 Mon
Mar 29 08:52:44 2010
@@ -216,6 +216,8 @@ class UserSnip extends DispatchSnippet {
       case _ => NodeSeq.Empty
     }
     
+    //, u.url.is
+    
   def links(in: NodeSeq): NodeSeq = 
     PopStatsActor !? PopStatsActor.TopStats(LinkClickedStat, 5, 1 week) match {
       case Nil => NodeSeq.Empty
@@ -227,7 +229,7 @@ class UserSnip extends DispatchSnippet {
                  UrlStore.find(linkId).map { u => bind(
                    "item", lst,
                    "freq" -> freq,
-                   "url" -> u.url.is
+                   "url" ->  link(u.url.is, () => (),Text(u.url.is))
                    )
                  }.getOrElse(NodeSeq.Empty)
                }

Modified: incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/auth_view/index.html?rev=928647&r1=928646&r2=928647&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/auth_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/auth_view/index.html Mon Mar 29 08:52:44 2010
@@ -17,81 +17,79 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-<head>
-	<!-- STYLESHEETS  -->  
-	<link type="text/css" href="../style/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet"
/>
-	<link type="text/css" href="../style/jquery-ui.css" rel="stylesheet" />
-	<link type="text/css" href="../style/parseTheme.css" rel="stylesheet" />
-	<link type="text/css" href="../style/dialog.css" rel="stylesheet" />
-	<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">   
</script>
-	<script type="text/javascript" src="../scripts/dialog_token.js">    </script>
+	<head>
+		<!-- STYLESHEETS  -->
+		<link type="text/css" href="../style/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet"
/>
+		<link type="text/css" href="../style/jquery-ui.css" rel="stylesheet" />
+		<link type="text/css" href="../style/parseTheme.css" rel="stylesheet" />
+		<link type="text/css" href="../style/dialog.css" rel="stylesheet" />
+		<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">  
 </script>
+		<script type="text/javascript" src="../scripts/dialog_token.js">    </script>
 		<lift:TableSorterSnip/>
 	</head>
-	
-<div class="demo">
-        <div id="messages"></div>
-
-				<span id="TokenSpan">
-					<lift:ignore>
-						<!--                        The displayTokens snippet *MUST* appear on the page
before                        the main snippet                        -->
-						</lift:ignore>
-					<lift:displayTokens the_id="TokenSpan">
-						<table id="esme-table" class="tablesorter">
-							<thead>
-								<tr>
-									<th>
-										<lift:loc>ui_token_create_description</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_token_list_token</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_token_list_create</lift:loc>
-									</th>
-									<th>
-										
-									</th>
-								</tr>
-							</thead>
-							<tbody>
-								<disp:item>
-									<tr>
-										<td>
-											<item:description/>
-										</td>
-										<td>
-											<item:uniqueId/>
-										</td>
-										<td>
-											<item:createdDate/>
-										</td>
-										<td>
-											<item:revoke style="background-color:#fff;">
-												<img valign="center" style="background-color:#fff;"  src="/images/delete.gif"/>
-											</item:revoke>
-										</td>
-									</tr>
-								</disp:item>
-							</tbody>
-						</table>
-					</lift:displayTokens>
-				</span>
-<div id="dialog-form" title="Create new token">
-	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
-
-       <form id="token_new_dialog" onsubmit="false">
-
-       <lift:main>
-	<fieldset>
-		<label for="name"><lift:loc>ui_token_create_description</lift:loc></label>
-		<main:token class="text ui-widget-content ui-corner-all" />
-	</fieldset>
-	</lift:main>
-       </form>
-</div>
-
-
-<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user"><lift:loc>ui_track_new_track</lift:loc></button>
-
-</div><!-- End demo -->
+	<div class="demo">
+		<div id="messages"></div>
+		<span id="TokenSpan">
+			<lift:ignore>
+				<!--                        The displayTokens snippet *MUST* appear on the page before
                       the main snippet                        -->
+				</lift:ignore>
+			<lift:displayTokens the_id="TokenSpan">
+				<table id="esme-table" class="tablesorter">
+					<thead>
+						<tr>
+							<th>
+								<lift:loc>ui_token_create_description</lift:loc>
+							</th>
+							<th>
+								<lift:loc>ui_token_list_token</lift:loc>
+							</th>
+							<th>
+								<lift:loc>ui_token_list_create</lift:loc>
+							</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+						<disp:item>
+							<tr>
+								<td>
+									<item:description/>
+								</td>
+								<td>
+									<item:uniqueId/>
+								</td>
+								<td>
+									<item:createdDate/>
+								</td>
+								<td>
+									<item:revoke style="background-color:#fff;">
+										<img valign="center" style="background-color:#fff;"  src="/images/delete.gif"/>
+									</item:revoke>
+								</td>
+							</tr>
+						</disp:item>
+					</tbody>
+				</table>
+			</lift:displayTokens>
+		</span>
+		<div id="dialog-form" title="Create new token">
+			<p class="validateTips">
+				<lift:loc>ui_form_all_fields_required</lift:loc>
+			</p>
+			<form id="token_new_dialog" onsubmit="false">
+				<lift:main>
+					<fieldset>
+						<label for="name">
+							<lift:loc>ui_token_create_description</lift:loc>
+						</label>
+						<main:token class="text ui-widget-content ui-corner-all" />
+					</fieldset>
+				</lift:main>
+			</form>
+		</div>
+		<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">
+			<lift:loc>ui_token_title_create</lift:loc>
+		</button>
+	</div>
+	<!-- End demo -->
 </lift:surround>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html?rev=928647&r1=928646&r2=928647&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html Mon Mar 29 08:52:44
2010
@@ -17,21 +17,77 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-  <lift:editProfile form="post">
-    <table id="profile">
-      <tbody>
-        <tr> <td><lift:loc>ui_sign_up_nickname</lift:loc></td>
<td><user:nickname/></td> </tr>
-        <tr> <td><lift:loc>ui_sign_up_firstname</lift:loc></td>
<td><user:firstName/></td> </tr>
-        <tr> <td><lift:loc>ui_sign_up_lastname</lift:loc></td>
<td><user:lastName/></td> </tr>
-        <tr> <td><lift:loc>ui_sign_up_image_url</lift:loc></td>
<td><user:imageURL/></td> </tr>
-        <tr> <td><lift:loc>ui_sign_up_timezone</lift:loc></td>
<td><user:timezone/></td> </tr>
-        <tr> <td><lift:loc>ui_sign_up_locale</lift:loc></td>
<td><user:locale/></td> </tr>
-        <tr> <td><lift:loc>ui_login_email</lift:loc></td> <td><user:email/></td>
</tr>
-        <tr> <td><lift:loc>ui_login_password</lift:loc></td>
<td><user:password/></td> </tr>
-        <tr> <td><lift:loc>ui_login_password_repeat</lift:loc></td>
<td><user:confirm/></td> </tr>
-        <tr> <td><lift:loc>ui_sign_up_openid</lift:loc></td>
<td><user:openid/></td> </tr>
-        <user:save/>
-      </tbody>
-    </table>
-  </lift:editProfile>
+
+<div id="back-header">
+	<h1><lift:loc>ui_profile_title</lift:loc></h1>
+		
+
+	<!---CONTENT BOX-->
+	<div class="container-settings">
+		  <lift:editProfile form="post">
+					<div id="form-signup">
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_nickname</lift:loc></label>
+								<user:nickname class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_firstname</lift:loc></label>
+								<user:firstName class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_lastname</lift:loc></label>
+								<user:lastName class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_image_url</lift:loc></label>
+								<user:imageURL class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_timezone</lift:loc></label>
+								<user:timezone class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_locale</lift:loc></label>
+								<user:locale class="inputBox2"/>
+							</div>
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_login_email</lift:loc></label>
+								<user:email class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_login_password</lift:loc></label>
+								<user:password class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_login_password_repeat</lift:loc></label>
+								<user:confirm class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<label><lift:loc>ui_sign_up_openid</lift:loc></label>
+								<user:openid class="inputBox2"/>
+							</div>	
+							
+							<div class="post-form-row">
+								<div class="submit-btn">
+									<user:save type="image" src="/images/btn-save.gif" />
+								</div>
+							</div>	
+							
+					</div><!--form-signup-->
+			 </lift:editProfile>
+	</div><!--container-settings-->
+	
+	<!--END CONTENT BOX-->	
+	</div>
+	
+	
 </lift:surround>

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=928647&r1=928646&r2=928647&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 Mon Mar 29 08:52:44
2010
@@ -33,7 +33,7 @@
         <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 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>
     <body id="back">
         <div id="container-bg">
@@ -100,7 +100,7 @@
                                     <input type="image" onclick="javascript:form.submit();"
src="../images/btn-search.gif" style="padding:0;"/>
                                 </div>
                             </div>
-                        </form><!--search form--><h3><a href="">Tags</a></h3>
+                        </form><!--search form--><h3><a href=""><lift:loc>ui_messages_message_label_tag_cloud</lift:loc></a></h3>
                        <div class="right-content">
                              <lift:comet type="TagCloud"/>
                         </div>



Mime
View raw message