Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

moved new thread btn to top, sticky/locked topics are marked

Browse Source
This commit is contained in:
jomo
2014-04-21 14:43:43 +02:00
parent 4458f341d4
commit 8f2ea31272
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/stylesheets/screen.css.scss
View File

@@ -559,23 +559,17 @@ and (min-width: 0px) //TODO
display: block; display: block;
padding: 0.5em; padding: 0.5em;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
&.locked:after { &.locked:before {
background-image: url(image_path('/assets/lock.png')); content: "(locked) ";
width: 20px; color: #000;
height: 20px;
display: inline-block;
} }
&.sticky:after { &.sticky:before {
background-image: url(image_path('/assets/pin.png')); content: "(sticky) ";
width: 20px; color: #000;
height: 20px;
display: inline-block;
} }
&.sticky-locked:after { &.lockedsticky:before {
background-image: url(image_path('/assets/lock.png')); content: "(locked sticky) ";
width: 20px; color: #000;
height: 20px;
display: inline-block;
} }
&.content { &.content {
.headline { .headline {

10
app/views/forums/show.html.erb
View File

@@ -1,6 +1,9 @@
<%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum %> <%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum %>
<h1><%= @forum %></h1> <h1><%= @forum %></h1>
<% if @forum.can_write?(current_user) %>
<p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
<% end %>
<div id="forum_groups"> <div id="forum_groups">
<% @threads.each do |thread| %> <% @threads.each do |thread| %>
<div class="item-group with-avatar" id="thread-<%= thread.id %>"> <div class="item-group with-avatar" id="thread-<%= thread.id %>">
@@ -12,11 +15,8 @@
</span> </span>
</div> </div>
<div class="items bold"> <div class="items bold">
<%= link_to thread.title, forumthread_path(thread), class: "item#{" locked" if thread.locked}#{" sticky" if thread.sticky}" %> <%= link_to thread.title, forumthread_path(thread), class: "item #{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
<% if @forum.can_write?(current_user) %>
<p><%= link_to "New thread", new_forumthread_path(forum: @forum), class: "btn blue" %></p>
<% end %>