incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r822601 - in /incubator/esme/trunk/server/src/main: resources/ESMEUI.properties webapp/action_view/index.html webapp/images/delete.png webapp/info_view/streams.html webapp/pools_view/index.html webapp/track_view/index.html
Date Wed, 07 Oct 2009 06:55:02 GMT
Author: rhirsch
Date: Wed Oct  7 06:54:52 2009
New Revision: 822601

URL: http://svn.apache.org/viewvc?rev=822601&view=rev
Log:
UI related changes

Added:
    incubator/esme/trunk/server/src/main/webapp/images/delete.png   (with props)
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/info_view/streams.html
    incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
    incubator/esme/trunk/server/src/main/webapp/track_view/index.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=822601&r1=822600&r2=822601&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Wed Oct  7 06:54:52 2009
@@ -16,8 +16,9 @@
 ui_default_footer=Apache ESME 2009 - An Apache Incubator Project
 ui_default_title=Enterprise Social Messaging Experiment
 
-ui_pool_title=Manage access pools
-ui_pool_add=Add pool with name
+ui_pool_manage=Manage Pools
+ui_pool_create=Create Pool
+ui_pool_add=Name  
 ui_pool_list_pool_name=Name
 ui_pool_list_last_modifier=Last Modifier
 ui_pool_list_modify_date=Modify Date
@@ -25,8 +26,11 @@
 ui_pool_list_create_date=Create Date
 ui_pool_list_user_name=Name
 ui_pool_list_user_role=Role
-ui_pool_edit_label=Edit user permissions within a pool
+ui_pool_edit_label=Select Pool
 ui_pool_edit_name=User
+ui_pool_title_details=Pool Details: 
+ui_pool_list_users=Users in Pool
+ui_pool_add_user=Add User to Pool
 
 ui_action_title=Manage Your Actions
 ui_action_table_name=Name
@@ -53,11 +57,12 @@
 ui_user_following=Following
 ui_user_followers=Followers
 
-ui_token_title=Manage your external application authentication tokens: 
+ui_token_title_manage=Manage your tokens 
+ui_token_title_create=Create a token 
 ui_token_revoke=Revoke
+ui_token_name=Name
 ui_token_list_title=Valid Tokens
-ui_token_list_token=Token: 
-ui_token_create_title=Create a new authentication token
+ui_token_list_token=Token 
 ui_token_create_description=Description
 
 ui_user_list_title=Users
@@ -65,14 +70,18 @@
 ui_user_list_name=Name
 ui_user_list_last_message=Last message
 
-ui_streams_title=Manage your streams:
+ui_streams_filter=Set Filter
 ui_streams_author=Author
 ui_streams_text=Text
 ui_streams_date=Date
-ui_streams_filter_by_resent=Filter by resent 
+ui_streams_filter_by_resent=By Resent 
 ui_streams_filter_resender=Resent by: 
-ui_streams_filter_by_pool=Filter by pool
+ui_streams_filter_by_pool=By Pool
 ui_streams_filter_pool=In pool:
+ui_stream_selected_stream=Selected Stream
+ui_streams_filter_type=Filter Type
+ui_streams_active=Active
+ui_streams_conditions=Conditions
 
 ui_login_user=Username:
 ui_login_password=Password:
@@ -109,6 +118,7 @@
 ui_track_manage=Manage your tracks
 ui_track_manage_active=Active
 ui_track_manage_remove=Delete
+ui_track_manage_track=Track
 ui_track_new_track=Create new track
 ui_track_new_track_what=What do you want to track?
  

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=822601&r1=822600&r2=822601&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 Wed Oct  7 06:54:52
2009
@@ -21,9 +21,9 @@
 
 <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 ui-tabs-selected ui-state-active"><a
href="#tabs-1"><lift:loc>ui_track_manage</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>
+		<li class="ui-state-default ui-corner-top"><a href="#tabs-3"><lift:loc>ui_action_help</lift:loc></a></li>
 	</ul>
 	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
 		  <span id="TokenSpan">
@@ -34,13 +34,13 @@
       -->
     </lift:ignore>
     <lift:displayActions the_id="TokenSpan">
-      <table>
+      <table border="1">
         <tr>
