You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2010/03/05 11:07:37 UTC
svn commit: r919357 - in
/incubator/esme/branches/ui-2010-03-05/src/main/webapp: ./ images/ scripts/
style/ templates-hidden/
Author: rhirsch
Date: Fri Mar 5 10:07:36 2010
New Revision: 919357
URL: http://svn.apache.org/viewvc?rev=919357&view=rev
Log:
initial check-in
Added:
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar1.jpg (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar2.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-back.jpg (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-box-right.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-main-header.jpg (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-right-back.jpg (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-search.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-tabs.png (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-update.png (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-search.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signon.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signout.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signup.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-update.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/esme-logo.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-bg.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-left.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-right.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.png (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading1.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/line.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bg.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bot.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-top.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/tab.gif (with props)
incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css
Modified:
incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_messages.js
incubator/esme/branches/ui-2010-03-05/src/main/webapp/signup.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/openid_login_form.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar1.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar1.jpg?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar1.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar2.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar2.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar2.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-back.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-back.jpg?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-back.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-box-right.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-box-right.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-box-right.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-main-header.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-main-header.jpg?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-main-header.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-right-back.jpg
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-right-back.jpg?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-right-back.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-search.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-search.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-search.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-tabs.png
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-tabs.png?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-tabs.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-update.png
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-update.png?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-update.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-search.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-search.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-search.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signon.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signon.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signon.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signout.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signout.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signout.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signup.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signup.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signup.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-update.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-update.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-update.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/esme-logo.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/esme-logo.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/esme-logo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-bg.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-bg.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-bg.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-left.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-left.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-left.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-right.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-right.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-right.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.png
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.png?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading1.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading1.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading1.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/line.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/line.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/line.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bg.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bg.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bg.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bot.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bot.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bot.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-top.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-top.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-top.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/tab.gif
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/tab.gif?rev=919357&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/tab.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html Fri Mar 5 10:07:36 2010
@@ -1,37 +1,54 @@
-<!--
- 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:UserSnip.loggedIn>
+<lift:UserSnip.loggedIn>
<logged:in>
<lift:surround with="message" at="content"/>
</logged:in>
<logged:out>
<lift:surround with="default" at="content">
- <div>
- <fieldset>
- <legend>
- <lift:loc>ui_default_conversation</lift:loc>
- </legend>
- <div style="height: 500px; overflow: auto">
- <lift:comet type="PublicTimeline"/>
- </div>
- </fieldset>
- </div>
+ <!---BLUE HEADER-->
+ <div id="container-2nd-level-bg">
+ <div id="container-2nd-level">
+ <h1><span>Getting Started on ESME</span></h1>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec interdum mauris eu est faucibus laoreet. Maecenas pulvinar ornare eros non hendrerit. Aliquam rutrum, mauris ut consectetur placerat, magna neque pulvinar eros, sed pretium purus turpis fermentum ligula. Vestibulum erat elit, dictum non hendrerit in, aliquet posuere augue. Aliquam mauris dolor, luctus sit amet luctus vitae, viverra tempor est. Donec metus lorem, hendrerit in venenatis ac.
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec interdum mauris eu est faucibus laoreet. </p>
+ </div><!--container-2nd-level-->
+ </div><!--container-2nd-level-bg-->
+ <!--END BLUE HEADER-->
+
+ <script src="/scripts/display_messages_start.js" type="text/javascript"/>
+ <lift:comet type="SinglePublicTimeline"/>
+
+ <div class="gray-box">
+ <h1>Now on ESME</h1>
+ <div class="avatar"><img src="images/avatar1.jpg" alt="" /></div>
+ <div class="update">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="tag"><a href="">mac</a>, <a href="">design</a>, <a href="">graphics</a>, <a href="">photoshop</a>, <a href="">cs3</a></div>
+ <div class="info"><a href="">Nickname</a> 3 hours ago</div>
+ </div>
+ </div><!--gray-box-->
+
+ <div class="tags-box">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
</lift:surround>
</logged:out>
</lift:UserSnip.loggedIn>
\ No newline at end of file
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_messages.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_messages.js?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_messages.js (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_messages.js Fri Mar 5 10:07:36 2010
@@ -1,22 +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. *
-*/
-
// <![CDATA[
/*
* displayMessages called by lift:comet, type="Timeline" and type="PublicTimeline"
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/signup.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/signup.html?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/signup.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/signup.html Fri Mar 5 10:07:36 2010
@@ -1,81 +1,55 @@
-<!--
- 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="default" at="content">
- <div>
- <h2><lift:loc>ui_sign_up_intro</lift:loc></h2>
- <lift:signup form="post">
- <div>
- <fieldset>
- <legend>
- <lift:loc>ui_sign_up_basic_info</lift:loc>
- </legend>
- <div>
- <signup:credentials/>
- </div>
- </fieldset>
- <fieldset>
- <legend>
- <lift:loc>ui_sign_up_details</lift:loc>
- </legend>
- <div>
- <label for="nickname">
- <lift:loc>ui_sign_up_nickname</lift:loc>
- <br/>
- <signup:nickname/> <lift:msg id="users_nickname"/>
- </label>
- <br/>
- <label for="firstname">
- <lift:loc>ui_sign_up_firstname</lift:loc>
- <br/>
- <signup:firstname/>
- </label>
- <br/>
- <label for="lastname">
- <lift:loc>ui_sign_up_lastname</lift:loc>
- <br/>
- <signup:lastname/>
- </label>
- <br/>
- <label for="image_url">
- <lift:loc>ui_sign_up_image_url</lift:loc>
- <br/>
- <signup:image_url/>
- </label>
- <br/>
- <label for="timezone">
- <lift:loc>ui_sign_up_timezone</lift:loc>
- <br/>
- <signup:timezone/>
- </label>
- <br/>
- <label for="locale">
- <lift:loc>ui_sign_up_locale</lift:loc>
- <br/>
- <signup:locale/>
- </label>
- </div>
- </fieldset>
- </div>
- <label for="submit">
- <signup:submit id="submit"/>
- </label>
- </lift:signup>
+<lift:surround with="default" at="login">
+ <div id="signup-box">
+ <div id="mid-signup">
+ <h2><label><lift:loc>ui_sign_up_intro</lift:loc> </label></h2>
+ <lift:signup form="post">
+ <div class="form">
+ <div>
+ <signup:credentials/>
+ </div>
+ <div>
+ <div class="post-form-row">
+ <label for="nickname">
+ <lift:loc>ui_sign_up_nickname</lift:loc>
+ <br/>
+ <signup:nickname class="inputBox2"/>
+ </label>
+ </div>
+ <label for="firstname">
+ <lift:loc>ui_sign_up_firstname</lift:loc>
+ <br/>
+ <signup:firstname/>
+ </label>
+ <br/>
+ <label for="lastname">
+ <lift:loc>ui_sign_up_lastname</lift:loc>
+ <br/>
+ <signup:lastname/>
+ </label>
+ <br/>
+ <label for="image_url">
+ <lift:loc>ui_sign_up_image_url</lift:loc>
+ <br/>
+ <signup:image_url/>
+ </label>
+ <br/>
+ <label for="timezone">
+ <lift:loc>ui_sign_up_timezone</lift:loc>
+ <br/>
+ <signup:timezone/>
+ </label>
+ <br/>
+ <label for="locale">
+ <lift:loc>ui_sign_up_locale</lift:loc>
+ <br/>
+ <signup:locale/>
+ </label>
+ </div>
+ </div>
+ <label for="submit">
+ <signup:submit id="submit"/>
+ </label>
+ </lift:signup>
+ </div>
</div>
</lift:surround>
\ No newline at end of file
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css?rev=919357&view=auto
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css (added)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css Fri Mar 5 10:07:36 2010
@@ -0,0 +1,499 @@
+/* reset - don't modify */
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+fieldset,img{border:0;}
+img{border:0;}
+address,caption,cite,code,dfn,em,th,var{font-style:normal;font-weight:normal;}
+
+em, i {font-style: italic;}
+caption,th {text-align:left;}
+q:before,q:after{content:'';}
+abbr,acronym {border:0;}
+/* reset */
+/* BASIC STRUCTURE
+*******************************************************************************/
+
+body { margin: 0; padding: 0; color:#000; line-height:18px; font-size:75%; font-family: Tahoma, Arial, Verdana, Helvetica; }
+body#home { background:#fff url(../images/bg-home.jpg) repeat-x;}
+body#back { background:#fff url(../images/bg-back.jpg) repeat-x;}
+
+#container-bg { margin: 0 auto; width: 890px; }
+#container { width: 890px; float:left; }
+
+/* LINKS - DEFAULT COLORS ARE SET IN BASE.CSS, CHANGE THESE COLORS AS NEEDED.
+*******************************************************************************/
+a:link, a:visited { color: #114e93; text-decoration:none; font-weight:bold; }
+a:hover { color: #88abd2; text-decoration:underline; }
+
+/* HEADER
+*******************************************************************************/
+#header { margin: 0px auto; padding: 0px; height: 72px; width: 871px; }
+
+div#logo {
+ float:left;
+ margin-top:10px;
+ height: 43px;
+ background: url(../images/esme-logo.gif) top left no-repeat;
+}
+
+div#logo h1 {
+ padding-left: 30px;
+ text-indent: -9999px;
+ float:left;
+ display: inline;
+}
+
+div#logo h1 a{
+ display: block;
+ height: 43px;
+ width: 152px;
+
+}
+
+#top-menu {
+ float:right;
+ text-align:right;
+ width:275px;
+ margin-top:15px;
+}
+#top-menu ul {
+ list-style:none;
+ float:left;
+}
+#top-menu li {
+ float:left;
+ margin:5px;
+ color:#2788e1;
+}
+#top-menu a {
+ color:#2788e1;
+}
+
+#left, #right {
+ position:relative;
+}
+#home #left {
+ float:left;
+ width:563px;
+ margin:0 10px;
+ }
+ * html #home #left {
+ float:left;
+ width:533px;
+ margin:0 20px 0 10px;
+ }
+#home #right {
+ float:left;
+ width:283px;
+ margin:0px;
+ }
+
+#back #left {
+ float:left;
+ width:623px;
+ margin:0 10px;
+ }
+#back #right {
+ float:left;
+ width:231px;
+ margin:-11px 0px;
+ }
+
+
+/*BLUE HEADER - HOME
+*********************************************************************************/
+#container-2nd-level-bg {
+ float:left;
+ width: 543px;
+ height:254px;
+ background: url(../images/bg-main-header.jpg) no-repeat;
+ margin-bottom:20px;
+ }
+#container-2nd-level {
+ margin: 0 auto;
+ padding:15px;
+ color:#fff;
+ }
+
+#container-2nd-level h1 {
+ color:#fff;
+ }
+
+/*SIGNUP
+********************************************************************************/
+
+#signup-box {
+ width:260px;
+ margin-top:10px;
+}
+.top-signup {
+ background: url(../images/login-top.gif) no-repeat;
+ width:260px;
+ height:22px;
+}
+.mid-signup {
+ background: url(../images/login-bg.gif) no-repeat;
+ padding:10px 15px;
+ width:230px;
+ height:400px;
+}
+.bot-signup {
+ background: url(../images/login-bot.gif) no-repeat;
+ width:260px;
+ height:22px;
+}
+
+/*LOGIN
+********************************************************************************/
+#login-box {
+ width:260px;
+ margin-top:10px;
+}
+.top-login {
+ background: url(../images/login-top.gif) no-repeat;
+ width:260px;
+ height:22px;
+}
+.mid-login {
+ background: url(../images/login-bg.gif) no-repeat;
+ padding:10px 15px;
+ width:230px;
+ height:218px;
+}
+.bot-login {
+ background: url(../images/login-bot.gif) no-repeat;
+ width:260px;
+ height:22px;
+}
+* html .bot-login {
+ background: url(../images/login-bot.gif) no-repeat;
+ width:260px;
+ height:22px;
+ position:relative;
+ top:-13px;
+}
+.inputBox2 {
+ background-color:#FFFFFF !important;
+ border:1px solid #ccc;
+ width:200px;
+ padding:5px 5px 5px 25px;
+}
+
+label {
+ display:block;
+ font-weight:bold;
+ color:#fff;
+ margin-bottom:5px;
+ padding-right:5px;
+ float:left;
+}
+
+.post-form-row {
+ margin:7px 0;
+}
+.line {
+ margin-top:12px;
+ border-bottom:1px solid #cae5fd;
+}
+.login-btn, update-btn {
+ float:right;
+}
+.update-btn {
+ margin-top:20px;
+ padding-top:10px;
+}
+#form-update label {
+ font-weight:bold;
+ color:#000;
+ margin-top: 5px;
+ padding-right:5px;
+ float:left;
+}
+select.inputBox2 {
+ background-color:#FFFFFF !important;
+ border:1px solid #a7aaad;
+ width:160px;
+ height:30px;
+ padding:4px;
+}
+
+textarea.inputBox2 {
+ float:left;
+ background-color:#FFFFFF !important;
+ border:1px solid #a7aaad;
+ width:440px;
+ height:50px;
+ padding:4px;
+ margin-right:10px;color:#000;
+}
+/*SEARCH
+*********************************************************************************/
+#search {
+ float:left;
+ background:#fff;
+ border:1px solid #ccc;
+ height:28px;
+ width:181px;
+ margin:15px 0 20px 0;
+ }
+.searchBox .inputBox {
+ padding:5px 0 0 8px;
+ float:left;
+ width:140px;
+ border:0;
+ }
+.searchButton {
+ float:left;
+
+ }
+
+/*RIGHT box
+*********************************************************************/
+ul.main-links {
+ list-style:none;
+ margin:20px 0 10px 15px;
+ padding:0;
+}
+.main-links li {
+ padding:3px 0;
+}
+
+.box-right {
+ float:left;
+ background: #f2f5f6 url(../images/bg-box-right.gif) repeat-x;
+ width:230px;
+ padding:10px 15px;
+ margin-top:10px;
+ border:1px solid #f1eded;
+ font-size:90%;
+}
+.box-right h3 {
+ float:left;
+ background: url(../images/heading1.gif) no-repeat;
+ color:#fff;
+ height:29px;
+ width:215px;
+ padding:10px 0 0 20px;
+ margin-left:-25px;
+ font-size:160%;
+}
+
+
+.box-right h3 a{
+ display: block;
+ height:29px;
+ width:215px;
+ color:#fff;
+}
+.box-right h3 a:hover, .box-right-back h3 a:hover {
+ color:#c4ddf4;
+ text-decoration:none;
+}
+* html .box-right h3 {
+ position: relative;
+ left: 0px;
+ margin-left:-15px;
+
+}
+.box-right-back {
+ float:left;
+ background: #ebeef2 url(../images/bg-right-back.jpg) no-repeat;
+ width:196px;
+ padding:10px 10px;
+ margin-top:10px;
+}
+
+.box-right-back h3 {
+ float:left;
+ background: url(../images/heading.gif) no-repeat;
+ color:#fff;
+ height:29px;
+ width:195px;
+ padding:10px 0 0 20px;
+ margin:10px 0 10px -20px;
+ font-size:140%;
+}
+* html .box-right-back h3 {
+ width:155px;
+ padding:10px 0 0 10px;
+ margin:10px 0 10px -25px;
+ font-size:140%;
+}
+.box-right-back h3 a{
+ display: block;
+ height:29px;
+ width:215px;
+ color:#fff;
+}
+* html .box-right-back h3 {
+ position: relative;
+ left: 0px;
+ margin-left:-10px;
+}
+.right-content {
+ float:left;
+ font-size:90%;
+
+}
+
+
+/* CONTENT AREA
+*******************************************************************************/
+#content { margin:0 auto; display:block; width: 851px; padding:20px 10px 0px 10px; }
+
+/* UPDATES
+*******************************************************************************/
+#back-header {
+ margin-top:20px;
+ }
+.container-update {
+
+ width: 563px;
+ height:152px;
+ padding:20px 30px;
+ background: url(../images/bg-update.png) no-repeat;
+ margin-bottom:20px;
+}
+
+.gray-box {
+ float:left;
+ background:#f9f9f9;
+ padding:20px;
+}
+
+.updates-box {
+ float:left;
+ padding:10px 20px;
+}
+.avatar {
+ float:left;
+ width:62px;
+}
+.update {
+ float:left;
+ width:420px;
+ padding:0 10px;
+}
+.update2 {
+ float:left;
+ width:500px;
+ padding:0 10px;
+}
+.tag, .tag a {
+ margin:10px 0 2px;
+ font-weight:normal;
+ }
+.info a {
+ font-weight:bold;
+}
+.info2 a {
+ font-weight:bold;
+ font-size:110%;
+}
+.info3 a {
+ color:#2788e1;
+ font-size:120%;
+ font-weight:bold;
+}
+.tags-box {
+ float:left;
+ margin:10px;
+ width:90%;
+}
+.time {
+ color:#07376d;
+ font-size:80%;
+}
+.style1{
+ font-size:80%;
+}
+.style2 {
+ font-size:100%;
+}
+.style3 {
+ font-size:120%;
+}
+.style4 {
+ font-size:140%;
+}
+.style5 {
+ font-size:160%;
+}
+.actions {
+ float:right;
+}
+.separator {
+ float:left;
+ width:96%;
+ padding:5px;
+ background: url(../images/line.gif) repeat-x;
+}
+.container-tabs {
+ float:left;
+ width: 563px;
+ height:152px;
+ padding:20px 30px;
+ background: url(../images/bg-tabs.png) no-repeat;
+ margin-bottom:20px;
+}
+/* CONTENT TABS*/
+ul#toc {
+ list-style: none;
+ margin-left: 30px;
+ padding: 0;
+}
+
+ul#toc li {
+ background: #f8f9fb url(../images/tab.gif);
+ float: left;
+ margin: 0 2px 0 0;
+ padding-left: 12px;
+}
+
+ul#toc a {
+ background: #f8f9fb url(../images/tab.gif) 100% 0;
+ color: #fff;
+ display: block;
+ float: left;
+ height: 2.2em;
+ line-height: 2.2em;
+ padding: 3px 10px 0 0;
+ text-decoration: none;
+ width:90px;
+ text-align:center;
+ text-transform: uppercase;
+}
+
+ul#toc li.current {
+ background-color: #f8f9fb;
+ background-position: 0 -62px;
+}
+
+ul#toc li.current a {
+ background-position: 100% -62px;
+ color: #fff;
+ font-weight: bold;
+}
+
+
+
+/* FOOTER
+*******************************************************************************/
+#footer {float:left; width:100%; height:61px; margin:0 auto; padding-top:40px; text-align:center; }
+.ftr-links {font-family: Verdana, Arial, Helvetica, sans-serif; line-height: 18px; font-size: 1em; font-weight:bold; color:#333; }
+.ftr-links a, .ftr-links a:visited {color:#0b6ac3; font-size:1em; }
+.ftr-links a:hover {color:#112843; text-decoration:underline;}
+
+/* HEADINGS
+******************************************************************************/
+h1 { font-size: 200%; color:#07376d; font-family: Tahoma, Helvetica, Arial, Verdana; line-height:100%; padding-bottom:4px;margin-bottom:6px;}
+h2 { font-size: 180%; color:#132b45; font-family: Helvetica, Arial, Verdana; }
+h3 { font-size: 160%; color:#132b45; font-family:Arial; margin-bottom:2px; padding-bottom:4px; }
+h4 { font-size: 140%; color:#003300; }
+h5 { font-size: 100%; }
+h6 { font-size: 80%; }
+img, img a {border:0px; }
+
+.clear {clear:both; height:20px; }
+
+.container-update, .container-tabs {behavior: url("src/iepngfix.htc");}
\ No newline at end of file
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/default.html Fri Mar 5 10:07:36 2010
@@ -1,84 +1,47 @@
-<!--
- 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"/>
+ <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="src/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="/">ESME</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>
+ </div><!--right-->
+ </div><!--// ENDS CONTAINER -->
+ </div><!--// ENDS CONTAINER-BG -->
+ <div class="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a> |
+ <a href="services.html">services</a> |
+ <a href="mission.html">mission</a> |
+ <br />
<lift:loc>ui_default_footer</lift:loc>
- </center>
+ <br />
+ </div>
</div>
</body>
</html>
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/message.html Fri Mar 5 10:07:36 2010
@@ -1,301 +1,253 @@
-<!--
- 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"> </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>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title><lift:loc>ui_default_title</lift:loc></title>
+ <meta http-equiv="Content-Language" content="en-US" />
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta http-equiv="imagetoolbar" content="no" />
+ <meta name="keywords" content="ESME" lang="en-US" />
+ <meta name="description" content="ESME" lang="en-US" />
+ <meta name="copyright" content="ESME" lang="en-US" />
+ <meta name="generator" content="" lang="en-US" />
+ <meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
+ <meta name="Robots" content="index,follow,noodp" />
+ <link rel="stylesheet" href="src/style.css" type="text/css" media="screen" />
+ <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/><script src="/scripts/display_messages.js" type="text/javascript"/>
+ </head>
+ <body id="back">
+ <div id="container-bg">
+ <div id="container">
+ <div id="header">
+ <div id="logo">
+ <h1><a href="/">ESME</a></h1>
+ </div>
+ <div id="top-menu">
+ <ul>
+ <li>
+ <a href="/">Public Timeline</a>
+ |
+ </li>
+ <li>
+ <a href="">Settings</a>
+ |
+ </li>
+ </ul>
+ <lift:Menu.item name="logout">
+ <img src="images/btn-signout.gif" alt="" />
+ </lift:Menu.item>
+ </div>
+ </div><!--// ENDS HEADER -->
+ <div id="left">
+ <div id="back-header">
+ <!---UPDATE BOX-->
+ <div class="container-update">
+ <h3><lift:loc>ui_messages_message_label_message_request</lift:loc></h3>
+ <form action="" method="post">
+ <div id="form-update">
+ <div class="post-form-row">
+ <label>
+ Share with
+ </label>
+ <select name="access_pool" class="inputBox2">
+ <option id="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="textdude" rows="5" cols="80%"></textarea>
+ <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>
+ </form>
+ </div><!--END UPDATE BOX-->
+ </div><lift:UserSnip.resendScript/>
+ <!--updates-box
+ <lift:comet type="Timeline"/> -->
+ <div class="separator">
+ </div>
+ <div id="personal_timeline_messages">
+ <div class="updates-box">
+ <div class="avatar">
+ <img src="images/avatar1.jpg" alt="" />
+ </div>
+ <div class="update2">
+ <div class="author">
+ </div>
+ <p id="body">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ </p>
+ in pool <div class="pool"></div><div id="when"> </div>
+ <div class="actions">
+ <a href="#"><lift:loc>ui_messages_message_label_reply</lift:loc></a>
+ | <a href=""><lift:loc>ui_messages_message_label_resend</lift:loc></a>
+ | <a href="" id="conversation"><lift:loc>ui_messages_message_label_conversation</lift:loc></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--updates-box-->
+ <div class="separator">
+ </div>
+ <div class="updates-box">
+ <div class="avatar">
+ <img src="images/avatar1.jpg" alt="" />
+ </div>
+ <div class="update2">
+ <div class="info2">
+ <a href="">Nickname</a>
+ </div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">
+ in pool default 3 hours ago
+ </div>
+ <div class="actions">
+ <a href="">reply</a>
+ | <a href="">resend</a>
+ | <a href="">conversation</a>
+ </div>
+ </div>
+ </div>
+ <!--updates-box-->
+ <div class="separator">
+ </div>
+ <div class="updates-box">
+ <div class="avatar">
+ <img src="images/avatar1.jpg" alt="" />
+ </div>
+ <div class="update2">
+ <div class="info2">
+ <a href="">Nickname</a>
+ </div>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam mauris velit, feugiat quis varius ac, malesuada in lectus. Nunc suscipit condimentum eros vitae lacinia.
+ <div class="time">
+ in pool default 3 hours ago
+ </div>
+ <div class="actions">
+ <a href="">reply</a>
+ | <a href="">resend</a>
+ | <a href="">conversation</a>
+ </div>
+ </div>
+ </div>
+ <!--updates-box-->
+ <div class="separator">
+ </div>
+ </div>
+ <!--left-->
+ <div id="right">
+ <div class="box-right-back">
+ <div class="avatar">
+ <img src="images/avatar2.gif" alt="" />
+ </div><strong><lift:loc>ui_messages_message_label_welcome</lift:loc></strong>
+ <div class="info4">
+ <a href=""><span class="name"><lift:UserSnip.name/></span></a>
+ </div>
+ <ul class="main-links">
+ <li>
+ <lift:Menu.item name="list_users"/>
+ </li>
+ <li>
+ <lift:Menu.item name="trackMgt"/>
+ </li>
+ <li>
+ <lift:Menu.item name="actionMgt"/>
+ </li>
+ <li>
+ <lift:Menu.item name="authToken"/>
+ </li>
+ <li>
+ <lift:Menu.item name="accessPools"/>
+ </li>
+ <li>
+ <lift:Menu.item name="streams"/>
+ </li>
+ </ul><!--search form-->
+ <form action="/info_view/search" method="post">
+ <div id="search">
+ <div class="searchBox">
+ <input type="text" class="inputBox" name="term" value=""/>
+ </div>
+ <div class="searchButton">
+ <input type="image" onclick="javascript:form.submit();" src="images/btn-search.gif" style="padding:0;"/>
+ </div>
+ </div>
+ </form><!--search form--><h3><a href="">Tags</a></h3>
+ <div class="right-content">
+ <a href="" class="style5">software</a>
+ <a href="" class="style5">teaching</a>
+ <a href="" class="style3">Technology</a>
+ <a href="" class="style3">movies</a>
+ <a href="" class="style2">twitter</a>
+ <a href="" class="style1">ebook</a>
+ <a href="" class="style4">web design</a>
+ <a href="" class="style4">wordpress</a>
+ <a href="" class="style1">work from home</a>
+ <a href="" class="style2">illustrator</a>
+ <a href="" class="style5">PHP</a>
+ <a href="" class="style4">AJAX</a>
+ <a href="" class="style1">wiki</a>
+ <a href="" class="style3">virtual assistant</a>
+ <a href="" class="style2">blogging</a>
+ <a href="" class="style2">movies</a>
+ <a href="" class="style5">youtube</a>
+ <a href="" class="style3">free stuff</a>
+ <a href="" class="style4">tutorials</a>
+ <a href="" class="style1">articles</a>
+ <a href="" class="style4">jQuery samples</a>
+ </div>
+ <h3><a href="">Popular Messages</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ <h3><a href="">Popular Links</a></h3>
+ <div class="right-content">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--// ENDS CONTAINER -->
+ </div>
+ <!--// ENDS CONTAINER-BG -->
+ <div id="footer">
+ <div class="ftr-links">
+ <a href="index.html">home</a>
+ |<a href="services.html">services</a>
+ |<a href="mission.html">mission</a>
+ |
+ <br/>
+ Copyright © 2009 ESME
+ <br/>
+ </div>
+ </div>
+ </body>
+</html>
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/openid_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/openid_login_form.html?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/openid_login_form.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/openid_login_form.html Fri Mar 5 10:07:36 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/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html?rev=919357&r1=919356&r2=919357&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html Fri Mar 5 10:07:36 2010
@@ -1,35 +1,46 @@
-<!--
- 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 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 action="/authentication/login" method="post" >
+ <div class="form">
+ <div class="post-form-row">
+ <label>Username</label>
+ <input type="text" name="username" value="" class="inputBox2"/><!--narrow input field-->
+ </div>
+ <div class="post-form-row">
+
+ <label>Password</label>
+ <input type="password" name="password" value="" class="inputBox2"/><!--narrow input field-->
+ </div>
+
+ <div class="line"></div>
+
+ <div class="post-form-row">
+ <label>Or Login using Open ID</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">
+ <!--<div class="headingl"></div>
+ <h3>Heading Section A</h3>
+ <div class="headingr"></div>--><h3><a href="">Heading Section A</a></h3>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ <div class="box-right">
+ <h3><a href="">Heading Section B</a></h3>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ <div class="box-right">
+ <h3><a href="">Heading Section C</a></h3>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at odio vitae justo ultricies porttitor sit amet nec justo. Nam dictum sodales purus.
+ </div>
+ </div><!--login-box-->
\ No newline at end of file