diff --git a/settings.py b/settings.py index d7112b4..c38b171 100644 --- a/settings.py +++ b/settings.py @@ -542,6 +542,6 @@ def settings_page(): for func, old_value, value in to_call: func(old_value, value) - 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 3604b21..0a2d363 100644 --- a/youtube/__init__.py +++ b/youtube/__init__.py @@ -14,9 +14,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="YT Local") diff --git a/youtube/static/channel.css b/youtube/static/channel.css index fee15b3..c261183 100644 --- a/youtube/static/channel.css +++ b/youtube/static/channel.css @@ -266,11 +266,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 116c96a..906418d 100644 --- a/youtube/static/local_playlist.css +++ b/youtube/static/local_playlist.css @@ -242,11 +242,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 cab28da..d721715 100644 --- a/youtube/static/playlist.css +++ b/youtube/static/playlist.css @@ -252,11 +252,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 95db90f..fb36092 100644 --- a/youtube/static/search.css +++ b/youtube/static/search.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/subscription.css b/youtube/static/subscription.css index e7f0ea6..fe7ff47 100644 --- a/youtube/static/subscription.css +++ b/youtube/static/subscription.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/watch.css b/youtube/static/watch.css index bbb09dd..fa839a5 100644 --- a/youtube/static/watch.css +++ b/youtube/static/watch.css @@ -409,11 +409,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 39f8d2b..d3c1bd6 100644 --- a/youtube/templates/base.html +++ b/youtube/templates/base.html @@ -126,22 +126,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 808a835..38266d0 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 5db5d8d..0000000 --- a/youtube/templates/subscription_manager.html +++ /dev/null @@ -1,78 +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 84585a2..14f955d 100644 --- a/youtube/templates/watch.html +++ b/youtube/templates/watch.html @@ -93,7 +93,6 @@ {% endif %} - Direct Link