zen 0.2.5 → 0.2.6

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

@@ -18,14 +18,9 @@ module Ramaze
       # @since  0.2a
       # @param  [Integer] menu_id The ID of the menu to validate.
       #
-      def validate_menu(menu_id = nil)
+      def validate_menu(menu_id)
         if !menu_id or ::Menus::Model::Menu[menu_id].nil?
-          notification(
-            :error, 
-            @menu_items_lang.titles[:index], 
-            @menu_items_lang.errors[:invalid_menu]
-          )
-
+          message(:error, @menu_items_lang.errors[:invalid_menu])
           redirect(::Menus::Controller::Menus.r(:index))
         end
       end
@@ -88,6 +83,6 @@ module Ramaze
           end
         end
       end
-    end
-  end
-end
+    end # MenuItem
+  end # Helper
+end # Ramaze

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

@@ -0,0 +1,41 @@
+---
+titles:
+  index: 'Menu items'
+  edit : 'Menu item aanpassen'
+  new  : 'Menu item aanmaken'
+
+labels:
+  id       : '#'
+  parent_id: 'Hoofd item'
+  name     : 'Naam'
+  url      : 'URL'
+  order    : 'Volgorde'
+  css_class: 'CSS klasse'
+  css_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.'
+
+messages:
+  no_items: 'Er zijn nog geen menu items aangemaakt.'
+
+buttons:
+  new   : 'Menu item toevoegen'
+  save  : 'Menu item opslaan'
+  delete: 'Geselecteerde menu items verwijderen'
+
+success:
+  new   : 'Het menu item is aangemaakt.'
+  save  : 'Het menu item is aangepast.'
+  delete: 'De menu items zijn verwijderd.'
+
+errors:
+  new         : 'Het menu item kon niet worden aangemaakt.'
+  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.'

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

@@ -0,0 +1,39 @@
+---
+titles:
+  index: "Menu's"
+  edit : 'Menu aanpassen'
+  new  : 'Menu aanmaken'
+
+labels:
+  id          : '#'
+  name        : 'Naam'
+  slug        : 'Slug'
+  description : 'Beschrijving'
+  css_class   : 'CSS klasse'
+  css_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.'
+
+messages:
+  no_menus: "Er zijn nog geen menu's aangemaakt."
+
+buttons:
+  new   : 'Menu toevoegen'
+  save  : 'Menu opslaan'
+  delete: "Geselecteerde menu's verwijderen"
+
+success:
+  new   : 'Het menu is aangemaakt.'
+  save  : 'Het menu is aangepast.'
+  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.'

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

@@ -33,6 +33,6 @@ module Menus
         # Prevent people from entering random crap for class and ID names
         validates_format(/^[a-zA-Z\-_0-9]*/, [:css_class, :css_id])
       end
-    end
-  end
-end
+    end # Menu
+  end # Model
+end # Menus

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

@@ -31,6 +31,6 @@ module Menus
         # Prevent people from entering random crap for class and ID names
         validates_format(/^[a-zA-Z\-_0-9]*/, [:css_class, :css_id])
       end
-    end
-  end
-end
+    end # MenuItem
+  end # Model
+end # Menus

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

@@ -75,8 +75,8 @@ module Menus
         return if !menu
 
         # Get all menu items
-        menu_items = MenuItem.filter(:menu_id => menu.id, :parent_id => nil)
-          .limit(@options[:limit], @options[:offset])
+        menu_items = MenuItem.filter(:menu_id => menu.id, :parent_id => nil) \
+          .limit(@options[:limit], @options[:offset]) \
           .all
         
         @g         = Ramaze::Gestalt.new
@@ -146,7 +146,6 @@ module Menus
           end
         end
       end
-
-    end
-  end
-end
+    end # Menus
+  end # Plugin
+end # Menus

data/lib/zen/package/menus/migrations/1297184342_create_schema.rb

@@ -21,7 +21,7 @@ Sequel.migration do
       String :css_class
       String :css_id
 
-      foreign_key :menu_id, :menus, :update => :on_cascade, :on_delete => :cascade, :key => :id,
+      foreign_key :menu_id, :menus, :update => :on_cascade, :on_delete => :cascade, :key => :id
     end
   end
   

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

@@ -46,3 +46,23 @@ Zen::Plugin.add do |p|
   p.url        = 'http://yorickpeterse.com/'
   p.plugin     = Sections::Plugin::SectionEntries
 end
