incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r936190 - in /incubator/esme/trunk/server/src/main: resources/ webapp/action_view/ webapp/auth_view/ webapp/pools_view/ webapp/profile_view/ webapp/templates-hidden/ webapp/track_view/
Date Wed, 21 Apr 2010 08:06:08 GMT
Author: rhirsch
Date: Wed Apr 21 08:06:08 2010
New Revision: 936190

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

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/pools_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
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.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=936190&r1=936189&r2=936190&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Wed Apr 21 08:06:08 2010
@@ -54,7 +54,7 @@ ui_pool_list_last_creator=Creator
 ui_pool_list_create_date=Create Date
 ui_pool_list_user_name=Name
 ui_pool_list_user_role=Role
-ui_pool_edit_label=Select Pool
+ui_pool_edit_label=Pool
 ui_pool_edit_name=User
 ui_pool_edit_edit=Edit
 ui_pool_title_details=Pool Details: 

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=936190&r1=936189&r2=936190&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 Apr 21 08:06:08 2010
@@ -18,111 +18,107 @@
 -->
 
 <lift:surround with="base" at="left">
-<head>
-	<!-- STYLESHEETS  -->  
-	<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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_action.js">    </script>
+	<head>
+		<!-- STYLESHEETS  -->
+		<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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_action.js">    </script>
 		<lift:TableSorterSnip/>
-		    <script type="text/javascript" src="../scripts/esme.js">
-    </script>
-    <script type="text/javascript" src="../scripts/esme_table_sorter_action.js"></script>
+		<script type="text/javascript" src="../scripts/esme.js">    </script>
+		<script type="text/javascript" src="../scripts/esme_table_sorter_action.js"></script>
 	</head>
-	
-<div id="back-header">
-	<h1><lift:loc>ui_action_title</lift:loc></h1>
-<div class="container-settings">
-				<span id="TokenSpan">
-					<lift:ignore>
-						<!--      The displayActions snippet *MUST* appear on the page before      the main snippet      -->
-						</lift:ignore>
-					<lift:displayActions the_id="TokenSpan">
-						<table id="esme-table" class="tablesorter">
-							<thead>
+	<div id="back-header">
+		<h1>
+			<lift:loc>ui_action_title</lift:loc>
+		</h1>
+		<div class="container-settings">
+			<span id="TokenSpan">
+				<lift:ignore>
+					<!--      The displayActions snippet *MUST* appear on the page before      the main snippet      -->
+					</lift:ignore>
+				<lift:displayActions the_id="TokenSpan">
+					<table id="esme-table" class="tablesorter">
+						<thead>
+							<tr>
+								<th class="tipelement" title="This is the name of the action.">
+									<lift:loc>ui_action_table_name</lift:loc>
+								</th>
+								<th class="tipelement" title="This checkbox determines whether this action is active or not." >
+									<lift:loc>ui_action_table_enabled</lift:loc>
+								</th>
+								<th class="tipelement" title="This is the test that is checked to see if the action is fired.">
+									<lift:loc>ui_action_table_test</lift:loc>
+								</th>
+								<th class="tipelement" title="This is the activity that occurs when the action is fired.">
+									<lift:loc>ui_action_table_action</lift:loc>
+								</th>
+								<th class="tipelement" title="This is the timestamp when the action was created.">
+									<lift:loc>ui_action_table_create_date</lift:loc>
+								</th>
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+							<disp:item>
 								<tr>
-									<th>
-										<lift:loc>ui_action_table_name</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_action_table_enabled</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_action_table_test</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_action_table_action</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_action_table_create_date</lift:loc>
-									</th>
-									<th>
-										
-									</th>
+									<td>
+										<item:name/>
+									</td>
+									<td >
+										<item:enabled/>
+									</td>
+									<td>
+										<item:test/>
+									</td>
+									<td>
+										<item:action/>
+									</td>
+									<td>
+										<item:createdDate/>
+									</td>
+									<td align="center" class="tipelement" title="You can delete the action.">
+										<item:remove/>
+									</td>
 								</tr>
