You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2009/11/09 08:52:08 UTC
svn commit: r833989 [1/2] - in /incubator/esme/trunk/server/src/main/webapp:
action_view/ auth_view/ info_view/ pools_view/ static/ templates-hidden/
track_view/ user_template/
Author: rhirsch
Date: Mon Nov 9 07:52:07 2009
New Revision: 833989
URL: http://svn.apache.org/viewvc?rev=833989&view=rev
Log:
HTML Formatted + added Tablesorter on many pages
Modified:
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/info_view/conversation.html
incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
incubator/esme/trunk/server/src/main/webapp/info_view/user.html
incubator/esme/trunk/server/src/main/webapp/info_view/users.html
incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
incubator/esme/trunk/server/src/main/webapp/static/about.html
incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html
incubator/esme/trunk/server/src/main/webapp/templates-hidden/login.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
incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html
incubator/esme/trunk/server/src/main/webapp/track_view/index.html
incubator/esme/trunk/server/src/main/webapp/user_template/edit.html
incubator/esme/trunk/server/src/main/webapp/user_template/login.html
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=833989&r1=833988&r2=833989&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 Nov 9 07:52:07 2009
@@ -3,6 +3,15 @@
<lift:Style.header />
<lift:TableSorterSnip/>
+
+
+ <!-- STYLESHEETS <lift:Style.header />
+ <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
+
+-->
+
+
+
<!-- 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" />
@@ -12,12 +21,10 @@
<!--[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>
+ <!-- JAVASCRIPT -->
<script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="../scripts/esme.js"></script>
<script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
-
<div class="demo">
@@ -28,7 +35,7 @@
<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">
+ <span id="TokenSpan">
<lift:ignore>
<!--
The displayActions snippet *MUST* appear on the page before
@@ -39,17 +46,16 @@
<table id="esme-table" class="tablesorter">
<thead>
<tr>
- <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_create_date</lift:loc></b></td>
- <td halign="center"><b><lift:loc>ui_action_table_delete</lift:loc></b></td>
+ <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><lift:loc>ui_action_table_delete</lift:loc></th>
</tr>
</thead>
-
- <disp:item>
- <tbody>
+ <tbody>
+ <disp:item>
<tr>
<td><item:name/></td>
<td><item:enabled/></td>
@@ -60,11 +66,10 @@
<item:remove><img src="/images/delete.png"/></item:remove>
</td>
</tr>
- </tbody>
- </disp:item>
-
+ </disp:item>
+ </tbody>
</table>
- </lift:displayActions>
+ </lift:displayActions>
</span>
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
@@ -121,4 +126,5 @@
</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=833989&r1=833988&r2=833989&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 Nov 9 07:52:07 2009
@@ -1,70 +1,85 @@
<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>
-
-<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_token_title_manage</lift:loc></a></li>
- <li class="ui-state-default ui-corner-top"><a href="#tabs-2"><lift:loc>ui_token_title_create</lift:loc></a></li>
- </ul>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
- <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 border="1">
- <tr>
- <td halign="center"><b><lift:loc>ui_token_create_description</lift:loc></b></td>
- <td halign="center"><b><lift:loc>ui_token_list_token</lift:loc></b></td>
- <td halign="center"><b><lift:loc>ui_token_list_create</lift:loc></b></td>
- <td halign="center"><b><lift:loc>ui_token_revoke</lift:loc></b></td>
- </tr>
- <disp:item>
- <tr>
- <td><item:description/></td>
- <td><item:uniqueId/></td>
- <td><item:createdDate/></td>
- <td>
- <item:revoke><img src="/images/delete.png"/></item:revoke>
- </td>
- </tr>
- </disp:item>
- </table>
- </lift:displayTokens>
- </span>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
-
- <lift:form>
- <lift:main>
- <lift:loc>ui_token_create_description</lift:loc>
- <main:token/>
- <input type="submit" value="Add" />
- </lift:main>
- </lift:form>
- </div>
-</div>
-
-</div><!-- End demo -->
-</lift:surround>
+ <lift:Style.header/><lift:TableSorterSnip/><!-- 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-ui-1.7.2.custom.min.js">
+ </script>
+ <script type="text/javascript" src="../scripts/esme.js">
+ </script>
+ <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+ </script>
+ <div 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_token_title_manage</lift:loc></a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-2"><lift:loc>ui_token_title_create</lift:loc></a>
+ </li>
+ </ul>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+ <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>
+ <lift:loc>ui_token_revoke</lift:loc>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <disp:item>
+ <tr>
+ <td>
+ <item:description/>
+ </td>
+ <td>
+ <item:uniqueId/>
+ </td>
+ <td>
+ <item:createdDate/>
+ </td>
+ <td>
+ <item:revoke>
+ <img src="/images/delete.png"/>
+ </item:revoke>
+ </td>
+ </tr>
+ </disp:item>
+ </tbody>
+ </table>
+ </lift:displayTokens>
+ </span>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <lift:form>
+ <lift:main>
+ <lift:loc>ui_token_create_description</lift:loc>
+ <main:token/><input type="submit" value="Add" />
+ </lift:main>
+ </lift:form>
+ </div>
+ </div>
+ </div><!-- End demo -->
+</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html Mon Nov 9 07:52:07 2009
@@ -1,14 +1,16 @@
<lift:surround with="default" at="content">
<fieldset>
- <legend>Conversation</legend>
- <lift:displayConversation>
- <disp:item>
- <ul>
- <li><item:text/></li>
- </ul>
- </disp:item>
- </lift:displayConversation>
+ <legend>
+ Conversation
+ </legend>
+ <lift:displayConversation>
+ <disp:item>
+ <ul>
+ <li>
+ <item:text/>
+ </li>
+ </ul>
+ </disp:item>
+ </lift:displayConversation>
</fieldset>
-
-</lift:surround>
-
+</lift:surround>
\ No newline at end of file
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=833989&r1=833988&r2=833989&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 Mon Nov 9 07:52:07 2009
@@ -1,70 +1,117 @@
<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>
-
- <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>
- <!--
- The displayStreams snippet *MUST* appear on the page before
- the main snippet
- -->
- </lift:ignore>
- <lift:displayStream the_id="StreamSpan">
- <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>
-
- <tbody>
- <disp:item>
- <tr><td><item:author/></td> <td><item:text/></td> <td><item:date/></td></tr>
- </disp:item>
- </tbody>
- </table>
- </lift:displayStream>
- </span>
-
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
-
-
- <lift:streamFilters>
- <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>
+ <lift:Style.header/><lift:TableSorterSnip/><!-- 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-ui-1.7.2.custom.min.js">
+ </script>
+ <script type="text/javascript" src="../scripts/esme.js">
+ </script>
+ <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+ </script>
+ <div 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>
+ <!--
+ The displayStreams snippet *MUST* appear on the page before
+ the main snippet
+ -->
+ </lift:ignore>
+ <lift:displayStream the_id="StreamSpan">
+ <table id="esme-table" class="tablesorter">
+ <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>
+ <tbody>
+ <disp:item>
+ <tr>
+ <td>
+ <item:author/>
+ </td>
+ <td>
+ <item:text/>
+ </td>
+ <td>
+ <item:date/>
+ </td>
+ </tr>
+ </disp:item>
+ </tbody>
+ </table>
+ </lift:displayStream>
+ </span>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <lift:streamFilters>
+ <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>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/tag.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/tag.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/tag.html Mon Nov 9 07:52:07 2009
@@ -1,18 +1,26 @@
<lift:surround with="default" at="content">
- <lift:tag_display>
- <div>
- <fieldset>
- <legend><tag:name/></legend>
- <table>
- <tag:each>
- <tr>
- <td><item:author/></td>
- <td><item:body/></td>
- <td><item:date/></td>
- </tr>
- </tag:each>
- </table>
- </fieldset>
- </div>
- </lift:tag_display>
+ <lift:tag_display>
+ <div>
+ <fieldset>
+ <legend>
+ <tag:name/>
+ </legend>
+ <table>
+ <tag:each>
+ <tr>
+ <td>
+ <item:author/>
+ </td>
+ <td>
+ <item:body/>
+ </td>
+ <td>
+ <item:date/>
+ </td>
+ </tr>
+ </tag:each>
+ </table>
+ </fieldset>
+ </div>
+ </lift:tag_display>
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/user.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/user.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/user.html Mon Nov 9 07:52:07 2009
@@ -1,82 +1,87 @@
<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>
-
-<div class="demo">
-
-<lift:user_info>
-
-<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"><user:nicename/><lift:loc>ui_user_timeline</lift:loc></a></li>
- <li class="ui-state-default ui-corner-top"><a href="#tabs-2"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a></li>
- <li class="ui-state-default ui-corner-top"><a href="#tabs-3"><lift:loc>ui_user_contacts</lift:loc></a></li>
- </ul>
-
-
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
- <dl class="messages">
- <span id="following"><user:followButton/></span>
- <dd>
- <table id="esme-table" class="tablesorter">
- <user:timeline>
- <tr>
- <td><item:author/></td>
- <td><item:body/></td>
- <td><item:date/></td>
- </tr>
- </user:timeline>
- </table>
- </dd>
- </dl>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
- <dl class="">
- <dd class="b-clouds">
- <table>
- <user:messages>
- <tr>
- <td><item:author/></td>
- <td><item:body/></td>
- <td><item:date/></td>
- </tr>
- </user:messages>
- </table>
- </dd>
- </dl>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
-
- <dl class="">
- <dd class="b-contacts" style="height: 240px; overflow: auto">
- <b><lift:loc>ui_user_following</lift:loc></b>
- <lift:UserSnip.following user:userId=""/>
- </dd>
- <dd class="b-contacts" style="height: 240px; overflow: auto">
- <b><lift:loc>ui_user_followers</lift:loc></b>
- <lift:UserSnip.followers user:userId=""/>
- </dd>
- </dl>
- </div>
-
-</div>
- </lift:user_info>
-
-</div><!-- End demo -->
-
-</lift:surround>
-
+ <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">
+ <lift:user_info>
+ <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"><user:nicename/><lift:loc>ui_user_timeline</lift:loc></a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-2"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-3"><lift:loc>ui_user_contacts</lift:loc></a>
+ </li>
+ </ul>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+ <dl class="messages">
+ <span id="following"><user:followButton/></span>
+ <dd>
+ <table id="esme-table" class="tablesorter">
+ <user:timeline>
+ <tr>
+ <td>
+ <item:author/>
+ </td>
+ <td>
+ <item:body/>
+ </td>
+ <td>
+ <item:date/>
+ </td>
+ </tr>
+ </user:timeline>
+ </table>
+ </dd>
+ </dl>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <dl class="">
+ <dd class="b-clouds">
+ <table>
+ <user:messages>
+ <tr>
+ <td>
+ <item:author/>
+ </td>
+ <td>
+ <item:body/>
+ </td>
+ <td>
+ <item:date/>
+ </td>
+ </tr>
+ </user:messages>
+ </table>
+ </dd>
+ </dl>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
+ <dl class="">
+ <dd class="b-contacts" style="height: 240px; overflow: auto">
+ <b><lift:loc>ui_user_following</lift:loc></b>
+ <lift:UserSnip.following user:userId=""/>
+ </dd>
+ <dd class="b-contacts" style="height: 240px; overflow: auto">
+ <b><lift:loc>ui_user_followers</lift:loc></b>
+ <lift:UserSnip.followers user:userId=""/>
+ </dd>
+ </dl>
+ </div>
+ </div>
+ </lift:user_info>
+ </div><!-- End demo -->
+</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/users.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/users.html Mon Nov 9 07:52:07 2009
@@ -1,30 +1,53 @@
<lift:surround with="default" at="content">
-
- <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
-
- <lift:TableSorterSnip/>
-
+ <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+ </script>
+ <lift:TableSorterSnip/>
<fieldset style="width: 80em">
- <legend><lift:loc>ui_user_list_title</lift:loc></legend>
- <table id="esme-table" class="tablesorter">
- <thead>
-
- <tr><th></th><th><lift:loc>ui_user_list_nickname</lift:loc></th><th><lift:loc>ui_user_list_name</lift:loc></th><th><lift:loc>ui_user_list_last_message</lift:loc></th><th><lift:loc>ui_user_list_last_message_date</lift:loc></th></tr>
- </thead>
- <tbody>
- <lift:displayUsers>
- <disp:item>
- <tr>
- <td><item:imageUrl/></td>
- <td><item:nickname/></td>
- <td><item:firstName/> <item:lastName/></td>
- <td><item:lastMsg/></td>
- <td><item:lastMsgWhen/></td>
- </tr>
- </disp:item>
- </lift:displayUsers>
+ <legend>
+ <lift:loc>ui_user_list_title</lift:loc>
+ </legend>
+ <table id="esme-table" class="tablesorter">
+ <thead>
+ <tr>
+ <th>
+ </th>
+ <th>
+ <lift:loc>ui_user_list_nickname</lift:loc>
+ </th>
+ <th>
+ <lift:loc>ui_user_list_name</lift:loc>
+ </th>
+ <th>
+ <lift:loc>ui_user_list_last_message</lift:loc>
+ </th>
+ <th>
+ <lift:loc>ui_user_list_last_message_date</lift:loc>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <lift:displayUsers>
+ <disp:item>
+ <tr>
+ <td>
+ <item:imageUrl/>
+ </td>
+ <td>
+ <item:nickname/>
+ </td>
+ <td>
+ <item:firstName/><item:lastName/>
+ </td>
+ <td>
+ <item:lastMsg/>
+ </td>
+ <td>
+ <item:lastMsgWhen/>
+ </td>
+ </tr>
+ </disp:item>
+ </lift:displayUsers>
</tbody>
- </table>
+ </table>
</fieldset>
-
-</lift:surround>
+</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=833989&r1=833988&r2=833989&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 Mon Nov 9 07:52:07 2009
@@ -1,111 +1,154 @@
<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>
-<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_create</lift:loc></a></li>
- <li class="ui-state-default ui-corner-top"><a href="#tabs-2"><lift:loc>ui_pool_manage</lift:loc></a></li>
- </ul>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
-
- <lift:form>
- <lift:addPool>
- <lift:loc>ui_pool_add</lift:loc><add:poolName/>
- <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
- 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 border="1">
- <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 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> <th><lift:loc>ui_pool_add_actions</lift:loc></th></tr>
- </thead>
-
- <tbody>
- <pool:user>
- <tr> <td><user:name/></td> <td><user:privilege/></td> <td><user:operations/></td></tr>
- </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/>
- <lift:loc>ui_pool_edit_name</lift:loc><edit:username/> <edit:permission/> <br/>
- <input type="submit" value="Edit" />
- </lift:editPool>
- </lift:form>
- </fieldset>
- </div>
-</div>
-
-</div><!-- End demo -->
-</lift:surround>
+ <lift:Style.header/><lift:TableSorterSnip/><!-- 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-ui-1.7.2.custom.min.js">
+ </script>
+ <script type="text/javascript" src="../scripts/esme.js">
+ </script>
+ <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+ </script>
+ <div 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_create</lift:loc></a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-2"><lift:loc>ui_pool_manage</lift:loc></a>
+ </li>
+ </ul>
+ <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+ <lift:form>
+ <lift:addPool>
+ <lift:loc>ui_pool_add</lift:loc>
+ <add:poolName/><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
+ 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>
+ <th>
+ <lift:loc>ui_pool_add_actions</lift:loc>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <pool:user>
+ <tr>
+ <td>
+ <user:name/>
+ </td>
+ <td>
+ <user:privilege/>
+ </td>
+ <td>
+ <user:operations/>
+ </td>
+ </tr>
+ </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/>
+ <lift:loc>ui_pool_edit_name</lift:loc>
+ <edit:username/><edit:permission/>
+ <br/>
+ <input type="submit" value="Edit" />
+ </lift:editPool>
+ </lift:form>
+ </fieldset>
+ </div>
+ </div>
+ </div><!-- End demo -->
+</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/static/about.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/static/about.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/static/about.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/static/about.html Mon Nov 9 07:52:07 2009
@@ -1,19 +1,21 @@
<lift:surround with="default" at="content">
- <p>
- ESME (Enterprise Social Messaging Experiment) is a social tool that
- takes the immediacy of messaging and applies it to real time business
- process problem solving. Taking the concepts embodied in social
- networks such as tags and groups, ESME provides the business
- communications framework that allows for the fastest and most reliable
- way of discovering the best solution to everyday problems for people
- working in peer and extended networks. It reduces the risk of applying
- suboptimal solutions by surfacing the right people at the right time
- who can apply expertise to a given situation, allows the participation
- of mobile workers, integrates to existing systems and provides for
- contextually appropriate document attachments.
- </p>
-
- <p>Read more at the <a href="http://blog.esme.us">ESME Blog</a>.</p>
-
- <p>Email us at <a href="mailto:feedback@esme.us">feedback@esme.us</a></p>
+ <p>
+ ESME (Enterprise Social Messaging Experiment) is a social tool that
+ takes the immediacy of messaging and applies it to real time business
+ process problem solving. Taking the concepts embodied in social
+ networks such as tags and groups, ESME provides the business
+ communications framework that allows for the fastest and most reliable
+ way of discovering the best solution to everyday problems for people
+ working in peer and extended networks. It reduces the risk of applying
+ suboptimal solutions by surfacing the right people at the right time
+ who can apply expertise to a given situation, allows the participation
+ of mobile workers, integrates to existing systems and provides for
+ contextually appropriate document attachments.
+ </p>
+ <p>
+ Read more at the <a href="http://blog.esme.us">ESME Blog</a>.
+ </p>
+ <p>
+ Email us at <a href="mailto:feedback@esme.us">feedback@esme.us</a>
+ </p>
</lift:surround>
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html Mon Nov 9 07:52:07 2009
@@ -1,54 +1,63 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/"
- xml:lang="eng">
- <head>
- <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
- <title><lift:loc>ui_default_title</lift:loc></title>
-
- <lift:Style.header />
-
- <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
- <script id="json" src="/classpath/json.js" type="text/javascript"/>
-
- </head>
-
- <body>
- <div class="container">
-
- <div class="head">
- <a class="logo" href="/"><img src="/images/esme.png" alt="ESME" /></a>
-
- <ul class="b-primary">
- <li><lift:Menu.item name="sign_up"/></li>
- <li><lift:Menu.item name="EditUser"/></li>
- <li><lift:Menu.item name="about"/></li>
- <li><lift:Menu.item name="list_users"/></li>
- <li><lift:Menu.item name="trackMgt"/></li>
- <li><lift:Menu.item name="actionMgt"/></li>
- <li><lift:Menu.item name="authToken"/></li>
- <li><lift:Menu.item name="accessPools"/></li>
- <li><lift:Menu.item name="streams"/></li>
- <li><lift:Menu.item name="logout"/></li>
- </ul>
- </div>
-
- <table>
- <tr>
- <td width="75%">
- <div>
- <lift:bind name="content" />
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/" xml:lang="eng">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+ <title><lift:loc>ui_default_title</lift:loc></title>
+ <lift:Style.header/><script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/>
+ </head>
+ <body>
+ <div class="container">
+ <div class="head">
+ <a class="logo" href="/"><img src="/images/esme.png" alt="ESME" /></a>
+ <ul class="b-primary">
+ <li>
+ <lift:Menu.item name="sign_up"/>
+ </li>
+ <li>
+ <lift:Menu.item name="EditUser"/>
+ </li>
+ <li>
+ <lift:Menu.item name="about"/>
+ </li>
+ <li>
+ <lift:Menu.item name="list_users"/>
+ </li>
+ <li>
+ <lift:Menu.item name="trackMgt"/>
+ </li>
+ <li>
+ <lift:Menu.item name="actionMgt"/>
+ </li>
+ <li>
+ <lift:Menu.item name="authToken"/>
+ </li>
+ <li>
+ <lift:Menu.item name="accessPools"/>
+ </li>
+ <li>
+ <lift:Menu.item name="streams"/>
+ </li>
+ <li>
+ <lift:Menu.item name="logout"/>
+ </li>
+ </ul>
</div>
- </td>
- <td>
- <lift:UserSnip.loginForm />
- <lift:msgs/>
- </td>
- </tr>
- </table>
-
- </div>
-
- <div class="foot">
- <center><lift:loc>ui_default_footer</lift:loc></center>
- </div>
- </body>
+ <table>
+ <tr>
+ <td width="75%">
+ <div>
+ <lift:bind name="content" />
+ </div>
+ </td>
+ <td>
+ <lift:UserSnip.loginForm/><lift:msgs/>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="foot">
+ <center>
+ <lift:loc>ui_default_footer</lift:loc>
+ </center>
+ </div>
+ </body>
</html>
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/login.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/login.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/login.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/login.html Mon Nov 9 07:52:07 2009
@@ -1,57 +1,62 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="eng">
- <head>
- <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
- <title>Enterprise Social Messaging Experiment</title>
-
- <lift:Style.header />
-
- <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
- <script id="json" src="/classpath/json.js" type="text/javascript"/>
-
- </head>
- <body>
- <div class="container">
-
- <div class="head">
- <a class="logo" href="/"><img src="/images/esme.png" alt="ESME" /></a>
-
- <ul class="b-primary">
- <li><lift:Menu.item name="about"/></li>
- <li><lift:Menu.item name="Logout"/></li>
- </ul>
- </div>
-
- <table class="l-page l-page-login">
- <tr>
- <td class="l-page-l">
- <div class="b-sign-on">
- <h1 class="title">Welcome and Sign On</h1>
-
- <p><b>Brought to you by the Enterprise Social Messaging Experiment group.</b></p>
- <p><b>The best, brightest shinning stars in the microblogging space.</b></p>
- <p class="last">Send micromessages to your friends and colleagues, tag messages and create groups of contacts.</p>
- <p><lift:msgs/></p>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+ <title>Enterprise Social Messaging Experiment</title>
+ <lift:Style.header/><script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/>
+ </head>
+ <body>
+ <div class="container">
+ <div class="head">
+ <a class="logo" href="/"><img src="/images/esme.png" alt="ESME" /></a>
+ <ul class="b-primary">
+ <li>
+ <lift:Menu.item name="about"/>
+ </li>
+ <li>
+ <lift:Menu.item name="Logout"/>
+ </li>
+ </ul>
</div>
- </td>
- <td class="l-page-c"></td>
- <td class="l-page-r">
- <div class="l-top">
- <div class="b-open">
- <lift:bind name="content"/>
-
- <div class="open-id">
- <h3>Need an OpenID?</h3>
- <p>try: <a href="http://openid.yahoo.com">http://openid.yahoo.com</a> or <a href="http://www.myopenid.com">www.myopenid.com</a></p>
- </div>
- </div>
+ <table class="l-page l-page-login">
+ <tr>
+ <td class="l-page-l">
+ <div class="b-sign-on">
+ <h1 class="title">Welcome and Sign On</h1>
+ <p>
+ <b>Brought to you by the Enterprise Social Messaging Experiment group.</b>
+ </p>
+ <p>
+ <b>The best, brightest shinning stars in the microblogging space.</b>
+ </p>
+ <p class="last">
+ Send micromessages to your friends and colleagues, tag messages and create groups of contacts.
+ </p>
+ <p>
+ <lift:msgs/>
+ </p>
+ </div>
+ </td>
+ <td class="l-page-c">
+ </td>
+ <td class="l-page-r">
+ <div class="l-top">
+ <div class="b-open">
+ <lift:bind name="content"/>
+ <div class="open-id">
+ <h3>Need an OpenID?</h3>
+ <p>
+ try: <a href="http://openid.yahoo.com">http://openid.yahoo.com</a>
+ or <a href="http://www.myopenid.com">www.myopenid.com</a>
+ </p>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <div class="foot">
</div>
- </td>
- </tr>
- </table>
-
- <div class="foot"></div>
- </div>
- </body>
+ </div>
+ </body>
</html>