zen 0.2.7 → 0.2.8

data/lib/zen/package/menus/lib/menus/language/en/menu_items.yml

@@ -10,15 +10,15 @@ labels:
   name       : 'Name'
   url        : 'URL'
   order      : 'Order'
-  css_class  : 'CSS class'
-  css_id     : 'CSS ID'
+  html_class : 'HTML class'
+  html_id    : 'HTML ID'
 
 placeholders:
   name       : 'The text that will be displayed in the link.'
   url        : 'The location to which the link will point.'
   order      : 'A number that indicates the sort order.'
-  css_class  : 'Specify a class name to use for stylesheets.'
-  css_id     : 'Specify an ID to use for stylesheets.'
+  html_class : 'Specify a class name (or multiple names) to apply to this item.'
+  html_id    : 'Specify an ID to apply to this item.'
 
 messages:
   no_items : 'No menu items have been added yet.'
@@ -38,4 +38,4 @@ errors:
   save          : 'The menu item could not be modified.'
   delete        : 'The menu item with ID #%s could not be deleted.'
   no_delete     : 'You need to specify at least one item to delete.'
-  invalid_menu  : 'The specified menu was invalid or no longer exists.'
+  invalid_item  : 'The specified menu item is invalid.'

data/lib/zen/package/menus/lib/menus/language/en/menus.yml

@@ -9,15 +9,15 @@ labels:
   name          : 'Name'
   slug          : 'Slug'
   description   : 'Description'
-  css_class     : 'CSS class'
-  css_id        : 'CSS ID'
+  html_class     : 'CSS class'
+  html_id        : 'CSS ID'
   manage_items  : 'Manage menu items'
 
 placeholders:
   name       : 'Specify the name of the menu.'
   slug       : 'Specify the URL friendly name of the menu.'
-  css_class  : 'Specify a class to use in stylesheets.'
-  css_id     : 'Specify an ID to use in stylesheets.'
+  html_class : 'A number of classes to apply to the menu.'
+  html_id    : 'An ID to apply to the menu.'
 
 messages:
   no_menus: 'No menus have been added yet.'
@@ -33,7 +33,8 @@ success:
   delete  : 'The selected menus have been deleted.'
 
 errors:
-  new        : 'The menu could not be created.'
-  save       : 'The menu could not be modified.'
-  delete     : 'The menu with ID #%s could not be deleted.'
-  no_delete  : 'You need to specify at least one menu to delete.'
+  new         : 'The menu could not be created.'
+  save        : 'The menu could not be modified.'
+  delete      : 'The menu with ID #%s could not be deleted.'
+  no_delete   : 'You need to specify at least one menu to delete.'
+  invalid_menu: 'The specified menu is invalid.'

data/lib/zen/package/menus/lib/menus/language/nl/menu_items.yml

@@ -10,15 +10,15 @@ labels:
   name     : 'Naam'
   url      : 'URL'
   order    : 'Volgorde'
-  css_class: 'CSS klasse'
-  css_id   : 'CSS ID'
+  html_class: 'CSS klasse'
+  html_id   : 'CSS ID'
 
 placeholders:
-  name     : 'De naam/label van het menu item.'
-  url      : 'De URL van het menu item.'
-  order    : 'De sorteer volgorde.'
-  css_class: 'Een klasse die gebruikt kan worden in CSS bestanden.'
-  css_id   : 'Een ID die gebruikt kan worden in CSS bestanden.'
+  name      : 'De naam/label van het menu item.'
+  url       : 'De URL van het menu item.'
+  order     : 'De sorteer volgorde.'
+  html_class: 'Een of meerdere klasses voor dit item.'
+  html_id   : 'Een ID voor dit item.'
 
 messages:
   no_items: 'Er zijn nog geen menu items aangemaakt.'
@@ -38,4 +38,4 @@ errors:
   save        : 'Het menu item kon niet worden aangepast.'
   delete      : 'Het menu item met ID #%s kon niet worden verwijderd.'
   no_delete   : 'U moet ten minste 1 item specificeren om te verwijderen.'
