Skip to content

F
flask-admin
Commit de6cbc39 authored by Serge S. Koval's avatar Serge S. Koval
Browse files
Options

Merge pull request #382 from wilsaj/replace-url-for-static-with-macro 

use a macro for generating admin static urls that can be easily replaced
parents 1c60b1c0 3d69a023
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 24 deletions
flask_admin/templates/admin/actions.html
View file @ de6cbc39
{% import 'admin/static.html' as admin_static with context %}
{% macro dropdown(actions, btn_class='dropdown-toggle') -%} {% macro dropdown(actions, btn_class='dropdown-toggle') -%}
<a class="{{ btn_class }}" data-toggle="dropdown" href="javascript:void(0)">{{ _gettext('With selected') }}<b class="caret"></b></a> <a class="{{ btn_class }}" data-toggle="dropdown" href="javascript:void(0)">{{ _gettext('With selected') }}<b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -22,7 +24,7 @@ ...@@ -22,7 +24,7 @@
{% macro script(message, actions, actions_confirmation) %} {% macro script(message, actions, actions_confirmation) %}
{% if actions %} {% if actions %}
<script src="{{ url_for('admin.static', filename='admin/js/actions.js') }}"></script> <script src="{{ admin_static.url(filename='admin/js/actions.js') }}"></script>
<script language="javascript"> <script language="javascript">
var modelActions = new AdminModelActions({{ message|tojson|safe }}, {{ actions_confirmation|tojson|safe }}); var modelActions = new AdminModelActions({{ message|tojson|safe }}, {{ actions_confirmation|tojson|safe }});
</script> </script>
......
flask_admin/templates/admin/base.html
View file @ de6cbc39
{% import 'admin/layout.html' as layout with context -%} {% import 'admin/layout.html' as layout with context -%}
{% import 'admin/static.html' as admin_static with context %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
...@@ -9,9 +10,9 @@ ...@@ -9,9 +10,9 @@
<meta name="author" content=""> <meta name="author" content="">
{% endblock %} {% endblock %}
{% block head_css %} {% block head_css %}
<link href="{{ url_for('admin.static', filename='bootstrap/css/bootstrap.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='bootstrap/css/bootstrap.css') }}" rel="stylesheet">
<link href="{{ url_for('admin.static', filename='bootstrap/css/bootstrap-responsive.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='bootstrap/css/bootstrap-responsive.css') }}" rel="stylesheet">
<link href="{{ url_for('admin.static', filename='admin/css/admin.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='admin/css/admin.css') }}" rel="stylesheet">
{% endblock %} {% endblock %}
{% block head %} {% block head %}
{% endblock %} {% endblock %}
...@@ -52,12 +53,12 @@ ...@@ -52,12 +53,12 @@
{% endblock %} {% endblock %}
{% block tail_js %} {% block tail_js %}
<script src="{{ url_for('admin.static', filename='vendor/jquery-1.8.3.min.js') }}" type="text/javascript"></script> <script src="{{ admin_static.url(filename='vendor/jquery-1.8.3.min.js') }}" type="text/javascript"></script>
<script src="{{ url_for('admin.static', filename='bootstrap/js/bootstrap.min.js') }}" type="text/javascript"></script> <script src="{{ admin_static.url(filename='bootstrap/js/bootstrap.min.js') }}" type="text/javascript"></script>
<script src="{{ url_for('admin.static', filename='select2/select2.min.js') }}" type="text/javascript"></script> <script src="{{ admin_static.url(filename='select2/select2.min.js') }}" type="text/javascript"></script>
{% endblock %} {% endblock %}
{% block tail %} {% block tail %}
{% endblock %} {% endblock %}
</body> </body>
</html> </html>
\ No newline at end of file
flask_admin/templates/admin/model/create.html
View file @ de6cbc39
{% extends 'admin/master.html' %} {% extends 'admin/master.html' %}
{% import 'admin/lib.html' as lib with context %} {% import 'admin/lib.html' as lib with context %}
{% import 'admin/static.html' as admin_static with context %}
{% macro extra() %} {% macro extra() %}
<input name="_add_another" type="submit" class="btn btn-large" value="{{ _gettext('Save and Add') }}" /> <input name="_add_another" type="submit" class="btn btn-large" value="{{ _gettext('Save and Add') }}" />
...@@ -7,8 +8,8 @@ ...@@ -7,8 +8,8 @@
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<link href="{{ url_for('admin.static', filename='select2/select2.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='select2/select2.css') }}" rel="stylesheet">
<link href="{{ url_for('admin.static', filename='datetimepicker/bootstrap-datetimepicker.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='datetimepicker/bootstrap-datetimepicker.css') }}" rel="stylesheet">
{% endblock %} {% endblock %}
{% block body %} {% block body %}
...@@ -29,6 +30,6 @@ ...@@ -29,6 +30,6 @@
{% block tail %} {% block tail %}
{{ super() }} {{ super() }}
<script src="{{ url_for('admin.static', filename='datetimepicker/bootstrap-datetimepicker.js') }}"></script> <script src="{{ admin_static.url(filename='datetimepicker/bootstrap-datetimepicker.js') }}"></script>
<script src="{{ url_for('admin.static', filename='admin/js/form.js') }}"></script> <script src="{{ admin_static.url(filename='admin/js/form.js') }}"></script>
{% endblock %} {% endblock %}
flask_admin/templates/admin/model/edit.html
View file @ de6cbc39
{% extends 'admin/master.html' %} {% extends 'admin/master.html' %}
{% import 'admin/lib.html' as lib with context %} {% import 'admin/lib.html' as lib with context %}
{% import 'admin/static.html' as admin_static with context %}
{% macro extra() %} {% macro extra() %}
<input name="_continue_editing" type="submit" class="btn btn-large" value="{{ _gettext('Save and Continue') }}" /> <input name="_continue_editing" type="submit" class="btn btn-large" value="{{ _gettext('Save and Continue') }}" />
...@@ -7,8 +8,8 @@ ...@@ -7,8 +8,8 @@
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<link href="{{ url_for('admin.static', filename='select2/select2.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='select2/select2.css') }}" rel="stylesheet">
<link href="{{ url_for('admin.static', filename='datetimepicker/bootstrap-datetimepicker.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='datetimepicker/bootstrap-datetimepicker.css') }}" rel="stylesheet">
{% endblock %} {% endblock %}
{% block body %} {% block body %}
...@@ -20,6 +21,6 @@ ...@@ -20,6 +21,6 @@
{% block tail %} {% block tail %}
{{ super() }} {{ super() }}
<script src="{{ url_for('admin.static', filename='datetimepicker/bootstrap-datetimepicker.js') }}"></script> <script src="{{ admin_static.url(filename='datetimepicker/bootstrap-datetimepicker.js') }}"></script>
<script src="{{ url_for('admin.static', filename='admin/js/form.js') }}"></script> <script src="{{ admin_static.url(filename='admin/js/form.js') }}"></script>
{% endblock %} {% endblock %}
flask_admin/templates/admin/model/list.html
View file @ de6cbc39
{% extends 'admin/master.html' %} {% extends 'admin/master.html' %}
{% import 'admin/lib.html' as lib with context %} {% import 'admin/lib.html' as lib with context %}
{% import 'admin/static.html' as admin_static with context%}
{% import 'admin/model/layout.html' as model_layout with context %} {% import 'admin/model/layout.html' as model_layout with context %}
{% import 'admin/actions.html' as actionlib with context %} {% import 'admin/actions.html' as actionlib with context %}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<link href="{{ url_for('admin.static', filename='select2/select2.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='select2/select2.css') }}" rel="stylesheet">
<link href="{{ url_for('admin.static', filename='datetimepicker/bootstrap-datetimepicker.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='datetimepicker/bootstrap-datetimepicker.css') }}" rel="stylesheet">
{% endblock %} {% endblock %}
{% block body %} {% block body %}
...@@ -142,9 +143,9 @@ ...@@ -142,9 +143,9 @@
{% block tail %} {% block tail %}
{{ super() }} {{ super() }}
<script src="{{ url_for('admin.static', filename='datetimepicker/bootstrap-datetimepicker.js') }}"></script> <script src="{{ admin_static.url(filename='datetimepicker/bootstrap-datetimepicker.js') }}"></script>
<script src="{{ url_for('admin.static', filename='admin/js/form.js') }}"></script> <script src="{{ admin_static.url(filename='admin/js/form.js') }}"></script>
<script src="{{ url_for('admin.static', filename='admin/js/filters.js') }}"></script> <script src="{{ admin_static.url(filename='admin/js/filters.js') }}"></script>
{{ actionlib.script(_gettext('Please select at least one model.'), {{ actionlib.script(_gettext('Please select at least one model.'),
actions, actions,
......
flask_admin/templates/admin/rediscli/console.html
View file @ de6cbc39
{% extends 'admin/master.html' %} {% extends 'admin/master.html' %}
{% import 'admin/lib.html' as lib with context %} {% import 'admin/lib.html' as lib with context %}
{% import 'admin/static.html' as admin_static with context%}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<link href="{{ url_for('admin.static', filename='admin/css/rediscli.css') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='admin/css/rediscli.css') }}" rel="stylesheet">
{% endblock %} {% endblock %}
{% block body %} {% block body %}
...@@ -20,10 +21,10 @@ ...@@ -20,10 +21,10 @@
{% block tail %} {% block tail %}
{{ super() }} {{ super() }}
<script src="{{ url_for('admin.static', filename='admin/js/rediscli.js') }}"></script> <script src="{{ admin_static.url(filename='admin/js/rediscli.js') }}"></script>
<script language="javascript"> <script language="javascript">
$(function() { $(function() {
var redisCli = new RedisCli({{ url_for('.execute_view')|tojson }}); var redisCli = new RedisCli({{ url_for('.execute_view')|tojson }});
}); });
</script> </script>
{% endblock %} {% endblock %}
\ No newline at end of file
flask_admin/templates/admin/static.html 0 → 100644
View file @ de6cbc39
{% macro url() -%}
{{ url_for('admin.static', *varargs, **kwargs) }}
{%- endmacro %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment