zen 0.3 → 0.4

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

@@ -3,59 +3,62 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{form_for(
-        @comment,
-        :method => :post,
-        :action => Comments::Controller::Comments.r(:save),
-        :id     => :comment_form
-      ) do |f|
-        f.input_hidden(:csrf_token, get_csrf_token)
-        f.input_hidden(:id        , @comment.id)
+    <div class="body">
+        #{form_for(
+            @comment,
+            :method => :post,
+            :action => Comments::Controller::Comments.r(:save),
+            :id     => :comment_form,
+            :'data-autosave-url' => Comments::Controller::Comments.r(:autosave)
+          ) do |f|
+            f.input_hidden(:csrf_token, get_csrf_token)
+            f.input_hidden(:id        , @comment.id)
 
-        f.input_text(
-          lang('comments.labels.name'),
-          :name,
-          :value    => @comment.user_name,
-          :disabled => :disabled
-        )
+            f.input_text(
+              lang('comments.labels.name'),
+              :name,
+              :value    => @comment.user_name,
+              :disabled => :disabled
+            )
 
-        if @comment.user.nil?
+            if @comment.user.nil?
+              f.input_text(
+                lang('comments.labels.website'),
+                :website,
+                :value     => @comment.website,
+                :maxlength => 255
+              )
 
-        f.input_text(
-          lang('comments.labels.website'),
-          :website,
-          :value     => @comment.website,
-          :maxlength => 255
-        )
+              f.input_text(
+                lang('comments.labels.email'),
+                :email,
+                :value     => @comment.email,
+                :required  => :required,
+                :maxlength => 255
+              )
+            end
 
-        f.input_text(
-          lang('comments.labels.email'),
-          :email,
-          :value     => @comment.email,
-          :required  => :required,
-          :maxlength => 255
-        )
+            f.select(
+              lang('comments.labels.status'),
+              :comment_status_id,
+              :values   => Comments::Model::Comment.status_hash,
+              :selected => @comment.comment_status_id,
+              :size     => 1,
+              :required => :required
+            )
 
-        end
+            f.textarea(
+              lang('comments.labels.comment'),
+              :comment,
+              :rows     => 10,
+              :required => :required
+            )
 
-        f.select(
-          lang('comments.labels.status'),
-          :comment_status_id,
-          :values   => Comments::Model::Comment.status_hash,
-          :selected => @comment.comment_status_id,
-          :size     => 1,
-          :required => :required
-        )
-
-        f.textarea(
-          lang('comments.labels.comment'),
-          :comment,
-          :rows     => 10,
-          :required => :required
-        )
-
-        f.g.div(:class => 'button') do
-          f.g.input(:type => 'submit', :value => lang('comments.buttons.save'))
-        end
-      end}
+            f.g.input(
+              :type  => 'submit',
+              :value => lang('comments.buttons.save'),
+              :class => 'button'
+            )
+          end}
+    </div>
 </section>

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

@@ -1,75 +1,67 @@
 <section>
-    #{render_search_form(::Comments::Controller::Comments.r(:index))}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
-    </header>
 
-    <form method="post" action="#{Comments::Controller::Comments.r(:delete)}">
-        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        #{render_search_form(::Comments::Controller::Comments.r(:index))}
+    </header>
 
-        <?r if !@comments.empty? ?>
+    <div class="body">
+        <form method="post" action="#{Comments::Controller::Comments.r(:delete)}">
+            <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
-        <table>
-            <thead>
-                <?r if user_authorized?(:delete_comment) ?>
-                <th class="no_sort">
-                    <input type="checkbox" />
-                </th>
-                <?r end ?>
+            <?r if !@comments.empty? ?>
 
-                <th>#{lang('comments.labels.id')}</th>
-                <th>#{lang('comments.labels.comment')}</th>
-                <th>#{lang('comments.labels.entry')}</th>
-                <th>#{lang('comments.labels.status')}</th>
-                <th>#{lang('comments.labels.name')}</th>
-                <th>#{lang('comments.labels.email')}</th>
-                <th>#{lang('comments.labels.website')}</th>
-                <th>#{lang('comments.labels.created_at')}</th>
-             </thead>
-            <tbody>
-                <?r @comments.each do |comment| ?>
-                <tr>
+            <table>
+                <thead>
                     <?r if user_authorized?(:delete_comment) ?>
