zen 0.2.5 → 0.2.6

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

@@ -32,7 +32,6 @@
     f.input_hidden(:id, @entry.id)
     
     f.g.div(:id => :basic) do
-
       f.input_text(
         lang('section_entries.labels.title'), 
         :title
@@ -65,11 +64,9 @@
         :selected => @entry.status, 
         :size     => 1
       )
-
     end
     
     f.g.div(:id => :categories) do
-
       if @entry.section.category_groups
         @entry.section.category_groups.each do |group|
           categories = {}
@@ -89,7 +86,6 @@
       else
         f.g.p(lang('section_entries.messages.no_categories'))
       end
-
     end
     
     # Organize all field values by field ID

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

@@ -49,8 +49,14 @@
                     
                     <td>#{entry.slug}</td>
                     <td>#{@status_hash[entry.status]}</td>
-                    <td>#{entry.created_at}</td>
-                    <td>#{entry.updated_at}</td>
+                    <td>#{entry.created_at.strftime(session[:user].date_format)}</td>
+                    <td>
+                        #{
+                          if entry.updated_at
+                            entry.updated_at.strftime(session[:user].date_format)
+                          end
+                        }
+                    </td>
                 </tr>
                 <?r end ?>
             </tbody>

data/lib/zen/package/sections/migrations/1306772479_remove_unique_slug.rb

@@ -0,0 +1,28 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    entries = Zen.database[:section_entries].all
+
+    drop_column(:section_entries, :slug)
+    add_column(:section_entries , :slug, String)
+    add_index(:section_entries  , :slug)
+
+    entries.each do |entry|
+      Zen.database[:section_entries] \
+        .filter(:id => entry[:id]).update(:slug => entry[:slug])
+    end
+  end
+  
+  # Reverts the changes made in the up() block.
+  down do
+    entries = Zen.database[:section_entries].all
+
+    drop_column(:section_entries, :slug)
+    add_column(:section_entries, :slug, String, :unique => true)
+
+    entries.each do |entry|
+      Zen.database[:section_entries] \
+        .filter(:id => entry[:id]).update(:slug => entry[:slug])
+    end    
+  end
+end

data/lib/zen/package/settings/lib/settings.rb

@@ -27,16 +27,7 @@ not to allow registration, etc.'
 end
 
 # Create all variables required for the settings
-section_hash = {}
-theme_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
+theme_hash = {}
 
 Zen::Theme::Registered.each do |name, theme|
   name             = name.to_s
@@ -103,18 +94,17 @@ plugin(:settings, :register) do |setting|
   setting.group       = 'general'
   setting.default     = 'en'
   setting.type        = 'select'
-  setting.values      = {
-    'en' => lang('zen_general.special.language_hash.en')
-  }
+  setting.values      = Zen::Language::Languages
 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.title       = lang('settings.labels.frontend_language')
+  setting.description = lang('settings.placeholders.frontend_language')
+  setting.name        = 'frontend_language'
   setting.group       = 'general'
+  setting.default     = 'en'
   setting.type        = 'select'
-  setting.values      = section_hash
+  setting.values      = Zen::Language::Languages
 end
 
 plugin(:settings, :register) do |setting|
@@ -126,6 +116,20 @@ plugin(:settings, :register) do |setting|
   setting.values      = theme_hash
 end
 
+plugin(:settings, :register) do |setting|
+  setting.title       = lang('settings.labels.date_format')
+  setting.description = lang('settings.placeholders.date_format')
+  setting.name        = 'date_format'
+  setting.group       = 'general'
+  setting.type        = 'select'
+  setting.default     = '%Y-%m-%d %H:%I:%S'
+  setting.values      = {
+    '%Y-%m-%d %H:%I:%S' => '2011-05-10 13:30:12',
+    '%d-%m-%Y %H:%I:%S' => '10-05-2011 13:30:12',
+    '%A, %B %d, %Y'     => 'Tuesday, May 10, 2011'
+  }
+end
+
 plugin(:settings, :register) do |setting|
   setting.title       = lang('settings.labels.enable_antispam')
   setting.description = lang('settings.placeholders.enable_antispam')
@@ -137,20 +141,3 @@ plugin(:settings, :register) do |setting|
     lang('zen_general.special.boolean_hash.false') => '0'
   }
 end
