Permalink
Browse files

reworked chatter post markup and style, hooked up pushdown plugin to …

…listen for render event
  • Loading branch information...
1 parent 17ddb59 commit 08f55ce91d8528c5ea761f5327c3bec37d52d8b7 @blaflamme blaflamme committed Apr 28, 2012
@@ -1,66 +1,64 @@
<div id="chatter-panel">
- <div class="pushdownContent clearfix">
- <div id="on-your-mind" class="panel">
- <h3>On your mind</h3>
- <form class="form-stacked" action="{{chatter_url}}/add_chatter.html" method="POST">
- <div class="control-group clearfix">
- <div class="controls">
- <textarea id="chatter-panel-text" name="text"></textarea>
- <p class="help-block tips">Tips: Use @username, #tag, and #this for this page</p>
- </div>
- <div class="actions">
- <div class="btn-group">
- <button id="speak" type="submit" class="btn btn-small">Speak</button>
- </div>
- </div>
+ <div class="pushdownContent clearfix">
+ <div id="on-your-mind" class="panel">
+ <h3>On your mind</h3>
+ <form class="form-stacked" action="{{chatter_url}}/add_chatter.html" method="POST">
+ <div class="control-group clearfix">
+ <div class="controls">
+ <textarea id="chatter-panel-text" name="text"></textarea>
+ <p class="help-block tips">Tips: Use @username, #tag, and #this for this page</p>
+ </div>
+ <div class="actions">
+ <div class="btn-group">
+ <button id="speak" type="submit" class="btn btn-small">Speak</button>
</div>
- </form>
- <div class="houstonWeHaveAProblem notification info">
- <strong>Something went wrong.</strong>
- <p>We could not update the messages for you. But don't you
- worry, we'll try again as soon as possible.</p>
- </div>
- <a id="goto-chatter" class="btn btn-small btn-primary goto" href="{{chatter_url}}" title="Go to Chatter">Go to Chatter</a>
+ </div>
+ </div>
+ </form>
+ <div class="houstonWeHaveAProblem notification info">
+ <strong>Something went wrong.</strong>
+ <p>We could not update the messages for you. But don't you
+ worry, we'll try again as soon as possible.</p>
+ </div>
+ <a id="goto-chatter" class="btn btn-small btn-primary goto" href="{{chatter_url}}" title="Go to Chatter">Go to Chatter</a>
+ </div>
+ {{#streams}}
+ <div id="{{class}}" class="panel">
+ <h3>{{title}}<span class="updating">Updating&hellip;</span></h3>
+ {{#items}}
+ <div class="panel-item clearfix {{#new}}newMessage{{/new}}">
+ <div class="panel-header">
+ <span class="timeago" title="{{info}}">{{info}}</span>
</div>
- {{#streams}}
- <div id="{{class}}" class="panel">
- <h3>{{title}}<span class="updating">Updating&hellip;</span></h3>
- {{#items}}
- <div class="panel-item clearfix {{#new}}newMessage{{/new}}">
- <div class="panel-item-content">
- <a href="{{author_profile_url}}">
- <img alt="{{author}}" src="{{image_url}}"
- class="avatar" />
- <strong class="fullname">{{author}}</strong>
- </a>
- <div>
- <a href="{{message_url}}" class="messagetext">
- {{text}}
- </a>
- </div>
- </div>
- <div class="panel-footer clearfix">
- <abbr class="timeago" title="{{info}}">{{info}}</abbr>
- </div>
+ <div class="panel-item-content">
+ <a href="{{author_profile_url}}">
+ <img alt="{{author}}" src="{{image_url}}" class="avatar" />
+ <span class="fullname">{{author}}</span>
+ </a>
+ <div class="messagewrapper">
+ <div class="messagetext">
+ {{text}}
</div>
- {{/items}}
- <a href="{{has_more_news_url}}" class="thereIsMore" title="Go to Chatter">
- {{#has_more_news}}
- <span class="newMessages">{{has_more_news}} more new items</span>
- {{/has_more_news}}
- {{^has_more_news}}
- <span class="noNewMessages">&hellip;</span>
- {{/has_more_news}}
- </a>
+ </div>
</div>
- {{/streams}}
-
+ <div class="panel-footer">
+ <div class="view-options">
+ <a href="#"><i class="icon-plus"></i>View more</a> |
+ <a href="{{message_url}}"><i class="icon-eye-open"></i>View</a>
+ </div>
+ </div>
+ </div>
+ {{/items}}
+ <a href="{{has_more_news_url}}" class="thereIsMore" title="Go to Chatter">
+ {{#has_more_news}}
+ <span class="newMessages">{{has_more_news}} more new items</span>
+ {{/has_more_news}}
+ {{^has_more_news}}
+ <span class="noNewMessages">&hellip;</span>
+ {{/has_more_news}}
+ </a>
</div>
- <script language="javascript" type="text/javascript">
- //<![CDATA[
- $(document).ready(function() {
- $(".panel-footer abbr.timeago").timeago();
- });
- //]]>
- </script>
+ {{/streams}}
+
+ </div>
</div>
@@ -1,17 +1,26 @@
<div class="panel-item-content">
+ <div class="panel-header">
+ <div class="timeago-date"
+ title="${post['timeago']}">${post['timeago']}</div>
+ <div class="post-options">
+ <a href="#" class="chatter-reply"><i class="icon-share-alt"></i>Reply</a> |
+ <a href="#" class="chatter-repost"><i class="icon-retweet"></i>Repost</a> |
+ <a href="${post['url']}"><i class="icon-eye-open"></i>View</a>
+ </div>
+ </div>
<div>
<a href="${post['creator_url']}">
<img class="avatar" alt="${post['creator_fullname']}"
src="${post['creator_image_url']}" />
- <span class="fullname"><a class="quip-name" href="#" ref="${post['creator']}">${post['creator_fullname']}</a></span>
+ <a class="fullname" href="#" ref="${post['creator']}">${post['creator_fullname']}</a>
</a>
<div class="messagetext">
${structure:post['html']}
<div class="repost" tal:condition="post['reposter']">
- <i class="icon-retweet"></i>Reposted by <a class="quip-name" href="#" ref="${post['reposter']}">${post['reposter_fullname']}</a>
+ <i class="icon-retweet"></i>Reposted by <a class="fullname" href="#" ref="${post['reposter']}">${post['reposter_fullname']}</a>
</div>
<div class="reply" tal:condition="post['reply']">
- <i class="icon-share-alt"></i>In reply to <a class="quip-name" href="#" ref="${post['reply']['creator']}">${post['reply']['creator_fullname']}</a>
+ <i class="icon-share-alt"></i>In reply to <a class="fullname" href="#" ref="${post['reply']['creator']}">${post['reply']['creator_fullname']}</a>
</div>
</div>
<div class="option-box reply-box">
@@ -23,23 +32,14 @@
<input type="hidden" name="text" value="${post['text']}" />
<input type="hidden" name="repost" value="${post['creator']}" />
<div>
- <button type="submit" class="btn btn-small btn-primary btn-speak-rp">
- Speak
- </button>
- <button type="submit" class="btn btn-small btn-cancel-rp">
- Cancel
- </button>
+ <button type="submit" class="btn btn-small btn-primary btn-speak-rp">
+ Speak
+ </button>
+ <button type="submit" class="btn btn-small btn-cancel-rp">
+ Cancel
+ </button>
</div>
</form>
</div>
</div>
- <div class="panel-footer clearfix">
- <div class="timeago-date"
- title="${post['timeago']}">${post['timeago']}</div>
- <div class="post-options">
- <a href="#" class="chatter-reply"><i class="icon-share-alt"></i>Reply</a> |
- <a href="#" class="chatter-repost"><i class="icon-retweet"></i>Repost</a> |
- <a href="${post['url']}"><i class="icon-eye-open"></i>View</a>
- </div>
- </div>
</div>
Oops, something went wrong.

0 comments on commit 08f55ce

Please sign in to comment.