From 7ba3cfd473eb7e9671e717ec23f1af5a7ffde3bb Mon Sep 17 00:00:00 2001 From: raluka Date: Thu, 3 Sep 2015 17:03:05 +0200 Subject: [PATCH] event title and conference title in 2 different lines now in view --- app/views/admin/comments/_all_comments.html.haml | 5 +++-- app/views/admin/comments/_posted_comments.html.haml | 5 +++-- app/views/admin/comments/_unread_comments.html.haml | 5 +++-- app/views/layouts/_unread_comment.html.haml | 2 -- 4 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 app/views/layouts/_unread_comment.html.haml diff --git a/app/views/admin/comments/_all_comments.html.haml b/app/views/admin/comments/_all_comments.html.haml index 3ad58e89..004c0606 100644 --- a/app/views/admin/comments/_all_comments.html.haml +++ b/app/views/admin/comments/_all_comments.html.haml @@ -5,8 +5,9 @@ %panel %panel.panel-header %h4.title - = link_to event.title, admin_conference_event_path(event.conference.short_title, event) - = conference.title + %ul.list-unstyled + %li= link_to event.title, admin_conference_event_path(event.conference.short_title, event) + %li= conference.title %hr -event.comment_threads.each do |comment| %panel-body diff --git a/app/views/admin/comments/_posted_comments.html.haml b/app/views/admin/comments/_posted_comments.html.haml index 3cdc2102..3c49d82c 100644 --- a/app/views/admin/comments/_posted_comments.html.haml +++ b/app/views/admin/comments/_posted_comments.html.haml @@ -5,8 +5,9 @@ %panel %panel.panel-header %h4.title - = link_to event.title, admin_conference_event_path(event.conference.short_title, event) - = conference.title + %ul.list-unstyled + %li= link_to event.title, admin_conference_event_path(event.conference.short_title, event) + %li= conference.title %hr -event.comment_threads.find_comments_by_user(current_user).each do |comment| %panel-body diff --git a/app/views/admin/comments/_unread_comments.html.haml b/app/views/admin/comments/_unread_comments.html.haml index 8c58193e..e229aa78 100644 --- a/app/views/admin/comments/_unread_comments.html.haml +++ b/app/views/admin/comments/_unread_comments.html.haml @@ -5,8 +5,9 @@ %panel %panel.panel-header %h4.title - = link_to event.title, admin_conference_event_path(event.conference.short_title, event) - = conference.title + %ul.list-unstyled + %li= link_to event.title, admin_conference_event_path(event.conference.short_title, event) + %li= conference.title %hr -event.comment_threads.find_since_last_login(current_user).each do |comment| %panel-body diff --git a/app/views/layouts/_unread_comment.html.haml b/app/views/layouts/_unread_comment.html.haml deleted file mode 100644 index d337df5c..00000000 --- a/app/views/layouts/_unread_comment.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -%li= link_to("New comment for: #{unread_comment.commentable.title}", admin_conference_event_path(unread_comment.commentable.conference.short_title, unread_comment.commentable_id)) -