incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r955848 - in /incubator/esme/trunk/server/src/main: scala/org/apache/esme/snippet/ webapp/action_view/ webapp/info_view/ webapp/profile_view/ webapp/scripts/ webapp/static/ webapp/style/ webapp/templates-hidden/ webapp/user_template/
Date Fri, 18 Jun 2010 06:42:30 GMT
Author: rhirsch
Date: Fri Jun 18 06:42:29 2010
New Revision: 955848

URL: http://svn.apache.org/viewvc?rev=955848&view=rev
Log:
[ESME-236] Clean Web UI Files

Removed:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/Style.scala
    incubator/esme/trunk/server/src/main/webapp/scripts/jquery-ui-1.7.2.custom.min.js
    incubator/esme/trunk/server/src/main/webapp/static/about.html
    incubator/esme/trunk/server/src/main/webapp/style/esme-ie.css
    incubator/esme/trunk/server/src/main/webapp/style/esme.css
    incubator/esme/trunk/server/src/main/webapp/style/layout.css
    incubator/esme/trunk/server/src/main/webapp/style/print-ie.css
    incubator/esme/trunk/server/src/main/webapp/style/print.css
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.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/scala/org/apache/esme/snippet/UserSnip.scala
    incubator/esme/trunk/server/src/main/webapp/action_view/index.html
    incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html
    incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
    incubator/esme/trunk/server/src/main/webapp/info_view/user.html
    incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
    incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=955848&r1=955847&r2=955848&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Fri
Jun 18 06:42:29 2010
@@ -46,7 +46,6 @@ import scala.xml.{NodeSeq, Text, Node}
 object JsonPoster extends JsonHandler{
   def apply(in: Any): JsCmd = in match {
     case JsonCmd("post", _, map: Map[String, Any], _) =>
-      println("Posting "+map)
       DisplayMessage("messages", <b>Status updated</b>, 200, 200)
       for (msgObj <- map.get("msg");
            msg <- Box.asA[String](msgObj).map(_.trim) if msg.length > 0;

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=955848&r1=955847&r2=955848&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 Fri Jun 18 06:42:29
2010
@@ -15,7 +15,6 @@
  KIND, either express or implied.  See the License for the    *
  specific language governing permissions and limitations      *
  under the License. 
- <link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.7.2.custom.css" rel="stylesheet"
/>
  
  		                                       *
 -->

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html?rev=955848&r1=955847&r2=955848&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/contacts.html Fri Jun 18 06:42:29
2010
@@ -19,12 +19,9 @@
 
 <lift:surround with="base" at="left">
     <!-- STYLESHEETS  -->
-    <link rel="stylesheet" type="text/css" href="../style/layout.css" media="screen" />
     <link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.8.2.custom.css" rel="stylesheet"
/>
-    <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js">
-    </script>
-    <script type="text/javascript" src="../scripts/esme.js">
-    </script>
+    <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"></script>
+        <script type="text/javascript" src="../scripts/esme.js"></script>
 <div id="back-header">
 	<h1><lift:loc>base_profile_contacts</lift:loc></h1>
 	<div class="container-settings">

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=955848&r1=955847&r2=955848&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 Fri Jun 18 06:42:29
2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-    <lift:Style.header/><lift:TableSorterSnip/>
+    <lift:TableSorterSnip/>
     <link rel="stylesheet" type="text/css" href="../style/style.css" />
 <head>
         <script src="/scripts/display_messages.js" type="text/javascript"/> 

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=955848&r1=955847&r2=955848&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 Fri Jun 18 06:42:29 2010
@@ -18,16 +18,11 @@
 -->
 
 <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" />
+    <lift:TableSorterSnip/><!-- STYLESHEETS  -->
     <link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.8.2.custom.css" rel="stylesheet"
/>   
     <script type="text/javascript" src="../scripts/jquery-ui-1.8.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 type="text/javascript" src="../scripts/esme.js"></script>
 <div id="back-header">
        <lift:user_info>
 	<h1><lift:loc>ui_user_single_title</lift:loc> <i>'<user:nicename/>'</i></h1>

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=955848&r1=955847&r2=955848&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 Fri Jun 18 06:42:29
2010
@@ -18,11 +18,6 @@
 -->
 <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/display_messages.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js?rev=955848&r1=955847&r2=955848&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 Fri Jun 18 06:42:29
2010
@@ -33,10 +33,6 @@ function displayMessages(msgArray, eleme
 	
 
 	
-  /*jQuery("#StreamSpan").each(function(i) {
-  	alert ("hi")
-  }*/
-
  // Select the first element in table id="timeline_messages"
   //  with id="message" as the message template
   if (msgTemplate == null) {
@@ -127,10 +123,10 @@ function displayMessages(msgArray, eleme
                                      'clearResend("resend_' + id + '")');
       }
       newMsg.find('#reply').attr('href',
-        "javascript:setReplyTo(" + id + ", '"+ msgBody + "'," + msgPoolId + ", '" + msgAuthor.nickname
+ "')");
+        "javascript:setReplyTo(" + id + ", '"+ encodeURI(msgBody) + "'," + msgPoolId + ",
'" + msgAuthor.nickname + "')");
       var conversation = newMsg.find('#conversation');
       if (msgConversation != 0) {
-        conversation.attr('href',
+        conversation.attr('href', 
           '/conversation/' + msgConversation);
       } else {
         conversation.css("display", "none");

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=955848&r1=955847&r2=955848&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 Fri Jun 18 06:42:29
2010
@@ -46,9 +46,7 @@
                   <lift:bind name="content" />
                 </div><!--left   -->
                 <div id="right">
-                <lift:bind name="login">
                  <lift:UserSnip.loginForm/> 
-                </lift:bind>
                 </div><!--right -->
            </div><!--// ENDS CONTAINER -->
         </div><!--// ENDS CONTAINER-BG -->



Mime
View raw message