+
+# Register all the settings
+section_hash = {}
+
+begin
+  Sections::Model::Section.select(:name, :slug).each do |s|
+    section_hash[s.slug] = s.name
+  end
+rescue => e
+  Ramaze::Log.warn("The settings plugin failed to retrieve all sections: #{e.message}")
+end
+
+plugin(:settings, :register) do |setting|
+  setting.title       = lang('settings.labels.default_section')
+  setting.description = lang('settings.placeholders.default_section')
+  setting.name        = 'default_section'
+  setting.group       = 'general'
+  setting.type        = 'select'
+  setting.values      = section_hash
+end

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

@@ -10,16 +10,22 @@ module Sections
     # @since  0.1
     #
     class SectionEntries < Zen::Controller::AdminController
-      include ::Sections::Model 
-      
-      map('/admin/section-entries')
+      include ::Sections::Model
+
+      map '/admin/section-entries'
+
+      # Load all required Javascript files
+      javascript ['zen/tabs', 'zen/editor', 'vendor/datepicker']
+
+      # Load all required CSS files
+      stylesheet ['zen/datepicker']
 
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Constructor method, called upon initialization. It's used to set the
       # URL to which forms send their data and load the language pack.
@@ -35,13 +41,13 @@ module Sections
       #
       def initialize
         super
-        
+
         @form_save_url   = SectionEntries.r(:save)
         @form_delete_url = SectionEntries.r(:delete)
-        
+
         Zen::Language.load('section_entries')
         Zen::Language.load('sections')
-        
+
         # Set the page title
         if !action.method.nil?
           method      = action.method.to_sym
@@ -53,14 +59,14 @@ module Sections
           'published' => lang('section_entries.special.status_hash.published')
         }
       end
-      
+
       ##
       # Show an overview of all entries for the current section.
       #
       # This method requires the following permissions:
       #
       # * read
-      # 
+      #
       # @author Yorick Peterse
       # @param  [Integer] section_id The ID of the current section.
       # @since  0.1
@@ -69,17 +75,17 @@ module Sections
         if !user_authorized?([:read])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
           anchor_to(lang('sections.titles.index'), Sections.r(:index)),
           lang('section_entries.titles.index')
         )
-        
+
         section     = Section[section_id.to_i]
         @section_id = section_id
         @entries    = section.section_entries
       end
-      
+
       ##
       # Show a form that lets the user edit an existing section entry.
       #
@@ -97,13 +103,19 @@ module Sections
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('sections.titles.index'), Sections.r(:index)),
-          anchor_to(lang('section_entries.titles.index'), SectionEntries.r(:index, section_id)),
+          anchor_to(
+            lang('sections.titles.index'),
+            Sections.r(:index)
+          ),
+          anchor_to(
+            lang('section_entries.titles.index'),
+            SectionEntries.r(:index, section_id)
+          ),
           lang('section_entries.titles.edit')
         )
-        
+
         @section_id = section_id
 
         if flash[:form_data]
@@ -113,10 +125,10 @@ module Sections
         end
 
         @users_hash = {}
-        
+
         Users::Model::User.each { |u| @users_hash[u.id] = u.name }
       end
-      
+
       ##
       # Show a form that lets the user create a new section entry.
       #
@@ -129,24 +141,30 @@ module Sections
       # @param  [Integer] section_id The ID of the current section.
       # @since  0.1
       #
-      def new section_id
+      def new(section_id)
         if !user_authorized?([:read, :create])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(
-          anchor_to(lang('sections.titles.index'), Sections.r(:index)),
-          anchor_to(lang('section_entries.titles.index'), SectionEntries.r(:index, section_id)),
+          anchor_to(
+            lang('sections.titles.index'),
+            Sections.r(:index)
+          ),
+          anchor_to(
+            lang('section_entries.titles.index'),
+            SectionEntries.r(:index, section_id)
+          ),
           lang('section_entries.titles.new')
         )
-          
+
         @section_id = section_id
         @entry      = SectionEntry.new(:section_id => @section_id)
         @users_hash = {}
-        
+
         Users::Model::User.each { |u| @users_hash[u.id] = u.name }
       end
-      
+
       ##
       # Method used for processing the form data and redirecting the user back to
       # the proper URL. Based on the value of a hidden field named "id" we'll determine
