From 0cd84bb3758d1500f8282f2dc28e38bc25e9fef5 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Tue, 23 Jun 2020 22:34:47 +0200 Subject: chg: [ui] improved forms in navbar. --- newspipe/static/js/feed.js | 33 +++-------------------- newspipe/templates/about_more.html | 20 ++++++++------ newspipe/templates/article.html | 54 +++++++++++++++++++------------------- newspipe/templates/home.html | 5 +--- newspipe/templates/layout.html | 38 ++++++++++++--------------- newspipe/templates/login.html | 6 ++--- newspipe/templates/signup.html | 24 ++++++++++------- newspipe/web/views/session_mgmt.py | 4 +-- 8 files changed, 79 insertions(+), 105 deletions(-) diff --git a/newspipe/static/js/feed.js b/newspipe/static/js/feed.js index ccbcd54c..23e509f4 100644 --- a/newspipe/static/js/feed.js +++ b/newspipe/static/js/feed.js @@ -1,7 +1,7 @@ var node = document.getElementById('add-feed-filter-row'); if (node != null) { node.onclick = function() { - document.getElementById('filters-container').innerHTML = + document.getElementById('filters-container').innerHTML = '
' + ' ' + ' ' - + '
'; - } + + ''; + } } var nodes = document.getElementsByClassName('del-feed-filter-row'); @@ -27,30 +27,3 @@ Array.prototype.map.call(nodes, function(node) { node.parentNode.remove(); } }) - - -// Delete a feed -var nodes = document.getElementsByClassName('delete-feed'); -Array.prototype.map.call(nodes, function(node) { - node.onclick = function() { - var r = confirm('You are going to delete this feed.'); - - if (r == true) { - var feed_id = node.parentNode.parentNode.parentNode.getAttribute("data-feed"); - node.parentNode.parentNode.parentNode.remove(); - // $('.feed-menu[data-feed='+feed_id+']').remove(); - - // sends the updates to the server - fetch(API_ROOT + "feed/" + feed_id, { - method: "DELETE", - headers: { - 'Content-Type': 'application/json', - }, - }).then(res => { - console.log("Request complete! response:", res); - }).catch((error) => { - console.error('Error:', error); - });; - } - } -}) diff --git a/newspipe/templates/about_more.html b/newspipe/templates/about_more.html index de034b4b..0df05852 100644 --- a/newspipe/templates/about_more.html +++ b/newspipe/templates/about_more.html @@ -1,13 +1,17 @@ {% extends "layout.html" %} {% block content %}
-

{{ _('Information about this instance') }}

- +
+
+

{{ _('Information about this instance') }}

+
    +
  • {{ _('Newspipe version') }}: {{newspipe_version}}
    • +
  • {{ _('Python version') }}: {{python_version}}
    • +
  • {{ _('Registration') }}: {{registration}}
    • +
  • {{ _('Number of users') }}: {{nb_users}}
    • +
  • {{ _('Content Security Policy') }}: {{content_security_policy}}
    • +
+
+
{% endblock %} diff --git a/newspipe/templates/article.html b/newspipe/templates/article.html index 81705da1..df9eba98 100644 --- a/newspipe/templates/article.html +++ b/newspipe/templates/article.html @@ -1,37 +1,37 @@ {% extends "layout.html" %} {% block content %}
-
-

{{ article.title|safe }}

-

{{ _('from') }} {{ article.source.title }}

- - {% if article.like %} - - {% else %} - - {% endif %} - {% if article.readed %} - - {% else %} - - {% endif %} -
{{ article.date | datetime }}
+
+
+

{{ article.title|safe }}

+

{{ _('from') }} {{ article.source.title }}

+ + {% if article.like %} + + {% else %} + + {% endif %} + {% if article.readed %} + + {% else %} + + {% endif %} +
{{ article.date | datetime }}
+

-
- {{ article.content | safe }} +
+
+ {{ article.content | safe }} +

-
- - - - - - - - - +
+
+ + + +
{% endblock %} diff --git a/newspipe/templates/home.html b/newspipe/templates/home.html index 86563d13..23d4ee37 100644 --- a/newspipe/templates/home.html +++ b/newspipe/templates/home.html @@ -7,7 +7,7 @@
{% if feeds|count == 0 %} -
+

{{ _("You don't have any feeds.") }}

{{ _('Add some') }}, {{ _('or') }} {{ _('upload an OPML file.') }}

@@ -46,7 +46,6 @@ - {% endfor %}
@@ -78,7 +77,6 @@ - {% endfor %}
@@ -108,7 +106,6 @@ - {% endfor %}
diff --git a/newspipe/templates/layout.html b/newspipe/templates/layout.html index 7d2b8c70..115a1cd9 100644 --- a/newspipe/templates/layout.html +++ b/newspipe/templates/layout.html @@ -4,7 +4,7 @@ {% block head %} - + Newspipe{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %} @@ -37,37 +37,33 @@ {% endif %}
  • -
    +
    {{ _('Feeds') }} {{ _('Inactive') }} {{ _('Popular') }} {{ _('History') }}
    {{ _('Add a new feed') }} -
    - -
    -
    - -
    + +
    + + -
    - +
    +
  • -
    +
    {{ _('Categories') }}
    {{ _('Add a new category') }} -
    + -
    -
    - -
    +
    +
    @@ -84,16 +80,16 @@
  • -
    -
    -
    +
    + +
    -
    +
    -
    +
    diff --git a/newspipe/templates/login.html b/newspipe/templates/login.html index cade2777..94037d81 100644 --- a/newspipe/templates/login.html +++ b/newspipe/templates/login.html @@ -6,20 +6,20 @@

    {{ _('Log In') }}

    {{ form.hidden_tag() }} -
    +
    {{ form.nickmane(class_="form-control", placeholder=_('Your nickname')) }}
    {% for message in form.nickmane.errors %} {% endfor %} -
    +
    {{ form.password(class_="form-control", placeholder=_('Your Password')) }}
    {% for message in form.password.errors %} {% endfor %} {{ form.submit(class_="btn btn-primary") }} - {{ _('Sign up') }} + {{ _('Sign up') }}
    diff --git a/newspipe/templates/signup.html b/newspipe/templates/signup.html index c940df5f..68ebbb6a 100644 --- a/newspipe/templates/signup.html +++ b/newspipe/templates/signup.html @@ -2,20 +2,24 @@ {% block content %}
    -
    +
    {{ form.hidden_tag() }} -
    - {{ form.nickname(class_="form-control", placeholder=_('Your nickname')) }} {% for error in form.nickname.errors %} {{ error }}
    {% endfor %} -

    {{ _('Letters, numbers, dots and underscores only.') }}

    +
    + {{ form.nickname(class_="form-control", placeholder=_('Your nickname')) }} + {% for error in form.nickname.errors %} {{ error }}
    {% endfor %} +  {{ _('Letters, numbers, dots and underscores only.') }}
    -
    - {{ form.email(class_="form-control", placeholder=_('Your email')) }} {% for error in form.email.errors %} {{ error }}
    {% endfor %} -

    {{ _("Only for account activation. Your email won't be stored.") }}

    +

    +
    + {{ form.email(class_="form-control", placeholder=_('Your email')) }} + {% for error in form.email.errors %} {{ error }}
    {% endfor %} +  {{ _("Only for account activation. Your email won't be stored.") }}
    -
    - {{ form.password(class_="form-control", placeholder=_('Your password')) }} {% for error in form.password.errors %} {{ error }}
    {% endfor %} -

    {{ _('Minimum 6 characters.') }}

    +
    + {{ form.password(class_="form-control", placeholder=_('Your password')) }} + {% for error in form.password.errors %} {{ error }}
    {% endfor %} +  {{ _('Minimum 6 characters.') }}

    {{ form.submit(class_="btn btn-primary") }} diff --git a/newspipe/web/views/session_mgmt.py b/newspipe/web/views/session_mgmt.py index c279ffc1..4fab943f 100644 --- a/newspipe/web/views/session_mgmt.py +++ b/newspipe/web/views/session_mgmt.py @@ -34,8 +34,8 @@ Principal(current_app) login_manager = LoginManager() login_manager.init_app(current_app) login_manager.login_view = "login" -login_manager.login_message = lazy_gettext("Please log in to access this page.") -login_manager.login_message_category = "info" +login_manager.login_message = "" +# login_manager.login_message_category = "info" logger = logging.getLogger(__name__) -- cgit