Return-Path: 
 <esme-commits-return-366-apmail-incubator-esme-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org
Received: (qmail 15446 invoked from network); 5 Mar 2010 11:56:02 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 5 Mar 2010 11:56:02 -0000
Received: (qmail 47253 invoked by uid 500); 5 Mar 2010 11:55:48 -0000
Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org
Received: (qmail 47080 invoked by uid 500); 5 Mar 2010 11:55:48 -0000
Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:esme-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:esme-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:esme-commits@incubator.apache.org>
List-Id: <esme-commits.incubator.apache.org>
Reply-To: esme-dev@incubator.apache.org
Delivered-To: mailing list esme-commits@incubator.apache.org
Received: (qmail 47007 invoked by uid 99); 5 Mar 2010 11:55:48 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Mar 2010 11:55:48 +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; Fri, 05 Mar 2010 11:55:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D6E7023889B2; Fri,  5 Mar 2010 11:55:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r919387 - in
 /incubator/esme/branches/ui-2010-03-05/src/main/webapp: action_view/
 auth_view/ info_view/ pools_view/ profile_view/ templates-hidden/ track_view/
Date: Fri, 05 Mar 2010 11:55:25 -0000
To: esme-commits@incubator.apache.org
From: rhirsch@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100305115525.D6E7023889B2@eris.apache.org>

Author: rhirsch
Date: Fri Mar  5 11:55:25 2010
New Revision: 919387

URL: http://svn.apache.org/viewvc?rev=919387&view=rev
Log:
further work

Added:
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html
Modified:
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/action_view/index.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/auth_view/index.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/search.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/streams.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/tag.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/user.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/pools_view/index.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/profile_view/edit.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html
    incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/action_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/action_view/index.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/action_view/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/action_view/index.html Fri Mar  5 11:55:25 2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
 
 	<lift:Style.header />
 	<lift:TableSorterSnip/>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/auth_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/auth_view/index.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/auth_view/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/auth_view/index.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<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" />

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <script src="/scripts/display_messages.js" type="text/javascript"/>
     <fieldset>
         <legend>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/search.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/search.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/search.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/search.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
   <script src="/scripts/display_messages.js" type="text/javascript"/>
   
   Search for <lift:searchTerm/>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/streams.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/streams.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/streams.html Fri Mar  5 11:55:25 2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 
-<lift:surround with="default" at="content">
+<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" />

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/tag.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/tag.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/tag.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/tag.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <script type="text/javascript" src="../scripts/esme_table_sorter.js">
     </script>
     <lift:TableSorterSnip/>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/user.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/user.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/user.html Fri Mar  5 11:55:25 2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 
