zen 0.3 → 0.4

data/lib/zen/package/menus/lib/menus/public/admin/menus/js/menu_items.js

@@ -0,0 +1,38 @@
+"use strict";
+
+/**
+ * Allows users to sort menu items and assign them to parent items by dragging
+ * them.
+ *
+ * @since 09-02-2012
+ */
+window.addEvent('domready', function()
+{
+    var container = $('menu_items');
+
+    // NestedSortables triggers events whenever all child elements of a list are
+    // clicked. This prevents that from happening which in turn leads to fewer
+    // async calls to the server.
+    $$('.menu_item input, .menu_item a').addEvent('mousedown', function(e)
+    {
+        e.stopPropagation();
+    });
+
+    if ( container && container.get('data-editable') !== 'false' )
+    {
+        var tree = new NestedSortables('menu_items',
+        {
+            ghostOffset: {x: 0, y: 0},
+            handleClass: 'menu_item',
+            onComplete:  function()
+            {
+                new Request(
+                {
+                    url:    '/admin/menu-items/tree',
+                    method: 'POST',
+                    data:   {menu_items: tree.serializeArray()}
+                }).send();
+            }
+        });
+    }
+});

data/lib/zen/package/menus/lib/menus/view/admin/menu-items/form.xhtml

@@ -3,65 +3,55 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{form_for(
-      @menu_item,
-      :method => :post,
-      :action => Menus::Controller::MenuItems.r(:save),
-      :id     => :menu_item_form
-    ) do |f|
-      f.input_hidden(:csrf_token, get_csrf_token)
-      f.input_hidden(:id        , @menu_item.id)
-      f.input_hidden(:menu_id   , @menu_id)
-
-      f.input_text(
-        lang('menu_items.labels.name'),
-        :name,
-        :title     => lang('menu_items.descriptions.name'),
-        :required  => :required,
-        :maxlength => 255
-      )
-
-      f.input_text(
-        lang('menu_items.labels.url'),
-        :url,
-        :title     => lang('menu_items.descriptions.url'),
-        :required  => :required,
-        :maxlength => 255
-      )
-
-      f.input_text(
-        lang('menu_items.labels.order'),
-        :sort_order,
-        :title   => lang('menu_items.descriptions.order'),
-        :pattern => '\\\d*'
-      )
-
-      f.select(
-        lang('menu_items.labels.parent_id'),
-        :parent_id,
-        :values   => menu_item_tree(@menu_id),
-        :selected => @menu_item.parent_id,
-        :size     => 1
-      )
-
-      f.input_text(
-        lang('menu_items.labels.html_class'),
-        :html_class,
-        :title     => lang('menu_items.descriptions.html_class'),
-        :maxlength => 255,
-        :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
-      )
-
-      f.input_text(
-        lang('menu_items.labels.html_id'),
-        :html_id,
-        :title     => lang('menu_items.descriptions.html_id'),
-        :maxlength => 255,
-        :pattern   => '^[a-zA-Z\\\-_0-9]*$'
-      )
-
-      f.g.div(:class => :button) do
-        f.g.input(:type => :submit, :value => lang('menu_items.buttons.save'))
-      end
-    end}
+    <div class="body">
+        #{form_for(
+          @menu_item,
+          :method              => :post,
+          :action              => Menus::Controller::MenuItems.r(:save),
+          :id                  => :menu_item_form,
+          :'data-autosave-url' => Menus::Controller::MenuItems.r(:autosave)
+        ) do |f|
+          f.input_hidden(:csrf_token, get_csrf_token)
+          f.input_hidden(:id        , @menu_item.id)
+          f.input_hidden(:menu_id   , @menu_id)
+
+          f.input_text(
+            lang('menu_items.labels.name'),
+            :name,
+            :title     => lang('menu_items.descriptions.name'),
+            :required  => :required,
+            :maxlength => 255
+          )
+
+          f.input_text(
+            lang('menu_items.labels.url'),
+            :url,
+            :title     => lang('menu_items.descriptions.url'),
+            :required  => :required,
+            :maxlength => 255
+          )
+
+          f.input_text(
+            lang('menu_items.labels.html_class'),
+            :html_class,
+            :title     => lang('menu_items.descriptions.html_class'),
+            :maxlength => 255,
+            :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
+          )
+
+          f.input_text(
+            lang('menu_items.labels.html_id'),
+            :html_id,
+            :title     => lang('menu_items.descriptions.html_id'),
+            :maxlength => 255,
+            :pattern   => '^[a-zA-Z\\\-_0-9]*$'
+          )
+
+          f.g.input(
+            :type  => :submit,
+            :value => lang('menu_items.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>

data/lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml

@@ -1,95 +1,32 @@
 <section>
-    #{render_search_form(::Menus::Controller::MenuItems.r(:index, @menu_id))}
-
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    <form method="post" action="#{Menus::Controller::MenuItems.r(:delete)}">
-        <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
-
-        <?r if !@menu_items.empty? ?>
-
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_menu_item) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
-
-                    <th>#{lang('menu_items.labels.id')}</th>
-                    <th>#{lang('menu_items.labels.name')}</th>
-                    <th>#{lang('menu_items.labels.url')}</th>
-                    <th>#{lang('menu_items.labels.parent_id')}</th>
-                    <th>#{lang('menu_items.labels.order')}</th>
-                    <th>#{lang('menu_items.labels.html_class')}</th>
-                    <th>#{lang('menu_items.labels.html_id')}</th>
-                </tr>
-            </thead>
-            <tbody>
-
-                <?r @menu_items.each do |item| ?>
-                <tr>
-                    <?r if user_authorized?(:delete_menu_item) ?>
-                    <td>
-                        <input name="menu_item_ids[]" type="checkbox"
-                        value="#{item.id}" />
-                    </td>
-                    <?r end ?>
-
-                    <td>#{item.id}</td>
-
-                    <td>
-                        #{if user_authorized?(:edit_menu_item)
-                          Menus::Controller::MenuItems.a(
-                            item.name,
-                            :edit,
-                            @menu_id,
-                            item.id
-                          )
-                        else
-                          item.name
-                        end}
-                    </td>
-
-                    <td>
-                        <a href="#{item.url}">#{item.url}</a>
-                    </td>
-
-                    <td>#{item.ancestors.map { |a| a.name }.join(', ')}</td>
-                    <td>#{item.sort_order}</td>
-                    <td>#{item.html_class}</td>
-                    <td>#{item.html_id}</td>
-                </tr>
-                <?r end ?>
+    <div class="body">
+        <form method="post" action="#{Menus::Controller::MenuItems.r(:delete)}">
+            <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
 
