zen 0.2.8 → 0.3b

data/lib/zen/package/categories/lib/categories/language/en/categories.rb

@@ -0,0 +1,40 @@
+Zen::Language::Translation.add do |trans|
+  trans.language = 'en'
+  trans.name     = 'categories'
+
+  trans.translate do |t|
+    t['titles.index'] = 'Categories'
+    t['titles.edit']  = 'Edit Category'
+    t['titles.new']   = 'Add Category'
+
+    t['labels.id']          = '#'
+    t['labels.name']        = 'Name'
+    t['labels.description'] = 'Description'
+    t['labels.parent']      = 'Parent'
+    t['labels.slug']        = 'Slug'
+
+    t['descriptions.name'] = 'The name of the category'
+    t['descriptions.slug'] = 'A URL friendly name of the category'
+
+    t['messages.no_categories'] = 'No categories were found.'
+
+    t['success.new']    = 'The category has been created.'
+    t['success.save']   = 'The category has been modified.'
+    t['success.delete'] = 'The selected categories have been deleted.'
+
+    t['errors.new']       = 'Failed to add a new category.'
+    t['errors.save']      = 'Failed to save the category.'
+    t['errors.delete']    = 'Failed to delete the category with ID #%s.'
+    t['errors.no_delete'] = 'You haven\'t specified any categories to delete.'
+    t['errors.invalid_category'] = 'The specified category is invalid.'
+
+    t['buttons.new']    = 'Add category'
+    t['buttons.save']   = 'Save category'
+    t['buttons.delete'] = 'Delete selected categories'
+
+    t['permissions.show']   = 'Show category'
+    t['permissions.edit']   = 'Edit category'
+    t['permissions.new']    = 'Add category'
+    t['permissions.delete'] = 'Delete category'
+  end
+end

data/lib/zen/package/categories/lib/categories/language/en/category_groups.rb

@@ -0,0 +1,39 @@
+Zen::Language::Translation.add do |trans|
+  trans.language = 'en'
+  trans.name     = 'category_groups'
+
+  trans.translate do |t|
+    t['titles.index'] = 'Category Groups'
+    t['titles.edit']  = 'Edit Category'
+    t['titles.new']   = 'Add Category Group'
+
+    t['labels.id']          = '#'
+    t['labels.name']        = 'Name'
+    t['labels.description'] = 'Description'
+    t['labels.manage']      = 'Manage categories'
+
+    t['descriptions.name']  = 'The name of the category group'
+    t['messages.no_groups'] = 'No category groups were found.'
+
+    t['success.new']    = 'The category group has been created.'
+    t['success.save']   = 'The category group has been modified.'
+    t['success.delete'] = 'All selected category groups have been deleted.'
+
+    t['errors.new']           = 'Failed to add the new category group.'
+    t['errors.save']          = 'Failed to modify the category group.'
+    t['errors.delete']        = 'Failed to delete the category group with ID #%s.'
+    t['errors.invalid_group'] = 'The specified group is invalid.'
+    t['errors.no_delete']     = 'You need to specify a category group to delete.'
+
+    t['buttons.new']    = 'Add group'
+    t['buttons.save']   = 'Save group'
+    t['buttons.delete'] = 'Delete selected groups'
+
+    t['permissions.show']   = 'Show category group'
+    t['permissions.edit']   = 'Edit category group'
+    t['permissions.new']    = 'Add category group'
+    t['permissions.delete'] = 'Delete group'
+
+    t['description'] = 'Managing categories and category groups.'
+  end
+end

data/lib/zen/package/categories/lib/categories/language/nl/categories.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+Zen::Language::Translation.add do |trans|
+  trans.language = 'nl'
+  trans.name     = 'categories'
+
+  trans.translate do |t|
+    t['titles.index'] = 'Categoriën'
+    t['titles.edit']  = 'Categorie aanpassen'
+    t['titles.new']   = 'Categorie aanmaken'
+
+    t['labels.id']          = '#'
+    t['labels.name']        = 'Naam'
+    t['labels.description'] = 'Beschrijving'
+    t['labels.parent']      = 'Ouder'
+    t['labels.slug']        = 'Slug'
+
+    t['descriptions.name'] = 'De naam van de categorie'
+    t['descriptions.slug'] = 'Een URL vriendelijke versie van de naam'
+
+    t['messages.no_categories'] = 'Er konden geen categoriën worden gevonden'
+
+    t['success.new']    = 'De categorie is aangemaakt.'
+    t['success.save']   = 'De categorie is aangepast.'
+    t['success.delete'] = 'De categorie is verwijderd.'
+
+    t['errors.new']       = 'De categorie kon niet worden aangemaakt.'
+    t['errors.save']      = 'De categorie kon niet worden aangepast.'
+    t['errors.delete']    = 'De categorie met ID #%s kon niet worden verwijderd.'
+    t['errors.no_delete']        = 'U moet ten minste 1 categorie specificeren.'
+    t['errors.invalid_category'] = 'De opgegeven categorie is ongeldig.'
+
+    t['buttons.new']    = 'Categorie aanmaken'
+    t['buttons.save']   = 'Categorie opslaan'
+    t['buttons.delete'] = 'Geselecteerde categoriën verwijderen'
+
+    t['permissions.show']   = 'Categorie weergeven'
+    t['permissions.edit']   = 'Categorie aanpassen'
+    t['permissions.new']    = 'Categorie aanmaken'
+    t['permissions.delete'] = 'Categorie verwijderen'
+  end
+end

