zen 0.2.7 → 0.2.8

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

@@ -1,59 +1,52 @@
-#{
-form_for(
-  @category, :method => :post, :action => @form_save_url, :id => :category_form
-) do |f|
-
-  f.input_hidden(:category_group_id, @category_group_id)
-  f.input_hidden(:id               , @category.id)
-  f.input_hidden(:csrf_token       , get_csrf_token)
-  
-  f.g.div(:id => 'general') do
-    f.input_text(
-      lang('categories.labels.name'), 
-      :name, 
-      :placeholder => lang('categories.placeholders.name'), 
-      :required    => :required, 
-      :maxlength   => 255
-    )
-
-    f.input_text(
-      lang('categories.labels.slug'),
-      :slug, 
-      :placeholder => lang('categories.placeholders.slug')
-    )
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
     
-    # Generate the dropdown that contains all possible parent categories
-    parent_categories = {}
-    Categories::Model::CategoryGroup[@category_group_id].categories.each do |c|
-      if c.id != @category.id
-        parent_categories[c.id] = c.name
-      end
-    end
+    #{
+    form_for(
+      @category, 
+      :method => :post, 
+      :action => Categories::Controller::Categories.r(:save), 
+      :id     => :category_form
+    ) do |f|
+      f.input_hidden(:category_group_id, @category_group_id)
+      f.input_hidden(:id               , @category.id)
+      f.input_hidden(:csrf_token       , get_csrf_token)
+      
+      f.g.div(:id => 'general') do
+        f.input_text(
+          lang('categories.labels.name'), 
+          :name, 
+          :placeholder => lang('categories.placeholders.name'), 
+          :required    => :required, 
+          :maxlength   => 255
+        )
 
-    parent_categories[nil] = '--'
-    
-    if !parent_categories.empty?
-      f.select(
-        lang('categories.labels.parent'), 
-        :parent_id, 
-        :values   => parent_categories, 
-        :size     => 1, 
-        :selected => @category.parent_id
-      )
-    end
-    
-    f.textarea(
-      lang('categories.labels.description'), 
-      :description, 
-      :rows => 8
-    )
-  end
-  
-  f.g.div(:class => "clearfix") do
-    f.g.div(:class => "button") do
-      f.g.input(:type => 'submit', :value => lang('categories.buttons.save'))
+        f.input_text(
+          lang('categories.labels.slug'),
+          :slug, 
+          :placeholder => lang('categories.placeholders.slug')
+        )
+        
+        f.select(
+          lang('categories.labels.parent'), 
+          :parent_id, 
+          :values   => parent_categories(@category.id, @category_group_id), 
+          :size     => 1, 
+          :selected => @category.parent_id
+        )
+        
+        f.textarea(
+          lang('categories.labels.description'), 
+          :description, 
+          :rows => 8
+        )
+      end
+      
+      f.g.div(:class => 'button') do
+        f.g.input(:type => 'submit', :value => lang('categories.buttons.save'))
+      end
     end
-  end
-
-end
-}
+    }
+</article>

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

@@ -2,22 +2,24 @@
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post"
+    action="#{Categories::Controller::Categories.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        <input type="hidden" name="category_group_id" value="#{@category_group_id}" />
-        
-        <?r if @categories and !@categories.empty? ?>
-        
-        <table class="table">
+        <input type="hidden" name="category_group_id"
+        value="#{@category_group_id}" />
+
+        <?r if !@categories.empty? ?>
+
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
-                    
+
                     <th>#{lang('categories.labels.id')}</th>
                     <th>#{lang('categories.labels.name')}</th>
                     <th>#{lang('categories.labels.slug')}</th>
@@ -29,50 +31,61 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="category_ids[]" value="#{category.id}" />
+                        <input type="checkbox" name="category_ids[]"
+                        value="#{category.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{category.id}</td>
-                    
+
                     <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          category.name, 
-                          Categories::Controller::Categories.r(:edit, @category_group_id, category.id)
+                        #{Categories::Controller::Categories.a(
+                          category.name,
+                          :edit,
+                          @category_group_id,
+                          category.id
                         )}
                     </td>
                     <?r else ?>
                     <td>#{category.name}</td>
                     <?r end ?>
-                    
+
                     <td>#{category.slug}</td>
-                    <td>#{category.parent.name if category.parent.respond_to?(:name)}</td>
+                    <td>
+                        #{category.parent.name \
+                        if category.parent.respond_to?(:name)}
+                    </td>
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @categories.respond_to?(:navigation) and @categories.page_count > 1
+          @categories.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('categories.messages.no_categories')}</p>
         <?r end ?>
