-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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.
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
fix: Invalid references in the basic template #26302
Merged
michael-s-molina
merged 2 commits into
apache:master
from
michael-s-molina:cleanup-basic-template
Jan 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,116 +1,118 @@ | ||
| {# | ||
| 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. | ||
| #} | ||
| {# 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'] %} | ||
| {% 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> | ||
| <title> | ||
| {% block title %} | ||
| {% if title %} | ||
| {{ title }} | ||
| {% elif appbuilder and appbuilder.app_name %} | ||
| {{ appbuilder.app_name }} | ||
| {% endif %} | ||
| {% endblock %} | ||
| {% 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/datepicker/bootstrap-datepicker.css"> | ||
| <link rel="stylesheet" type="text/css" href="{{ assets_prefix }}/static/appbuilder/datepicker/bootstrap-datepicker.css"> | ||
| <link rel="stylesheet" type="text/css" href="{{ assets_prefix }}/static/appbuilder/select2/select2.css"> | ||
| <link rel="stylesheet" type="text/css" href="{{ assets_prefix }}/static/appbuilder/select2/select2-bootstrap-theme.css"> | ||
|
|
||
| {{ css_bundle("theme") }} | ||
| {% 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" | ||
| /> | ||
|
|
||
| {% if entry %} | ||
| {{ css_bundle(entry) }} | ||
| {% endif %} | ||
|
|
||
| {% endblock %} | ||
|
|
||
| {{ js_bundle("theme") }} | ||
| {{ css_bundle("theme") }} {% if entry %} {{ css_bundle(entry) }} {% endif %} | ||
| {% endblock %} {{ js_bundle("theme") }} | ||
|
|
||
| <input | ||
| type="hidden" | ||
| name="csrf_token" | ||
| id="csrf_token" | ||
| value="{{ csrf_token() if csrf_token else '' }}" | ||
| > | ||
| /> | ||
| </head> | ||
|
|
||
| <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> | ||
| <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="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"> | ||
| <button | ||
| type="button" | ||
| class="close" | ||
| data-dismiss="modal" | ||
| aria-label="Close" | ||
| data-test="modal-header-close-button" | ||
| > | ||
| <span aria-hidden="true">×</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-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> | ||
| <button type="button" class="btn btn-default" data-dismiss="modal"> | ||
| Close | ||
| </button> | ||
| </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 %} | ||
| {% 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> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The actual change is fixing these 4 lines. The rest is just HTML formatting.