gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper

Browse source
This commit is contained in:
raluka 2015-09-21 15:56:57 +02:00
parent 5790d99fac
commit f7c70ba55c
7 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/osem.css.scss
View file

@ -72,3 +72,13 @@ p.comment-body {
#account-already {
font-size: 0.6em;
}
/* comments views pane: use padding-bottom before next comment box */
.panel.panel-default .panel-body .box {
padding-bottom: 20px;
}
/* comments views pane: use padding-bottom after each comment */
.panel.panel-default .panel-body .box p {
padding-bottom: 20px;
}

2
app/helpers/application_helper.rb
View file

@ -280,6 +280,6 @@ module ApplicationHelper
end
def unread_notifications(user)
Comment.accessible_by(current_ability).find_since_last_login(user).limit(5)
Comment.accessible_by(current_ability).find_since_last_login(user)
end
end

22
app/views/admin/comments/_all_comments.html.haml
View file

@ -1,16 +1,12 @@
- @comments.each do |conference, events|
.well
%p.h4= conference.title
.panel.panel-default
.panel-heading
%h4.title.panel-title= conference.title
.panel-body
- events.each do |event, comments|
%h3.title
= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%body
- comments.each do |comment|
.box
%h4.title= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%hr
%ul.list-unstyled
%ul.list-inline
%li
%h5.strong Posted by: #{comment.user.name}
%li
%h5.strong Created at: #{comment.created_at}
%li= comment.body
- comments.each do |comment|
%h5.strong Posted by: #{comment.user.name} | Created at: #{comment.created_at}
%p= comment.body

20
app/views/admin/comments/_posted_comments.html.haml
View file

@ -1,16 +1,12 @@
- @posted_comments.each do |conference, events|
.well
%p.h4= conference.title
.panel.panel-default
.panel-heading
%h4.title.panel-title= conference.title
.panel-body
- events.each do |event, comments|
%h3.title
= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%body
- comments.each do |comment|
.box
%h4.title= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%hr
%ul.list-unstyled
%ul.list-inline
%li
%h5.strong Posted by: #{comment.user.name}
%li
- comments.each do |comment|
%h5.strong Created at: #{comment.created_at}
%li= comment.body
%p= comment.body

22
app/views/admin/comments/_unread_comments.html.haml
View file

@ -1,16 +1,12 @@
- @unread_comments.each do |conference, events|
.well
%p.h4= conference.title
.panel.panel-default
.panel-heading
%h4.title.panel-title= conference.title
.panel-body
- events.each do |event, comments|
%h3.title
= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%body
- comments.each do |comment|
.box
%h4.title= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
%hr
%ul.list-unstyled
%ul.list-inline
%li
%h5.strong Posted by: #{comment.user.name}
%li
%h5.strong Created at: #{comment.created_at}
%li= comment.body
- comments.each do |comment|
%h5.strong Posted by: #{comment.user.name} | Created at: #{comment.created_at}
%p= comment.body

19
app/views/admin/comments/index.html.haml
View file

@ -1,23 +1,24 @@
%h1 Comments
%br
.row
.col-lg-12
.col-md-12
%ul.nav.nav-tabs#commentsTable
%li.active
%a{:href=>"#unread_comments", "data-toggle"=>"tab"}
%span.fa.fa-comment
Unread comments
%li
%a{:href=>"#all_comments", "data-toggle"=>"tab"}
%span.fa.fa-comments-o
Comments
Unread
%li
%a{:href=>"#posted_comments", "data-toggle"=>"tab"}
%span.fa.fa-pencil
Posted Comments
Posted
%li
%a{:href=>"#all_comments", "data-toggle"=>"tab"}
%span.fa.fa-comments-o
All
.tab-content
.tab-pane.active#unread_comments
= render partial: 'unread_comments'
.tab-pane#all_comments
= render partial: 'all_comments'
.tab-pane#posted_comments
= render partial: 'posted_comments'
.tab-pane#all_comments
= render partial: 'all_comments'

14
app/views/layouts/_navigation.html.haml
View file

@ -28,17 +28,19 @@
- if can? :index, Comment
%ul.nav.navbar-nav.navbar-right
%li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "unread-comments-preview"}
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
- if unread_notifications(current_user)
Notifications (#{unread_notifications(current_user).length})
%span.fa.fa-comment
%b.caret
%ul.dropdown-menu
- unread_notifications(current_user).limit(5).each do |unread_comment|
%li= link_to("New comment for: #{unread_comment.commentable.title}", admin_conference_event_path(unread_comment.commentable.conference.short_title, unread_comment.commentable_id))
- if unread_notifications(current_user).length > 0
%li.dropdown-header Last 5 Comments for:
- unread_notifications(current_user).limit(5).group_by{ |comment| comment.commentable}.each do |event, comments|
%li= link_to("#{event.title}(#{comments.count})", admin_conference_event_path(event.conference.short_title, event.id))
%li.divider
%li= link_to 'See comments', admin_comments_path
-else
No Notifications
%li= link_to "See all unread Comments (#{unread_notifications(current_user).length})", admin_comments_path
%li= link_to 'See all Comments', admin_comments_path(anchor: 'all_comments')
- else
%ul.nav.navbar-nav.navbar-right
- if CONFIG['authentication']['ichain']['enabled']