From 020a0871bd88ec7111b26a49df338946b96d45b6 Mon Sep 17 00:00:00 2001 From: nyaadev Date: Wed, 24 May 2017 00:28:17 +0200 Subject: [PATCH] fix #173 and add avatar to mod user info add rank color to username everywhere some other minor changes --- nyaa/models.py | 4 +++- nyaa/routes.py | 9 +-------- nyaa/static/css/main.css | 11 ++++++----- nyaa/templates/layout.html | 4 ++-- nyaa/templates/profile.html | 18 +++++++++--------- nyaa/templates/user.html | 37 ++++++++++++++++++++++--------------- nyaa/templates/view.html | 18 +++++++++--------- 7 files changed, 52 insertions(+), 49 deletions(-) diff --git a/nyaa/models.py b/nyaa/models.py index e91a432..bd6629a 100644 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -411,8 +411,10 @@ class User(db.Model): return 'User' elif self.level == UserLevelType.TRUSTED: return 'Trusted' - elif self.level >= UserLevelType.MODERATOR: + elif self.level == UserLevelType.MODERATOR: return 'Moderator' + elif self.level == UserLevelType.SUPERADMIN: + return 'Administrator' @property def userlevel_color(self): diff --git a/nyaa/routes.py b/nyaa/routes.py index 42c258b..465fabc 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -480,8 +480,6 @@ def profile(): form = forms.ProfileForm(flask.request.form) - level = ['Regular', 'Trusted', 'Moderator', 'Administrator'][flask.g.user.level] - if flask.request.method == 'POST' and form.validate(): user = flask.g.user new_email = form.email.data.strip() @@ -511,12 +509,7 @@ def profile(): flask.g.user = user return flask.redirect('/profile') - _user = models.User.by_id(flask.g.user.id) - username = _user.username - current_email = _user.email - - return flask.render_template('profile.html', form=form, name=username, email=current_email, - level=level) + return flask.render_template('profile.html', form=form) @app.route('/user/activate/') diff --git a/nyaa/static/css/main.css b/nyaa/static/css/main.css index fc54a47..90e8b13 100755 --- a/nyaa/static/css/main.css +++ b/nyaa/static/css/main.css @@ -258,15 +258,16 @@ a.text-purple:hover, a.text-purple:active, a.text-purple:focus { color: #a760e0; } .btn-grey { - color: #000000; - background-color: #cccfd2; - border-color: #ccc; + color: #000000; + background-color: #cccfd2; + border-color: #ccc; } .btn-grey:hover, .btn-grey:focus, .btn-grey:active, .btn-grey.active, .open > .dropdown-toggle.btn-grey { - background-color: #aaaaaa; + background-color: #aaaaaa; } .btn span.glyphicon { opacity: 0; } .btn.active span.glyphicon { - opacity: 1; + opacity: 1; +} diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html index 7d6ebeb..3bde60b 100644 --- a/nyaa/templates/layout.html +++ b/nyaa/templates/layout.html @@ -27,7 +27,7 @@ - + @@ -82,7 +82,7 @@