esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r833989 [2/2] - in /incubator/esme/trunk/server/src/main/webapp: action_view/ auth_view/ info_view/ pools_view/ static/ templates-hidden/ track_view/ user_template/
Date Mon, 09 Nov 2009 07:52:08 GMT
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Mon Nov  9 07:52:07 2009
@@ -1,263 +1,339 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/"
-      xml:lang="eng">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-    <title><lift:loc>ui_default_title</lift:loc></title>
-
-    <lift:Style.header />
-
-    <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>
-    <div class="container">
-      <div class="head">
-        <img src="/images/esme.png" alt="ESME" />
-        <img src="/images/ajax-loader.gif" style="display: none" id="ajax-loader"/>
-        <ul class="b-primary">
-          <li><lift:Menu.item name="sign_up"/></li>
-          <li><lift:Menu.item name="EditUser"/></li>
-          <li><lift:Menu.item name="about"/></li>
-          <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>
-          <li><lift:Menu.item name="logout"/></li>
-        </ul>
-      </div>
-
-      <table class="l-page l-page-massage">
-        <tbody>
-          <tr>
-            <td class="l-page-r">
-              <div class="l-top">
-                <div id="tabs" >
-                  <dl class="messages">
-                    <dt class="caption"><lift:loc>ui_messages_your_timeline</lift:loc></dt>
-
-                    <dd>
-                      <div class="b-list">
-                        <table>
-                          <thead>
-                            <tr>
-                              <th><lift:loc>ui_messages_message_label_author</lift:loc></th>
-                              <th><lift:loc>ui_messages_message_label_message</lift:loc></th>
-                              <th><lift:loc>ui_messages_message_label_tags</lift:loc></th>
-                            </tr>
-                          </thead>
-                          <lift:comet type="Timeline"/>
-                          <tbody id="timeline_messages">
-                            <tr id="message">
-                              <td><img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/><div id="author">anon</div></td>
-                              <td class="message">
-                                <div class="outer">
-                                  <div class="inner clear">
-                                    <p class="text" id="body">This is a test message in the HTML for designers.</p>
-                                  </div>
-                                  <div class="metainfo">
-                                    <span id="pool">in pool PUBLIC</span>
-                                    <span id="reason">resent by me</span>
-                                    <span id="when" class="date">today</span>
-                                  </div>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/" xml:lang="eng">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+        <title><lift:loc>ui_default_title</lift:loc></title>
+        <lift:Style.header/><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>
+        <div class="container">
+            <div class="head">
+                <img src="/images/esme.png" alt="ESME" /><img src="/images/ajax-loader.gif" style="display: none" id="ajax-loader"/>
+                <ul class="b-primary">
+                    <li>
+                        <lift:Menu.item name="sign_up"/>
+                    </li>
+                    <li>
+                        <lift:Menu.item name="EditUser"/>
+                    </li>
+                    <li>
+                        <lift:Menu.item name="about"/>
+                    </li>
+                    <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>
+                    <li>
+                        <lift:Menu.item name="logout"/>
+                    </li>
+                </ul>
+            </div>
+            <table class="l-page l-page-massage">
+                <tbody>
+                    <tr>
+                        <td class="l-page-r">
+                            <div class="l-top">
+                                <div id="tabs">
+                                    <dl class="messages">
+                                        <dt class="caption">
+                                            <lift:loc>ui_messages_your_timeline</lift:loc>
+                                        </dt>
+                                        <dd>
+                                            <div class="b-list">
+                                                <table>
+                                                    <thead>
+                                                        <tr>
+                                                            <th>
+                                                                <lift:loc>ui_messages_message_label_author</lift:loc>
+                                                            </th>
+                                                            <th>
+                                                                <lift:loc>ui_messages_message_label_message</lift:loc>
+                                                            </th>
+                                                            <th>
+                                                                <lift:loc>ui_messages_message_label_tags</lift:loc>
+                                                            </th>
+                                                        </tr>
+                                                    </thead>
+                                                    <lift:comet type="Timeline"/>
+                                                    <tbody id="timeline_messages">
+                                                        <tr id="message">
+                                                            <td>
+                                                                <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+                                                                <div id="author">
+                                                                    anon
+                                                                </div>
+                                                            </td>
+                                                            <td class="message">
+                                                                <div class="outer">
+                                                                    <div class="inner clear">
+                                                                        <p class="text" id="body">
+                                                                            This is a test message in the HTML for designers.
+                                                                        </p>
+                                                                    </div>
+                                                                    <div class="metainfo">
+                                                                        <span id="pool">in pool PUBLIC</span>
+                                                                        <span id="reason">resent by me</span>
+                                                                        <span id="when" class="date">today</span>
+                                                                    </div>
+                                                                </div>
+                                                            </td>
+                                                            <td id="tags" class="tag">
+                                                                <p id="tag">
+                                                                    <a href="tag/tag1">tag1</a>
+                                                                </p>
+                                                                <p id="tag">
+                                                                    <a href="tag/tag2">tag2</a>
+                                                                </p>
+                                                            </td>
+                                                            <td>
+                                                                <button id="resend" class="btn">
+                                                                    <lift:loc>ui_messages_message_label_resend</lift:loc>
+                                                                </button>
+                                                                <br/>
+                                                                <a href="#" id="reply"><lift:loc>ui_messages_message_label_reply</lift:loc></a>
+                                                                <br/>
+                                                                <a id="conversation"><lift:loc>ui_messages_message_label_conversation</lift:loc></a>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                        </dd>
+                                    </dl>
+                                    <lift:UserSnip.resendScript/>
+                                    <dl class="tagclouds">
+                                        <dt class="caption">
+                                            <lift:loc>ui_messages_message_label_public_timeline</lift:loc>
+                                        </dt>
+                                        <dd>
+                                            <div class="b-list">
+                                                <table>
+                                                    <thead>
+                                                        <tr>
+                                                            <th>
+                                                                <lift:loc>ui_messages_message_label_author</lift:loc>
+                                                            </th>
+                                                            <th>
+                                                                <lift:loc>ui_messages_message_label_message</lift:loc>
+                                                            </th>
+                                                            <th>
+                                                                <lift:loc>ui_messages_message_label_tags</lift:loc>
+                                                            </th>
+                                                        </tr>
+                                                    </thead>
+                                                    <lift:comet type="PublicTimeline"/>
+                                                    <tbody id="public_timeline_messages">
+                                                        <tr id="message">
+                                                            <td>
+                                                                <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+                                                                <div id="author">
+                                                                    anon
+                                                                </div>
+                                                            </td>
+                                                            <td class="message">
+                                                                <div class="outer">
+                                                                    <div class="inner clear">
+                                                                        <p class="text" id="body">
+                                                                            This is a test message in the HTML for designers.
+                                                                        </p>
+                                                                    </div>
+                                                                    <div class="metainfo">
+                                                                        <span id="pool">in pool PUBLIC</span>
+                                                                        <span id="reason">resent by me</span>
+                                                                        <span id="when" class="date">today</span>
+                                                                    </div>
+                                                                </div>
+                                                            </td>
+                                                            <td id="tags" class="tag">
+                                                                <p id="tag">
+                                                                    <a href="tag/tag1">tag1</a>
+                                                                </p>
+                                                                <p id="tag">
+                                                                    <a href="tag/tag2">tag2</a>
+                                                                </p>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                        </dd>
+                                    </dl>
+                                    <dl class="contacts">
+                                        <dt class="caption">
+                                            <lift:loc>ui_messages_message_label_contacts</lift:loc>
+                                        </dt>
+                                        <dd class="b-contacts" style="height: 240px; overflow: auto">
+                                            <lift:loc>ui_messages_message_label_following</lift:loc>
+                                            <lift:UserSnip.following/>
+                                        </dd>
+                                        <dd class="b-contacts" style="height: 240px; overflow: auto">
+                                            <lift:loc>ui_messages_message_label_followers</lift:loc>
+                                            <lift:UserSnip.followers/>
+                                        </dd>
+                                    </dl>
                                 </div>
