zen 0.4 → 0.4.1

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

@@ -41,18 +41,58 @@ module Menus
     #
     # In this form you can use the following fields:
     #
-    # * **Name** (required): the name of the menu.
-    # * **Slug**: a URL friendly version of the name. If none is specified it
-    #   will be generated automatically based on the name of the menu.
-    # * **HTML class**: a space separated list of classes to apply to the HTML
-    #   element. The format of this field should match the regular exresspion
-    #   ``^[a-zA-Z\-_0-9\s]*$``
-    # * **HTML ID**: an ID to apply to the HTML element. This value should match
-    #   the regular expression ``^[a-zA-Z\-_0-9]*$``.
-    # * **Description**: the description of the menu.
-    #
-    # Note that all fields except the description field have a maximum length of
-    # 255 characters.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Name</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>The name of the menu.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Slug</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>
+    #                 A URL friendly version of the name. If no slug is
+    #                 specified one will be generated based on the name.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>HTML class</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>
+    #                 A space separated string containing the class(es) to apply
+    #                 to the menu. This value should match the pattern
+    #                 <code>^[a-zA-Z\-_0-9\s]*$</code>.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>HTML ID</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>
+    #                 A single ID to apply to the menu. This value should match
+    #                 the pattern <code>^[a-zA-Z\-_0-9]*$</code>.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Description</td>
+    #             <td>No</td>
+    #             <td>Unlimited</td>
+    #             <td>A description of the menu.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # ## Used Permissions
     #
@@ -74,7 +114,7 @@ module Menus
       csrf_protection :save, :delete
 
       ##
-      # Shows an overview of all exisitng menus and a few properties of these
+      # Shows an overview of all existing menus and a few properties of these
       # groups such as the name, slug and the amount of items in that group.
       #
       # @since      0.2a

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

@@ -18,11 +18,12 @@ module Ramaze
       #  valid.
       #
       def validate_menu(menu_id)
+        redirect_invalid_menu unless menu_id =~ /\d+/
+
         menu = ::Menus::Model::Menu[menu_id]
 
         if menu.nil?
-          message(:error, lang('menus.errors.invalid_menu'))
-          redirect(::Menus::Controller::Menus.r(:index))
+          redirect_invalid_menu
         else
           return menu
         end
@@ -38,16 +39,41 @@ module Ramaze
       # @return [Menus::Model::MenuItem]
       #
       def validate_menu_item(menu_item_id, menu_id)
+        redirect_invalid_menu_item(menu_id) unless menu_item_id =~ /\d+/
+
         menu_item = ::Menus::Model::MenuItem[menu_item_id]
 
         if menu_item.nil?
-          message(:error, lang('menu_items.errors.invalid_item'))
-          redirect(::Menus::Controller::MenuItems.r(:index, menu_id))
+          redirect_invalid_menu_item(menu_id)
         else
           return menu_item
         end
       end
 
+      ##
+      # Redirects the user to the menus overview and informs him/her that the
+      # menu he/she tried to access is invalid.
+      #
+      # @since 05-04-2012
+      #
+      def redirect_invalid_menu
+        message(:error, lang('menus.errors.invalid_menu'))
+        redirect(::Menus::Controller::Menus.r(:index))
+      end
+
+      ##
+      # Redirects the user back to the overview of menu items for a specific
+      # menu and informs the user that the menu item he/she tried to access is
+      # invalid.
+      #
+      # @since 05-04-2012
+      # @param [Fixnum] menu_id The ID of the menu.
+      #
+      def redirect_invalid_menu_item(menu_id)
+        message(:error, lang('menu_items.errors.invalid_item'))
+        redirect(::Menus::Controller::MenuItems.r(:index, menu_id))
+      end
+
       ##
       # Builds the menu item tree that can be used by the user to edit the sort
       # order, create the menu item tree and edit individual menu items.

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

@@ -109,7 +109,9 @@ module Menus
       def menu_items_tree(order = :asc, limit = nil)
         nodes   = []
         indexes = {}
-        rows    =  MenuItem.filter(:menu_id => id).limit(limit).all
+        rows    =  MenuItem.filter(:menu_id => id) \
+          .order(:sort_order.send(order)) \
+          .limit(limit).all
 
         rows.sort! do |left, right|
           (left.parent_id || 0) <=> (right.parent_id || 0)
