You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/01/16 13:23:46 UTC
svn commit: r1059544 - in /esme/trunk/server/src/main/webapp: info_view/
templates-hidden/
Author: esjewett
Date: Sun Jan 16 12:23:46 2011
New Revision: 1059544
URL: http://svn.apache.org/viewvc?rev=1059544&view=rev
Log:
[ESME-322] Fix scripts not loading under Tomcat
Patch by Eric Christeson
Modified:
esme/trunk/server/src/main/webapp/info_view/streams.html
esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
esme/trunk/server/src/main/webapp/templates-hidden/timeline_conversation.html
esme/trunk/server/src/main/webapp/templates-hidden/timeline_personal.html
esme/trunk/server/src/main/webapp/templates-hidden/timeline_stream.html
esme/trunk/server/src/main/webapp/templates-hidden/timeline_tag.html
esme/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html
Modified: esme/trunk/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/streams.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/streams.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/streams.html Sun Jan 16 12:23:46 2011
@@ -47,12 +47,12 @@
</div>
<div id="stream_timeline_messages">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript"/>
- <script src="../scripts/pretty.js" type="text/javascript"/>
+ <script src="/scripts/display_messages_top.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
</head>
<stream:cometTimeline />
<lift:embed what="templates-hidden/message_core"/>
</div>
</div>
</lift:stream_display>
-</lift:surround>
\ No newline at end of file
+</lift:surround>
Modified: esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/message_core.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/message_core.html Sun Jan 16 12:23:46 2011
@@ -19,8 +19,8 @@
<div class="updates-box" id="message">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript" />
- <script src="../scripts/pretty.js" type="text/javascript" />
+ <script src="/scripts/display_messages_top.js" type="text/javascript" />
+ <script src="/scripts/pretty.js" type="text/javascript" />
<lift:UserSnip.resendScript/>
</head>
<div class="avatar">
Modified: esme/trunk/server/src/main/webapp/templates-hidden/timeline_conversation.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/timeline_conversation.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/timeline_conversation.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/timeline_conversation.html Sun Jan 16 12:23:46 2011
@@ -19,8 +19,8 @@
<div id="conversation_timeline_messages">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript"/>
- <script src="../scripts/pretty.js" type="text/javascript"/>
+ <script src="/scripts/display_messages_top.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
</head>
<lift:conv_info>
<conv:cometTimeline />
Modified: esme/trunk/server/src/main/webapp/templates-hidden/timeline_personal.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/timeline_personal.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/timeline_personal.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/timeline_personal.html Sun Jan 16 12:23:46 2011
@@ -19,10 +19,10 @@
<div id="personal_timeline_messages">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript"/>
- <script src="../scripts/pretty.js" type="text/javascript"/>
+ <script src="/scripts/display_messages_top.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
<lift:UserSnip.resendScript/>
<lift:comet type="PersonalTimeline"/>
</head>
<lift:embed what="templates-hidden/message_core"/>
-</div>
\ No newline at end of file
+</div>
Modified: esme/trunk/server/src/main/webapp/templates-hidden/timeline_stream.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/timeline_stream.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/timeline_stream.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/timeline_stream.html Sun Jan 16 12:23:46 2011
@@ -19,8 +19,8 @@
<div id="stream_timeline_messages">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript"/>
- <script src="../scripts/pretty.js" type="text/javascript"/>
+ <script src="/scripts/display_messages_top.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
</head>
<stream:cometTimeline />
<lift:embed what="templates-hidden/message_core"/>
Modified: esme/trunk/server/src/main/webapp/templates-hidden/timeline_tag.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/timeline_tag.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/timeline_tag.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/timeline_tag.html Sun Jan 16 12:23:46 2011
@@ -19,8 +19,8 @@
<div id="tag_timeline_messages">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript"/>
- <script src="../scripts/pretty.js" type="text/javascript"/>
+ <script src="/scripts/display_messages_top.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
</head>
<lift:tag_display>
<tag:cometTimeline />
Modified: esme/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html?rev=1059544&r1=1059543&r2=1059544&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/timeline_user_messages.html Sun Jan 16 12:23:46 2011
@@ -19,11 +19,11 @@
<div id="user_messages_timeline_messages">
<head>
- <script src="../scripts/display_messages_top.js" type="text/javascript"/>
- <script src="../scripts/pretty.js" type="text/javascript"/>
+ <script src="/scripts/display_messages_top.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
<lift:user_info>
<user:cometTimeline />
</lift:user_info>
</head>
<lift:embed what="templates-hidden/message_core"/>
-</div>
\ No newline at end of file
+</div>