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 2010/05/03 11:27:28 UTC
svn commit: r940404 - in /incubator/esme/trunk/server/src/main:
scala/org/apache/esme/actor/ webapp/pools_view/ webapp/profile_view/
webapp/scripts/ webapp/style/ webapp/templates-hidden/
Author: rhirsch
Date: Mon May 3 09:27:27 2010
New Revision: 940404
URL: http://svn.apache.org/viewvc?rev=940404&view=rev
Log:
[ESME-100] Finish web UI
Daily hour
Added:
incubator/esme/trunk/server/src/main/webapp/scripts/esme_validate.js
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala
incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
incubator/esme/trunk/server/src/main/webapp/scripts/esme_tool_tip.js
incubator/esme/trunk/server/src/main/webapp/style/style.css
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala?rev=940404&r1=940403&r2=940404&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala Mon May 3 09:27:27 2010
@@ -20,8 +20,6 @@
/*
* Distributor.scala
*
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
*/
package org.apache.esme.actor
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=940404&r1=940403&r2=940404&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 May 3 09:27:27 2010
@@ -36,7 +36,7 @@
<input type="image" onclick="javascript:$('#dialog-form').dialog('open')" id="create-pool" src="../images/new1.gif" />
</div>
</div>
- <span id="PoolDetailSpan">
+ <div id="PoolDetailSpan">
<lift:ignore>
<!-- The poolUsers snippet *MUST* appear on the page before the editPool snippet -->
</lift:ignore>
@@ -82,10 +82,10 @@
</tr>
</tbody>
</table>
- </fieldset>
+ </fieldset>
</lift:poolDetail>
- </span>
- <span id="PoolSpan">
+ </div>
+ <div id="PoolSpan">
<lift:ignore>
<!-- The poolUsers snippet *MUST* appear on the page before the editPool snippet -->
@@ -122,9 +122,9 @@
</div>
</div>
</lift:poolUsers>
- </span>
+ </div>
<div class="pool_select">
- <lift:form>
+ <lift:form >
<lift:editPool class="inputBox2" >
<lift:loc>ui_pool_edit_label</lift:loc>
<edit:pool class="tipelement" title="Select a pool to edit"/>
Modified: incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html?rev=940404&r1=940403&r2=940404&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html Mon May 3 09:27:27 2010
@@ -18,6 +18,11 @@
-->
<lift:surround with="base" at="left">
+ <head>
+ <script src="/scripts/jquery.validate.js" type="text/javascript"/>
+ <script src="/scripts/esme_validate.js" type="text/javascript"/>
+ </head>
+
<div id="back-header">
<h1><lift:loc>ui_profile_title</lift:loc></h1>
Modified: incubator/esme/trunk/server/src/main/webapp/scripts/esme_tool_tip.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_tool_tip.js?rev=940404&r1=940403&r2=940404&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_tool_tip.js (original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_tool_tip.js Mon May 3 09:27:27 2010
@@ -17,10 +17,6 @@
under the License. *
*/
- $(document).ready(function(){
- $("#validateForm").validate();
- });
-
$(function(){
$(".tipelement").tipTip({maxWidth: "auto", edgeOffset: 10});
Added: incubator/esme/trunk/server/src/main/webapp/scripts/esme_validate.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/esme_validate.js?rev=940404&view=auto
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/esme_validate.js (added)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/esme_validate.js Mon May 3 09:27:27 2010
@@ -0,0 +1,25 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you under the Apache License, Version 2.0 (the *
+ "License"); you may not use this file except in compliance *
+ with the License. You may obtain a copy of the License at *
+ *
+ http://www.apache.org/licenses/LICENSE-2.0 *
+ *
+ Unless required by applicable law or agreed to in writing, *
+ software distributed under the License is distributed on an *
+ "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. *
+*/
+
+ $(document).ready(function(){
+ $("#validateForm").validate();
+ });
+
+
+
Modified: incubator/esme/trunk/server/src/main/webapp/style/style.css
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/style/style.css?rev=940404&r1=940403&r2=940404&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/style/style.css (original)
+++ incubator/esme/trunk/server/src/main/webapp/style/style.css Mon May 3 09:27:27 2010
@@ -426,6 +426,7 @@ ul.main-links {
.updates-box {
float:left;
padding:10px 20px;
+ word-wrap:break-word;
}
.avatar {
float:left;
@@ -640,6 +641,8 @@ width:100%;
z-index:10000;
}
-000;
+.pool_select {
+position:absolute;
+top: 70px
}
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html?rev=940404&r1=940403&r2=940404&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html Mon May 3 09:27:27 2010
@@ -19,8 +19,6 @@
<div id="timeline_messages">
<head>
- <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>