diff options
author | Wojtek Kosior <koszko@koszko.org> | 2022-08-25 10:39:36 +0200 |
---|---|---|
committer | Wojtek Kosior <koszko@koszko.org> | 2022-09-28 12:54:53 +0200 |
commit | c8eb1012980a08a51d78da0c3955cc5ba6edf5ed (patch) | |
tree | 351eaf8f901a0e16c1564d9083fdead8f0b23f22 | |
parent | edbb8286146920583087080809f6e904ca856cc9 (diff) | |
download | haketilo-hydrilla-c8eb1012980a08a51d78da0c3955cc5ba6edf5ed.tar.gz haketilo-hydrilla-c8eb1012980a08a51d78da0c3955cc5ba6edf5ed.zip |
[proxy] normalize whitespace in jinja templates
10 files changed, 273 insertions, 273 deletions
diff --git a/src/hydrilla/proxy/web_ui/root.py b/src/hydrilla/proxy/web_ui/root.py index a6e3151..28d7262 100644 --- a/src/hydrilla/proxy/web_ui/root.py +++ b/src/hydrilla/proxy/web_ui/root.py @@ -72,8 +72,9 @@ class WebUIAppImpl(_app.WebUIApp): self.jinja_options = { **self.jinja_options, - 'loader': jinja2.PackageLoader(__package__), - 'autoescape': jinja2.select_autoescape(['html.jinja']), + 'loader': jinja2.PackageLoader(__package__), + 'autoescape': jinja2.select_autoescape(['html.jinja']), + 'lstrip_blocks': True, 'extensions': [ *self.jinja_options.get('extensions', []), 'jinja2.ext.i18n', diff --git a/src/hydrilla/proxy/web_ui/templates/base.html.jinja b/src/hydrilla/proxy/web_ui/templates/base.html.jinja index a34d538..09c726b 100644 --- a/src/hydrilla/proxy/web_ui/templates/base.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/base.html.jinja @@ -22,121 +22,120 @@ in a proprietary work, I am not going to enforce this in court. <!DOCTYPE html> <html> <head> - {%- block head %} + {% block head %} <title> - {% block title required %}{% endblock %} - - - _('web_ui.base.title.haketilo_proxy') + {% block title required %}{% endblock %} + - + _('web_ui.base.title.haketilo_proxy') </title> <style> - {%- block style %} + {% block style %} body { - color: #444; - margin: 0; + color: #444; + margin: 0; } #main { - max-width: 750px; - margin: auto; + max-width: 750px; + margin: auto; } a { - text-decoration: inherit; - color: inherit; + text-decoration: inherit; + color: inherit; } - .inline-form { - display: inline-block; - padding: 0; - margin: 0; - } + .inline-form { + display: inline-block; + padding: 0; + margin: 0; + } .small-print { - font-size: 80%; - color: #555; + font-size: 80%; + color: #555; + } + + .error-note { + display: block; + border-left: 5px solid #a33; + background-color: #fcc; } - .error-note { - display: block; - border-left: 5px solid #a33; - background-color: #fcc; - } - - .green-button { - background-color: #4caf50; - border: none; - border-radius: 2px; - color: white; - text-align: center; - text-decoration: none; - display: inline-block; - padding: 5px 10px; - -moz-user-select: none; - user-select: none; - cursor: pointer; - font: 400 0.9em sans-serif; - margin: 2px; - } + .green-button { + background-color: #4caf50; + border: none; + border-radius: 2px; + color: white; + text-align: center; + text-decoration: none; + display: inline-block; + padding: 5px 10px; + -moz-user-select: none; + user-select: none; + cursor: pointer; + font: 400 0.9em sans-serif; + margin: 2px; + } .hide { - display: none !important; + display: none !important; } - ul#nav { - -moz-user-select: none; - user-select: none; - background-color: #e0e0e0; - margin: 0; - border-bottom: 2px solid #444; - } - - ul#nav > li { - list-style-type: none; - background-color: #70af70; - font-size: 115%; - padding: 10px; - display: inline-block; - cursor: pointer; - margin: 5px 0 0 0; - } - - ul#nav > li:hover { - box-shadow: 0 6px 8px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); - } - - ul#nav > li.nav-active { - background-color: #65A065; - color: #222; - box-shadow: none; - cursor: default; - } - - ul#item_list > li > a:only-child { - display: block; - } - {%- endblock %} + ul#nav { + -moz-user-select: none; + user-select: none; + background-color: #e0e0e0; + margin: 0; + border-bottom: 2px solid #444; + } + + ul#nav > li { + list-style-type: none; + background-color: #70af70; + font-size: 115%; + padding: 10px; + display: inline-block; + cursor: pointer; + margin: 5px 0 0 0; + } + + ul#nav > li:hover { + box-shadow: 0 6px 8px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); + } + + ul#nav > li.nav-active { + background-color: #65A065; + color: #222; + box-shadow: none; + cursor: default; + } + + ul#item_list > li > a:only-child { + display: block; + } + {% endblock %} </style> - {%- endblock %} + {% endblock %} </head> <body> - {%- set active_endpoint = get_current_endpoint() %} - {%- + {% set active_endpoint = get_current_endpoint() %} + {% set navigation_bar = [ ('home', _('web_ui.base.nav.home')), ('packages.packages', _('web_ui.base.nav.packages')), ('repos.repos', _('web_ui.base.nav.repos')), ('packages.load_from_disk', _('web_ui.base.nav.load')) ] - -%} + %} <ul id="nav"> - {%- for endpoint, label in navigation_bar %} - {%- if endpoint == active_endpoint %} - <li class="nav-active">{{ label }}</li> - {%- else %} - <li><a href="{{ url_for(endpoint) }}">{{ label }}</a></li> - {%- endif %} - </li> - {%- endfor %} + {% for endpoint, label in navigation_bar %} + {% if endpoint == active_endpoint %} + <li class="nav-active">{{ label }}</li> + {% else %} + <li><a href="{{ url_for(endpoint) }}">{{ label }}</a></li> + {% endif %} + {% endfor %} </ul> <div id="main">{% block main required %}{% endblock %}</div> </body> diff --git a/src/hydrilla/proxy/web_ui/templates/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/index.html.jinja index 62c2b45..9115a3c 100644 --- a/src/hydrilla/proxy/web_ui/templates/index.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/index.html.jinja @@ -19,7 +19,7 @@ I, Wojtek Kosior, thereby promise not to sue for violation of this file's licenses. Although I request that you do not make use this code in a proprietary work, I am not going to enforce this in court. #} -{%- extends "base.html.jinja" %} +{% extends "base.html.jinja" %} {% block title %} {{ _('web_ui.home.title') }} {% endblock %} {% block main %} {{ _('web_ui.home.welcome_to_haketilo') }} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja index cbdd3d9..c59ed20 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja @@ -31,22 +31,22 @@ in a proprietary work, I am not going to enforce this in court. <ul id="item_list"> {% for info in display_infos %} <li class="{{ entry_classes }}"> - <a href="{{ url_for('.show_package', mapping_id=info.ref.id) }}"> - <div> - {{ info.identifier }} - </div> - {%- - if info.active_version is not none and - info.active_version.active == ActiveStatus.REQUIRED - %} - {%- set ver = info.active_version.info.version %} - {%- set ver_str = versions.version_string(ver) %} - {%- set ver_desc = ver_str + '@' + info.active_version.info.repo %} - <div class="small-print"> - {{ _('web_ui.packages.enabled_version_{}').format(ver_desc) }} - </div> - {% endif %} - </a> + <a href="{{ url_for('.show_package', mapping_id=info.ref.id) }}"> + <div> + {{ info.identifier }} + </div> + {% + if info.active_version is not none and + info.active_version.active == ActiveStatus.REQUIRED + %} + {% set ver = info.active_version.info.version %} + {% set ver_str = versions.version_string(ver) %} + {% set ver_desc = ver_str + '@' + info.active_version.info.repo %} + <div class="small-print"> + {{ _('web_ui.packages.enabled_version_{}').format(ver_desc) }} + </div> + {% endif %} + </a> </li> {% endfor %} </ul> diff --git a/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja index 1f3c246..e2d012c 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja @@ -19,7 +19,7 @@ I, Wojtek Kosior, thereby promise not to sue for violation of this file's licenses. Although I request that you do not make use this code in a proprietary work, I am not going to enforce this in court. #} -{%- extends "base.html.jinja" %} +{% extends "base.html.jinja" %} {% block title %} {{ _('web_ui.packages.load_from_disk.title') }} {% endblock %} {% block style %} {{ super() }} @@ -34,17 +34,17 @@ in a proprietary work, I am not going to enforce this in court. <form method="POST" enctype="multipart/form-data"> <div> <input id="packages_zipfile" name="packages_zipfile" type="file" - accept=".zip,application/zip" required=""> + accept=".zip,application/zip" required=""> </div> <div> <label class="green-button" for="packages_zipfile"> - {{ _('web_ui.packages.load_from_disk.choose_zipfile_button') }} + {{ _('web_ui.packages.load_from_disk.choose_zipfile_button') }} </label> </div> <div> <button class="green-button"> - {{ _('web_ui.packages.load_from_disk.install_button') }} + {{ _('web_ui.packages.load_from_disk.install_button') }} </button> </div> </form> -{%- endblock %} +{% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja index e362fa9..e1a447f 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja @@ -39,36 +39,36 @@ in a proprietary work, I am not going to enforce this in court. <h4> {% if version_display_infos|length > 0 %} {% block version_list_heading %} - {{ _('web_ui.packages.single.version_list_heading') }} + {{ _('web_ui.packages.single.version_list_heading') }} {% endblock %} {% endif %} </h4> <ul id="item_list"> - {%- for info in version_display_infos %} - {%- set entry_classes = [] %} + {% for info in version_display_infos %} + {% set entry_classes = [] %} {% if info.is_local %} - {%- do entry_classes.append('version-entry-local') %} - {%- endif %} - {%- if info.is_orphan %} - {%- do entry_classes.append('version-entry-orphan') %} - {%- endif %} + {% do entry_classes.append('version-entry-local') %} + {% endif %} + {% if info.is_orphan %} + {% do entry_classes.append('version-entry-orphan') %} + {% endif %} <li class="{{ entry_classes|join(' ') }}"> - {%- + {% set href = url_for( '.show_package_version', mapping_version_id = info.ref.id ) %} - <a href="{{ href }}"> - <div> - {{ versions.version_string(info.info.version) }} - {%- if not info.is_local %} - @ - {{ info.info.repo }} - {%- endif %} - </div> - </a> + <a href="{{ href }}"> + <div> + {{ versions.version_string(info.info.version) }} + {% if not info.is_local %} + @ + {{ info.info.repo }} + {% endif %} + </div> + </a> </li> - {%- endfor %} + {% endfor %} </ul> {% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja index 9943521..aa01272 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja @@ -22,16 +22,16 @@ in a proprietary work, I am not going to enforce this in court. {% extends "packages/show_single.html.jinja" %} {% block title %} {{ _('web_ui.packages.single_version.title') }} {% endblock %} {% block main_info %} - {%- if uninstall_disallowed is defined %} + {% if uninstall_disallowed is defined %} <aside class="error-note"> - {{ _('web_ui.err.uninstall_disallowed') }} + {{ _('web_ui.err.uninstall_disallowed') }} </aside> - {%- endif %} - {%- if repo_communication_error is defined %} + {% endif %} + {% if repo_communication_error is defined %} <aside class="error-note"> - {{ _('web_ui.err.repo_communication_error') }} + {{ _('web_ui.err.repo_communication_error') }} </aside> - {%- endif %} + {% endif %} <h3> {{ _('web_ui.packages.single_version.heading.name_{}') @@ -42,48 +42,48 @@ in a proprietary work, I am not going to enforce this in court. {{ display_info.info.versioned_identifier }} </div> TODO: add more info... - {%- if display_info.installed == InstalledStatus.INSTALLED %} + {% if display_info.installed == InstalledStatus.INSTALLED %} <div> {{ _('web_ui.packages.single_version.package_is_installed') }} </div> - {%- if uninstall_disallowed is not defined %} + {% if uninstall_disallowed is not defined %} <form method="POST"> - <input name="action" value="uninstall_package" type="hidden"> - <button class="green-button"> - {{ _('web_ui.packages.single_version.uninstall_button') }} - </button> + <input name="action" value="uninstall_package" type="hidden"> + <button class="green-button"> + {{ _('web_ui.packages.single_version.uninstall_button') }} + </button> </form> - {%- endif %} - {%- elif display_info.installed == InstalledStatus.NOT_INSTALLED %} + {% endif %} + {% elif display_info.installed == InstalledStatus.NOT_INSTALLED %} <div> {{ _('web_ui.packages.single_version.package_is_not_installed') }} </div> <form method="POST"> <input name="action" value="install_package" type="hidden"> <button class="green-button"> - {{ _('web_ui.packages.single_version.install_button') }} + {{ _('web_ui.packages.single_version.install_button') }} </button> </form> - {%- else %} + {% else %} <div> {{ _('web_ui.packages.single_version.package_install_failed') }} </div> <div> <form method="POST" class="inline-form"> - <input name="action" value="install_package" type="hidden"> - <button class="green-button"> - {{ _('web_ui.packages.single_version.retry_install_button') }} - </button> + <input name="action" value="install_package" type="hidden"> + <button class="green-button"> + {{ _('web_ui.packages.single_version.retry_install_button') }} + </button> </form> <form method="POST" class="inline-form"> - <input name="action" value="uninstall_package" type="hidden"> - <button class="green-button"> - {{ _('web_ui.packages.single_version.leave_uninstalled_button') }} - </button> + <input name="action" value="uninstall_package" type="hidden"> + <button class="green-button"> + {{ _('web_ui.packages.single_version.leave_uninstalled_button') }} + </button> </form> </div> - {%- endif %} -{%- endblock main_info %} + {% endif %} +{% endblock main_info %} {% block version_list_heading %} {{ _('web_ui.packages.single_version.version_list_heading') }} {% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja index 1b618cf..2f491e7 100644 --- a/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja @@ -26,38 +26,38 @@ in a proprietary work, I am not going to enforce this in court. <form method="POST"> <div> <label for="name_field"> - {{ _('web_ui.repos.add.name_field_label') }} + {{ _('web_ui.repos.add.name_field_label') }} </label> </div> - {% if repo_name_invalid is defined -%} + {% if repo_name_invalid is defined %} <aside class="error-note"> - {{ _('web_ui.err.repo_name_invalid') }} + {{ _('web_ui.err.repo_name_invalid') }} </aside> - {%- endif %} - {% if repo_name_taken is defined -%} + {% endif %} + {% if repo_name_taken is defined %} <aside class="error-note"> - {{ _('web_ui.err.repo_name_taken') }} + {{ _('web_ui.err.repo_name_taken') }} </aside> - {%- endif %} + {% endif %} <div> <input id="name_field" name="name" required=""> </div> <div> <label for="url_field"> - {{ _('web_ui.repos.add.url_field_label') }} + {{ _('web_ui.repos.add.url_field_label') }} </label> </div> - {% if repo_url_invalid is defined -%} + {% if repo_url_invalid is defined %} <aside class="error-note"> - {{ _('web_ui.err.repo_url_invalid') }} + {{ _('web_ui.err.repo_url_invalid') }} </aside> - {%- endif %} + {% endif %} <div> <input id="url_field" name="url" required=""> </div> <div> <button class="green-button"> - {{ _('web_ui.repos.add.submit_button') }} + {{ _('web_ui.repos.add.submit_button') }} </button> </div> </form> diff --git a/src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja index 54465a1..d910a4e 100644 --- a/src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja @@ -35,35 +35,35 @@ in a proprietary work, I am not going to enforce this in court. </div> <ul id="item_list"> {% for info in display_infos %} - <li - {% if info.deleted %} - class="repo-entry-deleted" - {% endif %} - > - <a href="{{ url_for('.show_repo', repo_id=info.ref.id) }}"> - <div> - {{ info.name }} - </div> - {% if not info.deleted %} - <div class="small-print"> - {{ info.url }} - </div> - {% endif %} - <div class="small-print"> - {{ _('web_ui.repos.package_count_{}').format(info.mapping_count) }} - </div> - </a> + {% set entry_classes = [] %} + {% if info.deleted %} + {% do entry_classes.append('repo-entry-deleted') %} + {% endif %} + <li class="{{ entry_classes|join(' ') }}"> + <a href="{{ url_for('.show_repo', repo_id=info.ref.id) }}"> + <div> + {{ info.name }} + </div> + {% if not info.deleted %} + <div class="small-print"> + {{ info.url }} + </div> + {% endif %} + <div class="small-print"> + {{ _('web_ui.repos.package_count_{}').format(info.mapping_count) }} + </div> + </a> </li> {% endfor %} <li> <a href="{{ url_for('.show_repo', repo_id=local_semirepo_info.ref.id) }}"> - {{ _('web_ui.repos.local_packages_semirepo') }} - <div class="small-print"> - {{ - _('web_ui.repos.package_count_{}') - .format(local_semirepo_info.mapping_count) - }} - </div> + {{ _('web_ui.repos.local_packages_semirepo') }} + <div class="small-print"> + {{ + _('web_ui.repos.package_count_{}') + .format(local_semirepo_info.mapping_count) + }} + </div> </a> </li> </ul> diff --git a/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja index a5998b8..b032765 100644 --- a/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja @@ -27,120 +27,120 @@ in a proprietary work, I am not going to enforce this in court. {% include 'include/checkbox_tricks_style.css.jinja' %} {% endblock %} {% block main %} - {%- if repo_communication_error is defined %} + {% if repo_communication_error is defined %} <aside class="error-note"> {{ _('web_ui.err.repo_communication_error') }} </aside> - {%- endif %} - {%- if repo_api_version_unsupported is defined %} + {% endif %} + {% if repo_api_version_unsupported is defined %} <aside class="error-note"> {{ _('web_ui.err.repo_api_version_unsupported') }} </aside> - {%- endif %} - {%- set repo_id = display_info.ref.id %} - {%- if display_info.is_local_semirepo %} + {% endif %} + {% set repo_id = display_info.ref.id %} + {% if display_info.is_local_semirepo %} <h3>{{ _('web_ui.repos.local_packages_semirepo') }}</h3> - {% else -%} + {% else %} <h3> {{ _('web_ui.repos.single.heading.name_{}').format(display_info.name) }} </h3> - {%- if repo_name_invalid is defined or repo_name_taken is defined %} - {%- set checked_attr = '' %} - {%- else %} - {%- set checked_attr = 'checked=""' %} - {%- endif %} - {%- if not display_info.deleted %} + {% if repo_name_invalid is defined or repo_name_taken is defined %} + {% set checked_attr = '' %} + {% else %} + {% set checked_attr = 'checked=""' %} + {% endif %} + {% if not display_info.deleted %} <input id="hide_name_edit_form" type="checkbox" - class="chbx-tricks-show-hide" {{ checked_attr }}> + class="chbx-tricks-show-hide" {{ checked_attr }}> <div> - <label for="hide_name_edit_form" class="green-button"> - {{ _('web_ui.repos.single.update_name_button') }} - </label> + <label for="hide_name_edit_form" class="green-button"> + {{ _('web_ui.repos.single.update_name_button') }} + </label> </div> <form method="POST"> - <input type="hidden" name="action" value="update_repo_data"> - {%- if repo_name_invalid is defined %} - <aside class="error-note"> - {{ _('web_ui.err.repo_name_invalid') }} - </aside> - {%- endif %} - {%- if repo_name_taken is defined %} - <aside class="error-note"> - {{ _('web_ui.err.repo_name_taken') }} - </aside> - {%- endif %} - <div> - <input name="name" value="{{ display_info.name }}" required=""> - </div> - <div> - <button class="green-button"> - {{ _('web_ui.repos.single.commit_update_name_button') }} - </button> - <label for="hide_url_edit_form" class="green-button"> - {{ _('web_ui.repos.single.abort_update_name_button') }} - </label> - </div> + <input type="hidden" name="action" value="update_repo_data"> + {% if repo_name_invalid is defined %} + <aside class="error-note"> + {{ _('web_ui.err.repo_name_invalid') }} + </aside> + {% endif %} + {% if repo_name_taken is defined %} + <aside class="error-note"> + {{ _('web_ui.err.repo_name_taken') }} + </aside> + {% endif %} + <div> + <input name="name" value="{{ display_info.name }}" required=""> + </div> + <div> + <button class="green-button"> + {{ _('web_ui.repos.single.commit_update_name_button') }} + </button> + <label for="hide_url_edit_form" class="green-button"> + {{ _('web_ui.repos.single.abort_update_name_button') }} + </label> + </div> </form> - {%- endif %}{# not display_info.deleted #} - {%- endif %}{# display_info.is_local_semirepo (else) #} - {% if display_info.deleted and not display_info.is_local_semirepo -%} + {% endif %}{# not display_info.deleted #} + {% endif %}{# display_info.is_local_semirepo (else) #} + {% if display_info.deleted and not display_info.is_local_semirepo %} <div> {{ _('web_ui.repos.single.repo_is_deleted') }} </div> - {%- elif not display_info.deleted %} - {%- if repo_url_invalid is defined %} - {%- set checked_attr = '' %} - {%- else %} - {%- set checked_attr = 'checked=""' %} - {%- endif %} + {% elif not display_info.deleted %} + {% if repo_url_invalid is defined %} + {% set checked_attr = '' %} + {% else %} + {% set checked_attr = 'checked=""' %} + {% endif %} <input id="hide_url_edit_form" type="checkbox" class="chbx-tricks-show-hide" - {{ checked_attr }}> + {{ checked_attr }}> <div> <div> - {{ display_info.url }} + {{ display_info.url }} </div> <div> - <label for="hide_url_edit_form" class="green-button"> - {{ _('web_ui.repos.single.update_url_button') }} - </label> + <label for="hide_url_edit_form" class="green-button"> + {{ _('web_ui.repos.single.update_url_button') }} + </label> </div> </div> <form method="POST"> <input type="hidden" name="action" value="update_repo_data"> - {%- if repo_url_invalid is defined %} - <aside class="error-note"> - {{ _('web_ui.err.repo_url_invalid') }} - </aside> - {%- endif %} + {% if repo_url_invalid is defined %} + <aside class="error-note"> + {{ _('web_ui.err.repo_url_invalid') }} + </aside> + {% endif %} <div> - <input name="url" value="{{ display_info.url }}" required=""> + <input name="url" value="{{ display_info.url }}" required=""> </div> <div> - <button class="green-button"> - {{ _('web_ui.repos.single.commit_update_url_button') }} - </button> - <label for="hide_url_edit_form" class="green-button"> - {{ _('web_ui.repos.single.abort_update_url_button') }} - </label> + <button class="green-button"> + {{ _('web_ui.repos.single.commit_update_url_button') }} + </button> + <label for="hide_url_edit_form" class="green-button"> + {{ _('web_ui.repos.single.abort_update_url_button') }} + </label> </div> </form> <div> - {% if display_info.last_refreshed is none -%} - {{ _('web_ui.repos.single.repo_never_refreshed') }} - {% else -%} - {{ - _('web_ui.repos.single.last_refreshed_{}') - .format(display_info.last_refreshed.strftime('%F %H:%M')) - }} - {% endif -%} + {% if display_info.last_refreshed is none %} + {{ _('web_ui.repos.single.repo_never_refreshed') }} + {% else %} + {{ + _('web_ui.repos.single.last_refreshed_{}') + .format(display_info.last_refreshed.strftime('%F %H:%M')) + }} + {% endif %} <form method="POST"> - <input type="hidden" name="action" value="refresh_repo"> - <button class="green-button"> - {{ _('web_ui.repos.single.refresh_now_button') }} - </button> + <input type="hidden" name="action" value="refresh_repo"> + <button class="green-button"> + {{ _('web_ui.repos.single.refresh_now_button') }} + </button> </form> </div> - {% endif -%}{# not display_info.deleted (elif) #} + {% endif %}{# not display_info.deleted (elif) #} <div> {{ _('web_ui.repos.item_count_{mappings}_{resources}') @@ -150,12 +150,12 @@ in a proprietary work, I am not going to enforce this in court. ) }} </div> - {% if not display_info.is_local_semirepo and not display_info.deleted -%} + {% if not display_info.is_local_semirepo and not display_info.deleted %} <form method="POST"> <input type="hidden" name="action" value="remove_repo"> <button class="green-button"> - {{ _('web_ui.repos.single.remove_button') }} + {{ _('web_ui.repos.single.remove_button') }} </button> </form> - {% endif -%} -{% endblock -%} + {% endif %} +{% endblock %} |