-  invalid_menu: 'Het opgegeven menu is ongeldig of bestaat niet meer.'
+  invalid_item: 'Het opgegeven menu item is ongeldig.'

data/lib/zen/package/menus/lib/menus/language/nl/menus.yml

@@ -9,15 +9,15 @@ labels:
   name        : 'Naam'
   slug        : 'Slug'
   description : 'Beschrijving'
-  css_class   : 'CSS klasse'
-  css_id      : 'CSS ID'
+  html_class   : 'CSS klasse'
+  html_id      : 'CSS ID'
   manage_items: 'Menu items beheren'
 
 placeholders:
-  name     : 'De naam van het menu.'
-  slug     : 'Een URL vriendelijke versie van de menu naam.'
-  css_class: 'Een klasse die gebruikt kan worden in CSS bestanden.'
-  css_id   : 'Een ID die gebruikt kan worden in CSS bestanden.'
+  name      : 'De naam van het menu.'
+  slug      : 'Een URL vriendelijke versie van de menu naam.'
+  html_class: 'Een of meerdere klasses voor dit menu.'
+  html_id   : 'Een ID voor dit menu.'
 
 messages:
   no_menus: "Er zijn nog geen menu's aangemaakt."
@@ -33,7 +33,8 @@ success:
   delete: "De geselecteerde menu's zijn verwijderd."
 
 errors:
-  new      : 'Het menu kon niet worden aangemaakt.'
-  save     : 'Het menu kon niet worden aangepast.'
-  delete   : 'Het menu met ID #%s kon niet worden verwijderd.'
-  no_delete: 'U moet ten minste 1 menu specificeren om te verwijderen.'
+  new         : 'Het menu kon niet worden aangemaakt.'
+  save        : 'Het menu kon niet worden aangepast.'
+  delete      : 'Het menu met ID #%s kon niet worden verwijderd.'
+  no_delete   : 'U moet ten minste 1 menu specificeren om te verwijderen.'
+  invalid_menu: 'Het opgegeven menu is ongeldig.'

data/lib/zen/package/menus/lib/menus/model/menu.rb

@@ -3,8 +3,8 @@ module Menus
   #:nodoc:
   module Model
     ##
-    # Model used for managing groups of menu items. This model uses the following
-    # Sequel plugins:
+    # Model used for managing groups of menu items. This model uses the 
+    # following Sequel plugins:
     #
     # * sluggable
     #
@@ -19,8 +19,8 @@ module Menus
 
       ##
       # Specifies all validates rules used when creating or updating a menu.
-      # A slug will be generated when a menu is first created but after that they are
-      # required to ensure that they don't collide with existing slugs.
+      # A slug will be generated when a menu is first created but after that 
+      # they are required to ensure that they don't collide with existing slugs.
       #
       # @author Yorick Peterse
       # @since  0.2a
@@ -31,7 +31,7 @@ module Menus
         validates_unique   :slug
       
         # Prevent people from entering random crap for class and ID names
-        validates_format(/^[a-zA-Z\-_0-9]*/, [:css_class, :css_id])
+        validates_format(/^[a-zA-Z\-_0-9]*/, [:html_class, :html_id])
       end
     end # Menu
   end # Model

data/lib/zen/package/menus/lib/menus/model/menu_item.rb

@@ -12,24 +12,25 @@ module Menus
     # @since  0.2a
     #
     class MenuItem < Sequel::Model
-      plugin :tree, :order => :order
+      plugin :tree, :order => :sort_order
 
       many_to_one :menu  , :class => 'Menus::Model::Menu'
       many_to_one :parent, :class => self
 
       ##
-      # Specifies all validation rules that will be used when creating or updating a 
-      # menu item.
+      # Specifies all validation rules that will be used when creating or 
+      # updating a menu item.
       #
       # @author Yorick Peterse
       # @since  0.2a
       #
       def validate
         validates_presence :name
-        validates_integer  [:order, :parent_id]
+        validates_presence :url
+        validates_integer  [:sort_order, :parent_id]
         
         # Prevent people from entering random crap for class and ID names
