Author: rhirsch
Date: Mon Apr 12 06:26:25 2010
New Revision: 933105
URL: http://svn.apache.org/viewvc?rev=933105&view=rev
Log:
[ESME-100] Finish web UI
Daily hour
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
incubator/esme/trunk/server/src/main/webapp/info_view/public.html
incubator/esme/trunk/server/src/main/webapp/info_view/search.html
incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
incubator/esme/trunk/server/src/main/webapp/info_view/user.html
incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
incubator/esme/trunk/server/src/main/webapp/scripts/dialog_track.js
incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter.js
incubator/esme/trunk/server/src/main/webapp/style/dialog.css
incubator/esme/trunk/server/src/main/webapp/style/esme.css
incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
(original)
+++
incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
Mon Apr 12 06:26:25 2010
@@ -72,7 +72,7 @@ class SinglePublicTimeline extends Comet
case Distributor.NewMessage(msg) =>
if (!msg.pool.defined_?)
- messages = (msg.id.is :: messages).take(40)
+ messages = (msg.id.is :: messages).take(1)
if ((millis - lastRender) < 30000L) {
if (!scheduled) {
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=933105&r1=933104&r2=933105&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
Apr 12 06:26:25 2010
@@ -24,17 +24,17 @@
</script>
<div id="back-header">
- <h1><b><lift:loc>ui_default_conversation</lift:loc></b></h1>
-
- <!---CONTENT BOX-->
+ <h1><lift:loc>ui_default_conversation</lift:loc></h1>
<div class="container-settings">
<div class="b-list">
<lift:displayConversation/>
- <lift:embed what="templates-hidden/timeline"/>
+ <lift:embed what="templates-hidden/message_core"/>
</div>
</div><!--container-settings-->
- </div><!--END CONTENT BOX-->
+ </div>
+ </div>
+ <!-- End demo -->
</lift:surround>
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/public.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/public.html?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/public.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/public.html Mon Apr
12 06:26:25 2010
@@ -21,19 +21,7 @@
<div id="left">
<!--updates-box -->
<lift:comet type="PublicTimeline"/>
- <div>
- <div id="timeline_messages">
- <div class="updates-box" id="message">
-
- <div class="avatar"> <img id="avatar"
alt="Anonymous" width="50px"/></div>
- <div class="update"> <div id="body">-</div>
- <div class="info"><a href=""
id="author">-</a><div class="time"><div id="supp_data"> -</div></div></div>
- </div>
- <div class="time"> </div>
- <div class="separator">
</div>
- </div>
- </div>
- </div>
+ <lift:embed what="templates-hidden/message_core"/>
</div>
<!--updates-box-->
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/info_view/search.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/search.html?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/search.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/search.html Mon Apr
12 06:26:25 2010
@@ -22,7 +22,7 @@
Search for <lift:searchTerm/>
<div class="b-list">
<lift:displaySearch/>
- <lift:embed what="templates-hidden/timeline"/>
+ <lift:embed what="templates-hidden/message_core"/>
</div>
</lift:surround>
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=933105&r1=933104&r2=933105&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 Apr
12 06:26:25 2010
@@ -18,13 +18,8 @@
-->
<lift:surround with="base" at="left">
- <lift:Style.header/>
<lift:TableSorterSnip/>
<!-- STYLESHEETS -->
- <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/jqueryui-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet" />
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="../style/ie6.css"
media="screen" />
@@ -34,11 +29,12 @@
<![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>
<script src="/scripts/display_messages.js" type="text/javascript"/>
<script src="/scripts/pretty.js" type="text/javascript"/>
- <div class="demo">
+ <div id="back-header">
+ <h1><lift:loc>ui_streams_manage</lift:loc></h1>
+ <div class="container-settings">
<div id="messages"></div>
<lift:streamFilters>
@@ -78,9 +74,10 @@
</lift:ignore>
<div class="b-list">
<lift:displayStream
the_id="StreamSpan"/>
- <lift:embed
what="templates-hidden/timeline"/>
+ <lift:embed
what="templates-hidden/message_core"/>
</div>
</span>
</div>
+ </div>
<!-- End demo -->
</lift:surround>
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=933105&r1=933104&r2=933105&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 Apr 12
06:26:25 2010
@@ -29,9 +29,10 @@
</script>
<script type="text/javascript" src="../scripts/esme.js">
</script>
- <script type="text/javascript" src="../scripts/esme_table_sorter.js">
- </script>
- <div class="demo">
+ <script type="text/javascript"
src="../scripts/esme_table_sorter.js"></script>
+<div id="back-header">
+ <h1><lift:loc>ui_user_single_title</lift:loc></h1>
+ <div class="container-settings">
<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">
@@ -126,5 +127,7 @@
</div>
</div>
</lift:user_info>
- </div><!-- End demo -->
+ </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=933105&r1=933104&r2=933105&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 Apr
12 06:26:25 2010
@@ -27,11 +27,9 @@
<lift:TableSorterSnip/>
</head>
-<div class="demo">
- <div id="messages" class="esme_message_bar"></div>
-
-
-
+ <div id="back-header">
+ <h1><lift:loc>ui_pool_manage</lift:loc></h1>
+ <div class="container-settings">
<span id="PoolDetailSpan">
<lift:ignore>
@@ -126,15 +124,21 @@
<br/>
</fieldset>
<br/>
- <button
onclick="javascript:$('#dialog-form-user').dialog('open')"
id="add-user"><lift:loc>ui_pool_add_user</lift:loc></button>
+ <div class="post-form-row">
+ <div
class="submit-btn">
+<button onclick="javascript:$('#dialog-form-user').dialog('open')"
id="create-user">
+ <lift:loc>ui_pool_add_user</lift:loc>
+ </button>
</div>
+ </div>
+
</lift:poolUsers>
</span>
- <fieldset>
+ <fieldset>
<lift:form>
- <lift:editPool>
+ <lift:editPool class="inputBox2">
<lift:loc>ui_pool_edit_label</lift:loc>
<edit:pool/>
</lift:editPool>
@@ -142,7 +146,7 @@
</fieldset>
-<div id="dialog-form" title="Create new pool">
+<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">
@@ -156,7 +160,7 @@
</form>
</div>
-<div id="dialog-form-user" title="Add a user to a pool">
+<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">
@@ -173,7 +177,14 @@
</div>
-<button onclick="javascript:$('#dialog-form').dialog('open')"
id="create-pool"><lift:loc>ui_pool_create</lift:loc></button>
-
- </div><!-- End demo -->
+ <div class="post-form-row">
+ <div
class="submit-btn">
+<button onclick="javascript:$('#dialog-form').dialog('open')" id="create-user">
+ <lift:loc>ui_pool_create</lift:loc>
+ </button>
</div>
+ </div>
+
+ </div>
+ </div>
+ <!-- End demo -->
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/scripts/dialog_track.js
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/dialog_track.js?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/dialog_track.js
(original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/dialog_track.js Mon Apr
12 06:26:25 2010
@@ -50,11 +50,11 @@
$("#dialog-form").dialog({
autoOpen: false,
- height: 200,
+ height: 250,
width: 350,
modal: true,
buttons: {
- 'Create a new track': function() {
+ 'Create': function() {
var bValid = true;
allFields.removeClass('ui-state-error');
@@ -64,9 +64,10 @@
if (bValid) {
//$('button[type=submit]
.default').click();
-
liftAjax.lift_ajaxHandler(jQuery("#track_new_dialog").serialize(), null, null,
"javascript");
+
liftAjax.lift_ajaxHandler(jQuery("#track_new_dialog").serialize(), null, null,
"javascript");
- $(this).dialog('close');
+ $(this).dialog('close');
+
}
},
Cancel: function() {
@@ -83,3 +84,4 @@
// ]]>
+
Modified:
incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter.js
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter.js?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter.js
(original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_table_sorter.js
Mon Apr 12 06:26:25 2010
@@ -19,7 +19,8 @@
$(document).ready(function()
{
- $("#esme-table").tablesorter();
+ $("#esme-table").tablesorter({ headers: { 0: { sorter: false}, 1:
{sorter: false} } });
}
);
+
Modified: incubator/esme/trunk/server/src/main/webapp/style/dialog.css
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/style/dialog.css?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/dialog.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/dialog.css Mon Apr 12
06:26:25 2010
@@ -22,7 +22,7 @@
input.text { margin-bottom:12px; width:95%; padding: .4em; }
textarea.text { margin-bottom:12px; width:95%; padding: .4em; }
fieldset { padding:0; border:0; margin-top:25px; }
- h1 { font-size: 1.2em; margin: .6em 0; }
+ h2 { font-size: 1.2em; margin: .6em 0; }
div#users-contain { width: 350px; margin: 20px 0; }
div#users-contain table { margin: 1em 0; border-collapse:
collapse; width: 100%; }
div#users-contain table td, div#users-contain table th {
border: 1px solid #eee; padding: .6em 10px; text-align: left; }
Modified: incubator/esme/trunk/server/src/main/webapp/style/esme.css
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/style/esme.css?rev=933105&r1=933104&r2=933105&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/esme.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/esme.css Mon Apr 12
06:26:25 2010
@@ -17,7 +17,6 @@
under the License. *
*/
-...@import url(print.css);
@import url(layout.css);
@import url(l-page.css);
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=933105&r1=933104&r2=933105&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 Mon
Apr 12 06:26:25 2010
@@ -36,6 +36,7 @@
<script id="jquery" src="/classpath/jquery.js"
type="text/javascript"/><script id="json" src="/classpath/json.js"
type="text/javascript"/><script src="/scripts/display_messages.js"
type="text/javascript"/> <script src="/scripts/pretty.js"
type="text/javascript"/>
</head>
<body id="back">
+ <div id="messages" class="esme_message_bar" style="display: none"></div>
<div id="container-bg">
<div id="container">
<div id="header">
