Commit 24a5704d authored by Davide Silvestri's avatar Davide Silvestri

fixed examples/layout; modified filters links and margins for filters table

parent 5ad16b1e
...@@ -5,7 +5,15 @@ body { ...@@ -5,7 +5,15 @@ body {
#content { #content {
background: white; background: white;
border: 1px solid #CCC; border: 1px solid #CCC;
padding: 5px 20px 30px 35px; padding: 15px 20px 30px 35px;
}
#content .row {
margin-left: 0px;
}
#brand {
display: inline;
} }
html, body, .container, .row, .col-md-2, .col-md-10, #content { html, body, .container, .row, .col-md-2, .col-md-10, #content {
......
...@@ -5,25 +5,25 @@ ...@@ -5,25 +5,25 @@
<h2 id="brand">{{ admin_view.name|capitalize }} list</h2> <h2 id="brand">{{ admin_view.name|capitalize }} list</h2>
{% if admin_view.can_create %} {% if admin_view.can_create %}
<div class="btn-menu"> <div class="btn-menu">
<a href="{{ url_for('.create_view', url=return_url) }}" class="btn btn-primary pull-right">{{ _gettext('Create') }}</a> <a href="{{ url_for('.create_view', url=return_url) }}" class="btn btn-primary pull-right">{{ _gettext('Create') }}</a>
</div> </div>
{% endif %} {% endif %}
{% if filter_groups %} {% if filter_groups %}
<div class="btn-group btn-menu"> <div class="btn-group btn-menu">
{{ model_layout.filter_options(btn_class='btn dropdown-toggle btn-title') }} {{ model_layout.filter_options(btn_class='btn dropdown-toggle btn-title') }}
</div> </div>
{% endif %} {% endif %}
{% if actions %} {% if actions %}
<div class="btn-group btn-menu"> <div class="btn-group btn-menu">
{{ actionlib.dropdown(actions, btn_class='btn dropdown-toggle btn-title') }} {{ actionlib.dropdown(actions, btn_class='btn dropdown-toggle btn-title') }}
</div> </div>
{% endif %} {% endif %}
{% if search_supported %} {% if search_supported %}
<div class="search-form btn-menu"> <div class="search-form btn-menu">
{{ model_layout.search_form(input_class='span2 btn-title') }} {{ model_layout.search_form(input_class='span2 btn-title') }}
</div> </div>
{% endif %} {% endif %}
<div class="clearfix"></div> <div class="clearfix"></div>
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
{% endblock %} {% endblock %}
{% block model_menu_bar %} {% block model_menu_bar %}
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -42,7 +42,7 @@ form.navbar-form div.input-append { ...@@ -42,7 +42,7 @@ form.navbar-form div.input-append {
table.filters { table.filters {
border-collapse: none; border-collapse: none;
border-spacing: 4px; border-spacing: 4px;
margin: 12px 0; margin: 12px 0px 20px 0px;
} }
...@@ -169,3 +169,11 @@ a.btn-link { ...@@ -169,3 +169,11 @@ a.btn-link {
border-radius: 4px; border-radius: 4px;
border-color: #95bee2; border-color: #95bee2;
} }
a.btn-filter, a.btn-filter:hover {
border-radius: 4px;
border-color: #adadad;
color: #333;
background-color: #ebebeb;
max-height: 32px;
}
\ No newline at end of file
...@@ -29,7 +29,7 @@ var AdminFilters = function(element, filters_element, operations, options, types ...@@ -29,7 +29,7 @@ var AdminFilters = function(element, filters_element, operations, options, types
// Filter list // Filter list
$el.append( $el.append(
$('<td/>').append( $('<td/>').append(
$('<a href="#" class="btn btn-link remove-filter" />') $('<a href="#" class="btn btn-filter remove-filter" />')
.append($('<span class="close-icon">&times;</span>')) .append($('<span class="close-icon">&times;</span>'))
.append('&nbsp;') .append('&nbsp;')
.append(name) .append(name)
......
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