-        validates_format(/^[a-zA-Z\-_0-9]*/, [:css_class, :css_id])
+        validates_format(/^[a-zA-Z\-_0-9]*/, [:html_class, :html_id])
       end
     end # MenuItem
   end # Model

data/lib/zen/package/menus/lib/menus/plugin/menus.rb

@@ -5,19 +5,19 @@ module Menus
   #:nodoc:
   module Plugin
     ##
-    # Plugin for displaying navigation menus. This plugin will take care of recursively
-    # displaying all sub items and various other tasks, you merely have to set a few
-    # options and then you can sit back and enjoy.
+    # Plugin for displaying navigation menus. This plugin will take care of
+    # recursively displaying all sub items and various other tasks, you merely
+    # have to set a few options and then you can sit back and enjoy.
     #
     # ## Usage
     #
     #     menu = plugin(:menus, :menu => 'userguide', :sub => true)
     #
-    # Calling this plugin will result in a string with HTML being returned. If you were
-    # to use this plugin in an Etanni template you'd have to wrap the call in #{} in order
-    # to actually display the menu.
+    # Calling this plugin will result in a string with HTML being returned. If
+    # you were to use this plugin in an Etanni template you'd have to wrap the
+    # call in #{} in order to actually display the menu.
     #
-    # For more information about all the available options see 
+    # For more information about all the available options see
     # Menus::Plugin::Menus#initialize().
     #
     # @author Yorick Peterse
@@ -36,20 +36,21 @@ module Menus
       # @author Yorick Peterse
       # @since 0.2.5
       # @param [Hash] options Hash with configuration options.
-      # @option options [Integer/Fixnum] :limit The maximum amount of root items to 
-      # retrieve.
-      # @option options [Integer/Fixnum] :offset The row offset for all root elements.
-      # @option options [Fixnum/Integer/String] :menu The ID or slug of the menu for which
-      # to retrieve all menu items.
-      # @option options [Boolean] :sub When set to false sub items will be ignored. This
-      # option is set to true by default.
-      # 
+      # @option options [Integer/Fixnum] :limit The maximum amount of root items
+      # to retrieve.
+      # @option options [Integer/Fixnum] :offset The row offset for all root
+      # elements.
+      # @option options [Fixnum/Integer/String] :menu The ID or slug of the menu
+      # for which to retrieve all menu items.
+      # @option options [Boolean] :sub When set to false sub items will be
+      # ignored. This option is set to true by default.
+      #
       def initialize(options = {})
         @options = {
           :limit  => 20,
           :offset => 0,
           :menu   => nil,
-          :sub    => true,
+          :sub    => false,
           :order  => :asc
         }.merge(options)
 
@@ -67,7 +68,7 @@ module Menus
       # @return [String] The HTML for the navigation menu.
       #
       def call
-        # Retrieve the menu 
+        # Retrieve the menu
         if @options[:menu].class == String
           menu = Menu[:slug => @options[:menu]]
         else
@@ -79,20 +80,20 @@ module Menus
         # Get all menu items
         menu_items = MenuItem.filter(:menu_id => menu.id, :parent_id => nil) \
           .limit(@options[:limit], @options[:offset]) \
-          .order(:order.send(@options[:order])) \
+          .order(:sort_order.send(@options[:order])) \
           .all
-        
+
         @g         = Ramaze::Gestalt.new
         attributes = {}
         items_tree = {}
 
         # Set the attributes for the main <ul> elements
-        if !menu.css_class.nil?
-          attributes[:class] = menu.css_class if !menu.css_class.empty?
+        if !menu.html_class.nil?
+          attributes[:class] = menu.html_class if !menu.html_class.empty?
         end
 
-        if !menu.css_id.nil?
-          attributes[:id] = menu.css_id if !menu.css_id.empty?
+        if !menu.html_id.nil?
+          attributes[:id] = menu.html_id if !menu.html_id.empty?
         end
 
         # Time to build the HTML
@@ -113,39 +114,36 @@ module Menus
       # Generates the HTML for a single <li> element and all sub elements.
       #
       # @author Yorick Peterse