-                              </td>
-                              <td id="tags" class="tag">
-                                <p id="tag"><a href="tag/tag1">tag1</a></p>
-                                <p id="tag"><a href="tag/tag2">tag2</a></p>
-                              </td>
-                              <td><button id="resend" class="btn"><lift:loc>ui_messages_message_label_resend</lift:loc></button><br/>
-                                  <a href="#" id="reply"><lift:loc>ui_messages_message_label_reply</lift:loc></a><br/>
-                                  <a id="conversation"><lift:loc>ui_messages_message_label_conversation</lift:loc></a></td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                    </dd>
-                  </dl>
-                  <lift:UserSnip.resendScript/>
-
-                  <dl class="tagclouds">
-                    <dt class="caption"><lift:loc>ui_messages_message_label_public_timeline</lift:loc></dt>
-
-                    <dd>
-                      <div class="b-list">
-                        <table>
-                          <thead>
-                            <tr>
-                              <th><lift:loc>ui_messages_message_label_author</lift:loc></th>
-                              <th><lift:loc>ui_messages_message_label_message</lift:loc></th>
-                              <th><lift:loc>ui_messages_message_label_tags</lift:loc></th>
-                            </tr>
-                          </thead>
-                          <lift:comet type="PublicTimeline"/>
-                          <tbody id="public_timeline_messages">
-                            <tr id="message">
-                              <td><img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/><div id="author">anon</div></td>
-                              <td class="message">
-                                <div class="outer">
-                                  <div class="inner clear">
-                                    <p class="text" id="body">This is a test message in the HTML for designers.</p>
-                                  </div>
-                                  <div class="metainfo">
-                                    <span id="pool">in pool PUBLIC</span>
-                                    <span id="reason">resent by me</span>
-                                    <span id="when" class="date">today</span>
-                                  </div>
+                            </div>
+                        </td>
+                        <td class="l-page-l">
+                            <div class="b-edit">
+                                <h2 class="title"><lift:loc>ui_messages_message_label_welcome</lift:loc><span class="name"><lift:UserSnip.name/></span></h2>
+                                <div class="b-popup-c">
+                                    <div class="row clear">
+                                        <label>
+                                            <lift:loc>ui_messages_message_label_message_request</lift:loc>
+                                        </label>
+                                        <textarea rows="4" cols="20" id="textdude" style="width: 90%">
+                                        </textarea>
+                                    </div>
+                                    <div class="row clear" style="display: none;" id="reply-to-div">
+                                        <lift:loc>ui_messages_message_label_message_reply</lift:loc>
+                                        <span id="reply-to-span">&nbsp;</span>
+                                        <button onclick="clearReplyTo()">
+                                            remove reply
+                                        </button>
+                                    </div>
+                                    <div class="row clear" style="display: none">
+                                        <label>
+                                            <lift:loc>ui_messages_message_label_message_tag</lift:loc>
+                                        </label>
+                                        <input id="tagdude" style="width: 90%"/>
+                                        <div class="note clear">
+                                            <span class="l"><lift:loc>ui_messages_message_label_message_tag_note</lift:loc></span>
+                                            <span class="r"><lift:loc>ui_messages_message_label_message_tag_not_required</lift:loc></span>
+                                        </div>
+                                    </div>
+                                    <div class="row clear">
+                                        <label>
+                                            <lift:loc>ui_messages_message_label_message_pool</lift:loc>
+                                        </label>
+                                        <select id="access_pool">
+                                            <option id="0"><lift:loc>ui_messages_message_label_message_pool_public</lift:loc></option>
+                                            <lift:UserSnip.accessPools/>
+                                        </select>
+                                    </div>
+                                    <div class="row clear">
+                                        <button class="btn" onclick="javascript:post_msg();">
+                                            Update<!--<img src="/images/send-message.png" alt="Send Message" />-->
+                                        </button>
+                                    </div>
+                                    <script>
+                                        // <![CDATA[
+                                        var currentConvNumber = 0;
+                                        
+                                        function setReplyTo(id, text){
+                                            currentConvNumber = id;
+                                            document.getElementById('reply-to-div').style.display = "block";
+                                            jQuery('#reply-to-span').html(text);
+                                        }
+                                        
+                                        function clearReplyTo(){
+                                            currentConvNumber = 0;
+                                            document.getElementById('reply-to-div').style.display = "none";
+                                        }
+                                        
+                                        function clearResend(id){
+                                            document.getElementById(id).style.display = "none"
+                                        }
+                                        
+                                        // ]]>
+                                    </script>
+                                    <lift:UserSnip.postScript/>
                                 </div>
