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 2011/03/22 10:17:16 UTC
svn commit: r1084110 - in /esme/trunk/server/src/main:
scala/org/apache/esme/model/ scala/org/apache/esme/snippet/
webapp/info_view/ webapp/templates-hidden/
Author: rhirsch
Date: Tue Mar 22 09:17:16 2011
New Revision: 1084110
URL: http://svn.apache.org/viewvc?rev=1084110&view=rev
Log:
[ESME-339] Clean up web content
Removed:
esme/trunk/server/src/main/webapp/templates-hidden/base_top.html
esme/trunk/server/src/main/webapp/templates-hidden/timeline_stream.html
Modified:
esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
esme/trunk/server/src/main/webapp/info_view/conversation.html
esme/trunk/server/src/main/webapp/info_view/messages.html
esme/trunk/server/src/main/webapp/info_view/tag.html
esme/trunk/server/src/main/webapp/info_view/users.html
esme/trunk/server/src/main/webapp/templates-hidden/base.html
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Tue Mar 22 09:17:16 2011
@@ -148,7 +148,7 @@ object User extends User with KeyedMetaM
var onLogOut: List[Box[User] => Unit] = List(ExtSession.userDidLogout _)
def loggedIn_? : Boolean = currentUserId.isDefined
-
+
def logUserIdIn(id: String) {
curUser.remove()
curUserId(Full(id))
Modified: esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Tue Mar 22 09:17:16 2011
@@ -149,6 +149,9 @@ class UserSnip extends DispatchSnippet {
// Image of user as part of an img tag
+ def logoutimage: MetaData = ("src" -> (Message.root + "/images/btn-signout.gif"))
+ def searchimage: MetaData = ("src" -> (Message.root + "/images/btn-search.gif"))
+
def image: MetaData = ("src" -> (User.currentUser.map(_.image_url)openOr "/images/avatar.jpg"))
// Href used to display details about a user
Modified: esme/trunk/server/src/main/webapp/info_view/conversation.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/conversation.html?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/conversation.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/conversation.html Tue Mar 22 09:17:16 2011
@@ -17,7 +17,6 @@
under the License. *
-->
<lift:surround with="base" at="left">
- <link rel="stylesheet" type="text/css" href="../style/style.css" />
<lift:conv_info>
<div id="back-header">
<h1>
Modified: esme/trunk/server/src/main/webapp/info_view/messages.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/messages.html?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/messages.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/messages.html Tue Mar 22 09:17:16 2011
@@ -19,7 +19,7 @@
-<lift:surround with="base_top" at="left">
+<lift:surround with="base" at="left">
<div id="back-header">
<lift:embed what="templates-hidden/message_update_box"/>
</div>
Modified: esme/trunk/server/src/main/webapp/info_view/tag.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/tag.html?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/tag.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/tag.html Tue Mar 22 09:17:16 2011
@@ -17,7 +17,6 @@
under the License. *
-->
<lift:surround with="base" at="left">
- <link rel="stylesheet" type="text/css" href="../style/style.css" />
<lift:tag_display>
<div id="back-header">
<h1>
Modified: esme/trunk/server/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/users.html?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/users.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/users.html Tue Mar 22 09:17:16 2011
@@ -17,7 +17,6 @@
under the License. *
-->
<lift:surround with="base" at="left">
- <link rel="stylesheet" type="text/css" href="../style/style.css"/>
<link rel="stylesheet" type="text/css" href="../style/esme_user_page.css"/>
<link rel="stylesheet" type="text/css" href="../style/esme_user_table.css"/>
<script type="text/javascript" src="../scripts/jquery.dataTables.min.js"></script>
Modified: esme/trunk/server/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/base.html?rev=1084110&r1=1084109&r2=1084110&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/base.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/base.html Tue Mar 22 09:17:16 2011
@@ -63,7 +63,7 @@
</ul>
<lift:Menu.item name="logout">
- <img src="../images/btn-signout.gif" alt="" class="tipelement" title="Log out of ESME." />
+ <img lift:snippet="UserSnip.logoutimage" alt="" class="tipelement" title="Log out of ESME." />
</lift:Menu.item>
</div>
</div><!--// ENDS HEADER -->
@@ -87,7 +87,7 @@
<input type="text" class="inputBox required alphanumeric nowhitespace" name="term" value=""/>
</div>
<div class="searchButton">
- <input type="image" onclick="javascript:form.submit();" src="../images/btn-search.gif" style="padding:0;"/>
+ <input type="image" onclick="javascript:form.submit();" lift:snippet="UserSnip.searchimage" style="padding:0;"/>
</div>
</div>
</form><!--search form--><h3 class ="tipelement" title="These are tags that appear often in your timeline."><lift:loc>ui_messages_message_label_tag_cloud</lift:loc></h3>