@@ -133,7 +135,7 @@ module Menus
         nodes.reverse.each do |node|
           # If there's a matching parent node the current node should be
           # assigned to that node and removed from the list. If there's no
-          # parent item then the node is un-modified.
+          # parent item then the node is unmodified.
           if indexes[node[:node].parent_id]
             index = indexes[node[:node].parent_id]
 

data/lib/zen/package/sections/lib/sections/controller/section_entries.rb

@@ -33,15 +33,54 @@ module Sections
     # Regardless of what field groups and categories you have assigned you can
     # always specify the following fields:
     #
-    # * **Title** (required): the title of your entry.
-    # * **Slug**: a URL friendly version of the title. If no slug is specified
-    #   one will be generated manually.
-    # * **Created at**: The date on which the entry was created. This field is
-    #   filled in automatically when an entry is created.
-    # * **Author** (required): the name of the person who wrote the entry.
-    # * **Status** (required): the status of an entry. If an entry has a status
-    #   other than "Published" it will not be displayed when using the
-    #   sectio_entries plugin.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Title</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>The title of the section entry.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Slug</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>
+    #                 A URL friendly version of the title. If no value is specified
+    #                 one will be generated automatically.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Creatd at</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>
+    #                 The date on which the article was created. If no date is
+    #                 specified one will be set automatically.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Author</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>The name of the author of the entry.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Status</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>The status of the section entry.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # Depending on whether or not you have category and field groups assigned
     # you can also use these fields. In the images above there's a "Body" field

data/lib/zen/package/sections/lib/sections/controller/sections.rb

@@ -47,27 +47,83 @@ module Sections
     #
     # In this form you can specify the following fields:
     #
-    # * **Name** (required): the name of the section.
-    # * **Slug**: a URL friendly version of the section name. If no slug is
-    #   specified one will be generated automatically.
-    # * **Description**: a description of the section to help clarify it's
-    #   purpose.
-    # * **Allow comments** (required): whether or not users can submit comments
-    #   for entries assigned to the section.
-    # * **Comments require an account** (required): when set to "Yes" a user has
-    #   to be logged in in order to post a comment.
-    # * **Moderate comments** (required): when enabled a comment first has to be
-    #   approved before it's displayed. This option is disabled by default.
-    # * **Comment format** (required): the format comments are posted in such as
-    #   Markdown or plain text.
-    # * **Custom field groups**: all the custom field groups to assign to the
-    #   section. These groups can then be used by all the entries in the
-    #   section.
-    # * **Category groups**: all the category groups that should be available to
-    #   the section entries of this section.
-    #
-    # Note that the name and the slug of a section can not be longer than 255
-    # characters.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Name</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>The name of the section.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Slug</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>
+    #                 A URL friendly version of the section name. If no value is
+    #                 specified one will be generated based on the section name.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Description</td>
+    #             <td>No</td>
+    #             <td>Unlimited</td>
+    #             <td>A description of the section.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Allow comments</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>
+    #                 Whether or not users can submit comments for this
+    #                 section's entries.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Comments require an account</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>
+    #                 When set users are required to be logged in in order to
+    #                 submit comments.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Moderate comments</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>
+    #                 Comments have to be approved before they'll be displayed.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Comment format</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>The markup format to use for comments.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Custom field groups</td>
+    #             <td></td>
+    #             <td></td>
+    #             <td>The custom field groups to assign to the section.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Category groups</td>
+    #             <td></td>
+    #             <td></td>
+    #             <td>The category groups to assign to the section.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # ## Used Permissions
     #

data/lib/zen/package/sections/lib/sections/helper/section.rb

@@ -14,11 +14,12 @@ module Ramaze
       # @return [Sections::Model::Section]
       #
       def validate_section(section_id)
+        redirect_invalid_section unless section_id =~ /\d+/
+
         section = Sections::Model::Section[section_id]
 
         if section.nil?
-          message(:error, lang('sections.errors.invalid_section'))
-          redirect(Sections::Controller::Sections.r(:index))
+          redirect_invalid_section
         else
           return section
         end