-                              </td>
-                              <td id="tags" class="tag">
-                                <p id="tag"><a href="tag/tag1">tag1</a></p>
-                                <p id="tag"><a href="tag/tag2">tag2</a></p>
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                    </dd>
-                  </dl>
-                  <dl class="contacts">
-                    <dt class="caption">
-                      <lift:loc>ui_messages_message_label_contacts</lift:loc>
-                    </dt>
-
-                    <dd class="b-contacts" style="height: 240px; overflow: auto">
-                      <lift:loc>ui_messages_message_label_following</lift:loc>
-                      <lift:UserSnip.following/>
-                    </dd>
-                    <dd class="b-contacts" style="height: 240px; overflow: auto">
-                      <lift:loc>ui_messages_message_label_followers</lift:loc>
-                      <lift:UserSnip.followers/>
-                    </dd>
-                  </dl>
-                </div>
-              </div>
-            </td>
-            <td class="l-page-l">
-              <div class="b-edit">
-                <h2 class="title"><lift:loc>ui_messages_message_label_welcome</lift:loc><span class="name"><lift:UserSnip.name /></span></h2>
-
-                <div class="b-popup-c">
-                  <div class="row clear">
-                    <label><lift:loc>ui_messages_message_label_message_request</lift:loc></label>
-                    <textarea rows="4" cols="20" id="textdude"
-                              style="width: 90%"></textarea
-                    >
-                  </div>
-                  <div class="row clear"
-                       style="display: none;"
-                       id="reply-to-div">
-                    <lift:loc>ui_messages_message_label_message_reply</lift:loc><span id="reply-to-span">&nbsp;</span>
-                    <button onclick="clearReplyTo()">remove reply</button>
-                  </div>
-
-                  <div class="row clear" style="display: none">
-                    <label><lift:loc>ui_messages_message_label_message_tag</lift:loc></label>
-                    <input id="tagdude" style="width: 90%"/>
-                    <div class="note clear">
-                      <span class="l"><lift:loc>ui_messages_message_label_message_tag_note</lift:loc></span>
-                      <span class="r"><lift:loc>ui_messages_message_label_message_tag_not_required</lift:loc></span>
-                    </div>
-                  </div>
-
-                  <div class="row clear">
-                    <label><lift:loc>ui_messages_message_label_message_pool</lift:loc></label>
-                    <select id="access_pool">
-                      <option id="0"><lift:loc>ui_messages_message_label_message_pool_public</lift:loc></option>
-                      <lift:UserSnip.accessPools />
-                    </select>
-                  </div>
-
-                  <div class="row clear"><button class="btn" onclick="javascript:post_msg();">Update<!--<img src="/images/send-message.png" alt="Send Message" />--></button></div>
-
-                  <script>
-                    // <![CDATA[
-                    var currentConvNumber = 0;
-
-                    function setReplyTo(id, text) {
-                      currentConvNumber = id;
-                      document.getElementById('reply-to-div').style.display = "block";
-                      jQuery('#reply-to-span').html(text);
-                    }
-
-                    function clearReplyTo() {
-                      currentConvNumber = 0;
-                      document.getElementById('reply-to-div').style.display = "none";
-                    }
-                    
-                    function clearResend(id) {
-                      document.getElementById(id).style.display="none"
-                    }
-                    // ]]>
-                  </script>
-                  <lift:UserSnip.postScript />
-                </div>
-
-
-                <div class="b-cloud">
-                  <lift:comet type="TagCloud"/>
-                </div>
-                
-                <div class="b-stats">
-                  <p id="stats-para"><lift:loc>ui_messages_message_label_popular</lift:loc></p>
-                  <lift:UserSnip.popular>
-                    <table>
-                      <thead>
-                        <tr> <th><lift:loc>ui_messages_message_header_popular_resent</lift:loc></th> <th><lift:loc>ui_messages_message_header_popular_message</lift:loc></th> </tr>
-                      </thead>
-                      <tbody>
-                        <disp:item>
-                          <tr>
-                            <td><item:freq/></td>
-                            <td><item:author/>:
-                                <item:text/>
-                                <!--<item:date/>--></td>
-                          </tr>
-                        </disp:item>
-                      </tbody>
-                    </table>
-                  </lift:UserSnip.popular>
-                </div>
-
-                <div class="b-stats">
-                  <p id="stats-para"><lift:loc>ui_messages_message_label_popular_links</lift:loc></p>
-                  <lift:UserSnip.links>
-                    <table>
-                      <thead>
-                        <tr> <th><lift:loc>ui_messages_message_header_popular_links_clicked</lift:loc></th> <th><lift:loc>ui_messages_message_header_popular_links_link</lift:loc></th> </tr>
-                      </thead>
-                      <tbody>
-                        <disp:item>
-                          <tr> <td><item:freq/></td> <td><item:url/></td> </tr>
-                        </disp:item>
-                      </tbody>
-                    </table>
-                  </lift:UserSnip.links>
-                </div>
-
-                <lift:ignore>
-                  <div class="bugs">
-                    <form action="/user_view/search"
-                          class="b-primay"><input style="height: 20px; background: #c9d8ea;"
-                                              name="term"/>
-                      <input style="height: 22px; background: #233e5e; color: #c9d8ea;" type="submit" value="Search"/>
-                    </form>
-                  </div>
-                </lift:ignore>
-
-              </div>
-            </td>
-
-
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <div class="foot">
-      <center><lift:loc>ui_default_footer</lift:loc></center>
-    </div>
-  </body>
+                                <div class="b-cloud">
+                                    <lift:comet type="TagCloud"/>
+                                </div>
+                                <div class="b-stats">
+                                    <p id="stats-para">
+                                        <lift:loc>ui_messages_message_label_popular</lift:loc>
+                                    </p>
+                                    <lift:UserSnip.popular>
+                                        <table>
+                                            <thead>
+                                                <tr>
+                                                    <th>
+                                                        <lift:loc>ui_messages_message_header_popular_resent</lift:loc>
+                                                    </th>
+                                                    <th>
+                                                        <lift:loc>ui_messages_message_header_popular_message</lift:loc>
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <disp:item>
+                                                    <tr>
+                                                        <td>
+                                                            <item:freq/>
+                                                        </td>
+                                                        <td>
+                                                            <item:author/>:<item:text/><!--<item:date/>-->
+                                                        </td>
+                                                    </tr>
+                                                </disp:item>
+                                            </tbody>
+                                        </table>
+                                    </lift:UserSnip.popular>
+                                </div>
+                                <div class="b-stats">
+                                    <p id="stats-para">
+                                        <lift:loc>ui_messages_message_label_popular_links</lift:loc>
+                                    </p>
+                                    <lift:UserSnip.links>
+                                        <table>
+                                            <thead>
+                                                <tr>
+                                                    <th>
+                                                        <lift:loc>ui_messages_message_header_popular_links_clicked</lift:loc>
+                                                    </th>
+                                                    <th>
+                                                        <lift:loc>ui_messages_message_header_popular_links_link</lift:loc>
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <disp:item>
+                                                    <tr>
+                                                        <td>
+                                                            <item:freq/>
+                                                        </td>
+                                                        <td>
+                                                            <item:url/>
+                                                        </td>
+                                                    </tr>
+                                                </disp:item>
+                                            </tbody>
+                                        </table>
+                                    </lift:UserSnip.links>
+                                </div>
+                                <lift:ignore>
+                                    <div class="bugs">
+                                        <form action="/user_view/search" class="b-primay">
+                                            <input style="height: 20px; background: #c9d8ea;" name="term"/><input style="height: 22px; background: #233e5e; color: #c9d8ea;" type="submit" value="Search"/>
+                                        </form>
+                                    </div>
+                                </lift:ignore>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="foot">
+            <center>
+                <lift:loc>ui_default_footer</lift:loc>
+            </center>
+        </div>
+    </body>
 </html>

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html Mon Nov  9 07:52:07 2009
@@ -1,8 +1,13 @@
-<form id="openid_submit" class="clear" method="post" action="/open_id/login" >
-  <div class="b-open-l">
-    <p class="input"><label for="open_id_field"><lift:loc>ui_open_id_title</lift:loc></label> <input type="text" name="open_id" id="open_id_field"/></p>
-    <p class="button">
-      <img onclick="document.getElementById('openid_submit').submit()" src="/images/sign-on.png" alt="Sign On" />
-    </p>
-  </div>
+<form id="openid_submit" class="clear" method="post" action="/open_id/login">
+    <div class="b-open-l">
+        <p class="input">
+            <label for="open_id_field">
+                <lift:loc>ui_open_id_title</lift:loc>
+            </label>
+            <input type="text" name="open_id" id="open_id_field"/>
+        </p>
+        <p class="button">
+            <img onclick="document.getElementById('openid_submit').submit()" src="/images/sign-on.png" alt="Sign On" />
+        </p>
+    </div>
 </form>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html Mon Nov  9 07:52:07 2009
