Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 13994 invoked from network); 19 Apr 2010 08:23:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Apr 2010 08:23:03 -0000 Received: (qmail 98626 invoked by uid 500); 19 Apr 2010 08:23:03 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 98594 invoked by uid 500); 19 Apr 2010 08:23:02 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 98537 invoked by uid 99); 19 Apr 2010 08:23:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Apr 2010 08:23:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Apr 2010 08:22:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 638D823889B2; Mon, 19 Apr 2010 08:22:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r935471 - in /incubator/esme/trunk/server/src/main: scala/bootstrap/liftweb/ scala/org/apache/esme/lib/ webapp/info_view/ webapp/pools_view/ webapp/scripts/ webapp/style/ Date: Mon, 19 Apr 2010 08:22:14 -0000 To: esme-commits@incubator.apache.org From: rhirsch@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100419082214.638D823889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhirsch Date: Mon Apr 19 08:22:13 2010 New Revision: 935471 URL: http://svn.apache.org/viewvc?rev=935471&view=rev Log: [ESME-100] Finish web UI Daily hour Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.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/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/display_messages.js incubator/esme/trunk/server/src/main/webapp/style/style.css Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=935471&r1=935470&r2=935471&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original) +++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Mon Apr 19 08:22:13 2010 @@ -119,7 +119,7 @@ class Boot { LiftRules.dispatch.append(UrlStore.redirectizer) - LiftRules.siteMapFailRedirectLocation = List("index", "Home") + LiftRules.siteMapFailRedirectLocation = List("index") UserAuth.register(UserPwdAuthModule) UserAuth.register(OpenIDAuthModule) Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala?rev=935471&r1=935470&r2=935471&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala Mon Apr 19 08:22:13 2010 @@ -64,7 +64,7 @@ object ConversationMgr { Script( OnLoad(JsCrVar(jsId, JsArray( msgs.map(m => JsObj(("message", m.asJs)) ) :_*)) & - JsFunc("displayMessages", JsVar(jsId), jsId).cmd) + JsFunc(" displayMessages", JsVar(jsId), jsId).cmd) ) } 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=935471&r1=935470&r2=935471&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 Mon Apr 19 08:22:13 2010 @@ -71,7 +71,6 @@ object StreamMgr { val spanName = S.attr("the_id") openOr "StreamSpan" // get the current user val user = User.currentUser - println("displayStream"); // bind the dynamic content to the incoming nodeseq def doRender(): NodeSeq = { 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=935471&r1=935470&r2=935471&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 19 08:22:13 2010 @@ -19,13 +19,17 @@ - - + + - -
-

ui_user_single_title

+ +

ui_user_single_title ''

- +
  • @@ -48,7 +49,6 @@
-
@@ -126,8 +126,9 @@ - + + \ 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=935471&r1=935470&r2=935471&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 19 08:22:13 2010 @@ -30,6 +30,14 @@

ui_pool_manage

+ + + +
+
+ +
+
@@ -92,6 +100,8 @@ --> + +
ui_pool_list_users @@ -135,7 +145,7 @@ -
+
ui_pool_edit_label @@ -143,7 +153,8 @@
- + + -
-
- -
-
+
Modified: incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js?rev=935471&r1=935470&r2=935471&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js (original) +++ incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js Mon Apr 19 08:22:13 2010 @@ -14,7 +14,7 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * - under the License. * + under the License. * */ //