-
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.defensio_key')
-  setting.description = lang('settings.placeholders.defensio_key')
-  setting.name        = 'defensio_key'
-  setting.group       = 'security'
-  setting.type        = 'textbox'
-end
-
-# Migrate all settings
-begin
-  plugin(:settings, :migrate)
-rescue
-  Ramaze::Log.warn(
-    "Failed to migrate the current settings, make sure the database table is up to date."
-  )
-end

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

@@ -12,14 +12,17 @@ module Settings
     class Settings < Zen::Controller::AdminController
       include ::Settings::Model
 
-      map('/admin/settings')
-      
+      map '/admin/settings'
+
+      # Load all required Javascript files
+      javascript ['zen/tabs']
+
       before_all do
         csrf_protection(:save, :delete) do
           respond(lang('zen_general.errors.csrf'), 403)
         end
       end
-      
+
       ##
       # Load our language packs, set the form URLs and define our page title.
       #
@@ -32,7 +35,7 @@ module Settings
       #
       def initialize
         super
-        
+
         @form_save_url = Settings.r(:save)
 
         # Set the page title
@@ -41,7 +44,7 @@ module Settings
           @page_title = lang("settings.titles.#{method}") rescue nil
         end
       end
-      
+
       ##
       # Show all settings and allow the user to change them.
       # The values of each setting item are stored in the database,