-      # @since  0.2.5 
-      # @param  [Object] item An instance of the MenuItem model as returned by Sequel.
+      # @since  0.2.5
+      # @param  [Object] item An instance of the MenuItem model as returned by
+      # Sequel.
       #
       def generate_item(item)
         attributes = {}
 
-        if !item.css_class.nil?
-          attributes[:class] = item.css_class if !item.css_class.empty?
+        if !item.html_class.nil?
+          attributes[:class] = item.html_class if !item.html_class.empty?
         end
 
-        if !item.css_id.nil?
-          attributes[:id] = item.css_id if !item.css_id.empty?
+        if !item.html_id.nil?
+          attributes[:id] = item.html_id if !item.html_id.empty?
         end
 
-        # Get all child elements
-        children = item.children
-
         # Render the <li> tag
         @g.li(attributes) do
-          # Do we have a URL?
-          if !item.url.nil? and !item.url.empty?
-            @g.a(:href => item.url, :title => item.name) { item.name }
-          else
-            @g.span { item.name }
-          end
+          @g.a(:href => item.url, :title => item.name) { item.name }
 
           # Generate all the sub elements
-          if !children.empty? and @options[:sub] === true
-            @g.ul(:class => :children) do
-              children.each do |child|
-                generate_item(child)
+          if @options[:sub] === true
+            children = item.children
+
+            if !children.empty?
+              @g.ul(:class => :children) do
+                children.each do |child|
+                  generate_item(child)
+                end
               end
-            end
+            end # if !children.empty?
           end
         end
       end

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

@@ -1,64 +1,60 @@
-#{
-form_for(
-  @menu_item, :method => :post, :action => @form_save_url, :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, 
-    :placeholder => lang('menu_items.placeholders.name')
-  )
-
-  f.input_text(
-    lang('menu_items.labels.url'),
-    :url, 
-    :placeholder => lang('menu_items.placeholders.url')
-  )
-
-  f.input_text(
-    lang('menu_items.labels.order'),
-    :order, 
-    :placeholder => lang('menu_items.placeholders.order')
-  )
-
-  # Generate the dropdown that contains all possible parent menu items    
-  parent_items = {}
-  Menus::Model::Menu[@menu_id.to_i].menu_items.each do |i|
-    if i.id != @menu_item.id
-      parent_items[i.id] = i.name
-    end
-  end
-
-  parent_items = menu_item_tree(@menu_id.to_i)
-
-  f.select(
-    lang('menu_items.labels.parent_id'),
-    :parent_id, 
-    :values   => parent_items, 
-    :selected => @menu_item.parent_id, 
-    :size     => 1
-  )
-
-  f.input_text(
-    lang('menu_items.labels.css_class'), 
-    :css_class, 
-    :placeholder => lang('menu_items.placeholders.css_class')
-  )
-
-  f.input_text(
-    lang('menu_items.labels.css_id'), 
-    :css_id, 
-    :placeholder => lang('menu_items.placeholders.css_id')
-  )
-
-  f.g.div(:class => :clearfix) do
-    f.g.div(:class => :button) do
-      f.g.input(:type => :submit, :value => lang('menu_items.buttons.save'))
+<article>
+    <header>
+        <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, 
+        :placeholder => lang('menu_items.placeholders.name')
+      )
+
+      f.input_text(
+        lang('menu_items.labels.url'),
+        :url, 
+        :placeholder => lang('menu_items.placeholders.url')
+      )
+
+      f.input_text(
+        lang('menu_items.labels.order'),
+        :sort_order, 
+        :placeholder => lang('menu_items.placeholders.order')
+      )
+
+      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, 
+        :placeholder => lang('menu_items.placeholders.html_class')
+      )
+
+      f.input_text(
+        lang('menu_items.labels.html_id'), 
+        :html_id, 
+        :placeholder => lang('menu_items.placeholders.html_id')
+      )
+
+      f.g.div(:class => :button) do
+        f.g.input(:type => :submit, :value => lang('menu_items.buttons.save'))
+      end
     end
-  end
-end
-}
+    }
+</article>