@@ -166,15 +184,15 @@ module Sections
         if !user_authorized?([:create, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         post                = request.params.dup
         section_id          = post['section_id']
         field_values        = post['custom_field_values']
         custom_field_errors = {}
-        
-        post.delete("custom_field_values")
+
+        post.delete('custom_field_values')
         post.delete('slug') if post['slug'].empty?
-        
+
         if !post['category_pks'].nil?
           post['category_pks'].map! { |value| value.to_i }
         else
@@ -184,7 +202,7 @@ module Sections
         if post['id'] and !post['id'].empty?
           @entry        = SectionEntry[post['id']]
           save_action   = :save
-          
+
           # Section entries aren't considered to be updated whenever a custom field value
           # is modified, this solves that problem
           post['updated_at'] = Time.new
@@ -192,70 +210,70 @@ module Sections
           @entry        = SectionEntry.new
           save_action   = :new
         end
-        
+
+        post.delete('id')
+
         flash_success = lang("section_entries.success.#{save_action}")
         flash_error   = lang("section_entries.errors.#{save_action}")
-        
+
         # Transactions ahoy!
         begin
-          Zen::Database.handle.transaction do
+          Zen.database.transaction do
             # Update the entry itself
             @entry.update(post)
-            notification(:success, lang('section_entries.titles.index'), flash_success)
-            
+            message(:success, flash_success)
+
             # Update the field values
             field_values.each do |field_id, value|
               field_value = CustomFields::Model::CustomFieldValue[
-                :custom_field_id  => field_id, 
+                :custom_field_id  => field_id,
                 :section_entry_id => @entry.id
               ]
-              
+
               if field_value.nil?
                 field_value = @entry.add_custom_field_value(
-                  :section_entry_id => @entry.id, 
+                  :section_entry_id => @entry.id,
                   :custom_field_id  => field_id
                 )
               end
-              
+
               # Get the custom field for the current value
               custom_field = field_value.custom_field
-              
+
               if custom_field.required and value.empty?
-                custom_field_errors[:"custom_field_values[#{field_id}]"] = lang('zen_models.presence')
+                custom_field_errors[:"custom_field_values[#{field_id}]"] = \
+                  lang('zen_models.presence')
               end
-              
-              # Validate the entry
-              if !custom_field_errors.empty?
-                # No need for a particular exception as Sequel will undo the changes anyway
-                raise
-              end
-              
+
+              raise unless custom_field_errors.empty?
+
               field_value.value = value
               field_value.save
             end
           end
-        
+
         # The rescue statement is called whenever the following happens:
-        # 
+        #
         # 1. The fields for the section entry (title, slug, etc) are invalid
         # 2. Any custom field marked as required didn't have a value
         # 3. Something else went wrong, god knows what.
-        rescue
-          notification(:error, lang('section_entries.titles.index'), flash_error)
-            
+        rescue => e
+          Ramaze::Log.error(e.inspect)
+          message(:error, flash_error)
+
           flash[:form_errors] = @entry.errors.merge(custom_field_errors)
           flash[:form_data]   = @entry
 
           redirect_referrer
         end
-        
+
         if @entry.id
           redirect(SectionEntries.r(:edit, section_id, @entry.id))
         else
           redirect_referrer
         end
       end
-      
+
       ##
       # Delete a set of section entries based on the supplied POST
       # field "section_entry_ids".
@@ -271,36 +289,24 @@ module Sections
         if !user_authorized?([:delete])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
-        if !request.params['section_entry_ids'] or request.params['section_entry_ids'].empty?
-          notification(
-            :error, 
-            lang('section_entries.titles.index'), 
-            lang('section_entries.errors.no_delete')
-          )
 
+        if !request.params['section_entry_ids'] or request.params['section_entry_ids'].empty?
+          message(:error, lang('section_entries.errors.no_delete'))
           redirect_referrer
         end
-        
+
         request.params['section_entry_ids'].each do |id|
           begin
-            SectionEntry[id.to_i].destroy
-            notification(
-              :success, 
-              lang('section_entries.titles.index'), 
-              lang('section_entries.success.delete')
-            )
-          rescue
-            notification(
-              :error, 
-              lang('section_entries.titles.index'), 
-              lang('section_entries.errors.delete') % id
-            )
+            SectionEntry[id].destroy
+            message(:success, lang('section_entries.success.delete'))
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error,lang('section_entries.errors.delete') % id)
           end
         end
-        
+
         redirect_referrer
       end
-    end 
-  end
-end
+    end  # SectionEntries
+  end # Controller
+end # Sections