data/lib/zen/package/categories/lib/categories/language/nl/category_groups.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+Zen::Language::Translation.add do |trans|
+  trans.language = 'nl'
+  trans.name     = 'category_groups'
+
+  trans.translate do |t|
+    t['titles.index'] = 'Categorie groepen'
+    t['titles.edit']  = 'Categorie groep aanpassen'
+    t['titles.new']   = 'Categorie groep aanmaken'
+
+    t['labels.id']          = '#'
+    t['labels.name']        = 'Naam'
+    t['labels.description'] = 'Beschrijving'
+    t['labels.manage']      = 'Categoriën beheren'
+
+    t['description.name']   = 'De naam van de group'
+    t['messages.no_groups'] = 'Er konden geen groepen worden gevonden.'
+
+    t['success.new']    = 'De categorie groep is aangemaakt.'
+    t['success.save']   = 'De categorie groep is aangepast.'
+    t['success.delete'] = 'De categorie groep is verwijderd.'
+
+    t['errors.new']    = 'De categorie groep kon niet worden aangemaakt.'
+    t['errors.save']   = 'De categorie groep kon niet worden aangepast.'
+    t['errors.delete'] = 'De categorie groep met ID #%s kon niet worden ' \
+      'verwijderd.'
+    t['errors.invalid_group'] = 'De opgegeven categorie groep is ongeldig.'
+    t['errors.no_delete']     = 'U moet een groep opgeven om te verwijderen.'
+
+    t['buttons.new']    = 'Groep aanmaken'
+    t['buttons.save']   = 'Groep opslaan'
+    t['buttons.delete'] = 'Geselecteerde groepen verwijderen'
+
+    t['permissions.show']   = 'Categorie groep weergeven'
+    t['permissions.edit']   = 'Categorie groep aanpassen'
+    t['permissions.new']    = 'Categorie groep aanmaken'
+    t['permissions.delete'] = 'Categorie groep verwijderen'
+
+    t['description'] = 'Beheren van categorie groepen en categoriën.'
+  end
+end

data/lib/zen/package/categories/lib/categories/model/category.rb

@@ -1,43 +1,39 @@
-#:nodoc:
 module Categories
   #:nodoc:
   module Model
     ##
-    # Model that represents a single category. This model has the following 
-    # relations:
+    # Model for managing and retrieving categories.
     #
-    # * category groups (one to one)
-    # * self (many to one)
-    #
-    # This model uses the following plugins:
-    #
-    # * sluggable (source: "name")
-    #
-    # When creating or saving a category the fields "name" and "slug" are 
-    # required. The latter is only needed when saving an existing category as a 
-    # slug will be generated whenever the field is empty. It's also important to 
-    # remember that slugs have to be unique. For more info see the validate() 
-    # method.
-    #
-    # @author Yorick Peterse
     # @since  0.1
     #
     class Category < Sequel::Model
-      many_to_one :category_group, :class => "Categories::Model::CategoryGroup"
+      include Zen::Model::Helper
+
+      many_to_one :category_group, :class => 'Categories::Model::CategoryGroup'
       many_to_one :parent        , :class => self
-      
+
       plugin :sluggable, :source => :name, :frozen => false
-      
+
+      ##
+      # Searches for a set of category groups using the specified search query.
+      #
+      # @since  16-10-2011
+      # @param  [String] query The search query.
+      # @return [Mixed]
+      #
+      def self.search(query)
+        return filter(search_column(:name, query))
+      end
+
       ##
-      # Validation rules for our model.
+      # Validates the model.
       #