-							</thead>
-							<tbody>
-								<disp:item>
-									<tr>
-										<td>
-											<item:name/>
-										</td>
-										<td class="tipelement" title="This checkbox determines whether this action is active or not." >
-											<item:enabled/>
-										</td>
-										<td>
-											<item:test/>
-										</td>
-										<td>
-											<item:action/>
-										</td>
-										<td>
-											<item:createdDate/>
-										</td>
-										<td align="center">
-											<item:remove/>
-										</td>
-									</tr>
-								</disp:item>
-							</tbody>
-						</table>
-					</lift:displayActions>
-				</span>
-<div id="dialog-form" title="Create new action" style="display: none">
-	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
-
-       <form id="action_new_dialog" onsubmit="false">
-
-       <lift:main>
-	<fieldset>
-		<label for="name"><lift:loc>ui_action_new_action_name</lift:loc></label>
-		<main:name class="text ui-widget-content ui-corner-all tipelement" title="This is the name of your action" />
-		<label for="name"><lift:loc>ui_action_new_action_test</lift:loc></label>
-		<main:test class="text ui-widget-content ui-corner-all tipelement" title="This is the message trait that will be tested. If it is true, the action will be fired. Examples: '@foo' -- sender is @foo or '#moo' -- contains the #moo tag" />
-		<label for="name"><lift:loc>ui_action_table_action</lift:loc></label>
-		<main:action class="text ui-widget-content ui-corner-all tipelement" title="This is the action that will be performed when your action fires." />
-	</fieldset>
-	</lift:main>
-       </form>
-</div>
-
-<div class="post-form-row">
-<div class="submit-btn tipelement" title="Create a new action." >
-     <input src="../images/new1.gif" id="create-user" onclick="javascript:$('#dialog-form').dialog('open')" type="image" />
-</div>
-</div>							
-
-		
-
-
-
-
-</div><!-- End demo -->
-</div><!-- End demo -->
-
-
-
+							</disp:item>
+						</tbody>
+					</table>
+				</lift:displayActions>
+			</span>
+			<div id="dialog-form" title="Create new action" style="display: none">
+				<p class="validateTips">
+					<lift:loc>ui_form_all_fields_required</lift:loc>
+				</p>
+				<form id="action_new_dialog" onsubmit="false">
+					<lift:main>
+						<fieldset>
+							<label for="name">
+								<lift:loc>ui_action_new_action_name</lift:loc>
+							</label>
+							<main:name class="text ui-widget-content ui-corner-all tipelement" title="This is the name of your action" />
+							<label for="name">
+								<lift:loc>ui_action_new_action_test</lift:loc>
+							</label>
+							<main:test class="text ui-widget-content ui-corner-all tipelement" title="This is the message trait that will be tested. If it is true, the action will be fired. Examples: '@foo' -- sender is @foo or '#moo' -- contains the #moo tag" />
+							<label for="name">
+								<lift:loc>ui_action_table_action</lift:loc>
+							</label>
+							<main:action class="text ui-widget-content ui-corner-all tipelement" title="This is the action that will be performed when your action fires." />
+						</fieldset>
+					</lift:main>
+				</form>
+			</div>
+			<div class="post-form-row">
+				<div class="submit-btn tipelement" title="Create a new action." >
+					<input src="../images/new1.gif" id="create-user" onclick="javascript:$('#dialog-form').dialog('open')" type="image" />
+				</div>
+			</div>
+		</div>
+		<!-- End demo -->
+		</div>
+	<!-- End demo -->
 	<lift:Msgs>
 		<lift:error_msg>Error:</lift:error_msg>
 		<lift:notice_msg>FYI:</lift:notice_msg>
@@ -134,3 +130,4 @@
 	</lift:Msgs>
 </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=936190&r1=936189&r2=936190&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 Wed Apr 21 08:06:08 2010
@@ -19,81 +19,82 @@
 <lift:surround with="base" at="left">
 	<head>
 		<!-- STYLESHEETS  -->
