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/02/13 13:17:06 UTC
svn commit: r1070221 - in /esme/trunk/server/src/main/webapp:
info_view/user.html scripts/display_messages_top.js style/style.css
templates-hidden/base_top.html templates-hidden/message_core.html
Author: esjewett
Date: Sun Feb 13 12:17:06 2011
New Revision: 1070221
URL: http://svn.apache.org/viewvc?rev=1070221&view=rev
Log:
[ESME-314] [ESME-286] Fix a lot of formatting issues on the user page and revamp some of the main timeline formatting as well to make it a little more manageable. Also changes duplicate ids in the main timeline to classes, so we are more valid.
Modified:
esme/trunk/server/src/main/webapp/info_view/user.html
esme/trunk/server/src/main/webapp/scripts/display_messages_top.js
esme/trunk/server/src/main/webapp/style/style.css
esme/trunk/server/src/main/webapp/templates-hidden/base_top.html
esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
Modified: esme/trunk/server/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/user.html?rev=1070221&r1=1070220&r2=1070221&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/user.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/user.html Sun Feb 13 12:17:06 2011
@@ -17,12 +17,14 @@
under the License. *
-->
-<lift:surround with="base" at="left">
+<lift:surround with="base" at="left">
+ <head>
<lift:TableSorterSnip/><!-- STYLESHEETS -->
<link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
- <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"> </script>
+ <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"></script>
<script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
<script type="text/javascript" src="../scripts/esme.js"></script>
+ </head>
<lift:user_info>
<div id="back-header">
<h1>
@@ -31,35 +33,29 @@
</h1>
</div>
<div class="container-aux">
- <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">
- <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
- <a href="#tabs-1"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a>
- </li>
- <li class="ui-state-default ui-corner-top">
- <a href="#tabs-2"><lift:loc>ui_user_following</lift:loc></a>
- </li>
- <li class="ui-state-default ui-corner-top">
- <a href="#tabs-3"><lift:loc>ui_user_followers</lift:loc></a>
- </li>
+ <div id="tabs" class="user-tabs">
+ <ul>
+ <li><a href="#tabs-1"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a></li>
+ <li><a href="#tabs-2"><lift:loc>ui_user_following</lift:loc></a></li>
+ <li><a href="#tabs-3"><lift:loc>ui_user_followers</lift:loc></a></li>
</ul>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-1">
+ <div id="tabs-1">
<dl class="">
<dd class="b-clouds">
<lift:embed what="templates-hidden/timeline_user_messages"/>
</dd>
</dl>
</div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
+ <div id="tabs-2">
<dl class="">
- <dd class="b-contacts" style="height: 240px; overflow: auto">
+ <dd class="b-contacts">
<lift:UserSnip.following user:userId=""/>
</dd>
</dl>
</div>
- <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
+ <div id="tabs-3">
<dl class="">
- <dd class="b-contacts" style="height: 240px; overflow: auto">
+ <dd class="b-contacts">
<lift:UserSnip.followers user:userId=""/>
</dd>
</dl>
Modified: esme/trunk/server/src/main/webapp/scripts/display_messages_top.js
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/scripts/display_messages_top.js?rev=1070221&r1=1070220&r2=1070221&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/scripts/display_messages_top.js (original)
+++ esme/trunk/server/src/main/webapp/scripts/display_messages_top.js Sun Feb 13 12:17:06 2011
@@ -194,13 +194,13 @@ function displayMessages(msgArray, eleme
var newMsg = msgTemplate.clone(true).attr('id',msgId);
- newMsg.find('#author').text(msgAuthor.nickname);
+ newMsg.find('.author').text(msgAuthor.nickname);
// Dealing with tomcat
if (top.location.pathName == "/")
- newMsg.find('#author').attr('href',"/user/" + msgAuthor.nickname );
+ newMsg.find('.author').attr('href',"/user/" + msgAuthor.nickname );
else
- newMsg.find('#author').attr('href', window.location.pathname + "user/" + msgAuthor.nickname );
+ newMsg.find('.author').attr('href', window.location.pathname + "user/" + msgAuthor.nickname );
@@ -220,15 +220,15 @@ function displayMessages(msgArray, eleme
.attr('src', msgAuthor.imageUrl)
.attr('alt',msgAuthor.firstName + ' ' + msgAuthor.lastName);
- newMsg.find('#msgbody').html(msgBody);
+ newMsg.find('.msgbody').html(msgBody);
if (msgReason)
- newMsg.find('#supp_data').text(msgPool + " " + msgDateStr + " " + msgReason );
+ newMsg.find('.supp_data').text(msgPool + " " + msgDateStr + " " + msgReason );
else {
- newMsg.find('#supp_data').text(msgPool + " " + msgDateStr + " via " + msgSource);
+ newMsg.find('.supp_data').text(msgPool + " " + msgDateStr + " via " + msgSource);
}
var id = cometMsg.id;
- var resendButton = newMsg.find('#resend');
+ var resendButton = newMsg.find('.resend');
if (cometResent) {
resendButton.css("display", "none");
@@ -243,9 +243,9 @@ function displayMessages(msgArray, eleme
var myReplyMsg = tempStr.replaceAll ("ZZZ$%$", "\\'");
- newMsg.find('#reply').attr('href',
+ newMsg.find('.reply').attr('href',
"javascript:setReplyTo(" + id + ", '"+ myReplyMsg + "'," + msgPoolId + ", '" + msgAuthor.nickname + "')");
- var conversation = newMsg.find('#conversation');
+ var conversation = newMsg.find('.conversation');
if (msgConversation != 0) {
conversation.attr('href',
'/conversation/' + msgConversation);
Modified: esme/trunk/server/src/main/webapp/style/style.css
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/style/style.css?rev=1070221&r1=1070220&r2=1070221&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/style/style.css (original)
+++ esme/trunk/server/src/main/webapp/style/style.css Sun Feb 13 12:17:06 2011
@@ -422,29 +422,40 @@ ul.main-links {
.gray-box {
float:left;
background:#f9f9f9;
-
}
.updates-box {
- float:left;
+/* float:left; */
padding:10px 0px 5px 0px;
word-wrap:break-word;
border-bottom: 1px solid #ddd;
}
.avatar {
+/* float:left; */
+ display: inline;
+ width:62px;
+}
+.user-avatar {
float:left;
width:62px;
}
.update {
- float:left;
+/* float:left; */
width:470px;
padding:0 10px;
word-wrap:break-word;
}
.update2 {
- float:left;
+/* float:left; */
+ display:block;
+ margin-top: -45px;
+ margin-left:62px;
width:500px;
padding:0px;
+}
+.author {
+ font-weight:bold;
+ font-size:110%;
}
.tag, .tag a {
margin:10px 0 2px;
@@ -453,7 +464,7 @@ ul.main-links {
.info a {
font-weight:bold;
}
-.info2 a {
+.info2 a {
font-weight:bold;
font-size:110%;
}
@@ -467,7 +478,7 @@ ul.main-links {
margin:10px;
width:90%;
}
-.supp_data_class {
+.supp_data {
padding-top:5px;
color:#07376d;
font-size:80%;
@@ -504,6 +515,9 @@ ul.main-links {
padding:20px 30px;
background: url(../images/bg-tabs.png) no-repeat;
margin-bottom:20px;
+}
+.user-tabs {
+ margin: -10px -25px;
}
/* CONTENT TABS*/
ul#toc {
Modified: esme/trunk/server/src/main/webapp/templates-hidden/base_top.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/base_top.html?rev=1070221&r1=1070220&r2=1070221&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/base_top.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/base_top.html Sun Feb 13 12:17:06 2011
@@ -74,7 +74,7 @@
<!--left-->
<div id="right">
<div class="box-right-back">
- <div class="avatar">
+ <div class="user-avatar">
<img lift:snippet="UserSnip.image" alt="" width="80%"/>
</div><strong><lift:loc>ui_messages_message_label_welcome</lift:loc></strong>
<div class="info4">
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=1070221&r1=1070220&r2=1070221&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 Feb 13 12:17:06 2011
@@ -27,22 +27,18 @@
<img id="avatar" width="40px"/>
</div> <!--end avatar-->
<div class="update2">
-
- <div class="info2">
- <a href="" id="author"/>
- <div id="msgbody"/>
- <div class="supp_data_class" id="supp_data"/>
- </div> <!--end info2-->
-
+ <a href="" class="author"/>
+ <div class="msgbody"/>
+ <div class="supp_data"/>
<div class="actions">
- <a href="#" id="resend">
+ <a href="#" class="resend">
<lift:loc>ui_messages_message_label_resend</lift:loc>
- </a><span id="resend">| </span>
- <a href="#" id="reply">
+ </a><span class="resend">| </span>
+ <a href="#" class="reply">
<lift:loc>ui_messages_message_label_reply</lift:loc>
</a>
- <span id="conversation">| </span>
- <a id="conversation">
+ <span class="conversation">| </span>
+ <a class="conversation">
<lift:loc>ui_messages_message_label_conversation</lift:loc>
</a>
</div> <!--end actions-->
Re: svn commit: r1070221 - in /esme/trunk/server/src/main/webapp:
info_view/user.html scripts/display_messages_top.js style/style.css
templates-hidden/base_top.html templates-hidden/message_core.html
Posted by Ethan Jewett <es...@gmail.com>.
Hi all,
I think this change and the subsequent commit fixes ESME-286 (1)
completely and makes ESME-314 (2) good enough to release, so I am
going to close both of these issues.
However, there are some changes to the way that the CSS and JS for the
main timeline works in this commit that reach into a lot of areas of
ESME. If people could please test in a variety of browsers to make
sure things generally function and look the same as they did
previously, that would be excellent.
Thanks,
Ethan
(1) https://issues.apache.org/jira/browse/ESME-286
(2) https://issues.apache.org/jira/browse/ESME-314
On Sun, Feb 13, 2011 at 1:17 PM, <es...@apache.org> wrote:
> Author: esjewett
> Date: Sun Feb 13 12:17:06 2011
> New Revision: 1070221
>
> URL: http://svn.apache.org/viewvc?rev=1070221&view=rev
> Log:
> [ESME-314] [ESME-286] Fix a lot of formatting issues on the user page and revamp some of the main timeline formatting as well to make it a little more manageable. Also changes duplicate ids in the main timeline to classes, so we are more valid.
>
> Modified:
> esme/trunk/server/src/main/webapp/info_view/user.html
> esme/trunk/server/src/main/webapp/scripts/display_messages_top.js
> esme/trunk/server/src/main/webapp/style/style.css
> esme/trunk/server/src/main/webapp/templates-hidden/base_top.html
> esme/trunk/server/src/main/webapp/templates-hidden/message_core.html
>
> Modified: esme/trunk/server/src/main/webapp/info_view/user.html
> URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/user.html?rev=1070221&r1=1070220&r2=1070221&view=diff
> ==============================================================================
> --- esme/trunk/server/src/main/webapp/info_view/user.html (original)
> +++ esme/trunk/server/src/main/webapp/info_view/user.html Sun Feb 13 12:17:06 2011
> @@ -17,12 +17,14 @@
> under the License. *
> -->
>
> -<lift:surround with="base" at="left">
> +<lift:surround with="base" at="left">
> + <head>
> <lift:TableSorterSnip/><!-- STYLESHEETS -->
> <link type="text/css" href="../style/jqueryui-theme/jquery-ui-1.8.2.custom.css" rel="stylesheet" />
> - <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"> </script>
> + <script type="text/javascript" src="../scripts/jquery-ui-1.8.2.custom.min.js"></script>
> <script type="text/javascript" src="../scripts/esme_table_sorter.js"></script>
> <script type="text/javascript" src="../scripts/esme.js"></script>
> + </head>
> <lift:user_info>
> <div id="back-header">
> <h1>
> @@ -31,35 +33,29 @@
> </h1>
> </div>
> <div class="container-aux">
> - <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">
> - <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
> - <a href="#tabs-1"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a>
> - </li>
> - <li class="ui-state-default ui-corner-top">
> - <a href="#tabs-2"><lift:loc>ui_user_following</lift:loc></a>
> - </li>
> - <li class="ui-state-default ui-corner-top">
> - <a href="#tabs-3"><lift:loc>ui_user_followers</lift:loc></a>
> - </li>
> + <div id="tabs" class="user-tabs">
> + <ul>
> + <li><a href="#tabs-1"><user:nicename/><lift:loc>ui_user_messages</lift:loc></a></li>
> + <li><a href="#tabs-2"><lift:loc>ui_user_following</lift:loc></a></li>
> + <li><a href="#tabs-3"><lift:loc>ui_user_followers</lift:loc></a></li>
> </ul>
> - <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-1">
> + <div id="tabs-1">
> <dl class="">
> <dd class="b-clouds">
> <lift:embed what="templates-hidden/timeline_user_messages"/>
> </dd>
> </dl>
> </div>
> - <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">
> + <div id="tabs-2">
> <dl class="">
> - <dd class="b-contacts" style="height: 240px; overflow: auto">
> + <dd class="b-contacts">
> <lift:UserSnip.following user:userId=""/>
> </dd>
> </dl>
> </div>
> - <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-3">
> + <div id="tabs-3">
> <dl class="">
> - <dd class="b-contacts" style="height: 240px; overflow: auto">
> + <dd class="b-contacts">
> <lift:UserSnip.followers user:userId=""/>
> </dd>
> </dl>
>
> Modified: esme/trunk/server/src/main/webapp/scripts/display_messages_top.js
> URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/scripts/display_messages_top.js?rev=1070221&r1=1070220&r2=1070221&view=diff
> ==============================================================================
> --- esme/trunk/server/src/main/webapp/scripts/display_messages_top.js (original)
> +++ esme/trunk/server/src/main/webapp/scripts/display_messages_top.js Sun Feb 13 12:17:06 2011
> @@ -194,13 +194,13 @@ function displayMessages(msgArray, eleme
> var newMsg = msgTemplate.clone(true).attr('id',msgId);
>
>
> - newMsg.find('#author').text(msgAuthor.nickname);
> + newMsg.find('.author').text(msgAuthor.nickname);
>
> // Dealing with tomcat
> if (top.location.pathName == "/")
> - newMsg.find('#author').attr('href',"/user/" + msgAuthor.nickname );
> + newMsg.find('.author').attr('href',"/user/" + msgAuthor.nickname );
> else
> - newMsg.find('#author').attr('href', window.location.pathname + "user/" + msgAuthor.nickname );
> + newMsg.find('.author').attr('href', window.location.pathname + "user/" + msgAuthor.nickname );
>
>
>
> @@ -220,15 +220,15 @@ function displayMessages(msgArray, eleme
> .attr('src', msgAuthor.imageUrl)
> .attr('alt',msgAuthor.firstName + ' ' + msgAuthor.lastName);
>
> - newMsg.find('#msgbody').html(msgBody);
> + newMsg.find('.msgbody').html(msgBody);
> if (msgReason)
> - newMsg.find('#supp_data').text(msgPool + " " + msgDateStr + " " + msgReason );
> + newMsg.find('.supp_data').text(msgPool + " " + msgDateStr + " " + msgReason );
> else {
> - newMsg.find('#supp_data').text(msgPool + " " + msgDateStr + " via " + msgSource);
> + newMsg.find('.supp_data').text(msgPool + " " + msgDateStr + " via " + msgSource);
> }
> var id = cometMsg.id;
>
> - var resendButton = newMsg.find('#resend');
> + var resendButton = newMsg.find('.resend');
>
> if (cometResent) {
> resendButton.css("display", "none");
> @@ -243,9 +243,9 @@ function displayMessages(msgArray, eleme
> var myReplyMsg = tempStr.replaceAll ("ZZZ$%$", "\\'");
>
>
> - newMsg.find('#reply').attr('href',
> + newMsg.find('.reply').attr('href',
> "javascript:setReplyTo(" + id + ", '"+ myReplyMsg + "'," + msgPoolId + ", '" + msgAuthor.nickname + "')");
> - var conversation = newMsg.find('#conversation');
> + var conversation = newMsg.find('.conversation');
> if (msgConversation != 0) {
> conversation.attr('href',
> '/conversation/' + msgConversation);
>
> Modified: esme/trunk/server/src/main/webapp/style/style.css
> URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/style/style.css?rev=1070221&r1=1070220&r2=1070221&view=diff
> ==============================================================================
> --- esme/trunk/server/src/main/webapp/style/style.css (original)
> +++ esme/trunk/server/src/main/webapp/style/style.css Sun Feb 13 12:17:06 2011
> @@ -422,29 +422,40 @@ ul.main-links {
> .gray-box {
> float:left;
> background:#f9f9f9;
> -
> }
>
> .updates-box {
> - float:left;
> +/* float:left; */
> padding:10px 0px 5px 0px;
> word-wrap:break-word;
> border-bottom: 1px solid #ddd;
> }
> .avatar {
> +/* float:left; */
> + display: inline;
> + width:62px;
> +}
> +.user-avatar {
> float:left;
> width:62px;
> }
> .update {
> - float:left;
> +/* float:left; */
> width:470px;
> padding:0 10px;
> word-wrap:break-word;
> }
> .update2 {
> - float:left;
> +/* float:left; */
> + display:block;
> + margin-top: -45px;
> + margin-left:62px;
> width:500px;
> padding:0px;
> +}
> +.author {
> + font-weight:bold;
> + font-size:110%;
> }
> .tag, .tag a {
> margin:10px 0 2px;
> @@ -453,7 +464,7 @@ ul.main-links {
> .info a {
> font-weight:bold;
> }
> -.info2 a {
> +.info2 a {
> font-weight:bold;
> font-size:110%;
> }
> @@ -467,7 +478,7 @@ ul.main-links {
> margin:10px;
> width:90%;
> }
> -.supp_data_class {
> +.supp_data {
> padding-top:5px;
> color:#07376d;
> font-size:80%;
> @@ -504,6 +515,9 @@ ul.main-links {
> padding:20px 30px;
> background: url(../images/bg-tabs.png) no-repeat;
> margin-bottom:20px;
> +}
> +.user-tabs {
> + margin: -10px -25px;
> }
> /* CONTENT TABS*/
> ul#toc {
>
> Modified: esme/trunk/server/src/main/webapp/templates-hidden/base_top.html
> URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/base_top.html?rev=1070221&r1=1070220&r2=1070221&view=diff
> ==============================================================================
> --- esme/trunk/server/src/main/webapp/templates-hidden/base_top.html (original)
> +++ esme/trunk/server/src/main/webapp/templates-hidden/base_top.html Sun Feb 13 12:17:06 2011
> @@ -74,7 +74,7 @@
> <!--left-->
> <div id="right">
> <div class="box-right-back">
> - <div class="avatar">
> + <div class="user-avatar">
> <img lift:snippet="UserSnip.image" alt="" width="80%"/>
> </div><strong><lift:loc>ui_messages_message_label_welcome</lift:loc></strong>
> <div class="info4">
>
> 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=1070221&r1=1070220&r2=1070221&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 Feb 13 12:17:06 2011
> @@ -27,22 +27,18 @@
> <img id="avatar" width="40px"/>
> </div> <!--end avatar-->
> <div class="update2">
> -
> - <div class="info2">
> - <a href="" id="author"/>
> - <div id="msgbody"/>
> - <div class="supp_data_class" id="supp_data"/>
> - </div> <!--end info2-->
> -
> + <a href="" class="author"/>
> + <div class="msgbody"/>
> + <div class="supp_data"/>
> <div class="actions">
> - <a href="#" id="resend">
> + <a href="#" class="resend">
> <lift:loc>ui_messages_message_label_resend</lift:loc>
> - </a><span id="resend">| </span>
> - <a href="#" id="reply">
> + </a><span class="resend">| </span>
> + <a href="#" class="reply">
> <lift:loc>ui_messages_message_label_reply</lift:loc>
> </a>
> - <span id="conversation">| </span>
> - <a id="conversation">
> + <span class="conversation">| </span>
> + <a class="conversation">
> <lift:loc>ui_messages_message_label_conversation</lift:loc>
> </a>
> </div> <!--end actions-->
>
>
>