-          <td><lift:loc>ui_action_table_name</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>
+          <td><b><lift:loc>ui_action_table_name</lift:loc></b></td>
+          <td halign="center"><b><lift:loc>ui_action_table_enabled</lift:loc></b></td>
+          <td halign="center"><b><lift:loc>ui_action_table_test</lift:loc></b></td>
+          <td halign="center"><b><lift:loc>ui_action_table_action</lift:loc></b></td>
+          <td halign="center"><b><lift:loc>ui_action_table_delete</lift:loc></b></td>
         </tr>
         <disp:item>
           <tr>
@@ -49,7 +49,7 @@
             <td><pre><item:test/></pre></td>
             <td><pre><item:action/></pre></td>
             <td>
-              <item:remove><lift:loc>ui_action_table_item_delete</lift:loc></item:remove>
+              <item:remove><img src="/images/delete.png"/></item:remove>
             </td>
           </tr>
         </disp:item>
@@ -96,6 +96,7 @@
           pool[:mypool] -- message is in access pool mypool<br/>
           resent[:user] -- message was resent by user
         </p>
+         <br/>
         	<b><lift:loc>ui_action_new_action_action</lift:loc></b><br
/>
           <p>
           filter -- not put in your timeline<br />

Added: incubator/esme/trunk/server/src/main/webapp/images/delete.png
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/images/delete.png?rev=822601&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/esme/trunk/server/src/main/webapp/images/delete.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=822601&r1=822600&r2=822601&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 Wed Oct  7 06:54:52
2009
@@ -1,5 +1,29 @@
 <lift:surround with="default" at="content">
-  <lift:loc>ui_streams_title</lift:loc> <br/>
+  	<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>
+		
+		<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_stream_selected_stream</lift:loc></a></li>
+		<li class="ui-state-default ui-corner-top"><a href="#tabs-2"><lift:loc>ui_streams_filter</lift:loc></a></li>
+	</ul>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+
   <span id="StreamSpan">
     <lift:ignore>
       <!--
@@ -8,7 +32,7 @@
       -->
     </lift:ignore>
     <lift:displayStream the_id="StreamSpan">
-      <table>
+      <table border="1">
         <thead>
           <tr> <th><lift:loc>ui_streams_author</lift:loc></th>
<th><lift:loc>ui_streams_text</lift:loc></th> <th><lift:loc>ui_streams_date</lift:loc></th></tr>
         </thead>
@@ -22,11 +46,25 @@
     </lift:displayStream>
   </span>
   
-  
+  	</div>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+
 
   <lift:streamFilters>
-    <lift:loc>ui_streams_filter_by_resent</lift:loc> <main:filterResent/><lift:loc>ui_streams_filter_resender</lift:loc>
<main:resent/><br/>
-    <lift:loc>ui_streams_filter_by_pool</lift:loc> <main:filterPools/><lift:loc>ui_streams_filter_pool</lift:loc>
<main:pools/>
+  <table>
+  <thead>
+          <tr> <th><lift:loc>ui_streams_filter_type</lift:loc></th>
<th><lift:loc>ui_streams_active</lift:loc></th> <th><lift:loc>ui_streams_conditions</lift:loc></th></tr>
+        </thead>
+    <tr>
+    <td><lift:loc>ui_streams_filter_by_resent</lift:loc></td> <td><main:filterResent/></td><td><lift:loc>ui_streams_filter_resender</lift:loc></td>
<td><main:resent/></td><br/>
+    </tr>
+    <tr>
+    <td><lift:loc>ui_streams_filter_by_pool</lift:loc></td><td><main:filterPools/></td><td><lift:loc>ui_streams_filter_pool</lift:loc>
</td><td><main:pools/></td>
+    </tr>
+   </table>
   </lift:streamFilters>
+	</div>
+</div>
 
+</div><!-- End demo -->
 </lift:surround>

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=822601&r1=822600&r2=822601&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 Wed Oct  7 06:54:52
2009
@@ -1,6 +1,28 @@
 <lift:surround with="default" at="content">
 
-  <lift:loc>ui_pool_title</lift:loc><br/>
+	<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>
+<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_pool_manage</lift:loc></a></li>
+		<li class="ui-state-default ui-corner-top"><a href="#tabs-2"><lift:loc>ui_pool_create</lift:loc></a></li>
+	</ul>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
 
   <lift:form>
     <lift:addPool>
@@ -8,8 +30,10 @@
       <input type="submit" value="Add" />
     </lift:addPool>
   </lift:form>
-  
+  	</div>
+	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
     <span id="PoolDetailSpan">
