Commit d88eca5a71f34283a90b003e4906f3c601f6d007
1 parent
997946d1
Exists in
master
and in
11 other branches
proposals_discussion: added topic title in proposal form
Showing
3 changed files
with
17 additions
and
2 deletions
Show diff stats
views/cms/proposals_discussion_plugin/_proposal.html.erb
| @@ -5,7 +5,14 @@ | @@ -5,7 +5,14 @@ | ||
| 5 | <% title_limit = 70 %> | 5 | <% title_limit = 70 %> |
| 6 | <% abstract_limit = 140 %> | 6 | <% abstract_limit = 140 %> |
| 7 | 7 | ||
| 8 | +<% extend ProposalsDiscussionPlugin::TopicHelper %> | ||
| 9 | + | ||
| 8 | <div class="proposals-discussion-plugin"> | 10 | <div class="proposals-discussion-plugin"> |
| 11 | + | ||
| 12 | + <div class="topic"> | ||
| 13 | + <%= topic_title @article.topic %> | ||
| 14 | + </div> | ||
| 15 | + | ||
| 9 | <div class="title"> | 16 | <div class="title"> |
| 10 | <%= required labelled_form_field _('Title'), limited_text_area(:article, :name, title_limit, 'title_textarea', :rows => 1) %> | 17 | <%= required labelled_form_field _('Title'), limited_text_area(:article, :name, title_limit, 'title_textarea', :rows => 1) %> |
| 11 | </div> | 18 | </div> |
views/content_viewer/topic.html.erb
| @@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
| 4 | <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %> | 4 | <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %> |
| 5 | <% end %> | 5 | <% end %> |
| 6 | 6 | ||
| 7 | -<div class="topic-color" style="background-color: <%= topic.color %>;"></div> | ||
| 8 | -<h2><%= link_to topic.title, topic.view_url %></h2> | 7 | +<% extend ProposalsDiscussionPlugin::TopicHelper %> |
| 8 | +<%= topic_title topic %> | ||
| 9 | 9 | ||
| 10 | <div class="topic-content"> | 10 | <div class="topic-content"> |
| 11 | 11 |