Commit d4b28ad00b5ff5db930e17cc46399e9470e25629
1 parent
74f0b543
Exists in
master
and in
11 other branches
proposals_discussion: improve proposal visualization
Showing
2 changed files
with
23 additions
and
8 deletions
Show diff stats
public/style.css
| @@ -150,7 +150,7 @@ form .proposals-discussion-plugin .body textarea { | @@ -150,7 +150,7 @@ form .proposals-discussion-plugin .body textarea { | ||
| 150 | #content #article .topic-item h2, #content #article .article-body-proposals-discussion-plugin_topic h2, | 150 | #content #article .topic-item h2, #content #article .article-body-proposals-discussion-plugin_topic h2, |
| 151 | #content #article .topic h2, | 151 | #content #article .topic h2, |
| 152 | #content .topic .topic-title h2 { | 152 | #content .topic .topic-title h2 { |
| 153 | - background-color: #C4C4C4; | 153 | + background-color: #BDBDBD; |
| 154 | margin: 0; | 154 | margin: 0; |
| 155 | } | 155 | } |
| 156 | 156 | ||
| @@ -233,3 +233,19 @@ form .proposals-discussion-plugin .body textarea { | @@ -233,3 +233,19 @@ form .proposals-discussion-plugin .body textarea { | ||
| 233 | vertical-align: middle; | 233 | vertical-align: middle; |
| 234 | padding: 4px 0 4px 4px; | 234 | padding: 4px 0 4px 4px; |
| 235 | } | 235 | } |
| 236 | + | ||
| 237 | +#content .article-body.article-body-proposals-discussion-plugin_proposal .body { | ||
| 238 | + clear: both; | ||
| 239 | + padding-top: 10px; | ||
| 240 | +} | ||
| 241 | +#content .article-body.article-body-proposals-discussion-plugin_proposal .abstract { | ||
| 242 | + width: 50%; | ||
| 243 | + float: right; | ||
| 244 | +} | ||
| 245 | +#content .article-body.article-body-proposals-discussion-plugin_proposal .abstract .content { | ||
| 246 | + font-style: italic; | ||
| 247 | + color: rgb(70, 70, 70); | ||
| 248 | +} | ||
| 249 | +#content .article-body.article-body-proposals-discussion-plugin_proposal .discussion { | ||
| 250 | + color: gray; | ||
| 251 | +} |
views/content_viewer/proposal.html.erb
| 1 | +<span class="created-at"> | ||
| 2 | + <span class="date"><%= show_date(proposal.published_at) %></span> | ||
| 3 | + <span class="author"><%= _(", by %s") % (proposal.author ? link_to(proposal.author_name, proposal.author_url) : proposal.author_name) %></span> | ||
| 4 | + <span class="comments"><%= _(" - %s") % link_to_comments(proposal) %></span> | ||
| 5 | +</span> | ||
| 6 | + | ||
| 1 | <div class="discussion"> | 7 | <div class="discussion"> |
| 2 | <h5><%= proposal.topic.discussion.title %> </h5> | 8 | <h5><%= proposal.topic.discussion.title %> </h5> |
| 3 | </div> | 9 | </div> |
| @@ -8,18 +14,11 @@ | @@ -8,18 +14,11 @@ | ||
| 8 | <%= topic_title proposal.topic %> | 14 | <%= topic_title proposal.topic %> |
| 9 | </div> | 15 | </div> |
| 10 | 16 | ||
| 11 | -<div class="title"> | ||
| 12 | - <h5><%= _('Title') %></h4> | ||
| 13 | - <div class="content"><%= proposal.title %></div> | ||
| 14 | -</div> | ||
| 15 | - | ||
| 16 | <div class="abstract"> | 17 | <div class="abstract"> |
| 17 | - <h5><%= _('Abstract') %></h4> | ||
| 18 | <div class="content"><%= proposal.abstract %></div> | 18 | <div class="content"><%= proposal.abstract %></div> |
| 19 | </div> | 19 | </div> |
| 20 | 20 | ||
| 21 | <div class="body"> | 21 | <div class="body"> |
| 22 | - <h5><%= proposal.topic.discussion.custom_body_label %></h4> | ||
| 23 | <div class="content"><%= proposal.body %></div> | 22 | <div class="content"><%= proposal.body %></div> |
| 24 | </div> | 23 | </div> |
| 25 | 24 |