-                    <td>
-                        <input type="checkbox" name="comment_ids[]"
-                        value="#{comment.id}" />
-                    </td>
+                    <th class="no_sort">
+                        <input type="checkbox" />
+                    </th>
                     <?r end ?>
 
-                    <td>#{comment.id}</td>
-                    <td>
-                        #{if user_authorized?(:edit_comment)
-                          comment.summary(true)
-                        else
-                          comment.summary
-                        end}
-                    </td>
-                    <td>#{comment.section_entry.title}</td>
-                    <td>#{comment.status_name}</td>
-                    <td>#{comment.user_name}</td>
-                    <td>#{comment.user_email}</td>
-                    <td>#{comment.user_website(true)}</td>
-                    <td>#{format_date(comment.created_at)}</td>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
+                    <th>#{lang('comments.labels.id')}</th>
+                    <th>#{lang('comments.labels.comment')}</th>
+                    <th>#{lang('comments.labels.entry')}</th>
+                    <th>#{lang('comments.labels.status')}</th>
+                    <th>#{lang('comments.labels.name')}</th>
+                    <th>#{lang('comments.labels.email')}</th>
+                    <th>#{lang('comments.labels.created_at')}</th>
+                </thead>
+                <tbody>
+                    <?r @comments.each do |comment| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete_comment) ?>
+                        <td>
+                            <input type="checkbox" name="comment_ids[]"
+                            value="#{comment.id}" />
+                        </td>
+                        <?r end ?>
+
+                        <td>#{comment.id}</td>
+                        <td>
+                            #{comment.summary(user_authorized?(:edit_comment))}
+                        </td>
+                        <td>#{comment.section_entry.title}</td>
+                        <td>#{comment.status_name}</td>
+                        <td>#{comment.user_website(true, comment.user_name)}</td>
+                        <td>#{comment.user_email}</td>
+                        <td>#{format_date(comment.created_at)}</td>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
 
-        #{if @comments.respond_to?(:navigation) and @comments.page_count > 1
-          @comments.navigation
-        end}
+            #{render_pagination(@comments)}
 
-        <?r else ?>
+            <?r else ?>
 
-        <p>#{lang('comments.messages.no_comments')}</p>
+            <p>#{lang('comments.messages.no_comments')}</p>
 
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:delete_comment) and !@comments.empty? ?>
-        <div class="button">
-            <input type="submit" value="#{lang('comments.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:delete_comment) and !@comments.empty? ?>
+            #{delete_button(lang('comments.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>

data/lib/zen/package/comments/migrations/1308774099_comment_status.rb

@@ -49,7 +49,7 @@ Sequel.migration do
       # MySQL doesn't automatically drop foreign keys, because of this the one
       # for the comment status ID has to be removed manually. Luckily the name
       # of the foreign key is rather easy to figure out.
-      if Zen.database.adapter_scheme.to_s.include?('mysql')
+      if Zen.database.database_type.to_s.include?('mysql')
         drop_constraint(:comments_ibfk_2, :type => :foreign_key)
       end
 

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

@@ -7,17 +7,13 @@ Zen::Package.add do |p|
   p.root       = __DIR__('custom_fields')
   p.migrations = __DIR__('../migrations')
 
-  p.menu(
-    'custom_fields.titles.index',
+  p.menu 'custom_fields.titles.index',
     '/admin/custom-field-groups',
     :permission => :show_custom_field_group
-  ) do |sub|
-    sub.menu(
-      'custom_field_types.titles.index',
-      '/admin/custom-field-types',
-      :permission => :show_custom_field
-    )
-  end
+
+  p.menu 'custom_field_types.titles.index',
+    '/admin/custom-field-types',
+    :permission => :show_custom_field
 
   p.permission :show_custom_field_group, 'custom_field_groups.permissions.show'
   p.permission :edit_custom_field_group, 'custom_field_groups.permissions.edit'
@@ -36,10 +32,6 @@ Zen::Package.add do |p|
   p.permission :delete_custom_field, 'custom_fields.permissions.delete'
 end
 
-Zen::Language.load('custom_fields')
-Zen::Language.load('custom_field_groups')
-Zen::Language.load('custom_field_types')
-
 require __DIR__('custom_fields/model/custom_field_method')
 require __DIR__('custom_fields/model/custom_field_type')
 require __DIR__('custom_fields/model/custom_field')