@@ -35,11 +36,14 @@ module Ramaze
       # @return [Sections::Model::SectionEntry]
       #
       def validate_section_entry(section_entry_id, section_id)
+        unless section_entry_id =~ /\d+/
+          redirect_invalid_section_entry(section_id)
+        end
+
         entry = Sections::Model::SectionEntry[section_entry_id]
 
         if entry.nil?
-          message(:error, lang('section_entries.errors.invalid_entry'))
-          redirect(Sections::Controller::SectionEntries.r(:index, section_id))
+          redirect_invalid_section_entry(section_id)
         else
           return entry
         end
@@ -88,6 +92,30 @@ module Ramaze
 
         return field_errors
       end
+
+      ##
+      # Redirects the user to the sections overview and shows a message
+      # informing the user that the section he/she tried to access is invalid.
+      #
+      # @since 09-04-2012
+      #
+      def redirect_invalid_section
+        message(:error, lang('sections.errors.invalid_section'))
+        redirect(Sections::Controller::Sections.r(:index))
+      end
+
+      ##
+      # Redirects the user to the overview of section entries for a given
+      # section and shows a message informing the user that the section entry
+      # he/she tried to access is invalid.
+      #
+      # @since 09-04-2012
+      # @param [Fixnum] section_id The ID of the section.
+      #
+      def redirect_invalid_section_entry(section_id)
+        message(:error, lang('section_entries.errors.invalid_entry'))
+        redirect(Sections::Controller::SectionEntries.r(:index, section_id))
+      end
     end # Section
   end # Helper
 end # Ramaze

data/lib/zen/package/sections/lib/sections/model/section_entry.rb

@@ -149,7 +149,7 @@ module Sections
 
       ##
       # Retrieves all the possible categories for an entry and returns these as
-      # a hash. This hash is a multi dimensional hash where the keys are the
+      # a hash. This hash is a multidimensional hash where the keys are the
       # names of all available category groups and the values hashes with the
       # IDs and names of all the categories for that group.
       #

data/lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml

@@ -41,7 +41,7 @@
           f.input_hidden(:section_id, @section_id)
           f.input_hidden(:id        , @entry.id)
 
-          f.g.div(:id => :basic) do
+          f.g.div(:id => :basic, :class => :tab_field) do
             f.input_text(
               lang('section_entries.labels.title'),
               :title,
@@ -74,7 +74,8 @@
               :user_id,
               :values   => ::Users::Model::User.pk_hash(:name),
               :size     => 1,
-              :required => :required
+              :required => :required,
+              :selected => @entry.user_id
             )
 
             f.select(
@@ -86,7 +87,7 @@
             )
           end
 
-          f.g.div(:id => :categories) do
+          f.g.div(:id => :categories, :class => :tab_field) do
             if !@possible_categories.empty?
               @possible_categories.each do |group, categories|
                 f.input_checkbox(
@@ -103,7 +104,7 @@
 
           # Display all the custom fields for this entry
           @custom_fields_hash.each do |id, group|
-            f.g.div(:id => "group_#{id}") do
+            f.g.div(:id => "group_#{id}", :class => :tab_field) do
               group[:fields].each do |field|
                 f.send(*field)
               end

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

@@ -37,7 +37,7 @@
           f.input_hidden(:id        , @section.id)
           f.input_hidden(:csrf_token, get_csrf_token)
 
-          f.g.div(:id => 'general') do
+          f.g.div(:id => 'general', :class => :tab_field) do
             f.input_text(
               lang('sections.labels.name'),
               :name,
@@ -58,7 +58,7 @@
             )
           end # f.g.div(:id => 'general')
 
-          f.g.div(:id => 'comments') do
+          f.g.div(:id => 'comments', :class => :tab_field) do
             f.input_radio(
               lang('sections.labels.comment_allow'),
               :comment_allow,
@@ -93,7 +93,7 @@
             )
           end # f.g.div(:id => 'comments')
 
-          f.g.div(:id => 'groups') do
+          f.g.div(:id => 'groups', :class => :tab_field) do
             f.input_checkbox(
               lang('sections.labels.custom_field_groups'),
               :custom_field_group_pks,