-            </tbody>
-        </table>
+            <?r if !@menu_items.empty? ?>
 
-        #{if @menu_items.respond_to?(:navigation) and @menu_items.page_count > 1
-          @menu_items.navigation
-        end}
+            #{menu_items_tree(@menu_items)}
 
-        <?r else ?>
+            <?r else ?>
 
-        <p>#{lang('menu_items.messages.no_items')}</p>
+            <p>#{lang('menu_items.messages.no_items')}</p>
 
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:new_menu_item) ?>
-        <div class="button">
-            #{Menus::Controller::MenuItems.a(
-              lang('menu_items.buttons.new'), :new, @menu_id
+            <?r if user_authorized?(:new_menu_item) ?>
+            #{new_button(
+              Menus::Controller::MenuItems.r(:new, @menu_id),
+              lang('menu_items.buttons.new')
             )}
-        </div>
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:delete_menu_item) and !@menu_items.empty? ?>
-        <div class="button">
-            <input type="submit" value="#{lang('menu_items.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:delete_menu_item) and !@menu_items.empty? ?>
+            #{delete_button(lang('menu_items.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>

data/lib/zen/package/menus/lib/menus/view/admin/menus/form.xhtml

@@ -3,54 +3,59 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{form_for(
-      @menu,
-      :method => :post,
-      :action => Menus::Controller::Menus.r(:save),
-      :id     => :menu_form
-    ) do |f|
-      f.input_hidden(:csrf_token, get_csrf_token)
-      f.input_hidden(:id        , @menu.id)
+    <div class="body">
+        #{form_for(
+          @menu,
+          :method              => :post,
+          :action              => Menus::Controller::Menus.r(:save),
+          :id                  => :menu_form,
+          :'data-autosave-url' => Menus::Controller::Menus.r(:autosave)
+        ) do |f|
+          f.input_hidden(:csrf_token, get_csrf_token)
+          f.input_hidden(:id        , @menu.id)
 