-        
-        <div class="clearfix">
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('categories.buttons.new'), 
-                  Categories::Controller::Categories.r(:new, @category_group_id)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @categories and !@categories.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('categories.buttons.delete')}" />
-            </div>
-            <?r end ?>
-            
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{Categories::Controller::Categories.a(
+              lang('categories.buttons.new'),
+              :new,
+              @category_group_id
+            )}
         </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@categories.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('categories.buttons.delete')}" />
+        </div>
+        <?r end ?>
     </form>
 </article>

data/lib/zen/package/categories/lib/categories/view/admin/category-groups/form.xhtml

@@ -1,31 +1,38 @@
-#{
-form_for(
-  @category_group, :method => :post, :action => @form_save_url, 
-  :id => :category_group_form
-) do |f|
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{
+    form_for(
+      @category_group, 
+      :method => :post, 
+      :action => Categories::Controller::CategoryGroups.r(:save), 
+      :id     => :category_group_form
+    ) do |f|
+      f.input_hidden(:id        , @category_group.id)
+      f.input_hidden(:csrf_token, get_csrf_token)
+      
+      f.input_text(
+        lang('category_groups.labels.name'), 
+        :name, 
+        :placeholder => lang('category_groups.placeholders.name'), 
+        :required    => :required,
+        :maxlength   => 255
+      )
 
-  f.input_hidden(:id, @category_group.id)
-  f.input_hidden(:csrf_token, get_csrf_token)
-  
-  f.input_text(
-    lang('category_groups.labels.name'), 
-    :name, 
-    :placeholder => lang('category_groups.placeholders.name'), 
-    :required    => :required,
-    :maxlength   => 255
-  )
-
-  f.textarea(
-    lang('category_groups.labels.description'), 
-    :description, 
-    :rows => 8
-  )
-  
-  f.g.div(:class => "clearfix") do
-    f.g.div(:class => "button") do
-      f.g.input(:type => 'submit', :value => lang('category_groups.buttons.save'))
+      f.textarea(
+        lang('category_groups.labels.description'), 
+        :description, 
+        :rows => 8
+      )
+      
+      f.g.div(:class => 'button') do
+        f.g.input(
+          :type  => 'submit', 
+          :value => lang('category_groups.buttons.save')
+        )
+      end
     end
-  end
-
-end
-}
+    }
+</article>

data/lib/zen/package/categories/lib/categories/view/admin/category-groups/index.xhtml

@@ -2,24 +2,24 @@
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post"
+    action="#{Categories::Controller::CategoryGroups.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        
-        <?r if @category_groups and !@category_groups.empty? ?>
-        
-        <table class="table">
+
+        <?r if !@category_groups.empty? ?>
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
-                    
+
                     <th>#{lang('category_groups.labels.id')}</th>
                     <th>#{lang('category_groups.labels.name')}</th>
-                    
+
                     <?r if user_authorized?(
                       [:read], true, 'Categories::Controller::Categories'
                     ) ?>
@@ -32,59 +32,64 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="category_group_ids[]" 
+                        <input type="checkbox" name="category_group_ids[]"
                         value="#{group.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{group.id}</td>
-                    
+
                     <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          group.name, 
-                          Categories::Controller::CategoryGroups.r(:edit, group.id)
+                        #{Categories::Controller::CategoryGroups.a(
+                          group.name, :edit, group.id
                         )}
                     </td>
                     <?r else ?>
                     <td>#{group.name}</td>
                     <?r end ?>
-                    
+
                     <?r if user_authorized?(
                       [:read], true, 'Categories::Controller::Categories'
                     ) ?>
                     <td>
-                        #{anchor_to(
-                          lang('category_groups.labels.manage'), 
-                          Categories::Controller::Categories.r(:index, group.id)
+                        #{Categories::Controller::Categories.a(
+                          lang('category_groups.labels.manage'),
+                          :index,
+                          group.id
                         )}
                     </td>
                     <?r end ?>
-                    
+
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @category_groups.respond_to?(:navigation) \
+        and @category_groups.page_count > 1
+          @category_groups.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('category_groups.messages.no_groups')}</p>
         <?r end ?>
-        
-        <div class="clearfix">
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('category_groups.buttons.new'), 
-                  Categories::Controller::CategoryGroups.r(:new)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @category_groups and !@category_groups.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('category_groups.buttons.delete')}" />
-            </div>
-            <?r end ?>
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{Categories::Controller::CategoryGroups.a(
+              lang('category_groups.buttons.new'), :new
+            )}
         </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@category_groups.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('category_groups.buttons.delete')}" />
+        </div>
+        <?r end ?>
     </form>
 </article>

data/lib/zen/package/comments/lib/comments.rb