-<lift:surround with="default" at="content">
+<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" />

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <script type="text/javascript" src="../scripts/esme_table_sorter.js">
     </script>
     <lift:TableSorterSnip/>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/pools_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/pools_view/index.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/pools_view/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/pools_view/index.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<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" />

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/profile_view/edit.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/profile_view/edit.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/profile_view/edit.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/profile_view/edit.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
   <lift:editProfile form="post">
     <table id="profile">
       <tbody>

Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html?rev=919387&view=auto
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html (added)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html Fri Mar  5 11:55:25 2010
@@ -0,0 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title><lift:loc>ui_default_title</lift:loc></title>
+        <meta http-equiv="Content-Language" content="en-US" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="imagetoolbar" content="no" />
+        <meta name="keywords" content="ESME" lang="en-US" />
+        <meta name="description" content="ESME" lang="en-US" />
+        <meta name="copyright" content="ESME" lang="en-US" />
+        <meta name="generator" content="" lang="en-US" />
+        <meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+        <meta name="Robots" content="index,follow,noodp" />
+        <link rel="stylesheet" href="../style/style.css" type="text/css" media="screen" />
+        <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"/>
+    </head>
+    <body id="back">
+        <div id="container-bg">
+            <div id="container">
+                <div id="header">
+                    <div id="logo">
+                        <h1><a href="/">ESME</a></h1>
+                    </div>
+                    <div id="top-menu">
+                        <ul>
+                            <li>
+                                <a href="/">Public Timeline</a>
+                                | 
+                            </li>
+                            <li>
+                                <a href="">Settings</a>
+                                | 
+                            </li>
+                        </ul>
+                        <lift:Menu.item name="logout">
+                           <img src="../images/btn-signout.gif" alt="" />
+                         </lift:Menu.item>
+                    </div>
+                </div><!--// ENDS HEADER -->
+                <div id="left">
+                     <lift:bind name="left" />
+                </div>
+                <!--left-->
+                <div id="right">
+                    <div class="box-right-back">
+                        <div class="avatar">
+                            <img src="../images/avatar2.gif" alt="" />
+                        </div><strong><lift:loc>ui_messages_message_label_welcome</lift:loc></strong>
+                        <div class="info4">
+                            <a href=""><span class="name"><lift:UserSnip.name/></span></a>
+                        </div>
+                        <ul class="main-links">
+                            <li>
+                                <lift:Menu.item name="list_users"/>
+                            </li>
+                            <li>
+                                <lift:Menu.item name="trackMgt"/>
+                            </li>
+                            <li>
+                                <lift:Menu.item name="actionMgt"/>
+                            </li>
+                            <li>
+                                <lift:Menu.item name="authToken"/>
+                            </li>
+                            <li>
+                                <lift:Menu.item name="accessPools"/>
+                            </li>
+                            <li>
+                                <lift:Menu.item name="streams"/>
+                            </li>
+                        </ul><!--search form-->
+                        <form action="/info_view/search" method="post">
+                            <div id="search">
+                                <div class="searchBox">
+                                    <input type="text" class="inputBox" name="term" value=""/>
+                                </div>
+                                <div class="searchButton">
+                                    <input type="image" onclick="javascript:form.submit();" src="../images/btn-search.gif" style="padding:0;"/>
+                                </div>
+                            </div>
+                        </form><!--search form--><h3><a href="">Tags</a></h3>
+                        <div class="right-content">
+                            <a href="" class="style5">software</a>
+                            <a href="" class="style5">teaching</a>
+                            <a href="" class="style3">Technology</a>
+                            <a href="" class="style3">movies</a>
+                            <a href="" class="style2">twitter</a>
+                            <a href="" class="style1">ebook</a>
+                            <a href="" class="style4">web design</a>
+                            <a href="" class="style4">wordpress</a>
+                            <a href="" class="style1">work from home</a>
+                            <a href="" class="style2">illustrator</a>
+                            <a href="" class="style5">PHP</a>
+                            <a href="" class="style4">AJAX</a>
+                            <a href="" class="style1">wiki</a>
+                            <a href="" class="style3">virtual assistant</a>
+                            <a href="" class="style2">blogging</a>
+                            <a href="" class="style2">movies</a>
+                            <a href="" class="style5">youtube</a>
+                            <a href="" class="style3">free stuff</a>
+                            <a href="" class="style4">tutorials</a>
+                            <a href="" class="style1">articles</a>
+                            <a href="" class="style4">jQuery samples</a>
+                        </div>
+                        <h3><a href="">Popular Messages</a></h3>
+                        <div class="right-content">
+                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus. 
+                        </div>
+                        <h3><a href="">Popular Links</a></h3>
+                        <div class="right-content">
+                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus. 
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!--// ENDS CONTAINER -->
+        </div>
+        <!--// ENDS CONTAINER-BG -->
+        <div id="footer">
+            <div class="ftr-links">
+                <a href="index.html">home</a>
+                |<a href="services.html">services</a>
+                |<a href="mission.html">mission</a>
+                |
+                <br/>
+                Copyright &copy; 2009 ESME
+                <br/>
+            </div>
+        </div>
+    </body>
+</html>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html Fri Mar  5 11:55:25 2010
@@ -24,13 +24,13 @@
                 </div>
                 <!--// ENDS HEADER -->
                 <div id="left">
-                   <lift:bind name="content" />
-                </div><!--left-->
+                  <lift:bind name="content" />
+                </div><!--left   -->
                 <div id="right">
                 <lift:bind name="login">
-                  <lift:UserSnip.loginForm/>
+                 <lift:UserSnip.loginForm/> 
                 </lift:bind>
-                </div><!--right-->
+                </div><!--right -->
            </div><!--// ENDS CONTAINER -->
         </div><!--// ENDS CONTAINER-BG -->
         <div class="footer">

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html Fri Mar  5 11:55:25 2010
@@ -61,7 +61,7 @@
                                     <div class="post-form-row">
                                         <textarea class="inputBox2" id="textdude" rows="5" cols="80%"></textarea>
                                         <div class="update-btn">
-                                            <input type="image" onclick="javascript:post_msg();" src="images/btn-update.gif" />
+                                            <input type="image" onclick="javascript:post_msg();alert('hi');" src="images/btn-update.gif" />
                                         </div>
                                     </div>
                                     <script>

Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html?rev=919387&r1=919386&r2=919387&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html Fri Mar  5 11:55:25 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<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" />