+
     <lift:ignore>
       <!--
       The poolUsers snippet *MUST* appear on the page before
@@ -17,28 +41,39 @@
       -->
     </lift:ignore>
     <lift:poolDetail the_pool_id="PoolDetailSpan">
-      <table>
+       <fieldset><legend><lift:loc>ui_pool_title_details</lift:loc><b><pool:name/></b></legend>
+      <br/>
+      <table border="1">
         <thead>
-          <tr> <th><lift:loc>ui_pool_list_pool_name</lift:loc></th>
<th><lift:loc>ui_pool_list_last_modifier</lift:loc></th> <th><lift:loc>ui_pool_list_modify_date</lift:loc>
</th> <th><lift:loc>ui_pool_list_modify_date</lift:loc> </th>
<th><lift:loc>ui_pool_list_last_creator</lift:loc></th> <th><lift:loc>ui_pool_list_create_date</lift:loc></th>
</tr>
+          <tr> <th><lift:loc>ui_pool_list_last_modifier</lift:loc></th>
<th><lift:loc>ui_pool_list_modify_date</lift:loc> </th><th><lift:loc>ui_pool_list_last_creator</lift:loc></th>
<th><lift:loc>ui_pool_list_create_date</lift:loc></th> </tr>
         </thead>
         
         <tbody>
-            <tr> <td><pool:name/></td>  <td><pool:modifier/></td><td><pool:lastModifyDate/></td><td><pool:creator/></td><td><pool:createdDate/></td>
</tr>
+            <tr><td><pool:modifier/></td><td><pool:lastModifyDate/></td><td><pool:creator/></td><td><pool:createdDate/></td>
</tr>
         </tbody>
       </table>
+          <br/>   
+     </fieldset>
+    <br/>   
     </lift:poolDetail>
+  
+
+
   </span>
+     <span id="PoolSpan">
+ 
   
-  <span id="PoolSpan">
-    <lift:ignore>
+      <lift:ignore>
       <!--
       The poolUsers snippet *MUST* appear on the page before
       the editPool snippet
       -->
     </lift:ignore>
     <lift:poolUsers the_id="PoolSpan">
-      <table>
-        <thead>
+     <fieldset><legend><lift:loc>ui_pool_list_users</lift:loc></legend>
+      <br/>
+       <table border="1">
+       <thead>
           <tr> <th><lift:loc>ui_pool_list_user_name</lift:loc></th>
 <th><lift:loc>ui_pool_list_user_role</lift:loc></th> </tr>
         </thead>
         
@@ -48,9 +83,19 @@
           </pool:user>
         </tbody>
       </table>
+          <br/>   
+           </fieldset>
+                <br/>
+ 
     </lift:poolUsers>
   </span>
+  
+
+
+        <fieldset><legend><lift:loc>ui_pool_add_user</lift:loc></legend>
 
+  
+ 
   <lift:form>
     <lift:editPool>
       <lift:loc>ui_pool_edit_label</lift:loc><edit:pool/> <br/>
@@ -58,5 +103,9 @@
       <input type="submit" value="Edit" />
     </lift:editPool>
   </lift:form>
-  
+       </fieldset>
+  	</div>
+</div>
+
+</div><!-- End demo -->
 </lift:surround>

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=822601&r1=822600&r2=822601&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 Wed Oct  7 06:54:52
2009
@@ -32,11 +32,23 @@
       -->
     </lift:ignore>
     <lift:displayTracking the_id="TrackSpan">
-      <ul>
+            <table border="1">
+        <tr>
+          <td halign="center"><b><lift:loc>ui_track_manage_track</lift:loc></b></td>
+          <td halign="center"><b><lift:loc>ui_track_manage_active</lift:loc></b></td>
+          <td halign="center"><b><lift:loc>ui_track_manage_remove</lift:loc></b></td>
+        </tr>
         <disp:item>
-          <li><item:pattern/> <lift:loc>ui_track_manage_active</lift:loc>
<item:enabled/> <item:remove><lift:loc>ui_track_manage_remove</lift:loc></item:remove></li>
+          <tr>
+            <td><item:pattern/></td>
+            <td><item:enabled/></td>
+            <td>
+              <item:remove><img src="/images/delete.png"/></item:remove>
+            </td>
+          </tr>
         </disp:item>
-      </ul>
+      </table>
+
     </lift:displayTracking>
   </span>
 	</div>



Mime
View raw message