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/15 08:15:57 UTC
svn commit: r923090 - in /incubator/esme/branches/ui-2010-03-05/src/main:
resources/ scala/bootstrap/liftweb/ scala/org/apache/esme/lib/
scala/org/apache/esme/model/ scala/org/apache/esme/snippet/ webapp/
webapp/info_view/ webapp/scripts/ webapp/style/...
Author: rhirsch
Date: Mon Mar 15 07:15:56 2010
New Revision: 923090
URL: http://svn.apache.org/viewvc?rev=923090&view=rev
Log:
[ESME-100] Finish web UI
Added:
incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/pretty.js
Modified:
incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties
incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties
incubator/esme/branches/ui-2010-03-05/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/lib/UserMgr.scala
incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/model/User.scala
incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/snippet/UserSnip.scala
incubator/esme/branches/ui-2010-03-05/src/main/webapp/index.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/public.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.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/scripts/display_single_message.js
incubator/esme/branches/ui-2010-03-05/src/main/webapp/signup.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.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/public.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html
Modified: incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMECustom.properties Mon Mar 15 07:15:56 2010
@@ -20,7 +20,7 @@ custom_mail_from_adress=esme@esme.apache
custom_mail_subject=Message from ESME
custom_opening_main_title=Getting Started on ESME
-custom_opening_main_body=Apache Enterprise Social Messaging Experiment (ESME) is a secure and highly scalable microsharing and micromessaging platform that allows people to discover and meet one another and get controlled access to other sources of information, all in a business process context.ESME is based on the idea that you - the user - decide what information is useful for you. There are various ways to discover what other users are posting information that may be relevant for you 1) Use "Tracks" to follow terms that may be of interest for you, 2) Use the public timeline to find others who posts may be of interest 3) use the search functionto find others who posts meet certain criterien, 4) post your thoughts, ideas, etc and others with similar interests will enter into conversations with you
+custom_opening_main_body=Apache Enterprise Social Messaging Experiment (ESME) is a secure and highly scalable microsharing and micromessaging platform that allows people to discover and meet one another and get controlled access to other sources of information, all in a business process context.ESME is based on the idea that you - the user - decide what information is useful for you. There are various ways to discover what other users are posting information that may be relevant for you 1) Use "Tracks" to follow terms that may be of interest for you, 2) Use the public timeline to find others who posts may be of interest 3) Use the search function to find others who posts meet certain criterien, 4) Post your thoughts, ideas, etc and others with similar interests will enter into conversations with you
custom_heading_1_title=ASF
custom_heading_1_body=Apache Software Foundation (ASF) provides support for the Apache community of open-source software projects.
Modified: incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties Mon Mar 15 07:15:56 2010
@@ -16,6 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+ui_base_error=Error:
+ui_base_notife=FYI:
+
ui_sign_up_intro=Create a new account
ui_sign_up_basic_info=Basic User Information
ui_sign_up_details=Account holder details
Modified: incubator/esme/branches/ui-2010-03-05/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/scala/bootstrap/liftweb/Boot.scala?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/scala/bootstrap/liftweb/Boot.scala Mon Mar 15 07:15:56 2010
@@ -122,6 +122,7 @@ class Boot {
Loc.Snippet("user_info", TagDisplay.userInfo))) ::
Menu(Loc("about", List("static", "about"), S.?("base_menu_about"), Hidden)) ::
Menu(Loc("tag", List("info_view", "tag"), "Tag", Hidden, Loc.Snippet("tag_display", TagDisplay.display))) ::
+ Menu(Loc("public", List("info_view", "public"), "Public")) ::
Menu(Loc("sign_up", List("signup"), S.?("base_menu_signup"),
Snippet("signup", User.signupForm),
Unless(User.loggedIn_? _, S.?("base_menu_sign_up_error")))) ::
Modified: incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/lib/UserMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/lib/UserMgr.scala?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/lib/UserMgr.scala (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/lib/UserMgr.scala Mon Mar 15 07:15:56 2010
@@ -85,9 +85,9 @@ object UserMgr {
private def profileImage(imageUrl: String): NodeSeq = {
if (imageUrl.length > 0)
- <img src={imageUrl}/>
+ <img width="30px" src={imageUrl}/>
else
- <p/>
+ <img width="30px" src="/images/avatar.jpg"/>
}
}
Modified: incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/model/User.scala?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/model/User.scala Mon Mar 15 07:15:56 2010
@@ -60,7 +60,6 @@ object User extends User with KeyedMetaM
source("profile").
setTextAndTags(S.?("base_user_msg_change", in.nickname, in.wholeName, in.imageUrl), Nil, Empty).
- // setTextAndTags("User " + in.nickname + " changed profile. Name: " + in.wholeName + ", Image: " + in.imageUrl, Nil, Empty).
foreach{ msg =>
if (msg.save) {
Distributor ! Distributor.AddMessageToMailbox(in.id, msg, ProfileReason(in.id))
@@ -252,12 +251,23 @@ class User extends KeyedMapper[Long, Use
case (_, l) if l.length > 1 => l
case (_, _) => niceName
}
+
+ /**
+ * URL to the image that the user has provided def image_url: String = new URL(imageUrl).toString
+ */
+
+
+
+ def image_url: String = (imageUrl.is) match {
+ case (f) if f.length > 1 => f
+ case (_) => "/images/avatar.jpg"
+ }
def needsChange_? : Boolean = this.nickname.is.startsWith("chang") &&
this.firstName.startsWith("Unkn") && this.lastName.startsWith("Unkn")
def image: Option[NodeSeq] = tryo(Text((new URL(imageUrl)).toString)).toOption
-
+
def tracking: List[Tracking] =
Tracking.findAll(By(Tracking.user, this),
By(Tracking.disabled, false),
Modified: incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/snippet/UserSnip.scala Mon Mar 15 07:15:56 2010
@@ -84,6 +84,7 @@ object JsonResender extends JsonHandler{
class UserSnip extends DispatchSnippet {
def dispatch: DispatchIt =
Map("name" -> userName _,
+ "userImage" -> userImage _,
"postScript" -> postScript _,
"followers" -> followers _,
"following" -> following _,
@@ -133,6 +134,13 @@ class UserSnip extends DispatchSnippet {
Text(User.currentUser.map(_.wholeName) openOr "")
}
+
+ def userImage(in: NodeSeq) = {
+ if (User.currentUser.map(_.needsChange_?) openOr false)
+ S.redirectTo("/user_mgt/edit")
+
+ Text(User.currentUser.map(_.image_url) openOr "")
+ }
def accessPools(in: NodeSeq): NodeSeq = {
for(user <- User.currentUser.toSeq;
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=923090&r1=923089&r2=923090&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 Mon Mar 15 07:15:56 2010
@@ -1,6 +1,32 @@
+<!--
+ 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>
<logged:in>
<lift:surround with="message" at="content"/>
+ <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>
</logged:in>
<logged:out>
<lift:surround with="default" at="content">
@@ -13,7 +39,7 @@
<link rel="stylesheet" href="../style/style.css" type="text/css" media="screen" />
</div><!--container-2nd-level-bg-->
<!--END BLUE 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_single_message.js" type="text/javascript"/>
+ <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/><script src="/scripts/display_single_message.js" type="text/javascript"/> <script src="/scripts/pretty.js" type="text/javascript"/>
<lift:comet type="SinglePublicTimeline"/>
@@ -51,40 +77,6 @@
</tr>
</tbody>
</table>
- <!--updates-box
-
- <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>
-
- <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/info_view/conversation.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/conversation.html Mon Mar 15 07:15:56 2010
@@ -17,14 +17,20 @@
under the License. *
-->
<lift:surround with="base" at="left">
+ <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS <lift:Style.header /> -->
+ <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
+ <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />
+ <link rel="stylesheet" type="text/css" href="../style/grid.css" media="screen" />
+ <link rel="stylesheet" type="text/css" href="../style/layout.css" media="screen" />
<script src="/scripts/display_messages.js" type="text/javascript"/>
- <fieldset>
- <legend>
- <lift:loc>ui_default_conversation</lift:loc>
- </legend>
+ <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+ </script>
+ <div class="box-title-aux">
+ <h3><a href=""><lift:loc>ui_default_conversation</lift:loc></a></h3>
+ </div>
<div class="b-list">
<lift:displayConversation/>
<lift:embed what="templates-hidden/timeline"/>
</div>
- </fieldset>
+
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/public.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/public.html?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/public.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/public.html Mon Mar 15 07:15:56 2010
@@ -1,78 +1,64 @@
+<!--
+ 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><lift:UserSnip.resendScript/>
- <!--updates-box
- <lift:comet type="Timeline"/> -->
+ <!--updates-box -->
+ <lift:comet type="PublicTimeline"/>
<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">
+ <table>
+ <tbody id="timeline_messages">
+ <tr id="message">
+ <div id="timeline_messages">
+ <div class="updates-box">
<div class="avatar">
- <img src="images/avatar1.jpg" alt="" />
+ <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
</div>
<div class="update2">
- <div class="info2">
- <a href="">Nickname</a>
+ <div class="info2" >
+ <a href="" id="author">-</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 id="body">-</div>
<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>
+ <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>
- </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 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="">reply</a>
- | <a href="">resend</a>
- | <a href="">conversation</a>
+ <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>
+ </div>
+ </tr>
+ </tbody>
+ </table>
+ </div>
<!--updates-box-->
- <div class="separator">
- </div>
- </div>
- <!--left-->
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/users.html Mon Mar 15 07:15:56 2010
@@ -20,10 +20,9 @@
<script type="text/javascript" src="../scripts/esme_table_sorter.js">
</script>
<lift:TableSorterSnip/>
- <fieldset style="width: 80em">
- <legend>
- <lift:loc>ui_user_list_title</lift:loc>
- </legend>
+ <div class="box-title-aux">
+ <h3><a href=""><lift:loc>ui_user_list_title</lift:loc></a></h3>
+ </div>
<table id="esme-table" class="tablesorter">
<thead>
<tr>
@@ -67,5 +66,4 @@
</lift:displayUsers>
</tbody>
</table>
- </fieldset>
</lift:surround>
\ 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=923090&r1=923089&r2=923090&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 Mon Mar 15 07:15:56 2010
@@ -1,3 +1,22 @@
+/*
+ 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"
@@ -39,8 +58,9 @@ function displayMessages(msgArray, eleme
var msgAuthor = cometMsg.author;
var msgBody = jQuery(cometMsg.text).find('body').html();
var msgDateObj = new Date(parseInt(cometMsg.when));
- var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
- ' ' + msgDateObj.toLocaleTimeString();
+
+ var msgDateStr = prettyDate(msgDateObj);
+
var msgPool = '';
if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
var msgSource = cometMsg.source;
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js Mon Mar 15 07:15:56 2010
@@ -1,8 +1,28 @@
+/*
+ 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"
*/
+
function login()
{
if (document.forms[0].openID.value != "") {
@@ -50,8 +70,9 @@ function displayMessages(msgArray, eleme
var msgAuthor = cometMsg.author;
var msgBody = jQuery(cometMsg.text).find('body').html();
var msgDateObj = new Date(parseInt(cometMsg.when));
- var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
- ' ' + msgDateObj.toLocaleTimeString();
+
+ var msgDateStr = prettyDate(msgDateObj);
+
var msgPool = '';
if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
var msgSource = cometMsg.source;
Added: incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/pretty.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/pretty.js?rev=923090&view=auto
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/pretty.js (added)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/pretty.js Mon Mar 15 07:15:56 2010
@@ -0,0 +1,36 @@
+/*
+ * JavaScript Pretty Date
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Licensed under the MIT license.
+ */
+
+// Takes an ISO time and returns a string representing how
+// long ago the date represents.
+function prettyDate(myDate){
+ var date = myDate,
+ diff = (((new Date()).getTime() - date.getTime()) / 1000),
+ day_diff = Math.floor(diff / 86400);
+
+ if ( isNaN(day_diff) || day_diff < 0 || day_diff >= 31 )
+ return;
+
+ return day_diff == 0 && (
+ diff < 60 && "just now" ||
+ diff < 120 && "1 minute ago" ||
+ diff < 3600 && Math.floor( diff / 60 ) + " minutes ago" ||
+ diff < 7200 && "1 hour ago" ||
+ diff < 86400 && Math.floor( diff / 3600 ) + " hours ago") ||
+ day_diff == 1 && "Yesterday" ||
+ day_diff < 7 && day_diff + " days ago" ||
+ day_diff < 31 && Math.ceil( day_diff / 7 ) + " weeks ago";
+}
+
+// If jQuery is included in the page, adds a jQuery plugin to handle it as well
+if ( typeof jQuery != "undefined" )
+ jQuery.fn.prettyDate = function(){
+ return this.each(function(){
+ var date = prettyDate(this.title);
+ if ( date )
+ jQuery(this).text( date );
+ });
+ };
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=923090&r1=923089&r2=923090&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 Mon Mar 15 07:15:56 2010
@@ -1,3 +1,22 @@
+<!--
+ 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="login">
<div id="signup-box">
<div id="mid-signup">
@@ -51,5 +70,6 @@
</label>
</lift:signup>
</div>
+
</div>
</lift:surround>
\ No newline at end of file
Modified: 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=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css Mon Mar 15 07:15:56 2010
@@ -1,3 +1,22 @@
+<!--
+ 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. *
+-->
+
/* 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;}
@@ -20,6 +39,14 @@ body#back { background:#fff url(../image
#container-bg { margin: 0 auto; width: 890px; }
#container { width: 890px; float:left; }
+div#error_major {
+ font-weight:bold;
+}
+
+#note_major {
+ font-weight:bold, italic;
+}
+
/* 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; }
@@ -53,7 +80,7 @@ div#logo h1 a{
#top-menu {
float:right;
text-align:right;
- width:275px;
+ width:300px;
margin-top:15px;
}
#top-menu ul {
@@ -475,6 +502,41 @@ ul#toc li.current a {
font-weight: bold;
}
+.box-title-aux {
+ float:left;
+ width:196px;
+ padding:10px 10px;
+ margin-top:10px;
+}
+
+.box-title-aux 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-title-aux h3 {
+ width:155px;
+ padding:10px 0 0 10px;
+ margin:10px 0 10px -25px;
+ font-size:140%;
+}
+.box-title-aux h3 a{
+ display: block;
+ height:29px;
+ width:215px;
+ color:#fff;
+}
+* html .box-title-aux h3 {
+ position: relative;
+ left: 0px;
+ margin-left:-10px;
+}
+
/* FOOTER
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html Mon Mar 15 07:15:56 2010
@@ -1,3 +1,22 @@
+<!--
+ 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. *
+-->
+
<!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>
@@ -14,7 +33,7 @@
<meta name="author" content="ESME Designed by Joy Reyes" lang="en-US" />
<meta name="Robots" content="index,follow,noodp" />
<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"/><script src="/scripts/display_messages.js" type="text/javascript"/>
+ <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"/> <script src="/scripts/pretty.js" type="text/javascript"/>
</head>
<body id="back">
<div id="container-bg">
@@ -26,7 +45,7 @@
<div id="top-menu">
<ul>
<li>
- <a href="/">Public Timeline</a>
+ <lift:Menu.item name="public"/>
|
</li>
<li>
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=923090&r1=923089&r2=923090&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 Mon Mar 15 07:15:56 2010
@@ -1,3 +1,22 @@
+<!--
+ 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"/>
@@ -13,8 +32,8 @@
<div id="container-bg">
<div class="container">
<div id="header">
- <div id="logo">
- <h1><a href="/">ESME</a></h1>
+ <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">
@@ -28,8 +47,15 @@
</div><!--left -->
<div id="right">
<lift:bind name="login">
- <lift:UserSnip.loginForm/> <lift:msgs/>
+ <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 -->
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=923090&r1=923089&r2=923090&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 Mon Mar 15 07:15:56 2010
@@ -1,44 +1,23 @@
-<!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="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"/><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>
- Public Timeline
- |
- </li>
- <li>
- <lift:Menu.item name="profile"/>
- |
- </li>
- </ul>
- <lift:Menu.item name="logout">
- <img src="images/btn-signout.gif" alt="" />
- </lift:Menu.item>
- </div>
- </div><!--// ENDS HEADER -->
+<!--
+ 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 -->
@@ -61,11 +40,12 @@
<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>
<div class="update-btn">
<input type="image" onclick="javascript:post_msg();" src="images/btn-update.gif" />
</div>
</div>
+
<script>
// <![CDATA[
var currentConvNumber = 0;
@@ -86,13 +66,16 @@
}
// ]]>
+
+
</script>
<lift:UserSnip.postScript/>
</div>
</div><!--END UPDATE BOX-->
</div><lift:UserSnip.resendScript/>
<!--updates-box -->
- <lift:comet type="Timeline"/>
+ <!--updates-box -->
+ <lift:comet type="Timeline"/>
<div class="separator">
</div>
<table>
@@ -121,7 +104,7 @@
</div>
<div class="actions">
<a href="javascript:resend_msg();"> <lift:loc>ui_messages_message_label_resend</lift:loc></a>
- | <a href="javascript:resend_msg();"><lift:loc>ui_messages_message_label_reply</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>
@@ -130,124 +113,6 @@
</tr>
</tbody>
</table>
+ </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">
- <lift:comet type="TagCloud"/>
- </div>
- <h3><a href=""><lift:loc>ui_messages_message_label_popular</lift:loc></a></h3>
- <div class="right-content">
- <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>
- <h3><a href=""><lift:loc>ui_messages_message_label_popular_links</lift:loc></a></h3>
- <div class="right-content">
- <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>
- </div>
- </div>
- <!--// ENDS CONTAINER -->
- </div>
- <!--// ENDS CONTAINER-BG -->
- <div id="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>
- <br />
- </div>
- </div>
- </body>
-</html>
+ </lift:surround>
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/public.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/public.html?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/public.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/public.html Mon Mar 15 07:15:56 2010
@@ -1,3 +1,22 @@
+<!--
+ 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">
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=923090&r1=923089&r2=923090&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 Mon Mar 15 07:15:56 2010
@@ -1,6 +1,23 @@
+<!--
+ 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. *
+-->
-
-
+
<div id="login-box">
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html?rev=923090&r1=923089&r2=923090&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/track_view/index.html Mon Mar 15 07:15:56 2010
@@ -17,6 +17,11 @@
under the License. *
-->
<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