Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Simplify layout of menu edit page.

  • Loading branch information...
commit de803dd350f81ad6c3f37d059026dccc50f83ac5 1 parent ce30dc2
@mworrell mworrell authored
View
2  modules/mod_admin/templates/_action_dialog_connect.tpl
@@ -1,7 +1,7 @@
{% with callback|default:q.callback|default:"window.zAdminConnectDone" as callback %}
{% with language|default:q.language|default:z_language as language %}
{% with actions|default:[] as actions %}
-{% with stay|default:(not not callback) as stay %}
+{% with stay or callback or subject_id as stay %}
<ul class="nav nav-pills">
{% if q.is_zmedia %}
<li class="active">
View
2  modules/mod_admin/templates/admin_edit.tpl
@@ -47,6 +47,8 @@
<input type="hidden" name="id" value="{{ id }}" />
<div class="span8" id="poststuff">
+ {% block admin_edit_form_top %}{% endblock %}
+
{% all catinclude "_admin_edit_basics.tpl" id is_editable=is_editable languages=languages %}
{% include "_admin_edit_content_address.tpl" %}
{% all catinclude "_admin_edit_content.tpl" id is_editable=is_editable languages=languages %}
View
12 modules/mod_menu/templates/_admin_menu_menu_view.tpl
@@ -1,6 +1,9 @@
<div class="widget" id="{{ #menu }}">
<h3 class="widget-header">
{_ Current menu _}
+ </h3>
+ <div class="widget-content">
+
<span class="btn-group pull-right">
<a href="#" class="btn dropdown-toggle" data-toggle="dropdown">{_ Add menu item _} <span class="caret"></span></a>
<ul class="dropdown-menu">
@@ -9,8 +12,13 @@
<li><a href="#" data-where="bottom">&darr; {_ Add bottom _}</a></li>
</ul>
</span>
- </h3>
- <div class="widget-content">
+
+ <p>
+ {_ Click on <strong>Add menu item</strong> or <strong>Menu item</strong> to add pages. _}
+ <br/>{_ Drag menu items in the menu up, down, left or right to structure the menu. _}
+ </p>
+
+
<ul class="tree-list do_menuedit" id="menu-{{ id }}">
{% for mid, path, action in id.menu|menu_flat %}
{% with forloop.counter as c %}
View
15 modules/mod_menu/templates/admin_edit.menu.tpl
@@ -1,23 +1,10 @@
{% extends "admin_edit.tpl" %}
-{% block admin_edit_form_pre %}
+{% block admin_edit_form_top %}
{# Edit the menu #}
<div class="row edit-header">
-
<div id="menu-editor" class="span8">
{% include "_admin_menu_menu_view.tpl" id=id %}
</div>
-
- <div class="span4">
- <div class="widget">
- <h3 class="widget-header">{_ How does this work? _}</h3>
- <div class="widget-content">
- <p>
- {_ Click on <strong>Add menu item</strong> or <strong>Menu item</strong> to add pages. _}
- {_ Drag menu items in the menu up, down, left or right to structure the menu. _}
- </p>
- </div>
- </div>
- </div>
</div>
{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.