zen 0.2.5 → 0.2.6

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

@@ -41,7 +41,7 @@ special:
     textbox          : 'Textbox'
     textarea         : 'Textarea'
     radio            : 'Radio button'
-    checkbox         : 'Checkboxe'
+    checkbox         : 'Checkbox'
     date             : 'Date'
     select           : 'Select dropdown'
     select_multiple  : 'Multi select'

data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.yml

@@ -0,0 +1,32 @@
+---
+titles:
+  index: 'Veld groepen'
+  edit : 'Veld groep aanpassen'
+  new  : 'Veld groep aanmaken'
+
+labels:
+  id           : '#'
+  name         : 'Naam'
+  description  : 'Beschrijving'
+  sections     : 'Secties'
+  manage_fields: 'Beheer velden'
+  none         : 'Geen'
+
+messages:
+  no_groups: 'Er zijn nog geen veld groepen aangemaakt.'
+
+success:
+  new   : 'De veld groep is aangemaakt.'
+  save  : 'De veld groep is aangepast.'
+  delete: 'De veld groep is verwijderd.'
+
+errors:
+  new      : 'De veld groep kon niet worden aangemaakt.'
+  save     : 'De veld groep kon niet worden aangepast.'
+  delete   : 'De veld groep met ID #%s kon niet worden verwijderd.'
+  no_delete: 'U moet ten minste 1 groep specificeren om te verwijderen.'
+
+buttons:
+  new   : 'Groep aanmaken'
+  save  : 'Groep opslaan'
+  delete: 'Geselecteerde groepen verwijderen'

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

@@ -0,0 +1,52 @@
+---
+titles:
+  index: 'Velden'
+  edit : 'Veld aanpassen'
+  new  : 'Veld aanmaken'
+
+labels:
+  id             : '#'
+  name           : 'Naam'
+  slug           : 'Slug'
+  type           : 'Type'
+  format         : 'Formaat'
+  description    : 'Beschrijving'
+  possible_values: 'Mogelijke waardes (een per regel)'
+  required       : 'Vereist een waarde'
+  visual_editor  : 'Visuele editor'
+  textarea_rows  : 'Text veld rijen'
+  text_limit     : 'Karakter limiet'
+  sort_order     : 'Sorteer volgorde'
+
+tabs:
+  general : 'Algemeen'
+  settings: 'Instellingen'
+
+messages:
+  no_fields: 'Er zijn nog geen velden aangemaakt.'
+
+success:
+  new   : 'Het veld is aangemaakt.'
+  save  : 'Het veld is aangepast.'
+  delete: 'Alle geselecteerde velden zijn verwijderd.'
+
+errors:
+  new      : 'Het veld kon niet worden aangemaakt.'
+  save     : 'Het veld kon niet worden aangepast.'
+  delete   : 'Het veld met ID #%s kon niet worden verwijderd.'
+  no_delete: 'U moet ten minste 1 veld specificeren om te verwijderen.'
+
+special:
+  type_hash:
+    textbox        : 'Text veld'
+    textarea       : 'Text gebied'
+    radio          : 'Keuze knop (enkele waarde)'
+    checkbox       : 'Keuze knop (meerdere waardes)'
+    date           : 'Datum'
+    select         : 'Lijst (enkele waarde)'
+    select_multiple: 'Lijst (meerdere waardes)'
+
+buttons:
+  new   : 'Veld toevoegen'
+  delete: 'Geselecteerde velden verwijderen'
+  save  : 'Veld opslaan'

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field.rb

@@ -41,6 +41,6 @@ module CustomFields
         validates_presence :slug unless new?
         validates_unique   :slug
       end
-    end
-  end
-end
+    end # CustomField
+  end # Model
+end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_group.rb

@@ -22,10 +22,7 @@ module CustomFields
         :order => :sort_order
       )
 
-      many_to_many(
-        :sections, 
-        :class => "Sections::Model::Section"
-      )
+      many_to_many(:sections, :class => "Sections::Model::Section")
       
       ##
       # Validates rules used whenever the model is created or saved.
@@ -37,6 +34,6 @@ module CustomFields
         validates_presence        :name
         validates_max_length 255, :name
       end
-    end
-  end
-end
+    end # CustomFieldGroup
+  end # Model
+end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb

@@ -31,6 +31,6 @@ module CustomFields
           self.value.gsub!(/\r\n/, "\n")
         end
       end
-    end
-  end
-end
+    end # CustomFieldValue
+  end # Model
+end # CustomFields

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

@@ -3,7 +3,7 @@ module Menus
   #:nodoc:
   module Controller
     ##
-    # Controller for managing individual navigation items that belong to a menu. 
+    # Controller for managing individual navigation items that belong to a menu.
     #
     # @author Yorick Peterse
     # @since  0.2a