@@ -1,4 +1,7 @@
-require __DIR__('comments/model/comment.rb')
+Ramaze::HelpersHelper.options.paths.push(__DIR__('comments'))
+
+require __DIR__('comments/model/comment_status')
+require __DIR__('comments/model/comment')
 require __DIR__('comments/controller/comments')
 require __DIR__('comments/controller/comments_form')
 require __DIR__('comments/plugin/comments')

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

@@ -6,9 +6,9 @@ module Comments
     # Controller used for managing comments. Administrations can't actually
     # add new comments using the backend controller but can edit or delete them.
     # Comments can be submitted to any section entry as long as the section
-    # allows it. When submitting a comment the user data such as the name and email
-    # will be retrieved from either the users table (if the user is logged in) or
-    # from the form that was submitted.
+    # allows it. When submitting a comment the user data such as the name and
+    # email will be retrieved from either the users table (if the user is logged
+    # in) or from the form that was submitted.
     #
     # @author  Yorick Peterse
     # @since   0.1
@@ -16,7 +16,8 @@ module Comments
     class Comments < Zen::Controller::AdminController
       include ::Comments::Model
 
-      map('/admin/comments')
+      map '/admin/comments'
+      helper :comment
 
       before_all do
         csrf_protection(:save, :delete) do
@@ -36,9 +37,6 @@ module Comments
       def initialize
         super
 
-        @form_save_url   = Comments.r(:save)
-        @form_delete_url = Comments.r(:delete)
-
         Zen::Language.load('comments')
 
         # Set the page title
@@ -60,13 +58,11 @@ module Comments
       # @since  0.1
       #
       def index
-        if !user_authorized?([:read])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read)
 
         set_breadcrumbs(lang('comments.titles.index'))
 
-        @comments = Comment.all
+        @comments = paginate(Comment.eager(:comment_status))
       end
 
       ##
@@ -78,28 +74,31 @@ module Comments
       # * update
       #
       # @author Yorick Peterse
-      # @param  [Integer] id The ID of the comment to retrieve so that we can edit it.
+      # @param  [Integer] id The ID of the comment to retrieve so that we can
+      # edit it.
       # @since  0.1
       #
       def edit(id)
-        if !user_authorized?([:read, :update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:read, :update)
 
         set_breadcrumbs(
-          anchor_to(lang('comments.titles.index'), Comments.r(:index)), @page_title
+          Comments.a(lang('comments.titles.index'), :index),
+          @page_title
         )
 
         if flash[:form_data]
           @comment = flash[:form_data]
         else
-          @comment = Comment[id.to_i]
+          @comment = validate_comment(id)
         end
+
+        render_view(:form)
       end
 
       ##
       # Saves a comment based on the current POST data. Note that this
-      # method won't create a new comment as this can't be done using the backend.
+      # method won't create a new comment as this can't be done using the
+      # backend.
       #
       # This method requires the following permissions:
       #
@@ -109,33 +108,40 @@ module Comments
       # @since  0.1
       #
       def save
-        if !user_authorized?([:update])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:update)
 
         # Copy the POST data so we can work with it without messing things up
         post = request.subset(
-          :user_id, :name, :website, :email, :comment, :status, :section_entry_id, :id
+          :id,
+          :user_id,
+          :name,
+          :website,
+          :email,
+          :comment,
+          :comment_status_id,
+          :section_entry_id
         )
 
-        @comment = Comment[post['id']]
+        comment = validate_comment(post['id'])
 
         post.delete('id')
 
         begin
-          @comment.update(post)
+          comment.update(post)
           message(:success, lang('comments.success.save'))
         rescue => e
           Ramaze::Log.error(e.inspect)
           message(:error, lang('comments.errors.save'))
 
-          flash[:form_errors] = @comment.errors
-          flash[:form_data]   = @comment
+          flash[:form_errors] = comment.errors
+          flash[:form_data]   = comment
+
+          redirect_referrer
         end
 
         # Redirect the user to the proper page.
-        if @comment.id
-          redirect(Comments.r(:edit, @comment.id))
+        if comment.id
+          redirect(Comments.r(:edit, comment.id))
         else
           redirect_referrer
         end
@@ -153,12 +159,11 @@ module Comments
       # @since  0.1
       #
       def delete
-        if !user_authorized?([:delete])
-          respond(lang('zen_general.errors.not_authorized'), 403)
-        end
+        require_permissions(:delete)
 
         # Obviously we'll require some IDs
-        if !request.params['comment_ids'] or request.params['comment_ids'].empty?
+        if !request.params['comment_ids'] \
+        or request.params['comment_ids'].empty?
           message(:error, lang('comments.errors.no_delete'))
           redirect_referrer
         end
@@ -171,6 +176,8 @@ module Comments
           rescue => e
             Ramaze::Log.error(e.inspect)
             message(:error, lang('comments.errors.delete') % id)
+
+            redirect_referrer
           end
         end