antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 9 Projects Releases 9 Wiki Activity Actions

Moved top stories into stories section

Browse source
This commit is contained in:
Tobi Schäfer 2014-12-17 23:56:44 +01:00
parent 73089d0658
commit 0df3fae9c4
3 changed files with 13 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/Site/Site.skin
View file

@ -27,7 +27,6 @@ prefix="Last update: " default="None so far" %>)</span></li>
<% site.link edit <% gettext Settings prefix="<i class='uk-icon-cog'></i> " %> prefix=<li> suffix=</li> %>
<% site.layout.link main <% gettext Layout %> prefix=<li> suffix=</li> %>
<% site.link referrers <% gettext Referrers %> prefix=<li> suffix=</li> %>
<% site.stories.link top <% gettext "Top Stories" %> prefix=<li> suffix=</li> %>
<li class='uk-nav-divider'></li>
<li><% root.title | root.link %></li>

26
code/Stories/$Stories.skin
View file

@ -1,10 +1,11 @@
<% #main %>
<h1><% response.title %></h1>
<div class="ample">
<% stories.link create <% gettext "Add Story" %> %>
</div>
<h1>
<% response.title %>
<% stories.link create ' ' class='uk-icon-button uk-icon-plus uk-text-middle' %>
</h1>
<% stories.link main <% gettext "By {0}" <% membership.name %> %> %>
<% stories.link closed <% gettext Closed %> prefix=" | " %>
<% stories.link top <% gettext Top %> prefix=" | " %>
<% stories.link all <% gettext All %> prefix=" | " %>
<% response.pager %>
<table class='uk-table uk-table-striped uk-table-hover uk-table-condensed'>
@ -25,23 +26,6 @@
</table>
<% response.pager %>
<% #top %>
<p class="storyTitle"><% response.title %></p>
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td></td>
<td rowspan="999"> </td>
<td align="right" class="small"><% gettext Count %></td>
<td rowspan="999"> </td>
<td class="small"><% gettext Date %></td>
<td rowspan="999"> </td>
<td class="small"><% gettext Story %></td>
<td rowspan="999"> </td>
<td class="small"><% gettext Author %></td>
</tr>
<% stories.list top %>
</table>
<% #macros %>
<p class="small">
<b>Available Macros:</b><br>

21
code/Stories/Stories.js
View file

@ -66,10 +66,8 @@ Stories.prototype.getPermission = function(action) {
Stories.prototype.main_action = function() {
var stories = User.getMembership().stories;
res.data.list = renderList(stories, '$Story#listItem',
25, req.queryParams.page);
res.data.pager = renderPager(stories,
this.href(), 25, req.queryParams.page);
res.data.list = renderList(stories, '$Story#listItem', 25, req.queryParams.page);
res.data.pager = renderPager(stories, this.href(), 25, req.queryParams.page);
res.data.title = gettext('Stories by {0}', session.user.name);
res.data.body = this.renderSkinAsString('$Stories#main');
this._parent.renderSkin('Site#page');
@ -92,7 +90,6 @@ Stories.prototype.create_action = function() {
app.log(ex);
}
}
res.data.title = gettext('Add Story');
res.data.action = this.href(req.action);
HopObject.confirmConstructor(Story);
@ -102,10 +99,8 @@ Stories.prototype.create_action = function() {
}
Stories.prototype.closed_action = function() {
res.data.list = renderList(this.closed,
'$Story#listItem', 25, req.queryParams.page);
res.data.pager = renderPager(this.closed,
this.href(req.action), 25, req.queryParams.page);
res.data.list = renderList(this.closed, '$Story#listItem', 25, req.queryParams.page);
res.data.pager = renderPager(this.closed, this.href(req.action), 25, req.queryParams.page);
res.data.title = gettext('Closed Stories');
res.data.body = this.renderSkinAsString('$Stories#main');
this._parent.renderSkin('Site#page');
@ -114,17 +109,17 @@ Stories.prototype.closed_action = function() {
Stories.prototype.all_action = function() {
res.data.list = renderList(this, '$Story#listItem', 25, req.queryParams.page);
res.data.pager = renderPager(this,
this.href(req.action), 25, req.queryParams.page);
res.data.title = gettext('All Stories');
res.data.pager = renderPager(this, this.href(req.action), 25, req.queryParams.page);
res.data.title = gettext('Stories');
res.data.body = this.renderSkinAsString('$Stories#main');
this._parent.renderSkin('Site#page');
return;
}
Stories.prototype.top_action = function() {
res.data.list = renderList(this.top, '$Story#listItem', 25);
res.data.title = gettext('Top Stories');
res.data.body = this.renderSkinAsString('$Stories#top');
res.data.body = this.renderSkinAsString('$Stories#main');
this._parent.renderSkin('Site#page');
return;
}