-      f.input_text(
-        lang('menus.labels.name'),
-        :name,
-        :title     => lang('menus.descriptions.name'),
-        :required  => :required,
-        :maxlength => 255
-      )
+          f.input_text(
+            lang('menus.labels.name'),
+            :name,
+            :title     => lang('menus.descriptions.name'),
+            :required  => :required,
+            :maxlength => 255
+          )
 
-      f.input_text(
-        lang('menus.labels.slug'),
-        :slug,
-        :title     => lang('menus.descriptions.slug'),
-        :maxlength => 255
-      )
+          f.input_text(
+            lang('menus.labels.slug'),
+            :slug,
+            :title     => lang('menus.descriptions.slug'),
+            :maxlength => 255
+          )
 
-      f.input_text(
-        lang('menus.labels.html_class'),
-        :html_class,
-        :title     => lang('menus.descriptions.html_class'),
-        :maxlength => 255,
-        :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
-      )
+          f.input_text(
+            lang('menus.labels.html_class'),
+            :html_class,
+            :title     => lang('menus.descriptions.html_class'),
+            :maxlength => 255,
+            :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
+          )
 
-      f.input_text(
-        lang('menus.labels.html_id'),
-        :html_id,
-        :title     => lang('menus.descriptions.html_id'),
-        :maxlength => 255,
-        :pattern   => '^[a-zA-Z\\\-_0-9]*$'
-      )
+          f.input_text(
+            lang('menus.labels.html_id'),
+            :html_id,
+            :title     => lang('menus.descriptions.html_id'),
+            :maxlength => 255,
+            :pattern   => '^[a-zA-Z\\\-_0-9]*$'
+          )
 
-      f.textarea(
-        lang('menus.labels.description'),
-        :description,
-        :rows => 8
-      )
+          f.textarea(
+            lang('menus.labels.description'),
+            :description,
+            :rows => 8
+          )
 
