incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akpette...@apache.org
Subject svn commit: r930539 - in /incubator/esme/trunk/server/src/main/webapp/info_view: conversation.html users.html
Date Sat, 03 Apr 2010 16:38:49 GMT
Author: akpetteroe
Date: Sat Apr  3 16:38:49 2010
New Revision: 930539

URL: http://svn.apache.org/viewvc?rev=930539&view=rev
Log:
[ESME-100] Finish web UI
New layout on users and conversation pages

Modified:
    incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
    incubator/esme/trunk/server/src/main/webapp/info_view/users.html

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=930539&r1=930538&r2=930539&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 Sat Apr  3 16:38:49
2010
@@ -17,20 +17,25 @@
  under the License.                                           *
 -->
 <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" />
-    <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:Style.header/><lift:TableSorterSnip/>
+    <link rel="stylesheet" type="text/css" href="../style/style.css"/>
     <script src="/scripts/display_messages.js" type="text/javascript"/>
         <script type="text/javascript" src="../scripts/esme_table_sorter.js">
     </script>
-    <div class="box-title-aux">
-   <h3><a href=""><lift:loc>ui_default_conversation</lift:loc></a></h3>
-     </div>
+
+<div id="back-header">
+	<h1><b><lift:loc>ui_default_conversation</lift:loc></b></h1>
+		
+	<!---CONTENT BOX-->
+	<div class="container-settings">
         <div class="b-list">
             <lift:displayConversation/>
             <lift:embed what="templates-hidden/timeline"/>
         </div>
-       
-</lift:surround>
\ No newline at end of file
+	</div><!--container-settings-->
+	
+	</div><!--END CONTENT BOX-->	    
+</lift:surround>
+
+
+	

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/users.html?rev=930539&r1=930538&r2=930539&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/users.html Sat Apr  3 16:38:49 2010
@@ -17,12 +17,15 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-    <script type="text/javascript" src="../scripts/esme_table_sorter.js">
-    </script>
+    <link rel="stylesheet" type="text/css" href="../style/style.css"/>
+    <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
     <lift:TableSorterSnip/>
-    <div class="box-title-aux">
-      <h3><a href=""><lift:loc>ui_user_list_title</lift:loc></a></h3>
-     </div>
+    <div id="back-header">
+      <h1><b><lift:loc>ui_user_list_title</lift:loc></b></h1>
+     
+	<!---CONTENT BOX-->
+	<div class="container-settings">
+	
         <table id="esme-table" class="tablesorter">            
             <thead>
                 <tr>
@@ -68,4 +71,7 @@
                 </lift:displayUsers>
             </tbody>
         </table>
+      
+      </div><!--container-settings-->
+	</div><!--END CONTENT BOX-->	
 </lift:surround>
\ No newline at end of file



Mime
View raw message