esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r834090 - in /incubator/esme/trunk/server/src/main: resources/ESMEUI.properties webapp/info_view/tag.html webapp/info_view/user.html
Date Mon, 09 Nov 2009 14:56:02 GMT
Author: rhirsch
Date: Mon Nov  9 14:55:56 2009
New Revision: 834090

URL: http://svn.apache.org/viewvc?rev=834090&view=rev
Log:
[ESME-90] Sorting tables via Lift's TableSorter widget

Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
    incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
    incubator/esme/trunk/server/src/main/webapp/info_view/user.html

Modified: incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEUI.properties?rev=834090&r1=834089&r2=834090&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Mon Nov  9 14:55:56 2009
@@ -58,6 +58,10 @@
 ui_user_contacts=Contacts
 ui_user_following=Following
 ui_user_followers=Followers
+ui_user_author=Author
+ui_user_message=Message
+ui_user_date=Date
+
 
 ui_token_title_manage=Manage your tokens 
 ui_token_title_create=Create a token 
@@ -128,6 +132,15 @@
 ui_track_manage_track=Track
 ui_track_new_track=Create new track
 ui_track_new_track_what=What do you want to track?
+
+ui_tag_title=Tag 
+ui_tag_author=Author
+ui_tag_message=Message
+ui_tag_date=Date
+
+
+
+
  
 
    

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/tag.html?rev=834090&r1=834089&r2=834090&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/tag.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/tag.html Mon Nov  9 14:55:56 2009
@@ -1,11 +1,28 @@
 <lift:surround with="default" at="content">
+    <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+    </script>
+    <lift:TableSorterSnip/>
     <lift:tag_display>
         <div>
             <fieldset>
                 <legend>
-                    <tag:name/>
+                    <lift:loc>ui_tag_title</lift:loc> <b><tag:name/></b>
                 </legend>
-                <table>
+              <table id="esme-table" class="tablesorter">
+            <thead>
+                <tr>
+                    <th>
+                        <lift:loc>ui_tag_author</lift:loc>
+                    </th>
+                    <th>
+                        <lift:loc>ui_tag_message</lift:loc>
+                    </th>
+                    <th>
+                        <lift:loc>ui_tag_date</lift:loc>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
                     <tag:each>
                         <tr>
                             <td>
@@ -19,6 +36,7 @@
                             </td>
                         </tr>
                     </tag:each>
+                     </tbody>
                 </table>
             </fieldset>
         </div>

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=834090&r1=834089&r2=834090&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 Mon Nov  9 14:55:56 2009
@@ -1,17 +1,17 @@
 <lift:surround with="default" at="content">
-    <lift:Style.header/><!-- STYLESHEETS <lift:Style.header /> -->
+    <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" />
     <link type="text/css" href="../style/smoothness/jquery-ui-1.7.2.custom.css" rel="stylesheet"
/>
     <!--[if IE 6]><link rel="stylesheet" type="text/css" href="../style/ie6.css"
media="screen" /><![endif]--><!--[if gte IE 7]><link rel="stylesheet" type="text/css"
href="../style/ie.css" media="screen" /><![endif]--><!-- JAVASCRIPT -->
-    <script type="text/javascript" src="../scripts/jquery-1.3.2.min.js">
-    </script>
     <script type="text/javascript" src="../scripts/jquery-ui-1.7.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>
     <div class="demo">
         <lift:user_info>
             <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
@@ -31,19 +31,34 @@
                         <span id="following"><user:followButton/></span>
                         <dd>
                             <table id="esme-table" class="tablesorter">
-                                <user:timeline>
+                                <thead>
                                     <tr>
-                                        <td>
-                                            <item:author/>
-                                        </td>
-                                        <td>
-                                            <item:body/>
-                                        </td>
-                                        <td>
-                                            <item:date/>
-                                        </td>
+                                        <th>
+                                            <lift:loc>ui_user_author</lift:loc>
+                                        </th>
+                                        <th>
+                                            <lift:loc>ui_user_message</lift:loc>
+                                        </th>
+                                        <th>
+                                            <lift:loc>ui_user_date</lift:loc>
+                                        </th>
                                     </tr>
-                                </user:timeline>
+                                </thead>
+                                <tbody>
+                                    <user:timeline>
+                                        <tr>
+                                            <td>
+                                                <item:author/>
+                                            </td>
+                                            <td>
+                                                <item:body/>
+                                            </td>
+                                            <td>
+                                                <item:date/>
+                                            </td>
+                                        </tr>
+                                    </user:timeline>
+                                </tbody>
                             </table>
                         </dd>
                     </dl>
@@ -51,13 +66,21 @@
                 <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"
id="tabs-2">
                     <dl class="">
                         <dd class="b-clouds">
-                            <table>
+                            <table class="tablesorter">
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            <lift:loc>ui_user_message</lift:loc>
+                                        </th>
+                                        <th>
+                                            <lift:loc>ui_user_date</lift:loc>
+                                        </th>
+                                    </tr>
+                                </thead>
+                                <tbody>
                                 <user:messages>
                                     <tr>
                                         <td>
-                                            <item:author/>
-                                        </td>
-                                        <td>
                                             <item:body/>
                                         </td>
                                         <td>
@@ -65,6 +88,7 @@
                                         </td>
                                     </tr>
                                 </user:messages>
+                                </tbody>
                             </table>
                         </dd>
                     </dl>



Mime
View raw message