@@ -51,3 +43,9 @@ require __DIR__('custom_fields/controller/custom_fields')
 require __DIR__('custom_fields/controller/custom_field_types')
 
 require __DIR__('custom_fields/blue_form_parameters')
+
+Zen::Event.listen :post_start do
+  Zen::Language.load('custom_fields')
+  Zen::Language.load('custom_field_groups')
+  Zen::Language.load('custom_field_types')
+end

data/lib/zen/package/custom_fields/lib/custom_fields/blue_form_parameters.rb

@@ -87,11 +87,9 @@ module CustomFields
       def input_text(field, field_value)
         type   = field.custom_field_type
         value  = field_value.value rescue nil
+        name   = "custom_field_value_#{field.id}"
         params = [
-          :input_text,
-          field.name,
-          "custom_field_value_#{field.id}",
-          {:value => value}
+          :input_text, field.name, name, {:value => get_value(name, value)}
         ]
 
         if !field.text_limit.nil?
@@ -164,13 +162,8 @@ module CustomFields
       def input_radio(field, field_value)
         type   = field.custom_field_type
         value  = field_value.value rescue nil
-        params = [
-          :input_radio,
-          field.name,
-          "custom_field_value_#{field.id}",
-          value,
-          {}
-        ]
+        name   = "custom_field_value_#{field.id}"
+        params = [:input_radio, field.name, name, get_value(name, value), {}]
 
         # Convert the string containing the possible values to a hash.
         if !field.possible_values.nil? and !field.possible_values.empty?
@@ -215,11 +208,12 @@ module CustomFields
       def select(field, field_value)
         type   = field.custom_field_type
         value  = field_value.value rescue nil
+        name   = "custom_field_value_#{field.id}"
         params = [
           :select,
           field.name,
-          "custom_field_value_#{field.id}",
-          {:selected => value, :size => 1}
+          name,
+          {:selected => get_value(name, value), :size => 1}
         ]
 
         # Convert the string containing the possible values to a hash.
@@ -259,6 +253,28 @@ module CustomFields
 
         return params
       end
+
+      private
+
+      ##
+      # Determines the value of a custom field. If a field's value is set in
+      # ``flash[:form_data]`` it will be retrieved from this hash, otherwise the
+      # default value is used.
+      #
+      # @since  26-02-2012
+      # @param  [String] name The name of the field.
+      # @param  [Mixed] value The default value.
+      # @return [Mixed]
+      #
+      def get_value(name, value)
+        if Ramaze::Current.session \
+        and Ramaze::Current.session.flash[:form_data] \
+        and Ramaze::Current.session.flash[:form_data].key?(name)
+          value = Ramaze::Current.session.flash[:form_data][name]
+        end
+
+        return value
+      end
     end # class << self
   end # BlueFormParameters
 end # CustomFields

data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb

@@ -34,7 +34,7 @@ module CustomFields
     # existing groups these will be displayed, otherwise a message telling you
     # that do don't have any groups will be displayed instead.
     #
-    # ![Groups](../../_static/custom_fields/custom_field_groups.png)
+    # ![Groups](../../images/custom_fields/custom_field_groups.png)
     #
     # Just like with other packages you can delete records by clicking the
     # checkboxes followed by the "Delete selected groups" button. Groups can be
@@ -43,7 +43,7 @@ module CustomFields
     #
     # ## Adding/Editing Groups
     #
-    # ![Edit Group](../../_static/custom_fields/edit_custom_field_group.png)
+    # ![Edit Group](../../images/custom_fields/edit_custom_field_group.png)
     #
     # When creating a new group or editing an existing group you can fill in the
     # following two fields:
@@ -62,27 +62,18 @@ module CustomFields
     # * edit_custom_field_group
     # * delete_custom_field_group
     #
-    # ## Events
-    #
-    # All events in this controller receive an instance of
-    # {CustomFields::Model::CustomFieldGroup}. The
-    # ``after_delete_custom_field_group`` event will receive an instance of this
-    # model that has already been destroyed.
-    #
     # @since  0.1
     # @map    /admin/custom-field-groups