-      f.g.div(:class => "button") do
-        f.g.input(:type => :submit, :value => lang('menus.buttons.save'))
-      end
-    end}
+          f.g.input(
+            :type  => :submit,
+            :value => lang('menus.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>

data/lib/zen/package/menus/lib/menus/view/admin/menus/index.xhtml

@@ -1,93 +1,91 @@
 <section>
-    #{render_search_form(::Menus::Controller::Menus.r(:index))}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
+
+        #{render_search_form(Menus::Controller::Menus.r(:index))}
     </header>
 
-    <form action="#{Menus::Controller::Menus.r(:delete)}" method="post">
-        <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
+    <div class="body">
+        <form action="#{Menus::Controller::Menus.r(:delete)}" method="post">
+            <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
+
+            <?r if !@menus.empty? ?>
+
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_menu) ?>
+                        <th class="no_sort">
+                            <input type="checkbox" />
+                        </th>
+                        <?r end ?>
+
+                        <th>#{lang('menus.labels.id')}</th>
+                        <th>#{lang('menus.labels.name')}</th>
+                        <th>#{lang('menus.labels.slug')}</th>
+                        <th>#{lang('menus.labels.html_class')}</th>
+                        <th>#{lang('menus.labels.html_id')}</th>
+
+                        <?r if user_authorized?(:show_menu_item) ?>
+                        <th></th>
+                        <?r end ?>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?r @menus.each do |menu| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete_menu) ?>
+                        <td>
+                            <input type="checkbox" name="menu_ids[]"
+                            value="#{menu.id}" />
+                        </td>
+                        <?r end ?>
+
+                        <td>#{menu.id}</td>
+
+                        <td>
+                            #{if user_authorized?(:edit_menu)
+                              edit_link(
+                                Menus::Controller::Menus.r(:edit, menu.id),
+                                menu.name
+                              )
+                            else
+                              menu.name
+                            end}
+                        </td>
+
+                        <td>#{menu.slug}</td>
+                        <td>#{menu.html_class}</td>
+                        <td>#{menu.html_id}</td>
+
+                        <?r if user_authorized?(:show_menu_item) ?>
+                        <td>
+                            #{manage_link(
+                              Menus::Controller::MenuItems.r(:index, menu.id),
+                              lang('menus.labels.manage_items')
+                            )}
+                        </td>
+                        <?r end ?>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
 
-        <?r if !@menus.empty? ?>
+            #{render_pagination(@menus)}
 
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_menu) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
+            <?r else ?>
 
-                    <th>#{lang('menus.labels.id')}</th>
-                    <th>#{lang('menus.labels.name')}</th>
-                    <th>#{lang('menus.labels.slug')}</th>
-                    <th>#{lang('menus.labels.html_class')}</th>
-                    <th>#{lang('menus.labels.html_id')}</th>
+            <p>#{lang('menus.messages.no_menus')}</p>
 
-                    <?r if user_authorized?(:show_menu_item) ?>
-                    <th></th>
-                    <?r end ?>
-                </tr>
-            </thead>
-            <tbody>
-                <?r @menus.each do |menu| ?>
-                <tr>
-                    <?r if user_authorized?(:delete_menu) ?>
-                    <td>
-                        <input type="checkbox" name="menu_ids[]"
-                        value="#{menu.id}" />
-                    </td>
-                    <?r end ?>
+            <?r end ?>
 
-                    <td>#{menu.id}</td>
-
-                    <td>
-                        #{if user_authorized?(:edit_menu)
-                          Menus::Controller::Menus.a(menu.name, :edit, menu.id)
-                        else
-                          menu.name
-                        end}
-                    </td>
-
-                    <td>#{menu.slug}</td>
-                    <td>#{menu.html_class}</td>
-                    <td>#{menu.html_id}</td>
-
-                    <?r if user_authorized?(:show_menu_item) ?>
-                    <td>
-                        #{Menus::Controller::MenuItems.a(
-                          lang('menus.labels.manage_items'), :index, menu.id
-                        )}
-                    </td>
-                    <?r end ?>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
-
-        #{if @menus.respond_to?(:navigation) and @menus.page_count > 1
-          @menus.navigation
-        end}
-
-        <?r else ?>
-
-        <p>#{lang('menus.messages.no_menus')}</p>
-
-        <?r end ?>
-
-        <?r if user_authorized?(:new_menu) ?>
-        <div class="button">
-            #{Menus::Controller::Menus.a(
-              lang('menus.buttons.new'), :new
-            )}
-        </div>
-        <?r end ?>
-
-        <?r if user_authorized?(:delete_menu) and !@menus.empty? ?>
-        <div class="button">
-            <input type="submit" value="#{lang('menus.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:new_menu) ?>
+            #{new_button(Menus::Controller::Menus.r(:new), lang('menus.buttons.new'))}
+            <?r end ?>
+
+            <?r if user_authorized?(:delete_menu) and !@menus.empty? ?>
+            #{delete_button(lang('menus.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>