nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add separator between days, don't display grey zero

Browse source
This commit is contained in:
Steffen van Bergerem 2014-03-19 23:55:49 +01:00
parent 23a91eb63f
commit d9857a3a10
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/views/notifications_view.js
View file

@ -68,14 +68,14 @@ app.views.Notifications = Backbone.View.extend({
type_notes.text( function(i,text) { return parseInt(text) + change }); type_notes.text( function(i,text) { return parseInt(text) + change });
header_badge.text( function(i,text) { return parseInt(text) + change }); header_badge.text( function(i,text) { return parseInt(text) + change });
if(all_notes.text()>0){ if(all_notes.text()>0){
all_notes.addClass('badge-important'); all_notes.addClass('badge-important').removeClass('badge-default');
} else { } else {
all_notes.removeClass('badge-important'); all_notes.removeClass('badge-important').addClass('badge-default');
} }
if(type_notes.text()>0){ if(type_notes.text()>0){
type_notes.addClass('badge-important'); type_notes.addClass('badge-important').removeClass('badge-default');
} else { } else {
type_notes.removeClass('badge-important'); type_notes.removeClass('badge-important').addClass('badge-default');
} }
if(header_badge.text()>0){ if(header_badge.text()>0){
header_badge.removeClass('hidden'); header_badge.removeClass('hidden');

7
app/assets/stylesheets/notifications.css.scss
View file

@ -8,6 +8,7 @@
color: $text-dark-grey; color: $text-dark-grey;
margin-right: 5px; margin-right: 5px;
} }
.badge.badge-default { display: none; }
} }
li.active > a { li.active > a {
background-color: $background-grey; background-color: $background-grey;
@ -27,11 +28,13 @@
} }
.day_group { .day_group {
margin-bottom: 20px; margin-bottom: 10px;
padding-bottom: 10px;
border-bottom: 1px dashed $border-grey;
&:last-child { border-bottom: none; }
.date { .date {
text-align: center; text-align: center;
color: $light-grey; color: $light-grey;
margin-bottom: 5px;
.day { .day {
font-size: 40px; font-size: 40px;
line-height: 40px; line-height: 40px;

4
app/views/notifications/index.html.haml
View file

@ -6,13 +6,13 @@
%ul.nav.nav-tabs.nav-stacked %ul.nav.nav-tabs.nav-stacked
%li{ :class => ('active' unless params[:type] && @grouped_unread_notification_counts.has_key?(params[:type])) } %li{ :class => ('active' unless params[:type] && @grouped_unread_notification_counts.has_key?(params[:type])) }
%a{ :href => '/notifications' + (params[:show] == 'unread' ? '?show=unread' : '') } %a{ :href => '/notifications' + (params[:show] == 'unread' ? '?show=unread' : '') }
%span.pull-right.badge{:class => ('badge-important' if @unread_notification_count > 0)} %span.pull-right.badge{:class => (@unread_notification_count > 0 ? 'badge-important' : 'badge-default')}
= @unread_notification_count = @unread_notification_count
= t('.all_notifications') = t('.all_notifications')
- @grouped_unread_notification_counts.each do |key, count| - @grouped_unread_notification_counts.each do |key, count|
%li{ :class => ('active' if params[:type] == key), :data => { :type => key } } %li{ :class => ('active' if params[:type] == key), :data => { :type => key } }
%a{ :href => '/notifications?type=' + key + (params[:show] == 'unread' ? '&show=unread' : '') } %a{ :href => '/notifications?type=' + key + (params[:show] == 'unread' ? '&show=unread' : '') }
%span.pull-right.badge{ :class => ('badge-important' if count > 0) } %span.pull-right.badge{ :class => (count > 0 ? 'badge-important' :'badge-default') }
= count = count
- case key - case key
- when 'also_commented', 'comment_on_post' - when 'also_commented', 'comment_on_post'