esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r821698 - in /incubator/esme/trunk/server/src/main: resources/ webapp/action_view/ webapp/auth_view/ webapp/templates-hidden/
Date Mon, 05 Oct 2009 06:46:24 GMT
Author: rhirsch
Date: Mon Oct  5 06:46:24 2009
New Revision: 821698

URL: http://svn.apache.org/viewvc?rev=821698&view=rev
Log:
UI related changes - working on beautifying code

Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
    incubator/esme/trunk/server/src/main/webapp/action_view/index.html
    incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.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=821698&r1=821697&r2=821698&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Mon Oct  5 06:46:24 2009
@@ -28,7 +28,7 @@
 ui_pool_edit_label=Edit user permissions within a pool
 ui_pool_edit_name=User
 
-ui_action_title=Manage your Actions
+ui_action_title=Manage Your Actions
 ui_action_table_name=Name
 ui_action_table_enabled=Active
 ui_action_table_test=Test
@@ -56,7 +56,7 @@
 ui_token_revoke=Revoke
 ui_token_list_title=Valid Tokens
 ui_token_list_token=Token: 
-ui_token_create_title=Create a new authentication Token.
+ui_token_create_title=Create a new authentication token
 ui_token_create_description=Description
 
 ui_user_list_title=Users

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=821698&r1=821697&r2=821698&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 Mon Oct  5 06:46:24
2009
@@ -1,8 +1,32 @@
 <lift:surround with="default" at="content">
 
+	<lift:Style.header />
+	    	
+	<!-- STYLESHEETS <lift:Style.header /> -->	
+		<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/smoothness/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-1.3.2.min.js"></script>
+		<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js"></script>
+		<script type="text/javascript" src="../scripts/esme.js"></script>
+  
 
-  <span id="TokenSpan">
+<div class="demo">
+
+<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_action_title</lift:loc></a></li>
+		<li class="ui-state-default ui-corner-top"><a href="#tabs-2"><lift:loc>ui_action_new_action</lift:loc></a></li>
+		<li class="ui-state-default ui-corner-top"><a href="#tabs-3">Help</a></li>
+	</ul>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+		  <span id="TokenSpan">
     <lift:ignore>
       <!--
       The displayActions snippet *MUST* appear on the page before
@@ -10,14 +34,13 @@
       -->
     </lift:ignore>
     <lift:displayActions the_id="TokenSpan">
-      <b><lift:loc>ui_action_title</lift:loc></b><br/>
       <table>
         <tr>
           <td><lift:loc>ui_action_table_name</lift:loc></td>
-          <td><lift:loc>ui_action_table_enabled</lift:loc></td>
-          <td><lift:loc>ui_action_table_test</lift:loc></td>
-          <td><lift:loc>ui_action_table_action</lift:loc></td>
-          <td><lift:loc>ui_action_table_delete</lift:loc></td>
+          <td halign="center"><lift:loc>ui_action_table_enabled</lift:loc></td>
+          <td halign="center"><lift:loc>ui_action_table_test</lift:loc></td>
+          <td halign="center"><lift:loc>ui_action_table_action</lift:loc></td>
+          <td halign="center"><lift:loc>ui_action_table_delete</lift:loc></td>
         </tr>
         <disp:item>
           <tr>
@@ -33,11 +56,11 @@
       </table>
     </lift:displayActions>
   </span>
-
+	</div>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
   <lift:form>
     <lift:main>
     <table>
-      <tr><td colspan="3"><b><lift:loc>ui_action_new_action</lift:loc></b></td></tr>
       <tr>
         <td><lift:loc>ui_action_new_action_name</lift:loc></td>
         <td><main:name/></td>
@@ -56,4 +79,35 @@
     </table>
     </lift:main>
   </lift:form>
+	</div>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
+		<b><lift:loc>ui_action_new_action_test</lift:loc></b><br />
+		<p>
+          @foo -- sender is @foo<br />
+          day = (0,1) -- sent on Sunday or Monday<br/>
+          #moo -- contains the #moo tag<br/>
+          50% -- success 50% of the time<br/>
+          @foo &amp; 50% -- half the time, something sent by @foo<br/>
+          login -- user has logged in<br/>
+          followed -- user is being followed<br/>
+          unfollowed -- user is being unfollowed<br/>
+          profile -- user changed profile<br/>
+          every N mins -- repeat action, N is an integer<br/>
+          pool[:mypool] -- message is in access pool mypool<br/>
+          resent[:user] -- message was resent by user
+        </p>
+        	<b><lift:loc>ui_action_new_action_action</lift:loc></b><br
/>
+          <p>
+          filter -- not put in your timeline<br />
+          resend -- sends the message to all your followers<br />
+          mailto:foo@bar.com -- sends the message to foo@bar.com<br/>
+          http://foo.com/message/in -- HTTP post, %s expands to message<br/>
+          atom:http://blog.com/feed.atom -- posts new messages from Atom feed<br/>
+          rss:http://blog.com/feed.rss -- posts new messages from RSS feed
+        </p>
+	</div>
+</div>
+
+</div><!-- End demo -->
+
 </lift:surround>

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=821698&r1=821697&r2=821698&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 Oct  5 06:46:24 2009
@@ -1,7 +1,8 @@
 <lift:surround with="default" at="content">
 
