diff options
| -rw-r--r-- | core/0001.patch | 123 |
1 files changed, 22 insertions, 101 deletions
diff --git a/core/0001.patch b/core/0001.patch index 3fce942..52e033a 100644 --- a/core/0001.patch +++ b/core/0001.patch @@ -1,8 +1,8 @@ diff --git a/settings.py b/settings.py -index 540d3f7..17429e5 100644 +index 16ec6ff..597a086 100644 --- a/settings.py +++ b/settings.py -@@ -542,6 +542,6 @@ def settings_page(): +@@ -556,6 +556,6 @@ def settings_page(): for func, old_value, value in to_call: func(old_value, value) @@ -133,7 +133,7 @@ index 51ecacd..01a790d 100644 .item-video { diff --git a/youtube/templates/base.html b/youtube/templates/base.html -index b68c250..1f5b332 100644 +index 393cc52..52660f4 100644 --- a/youtube/templates/base.html +++ b/youtube/templates/base.html @@ -131,22 +131,6 @@ @@ -160,7 +160,7 @@ index b68c250..1f5b332 100644 <main class="main"> diff --git a/youtube/templates/channel.html b/youtube/templates/channel.html -index 294f1df..a4361c3 100644 +index 5a567c0..e363d4e 100644 --- a/youtube/templates/channel.html +++ b/youtube/templates/channel.html @@ -21,14 +21,6 @@ @@ -193,11 +193,11 @@ index bacc513..2773ed6 100644 </article> {% endmacro %} diff --git a/youtube/templates/home.html b/youtube/templates/home.html -index ef1f029..b537cca 100644 +index 0adac56..4a56af2 100644 --- a/youtube/templates/home.html +++ b/youtube/templates/home.html @@ -4,10 +4,4 @@ - <link href="/youtube.com/static/home.css" rel="stylesheet"/> + <link href="/youtube.com/static/home.css" rel="stylesheet"> {% endblock style %} {% block main %} - <ul> @@ -208,13 +208,18 @@ index ef1f029..b537cca 100644 - </ul> {% endblock main %} diff --git a/youtube/templates/settings.html b/youtube/templates/settings.html -index 7a7ce9e..4749d4c 100644 +deleted file mode 100644 +index a4ebabf..0000000 --- a/youtube/templates/settings.html -+++ b/youtube/templates/settings.html -@@ -5,43 +5,5 @@ - {% endblock style %} - - {% block main %} ++++ /dev/null +@@ -1,47 +0,0 @@ +-{% set page_title = 'Settings' %} +-{% extends "base.html" %} +-{% block style %} +- <link href="/youtube.com/static/settings.css" rel="stylesheet"> +-{% endblock style %} +- +-{% block main %} - <form method="POST" class="settings-form"> - {% for categ in categories %} - <h2>{{ categ|capitalize }}</h2> @@ -223,11 +228,11 @@ index 7a7ce9e..4749d4c 100644 - {% if not setting_info.get('hidden', false) %} - <li class="setting-item"> - {% if 'label' is in(setting_info) %} -- <label for="{{ 'setting_' + setting_name }}">{{ setting_info['label'] }}</label> +- <label for="{{ 'setting_' + setting_name }}" {% if 'comment' is in(setting_info) %}title="{{ setting_info['comment'] }}" {% endif %}>{{ setting_info['label'] }}</label> - {% else %} -- <label for="{{ 'setting_' + setting_name }}">{{ setting_name.replace('_', ' ')|capitalize }}</label> +- <label for="{{ 'setting_' + setting_name }}" {% if 'comment' is in(setting_info) %}title="{{ setting_info['comment'] }}" {% endif %}>{{ setting_name.replace('_', ' ')|capitalize }}</label> - {% endif %} - +- - {% if setting_info['type'].__name__ == 'bool' %} - <input type="checkbox" id="{{ 'setting_' + setting_name }}" name="{{ setting_name }}" {{ 'checked' if value else '' }}> - {% elif setting_info['type'].__name__ == 'int' %} @@ -254,93 +259,9 @@ index 7a7ce9e..4749d4c 100644 - {% endfor %} - <input type="submit" value="Save settings"> - </form> - {% 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 %} -- <link href="/youtube.com/static/subscription_manager.css" rel="stylesheet"/> --{% endblock style %} -- -- --{% macro subscription_list(sub_list) %} -- {% for subscription in sub_list %} -- <li class="sub-list-item {{ 'muted' if subscription['muted'] else '' }}"> -- <input class="sub-list-checkbox" name="channel_ids" value="{{ subscription['channel_id'] }}" form="subscription-manager-form" type="checkbox"> -- <a href="{{ subscription['channel_url'] }}" class="sub-list-item-name" title="{{ subscription['channel_name'] }}">{{ subscription['channel_name'] }}</a> -- <span class="tag-list">{{ ', '.join(subscription['tags']) }}</span> -- </li> -- {% endfor %} --{% endmacro %} -- --{% block main %} -- <div class="import-export"> -- <form class="subscriptions-import-form" enctype="multipart/form-data" action="/youtube.com/import_subscriptions" method="POST"> -- <h2>Import subscriptions</h2> -- <div class="subscriptions-import-options"> -- <input type="file" id="subscriptions-import" accept="application/json, application/xml, text/x-opml, text/csv" name="subscriptions_file" required> -- <input type="submit" value="Import"> -- </div> -- </form> -- -- <form class="subscriptions-export-form" action="/youtube.com/export_subscriptions" method="POST"> -- <h2>Export subscriptions</h2> -- <div class="subscriptions-export-options"> -- <select id="export-type" name="export_format" title="Export format"> -- <option value="json_newpipe">JSON (NewPipe)</option> -- <option value="json_google_takeout">JSON (Old Google Takeout Format)</option> -- <option value="opml">OPML (RSS, no tags)</option> -- </select> -- <label for="include-muted">Include muted</label> -- <input id="include-muted" type="checkbox" name="include_muted" checked> -- <input type="submit" value="Export"> -- </div> -- </form> -- </div> -- -- <hr> -- -- <form id="subscription-manager-form" class="sub-list-controls" method="POST"> -- {% if group_by_tags %} -- <a class="sort-button" href="/https://www.youtube.com/subscription_manager?group_by_tags=0">Don't group</a> -- {% else %} -- <a class="sort-button" href="/https://www.youtube.com/subscription_manager?group_by_tags=1">Group by tags</a> -- {% endif %} -- <input type="text" name="tags"> -- <button type="submit" name="action" value="add_tags">Add tags</button> -- <button type="submit" name="action" value="remove_tags">Remove tags</button> -- <button type="submit" name="action" value="unsubscribe_verify">Unsubscribe</button> -- <button type="submit" name="action" value="mute">Mute</button> -- <button type="submit" name="action" value="unmute">Unmute</button> -- <input type="reset" value="Clear Selection"> -- </form> -- -- -- {% if group_by_tags %} -- <ul class="tag-group-list"> -- {% for tag_name, sub_list in tag_groups %} -- <li class="tag-group"> -- <h2 class="tag-group-name">{{ tag_name }}</h2> -- <ol class="sub-list"> -- {{ subscription_list(sub_list) }} -- </ol> -- </li> -- {% endfor %} -- </ul> -- {% else %} -- <ol class="sub-list"> -- {{ subscription_list(sub_list) }} -- </ol> -- {% endif %} -- -{% endblock main %} diff --git a/youtube/templates/subscriptions.html b/youtube/templates/subscriptions.html -index b528e5c..6302fcc 100644 +index 2823e8d..4aefee2 100644 --- a/youtube/templates/subscriptions.html +++ b/youtube/templates/subscriptions.html @@ -13,71 +13,5 @@ @@ -416,7 +337,7 @@ index b528e5c..6302fcc 100644 {% endblock main %} diff --git a/youtube/templates/watch.html b/youtube/templates/watch.html -index 383d7cb..0cdd3f7 100644 +index 4030a18..cfd2c8d 100644 --- a/youtube/templates/watch.html +++ b/youtube/templates/watch.html @@ -93,7 +93,6 @@ |