diff --git a/settings.py b/settings.py index 1482db0..065954e 100644 --- a/settings.py +++ b/settings.py @@ -452,6 +452,6 @@ def settings_page(): globals().update(current_settings_dict) save_settings(current_settings_dict) - return flask.redirect(util.URL_ORIGIN + '/settings', 303) + return flask.redirect(util.URL_ORIGIN) else: flask.abort(400) diff --git a/youtube/__init__.py b/youtube/__init__.py index 3c85d47..05fa3a5 100644 --- a/youtube/__init__.py +++ b/youtube/__init__.py @@ -13,9 +13,6 @@ yt_app.url_map.strict_slashes = False # yt_app.jinja_env.lstrip_blocks = True -yt_app.add_url_rule('/settings', 'settings_page', settings.settings_page, methods=['POST', 'GET']) - - @yt_app.route('/') def homepage(): return flask.render_template('home.html', title="Youtube local") diff --git a/youtube/static/channel.css b/youtube/static/channel.css index ada086d..3d2d36a 100644 --- a/youtube/static/channel.css +++ b/youtube/static/channel.css @@ -270,11 +270,9 @@ hr { .item-box { display: grid; - grid-template-columns: 1.9fr 0.1fr; + grid-template-columns: 1fr; grid-template-rows: 1fr; - grid-gap: 1px; - grid-template-areas: - "item-video item-checkbox"; + grid-template-areas: "item-video"; } .item-video { diff --git a/youtube/static/local_playlist.css b/youtube/static/local_playlist.css index 33771f4..1689b31 100644 --- a/youtube/static/local_playlist.css +++ b/youtube/static/local_playlist.css @@ -246,11 +246,9 @@ hr { .item-box { display: grid; - grid-template-columns: 1.9fr 0.1fr; + grid-template-columns: 1fr; grid-template-rows: 1fr; - grid-gap: 1px; - grid-template-areas: - "item-video item-checkbox"; + grid-template-areas: "item-video"; } .item-video { diff --git a/youtube/static/playlist.css b/youtube/static/playlist.css index 8438ceb..a614056 100644 --- a/youtube/static/playlist.css +++ b/youtube/static/playlist.css @@ -256,11 +256,9 @@ hr { .item-box { display: grid; - grid-template-columns: 1.9fr 0.1fr; + grid-template-columns: 1fr; grid-template-rows: 1fr; - grid-gap: 1px; - grid-template-areas: - "item-video item-checkbox"; + grid-template-areas: "item-video"; } .item-video { diff --git a/youtube/static/search.css b/youtube/static/search.css index ff1fbda..b9b7952 100644 --- a/youtube/static/search.css +++ b/youtube/static/search.css @@ -274,11 +274,9 @@ hr { .item-box { display: grid; - grid-template-columns: 1.9fr 0.1fr; + grid-template-columns: 1fr; grid-template-rows: 1fr; - grid-gap: 1px; - grid-template-areas: - "item-video item-checkbox"; + grid-template-areas: "item-video"; } .item-video { diff --git a/youtube/static/subscription.css b/youtube/static/subscription.css index 2004bd6..9a963ba 100644 --- a/youtube/static/subscription.css +++ b/youtube/static/subscription.css @@ -250,11 +250,9 @@ hr { .item-box { display: grid; - grid-template-columns: 1.9fr 0.1fr; + grid-template-columns: 1fr; grid-template-rows: 1fr; - grid-gap: 1px; - grid-template-areas: - "item-video item-checkbox"; + grid-template-areas: "item-video"; } .item-video { diff --git a/youtube/static/watch.css b/youtube/static/watch.css index 8d23017..dd83da3 100644 --- a/youtube/static/watch.css +++ b/youtube/static/watch.css @@ -385,11 +385,9 @@ label[for=options-toggle-cbox] { .item-box { display: grid; - grid-template-columns: 1.9fr 0.1fr; + grid-template-columns: 1fr; grid-template-rows: 1fr; - grid-gap: 1px; - grid-template-areas: - "item-video item-checkbox"; + grid-template-areas: "item-video"; } .item-video { diff --git a/youtube/templates/base.html b/youtube/templates/base.html index 7b32d76..5f60b40 100644 --- a/youtube/templates/base.html +++ b/youtube/templates/base.html @@ -117,22 +117,6 @@ - {% if header_playlist_names is defined %} -
- - - {% for playlist_name in header_playlist_names %} - - {% endfor %} - - -
- -
-
- - {% endif %} -
diff --git a/youtube/templates/channel.html b/youtube/templates/channel.html index 294f1df..a4361c3 100644 --- a/youtube/templates/channel.html +++ b/youtube/templates/channel.html @@ -21,14 +21,6 @@

{{ short_description }}

-
- -

diff --git a/youtube/templates/common_elements.html b/youtube/templates/common_elements.html index 94554d4..7ba904a 100644 --- a/youtube/templates/common_elements.html +++ b/youtube/templates/common_elements.html @@ -59,9 +59,6 @@ {% endif %} - {% if info['type'] == 'video' %} - - {% endif %} {% endif %} {% endmacro %} diff --git a/youtube/templates/home.html b/youtube/templates/home.html index ef1f029..b537cca 100644 --- a/youtube/templates/home.html +++ b/youtube/templates/home.html @@ -4,10 +4,4 @@ {% endblock style %} {% block main %} - {% endblock main %} diff --git a/youtube/templates/settings.html b/youtube/templates/settings.html index 7a7ce9e..4749d4c 100644 --- a/youtube/templates/settings.html +++ b/youtube/templates/settings.html @@ -5,43 +5,5 @@ {% endblock style %} {% block main %} -
- {% for categ in categories %} -

{{ categ|capitalize }}

- - {% endfor %} - -
{% endblock main %} diff --git a/youtube/templates/subscription_manager.html b/youtube/templates/subscription_manager.html deleted file mode 100644 index 62a8bed..0000000 --- a/youtube/templates/subscription_manager.html +++ /dev/null @@ -1,77 +0,0 @@ -{% set page_title = 'Subscription Manager' %} -{% extends "base.html" %} -{% block style %} - -{% endblock style %} - - -{% macro subscription_list(sub_list) %} - {% for subscription in sub_list %} -
  • - - {{ subscription['channel_name'] }} - {{ ', '.join(subscription['tags']) }} -
  • - {% endfor %} -{% endmacro %} - -{% block main %} -
    -
    -

    Import subscriptions

    -
    - - -
    -
    - -
    -

    Export subscriptions

    -
    - - - - -
    -
    -
    - -
    - -
    - {% if group_by_tags %} - Don't group - {% else %} - Group by tags - {% endif %} - - - - - - - -
    - - - {% if group_by_tags %} - - {% else %} -
      - {{ subscription_list(sub_list) }} -
    - {% endif %} - -{% endblock main %} diff --git a/youtube/templates/subscriptions.html b/youtube/templates/subscriptions.html index b528e5c..6302fcc 100644 --- a/youtube/templates/subscriptions.html +++ b/youtube/templates/subscriptions.html @@ -13,71 +13,5 @@ {% block main %} -
    - - - - -
    - -
    - - {% if current_tag %} -

    {{ current_tag }}

    - {% endif %} - -
    - {% for video_info in videos %} - {{ common_elements.item(video_info) }} - {% endfor %} -
    -
    - - {% endblock main %} diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html index 70f5692..9b55493 100644 --- a/youtube/templates/watch.html +++ b/youtube/templates/watch.html @@ -79,8 +79,6 @@ - -
    Download