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

Merge branch 'django1.7' into django1.8

Browse source 
* django1.7:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
This commit is contained in:
Samuel Clay 2020-07-07 15:56:04 -04:00
commit b9bf48fa14
5 changed files with 100 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/requirements.txt
View file

@ -24,7 +24,7 @@ dnspython==1.15.0
Fabric==1.14.0
gunicorn==19.7
hiredis==0.2.0
httplib2==0.17.4
httplib2==0.18.1
image==1.5.27
isodate==0.5.4
lxml==3.6.4

17
media/css/welcome.css
View file

@ -52,6 +52,18 @@
position: relative;
height: 100%;
}
.NB-welcome .NB-inner-account {
width: 960px;
margin: 0 auto;
overflow: hidden;
position: absolute;
top: 0;
height: 100%;
margin-right: -50%;
left: 50%;
transform: translate(-50%, 0);
pointer-events: none;
}
.NB-button {
border: 1px solid #07360F;
font-size: 12px;
@ -81,6 +93,7 @@
/* ========== */
.NB-welcome-header {
position: relative;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#3F5354), to(#1B2424));
background: -moz-linear-gradient(center top , #3F5354 0%, #1B2424 100%) repeat scroll 0 0 transparent;
height: 420px;
@ -274,7 +287,9 @@
/* ================== */
.NB-welcome-header-account {
pointer-events: all;
position: absolute;
transition: bottom 1s ease-in-out;
bottom: -350px;
right: 12px;
width: 400px;
@ -284,7 +299,7 @@
padding: 36px 36px 12px;
}
.NB-welcome-header-account.NB-active {
bottom: 0;
bottom: 0px;
}
.NB-welcome-header-account .NB-module-header-login {
width: 142px;

42
media/js/newsblur/welcome/welcome.js
View file

@ -15,14 +15,28 @@ NEWSBLUR.Welcome = Backbone.View.extend({
initialize: function() {
this.start_rotation();
this.debug_password_autocomplete();
_.delay(_.bind(function() {
// this.debug_password_autocomplete();
}, this), 500);
NEWSBLUR.reader.$s.$layout.hide();
},
debug_password_autocomplete: function() {
console.log(['Triggering focus']);
this.$("input[name=login-username]").trigger('focus');
},
// ==========
// = Header =
// ==========
fix_misalignment: function(e) {
console.log(['Fixing misalignment', e]);
this.flags.on_signin = true;
this.show_signin_form();
},
click_header_caption: function(e) {
this.flags.on_signin = false;
this.enter_header_caption(e);
@ -55,11 +69,16 @@ NEWSBLUR.Welcome = Backbone.View.extend({
start_rotation: function() {
if (this.$('.NB-welcome-header-account').hasClass('NB-active')) {
this.show_signin_form();
this.stop_rotation();
}
this.$('.NB-welcome-header-image img').eq(0).on('load', _.bind(function() {
var $first_img = this.$('.NB-welcome-header-image img').eq(0);
if ($first_img[0].complete) {
setInterval(_.bind(this.rotate_screenshots, this), 3000);
} else {
$first_img.on('load', _.bind(function() {
setInterval(_.bind(this.rotate_screenshots, this), 3000);
}, this));
}
},
rotate_screenshots: function(force, callback) {
@ -82,7 +101,7 @@ NEWSBLUR.Welcome = Backbone.View.extend({
var $out_img = $images.not($in_img);
var $in_caption = $captions.eq(r);
var $out_caption = $captions.not($in_caption);
console.log(['Rotate screenshots', force]);
$out_img.removeClass('NB-active');
$in_img.addClass('NB-active');
@ -103,6 +122,7 @@ NEWSBLUR.Welcome = Backbone.View.extend({
},
stop_rotation: function() {
console.log(['stop_rotation']);
this.flags.on_signin = true;
},
@ -122,7 +142,13 @@ NEWSBLUR.Welcome = Backbone.View.extend({
_.delay(_.bind(function() {
this.rotate_screenshots(4, _.bind(function() {
_.delay(_.bind(function() {
if (this.$("input:focus").length) {
console.log(['Already focused']);
return;
}
this.$('input[name=login-username]').focus();
}), 50);
}, this));
}, this), open ? 560 : 0);
@ -138,7 +164,7 @@ NEWSBLUR.Welcome = Backbone.View.extend({
}
var open = NEWSBLUR.reader.toggle_sidebar();
this.$('.NB-inner').animate({
this.$('.NB-inner,.NB-inner-account').animate({
paddingLeft: open ? 240 : 0
}, {
queue: false,
@ -154,7 +180,7 @@ NEWSBLUR.Welcome = Backbone.View.extend({
NEWSBLUR.reader.close_sidebar();
this.$('.NB-inner').animate({
this.$('.NB-inner,.NB-inner-account').animate({
paddingLeft: 0
}, {
queue: false,
@ -163,10 +189,6 @@ NEWSBLUR.Welcome = Backbone.View.extend({
});
this.$('.NB-welcome-container').removeClass('NB-welcome-tryout');
},
debug_password_autocomplete: function() {
this.$("input[name=login-username]").focus();
}
});

5
templates/reader/welcome.xhtml
View file

@ -68,6 +68,10 @@
<img src="{{ MEDIA_URL }}img/welcome/header-android.png">
</div>
</div>
<div class="NB-inner-account">
<div class="NB-welcome-header-account {% if post_request %}NB-active{% endif %}">
<div class="NB-account-header">
<div class="NB-module-header-login">Log in</div>
@ -134,7 +138,6 @@
{% endif %}
</div>
</div>
</div>
</div>
</div>

2
utils/request_introspection_middleware.py
View file

@ -7,4 +7,4 @@ class DumpRequestMiddleware:
request_data = request.POST or request.GET
request_items = request_data.items()
if request_items:
logging.debug(" ---> ~FC%s ~SN~FC%s ~SN~BC~FK%s" % (request.method, request.path, dict(request_items)))
logging.debug(" ---> ~FC%s ~SN~FC%s ~SN~BC~FK%s~BK~FC %s" % (request.method, request.path, dict(request_items), request.COOKIES))