-		<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet" /> 
+		<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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/>
-		    <script type="text/javascript" src="../scripts/esme.js">
-    </script>
-    <script type="text/javascript" src="../scripts/esme_table_sorter_token.js"></script>
+		<script type="text/javascript" src="../scripts/esme.js">    </script>
+		<script type="text/javascript" src="../scripts/esme_table_sorter_token.js"></script>
 	</head>
 	<div id="back-header">
-	<h1><lift:loc>ui_token_title</lift:loc></h1>
-	<div class="container-settings">
-		<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>
+		<h1>
+			<lift:loc>ui_token_title</lift:loc>
+		</h1>
+		<div class="container-settings">
+			<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>
-								<td>
-									<item:description/>
-								</td>
-								<td>
-									<item:uniqueId/>
-								</td>
-								<td>
-									<item:createdDate/>
-								</td>
-								<td align="center">
-									<item:revoke/>
-								</td>
+								<th class="tipelement" title="Each token has a distinct description so that you can identify it quickly.">
+									<lift:loc>ui_token_create_description</lift:loc>
+								</th>
+								<th class="tipelement" title="Use this token in external applications that use ESME APIs.">
+									<lift:loc>ui_token_list_token</lift:loc>
+								</th>
+								<th class="tipelement" title="This is the timestamp when the token was created. ">
+									<lift:loc>ui_token_list_create</lift:loc>
+								</th>
+								<th></th>
 							</tr>
-						</disp:item>
-					</tbody>
-				</table>
-			</lift:displayTokens>
-		</span>
-		<div id="dialog-form" style="display: none" 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 tipelement" title="This is the name of your token. Use something unique. " />
-					</fieldset>
-				</lift:main>
-			</form>
+						</thead>
+						<tbody>
+							<disp:item>
+								<tr>
+									<td>
+										<item:description/>
+									</td>
+									<td>
+										<item:uniqueId/>
+									</td>
+									<td>
+										<item:createdDate/>
+									</td>
+									<td align="center" class="tipelement" title="This will revoke this token. All external applications using this token will require a new token. ">
+										<item:revoke/>
+									</td>
+								</tr>
+							</disp:item>
+						</tbody>
+					</table>
+				</lift:displayTokens>
+			</span>
+			<div id="dialog-form" style="display: none" 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 tipelement" title="This is the name of your token. Use something unique. " />
+						</fieldset>
+					</lift:main>
+				</form>
+			</div>
+			<div class="post-form-row">
+				<div class="submit-btn tipelement" title="Create a new token." >
+					<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-user" src="../images/new1.gif" />
+				</div>
+			</div>
 		</div>
-		<div class="post-form-row">
-								<div class="submit-btn tipelement" title="Create a new token." >
-<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-user" src="../images/new1.gif" />
-							</div>
-							</div>
-	</div>
 	</div>
 	<!-- End demo -->
 </lift:surround>
\ No newline at end of file

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=936190&r1=936189&r2=936190&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 Apr 21 08:06:08 2010
@@ -17,179 +17,164 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-<head>
-	<!-- STYLESHEETS  -->  
-	<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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_pool.js">    </script>
+	<head>
+		<!-- STYLESHEETS  -->
+		<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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_pool.js">    </script>
 		<lift:TableSorterSnip/>
 	</head>
-	
 	<div id="back-header">
-	<h1><lift:loc>ui_pool_manage</lift:loc></h1>
-	<div class="container-settings">
-	
-
-	
+		<h1>
+			<lift:loc>ui_pool_manage</lift:loc>
+		</h1>
+		<div class="container-settings">
 			<div class="post-form-row">