@@ -1,13 +1,21 @@
 <form method="post" action="/authentication/login">
-  <label for="username"><lift:loc>ui_login_user</lift:loc><br/>
-    <input type="text" name="username" value="" id="username"/>
-  </label>
-<br/>
-  <label for="password"><lift:loc>ui_login_password</lift:loc><br/>
-    <input type="password" name="password" value="" id="password"/>
-  </label>
-  <br/>
-  <label for="login">
-    <input type="submit" value="Login" id="login"/>
-  </label>
+    <label for="username">
+        <lift:loc>
+            ui_login_user
+        </lift:loc>
+        <br/>
+        <input type="text" name="username" value="" id="username"/>
+    </label>
+    <br/>
+    <label for="password">
+        <lift:loc>
+            ui_login_password
+        </lift:loc>
+        <br/>
+        <input type="password" name="password" value="" id="password"/>
+    </label>
+    <br/>
+    <label for="login">
+        <input type="submit" value="Login" id="login"/>
+    </label>
 </form>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html Mon Nov  9 07:52:07 2009
@@ -1,24 +1,26 @@
 <lift:xml_group>
-  <label for="email">
-    <lift:loc>ui_login_email</lift:loc> 
+    <label for="email">
+        <lift:loc>
+            ui_login_email
+        </lift:loc>
+        <br/>
+        <signup:email/><lift:msg id="email"/>
+    </label>
     <br/>
