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

Fixing notification footer on mobile. Also fixing back button on web.

Browse source
This commit is contained in:
Samuel Clay 2016-11-21 13:02:13 -08:00
parent 9d90dbb120
commit be4266de14
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -551,6 +551,7 @@
this.$s.$body.removeClass('NB-show-reader');
if (!skip_router) {
NEWSBLUR.log(["Navigating to splash"]);
NEWSBLUR.router.navigate('');
}
},
@ -1506,10 +1507,10 @@
this.flags['select_story_in_feed'] = story;
}
if (window.history.replaceState && !$.getQueryString('test')) {
// In case this needs to be found again: window.location.href = BACKBONE
window.history.replaceState({}, null, '/');
}
// if (window.history.replaceState && !$.getQueryString('test')) {
// // In case this needs to be found again: window.location.href = BACKBONE
// window.history.replaceState({}, null, '/');
// }
},
set_correct_story_view_for_feed: function(feed_id, view) {
@ -1820,6 +1821,7 @@
if (!options.silent) {
var url = "/read";
if (window.location.pathname != url) {
NEWSBLUR.log(["Navigating to url", url]);
NEWSBLUR.router.navigate(url);
}
}

1
media/js/newsblur/views/feed_list_view.js
View file

@ -214,6 +214,7 @@ NEWSBLUR.Views.FeedList = Backbone.View.extend({
load_url_next_param: function(route_found) {
var next = $.getQueryString('next') || $.getQueryString('test');
console.log(['load_url_next_param', next, route_found]);
if (next == 'optout') {
NEWSBLUR.reader.open_account_modal({'animate_email': true});
} else if (next == 'goodies') {

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

@ -75,7 +75,7 @@ NEWSBLUR.Views.StoryTabView = Backbone.View.extend({
NEWSBLUR.app.taskbar_info.hide_stories_error();
this.$iframe.empty();
this.$iframe.removeAttr('src').attr({src: 'about:blank'});
this.$iframe.removeAttr('src');//.attr({src: 'about:blank'});
},
show_explainer_single_story_mode: function() {

1
media/js/vendor/backbone-1.0.0.js vendored
View file

@ -1464,6 +1464,7 @@
// route callback be fired (not usually desirable), or `replace: true`, if
// you wish to modify the current URL without adding an entry to the history.
navigate: function(fragment, options) {
console.log(['backbone navigate', fragment, options]);
if (!History.started) return false;
if (!options || options === true) options = {trigger: options};
fragment = this.getFragment(fragment || '');

4
templates/mail/email_base.xhtml
View file

@ -141,6 +141,7 @@
}
.content-td img {
margin: 17px 0 0;
max-width: 100%;
}
@ -198,6 +199,9 @@
.content-td {
padding: 30px 15px !important;
}
.content-td.content-td-footer {
padding: 0 12px 15px !important;
}
.content-td h1 {
margin-bottom: 5px;
}

2
templates/mail/email_story_notification.xhtml
View file

@ -25,7 +25,7 @@
{% block footer %}
<tr>
<td class="comment_body_td content-td" style="-webkit-background-clip: padding-box; -webkit-border-radius: 0 0 3px 3px; background: white; background-clip: padding-box; border-radius: 0 0 3px 3px; box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.05); color: #525252; font-family: 'Helvetica Neue',Arial,sans-serif; font-size: 15px; line-height: 22px; overflow: hidden; padding: 0 0 12px;" bgcolor="white">
<td class="comment_body_td content-td content-td-footer" style="-webkit-background-clip: padding-box; -webkit-border-radius: 0 0 3px 3px; background: white; background-clip: padding-box; border-radius: 0 0 3px 3px; box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.05); color: #525252; font-family: 'Helvetica Neue',Arial,sans-serif; font-size: 15px; line-height: 22px; overflow: hidden; padding: 0 40px 12px;" bgcolor="white">
<p style="font-size:12px;text-align: center;">
You received this because you have <a href="http://{% current_domain %}/site/{{ feed.pk }}/{{ feed_title|slugify }}?next=notifications" style="text-decoration:none;">email notifications for {{ feed_title }}</a>.
</p>