-								<div class="submit-btn tipelement" title="Create a new pool." >
-<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-pool" src="../images/new1.gif" />
-							</div>
-							</div>
- 
-                <span id="PoolDetailSpan">
-                    <lift:ignore>
-                        <!--
-                        The poolUsers snippet *MUST* appear on the page before
-                        the editPool snippet
-                        -->
-                    </lift:ignore>
-                    <lift:poolDetail the_pool_id="PoolDetailSpan">
-                        <fieldset>
-                            <legend>
-                                <lift:loc>ui_pool_title_details</lift:loc>
-                                <b><pool:name/></b>
-                            </legend>
-                            <br/>
-                             <table class="tablesorter">
-                                <thead>
-                                    <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: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">
-                    <lift:ignore>
-                        <!--
-                        The poolUsers snippet *MUST* appear on the page before
-                        the editPool snippet
-                        -->
-                    </lift:ignore>
-                    <lift:poolUsers the_id="PoolSpan">
-                    
-
-                        <fieldset>
-                            <legend>
-                                <lift:loc>ui_pool_list_users</lift:loc>
-                            </legend>
-                            <br/>
-                             <table id="esme-table" class="tablesorter">
-                                <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>
-                                <tbody>
-                                    <pool:user>
-                                        <tr>
-                                            <td>
-                                                <user:name/>
-                                            </td>
-                                            <td>
-                                                <user:privilege/>
-                                            </td>
-                                        </tr>
-                                    </pool:user>
-                                </tbody>
-                            </table>
-                            <br/>
-                        </fieldset>
-                        <br/>
-                        		<div class="post-form-row tipelement" title="Add a user to an existing pool.">
-								<div class="submit-btn" >
-<input type="image" onclick="javascript:$('#dialog-form-user').dialog('open')" id="create-user" src="../images/add1.gif"/>							
-							</div>
-							</div>
-							
-                    </lift:poolUsers>
-                    
-
-                </span>
-                
-                <fieldset>
-                    <lift:form>
-                        <lift:editPool class="inputBox2 tipelement" title="Select a pool to edit" >
-                            <lift:loc>ui_pool_edit_label</lift:loc>
-                            <edit:pool/>
-                        </lift:editPool>
-                    </lift:form>
-                </fieldset>
-                
-     
-
-<div id="dialog-form" title="Create new  pool" style="display: none">
-	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
-
-       <form id="pool_new_dialog" onsubmit="false">
-
-       <lift:addPool>
-	<fieldset>
-		<label for="poolName"><lift:loc>ui_pool_add</lift:loc></label>
-		<add:poolName class="text ui-widget-content ui-corner-all tipelement" title="This is name of your new pool" />
-	</fieldset>
-	</lift:addPool>
-       </form>
-</div>
-
-<div id="dialog-form-user" title="Add a user to a pool" style="display: none">
-	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
-
-       <form id="pool_new_user_dialog" onsubmit="false">
-
-       <lift:editPool>
-	<fieldset>
-		<label for="poolName"><lift:loc>ui_pool_add</lift:loc></label>
-		<edit:username class="text ui-widget-content ui-corner-all tipelement" title="This is the user that will be added to a pool." />
-		<label for="permission"><lift:loc>ui_pool_list_user_role</lift:loc></label>
-		<edit:permission class="text ui-widget-content ui-corner-all tipelement" title="This is the type of permission that the new user will have." />
-	</fieldset>
-	</lift:editPool>
-       </form>
-</div>
-
-
-
-
-	</div>
+				<div class="submit-btn tipelement" title="Create a new pool." >
+					<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-pool" src="../images/new1.gif" />
+				</div>
+			</div>
+			<span id="PoolDetailSpan">
+				<lift:ignore>
+					<!--                        The poolUsers snippet *MUST* appear on the page before                        the editPool snippet                        -->
+					</lift:ignore>
+				<lift:poolDetail the_pool_id="PoolDetailSpan">
+					<fieldset>
+						<legend>
+							<b><lift:loc>ui_pool_title_details</lift:loc></b>
+							<i>
+								<pool:name/>
+							</i>
+						</legend>
+						<br/>
+						<table class="tablesorter">
+							<thead>
+								<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: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">
+				<lift:ignore>
+					<!--                        The poolUsers snippet *MUST* appear on the page before                        the editPool snippet                        -->
+					</lift:ignore>
+				<lift:poolUsers the_id="PoolSpan">
+					<fieldset>
+						<legend>
+							<b><lift:loc>ui_pool_list_users</lift:loc></b>
+						</legend>
+						<br/>
+						<table id="esme-table" class="tablesorter">
+							<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>
+							<tbody>
+								<pool:user>
+									<tr>
+										<td>
+											<user:name/>
+										</td>
+										<td>
+											<user:privilege/>
+										</td>
+									</tr>
+								</pool:user>
+							</tbody>
+						</table>
+						<br/>
+					</fieldset>
+					<br/>
+					<div class="post-form-row">
+						<div class="submit-btn tipelement" title="Add a user to an existing pool." >
+							<input type="image" onclick="javascript:$('#dialog-form-user').dialog('open')" id="create-user" src="../images/add1.gif"/>
+						</div>
+					</div>
+				</lift:poolUsers>
+			</span>
+			<fieldset>
+				<lift:form>
+					<lift:editPool class="inputBox2" >
+						<lift:loc>ui_pool_edit_label</lift:loc>
+						<edit:pool class="tipelement" title="Select a pool to edit"/>
+					</lift:editPool>
+				</lift:form>
+			</fieldset>
+			<div id="dialog-form" title="Create new  pool" style="display: none">
+				<p class="validateTips">
+					<lift:loc>ui_form_all_fields_required</lift:loc>
+				</p>
+				<form id="pool_new_dialog" onsubmit="false">
+					<lift:addPool>
+						<fieldset>
+							<label for="poolName">
+								<lift:loc>ui_pool_add</lift:loc>
+							</label>
+							<add:poolName class="text ui-widget-content ui-corner-all tipelement" title="This is name of your new pool" />
+						</fieldset>
+					</lift:addPool>
+				</form>
+			</div>
+			<div id="dialog-form-user" title="Add a user to a pool" style="display: none">
+				<p class="validateTips">
+					<lift:loc>ui_form_all_fields_required</lift:loc>
+				</p>
+				<form id="pool_new_user_dialog" onsubmit="false">
+					<lift:editPool>
+						<fieldset>
+							<label for="poolName">
+								<lift:loc>ui_pool_add</lift:loc>
+							</label>
+							<edit:username class="text ui-widget-content ui-corner-all tipelement" title="This is the user that will be added to a pool." />
+							<label for="permission">
+								<lift:loc>ui_pool_list_user_role</lift:loc>
+							</label>
+							<edit:permission class="text ui-widget-content ui-corner-all tipelement" title="This is the type of permission that the new user will have." />
+						</fieldset>
+					</lift:editPool>
+				</form>
+			</div>
+		</div>
 	</div>
 	<!-- End demo -->
