Permalink
Browse files

Fixed some duplications on topics show

  • Loading branch information...
1 parent c896270 commit 649451b92906ff2da490036d428c224edd06cb12 @brodock brodock committed Dec 22, 2011
Showing with 9 additions and 23 deletions.
  1. +9 −23 app/views/topics/show.html.erb
@@ -1,29 +1,17 @@
<% @page_title = @topic.title %>
<% @monitoring = logged_in? && Monitorship.where(:user_id => current_user.id, :topic_id => @topic.id, :active => true).present? %>
-<% content_for :right do %>
-
-<h5><%= I18n.t 'txt.voices', :default => 'Voices' %></h5>
-<ul class="flat talking">
-<% @topic.voices.each do | user | %>
- <li><%= link_to user.display_name, user_path(user) %></li>
-<% end %>
-</ul>
-
-
-<% end # right content %>
-
<% if logged_in? %>
-<%= form_tag monitorship_path(@forum, @topic), :style => 'margin-top:0em; float:right;' do %>
-<div>
- <input id="monitor_checkbox" type="checkbox" <%= "checked='checked'" if @monitoring %>
- onclick="if (this.checked) {<%= remote_function :url => monitorship_path(@forum, @topic) %>} else {<%= remote_function :url => monitorship_path(@forum, @topic), :method => :delete %>}" />
- <label id="monitor_label" for="monitor_checkbox"><%= @monitoring ? I18n.t('txt.monitoring_topic', :default => 'Monitoring topic') : I18n.t('txt.monitor_topic', :default => 'Monitor topic') %></label>
- <%= hidden_field_tag '_method', 'delete' if @monitoring %>
- <%= submit_tag :Set, :id => 'monitor_submit' %>
-</div>
-<% end %>
+ <%= form_tag monitorship_path(@forum, @topic), :style => 'margin-top:0em; float:right;' do %>
+ <div>
+ <input id="monitor_checkbox" type="checkbox" <%= "checked='checked'" if @monitoring %>
+ onclick="if (this.checked) {<%= remote_function :url => monitorship_path(@forum, @topic) %>} else {<%= remote_function :url => monitorship_path(@forum, @topic), :method => :delete %>}"/>
+ <label id="monitor_label" for="monitor_checkbox"><%= @monitoring ? I18n.t('txt.monitoring_topic', :default => 'Monitoring topic') : I18n.t('txt.monitor_topic', :default => 'Monitor topic') %></label>
+ <%= hidden_field_tag '_method', 'delete' if @monitoring %>
+ <%= submit_tag :Set, :id => 'monitor_submit' %>
+ </div>
+ <% end %>
<% end %>
@@ -142,8 +130,6 @@
</p>
<% else %>
-<p><%= link_to I18n.t('txt.reply_to_topic', :default => 'Reply to topic'), "#reply", :class => "utility", :id => 'reply-link' %></p>
-
<div id="reply" class="editbox">
<div class="container">
<%= content_tag :p, flash[:bad_reply], :class => 'notice' if flash[:bad_reply] %>

0 comments on commit 649451b

Please sign in to comment.