@@ -13,13 +13,13 @@ module Menus
 
       map('/admin/menu-items')
       helper(:menu_item)
-      
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
- 
+
       ##
       # Initializes the class, loads all language packs and sets the form URLs.
       #
@@ -33,10 +33,10 @@ module Menus
       #
       def initialize
         super
- 
+
         @form_save_url   = MenuItems.r(:save)
         @form_delete_url = MenuItems.r(:delete)
-        
+
         Zen::Language.load('menu_items')
         Zen::Language.load('menus')
 
@@ -58,7 +58,7 @@ module Menus
       # @since  0.2a
       # @param  [Integer] menu_id The ID of the current navigation menu.
       #
-      def index(menu_id = nil)
+      def index(menu_id)
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
@@ -66,7 +66,7 @@ module Menus
         validate_menu(menu_id)
 
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)), 
+          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
           lang('menu_items.titles.index')
         )
 
@@ -87,7 +87,7 @@ module Menus
       # @param  [Integer] menu_id The ID of the current navigation menu.
       # @param  [Integer] id The ID of the menu item to edit.
       #
-      def edit(menu_id = nil, id)
+      def edit(menu_id, id)
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
@@ -96,7 +96,7 @@ module Menus
 
         set_breadcrumbs(
           anchor_to(lang('menus.titles.index'), Menus.r(:index)),
-          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)), 
+          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)),
           lang('menu_items.titles.edit')
         )
 
@@ -105,7 +105,7 @@ module Menus
         if flash[:form_data]
           @menu_item = flash[:form_data]
         else
-          @menu_item = MenuItem[id.to_i]
+          @menu_item = MenuItem[id]
         end
       end
 
@@ -121,16 +121,16 @@ module Menus
       # @since  0.2a
       # @param  [Integer] menu_id  The ID of the current navigation menu.
       #
-      def new(menu_id = nil)
+      def new(menu_id)
         if !user_authorized?([:create, :read])
           respond(lang('zen_general.errors.not_authorized'), 403)
-        end  
+        end
 
         validate_menu(menu_id)
 
         set_breadcrumbs(
           anchor_to(lang('menus.titles.index'), Menus.r(:index)),
-          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)), 
+          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)),
           lang('menu_items.titles.new')
         )
 
@@ -139,7 +139,7 @@ module Menus
       end
 
       ##
-      # Saves an existing menu iten or creates a new one using the supplied POST data. 
+      # Saves an existing menu iten or creates a new one using the supplied POST data.
       #
       # This method requires the following permissions:
       #
@@ -154,21 +154,26 @@ module Menus
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
 
-        post = request.params.dup
-        if post['parent_id'].empty? or post['parent_id'] == post['id']
+        post = request.subset(
+          :id, :parent_id, :name, :url, :order, :css_class, :css_id, :menu_id
+        )
+
+        if post['parent_id'].empty? or post['parent_id'] === post['id']
           post['parent_id'] = nil
         end
 
         # Determine if we're saving changes made to an existing menu item or if we're
         # going to create a new one.
         if !post['id'].empty?
-          @menu_item  = MenuItem[post['id'].to_i]
+          @menu_item  = MenuItem[post['id']]
           save_action = :save
         else
           @menu_item  = MenuItem.new
           save_action = :new
         end
 
+        post.delete('id')
+
         # Set our notifications
         flash_success = lang("menu_items.success.#{save_action}")
         flash_error   = lang("menu_items.errors.#{save_action}")
@@ -176,9 +181,10 @@ module Menus
         # Time to save the data
         begin
           @menu_item.update(post)
