Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(View): Remove unnecessary theme view and defer basic styles #30128

Merged
merged 11 commits into from
Sep 27, 2024
Merged

chore(View): Remove unnecessary theme view and defer basic styles #30128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2260f7b
chore(View): Remove unnecessary styles
geido Sep 2, 2024
7d451c4
chore(CSP): Avoid CSP issues
geido Sep 2, 2024
5e564ba
chore(Script): Update defer script
geido Sep 2, 2024
051c28a
chore(View): Remove unnecessary styles
geido Sep 2, 2024
f957df5
chore(CSP): Avoid CSP issues
geido Sep 2, 2024
17f542f
chore(Script): Update defer script
geido Sep 2, 2024
3f3934e
Merge branch 'master' of https://github.com/apache/superset into geid…
geido Sep 27, 2024
e10d6d7
chore(Nonce): Add nonce
geido Sep 27, 2024
486f431
Merge
geido Sep 27, 2024
47cde40
chore(Logo): Lazy load logo
geido Sep 27, 2024
348f724
fix(Macros): Add macros import
geido Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
234 changes: 120 additions & 114 deletions superset/templates/superset/basic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,124 +1,130 @@
{# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
applicable law or agreed to in writing, software distributed under the License
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License. #}

<!DOCTYPE html>
{% import 'appbuilder/general/lib.html' as lib %} {% from
'superset/partials/asset_bundle.html' import css_bundle, js_bundle with context
%} {% set favicons = appbuilder.app.config['FAVICONS'] %}
<html>
<head>
{% include "head_custom_extra.html" %}
<title>
{% block title %} {% if title %} {{ title }} {% elif appbuilder and
appbuilder.app_name %} {{ appbuilder.app_name }} {% endif %} {% endblock
%}
</title>
{% block head_meta %}{% endblock %} {% block head_css %} {% for favicon in
favicons %} <link rel="{{favicon.rel if favicon.rel else "icon"}}"
type="{{favicon.type if favicon.type else "image/png"}}" {% if favicon.sizes
%}sizes={{favicon.sizes}}{% endif %} href="{{ "" if
favicon.href.startswith("http") else assets_prefix }}{{favicon.href}}" > {%
endfor %}
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/flags/flags16.css"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/fontawesome.min.css"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/regular.min.css"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/solid.min.css"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/brands.min.css"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/select2/select2.min.css"
/>
{# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
applicable law or agreed to in writing, software distributed under the License
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License. #}

{{ css_bundle("theme") }} {% if entry %} {{ css_bundle(entry) }} {% endif %}
{% endblock %} {{ js_bundle("theme") }}
<!DOCTYPE html>
{% import 'appbuilder/general/lib.html' as lib %} {% from
'superset/partials/asset_bundle.html' import css_bundle, js_bundle with context
%} {% set favicons = appbuilder.app.config['FAVICONS'] %}
<html>
<head>
{% include "head_custom_extra.html" %}
<title>
{% block title %} {% if title %} {{ title }} {% elif appbuilder and
appbuilder.app_name %} {{ appbuilder.app_name }} {% endif %} {% endblock
%}
</title>
{% block head_meta %}{% endblock %} {% block head_css %} {% for favicon in
favicons %} <link rel="{{favicon.rel if favicon.rel else "icon"}}"
type="{{favicon.type if favicon.type else "image/png"}}" {% if favicon.sizes
%}sizes={{favicon.sizes}}{% endif %} href="{{ "" if
favicon.href.startswith("http") else assets_prefix }}{{favicon.href}}" > {%
endfor %}
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/flags/flags16.css"
media="print"
onload="this.media='all'"
geido marked this conversation as resolved.
Show resolved Hide resolved
/>
geido marked this conversation as resolved.
Show resolved Hide resolved
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/fontawesome.min.css"
media="print"
onload="this.media='all'"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/solid.min.css"
media="print"
onload="this.media='all'"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/fontawesome/brands.min.css"
media="print"
onload="this.media='all'"
/>
<link
rel="stylesheet"
type="text/css"
href="{{ assets_prefix }}/static/appbuilder/css/select2/select2.min.css"
media="print"
onload="this.media='all'"
/>

<input
type="hidden"
name="csrf_token"
id="csrf_token"
value="{{ csrf_token() if csrf_token else '' }}"
/>
</head>
{{ css_bundle("theme") }} {% if entry %} {{ css_bundle(entry) }} {% endif %}
{% endblock %} {{ js_bundle("theme") }}

<body {% if standalone_mode %}class="standalone" {% endif %}>
{% block navbar %} {% if not standalone_mode %} {% include
'appbuilder/navbar.html' %} {% endif %} {% endblock %} {% block body %}
<div id="app" data-bootstrap="{{ bootstrap_data }}">
<img
src="{{ assets_prefix }}/static/assets/images/loading.gif"
style="
width: 50px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
"
<input
type="hidden"
name="csrf_token"
id="csrf_token"
value="{{ csrf_token() if csrf_token else '' }}"
/>
</div>
{% endblock %}
</head>

<!-- Modal for misc messages / alerts -->
<div
class="misc-modal modal fade"
tabindex="-1"
role="dialog"
aria-labelledby="myModalLabel"
>
<div class="modal-dialog" role="document">
<div class="modal-content" data-test="modal-content">
<div class="modal-header" data-test="modal-header">
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
data-test="modal-header-close-button"
>
<span aria-hidden="true">&times;</span>
</button>
<h4 data-test="modal-title" class="modal-title"></h4>
</div>
<div data-test="modal-body" class="modal-body"></div>
<div data-test="modal-footer" class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
Close
</button>
<body {% if standalone_mode %}class="standalone" {% endif %}>
{% block navbar %} {% if not standalone_mode %} {% include
'appbuilder/navbar.html' %} {% endif %} {% endblock %} {% block body %}
<div id="app" data-bootstrap="{{ bootstrap_data }}">
<img
src="{{ assets_prefix }}/static/assets/images/loading.gif"
style="
width: 50px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
"
/>
</div>
{% endblock %}

<!-- Modal for misc messages / alerts -->
<div
class="misc-modal modal fade"
tabindex="-1"
role="dialog"
aria-labelledby="myModalLabel"
>
<div class="modal-dialog" role="document">
<div class="modal-content" data-test="modal-content">
<div class="modal-header" data-test="modal-header">
<button
type="button"
class="close"
data-dismiss="modal"
aria-label="Close"
data-test="modal-header-close-button"
>
<span aria-hidden="true">&times;</span>
</button>
<h4 data-test="modal-title" class="modal-title"></h4>
</div>
<div data-test="modal-body" class="modal-body"></div>
<div data-test="modal-footer" class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
Close
</button>
</div>
</div>
</div>
</div>
</div>

{% block tail_js %} {% if not standalone_mode %} {{ js_bundle('menu') }} {%
endif %} {% if entry %} {{ js_bundle(entry) }} {% endif %} {% include
"tail_js_custom_extra.html" %} {% endblock %}
</body>
</html>
{% block tail_js %} {% if not standalone_mode %} {{ js_bundle('menu') }} {%
endif %} {% if entry %} {{ js_bundle(entry) }} {% endif %} {% include
"tail_js_custom_extra.html" %} {% endblock %}
</body>
</html>
Loading
Loading