diff --git a/settings.py b/settings.py index eb210c5..fce9c56 100644 --- a/settings.py +++ b/settings.py @@ -589,6 +589,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 64aed56..437c5ad 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 030bc11..29f0c05 100644 --- a/youtube/static/channel.css +++ b/youtube/static/channel.css @@ -268,11 +268,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 dedd2dd..9aa8811 100644 --- a/youtube/static/local_playlist.css +++ b/youtube/static/local_playlist.css @@ -243,11 +243,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 e6ae0f9..1f0211c 100644 --- a/youtube/static/playlist.css +++ b/youtube/static/playlist.css @@ -253,11 +253,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 9b7bf8d..25af37c 100644 --- a/youtube/static/search.css +++ b/youtube/static/search.css @@ -271,11 +271,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 e4e9c8b..8acb9b1 100644 --- a/youtube/static/subscription.css +++ b/youtube/static/subscription.css @@ -247,11 +247,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 460bba3..181fb94 100644 --- a/youtube/static/watch.css +++ b/youtube/static/watch.css @@ -398,11 +398,9 @@ figure.sc-video { .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 393cc52..52660f4 100644 --- a/youtube/templates/base.html +++ b/youtube/templates/base.html @@ -131,22 +131,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 c43f488..bd0f733 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 bacc513..2773ed6 100644 --- a/youtube/templates/common_elements.html +++ b/youtube/templates/common_elements.html @@ -70,9 +70,6 @@ {% endif %} - {% if info['type'] == 'video' %} - - {% endif %} {% endif %} {% endmacro %} diff --git a/youtube/templates/home.html b/youtube/templates/home.html index 0adac56..4a56af2 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 deleted file mode 100644 index a4ebabf..0000000 --- a/youtube/templates/settings.html +++ /dev/null @@ -1,47 +0,0 @@ -{% set page_title = 'Settings' %} -{% extends "base.html" %} -{% block style %} - -{% endblock style %} - -{% block main %} -
- {% for categ in categories %} -

{{ categ|capitalize }}

- - {% endfor %} - -
-{% endblock main %} diff --git a/youtube/templates/subscriptions.html b/youtube/templates/subscriptions.html index 2823e8d..4aefee2 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 0991457..06c5f1d 100644 --- a/youtube/templates/watch.html +++ b/youtube/templates/watch.html @@ -87,7 +87,6 @@ {% endif %} - Direct Link