-</lift:surround>
\ No newline at end of file
+</lift:surround>

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=936190&r1=936189&r2=936190&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 Wed Apr 21 08:06:08 2010
@@ -28,57 +28,57 @@
 					<div id="form-signup">
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_nickname</lift:loc></label>
-								<user:nickname class="inputBox2"/>
+								<user:nickname class="inputBox2  tipelement" title="This is nickname that other users will use communicate with you."/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_firstname</lift:loc></label>
-								<user:firstName class="inputBox2"/>
+								<user:firstName class="inputBox2 tipelement" title="This is your first name."/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_lastname</lift:loc></label>
-								<user:lastName class="inputBox2"/>
+								<user:lastName class="inputBox2 tipelement" title="This is your last name."/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_image_url</lift:loc></label>
-								<user:imageURL class="inputBox2"/>
+								<user:imageURL class="inputBox2 tipelement" title="This is the URL that points to your avatar picture. You can use Gravatar.com to store your avatar images."/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_timezone</lift:loc></label>
-								<user:timezone class="inputBox2"/>
+								<user:timezone class="inputBox2 tipelement" title="This is the timezone in which you are located."/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_locale</lift:loc></label>
-								<user:locale class="inputBox2"/>
+								<user:locale class="inputBox2 tipelement" title="This is your language setting that influences which language is used in the UI. "/>
 							</div>
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_login_email</lift:loc></label>
-								<user:email class="inputBox2"/>
+								<user:email class="inputBox2 tipelement" title="This is your email. "/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_login_password</lift:loc></label>
-								<user:password class="inputBox2"/>
+								<user:password class="inputBox2 tipelement" title="This is your password"/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_login_password_repeat</lift:loc></label>
-								<user:confirm class="inputBox2"/>
+								<user:confirm class="inputBox2 tipelement" title="Please enter your password again to make sure that it is correct"/>
 							</div>	
 							
 							<div class="post-form-row">
 								<label><lift:loc>ui_sign_up_openid</lift:loc></label>