@@ -60,23 +63,23 @@ module Settings
         if !user_authorized?([:read, :update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         set_breadcrumbs(lang('settings.titles.index'))
-        
+
         @settings_ordered = {}
         @groups           = ::Settings::Plugin::Settings::Registered[:groups]
-        
+
         # Organize the settings so that each item is a child
         # item of it's group.
         ::Settings::Plugin::Settings::Registered[:settings].each do |name, setting|
           if !@settings_ordered.key?(setting.group)
             @settings_ordered[setting.group] = []
           end
-          
+
           @settings_ordered[setting.group].push(setting)
         end
       end
-      
+
       ##
       # Saves the values of each setting. Since each setting
       # is a new row we'll have to loop through them and execute quite
@@ -85,42 +88,46 @@ module Settings
       # This method requires the following permissions:
       #
       # * update
-      # 
+      #
       # @author Yorick Peterse
       # @since  0.1
-      #      
+      #
       def save
         if !user_authorized?([:update])
           respond(lang('zen_general.errors.not_authorized'), 403)
         end
-        
+
         post = request.params.dup
         post.delete('csrf_token')
+        post.delete('id')
 
         flash_success = lang('settings.success.save')
         flash_error   = lang('settings.errors.save')
+        success       = true
 
         # Update all settings
         post.each do |key, value|
           setting = Setting[:name => key]
 
           begin
-            # Update the DB record
             setting.update(:value => value)
-            notification(:success, lang('settings.titles.index'), flash_success)
 
             # Update the internal settings
-            if ::Zen::Settings[key.to_sym] != value
-              ::Zen::Settings[key.to_sym] = value
+            if ::Zen.settings[key.to_sym] != value
+              ::Zen.settings[key.to_sym] = value
             end
-          rescue
-            notification(:error, lang('settings.titles.index'), flash_error)
+          rescue => e
+            Ramaze::Log.error(e.inspect)
+            message(:error, flash_error)
+
             flash[:form_errors] = setting.errors
+            success             = false
           end
         end
 
+        message(:success, flash_success) if success === true
         redirect_referrer
       end
-    end
-  end
-end
+    end # Settings
+  end # Controller
+end # Settings

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

@@ -7,10 +7,11 @@ labels:
   website_description  : 'Website description'
   website_enabled      : 'Website enabled'
   language             : 'Language'
+  frontend_language    : 'Frontend language'
   default_section      : 'Default section'
   theme                : 'Theme'
   enable_antispam      : 'Enable anti-spam'
-  defensio_key         : 'Defensio API key'
+  date_format          : 'Date format'
 
 placeholders:
   website_name        : 'The name of the website.'
@@ -19,12 +20,13 @@ placeholders:
   language            : 'The language to use for the system.'
   default_section     : 'The default section to use on the homepage.'
   theme               : 'The frontend theme to use.'
-  enable_antispam     : "Whether or not Defensio's anti-spam system should be used."
-  defensio_key        : 'The API key to use for the Defensio anti-spam system.'
+  enable_antispam     : 'Whether or not anti-spam protection should be used for comments'
+  frontend_language   : 'The language to use for the frontend of the website.'
+  date_format         : 'A custom format used for all the dates displayed in the backend.'
 
 tabs:
-  general   : 'General'
-  security  : 'Security'
+  general  : 'General'
+  security : 'Security'
 
 buttons:
   save: 'Save'

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

@@ -0,0 +1,39 @@
+---
+titles:
+  index: 'Instellingen'
+
+labels:
+  website_name       : 'Website naam'
+  website_description: 'Website beschrijving'
+  website_enable     : 'Website beschikbaar'
+  language           : 'Taal'
+  frontend_langauge  : 'Taal voor bezoekers'
+  default_section    : 'Standaard sectie'
+  theme              : 'Thema'
+  enable_antispam    : 'Anti-spam inschakelen'
+  date_format        : 'Datum formaat'
+
+placeholders:
+  website_name       : 'De naam van de website.'
+  website_description: 'De beschrijving van de website.'
+  website_enabled    : 'Is de website wel of niet beschikbaar?'
+  language           : 'De taal die gebruikt moet worden voor het admin gedeelte.'
+  default_section    : 'De standaard sectie die moet worden gebruikt.'
+  theme              : 'Het thema dat bezoekers zullen zien.'
+  enable_antispam    : 'Waarde die aangeeft of het anti-spam systeem moet worden gebruikt 
+voor reacties.'
+  frontend_language  : 'De taal die gebruikt moet worden voor bezoekers.'
+  date_format        : 'Het formaat van de datum voor het admin gedeelte.'
+
+tabs:
+  general : 'Algemeen'
+  security: 'Beveiliging'
+
+buttons:
+  save: 'Opslaan'
+
+success:
+  save: 'De instellingen zijn opgeslagen.'
+
+errors:
+  save: 'De instellingen konden niet worden opgeslagen.'

data/lib/zen/package/settings/lib/settings/model/setting.rb

@@ -23,7 +23,6 @@ module Settings
     # idea to refactor this and put it in it's own class/plugin/whatever.
     #
     class Setting < Sequel::Model
-
       ##
       # Retrieves all settings and returns them as a key/value hash.
       #
@@ -46,7 +45,6 @@ module Settings
         
         return settings
       end
-
-    end
-  end
-end
+    end # Setting
+  end # Model
+end # Settings

data/lib/zen/package/settings/lib/settings/plugin/group_base.rb

@@ -34,7 +34,6 @@ module Settings
           )
         end
       end
-
-    end
-  end
-end
+    end # GroupBase
+  end # Plugin
+end # Settings

data/lib/zen/package/settings/lib/settings/plugin/setting_base.rb

@@ -69,8 +69,6 @@ module Settings
           raise(::Zen::ValidationError, "The settings group #{group} doesn't exist.")
         end
       end
-
-    end
-  end
-end
-
+    end # SettingBase
+  end # Plugin
+end # Settings

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

@@ -201,12 +201,20 @@ module Settings
         settings = Setting.all.map { |s| s.name }
 
         Registered[:settings].each do |name, setting|
+          name = name.to_s
+
           if !settings.include?(name)
             # Insert the new setting
             Setting.new(
               :name    => setting.name   , :group => setting.group,
               :default => setting.default, :type  => setting.type
             ).save
+
+          # Update everything but the value
+          else
+            Setting.filter[:name => setting.name].update(
+              :group => setting.group, :default => setting.default, :type => setting.type
+            )
           end
         end
       end
@@ -230,7 +238,6 @@ module Settings
 
         Setting.filter(:name => names).delete
       end
-
-    end
-  end
-end
+    end # Settings
+  end # Plugin
+end # Settings

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

@@ -12,7 +12,8 @@
             <?r end ?>
         </ul>
     </div>
-  #{
+ 
+    #{
     form_for(@settings_ordered, :method => :post, :action => @form_save_url, :id => :setting_form) do |f|
       f.input_hidden(:csrf_token, get_csrf_token)
 
@@ -20,10 +21,10 @@
         f.g.div(:id => "group_#{group}") do
           items.each do |s|
             # Get the value from either the value or default getter
-            if ::Zen::Settings[s.name.to_sym].nil?
+            if ::Zen.settings[s.name.to_sym].nil?
               value = s.default
             else
-              value = ::Zen::Settings[s.name.to_sym]
+              value = ::Zen.settings[s.name.to_sym]
             end
             
             case s.type
@@ -77,6 +78,5 @@
         end
       end
     end
-  }
-
+    }
 </article>