-      # @author Yorick Peterse
       # @since  0.1
       #
       def validate
-        validates_presence   :name
-        validates_max_length 255, [:name, :slug]
-        validates_unique     :slug
+        validates_presence([:name, :category_group_id])
+        validates_max_length(255, [:name, :slug])
+        validates_unique(:slug)
       end
     end # Category
   end # Model

data/lib/zen/package/categories/lib/categories/model/category_group.rb

@@ -1,30 +1,36 @@
-#:nodoc:
 module Categories
   #:nodoc:
   module Model
     ##
-    # Model that represents a single category group. Each category group
-    # has the following relations to other models:
+    # Model that represents a single category group.
     #
-    # * categories (one to many)
-    # * sections (many to many)
-    #
-    # When saving or creating a category group the "name" field is required
-    # and should be no longer than 255 characters.
+    # @since  0.1
     #
     class CategoryGroup < Sequel::Model
-      one_to_many  :categories, :class => "Categories::Model::Category"
-      many_to_many :sections  , :class => "Sections::Model::Section"
-      
+      include Zen::Model::Helper
+
+      one_to_many  :categories, :class => 'Categories::Model::Category'
+      many_to_many :sections  , :class => 'Sections::Model::Section'
+
+      ##
+      # Searches for a set of category groups using the specified search query.
+      #
+      # @since  16-10-2011
+      # @param  [String] query The search query.
+      # @return [Mixed]
+      #
+      def self.search(query)
+        return filter(search_column(:name, query))
+      end
+
       ##
-      # Validation rules for our model.
+      # Validation rules for the model.
       #
-      # @author Yorick Peterse
       # @since  0.1
       #
       def validate
-        validates_presence        :name
-        validates_max_length 255, :name
+        validates_presence(:name)
+        validates_max_length(255, :name)
       end
     end # CategoryGroup
   end # Model

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

@@ -1,52 +1,51 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    #{
-    form_for(
-      @category, 
-      :method => :post, 
-      :action => Categories::Controller::Categories.r(:save), 
+
+    #{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, 
+          lang('categories.labels.name'),
+          :name,
+          :title => lang('categories.descriptions.name'),
+          :required    => :required,
           :maxlength   => 255
         )
 
         f.input_text(
           lang('categories.labels.slug'),
-          :slug, 
-          :placeholder => lang('categories.placeholders.slug')
+          :slug,
+          :title => lang('categories.descriptions.slug'),
+          :maxlength   => 255
         )
-        
+
         f.select(
-          lang('categories.labels.parent'), 
-          :parent_id, 
-          :values   => parent_categories(@category.id, @category_group_id), 
-          :size     => 1, 
+          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, 
+          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
-    }
-</article>
+    end}
+</section>

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

@@ -1,4 +1,8 @@
-<article>
+<section>
+    #{render_search_form(
+      ::Categories::Controller::Categories.r(:index, @category_group_id)
+    )}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -6,15 +10,13 @@
     <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.empty? ?>
 
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_category) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -29,7 +31,7 @@
             <tbody>
                 <?r @categories.each do |category| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_category_group) ?>
                     <td>
                         <input type="checkbox" name="category_ids[]"
                         value="#{category.id}" />
@@ -37,20 +39,18 @@
                     <?r end ?>
 
                     <td>#{category.id}</td>
-
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{Categories::Controller::Categories.a(
-                          category.name,
-                          :edit,
-                          @category_group_id,
-                          category.id
-                        )}
+                        #{if user_authorized?(:edit_category_group)
+                          Categories::Controller::Categories.a(
+                            category.name,
+                            :edit,
+                            @category_group_id,
+                            category.id
+                          )
+                        else
+                          category.name
+                        end}
                     </td>
-                    <?r else ?>
-                    <td>#{category.name}</td>
-                    <?r end ?>
-
                     <td>#{category.slug}</td>
                     <td>
                         #{category.parent.name \
@@ -61,17 +61,17 @@
             </tbody>
         </table>
 
-        #{
-        if @categories.respond_to?(:navigation) and @categories.page_count > 1
+        #{if @categories.respond_to?(:navigation) and @categories.page_count > 1
           @categories.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('categories.messages.no_categories')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_category) ?>
         <div class="button">
             #{Categories::Controller::Categories.a(
               lang('categories.buttons.new'),
@@ -81,11 +81,11 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@categories.empty? ?>
+        <?r if user_authorized?(:delete_category) and !@categories.empty? ?>
         <div class="button">
             <input type="submit"
             value="#{lang('categories.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>