-								<user:openid class="inputBox2"/>
+								<user:openid class="inputBox2 tipelement" title="This is your OpenID URL."/>
 							</div>	
 							
 							<div class="post-form-row">
 								<div class="submit-btn">
-									<user:save type="image" src="/images/btn-save.gif" />
+									<user:save type="image" src="/images/btn-save.gif" class="tipelement" title="Save your changes!"/>
 								</div>
 							</div>	
 							

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=936190&r1=936189&r2=936190&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 Wed Apr 21 08:06:08 2010
@@ -50,15 +50,16 @@
                     <div id="top-menu">
                         <ul>
                             <li>
-                                 <lift:Menu.item donthide="true" name="public"/> | 
+                                 <lift:Menu.item donthide="true" name="public" a:class="tipelement" a:title="The public timeline includes messages from all users not only those you are following. "/>  |  
                             </li>
                             <li>
-                              <lift:Menu.item donthide="true" name="list_users"/> | 
+                              <lift:Menu.item donthide="true" name="list_users" a:class="tipelement" a:title="Users are listed along with their details. "/>  | 
                             </li>
                              <li>
-                              <lift:Menu.item donthide="true" name="streams" />  
+                               <lift:Menu.item donthide="true" name="streams" a:class="tipelement" a:title="Streams allow you to view pools or the messages sent by particular users. "/>
                             </li>
                         </ul>
+
                         <lift:Menu.item name="logout">
                            <img src="../images/btn-signout.gif" alt="" class="tipelement" title="Log out of ESME." />
                          </lift:Menu.item>
@@ -78,26 +79,27 @@
                         </div>
                         <ul class="main-links">
                            <li>
-                                <lift:Menu.item donthide="true" name="Home"/>
+                                <lift:Menu.item donthide="true" name="Home" a:class="tipelement" a:title="This is the your timeline."/>
                             </li>
                             <li>
-                                <lift:Menu.item donthide="true" name="profile"/>     
+                                <lift:Menu.item donthide="true" name="profile" a:class="tipelement" a:title="You can change your profile."/>     
                             </li>
                             <li>
-                                <lift:Menu.item donthide="true" name="trackMgt"/>
+                                <lift:Menu.item donthide="true" name="trackMgt" a:class="tipelement" a:title="You can track words."/>
                             </li>
                             <li>
-                                <lift:Menu.item donthide="true" name="actionMgt"/>
+                                <lift:Menu.item donthide="true" name="actionMgt" a:class="tipelement" a:title="You can create actions to fire when certain events occur"/>
                             </li>
                             <li>
-                                <lift:Menu.item donthide="true" name="authToken"/>
+                                <lift:Menu.item donthide="true" name="authToken" a:class="tipelement" a:title="You can create tokens to use when accessing ESME via other clients."/>
                             </li>
                             <li>
-                                <lift:Menu.item donthide="true" name="accessPools"/>
+                                <lift:Menu.item donthide="true" name="accessPools" a:class="tipelement" a:title="You can create access pools to restrict access top certain messages."/>
                             </li>
                             <li>
