incubator-esme-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Richard Hirsch <hirsch.d...@gmail.com>
Subject Re: svn commit: r923106 - in /incubator/esme/trunk/server/src/main: resources/ scala/bootstrap/liftweb/ scala/org/apache/esme/comet/ scala/org/apache/esme/lib/ scala/org/apache/esme/model/ scala/org/apache/esme/snippet/ webapp/ webapp/action_view/ we
Date Mon, 15 Mar 2010 08:12:49 GMT
The new UI branch is now integrated into the trunk and deployed on stax (
http://esmecloudserverapache.dickhirsch.staxapps.net/)

Should we create a Jira item to take care of all the UI-related bugs (there
are tons!)

On Mon, Mar 15, 2010 at 9:03 AM, Anne Kathrine Petter√łe
<yojibee@gmail.com>wrote:

> Sorry for failing to set up the dev environment on Win yesterday :(
> Good news is that it is now up and running and I will spend some time in
> the evenings this week fixing the UI in IE7.
>
>
Sounds good.


> >
> > 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=923106&r1=923105&r2=923106&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
> Mon Mar 15 07:55:00 2010
> > @@ -16,69 +16,58 @@
> >  specific language governing permissions and limitations      *
> >  under the License.                                           *
> > -->
> > +
> > <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"/>
> > +        <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" />
> > +        <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"/>
> >     </head>
> > -    <body>
> > -        <div class="container">
> > -            <div class="head">
> > -                <a class="logo" href="/"><img src="/images/esme.png"
> alt="ESME" /></a>
> > -                <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="profile"/>
> > -                    </li>
> > -                    <li>
> > -                        <lift:Menu.item name="logout"/>
> > -                    </li>
> > -                </ul>
> > -            </div>
> > -            <table>
> > -                <tr>
> > -                    <td width="75%">
> > -                        <div>
> > -                            <lift:bind name="content" />
> > -                        </div>
> > -                    </td>
> > -                    <td>
> > -                        <lift:UserSnip.loginForm/><lift:msgs/>
> > -                    </td>
> > -                </tr>
> > -            </table>
> > -        </div>
> > -        <div class="foot">
> > -            <center>
> > +    <body id="home">
> > +        <div id="container-bg">
> > +            <div class="container">
> > +                <div id="header">
> > +                    <div id="logo">
> > +                        <h1><a
> href="/"><lift:loc>ui_default_title</lift:loc></a></h1>
> > +                    </div>
> > +                    <div id="top-menu">
> > +                        <lift:Menu.item name="sign_up">
> > +                       <img src="images/btn-signup.gif" alt="" />
> > +                    </lift:Menu.item>
> > +                    </div>
> > +                </div>
> > +                <!--// ENDS HEADER -->
> > +                <div id="left">
> > +                  <lift:bind name="content" />
> > +                </div><!--left   -->
> > +                <div id="right">
> > +                <lift:bind name="login">
> > +                 <lift:UserSnip.loginForm/>
> > +                </lift:bind>
> > +                 <lift:Msgs>
> > +                     <lift:error_msg>Error:</lift:error_msg>
> > +                     <lift:notice_msg>FYI:</lift:notice_msg>
> > +                     <lift:error_class>error_major</lift:error_class>
> > +
> <lift:notice_msg><lift:loc>ui_base_note</lift:loc></lift:notice_msg>
> > +                     <lift:notice_class>note_major</lift:notice_class>
> > +                 </lift:Msgs>
> > +                </div><!--right -->
> > +           </div><!--// ENDS CONTAINER -->
> > +        </div><!--// ENDS CONTAINER-BG -->
> > +        <div class="footer">
> > +            <div class="ftr-links">
> > +                             <a href="
> http://cwiki.apache.org/confluence/display/ESME/Index"><lift:loc>custom_text_link1</lift:loc></a>
> |
> > +                             <a href="
> http://cwiki.apache.org/confluence/display/ESME/Index#Index-GettingStarted"><lift:loc>custom_text_link2</lift:loc></a>
> |
> > +                             <a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a>
> |
> > +                             <br />
> >                 <lift:loc>ui_default_footer</lift:loc>
> > -            </center>
> > +          <br />
> > +         </div>
> >         </div>
> >     </body>
> > </html>
> >
> > 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=923106&r1=923105&r2=923106&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 Mar 15 07:55:00 2010
> > @@ -1,301 +1,118 @@
> > -<!--
> > - Licensed to the Apache Software Foundation (ASF) under one   *
> > - or more contributor license agreements.  See the NOTICE file *
> > - distributed with this work for additional information        *
> > - regarding copyright ownership.  The ASF licenses this file   *
> > - to you under the Apache License, Version 2.0 (the            *
> > - "License"); you may not use this file except in compliance   *
> > - with the License.  You may obtain a copy of the License at   *
> > -                                                              *
> > -   http://www.apache.org/licenses/LICENSE-2.0                 *
> > -                                                              *
> > - Unless required by applicable law or agreed to in writing,   *
> > - software distributed under the License is distributed on an  *
> > - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
> > - KIND, either express or implied.  See the License for the    *
> > - specific language governing permissions and limitations      *
> > - under the License.                                           *
> > --->
> > - <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="profile"/>
> > -                    </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="personal_timeline_messages">
> > -                                                        <tr
> id="message">
> > -                                                            <td>
> > -                                                                <img
> id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
> > -                                                                <div
> id="author">
> > -                                                                    -
> > -                                                                </div>
> > -                                                            </td>
> > -                                                            <td
> class="message">
> > -                                                                <div
> class="outer">
> > -                                                                    <div
> class="inner clear">
> > -
>  <p class="text" id="body">
> > -
>    -
> > -
>  </p>
> > -
>  </div>
> > -                                                                    <div
> class="metainfo">
> > -
>  <span id="pool">-</span>
> > -
>  <span id="reason">-</span>
> > -
>  <span id="when" class="date">-</span>
> > -
>  </div>
> > -                                                                </div>
> > -                                                            </td>
> > -                                                            <td
> id="tags" class="tag">
> > -                                                                <p
> id="tag">
> > -                                                                    <a
> href="tag/tag1">-</a>
> > -                                                                </p>
> > -                                                                <p
> id="tag">
> > -                                                                    <a
> href="tag/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">
> > -                                                <lift:comet
> type="PublicTimeline"/>
> > -                                                <lift:embed
> what="templates-hidden/timeline"/>
> > -                                            </div>
> > -                                        </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%"/>
> > -                                    </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()">
> > -
>  <lift:loc>ui_messages_message_label_message_remove_reply</lift:loc>
> > -                                        </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();">
> > -
>  <lift:loc>ui_messages_message_update</lift:loc>
> > -                                        </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>
> > -                                    <div class="bugs">
> > -                                        <form action="/info_view/search"
> class="b-primay">
> > -                                            <input style="height: 20px;
> background: #c9d8ea;" name="term"/>
> > -                                          <button class="btn"
> onclick="javascript:form.submit();">
> > -
>  <lift:loc>ui_messages_search</lift:loc>
> > -                                        </button>
> > -                                        </form>
> > -                                    </div>
> > -                            </div>
> > -                        </td>
> > -                    </tr>
> > -                </tbody>
> > -            </table>
> > -        </div>
> > -        <div class="foot">
> > -            <center>
> > -                <lift:loc>ui_default_footer</lift:loc>
> > -            </center>
> > -        </div>
> > -    </body>
> > -</html>
> > +<!--
> > + Licensed to the Apache Software Foundation (ASF) under one   *
> > + or more contributor license agreements.  See the NOTICE file *
> > + distributed with this work for additional information        *
> > + regarding copyright ownership.  The ASF licenses this file   *
> > + to you under the Apache License, Version 2.0 (the            *
> > + "License"); you may not use this file except in compliance   *
> > + with the License.  You may obtain a copy of the License at   *
> > +                                                              *
> > +   http://www.apache.org/licenses/LICENSE-2.0                 *
> > +                                                              *
> > + Unless required by applicable law or agreed to in writing,   *
> > + software distributed under the License is distributed on an  *
> > + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
> > + KIND, either express or implied.  See the License for the    *
> > + specific language governing permissions and limitations      *
> > + under the License.                                           *
> > +-->
> > +
> > +<lift:surround with="base" at="left">
> > +                <div id="left">
> > +                    <div id="back-header">
> > +                        <!---UPDATE BOX -->
> > +                        <div class="container-update">
> > +
>  <h3><lift:loc>ui_messages_message_label_message_request</lift:loc></h3>
> > +                                <div id="form-update">
> > +                                    <div class="post-form-row">
> > +                                        <label>
> > +                                            Share with
> > +                                        </label>
> > +                                        <select id="vPool"
> class="inputBox2">
> > +                                            <option
> value="0"><lift:loc>ui_messages_message_label_message_pool_public</lift:loc></option>
> > +                                            <lift:UserSnip.accessPools/>
> > +                                        </select>
> > +                                    </div>
> > +                                    <div class="row clear"
> style="display: none">
> > +                                        <input id="tagdude"
> style="width: 90%"/>
> > +                                    </div>
> > +                                    <div class="post-form-row">
> > +                                        <textarea class="inputBox2"
> id="vMsg" rows="5" cols="80%"></textarea>
> > +                                        <div class="row clear"
> style="display: none">
> > +                                        <input id="vTag" style="width:
> 90%"/>
> > +                                        </div>
> > +                                        <div class="update-btn">
> > +                                            <input type="image"
> onclick="javascript:post_msg();" src="images/btn-update.gif" />
> > +                                        </div>
> > +                                    </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><!--END UPDATE BOX-->
> > +                    </div><lift:UserSnip.resendScript/>
> > +                    <!--updates-box -->
> > +                    <!--updates-box -->
> > +                   <lift:comet type="Timeline"/>
> > +                    <div class="separator">
> > +                    </div>
> > +                    <table>
> > +                      <tbody id="personal_timeline_messages">
> > +                       <tr id="message">
> > +                      <div id="personal_timeline_messages">
> > +                       <div class="updates-box">
> > +                        <div class="avatar">
> > +                            <img id="avatar" src="/images/avatar.jpg"
> alt="Anonymous" width="50px"/>
> > +                        </div>
> > +                        <div class="update2">
> > +                            <div class="info2" >
> > +                                <a href="" id="author">-</a>
> > +                            </div>
> > +                            <div id="body">-</div>
> > +                            <div class="time">
> > +                                <table><tr><td><div id="pool">
> -</div></td><td>   </td><td> <div id="when"> -</div></td><td><div
> id="reason"> -</div></td><td> <div id="source"> -</div></td></tr></table>
> > +                            </div>
> > +                            <div id="tags" class="tags">
> > +                                <p id="tag">
> > +                                  <a href="tag/tag1">-</a>
> > +                                </p>
> > +                                <p id="tag">
> > +                                  <a href="tag/tag2">-</a>
> > +                                </p>
> > +                            </div>
> > +                            <div class="actions">
> > +                                <a href="javascript:resend_msg();">
> <lift:loc>ui_messages_message_label_resend</lift:loc></a>
> > +                                | <a href="#"
> id="reply"><lift:loc>ui_messages_message_label_reply</lift:loc></a>
> > +                                <a id="conversation">|
>  <lift:loc>ui_messages_message_label_conversation</lift:loc></a>
> > +                            </div>
> > +                        </div>
> > +                      </div>
> > +                      </div>
> > +                      </tr>
> > +                       </tbody>
> > +                     </table>
> > +                      </div>
> > +                    <!--updates-box-->
> > + </lift:surround>
> >
> > 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=923106&r1=923105&r2=923106&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 Mar 15 07:55:00 2010
> > @@ -1,32 +1,3 @@
> > -<!--
> > - Licensed to the Apache Software Foundation (ASF) under one   *
> > - or more contributor license agreements.  See the NOTICE file *
> > - distributed with this work for additional information        *
> > - regarding copyright ownership.  The ASF licenses this file   *
> > - to you under the Apache License, Version 2.0 (the            *
> > - "License"); you may not use this file except in compliance   *
> > - with the License.  You may obtain a copy of the License at   *
> > -                                                              *
> > -   http://www.apache.org/licenses/LICENSE-2.0                 *
> > -                                                              *
> > - Unless required by applicable law or agreed to in writing,   *
> > - software distributed under the License is distributed on an  *
> > - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
> > - KIND, either express or implied.  See the License for the    *
> > - specific language governing permissions and limitations      *
> > - under the License.                                           *
> > --->
> > +<form id="openid_submit" class="clear" method="post"
> action="/open_id/login">
> >
> > - <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=923106&r1=923105&r2=923106&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 Mar 15 07:55:00 2010
> > @@ -16,20 +16,48 @@
> >  specific language governing permissions and limitations      *
> >  under the License.                                           *
> > -->
> > - <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>
> > -</form>
> > \ No newline at end of file
> > +
> > +
> > +     <div id="login-box">
> > +
> > +
> > +             <div class="top-login"></div>
> > +             <div class="mid-login">
> > +                     <form name="loginFrm" action="javascript:login()"
> method="post" >
> > +                             <div class="form">
> > +                                             <div class="post-form-row">
> > +                                                     <label>
> <lift:loc>ui_login_email</lift:loc></label>
> > +                                                     <input type="text"
> name="username" value="" class="inputBox2"/><!--narrow input field-->
> > +                                             </div>
> > +                                             <div class="post-form-row">
> > +
> > +
> <label><lift:loc>ui_login_password</lift:loc></label>
> > +                                                     <input
> type="password" name="password" value="" class="inputBox2"/><!--narrow input
> field-->
> > +                                             </div>
> > +
> > +                                             <div class="line"></div>
> > +
> > +                                             <div class="post-form-row">
> > +
> <label><lift:loc>ui_login_openid</lift:loc></label>
> > +                                                     <input type="text"
> name="openID" value="" class="inputBox2"/><!--narrow input field-->
> > +                                             </div>
> > +
> > +                             </div>
> > +                             <div class="login-btn">
> > +                                     <input type="image"
> src="images/btn-signon.gif" />
> > +
> > +                             </div>
> > +                     </form>
> > +             </div>
> > +             <div class="bot-login"></div>
> > +             <div class="box-right">
> > +                        <h3><a href="http://www.apache.org/
> "><lift:loc>custom_heading_1_title</lift:loc></a></h3>
> > +                       <p><lift:loc>custom_heading_1_body</lift:loc></p>
> > +                       </div>
> > +                    <div class="box-right">
> > +                        <h3><a href="http://incubator.apache.org/
> "><lift:loc>custom_heading_2_title</lift:loc></a></h3>
> > +                        <lift:loc>custom_heading_2_body</lift:loc></div>
> > +                    <div class="box-right">
> > +                        <h3><a href="
> http://en.wikipedia.org/wiki/Microblogging
> "><lift:loc>custom_heading_3_title</lift:loc></a></h3>
> > +                        <lift:loc>custom_heading_3_body</lift:loc></div>
> > +     </div><!--login-box  "-->
> > \ No newline at end of file
> >
> > 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=923106&r1=923105&r2=923106&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
> Mar 15 07:55:00 2010
> > @@ -16,7 +16,12 @@
> >  specific language governing permissions and limitations      *
> >  under the License.                                           *
> > -->
> > -<lift:surround with="default" at="content">
> > +<lift:surround with="base" at="left">
> > +
> > + <link rel="stylesheet" href="../style/dialog_test.css" type="text/css"
> media="screen" />
> > +
> > +
> > +
> >     <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" />
> > @@ -26,10 +31,13 @@
> >     <!--[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/dialog_test.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">
> > @@ -109,4 +117,6 @@
> >             </div>
> >         </div>
> >     </div><!-- End demo -->
> > +
> > +
> > </lift:surround>
> > \ No newline at end of file
> >
> >
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message