globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Defer and clean up JS scripts

Browse source
This commit is contained in:
Éloi Rivard 2023-06-26 18:00:58 +02:00
parent c091ca19cf
commit 7b9e97f5e4
17 changed files with 18 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
canaille/static/js/users.js
View file

@ -1,10 +0,0 @@
$( function () {
$('.delete-user').click(function(event){
event.preventDefault();
var that = this;
$('.delete-confirmation').unbind('click').click(function(){
window.location.href = $(that).attr('href');
});
$('.ui.basic.modal').modal('show');
});
});

3
canaille/templates/group.html
View file

@ -11,8 +11,7 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/confirm.js"></script>
<script src="/static/js/users.js"></script>
<script src="/static/js/confirm.js" defer></script>
{% endblock %}
{% block submenu %}

2
canaille/templates/invite.html
View file

@ -6,7 +6,7 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/copy.js"></script>
<script src="/static/js/copy.js" defer></script>
{% endblock %}
{% block submenu %}

4
canaille/templates/oidc/admin/authorization_list.html
View file

@ -5,10 +5,6 @@
{%- trans %}Codes{% endtrans -%}
{%- endblock -%}
{% block script %}
<script src="/static/js/users.js"></script>
{% endblock %}
{% block submenu %}
<nav class="ui bottom attached five item borderless menu">
<a class="item" href="{{ url_for('admin.mail_index') }}">

2
canaille/templates/oidc/admin/client_edit.html
View file

@ -6,7 +6,7 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/admin/client_edit.js"></script>
<script src="/static/js/admin/client_edit.js" defer></script>
{% endblock %}
{% block submenu %}

4
canaille/templates/oidc/admin/client_list.html
View file

@ -5,10 +5,6 @@
{%- trans %}Clients{% endtrans -%}
{%- endblock -%}
{% block script %}
<script src="/static/js/users.js"></script>
{% endblock %}
{% block submenu %}
<nav class="ui bottom attached five item borderless menu">
<a class="item" href="{{ url_for('admin.mail_index') }}">

4
canaille/templates/oidc/admin/token_list.html
View file

@ -5,10 +5,6 @@
{%- trans %}Tokens{% endtrans -%}
{%- endblock -%}
{% block script %}
<script src="/static/js/users.js"></script>
{% endblock %}
{% block submenu %}
<nav class="ui bottom attached five item borderless menu">
<a class="item" href="{{ url_for('admin.mail_index') }}">

4
canaille/templates/oidc/admin/token_view.html
View file

@ -6,8 +6,8 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/confirm.js"></script>
<script src="/static/js/copy.js"></script>
<script src="/static/js/confirm.js" defer></script>
<script src="/static/js/copy.js" defer></script>
{% endblock %}
{% block submenu %}

4
canaille/templates/oidc/user/consent_list.html
View file

@ -4,10 +4,6 @@
{%- trans %}My consents{% endtrans -%}
{%- endblock -%}
{% block script %}
<script src="/static/js/users.js"></script>
{% endblock %}
{% block submenu %}
<nav class="ui bottom attached two item borderless menu">
<a class="active item" href="{{ url_for('oidc.consents.consents') }}">

4
canaille/templates/oidc/user/preconsent_list.html
View file

@ -4,10 +4,6 @@
{%- trans %}My consents{% endtrans -%}
{%- endblock -%}
{% block script %}
<script src="/static/js/users.js"></script>
{% endblock %}
{% block submenu %}
<nav class="ui bottom attached two item borderless menu">
<a class="item" href="{{ url_for('oidc.consents.consents') }}">

3
canaille/templates/profile_add.html
View file

@ -6,8 +6,7 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/confirm.js"></script>
<script src="/static/js/profile.js"></script>
<script src="/static/js/profile.js" defer></script>
{% endblock %}
{% block submenu %}

3
canaille/templates/profile_edit.html
View file

@ -12,8 +12,7 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/confirm.js"></script>
<script src="/static/js/profile.js"></script>
<script src="/static/js/profile.js" defer></script>
{% endblock %}
{% block submenu %}

3
canaille/templates/profile_settings.html
View file

@ -10,8 +10,7 @@
{%- endblock -%}
{% block script %}
<script src="/static/js/confirm.js"></script>
<script src="/static/js/profile.js"></script>
<script src="/static/js/confirm.js" defer></script>
{% endblock %}
{% block submenu %}

4
canaille/templates/users.html
View file

@ -5,10 +5,6 @@
{%- trans %}Users{% endtrans -%}
{%- endblock -%}
{% block script %}
<script src="/static/js/users.js"></script>
{% endblock %}
{% block submenu %}
<nav class="ui bottom attached {% if has_smtp %}three{% else %}two{% endif %} item borderless menu">
<a class="active item" href="{{ url_for('account.users') }}">

8
canaille/themes/default/base.html
View file

@ -87,15 +87,15 @@
<a href="{{ url_for('account.about') }}">{{ _("About Canaille") }}</a>
</footer>
{% if not is_boosted %}
<script src="/static/jquery/jquery.min.js"></script>
<script src="/static/fomanticui/semantic.min.js"></script>
<script src="/static/jquery/jquery.min.js" defer></script>
<script src="/static/fomanticui/semantic.min.js" defer></script>
{% if config.get("HTMX", true) %}
<script src="/static/htmx/htmx.min.js"></script>
<script src="/static/htmx/htmx.min.js" defer></script>
<script>
htmx.config.requestClass = "loading"
</script>
{% endif %}
<script src="/static/js/base.js"></script>
<script src="/static/js/base.js" defer></script>
{% endif %}
{% block script %}{% endblock %}
</body>

6
demo/client/templates/index.html
View file

@ -135,9 +135,9 @@
</div>
</div>
<script src="/static/jquery/jquery.min.js"></script>
<script src="/static/fomanticui/semantic.min.js"></script>
<script src="/static/js/base.js"></script>
<script src="/static/jquery/jquery.min.js" defer></script>
<script src="/static/fomanticui/semantic.min.js" defer></script>
<script src="/static/js/base.js" defer></script>
{% block script %}{% endblock %}
</body>
</html>

6
tests/app/fixtures/themes/test/base.html
View file

@ -93,9 +93,9 @@
<footer>
<a href="{{ url_for('account.about') }}">{{ _("About canaille") }}</a>
</footer>
<script src="/static/jquery/jquery.min.js"></script>
<script src="/static/fomanticui/semantic.min.js"></script>
<script src="/static/js/base.js"></script>
<script src="/static/jquery/jquery.min.js" defer></script>
<script src="/static/fomanticui/semantic.min.js" defer></script>
<script src="/static/js/base.js" defer></script>
{% block script %}{% endblock %}
TEST_THEME