-    <signup:email/>
-    <lift:msg id="email"/>
-  </label>
-  <br/>
-
-  <label for="pwd1">
-  <lift:loc>ui_login_password</lift:loc> 
+    <label for="pwd1">
+        <lift:loc>
+            ui_login_password
+        </lift:loc>
+        <br/>
+        <signup:pwd1/><lift:msg id="pwd1"/>
+    </label>
     <br/>
-    <signup:pwd1/>
-    <lift:msg id="pwd1"/>
-  </label>
-  <br/>
-
-  <label for="pwd2">
-  <lift:loc>ui_login_password_repeat</lift:loc> 
+    <label for="pwd2">
+        <lift:loc>
+            ui_login_password_repeat
+        </lift:loc>
+        <br/>
+        <signup:pwd2/>
+    </label>
     <br/>
-    <signup:pwd2/>
-  </label>
-  <br/>
 </lift:xml_group>

Modified: incubator/esme/trunk/server/src/main/webapp/track_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/track_view/index.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/track_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/track_view/index.html Mon Nov  9 07:52:07 2009
@@ -1,74 +1,94 @@
 <lift:surround with="default" at="content">
-
-	<lift:Style.header />
-	    	
-	<!-- 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" />
-		<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>
-		
-		<div class="demo">
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
-	<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-		<li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tabs-1"><lift:loc>ui_track_manage</lift:loc></a></li>
-		<li class="ui-state-default ui-corner-top"><a href="#tabs-2"><lift:loc>ui_track_new_track</lift:loc></a></li>
-	</ul>
-	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
-  <span id="TrackSpan">
-    <lift:ignore>
-      <!--
-      The displayTracking snippet *MUST* appear on the page before
-      the main snippet
-      -->
-    </lift:ignore>
-    <lift:displayTracking the_id="TrackSpan">
-            <table border="1">
-        <tr>
-          <td halign="center"><b><lift:loc>ui_track_manage_track</lift:loc></b></td>
-          <td halign="center"><b><lift:loc>ui_track_manage_active</lift:loc></b></td>
-          <td halign="center"><b><lift:loc>ui_track_manage_remove</lift:loc></b></td>
-        </tr>
-        <disp:item>
-          <tr>
-            <td><item:pattern/></td>
-            <td><item:enabled/></td>
-            <td>
-              <item:remove><img src="/images/delete.png"/></item:remove>
-            </td>
-          </tr>
-        </disp:item>
-      </table>
-
-    </lift:displayTracking>
-  </span>
-	</div>
-	<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
-  <lift:form>
-    <lift:main>
-    <table>
-      <tr>
-        <td><lift:loc>ui_track_new_track_what</lift:loc></td>
-        <td><main:track/></td>
-      </tr>
-       <tr>
-      <td></td><td><input type="submit" value="Add" /></td>
-      </tr>
-    </table>
-    </lift:main>
-  </lift:form>
-	</div>
-</div>
-
-</div><!-- End demo -->
-
-</lift:surround>
+    <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" />
+    <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-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">
+        <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
+            <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+                <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
+                    <a href="#tabs-1"><lift:loc>ui_track_manage</lift:loc></a>
+                </li>
+                <li class="ui-state-default ui-corner-top">
+                    <a href="#tabs-2"><lift:loc>ui_track_new_track</lift:loc></a>
+                </li>
+            </ul>
+            <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-1">
+                <span id="TrackSpan">
+                    <lift:ignore>
+                        <!--
+                        The displayTracking snippet *MUST* appear on the page before
+                        the main snippet
+                        -->
+                    </lift:ignore>
+                    <lift:displayTracking the_id="TrackSpan">
+                        <table id="esme-table" class="tablesorter">
+                            <thead>
+                                <tr>
+                                    <th>
+                                        <lift:loc>ui_track_manage_track</lift:loc>
+                                    </th>
+                                    <th>
+                                        <lift:loc>ui_track_manage_active</lift:loc>
+                                    </th>
+                                    <th>
+                                        <lift:loc>ui_track_manage_remove</lift:loc>
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <disp:item>
+                                    <tr>
+                                        <td>
+                                            <item:pattern/>
+                                        </td>
+                                        <td>
+                                            <item:enabled/>
+                                        </td>
+                                        <td>
+                                            <item:remove>
+                                                <img src="/images/delete.png"/>
+                                            </item:remove>
+                                        </td>
+                                    </tr>
+                                </disp:item>
+                            </tbody>
+                        </table>
+                    </lift:displayTracking>
+                </span>
+            </div>
+            <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+                <lift:form>
+                    <lift:main>
+                        <table>
+                            <tr>
+                                <td>
+                                    <lift:loc>ui_track_new_track_what</lift:loc>
+                                </td>
+                                <td>
+                                    <main:track/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                </td>
+                                <td>
+                                    <input type="submit" value="Add" />
+                                </td>
+                            </tr>
+                        </table>
+                    </lift:main>
+                </lift:form>
+            </div>
+        </div>
+    </div><!-- End demo -->
+</lift:surround>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/user_template/edit.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/user_template/edit.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/user_template/edit.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/user_template/edit.html Mon Nov  9 07:52:07 2009
@@ -1,4 +1,16 @@
-<table><tr><td colspan="2"><lift:loc>ui_edit_profile</lift:loc></td></tr>
+<table>
+    <tr>
+        <td colspan="2">
+            <lift:loc>ui_edit_profile</lift:loc>
+        </td>
+    </tr>
     <user:user_info/>
