Permalink
Browse files

Merge branch 'ux2' of github.com:karlproject/karl into ux2

  • Loading branch information...
cguardia committed Apr 9, 2012
2 parents c57dbf8 + 611c59d commit b1df90685ecda8979f834ce7d9f83b56379ceddf
@@ -42,9 +42,6 @@
<div class="commentText" tal:content="structure comment['text']" />
- <div class="kbyline">Posted
- by <a href="${comment['author_url']}">${comment['author_name']}</a>
- on ${comment['date']}</div>
<div class="blogAttachments">
<span tal:repeat="attachment comment['attachments']">
@@ -57,6 +54,10 @@
</span>
</div>
+ <div class="kbyline">Posted
+ by <a href="${comment['author_url']}">${comment['author_name']}</a>
+ on ${comment['date']}</div>
+
</div>
</div>
<h3 tal:condition="comments">Add Comment</h3>
@@ -6,11 +6,15 @@
</metal:feed>
<div metal:fill-slot="content">
- <div class="blogEntry ${repeat['entry'].start and 'noborder' or ''}"
- tal:repeat="entry entries">
- <header>
+ <header>
${panel('status_message')}
${panel('popper.actions_menu', actions=actions)}
+ <h1>Blog Listing</h1>
+ </header>
+
+ <div class="blogEntry ${repeat['entry'].start and 'noborder' or ''}"
+ tal:repeat="entry entries">
+ <header>
<h2><a href="${entry['href']}">${entry['title']}</a></h2>
</header>
@@ -19,25 +19,22 @@
<div metal:fill-slot="content">
- ${panel('status_message')}
- ${panel('popper.actions_menu', actions=actions)}
+ <div class="contentbar-wrapper">
+ <span class="contentbar-menu">
+ <a href="${layout.here_url}..">Front Page</a> |
+ Index
+ <tal:block condition="show_trash"> |
+ <a href="${layout.here_url}../trash">Trash</a>
+ </tal:block>
+ </span>
+ </div>
+ <header>
+ ${panel('status_message')}
+ ${panel('wiki_lock', lock_info)}
+ ${panel('popper.actions_menu', actions=actions)}
+ <h1>Wiki Index</h1>
+ </header>
- <div class="contentbar-wrapper">
- <span class="contentbar-menu">
- <a href="${layout.here_url}..">Front Page</a> |
- Index
- <tal:block condition="show_trash"> |
- <a href="${layout.here_url}../trash">Trash</a>
- </tal:block>
- </span>
- </div>
-
-
- ${panel('wiki_lock', lock_info)}
-
- ${panel('page_title')}
-
- ${panel('list_tags')}
<div class="kbody">
<div class="filter karl-wikitoc-header"></div>
View
@@ -185,11 +185,11 @@ def followed_chatter(context, request):
if layout is not None:
layout.add_portlet('chatter.quip_search')
info = followed_chatter_json(context, request)
- info['api'] = TemplateAPI(context, request, 'Recent Chatter')
+ info['api'] = TemplateAPI(context, request, 'Posts')
info['chatter_form_url'] = resource_url(find_chatter(context), request,
'add_chatter.html')
info['context_tools'] = get_context_tools(request)
- info['page_title'] = 'Chatter: Recent Chatter'
+ info['page_title'] = 'Chatter: Posts'
return info
@@ -591,7 +591,7 @@ def following(context, request):
'members': following,
'context_tools': get_context_tools(request, selected='following'),
'chatter_url': chatter_url,
- 'page_title': 'Chatter: following'
+ 'page_title': 'Chatter: Following'
}
Oops, something went wrong.

0 comments on commit b1df906

Please sign in to comment.