Author: rhirsch
Date: Wed Mar 17 07:59:49 2010
New Revision: 924184
URL: http://svn.apache.org/viewvc?rev=924184&view=rev
Log:
[ESME-100] Finish web UI
Daily hour
Modified:
incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
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/index.html
incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
incubator/esme/trunk/server/src/main/webapp/track_view/index.html
Modified: incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEBase.properties?rev=924184&r1=924183&r2=924184&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
(original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Wed Mar
17 07:59:49 2010
@@ -86,6 +86,8 @@ base_track_msg_active=Active state of th
base_streams_menu=Streams
base_streams_resend_any=--any--
base_streams_pool_default=--default--
+base_streams_filter_pool=Filtering by pool has changed
+base_streams_filter_pool_active=Now filtering with a pool
base_actions_menu=Actions
base_action_msg_new_action=A new action '%s' has been created.
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=924184&r1=924183&r2=924184&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Wed Mar 17
07:59:49 2010
@@ -31,7 +31,7 @@ ui_sign_up_timezone=Your Timezone
ui_sign_up_locale=Your Locale
ui_sign_up_openid=Your OpenID provider URL
-ui_login_email=Email
+ui_login_user=User
ui_login_password=Password
ui_login_password_repeat=Password (retype)
ui_login_login=Login
@@ -119,8 +119,8 @@ ui_streams_filter_type=Filter Type
ui_streams_active=Active
ui_streams_conditions=Conditions
-ui_login_user=Username:
-ui_login_password=Password:
+ui_login_user=User
+ui_login_password=Password
ui_open_id_title=OpenID
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=924184&r1=924183&r2=924184&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
(original)
+++
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
Wed Mar 17 07:59:49 2010
@@ -150,7 +150,7 @@ object StreamMgr {
"pools" -> ajaxSelect(pools,
Empty,
p => {pool = p.toLong
- redisplay()},
+
S.notice(S.?("base_streams_filter_pool_active"));redisplay()},
"id" -> poolInput),
"filterResent" -> ajaxCheckbox(false,
r_? => {filterResent = r_?
@@ -158,7 +158,7 @@ object StreamMgr {
"id" -> filterResentInput),
"filterPools" -> ajaxCheckbox(false,
p_? => {filterPools = p_?
- redisplay()},
+
S.notice(S.?("base_streams_filter_pool"));redisplay()},
"id" -> filterPoolsInput)
)
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=924184&r1=924183&r2=924184&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 Mar
17 07:59:49 2010
@@ -18,132 +18,181 @@
-->
<lift:surround with="base" at="left">
-
<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" />
- <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_action_title</lift:loc></a></li>
- <li class="ui-state-default ui-corner-top"><a
href="#tabs-2"><lift:loc>ui_action_new_action</lift:loc></a></li>
- <li class="ui-state-default ui-corner-top"><a
href="#tabs-3"><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">
- <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><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>
- <tbody>
- <disp:item>
- <tr>
- <td><item:name/></td>
- <td><item:enabled/></td>
- <td><item:test/></td>
- <td><item:action/></td>
- <td><item:createdDate/></td>
- <td>
- <item:remove><img src="/images/delete.png"/></item:remove>
- </td>
- </tr>
- </disp:item>
- </tbody>
- </table>
- </lift:displayActions>
- </span>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom
ui-tabs-hide" id="tabs-2">
- <lift:form>
- <lift:main>
- <table>
- <tr>
- <td><lift:loc>ui_action_new_action_name</lift:loc></td>
- <td><main:name/></td>
- </tr>
- <tr>
- <td><lift:loc>ui_action_new_action_test</lift:loc></td>
- <td><main:test/></td>
- </tr>
- <tr>
- <td><lift:loc>ui_action_new_action_action</lift:loc></td>
- <td><main:action/></td>
- </tr>
- <tr>
- <td></td><td><input type="submit" value="Add" /></td>
- </tr>
- </table>
- </lift:main>
- </lift:form>
+ <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_action_title</lift:loc>
+ </a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-2">
+
<lift:loc>ui_action_new_action</lift:loc>
+ </a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-3">
+
<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">
+ <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>
+
<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>
+ <tbody>
+ <disp:item>
+ <tr>
+
<td>
+
<item:name/>
+
</td>
+
<td>
+
<item:enabled/>
+
</td>
+
<td>
+
<item:test/>
+
</td>
+
<td>
+
<item:action/>
+
</td>
+
<td>
+
<item:createdDate/>
+
</td>
+
<td>
+
<item:remove>
+
<lift:loc>ui_action_table_delete</lift:loc>
+
</item:remove>
+
</td>
+ </tr>
+ </disp:item>
+ </tbody>
+ </table>
+ </lift:displayActions>
+ </span>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content
ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <lift:form>
+ <lift:main>
+ <table>
+ <tr>
+ <td>
+
<lift:loc>ui_action_new_action_name</lift:loc>
+ </td>
+ <td>
+
<main:name/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<lift:loc>ui_action_new_action_test</lift:loc>
+ </td>
+ <td>
+
<main:test/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<lift:loc>ui_action_new_action_action</lift:loc>
+ </td>
+ <td>
+
<main:action/>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <input
type="submit" value="Add" />
+ </td>
+ </tr>
+ </table>
+ </lift:main>
+ </lift:form>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content
ui-corner-bottom ui-tabs-hide" id="tabs-3">
+ <b>
+
<lift:loc>ui_action_new_action_test</lift:loc>
+ </b>
+ <br />
+ <p>
+ @foo -- sender is @foo<br />
+ day = (0,1) -- sent on Sunday or
Monday<br/>
+ #moo -- contains the #moo tag<br/>
+ 50% -- success 50% of the time<br/>
+ @foo & 50% -- half the time,
something sent by @foo<br/>
+ login -- user has logged in<br/>
+ followed -- user is being followed<br/>
+ unfollowed -- user is being
unfollowed<br/>
+ profile -- user changed profile<br/>
+ every N mins -- repeat action, N is an
integer<br/>
+ pool:[mypool] -- message is in access
pool mypool<br/>
+ resent:[user] -- message was resent by user
</p>
+ <br/>
+ <b>
+
<lift:loc>ui_action_new_action_action</lift:loc>
+ </b>
+ <br />
+ <p>
+ filter -- not put in your timeline<br />
+ resend -- sends the message to all your
followers<br />
+ mailto:f...@bar.com -- sends the
message to f...@bar.com<br/>
+ <a
href="http://foo.com/message/in";>http://foo.com/message/in</a> -- HTTP post, %s
expands to message<br/>
+ atom:<a
href="http://blog.com/feed.atom";>http://blog.com/feed.atom</a> -- posts new
messages from Atom feed<br/>
+ rss:<a
href="http://blog.com/feed.rss";>http://blog.com/feed.rss</a> -- posts new
messages from RSS feed </p>
+ </div>
+ </div>
</div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom
ui-tabs-hide" id="tabs-3">
- <b><lift:loc>ui_action_new_action_test</lift:loc></b><br />
- <p>
- @foo -- sender is @foo<br />
- day = (0,1) -- sent on Sunday or Monday<br/>
- #moo -- contains the #moo tag<br/>
- 50% -- success 50% of the time<br/>
- @foo & 50% -- half the time, something sent by @foo<br/>
- login -- user has logged in<br/>
- followed -- user is being followed<br/>
- unfollowed -- user is being unfollowed<br/>
- profile -- user changed profile<br/>
- every N mins -- repeat action, N is an integer<br/>
- pool:[mypool] -- message is in access pool mypool<br/>
- resent:[user] -- message was resent by user
- </p>
- <br/>
- <b><lift:loc>ui_action_new_action_action</lift:loc></b><br />
- <p>
- filter -- not put in your timeline<br />
- resend -- sends the message to all your followers<br />
- mailto:f...@bar.com -- sends the message to f...@bar.com<br/>
- http://foo.com/message/in -- HTTP post, %s expands to message<br/>
- atom:http://blog.com/feed.atom -- posts new messages from Atom
feed<br/>
- rss:http://blog.com/feed.rss -- posts new messages from RSS feed
- </p>
- </div>
-</div>
-
-</div><!-- End demo -->
-
-
+ <!-- End demo -->
+ <lift:Msgs>
+ <lift:error_msg>Error:</lift:error_msg>
+ <lift:notice_msg>FYI:</lift:notice_msg>
+ <lift:error_class>error_major</lift:error_class>
+ <lift:notice_msg>
+ <lift:loc>ui_base_note</lift:loc>
+ </lift:notice_msg>
+ <lift:notice_class>note_major</lift:notice_class>
+ </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=924184&r1=924183&r2=924184&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 Mar 17
07:59:49 2010
@@ -17,87 +17,104 @@
under the License. *
-->
<lift:surround with="base" at="left">
- <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: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:Msgs>
+ <lift:error_msg>Error:</lift:error_msg>
+ <lift:notice_msg>FYI:</lift:notice_msg>
+ <lift:error_class>error_major</lift:error_class>
+ <lift:notice_msg>
+ <lift:loc>ui_base_note</lift:loc>
+ </lift:notice_msg>
+ <lift:notice_class>note_major</lift:notice_class>
+ </lift:Msgs>
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/index.html?rev=924184&r1=924183&r2=924184&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/index.html Wed Mar 17 07:59:49
2010
@@ -18,65 +18,83 @@
-->
<lift:UserSnip.loggedIn>
- <logged:in>
- <lift:surround with="message" at="content"/>
- <lift:Msgs>
- <lift:error_msg>Error:</lift:error_msg>
- <lift:notice_msg>FYI:</lift:notice_msg>
- <lift:error_class>error_major</lift:error_class>
-
<lift:notice_msg><lift:loc>ui_base_note</lift:loc></lift:notice_msg>
- <lift:notice_class>note_major</lift:notice_class>
- </lift:Msgs>
- </logged:in>
- <logged:out>
- <lift:surround with="default" at="content">
- <!---BLUE HEADER-->
- <div id="container-2nd-level-bg">
- <div id="container-2nd-level">
-
<h1><span><lift:loc>custom_opening_main_title</lift:loc></span></h1>
- <p><lift:loc>custom_opening_main_body</lift:loc> </p>
- </div><!--container-2nd-level-->
- <link rel="stylesheet" href="../style/style.css" type="text/css"
media="screen" />
- </div><!--container-2nd-level-bg-->
- <!--END BLUE HEADER-->
- <script id="jquery" src="/classpath/jquery.js"
type="text/javascript"/><script id="json" src="/classpath/json.js"
type="text/javascript"/><script src="/scripts/display_single_message.js"
type="text/javascript"/> <script src="/scripts/pretty.js"
type="text/javascript"/>
-
- <lift:comet type="SinglePublicTimeline"/>
-
- <!--updates-box -->
- <lift:comet type="SinglePublicTimeline"/>
- <div class="separator">
- </div>
- <table>
- <tbody id="timeline_messages">
- <tr id="message">
- <div id="timeline_messages">
- <div class="updates-box">
- <div class="avatar">
- <img id="avatar" src="/images/avatar.jpg"
alt="Anonymous" width="50px"/>
- </div>
- <div class="update2">
- <div class="info2" >
- <a href="" id="author">-</a>
- </div>
- <div id="body">-</div>
- <div class="time">
- <table><tr><td><div id="pool">
-</div></td><td> </td><td> <div id="when"> -</div></td><td><div id="reason">
-</div></td><td> <div id="source"> -</div></td></tr></table>
- </div>
- <div id="tags" class="tags">
- <p id="tag">
- <a href="tag/tag1">-</a>
- </p>
- <p id="tag">
- <a href="tag/tag2">-</a>
- </p>
- </div>
- </div>
- </div>
- </div>
- </tr>
- </tbody>
- </table>
- </lift:surround>
- </logged:out>
+ <logged:in>
+ <lift:surround with="message" at="content"/>
+ <lift:Msgs>
+ <lift:error_msg>Error:</lift:error_msg>
+ <lift:notice_msg>FYI:</lift:notice_msg>
+ <lift:error_class>error_major</lift:error_class>
+ <lift:notice_msg>
+ <lift:loc>ui_base_note</lift:loc>
+ </lift:notice_msg>
+ <lift:notice_class>note_major</lift:notice_class>
+ </lift:Msgs>
+ </logged:in>
+ <logged:out>
+ <lift:surround with="default" at="content">
+ <!---BLUE HEADER-->
+ <div id="container-2nd-level-bg">
+ <div width="623px" id="container-2nd-level">
+ <h1>
+ <span>
+
<lift:loc>custom_opening_main_title</lift:loc>
+ </span>
+ </h1>
+ <p>
+
<lift:loc>custom_opening_main_body</lift:loc>
+ </p>
+ </div>
+ <!--container-2nd-level-->
+ <link rel="stylesheet"
href="../style/style.css" type="text/css" media="screen" />
+ </div>
+ <!--container-2nd-level-bg-->
+ <!--END BLUE HEADER-->
+ <script id="jquery" src="/classpath/jquery.js"
type="text/javascript"/>
+ <script id="json" src="/classpath/json.js"
type="text/javascript"/>
+ <script src="/scripts/display_single_message.js"
type="text/javascript"/>
+ <script src="/scripts/pretty.js"
type="text/javascript"/>
+ <lift:comet type="SinglePublicTimeline"/>
+ <!--updates-box -->
+ <lift:comet type="SinglePublicTimeline"/>
+ <div class="separator"> </div>
+ <table>
+ <tbody id="timeline_messages">
+ <tr id="message">
+ <div id="timeline_messages">
+ <div
class="updates-box">
+ <div
class="avatar">
+ <img
id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+ </div>
+ <div
class="update2">
+ <div
class="info2" >
+
<a href="" id="author">-</a>
+ </div>
+ <div
id="body">-</div>
+ <div
class="time">
+
<table>
+
<tr>
+
<td>
+
<div id="pool"> -</div>
+
</td>
+
<td> </td>
+
<td>
+
<div id="when"> -</div>
+
</td>
+
<td>
+
<div id="reason"> -</div>
+
</td>
+
<td>
+
<div id="source"> -</div>
+
</td>
+
</tr>
+
</table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </tr>
+ </tbody>
+ </table>
+ </lift:surround>
+ </logged:out>
</lift:UserSnip.loggedIn>
\ No newline at end of file
Modified:
incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js?rev=924184&r1=924183&r2=924184&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
(original)
+++
incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
Wed Mar 17 07:59:49 2010
@@ -85,11 +85,7 @@ function displayMessages(msgArray, eleme
msgReason = "caused by " + r;
break
}
- var msgTags = jQuery(cometMsg.text).find('tags > tag').get();
- for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
- // Replace each tag element with the plain tag text
- msgTags[tagIndex] = jQuery(msgTags[tagIndex]).attr('name');
- }
+
// Put the marshalled data into a copy of the template
var newMsg = msgTemplate.clone(true).attr('id',msgId);
@@ -130,13 +126,6 @@ function displayMessages(msgArray, eleme
} else {
conversation.css("display", "none");
}
- for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
- var newTag = tagTemplate.clone(true).attr('id',msgTags[tagIndex]);
- newTag.find('a')
- .attr('href','tag/'+msgTags[tagIndex])
- .text(msgTags[tagIndex]);
- newTag.insertBefore(newMsg.find('#tag:first'));
- }
// Remove any old tags from the template
newMsg.find('*[id=tag]').remove();
Modified:
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=924184&r1=924183&r2=924184&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
(original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Wed Mar 17 07:59:49 2010
@@ -18,35 +18,36 @@
-->
<lift:surround with="base" at="left">
- <div id="left">
- <div id="back-header">
- <!---UPDATE BOX -->
- <div class="container-update">
-
<h3><lift:loc>ui_messages_message_label_message_request</lift:loc></h3>
- <div id="form-update">
- <div class="post-form-row">
- <label>
- Share with
- </label>
- <select id="vPool" class="inputBox2">
- <option
value="0"><lift:loc>ui_messages_message_label_message_pool_public</lift:loc></option>
- <lift:UserSnip.accessPools/>
- </select>
- </div>
- <div class="row clear" style="display:
none">
- <input id="tagdude" style="width:
90%"/>
- </div>
- <div class="post-form-row">
- <textarea class="inputBox2" id="vMsg"
rows="5" cols="80%"></textarea>
- <div class="row clear" style="display:
none">
- <input id="vTag" style="width: 90%"/>
- </div>
- <div class="update-btn">
- <input type="image"
onclick="javascript:post_msg();" src="images/btn-update.gif" />
- </div>
- </div>
-
- <script>
+ <div id="left">
+ <div id="back-header">
+ <!---UPDATE BOX -->
+ <div class="container-update">
+ <h3>
+
<lift:loc>ui_messages_message_label_message_request</lift:loc>
+ </h3>
+ <div id="form-update">
+ <div class="post-form-row">
+ <label>
Share with </label>
+ <select id="vPool"
class="inputBox2">
+ <option value="0">
+
<lift:loc>ui_messages_message_label_message_pool_public</lift:loc>
+ </option>
+
<lift:UserSnip.accessPools/>
+ </select>
+ </div>
+ <div class="row clear" style="display:
none">
+ <input id="tagdude"
style="width: 90%"/>
+ </div>
+ <div class="post-form-row">
+ <textarea class="inputBox2"
id="vMsg" rows="5" cols="80%"></textarea>
+ <div class="row clear"
style="display: none">
+ <input id="vTag"
style="width: 90%"/>
+ </div>
+ <div class="update-btn">
+ <input type="image"
onclick="javascript:post_msg();" src="images/btn-update.gif" />
+ </div>
+ </div>
+ <script>
// <![CDATA[
var currentConvNumber = 0;
@@ -69,50 +70,66 @@
</script>
- <lift:UserSnip.postScript/>
- </div>
- </div><!--END UPDATE BOX-->
- </div><lift:UserSnip.resendScript/>
- <!--updates-box -->
- <!--updates-box -->
- <lift:comet type="Timeline"/>
- <div class="separator">
- </div>
- <table>
- <tbody id="personal_timeline_messages">
- <tr id="message">
- <div id="personal_timeline_messages">
- <div class="updates-box">
- <div class="avatar">
- <img id="avatar" src="/images/avatar.jpg"
alt="Anonymous" width="50px"/>
- </div>
- <div class="update2">
- <div class="info2" >
- <a href="" id="author">-</a>
- </div>
- <div id="body">-</div>
- <div class="time">
- <table><tr><td><div id="pool">
-</div></td><td> </td><td> <div id="when"> -</div></td><td><div id="reason">
-</div></td><td> <div id="source"> -</div></td></tr></table>
- </div>
- <div id="tags" class="tags">
- <p id="tag">
- <a href="tag/tag1">-</a>
- </p>
- <p id="tag">
- <a href="tag/tag2">-</a>
- </p>
- </div>
- <div class="actions">
- <a href="javascript:resend_msg();">
<lift:loc>ui_messages_message_label_resend</lift:loc></a>
- | <a href="#"
id="reply"><lift:loc>ui_messages_message_label_reply</lift:loc></a>
- <a id="conversation">|
<lift:loc>ui_messages_message_label_conversation</lift:loc></a>
- </div>
- </div>
- </div>
- </div>
- </tr>
- </tbody>
- </table>
- </div>
- <!--updates-box-->
- </lift:surround>
+ <lift:UserSnip.postScript/>
+ </div>
+ </div>
+ <!--END UPDATE BOX-->
+ </div>
+ <lift:UserSnip.resendScript/>
+ <!--updates-box -->
+ <!--updates-box -->
+ <lift:comet type="Timeline"/>
+ <div class="separator"> </div>
+ <table>
+ <tbody id="personal_timeline_messages">
+ <tr id="message">
+ <div id="personal_timeline_messages">
+ <div class="updates-box">
+ <div class="avatar">
+ <img
id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+ </div>
+ <div class="update2">
+ <div
class="info2" >
+ <a
href="" id="author">-</a>
+ </div>
+ <div
id="body">-</div>
+ <div
class="time">
+ <table>
+
<tr>
+
<td>
+
<div id="pool"> -</div>
+
</td>
+
<td> </td>
+
<td>
+
<div id="when"> -</div>
+
</td>
+
<td>
+
<div id="reason"> -</div>
+
</td>
+
<td>
+
<div id="source"> -</div>
+
</td>
+
</tr>
+ </table>
+ </div>
+ <div
class="actions">
+ <a
href="javascript:resend_msg();">
+
<lift:loc>ui_messages_message_label_resend</lift:loc>
+ </a>
+ | <a
href="#" id="reply">
+
<lift:loc>ui_messages_message_label_reply</lift:loc>
+ </a>
+ <a
id="conversation">
+
| <lift:loc>ui_messages_message_label_conversation</lift:loc>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <!--updates-box-->
+</lift:surround>
+
Modified:
incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html?rev=924184&r1=924183&r2=924184&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
(original)
+++
incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
Wed Mar 17 07:59:49 2010
@@ -26,7 +26,7 @@
<form name="loginFrm" action="javascript:login()"
method="post" >
<div class="form">
<div class="post-form-row">
- <label>
<lift:loc>ui_login_email</lift:loc></label>
+ <label>
<lift:loc>ui_login_user</lift:loc></label>
<input type="text"
name="username" value="" class="inputBox2"/><!--narrow input field-->
</div>
<div class="post-form-row">
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=924184&r1=924183&r2=924184&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 Mar
17 07:59:49 2010
@@ -17,106 +17,113 @@
under the License. *
-->
<lift:surround with="base" at="left">
-
- <link rel="stylesheet" href="../style/dialog_test.css" type="text/css"
media="screen" />
-
-
-
- <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/dialog_test.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_track_manage</lift:loc></a>
- </li>
- <li class="ui-state-default ui-corner-top">
- <a
href="#tabs-2"><lift:loc>ui_track_new_track</lift:loc></a>
- </li>
- </ul>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom"
id="tabs-1">
- <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>
-
<lift:loc>ui_track_manage_remove</lift:loc>
- </th>
- </tr>
- </thead>
- <tbody>
- <disp:item>
- <tr>
- <td>
- <item:pattern/>
- </td>
- <td>
- <item:enabled/>
- </td>
- <td>
- <item:remove>
- <img src="/images/delete.png"/>
- </item:remove>
- </td>
- </tr>
- </disp:item>
- </tbody>
- </table>
- </lift:displayTracking>
- </span>
- </div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom
ui-tabs-hide" id="tabs-2">
- <lift:form>
- <lift:main>
- <table>
- <tr>
- <td>
-
<lift:loc>ui_track_new_track_what</lift:loc>
- </td>
- <td>
- <main:track/>
- </td>
- </tr>
- <tr>
- <td>
- </td>
- <td>
- <input type="submit" value="Add" />
- </td>
- </tr>
- </table>
- </lift:main>
- </lift:form>
- </div>
- </div>
- </div><!-- End demo -->
-
-
+ <link rel="stylesheet" href="../style/dialog_test.css" type="text/css"
media="screen" />
+ <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/dialog_test.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_track_manage</lift:loc>
+ </a>
+ </li>
+ <li class="ui-state-default ui-corner-top">
+ <a href="#tabs-2">
+
<lift:loc>ui_track_new_track</lift:loc>
+ </a>
+ </li>
+ </ul>
+ <div class="ui-tabs-panel ui-widget-content
ui-corner-bottom" id="tabs-1">
+ <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>
+
<lift:loc>ui_track_manage_remove</lift:loc>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <disp:item>
+ <tr>
+
<td>
+
<item:pattern/>
+
</td>
+
<td>
+
<item:enabled/>
+
</td>
+
<td>
+
<item:remove>
+
<img src="/images/delete.png"/>
+
</item:remove>
+
</td>
+ </tr>
+ </disp:item>
+ </tbody>
+ </table>
+ </lift:displayTracking>
+ </span>
+ </div>
+ <div class="ui-tabs-panel ui-widget-content
ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <lift:form>
+ <lift:main>
+ <table>
+ <tr>
+ <td>
+
<lift:loc>ui_track_new_track_what</lift:loc>
+ </td>
+ <td>
+
<main:track/>
+ </td>
+ </tr>
+ <tr>
+ <td>
</td>
+ <td>
+ <input
type="submit" value="Add" />
+ </td>
+ </tr>
+ </table>
+ </lift:main>
+ </lift:form>
+ </div>
+ </div>
+ </div>
+ <!-- End demo -->
+ <lift:Msgs>
+ <lift:error_msg>Error:</lift:error_msg>
+ <lift:notice_msg>FYI:</lift:notice_msg>
+ <lift:error_class>error_major</lift:error_class>
+ <lift:notice_msg>
+ <lift:loc>ui_base_note</lift:loc>
+ </lift:notice_msg>
+ <lift:notice_class>note_major</lift:notice_class>
+ </lift:Msgs>
</lift:surround>
\ No newline at end of file
