public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding readfilter and order to feedbar. Also fixing misaligned manage menus.

Browse source
This commit is contained in:
Samuel Clay 2013-01-25 16:18:30 -08:00
parent ba6f4ff580
commit ca1c7f8065
3 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
media/css/reader.css
View file

@ -1064,8 +1064,10 @@ background: transparent;
font-weight: bold;
font-size: 16px;
padding: 2px 208px 2px 4px;
background: #dadada url('/media/css/jquery-ui/images/dadada_40x100_textures_03_highlight_soft_75.png') 0 50% repeat-x;
border-bottom: 2px solid #404040;
background-image: -webkit-gradient(linear, left top, left bottom, from(#FEFEFE), to(#F3F4EF));
background-image: -moz-linear-gradient(center top , #FEFEFE 0%, #F3F4EF 100%);
background-image: linear-gradient(top, #FEFEFE, #F3F4EF);
border-bottom: 1px solid #C2C5BE;
position: relative;
overflow: hidden;
}
@ -1086,6 +1088,28 @@ background: transparent;
/* float: left;*/
display: block;
margin-left: 24px;
color: #40413E;
text-shadow: 0 1px 0 rgba(255, 255, 255, .8);
}
#story_titles .NB-feedbar .NB-feedbar-option {
color: rgba(0, 0, 0, .5);
border: 1px solid rgba(0, 0, 0, .1);
border-radius: 16px;
text-transform: uppercase;
font-size: 10px;
padding: 0 4px 0 8px;
line-height: 14px;
margin: 0 0 -2px 6px;
position: relative;
display: inline-block;
cursor: pointer;
}
#story_titles .NB-feedbar .NB-feedbar-option .NB-icon {
float: right;
width: 16px;
height: 12px;
background: transparent url('/media/embed/icons/silk/bullet_arrow_down.png') no-repeat 0 -1px;
margin: 0 0 0 4px;
}
#story_titles .NB-feedbar .NB-feedbar-settings {

16
media/js/newsblur/reader/reader.js
View file

@ -3076,36 +3076,36 @@
$('.NB-task-manage').parents('.NB-taskbar').css('z-index', 2);
if (type == 'site') {
$manage_menu_container.align($('.NB-task-manage'), 'top -left', {
'top': -32,
'top': 0,
'left': -2
});
$('.NB-task-manage').addClass('NB-hover');
$manage_menu_container.corner('tl tr 8px');
} else if (type == 'feed' || type == 'folder' || type == 'story' || type == 'socialfeed') {
var left, top;
// NEWSBLUR.log(['menu open', $item, inverse, toplevel, type]);
NEWSBLUR.log(['menu open', $item, inverse, toplevel, type]);
if (inverse) {
var $align = $item;
if (type == 'feed') {
left = toplevel ? 2 : -20;
top = toplevel ? 21 : 21;
top = toplevel ? 1 : 1;
} else if (type == 'socialfeed') {
left = toplevel ? 2 : -20;
top = toplevel ? 21 : 21;
left = 2;
top = 1;
} else if (type == 'folder') {
left = toplevel ? 0 : -20;
top = toplevel ? 23 : 24;
top = toplevel ? 1 : 2;
$align = $('.folder_title', $item);
} else if (type == 'story') {
left = 4;
top = 24 ;
top = 2;
$align = $('.NB-story-manage-icon,.NB-feed-story-manage-icon', $item);
if (!$align.is(':visible')) {
$align = $('.NB-storytitles-sentiment', $item);
}
}
$manage_menu_container.align($align, 'top -left', {
$manage_menu_container.align($align, 'bottom -left', {
'top': -1 * top,
'left': left
});

9
media/js/newsblur/views/feed_title_view.js
View file

@ -73,6 +73,14 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
<% } %>\
<%= feed.get("feed_title") %>\
<% if (type == "story") { %>\
<span class="NB-feedbar-option NB-feedbar-readfilter">\
<div class="NB-icon"></div>\
<%= NEWSBLUR.assets.view_setting(feed.id, "read_filter") %>\
</span>\
<span class="NB-feedbar-option NB-feedbar-order">\
<div class="NB-icon"></div>\
<%= NEWSBLUR.assets.view_setting(feed.id, "order") %>\
</span>\
<span class="NB-feedbar-settings" title="Site settings"></span>\
<% } %>\
</span>\
@ -256,6 +264,7 @@ NEWSBLUR.Views.FeedTitleView = Backbone.View.extend({
e.preventDefault();
e.stopPropagation();
if (this.options.type == "story") return;
if ($('.NB-modal-feedchooser').is(':visible')) return;
NEWSBLUR.reader.mark_feed_as_read(this.model.id);