-                                <lift:Menu.item donthide="true" name="contacts"/>
+                                <lift:Menu.item donthide="true" name="contacts" a:class="tipelement" a:title="You can manage your followers and those you follow."/>
                             </li>
+
                         </ul><!--search form-->
                         <form action="/info_view/search" method="post">
                             <div id="search">
@@ -108,11 +110,11 @@
                                     <input type="image" onclick="javascript:form.submit();" src="../images/btn-search.gif" style="padding:0;"/>
                                 </div>
                             </div>
-                        </form><!--search form--><h3><a href=""><lift:loc>ui_messages_message_label_tag_cloud</lift:loc></a></h3>
+                        </form><!--search form--><h3><a href=""  class ="tipelement" title="These are tags that appear often in your timeline."><lift:loc>ui_messages_message_label_tag_cloud</lift:loc></a></h3>
                        <div class="right-content">
                              <lift:comet type="TagCloud"/>
                         </div>
-                        <h3><a href=""><lift:loc>ui_messages_message_label_popular</lift:loc></a></h3>
+                        <h3><a href="" class ="tipelement" title="These are popular messages that users have resent often"><lift:loc>ui_messages_message_label_popular</lift:loc></a></h3>
                         <div class="right-content">
                                         <lift:UserSnip.popular>
                                         <ul>
@@ -124,7 +126,7 @@
                                         </ul>
                                     </lift:UserSnip.popular> 
                                      </div>
-                        <h3><a href=""><lift:loc>ui_messages_message_label_popular_links</lift:loc></a></h3>
+                        <h3><a href="" class ="tipelement" title="These are popular links that users have clicked often."><lift:loc>ui_messages_message_label_popular_links</lift:loc></a></h3>
                         <div class="right-content">
                                   <lift:UserSnip.links>
                                         <ul>

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html?rev=936190&r1=936189&r2=936190&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html Wed Apr 21 08:06:08 2010
@@ -17,18 +17,22 @@
  under the License.                                           *
 -->
 <lift:xml_group>
-<div class="post-form-row">
-								<label><lift:loc>ui_login_email</lift:loc></label>
-								<signup:email class="inputBox2"/>
-							</div>	
-							
-							<div class="post-form-row">
-								<label><lift:loc>ui_login_password</lift:loc></label>
-								<signup:pwd1 class="inputBox2"/>
-							</div>	
-							
-							<div class="post-form-row">
-								<label> <lift:loc>ui_login_password_repeat</lift:loc></label>
-								<signup:pwd2 class="inputBox2"/>
-							</div>	
+	<div class="post-form-row">
+		<label>
+			<lift:loc>ui_login_email</lift:loc>
+		</label>
+		<signup:email class="inputBox2 tipelement" title="This is your email. "/>
+	</div>
+	<div class="post-form-row">
+		<label>
+			<lift:loc>ui_login_password</lift:loc>
+		</label>
+		<signup:pwd1 class="inputBox2 tipelement" title="This is your password"/>
+	</div>
+	<div class="post-form-row">
+		<label>
+			<lift:loc>ui_login_password_repeat</lift:loc>
+		</label>
+		<signup:pwd2 class="inputBox2" title="Please enter your password again to make sure that it is correct"/>
+	</div>
 </lift:xml_group>

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=936190&r1=936189&r2=936190&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 Apr 21 08:06:08 2010
@@ -17,85 +17,80 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-<head>
-	<!-- STYLESHEETS  -->  
-	<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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_track.js">    </script>
+	<head>
+		<!-- STYLESHEETS  -->
+		<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.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_track.js">    </script>
 		<lift:TableSorterSnip/>
-		    <script type="text/javascript" src="../scripts/esme.js">
-    </script>
-    <script type="text/javascript" src="../scripts/esme_table_sorter_track.js"></script>
+		<script type="text/javascript" src="../scripts/esme.js">    </script>
+		<script type="text/javascript" src="../scripts/esme_table_sorter_track.js"></script>
 	</head>
