diff --git a/lib/hawat/blueprints/filters/templates/filters/creatupdate.html b/lib/hawat/blueprints/filters/templates/filters/creatupdate.html
index 74c1b8a6b37ed1cd7c739f254e31a5456ac6e6f6..bc8b7b45fc5b646dec01cae1dcf5971b1c263ad8 100644
--- a/lib/hawat/blueprints/filters/templates/filters/creatupdate.html
+++ b/lib/hawat/blueprints/filters/templates/filters/creatupdate.html
@@ -7,6 +7,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('filters.list') }}">{{ gettext('Filter management') }}</a></li>
+ <li><a href="{{ url_for('filters.show', item_id = item.id) }}">{{ gettext('Filter detail') }}</a></li>
<li class="active">{{ action_name }}</li>
</ol>
<hr>
@@ -26,17 +27,7 @@
{{ macros_site.render_form_item_default(form.filter) }}
- <div class="form-group{% if form.enabled.errors %}{{ ' has-error' }}{% endif %}">
- <div>
- {{ form.enabled.label }}
- </div>
- <div class="radio-inline">
- {%- for subfield in form.enabled %}
- <div>{{ subfield }} {{ subfield.label }}</div>
- {%- endfor %}
- </div>
- {{ macros_site.form_errors(form.enabled.errors) }}
- </div>
+ {{ macros_site.render_form_item_radiobutton(form.enabled) }}
{{ macros_site.form_errors(form.csrf_token.errors) }}
{{ form.csrf_token }}
diff --git a/lib/hawat/blueprints/filters/templates/filters/show.html b/lib/hawat/blueprints/filters/templates/filters/show.html
index 009d5edd71c452e7ceb883dee84623ba27ee4b88..f31d5b188ec727cfbd985f98fa03a896bce50d1b 100644
--- a/lib/hawat/blueprints/filters/templates/filters/show.html
+++ b/lib/hawat/blueprints/filters/templates/filters/show.html
@@ -8,7 +8,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('users.list') }}">{{ gettext('Filter management') }}</a></li>
- <li class="active">{{ gettext('Show') }}</li>
+ <li class="active">{{ gettext('Filter detail') }}</li>
</ol>
<h2>{{ hawat_view_title }}</h2>
<hr>
diff --git a/lib/hawat/blueprints/groups/templates/groups/creatupdate.html b/lib/hawat/blueprints/groups/templates/groups/creatupdate.html
index 82f46cdad4e9c4fb92e2c95c9ba73a05ce8e7f43..f0e45f47166f1df78f25c6c5f785502fcdb640c6 100644
--- a/lib/hawat/blueprints/groups/templates/groups/creatupdate.html
+++ b/lib/hawat/blueprints/groups/templates/groups/creatupdate.html
@@ -7,6 +7,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('groups.list') }}">{{ gettext('Group management') }}</a></li>
+ <li><a href="{{ url_for('groups.show', item_id = item.id) }}">{{ gettext('Group detail') }}</a></li>
<li class="active">{{ action_name }}</li>
</ol>
<hr>
diff --git a/lib/hawat/blueprints/groups/templates/groups/show.html b/lib/hawat/blueprints/groups/templates/groups/show.html
index 7ef1aac98889f4c09dbfd9f1568f8854c2174bac..31f33e68abe9898081e214d12bbf08ceb20b700d 100644
--- a/lib/hawat/blueprints/groups/templates/groups/show.html
+++ b/lib/hawat/blueprints/groups/templates/groups/show.html
@@ -8,7 +8,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('groups.list') }}">{{ gettext('Group management') }}</a></li>
- <li class="active">{{ gettext('Show') }}</li>
+ <li class="active">{{ gettext('Group detail') }}</li>
</ol>
<h2>{{ hawat_view_title }}</h2>
<hr>
diff --git a/lib/hawat/blueprints/networks/templates/networks/creatupdate.html b/lib/hawat/blueprints/networks/templates/networks/creatupdate.html
index 3ba5d86c8a82ffd51717240af2d4cea93a83bbc5..4ac6aac340108712f3cd38bbc9331bc29d72d2f3 100644
--- a/lib/hawat/blueprints/networks/templates/networks/creatupdate.html
+++ b/lib/hawat/blueprints/networks/templates/networks/creatupdate.html
@@ -7,6 +7,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('networks.list') }}">{{ gettext('Network management') }}</a></li>
+ <li><a href="{{ url_for('networks.show', item_id = item.id) }}">{{ gettext('Network detail') }}</a></li>
<li class="active">{{ action_name }}</li>
</ol>
<hr>
diff --git a/lib/hawat/blueprints/networks/templates/networks/show.html b/lib/hawat/blueprints/networks/templates/networks/show.html
index f19b9a00cb7a16212f632e6ecb3f1edb93eb79e3..9d21fb30ee6328400f2019f8a3359fb6c6d441e3 100644
--- a/lib/hawat/blueprints/networks/templates/networks/show.html
+++ b/lib/hawat/blueprints/networks/templates/networks/show.html
@@ -8,7 +8,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('networks.list') }}">{{ gettext('Network management') }}</a></li>
- <li class="active">{{ gettext('Show') }}</li>
+ <li class="active">{{ gettext('Network detail') }}</li>
</ol>
<h2>{{ hawat_view_title }}</h2>
<hr>
diff --git a/lib/hawat/blueprints/users/templates/users/creatupdate.html b/lib/hawat/blueprints/users/templates/users/creatupdate.html
index e54fe00c0171ab40c92f05a66aaa79adcb87f3aa..10a7b1b76d3ea6991f4770f1def9da373ca08153 100644
--- a/lib/hawat/blueprints/users/templates/users/creatupdate.html
+++ b/lib/hawat/blueprints/users/templates/users/creatupdate.html
@@ -7,6 +7,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('users.list') }}">{{ gettext('User management') }}</a></li>
+ <li><a href="{{ url_for('users.show', item_id = item.id) }}">{{ gettext('User detail') }}</a></li>
<li class="active">{{ action_name }}</li>
</ol>
<hr>
diff --git a/lib/hawat/blueprints/users/templates/users/show.html b/lib/hawat/blueprints/users/templates/users/show.html
index 1ea9852f8510269b6c55653a72d2e652a36b0f3f..9d1bfa7618d8bfcc58b50592bcc628a0f59dc31a 100644
--- a/lib/hawat/blueprints/users/templates/users/show.html
+++ b/lib/hawat/blueprints/users/templates/users/show.html
@@ -7,7 +7,7 @@
<ol class="breadcrumb">
<li><a href="{{ url_for('index') }}">{{ gettext('Home') }}</a></li>
<li><a href="{{ url_for('users.list') }}">{{ gettext('User management') }}</a></li>
- <li class="active">{{ gettext('Show') }}</li>
+ <li class="active">{{ gettext('User detail') }}</li>
</ol>
<h2>{{ hawat_view_title }}</h2>
<hr>