Skip to content
This repository
Browse code

Simplify layout of menu edit page.

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

0 notes on commit de803dd

Please sign in to comment.
Something went wrong with that request. Please try again.