-  Manage your external application authentication tokens: <br/>
+ <lift:loc>ui_token_title</lift:loc><br/>
   <span id="TokenSpan">
+  <fieldset><legend><lift:loc>ui_token_list_title</lift:loc></legend>
     <lift:ignore>
       <!--
       The displayTokens snippet *MUST* appear on the page before
@@ -11,18 +12,22 @@
     <lift:displayTokens the_id="TokenSpan">
       <ul>
         <disp:item>
-          <li><item:description/> token: <item:uniqueId/> <item:revoke>Revoke</item:revoke></li>
+          <li><item:description/> <lift:loc>ui_token_list_token</lift:loc>
<item:uniqueId/> <item:revoke><lift:loc>ui_token_revoke</lift:loc></item:revoke></li>
         </disp:item>
       </ul>
     </lift:displayTokens>
+    </fieldset>
   </span>
 
   <lift:form>
+  <fieldset><legend><lift:loc>ui_token_create_title</lift:loc></legend>
     <lift:main>
-      Create a new Authentication Token.<br />
-      Description: <main:token/>
+      <lift:loc>ui_token_create_description</lift:loc>
+      <br/>
+      <main:token/>
       <input type="submit" value="Add" />
     </lift:main>
+     </fieldset>
   </lift:form>
 
 </lift:surround>

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=821698&r1=821697&r2=821698&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 Mon Oct  5 06:46:24
2009
@@ -2,7 +2,7 @@
       xml:lang="eng">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-    <title>Enterprise Social Messaging Experiment: Messages</title>
+    <title><lift:loc>ui_default_title</lift:loc></title>
 
     <lift:Style.header />
 
@@ -37,16 +37,16 @@
               <div class="l-top">
                 <div id="tabs" >
                   <dl class="messages">
-                    <dt class="caption">Your timeline</dt>
+                    <dt class="caption"><lift:loc>ui_messages_your_timeline</lift:loc></dt>
 
                     <dd>
                       <div class="b-list">
                         <table>
                           <thead>
                             <tr>
-                              <th>Author</th>
-                              <th>Message</th>
-                              <th>Tags</th>
+                              <th><lift:loc>ui_messages_message_label_author</lift:loc></th>
+                              <th><lift:loc>ui_messages_message_label_message</lift:loc></th>
+                              <th><lift:loc>ui_messages_message_label_tags</lift:loc></th>
                             </tr>
                           </thead>
                           <lift:comet type="Timeline"/>
@@ -88,9 +88,9 @@
                         <table>
                           <thead>
                             <tr>
-                              <th>Author</th>
-                              <th>Message</th>
-                              <th>Tags</th>
+                              <th><lift:loc>ui_messages_message_label_author</lift:loc></th>
+                              <th><lift:loc>ui_messages_message_label_message</lift:loc></th>
+                              <th><lift:loc>ui_messages_message_label_tags</lift:loc></th>
                             </tr>
                           </thead>
                           <lift:comet type="PublicTimeline"/>
@@ -256,7 +256,7 @@
       </table>
     </div>
     <div class="foot">
-      <center>ESME</center>
+      <center><lift:loc>ui_default_footer</lift:loc></center>
     </div>
   </body>
 </html>

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html?rev=821698&r1=821697&r2=821698&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html Mon
Oct  5 06:46:24 2009
@@ -1,6 +1,6 @@
 <form id="openid_submit" class="clear" method="post" action="/open_id/login" >
   <div class="b-open-l">
-    <p class="input"><label for="open_id_field">Open ID</label> <input
type="text" name="open_id" id="open_id_field"/></p>
+    <p class="input"><label for="open_id_field"><lift:loc>ui_open_id_title</lift:loc></label>
<input type="text" name="open_id" id="open_id_field"/></p>
     <p class="button">
       <img onclick="document.getElementById('openid_submit').submit()" src="/images/sign-on.png"
alt="Sign On" />
     </p>

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html?rev=821698&r1=821697&r2=821698&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html Mon Oct
 5 06:46:24 2009
@@ -1,12 +1,13 @@
 <form method="post" action="/authentication/login">
-  <label for="username">Username:
+  <label for="username"><lift:loc>ui_login_user</lift:loc><br/>
     <input type="text" name="username" value="" id="username"/>
   </label>
-
-  <label for="password">Password:
+<br/>
+  <label for="password"><lift:loc>ui_login_password</lift:loc><br/>
     <input type="password" name="password" value="" id="password"/>
   </label>
+  <br/>
   <label for="login">
-    <input type="submit" value="login" id="login"/>
+    <input type="submit" value="Login" id="login"/>
   </label>
 </form>
\ No newline at end of file



Mime
View raw message