-    <tr><td>&nbsp;</td><td><user:submit/></td></tr>
-</table>
+    <tr>
+        <td>
+            &nbsp;
+        </td>
+        <td>
+            <user:submit/>
+        </td>
+    </tr>
+</table>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/user_template/login.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/user_template/login.html?rev=833989&r1=833988&r2=833989&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/user_template/login.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/user_template/login.html Mon Nov  9 07:52:07 2009
@@ -1,9 +1,13 @@
- <form id="openid_submit" class="clear" method="POST" action="/user_mgt/login" >
+<form id="openid_submit" class="clear" method="POST" action="/user_mgt/login">
     <div class="b-open-l">
-      <p class="input"><label><lift:loc>ui_login_openID</lift:loc></label><user:openid /></p>
-      <p class="button">
-        <img onclick="document.getElementById('openid_submit').submit()" src="/images/sign-on.png" alt="Sign On" />
-      </p>
+        <p class="input">
+            <label>
+                <lift:loc>ui_login_openID</lift:loc>
+            </label>
+            <user:openid/>
+        </p>
+        <p class="button">
+            <img onclick="document.getElementById('openid_submit').submit()" src="/images/sign-on.png" alt="Sign On" />
+        </p>
     </div>
-
-  </form>
+</form>
\ No newline at end of file



Mime
View raw message