-          notification(:success, lang('menu_items.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('menu_items.titles.index'), flash_error)
+          message(:success, flash_success)
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
 
           flash[:form_data]   = @menu_item
           flash[:form_errors] = @menu_item.errors
@@ -192,7 +198,7 @@ module Menus
       end
 
       ##
-      # Delete all specified menu items based on the values in the POST array 
+      # Delete all specified menu items based on the values in the POST array
       # "menu_item_ids". This method requires the following permissions:
       #
       # * delete
@@ -205,39 +211,26 @@ module Menus
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
 
-        post = request.params.dup
+        post = request.subset(:menu_item_ids)
 
         if !post['menu_item_ids'] or post['menu_item_ids'].empty?
-          notification(
-            :error, 
-            lang('menu_items.titles.index'), 
-            lang('menu_items.errors.no_delete')
-          )
-
+          message(:error, lang('menu_items.errors.no_delete'))
           redirect_referrer
         end
 
         post['menu_item_ids'].each do |id|
           begin
-            MenuItem[id.to_i].destroy
-          rescue
-            notification(
-              :error, 
-              lang('menu_items.titles.index'), 
-              lang('menu_items.errors.delete') % id
-            )
+            MenuItem[id].destroy
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('menu_items.errors.delete') % id)
             redirect_referrer
           end
         end
 
-        notification(
-          :success, 
-          lang('menu_items.titles.index'), 
-          lang('menu_items.success.delete')
-        )
-
+        message(:success, lang('menu_items.success.delete'))
         redirect_referrer
       end
-    end
-  end
-end
+    end # MenuItems
+  end # Controller
+end # Menus

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

@@ -13,13 +13,13 @@ module Menus
       include ::Menus::Model
 
       map('/admin/menus')
-      
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Initializes the class and loads all required language packs.
       #
@@ -32,19 +32,19 @@ module Menus
       #
       def initialize
         super
-        
+
         @form_save_url   = Menus.r(:save)
         @form_delete_url = Menus.r(:delete)
-        
+
         Zen::Language.load('menus')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
           @page_title = lang("menus.titles.#{method}") rescue nil
         end
       end
-      
+
       ##
       # Shows an overview of all exisitng menus and a few properties of these
       # groups such as the name, slug and the amount of items in that group.
@@ -67,10 +67,10 @@ module Menus
         # Get all menus
         @menus = Menu.all
       end
-      
+
       ##
       # Show a form that allows the user to edit the details (such as the name and slug)
-      # of a menu group. This method can not be used to manage all menu items for this 
+      # of a menu group. This method can not be used to manage all menu items for this
       # group.
       #
       # This method requires the following permissions:
@@ -87,17 +87,17 @@ module Menus
         end
 
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)), 
+          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
           @page_title
         )
-        
+
         if flash[:form_data]
           @menu = flash[:form_data]
         else
           @menu = Menu[id]
         end
       end
-      
+
       ##
       # Show a form that can be used to create a new menu group. Once a menu group has
       # been created users can start adding navigation items to the group.
@@ -117,13 +117,13 @@ module Menus
 
         # Breadcrumbs, om nom nom!
         set_breadcrumbs(
-          anchor_to(lang('menus.titles.index'), Menus.r(:index)), 
+          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
           @page_title
         )
 
         @menu = Menu.new
       end
-      
+
       ##
       # Saves the changes made to an existing menu group or creates a new group using the
       # supplied POST data. In order to detect this forms that contain data of an existing
@@ -137,39 +137,38 @@ module Menus
       #
       # @author Yorick Peterse
       # @since  0.2a
-      #      
+      #
       def save
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
 
-        # Fetch the POST data and store it in a variable so it's a bit easier to work with
-        post = request.params.dup
+        post = request.subset(:name, :slug, :description, :css_class, :css_id, :id)
 
         # Determine if we're creating a new group or modifying an existing one.
         if !post['id'].empty?
-          @menu       = Menu[post['id'].to_i]
+          @menu       = Menu[post['id']]
           save_action = :save
         else
           @menu       = Menu.new
           save_action = :new
 
           # Delete the slug if it's empty
-          if post['slug'].empty?
-            post.delete('slug')
-          end
+          post.delete('slug') if post['slug'].empty?
         end
 
-        # Set our notifications
+        post.delete('id')
+
         flash_success = lang("menus.success.#{save_action}")
         flash_error   = lang("menus.errors.#{save_action}")
 
         # Let's see if we can insert/update the data
         begin
           @menu.update(post)
-          notification(:success, lang('menus.titles.index'), flash_success)
-        rescue
-          notification(:error, lang('menus.titles.index'), flash_error)
+          message(:success, flash_success)
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
 
           flash[:form_data]   = @menu
           flash[:form_errors] = @menu.errors
@@ -193,7 +192,7 @@ module Menus
       #
       # @author Yorick Peterse
       # @since  0.2a
-      #      
+      #
       def delete
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
@@ -203,33 +202,24 @@ module Menus
 
         # We always require a set of IDs
         if !post['menu_ids'] or post['menu_ids'].empty?
-          notification(
-            :error, 
-            lang('menus.titles.index'), 
-            lang('menus.errors.no_delete')
-          )
-
+          message(:error, lang('menus.errors.no_delete'))
           redirect_referrer
         end
 
         # Time to delete all menus
         post['menu_ids'].each do |id|
           begin
-            Menu[id.to_i].destroy
-          rescue
-            notification(
-              :error, 
-              lang('menus.titles.index'), 
-              lang('menus.errors.delete') % id
-            )
-
+            Menu[id].destroy
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, lang('menus.errors.delete') % id)
             redirect_referrer
           end
         end
 
-        notification(:success, lang('menus.titles.index'), lang('menus.success.delete'))
+        message(:success, lang('menus.success.delete'))
         redirect_referrer
       end
-    end
-  end
-end
+    end # Menus
+  end # Controller
+end # Menus