mirror of
https://github.com/apache/superset.git
synced 2024-09-12 16:49:40 -04:00
Cleaning up the html indentation on explore.html
This commit is contained in:
Maxime Beauchemin
parent
6b069c6741
commit
eb13ce1840
@ -29,11 +29,11 @@
|
|||||||
|
|
||||||
{% block footer %}
|
{% block footer %}
|
||||||
<footer>
|
<footer>
|
||||||
<div class="img-rounded nav-fixed-bottom">
|
<div class="img-rounded nav-fixed-bottom">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
{% include 'appbuilder/footer.html' %}
|
{% include 'appbuilder/footer.html' %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -14,3 +14,6 @@
|
|||||||
<script src="/static/lib/select2.sortable.js"></script>
|
<script src="/static/lib/select2.sortable.js"></script>
|
||||||
{{ super() }}
|
{{ super() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
{% block footer %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
|||||||
@ -19,152 +19,153 @@
|
|||||||
|
|
||||||
<div class="container-fluid datasource">
|
<div class="container-fluid datasource">
|
||||||
<form id="query" method="GET" style="display: none;">
|
<form id="query" method="GET" style="display: none;">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<a class="btn btn-primary" data-toggle="tooltip" title="Slice!">
|
<a class="btn btn-primary" data-toggle="tooltip" title="Slice!">
|
||||||
<i class="fa fa-bolt"></i>
|
<i class="fa fa-bolt"></i>
|
||||||
</a>
|
</a>
|
||||||
<span class="btn btn-default notbtn">
|
<span class="btn btn-default notbtn">
|
||||||
<strong>{{ datasource.full_name }}</strong>
|
<strong>{{ datasource.full_name }}</strong>
|
||||||
{% if datasource.description %}
|
{% if datasource.description %}
|
||||||
<i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{ datasource.description }}"></i>
|
<i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{ datasource.description }}"></i>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a class="" href="/{{ datasource.baselink }}/edit/{{ datasource.id }}" data-toggle="tooltip" title="Edit datasource">
|
<a class="" href="/{{ datasource.baselink }}/edit/{{ datasource.id }}" data-toggle="tooltip" title="Edit datasource">
|
||||||
<i class="fa fa-edit"></i>
|
<i class="fa fa-edit"></i>
|
||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
<span>{{ form.get_field("viz_type")(class_="select2") }}</span>
|
<span>{{ form.get_field("viz_type")(class_="select2") }}</span>
|
||||||
<span class="btn btn-info pull-right"
|
<span class="btn btn-info pull-right"
|
||||||
data-toggle="modal" data-target="#query_modal">query</span>
|
data-toggle="modal" data-target="#query_modal">query</span>
|
||||||
<hr/>
|
<hr/>
|
||||||
</font>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div id="form_container" class="col-md-3">
|
<div id="form_container" class="col-md-3">
|
||||||
|
{% for fieldset in form.fieldsets %}
|
||||||
{% for fieldset in form.fieldsets %}
|
<fieldset class="fs-style">
|
||||||
<fieldset class="fs-style">
|
{% if fieldset.label %}
|
||||||
{% if fieldset.label %}
|
<legend class="legend-style">
|
||||||
<legend class="legend-style">
|
<span class="legend_label">{{ fieldset.label }}</span>
|
||||||
<span class="legend_label">{{ fieldset.label }}</span>
|
{% if fieldset.description %}
|
||||||
{% if fieldset.description %}
|
<i class="fa fa-info-circle" data-toggle="tooltip"
|
||||||
<i class="fa fa-info-circle" data-toggle="tooltip"
|
data-placement="bottom"
|
||||||
data-placement="bottom"
|
title="{{ fieldset.description }}"></i>
|
||||||
title="{{ fieldset.description }}"></i>
|
{% endif %}
|
||||||
{% endif %}
|
<span class="collapser"> [-]</span>
|
||||||
<span class="collapser"> [-]</span>
|
</legend>
|
||||||
</legend>
|
{% endif %}
|
||||||
{% endif %}
|
<div class="fieldset_content">
|
||||||
<div class="fieldset_content">
|
{% for fieldname in fieldset.fields %}
|
||||||
{% for fieldname in fieldset.fields %}
|
{% if not fieldname.__iter__ %}
|
||||||
{% if not fieldname.__iter__ %}
|
{{ panofield(fieldname) }}
|
||||||
{{ panofield(fieldname) }}
|
{% else %}
|
||||||
{% else %}
|
<div class="row">
|
||||||
<div class="row">
|
<div class="form-group">
|
||||||
<div class="form-group">
|
{% for name in fieldname %}
|
||||||
{% for name in fieldname %}
|
<div class="col-xs-{{ (12 / fieldname|length) | int }}">
|
||||||
<div class="col-xs-{{ (12 / fieldname|length) | int }}">
|
{% if name %}
|
||||||
{% if name %}
|
{{ panofield(name) }}
|
||||||
{{ panofield(name) }}
|
{% endif %}
|
||||||
{% endif %}
|
</div>
|
||||||
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
{% endfor %}
|
||||||
|
<fieldset class="fs-style">
|
||||||
|
<legend class="legend-style">
|
||||||
|
<span class="legend_label">Filters</span>
|
||||||
|
<i class="fa fa-info-circle" data-toggle="tooltip"
|
||||||
|
data-placement="bottom"
|
||||||
|
title="Filters are defined using comma delimited strings as in 'US,FR,Other'"></i>
|
||||||
|
<span class="collapser"> [-]</span>
|
||||||
|
</legend>
|
||||||
|
<div class="fieldset_content">
|
||||||
|
<div id="flt0" style="display: none;">
|
||||||
|
<span class="">{{ form.flt_col_0(class_="form-control inc") }}</span>
|
||||||
|
<div class="row">
|
||||||
|
<span class="col col-sm-4">{{ form.flt_op_0(class_="form-control inc") }}</span>
|
||||||
|
<span class="col col-sm-6">{{ form.flt_eq_0(class_="form-control inc") }}</span>
|
||||||
|
<button type="button" class="btn btn-sm remove" aria-label="Delete filter">
|
||||||
|
<span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
<div id="filters"></div>
|
||||||
{% endfor %}
|
<button type="button" id="plus" class="btn btn-sm" aria-label="Add a filter">
|
||||||
|
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
{% endfor %}
|
<button type="button" class="btn btn-primary druidify">
|
||||||
<fieldset class="fs-style">
|
<i class="fa fa-bolt"></i>
|
||||||
<legend class="legend-style">
|
Slice!
|
||||||
<span class="legend_label">Filters</span>
|
|
||||||
<i class="fa fa-info-circle" data-toggle="tooltip"
|
|
||||||
data-placement="bottom"
|
|
||||||
title="Filters are defined using comma delimited strings as in 'US,FR,Other'"></i>
|
|
||||||
<span class="collapser"> [-]</span>
|
|
||||||
</legend>
|
|
||||||
<div class="fieldset_content">
|
|
||||||
<div id="flt0" style="display: none;">
|
|
||||||
<span class="">{{ form.flt_col_0(class_="form-control inc") }}</span>
|
|
||||||
<div class="row">
|
|
||||||
<span class="col col-sm-4">{{ form.flt_op_0(class_="form-control inc") }}</span>
|
|
||||||
<span class="col col-sm-6">{{ form.flt_eq_0(class_="form-control inc") }}</span>
|
|
||||||
<button type="button" class="btn btn-sm remove" aria-label="Delete filter">
|
|
||||||
<span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div id="filters"></div>
|
|
||||||
<button type="button" id="plus" class="btn btn-sm" aria-label="Add a filter">
|
|
||||||
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
<button type="button" class="btn btn-primary druidify">
|
|
||||||
<i class="fa fa-bolt"></i>
|
|
||||||
Slice!
|
|
||||||
</button>
|
|
||||||
{% if viz.form_data.slice_id %}
|
|
||||||
<button type="button" class="btn btn-default" id="btn_overwrite">
|
|
||||||
<i class="fa fa-save"></i>
|
|
||||||
Overwrite
|
|
||||||
</button>
|
</button>
|
||||||
{% endif %}
|
{% if viz.form_data.slice_id %}
|
||||||
<button type="button" class="btn btn-default" id="btn_save">
|
<button type="button" class="btn btn-default" id="btn_overwrite">
|
||||||
<i class="fa fa-plus-circle"></i>
|
<i class="fa fa-save"></i>
|
||||||
Save as
|
Overwrite
|
||||||
</button>
|
</button>
|
||||||
<img src="{{ url_for("static", filename="img/tux_panoramix.png") }}" width=250>
|
|
||||||
{{ form.slice_id() }}
|
|
||||||
{{ form.slice_name() }}
|
|
||||||
{{ form.collapsed_fieldsets() }}
|
|
||||||
<input type="hidden" name="action" id="action" value="">
|
|
||||||
<input type="hidden" name="datasource_name" value="{{ datasource.name }}">
|
|
||||||
<input type="hidden" name="datasource_id" value="{{ datasource.id }}">
|
|
||||||
<input type="hidden" name="datasource_type" value="{{ datasource.type }}">
|
|
||||||
<input type="hidden" name="previous_viz_type" value="{{ viz.viz_type or "table" }}">
|
|
||||||
<br>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-md-9">
|
|
||||||
{% block messages %}
|
|
||||||
{% endblock %}
|
|
||||||
{% include 'appbuilder/flash.html' %}
|
|
||||||
<div
|
|
||||||
class="viz widget"
|
|
||||||
data-widget="{{ viz.get_data_attribute() }}"
|
|
||||||
style="height: 700px;">
|
|
||||||
{% block viz_html %}
|
|
||||||
{% if viz.error_msg %}
|
|
||||||
<div class="alert alert-danger">{{ viz.error_msg }}</div>
|
|
||||||
{% endif %}
|
|
||||||
{% if viz.warning_msg %}
|
|
||||||
<div class="alert alert-warning">{{ viz.warning_msg }}</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal fade" id="query_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
|
|
||||||
<div class="modal-dialog" role="document">
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
|
||||||
<h4 class="modal-title" id="myModalLabel">Query</h4>
|
|
||||||
</div>
|
|
||||||
<div class="modal-body">
|
|
||||||
<pre id="query_container">
|
|
||||||
{% if viz.query %}
|
|
||||||
{% else %}
|
|
||||||
<img width="250" src="{{ url_for('static', filename="img/penguins.png") }}">
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</pre>
|
<button type="button" class="btn btn-default" id="btn_save">
|
||||||
|
<i class="fa fa-plus-circle"></i>
|
||||||
|
Save as
|
||||||
|
</button>
|
||||||
|
<img src="{{ url_for("static", filename="img/tux_panoramix.png") }}" width=250 alt="Tux">
|
||||||
|
{{ form.slice_id() }}
|
||||||
|
{{ form.slice_name() }}
|
||||||
|
{{ form.collapsed_fieldsets() }}
|
||||||
|
<input type="hidden" name="action" id="action" value="">
|
||||||
|
<input type="hidden" name="datasource_name" value="{{ datasource.name }}">
|
||||||
|
<input type="hidden" name="datasource_id" value="{{ datasource.id }}">
|
||||||
|
<input type="hidden" name="datasource_type" value="{{ datasource.type }}">
|
||||||
|
<input type="hidden" name="previous_viz_type" value="{{ viz.viz_type or "table" }}">
|
||||||
|
<br>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
|
<div class="col-md-9">
|
||||||
|
{% block messages %}
|
||||||
|
{% endblock %}
|
||||||
|
{% include 'appbuilder/flash.html' %}
|
||||||
|
<div
|
||||||
|
class="viz widget"
|
||||||
|
data-widget="{{ viz.get_data_attribute() }}"
|
||||||
|
style="height: 700px;">
|
||||||
|
{% block viz_html %}
|
||||||
|
{% if viz.error_msg %}
|
||||||
|
<div class="alert alert-danger">{{ viz.error_msg }}</div>
|
||||||
|
{% endif %}
|
||||||
|
{% if viz.warning_msg %}
|
||||||
|
<div class="alert alert-warning">{{ viz.warning_msg }}</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal fade" id="query_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
|
||||||
|
<div class="modal-dialog" role="document">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||||
|
<span aria-hidden="true">×</span>
|
||||||
|
</button>
|
||||||
|
<h4 class="modal-title">Query</h4>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<pre id="query_container">
|
||||||
|
{% if viz.query %}
|
||||||
|
{% else %}
|
||||||
|
<img width="250" src="{{ url_for('static', filename="img/penguins.png") }}" alt="Under construction">
|
||||||
|
{% endif %}
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user