-    # @event  before_new_custom_field_group
-    # @event  after_new_custom_field_group
-    # @event  before_edit_custom_field_group
-    # @event  after_edit_custom_field_group
-    # @event  before_delete_custom_field_group
-    # @event  after_delete_custom_field_group
     #
     class CustomFieldGroups < Zen::Controller::AdminController
       helper :custom_field
       map    '/admin/custom-field-groups'
       title  'custom_field_groups.titles.%s'
 
+      autosave Model::CustomFieldGroup,
+        Model::CustomFieldGroup::COLUMNS,
+        :edit_custom_field_group
+
       csrf_protection :save, :delete
 
       ##
@@ -123,7 +114,8 @@ module CustomFields
           @page_title
         )
 
-        @field_group = flash[:form_data] || validate_custom_field_group(id)
+        @field_group = validate_custom_field_group(id)
+        @field_group.set(flash[:form_data]) if flash[:form_data]
 
         render_view(:form)
       end
@@ -142,11 +134,8 @@ module CustomFields
           @page_title
         )
 
-        if flash[:form_data]
-          @field_group = flash[:form_data]
-        else
-          @field_group = ::CustomFields::Model::CustomFieldGroup.new
-        end
+        @field_group = Model::CustomFieldGroup.new
+        @field_group.set(flash[:form_data]) if flash[:form_data]
 
         render_view(:form)
       end
@@ -159,52 +148,39 @@ module CustomFields
       # @since      0.1
       # @permission edit_custom_field_group (when editing a group)
       # @permission new_custom_field_group (when creating a group)
-      # @event      before_edit_custom_field_group
-      # @event      after_edit_custom_field_group
-      # @event      before_new_custom_field_group
-      # @event      after_new_custom_field_group
       #
       def save
-        post = request.subset(:id, :name, :description)
+        post = post_fields(*Model::CustomFieldGroup::COLUMNS)
+        id   = request.params['id']
 
-        if post['id'] and !post['id'].empty?
+        if id and !id.empty?
           authorize_user!(:edit_custom_field_group)
 
-          field_group  = validate_custom_field_group(post['id'])
-          save_action  = :save
-          before_event = :before_edit_custom_field_group
-          after_event  = :after_edit_custom_field_group
+          field_group = validate_custom_field_group(id)
+          save_action = :save
         else
           authorize_user!(:new_custom_field_group)
 
-          field_group  = ::CustomFields::Model::CustomFieldGroup.new
-          save_action  = :new
-          before_event = :before_new_custom_field_group
-          after_event  = :after_new_custom_field_group
+          field_group = ::CustomFields::Model::CustomFieldGroup.new
+          save_action = :new
         end
 
-        post.delete('id')
-
         success = lang("custom_field_groups.success.#{save_action}")
         error   = lang("custom_field_groups.errors.#{save_action}")
 
         begin
-          post.each { |k, v| field_group.send("#{k}=", v) }
-          Zen::Event.call(before_event, field_group)
-
+          field_group.set(post)
           field_group.save
         rescue => e
-          Ramaze::Log.error(e.inspect)
+          Ramaze::Log.error(e)
           message(:error, error)
 
           flash[:form_errors] = field_group.errors
-          flash[:form_data]   = field_group
+          flash[:form_data]   = post
 
           redirect_referrer
         end
 
-        Zen::Event.call(after_event, field_group)
-
         message(:success, success)
         redirect(CustomFieldGroups.r(:edit, field_group.id))
       end
@@ -215,8 +191,6 @@ module CustomFields
       #
       # @since      0.1
       # @permission delete_custom_field_group
-      # @event      before_delete_custom_field_group
-      # @event      after_delete_custom_field_group
       #
       def delete
         authorize_user!(:delete_custom_field_group)
@@ -231,18 +205,15 @@ module CustomFields
           group = ::CustomFields::Model::CustomFieldGroup[id]
 
           next if group.nil?
-          Zen::Event.call(:before_delete_custom_field_group, group)
 
           begin
             group.destroy
           rescue => e
-            Ramaze::Log.error(e.inspect)
+            Ramaze::Log.error(e)
             message(:error, lang('custom_field_groups.errors.delete') % id)
 
             redirect_referrer
           end
-
-          Zen::Event.call(:after_delete_custom_field_group, group)
         end
 
         message(:success, lang('custom_field_groups.success.delete'))