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

Fixing bookmarklet, moving endlne fleuron, adding load-line, archviing Jammit.

Browse source
This commit is contained in:
Samuel Clay 2022-01-05 11:18:31 -05:00
parent 04c62b11c7
commit 76ffe7bb8a
8 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ansible/playbooks/deploy_app.yml
View file

@ -76,7 +76,7 @@
amazon.aws.aws_s3:
bucket: newsblur_backups
object: /static_py3.tgz
dest: /srv/newsblur/static/static.tgz
dest: /srv/newsblur/static.tgz
mode: get
overwrite: different
aws_access_key: "{{ lookup('ini', 'aws_access_key_id section=default file=/srv/secrets-newsblur/keys/aws.s3.token') }}"

3
apps/reader/views.py
View file

@ -846,10 +846,9 @@ def load_single_feed(request, feed_id):
# if not usersub and feed.num_subscribers <= 1:
# data = dict(code=-1, message="You must be subscribed to this feed.")
# time.sleep(random.randint(1, 3))
if delay and user.is_staff:
# import random
# time.sleep(random.randint(2, 7) / 10.0)
# time.sleep(random.randint(1, 10))
time.sleep(delay)
# if page == 1:
# time.sleep(1)

0
utils/jammit.py → archive/jammit.py
View file

2
media/js/newsblur/views/story_list_view.js
View file

@ -329,7 +329,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
var $feed_scroll = NEWSBLUR.reader.$s.$feed_scroll;
this.$('.NB-end-line').remove();
var $endline = $.make('div', { className: "NB-end-line NB-short" });
var $endline = $.make('div', { className: "NB-end-line NB-load-line NB-short" });
$endline.css({'background': '#FFF'});
$feed_scroll.append($endline);
},

6
media/js/newsblur/views/story_titles_view.js
View file

@ -198,7 +198,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
var $story_titles = this.$story_titles;
this.$('.NB-end-line').remove();
var $endline = $.make('div', { className: "NB-end-line NB-short" });
var $endline = $.make('div', { className: "NB-end-line NB-load-line NB-short" });
$endline.css({'background': '#FFF'});
this.$el.append($endline);
@ -266,9 +266,9 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
var empty_space = pane_height - last_story_height - endbar_height;
if (empty_space > 0) endbar_height += empty_space + 1;
endbar_height /= 2; // Splitting padding between top and bottom
// endbar_height /= 2; // Splitting padding between top and bottom
$end_stories_line.css('paddingBottom', endbar_height);
$end_stories_line.css('paddingTop', endbar_height);
// $end_stories_line.css('paddingTop', endbar_height);
// console.log(["endbar height list", endbar_height, empty_space, pane_height, last_story_height]);
}

2
newsblur_web/docker_local_settings.py
View file

@ -22,7 +22,7 @@ DOCKERBUILD = True
DEBUG = False
# DEBUG = True
DEBUG_ASSETS = False
# DEBUG_ASSETS = True
DEBUG_ASSETS = True
DEBUG_QUERIES = DEBUG
DEBUG_QUERIES_SUMMARY_ONLY = True
MEDIA_URL = '/media/'

6
templates/api/share_bookmarklet.js
View file

@ -1,10 +1,10 @@
{% load bookmarklet_includes utils_tags %}
{% load utils_tags %}
(function() {
window.NEWSBLUR = window.NEWSBLUR || {};
var exports = undefined;
{% include_bookmarklet_js %}
{% include_javascripts "bookmarklet" %}
NEWSBLUR.Bookmarklet = function(options) {
var defaults = {};
@ -634,7 +634,7 @@
},
attach_css: function() {
var css = "{% include_bookmarklet_css %}";
var css = '{% include_stylesheets "bookmarklet" %}';
var style = '<style id="newsblur_bookmarklet_css">' + css + '</style>';
if ($('#newsblur_bookmarklet_css').length) {
$('#newsblur_bookmarklet_css').replaceWith(style);

13
utils/templatetags/bookmarklet_includes.py
View file

@ -1,13 +0,0 @@
from django.conf import settings
from django import template
from django.utils.safestring import mark_safe
register = template.Library()
@register.simple_tag
def include_bookmarklet_js():
return mark_safe(settings.JAMMIT.render_code('javascripts', 'bookmarklet'))
@register.simple_tag
def include_bookmarklet_css():
return mark_safe(settings.JAMMIT.render_code('stylesheets', 'bookmarklet'))