-	
-<div id="back-header">
-	<h1><lift:loc>ui_track_manage</lift:loc></h1>
-<div class="container-settings">
- <div id="messages"></div>
-
-<span id="TrackSpan">
-					<lift:ignore>
-						<!--                        The displayTracking snippet *MUST* appear on the page before                        the main snippet                        -->
-						</lift:ignore>
-					<lift:displayTracking the_id="TrackSpan">
-						<table id="esme-table" class="tablesorter">
-							<thead>
-								<tr>
-									<th>
-										<lift:loc>ui_track_manage_track</lift:loc>
-									</th>
-									<th>
-										<lift:loc>ui_track_manage_active</lift:loc>
-									</th>
-									<th>
-										
-									</th>
+	<div id="back-header">
+		<h1>
+			<lift:loc>ui_track_manage</lift:loc>
+		</h1>
+		<div class="container-settings">
+			<div id="messages"></div>
+			<span id="TrackSpan">
+				<lift:ignore>
+					<!--                        The displayTracking snippet *MUST* appear on the page before                        the main snippet                        -->
+					</lift:ignore>
+				<lift:displayTracking the_id="TrackSpan">
+					<table id="esme-table" class="tablesorter">
+						<thead>
+							<tr>
+								<th class="tipelement" title="This is the text that you are tracking.">
+									<lift:loc>ui_track_manage_track</lift:loc>
+								</th>
+								<th class="tipelement" title="Whether this text is being tracked or not.">
+									<lift:loc>ui_track_manage_active</lift:loc>
+								</th>
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+							<disp:item>
+								<tr class ="esme-tr">
+									<td>
+										<item:pattern/>
+									</td>
+									<td>
+										<item:enabled/>
+									</td>
+									<td align="center">
+										<item:remove/>
+									</td>
 								</tr>
-							</thead>
-							<tbody>
-								<disp:item>
-									<tr class ="esme-tr">
-										<td>
-											<item:pattern/>
-										</td>
-										<td>
-											<item:enabled/>
-										</td>
-										<td align="center">
-											<item:remove/>
-										</td>
-									</tr>
-								</disp:item>
-							</tbody>
-						</table>
-					</lift:displayTracking>
-				</span>
-
-
-<div id="dialog-form" style="display: none" title="Create a new track">
-	<p class="validateTips"><lift:loc>ui_form_all_fields_required</lift:loc></p>
-
-       <form id="track_new_dialog" onsubmit="false">
-
-       <lift:main>
-	<fieldset>
-		<label for="name"><lift:loc>ui_track_new_track_what</lift:loc></label>
-		<main:track class="text ui-widget-content ui-corner-all tipelement" title="This is the text that you want to follow." />
-	</fieldset>
-	</lift:main>
-       </form>
-</div>
-
-<div class="post-form-row">
-								<div class="submit-btn tipelement" title="Create a new track" >
-								        <input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-user" src="../images/new1.gif" />
-								</div>
-							</div>
-
-
-
-</div><!-- End demo -->
-</div><!-- End demo -->
-</lift:surround>
\ No newline at end of file
+							</disp:item>
+						</tbody>
+					</table>
+				</lift:displayTracking>
+			</span>
+			<div id="dialog-form" style="display: none" title="Create a new track">
+				<p class="validateTips">
+					<lift:loc>ui_form_all_fields_required</lift:loc>
+				</p>
+				<form id="track_new_dialog" onsubmit="false">
+					<lift:main>
+						<fieldset>
+							<label for="name">
+								<lift:loc>ui_track_new_track_what</lift:loc>
+							</label>
+							<main:track class="text ui-widget-content ui-corner-all tipelement" title="This is the text that you want to follow." />
+						</fieldset>
+					</lift:main>
+				</form>
+			</div>
+			<div class="post-form-row">
+				<div class="submit-btn tipelement" title="Create a new track" >
+					<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-user" src="../images/new1.gif" />
+				</div>
+			</div>
+		</div>
+		<!-- End demo -->
+		</div>
+	<!-- End demo -->
+	</lift:surround>



Mime
View raw message