zen 0.1a → 0.2

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/index.xhtml

@@ -0,0 +1,100 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    <form method="post" action="#{@form_delete_url}">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        
+        <?r if @field_groups and !@field_groups.empty? ?>
+        
+        <table class="table">
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th>
+                        <input type="checkbox" />
+                    </th>
+                    <?r end ?>
+                    
+                    <th>#{lang('custom_field_groups.labels.id')}</th>
+                    <th>#{lang('custom_field_groups.labels.name')}</th>
+                    <th>#{lang('custom_field_groups.labels.sections')}</th>
+                    
+                    <?r if user_authorized?([:create]) ?>
+                    <th></th>
+                    <?r end ?>
+                </tr>
+            </thead>
+            <tbody>
+                <?r @field_groups.each do |group| ?>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <td>
+                        <input type="checkbox" name="custom_field_group_ids[]" value="#{group.id}" />
+                    </td>
+                    <?r end ?>
+                    
+                    <td>#{group.id}</td>
+                    
+                    <?r if user_authorized?([:update]) ?>
+                    <td>
+                        #{anchor_to(
+                          group.name, 
+                          CustomFields::Controllers::CustomFieldGroups.r(:edit, group.id), 
+                          :title => group.name
+                        )}
+                    </td>
+                    <?r else ?>
+                    <td>#{group.name}</td>
+                    <?r end ?>
+                    
+                    <td>
+                        <?r sections = group.sections.map { |s| s.name } ?> 
+                        <?r if !sections.empty? ?>
+                            #{sections.join(', ')}
+                        <?r else ?>
+                            #{lang('custom_field_groups.labels.none')}
+                        <?r end ?> 
+                    </td>
+                    
+                    <?r if user_authorized?([:create]) ?>
+                    <td>
+                      #{anchor_to(
+                          lang('custom_field_groups.labels.manage_fields'), 
+                          CustomFields::Controllers::CustomFields.r(:index, group.id) 
+                        )}
+                    </td>
+                    <?r end ?>
+                    
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+        
+        <?r else ?>
+        
+        <p>#{lang('custom_field_groups.messages.no_groups')}</p>
+        
+        <?r end ?>
+        
+        <div class="clearfix">
+            
+            <?r if user_authorized?([:create]) ?>
+            <div class="button">
+                #{anchor_to(
+                  lang('custom_field_groups.buttons.new'), 
+                  CustomFields::Controllers::CustomFieldGroups.r(:new)
+                )}
+            </div>
+            <?r end ?>
+            
+            <?r if user_authorized?([:delete]) and @field_groups and !@field_groups.empty? ?>
+            <div class="button">
+                <input type="submit" value="#{lang('custom_field_groups.buttons.delete')}" />
+            </div>
+            <?r end ?>
+        </div>
+
+    </form>
+</article> 

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/new.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/edit.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/form.xhtml

@@ -0,0 +1,107 @@
+<div class='tabs'>
+    <ul>
+        <li>
+            <a href="#general" title="#{lang('custom_fields.tabs.general')}">
+                #{lang('custom_fields.tabs.general')}
+            </a>
+        </li>
+        <li>
+            <a href="#settings" title="#{lang('custom_fields.tabs.settings')}">
+                #{lang('custom_fields.tabs.settings')}
+            </a>
+        </li>
+    </ul>
+</div>
+
+#{
+form_for(
+  @custom_field, :method => :post, :action => @form_save_url, :id => :custom_field_form
+) do |f|
+
+  f.input_hidden(:id, @custom_field.id)
+  f.input_hidden(:custom_field_group_id, @custom_field_group_id)
+  f.input_hidden(:csrf_token, get_csrf_token)
+  
+  f.g.div(:id => 'general') do
+
+    f.input_text(
+      lang('custom_fields.labels.name'),
+      :name
+    )
+
+    f.input_text(
+      lang('custom_fields.labels.slug'),
+      :slug
+    )
+    
+    f.select(
+      lang('custom_fields.labels.type'),
+      :type, 
+      :values   => @field_type_hash, 
+      :size     => 1,
+      :selected => @custom_field.type
+    )
+    
+    f.select(
+      lang('custom_fields.labels.format'),
+      :format, 
+      :values   => @format_hash, 
+      :size     => 1,
+      :selected => @custom_field.format
+    )
+  
+    f.textarea(
+      lang('custom_fields.labels.description'),
+      :description, 
+      :rows => 8
+    )
+
+    f.textarea(
+      lang('custom_fields.labels.possible_values'),
+      :possible_values, 
+      :rows => 8
+    )
+   
+  end
+  
+  f.g.div(:id => 'settings') do
+
+    f.input_radio(
+      lang('custom_fields.labels.required'),
+      :required, 
+      @custom_field.required,
+      :values => @boolean_hash 
+    )
+      
+    f.input_radio(
+      lang('custom_fields.labels.visual_editor'),
+      :visual_editor, 
+      @custom_field.visual_editor,
+      :values => @boolean_hash
+    )
+      
+    f.input_text(
+      lang('custom_fields.labels.textarea_rows'),
+      :textarea_rows
+    )
+    
+    f.input_text(
+      lang('custom_fields.labels.text_limit'),
+      :text_limit
+    )
+    
+    f.input_text(
+      lang('custom_fields.labels.sort_order'),
+      :sort_order
+    )
+
+  end
+  
+  f.g.div(:class => 'clearfix') do
+    f.g.div(:class => 'button') do
+      f.g.input(:type => 'submit', :value => lang('custom_fields.buttons.save'))
+    end
+  end
+
+end
+}

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/index.xhtml

@@ -0,0 +1,84 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    <form method="post" action="#{@form_delete_url}">
+        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+        <input type="hidden" name="custom_field_group_id" value="#{@custom_field_group_id}" />
+        
+        <?r if @custom_fields and !@custom_fields.empty? ?>
+        
+        <table class="table">
+            <thead>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <th>
+                        <input type="checkbox" />
+                    </th>
+                    <?r end ?>
+                    
+                    <th>#{lang('custom_fields.labels.id')}</th>
+                    <th>#{lang('custom_fields.labels.name')}</th>
+                    <th>#{lang('custom_fields.labels.slug')}</th>
+                    <th>#{lang('custom_fields.labels.type')}</th>
+                    <th>#{lang('custom_fields.labels.format')}</th>
+                </tr>
+            </thead>
+            
+            <tbody>
+                <?r @custom_fields.each do |field| ?>
+                <tr>
+                    <?r if user_authorized?([:delete]) ?>
+                    <td>
+                        <input type="checkbox" name="custom_field_ids[]" value="#{field.id}" />
+                    </td>
+                    <?r end ?>
+                    
+                    <td>#{field.id}</td>
+                    
+                    <?r if user_authorized?([:update]) ?>
+                    <td>
+                        #{anchor_to(
+                          field.name, 
+                          CustomFields::Controllers::CustomFields.r(:edit, @custom_field_group_id, field.id), 
+                          :title => field.name
+                        )}
+                    </td>
+                    <?r else ?>
+                    <td>#{field.name}</td>
+                    <?r end ?>
+                    
+                    <td>#{field.slug}</td>
+                    <td>#{lang("custom_fields.special.type_hash.#{field.type}")}</td>
+                    <td>#{@format_hash[field.format]}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+        
+        <?r else ?>
+        
+        <p>#{lang('custom_fields.messages.no_fields')}</p>
+        
+        <?r end ?>
+        
+        <div class="clearfix">
+            <?r if user_authorized?([:create]) ?>
+            <div class="button">
+                #{anchor_to(
+                  lang('custom_fields.buttons.new'),
+                  CustomFields::Controllers::CustomFields.r(:new, @custom_field_group_id)
+                )}
+            </div>
+            <?r end ?>
+            
+            <?r if user_authorized?([:delete]) and @custom_fields and !@custom_fields.empty? ?>
+            <div class="button">
+                <input type="submit" value="#{lang('custom_fields.buttons.delete')}" />
+            </div>
+            <?r end ?>
+            
+        </div>
+    </form>
+</article>

data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/new.xhtml

@@ -0,0 +1,7 @@
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+    
+    #{render_partial :form}
+</article>

data/lib/zen/{packages → package}/custom_fields/migrations/1295255665_create_schema.rb

@@ -14,18 +14,19 @@ Sequel.migration do
       String    :name,                :null => false
       String    :slug,                :null => false, :unique => true
       String    :description,         :text => true
-      Integer   :sort_order,          :null => false, :default  => 0
-      Enum      :type,                :null => false, :elements => ['textbox', 'textarea', 'radio', 'checkbox', 'date', 'select', 'select_multiple'], :default => 'textbox'
-      Enum      :format,              :null => false, :elements => ['plain', 'html', 'textile', 'markdown'], :default => 'plain'
+      Integer   :sort_order,          :default  => 0
+      String    :type,                :null => false, :default => 'textbox'
+      String    :format,              :null => false, :default => 'plain'
       String    :possible_values,     :text => true
       
       # Custom field settings
       TrueClass :required,            :null => false, :default => false
       TrueClass :visual_editor,       :null => false, :default => true
-      Integer   :textarea_rows,       :null => false, :default => 6
-      Integer   :text_limit,          :null => false, :default => 255
+      Integer   :textarea_rows,       :default => 10
+      Integer   :text_limit,          :default => 1
       
-      foreign_key :custom_field_group_id, :custom_field_groups, :on_delete => :cascade, :on_update => :cascade, :key => :id
+      foreign_key :custom_field_group_id, :custom_field_groups, :on_delete => :cascade,
+        :on_update => :cascade, :key => :id
     end
     
     create_table :custom_field_groups_sections do
@@ -50,4 +51,4 @@ Sequel.migration do
     drop_table :custom_field_groups
   end
 
-end
+end

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

@@ -0,0 +1,59 @@
+
+# Update the list of helper paths
+Ramaze::HelpersHelper.options.paths << __DIR__('menus')
+
+# Load all our models
+require __DIR__('menus/model/menu')
+require __DIR__('menus/model/menu_item')
+
+# Load all controllers
+require __DIR__('menus/controller/menus')
+require __DIR__('menus/controller/menu_items')
+
+# Load all Liquid tags and register them
+require __DIR__('menus/liquid/menus')
+
+Liquid::Template.register_tag('menus', Menus::Liquid::Menus)
+
+# Describe the package
+Zen::Package.add do |p|
+  # The type of extension. Can either be "theme" or "extension".
+  p.type        = 'extension'
+
+  # The name of the package
+  p.name        = 'Menus' 
+
+  # The person/company that made the package
+  p.author      = 'Yorick Peterse'
+
+  # A URL to a page about the package
+  p.url         = 'http://zen-cms.com/userguide/menus'
+
+  # The version number of the package
+  p.version     = '1.0'
+
+  # Describe what your theme or extension does.
+  p.about       = 'The Menus extension allows you to easily create navigation menus 
+for the frontend.'
+
+  ## 
+  # An identifier is a unique string for your package in the following format: 
+  # 
+  # * com.AUTHOR.NAME for extensions
+  # * com.AUTHOR.themes.NAME for themes
+  #
+  # An example of this would be "com.zen.sections" or "com.zen.themes.zen_website".
+  #
+  p.identifier  = 'com.zen.menus'
+
+  ##
+  # Path to the directory containing the controllers, models, etc.
+  #
+  p.directory   = __DIR__('menus')
+  
+  # Note that themes can not have menu items (they'll be ignored).
+  p.menu = [{
+    :title => "Menus",
+    :url   => "/admin/menus"
+  }]
+end

data/lib/zen/package/menus/lib/menus/controller/menu_items.rb

@@ -0,0 +1,244 @@
+#:nodoc:
+module Menus
+  #:nodoc:
+  module Controllers
+    ##
+    # Controller for managing individual navigation items that belong to a menu. 
+    #
+    # @author Yorick Peterse
+    # @since  0.2a
+    #
+    class MenuItems < ::Zen::Controllers::AdminController
+      include ::Menus::Models
+
+      map    '/admin/menu-items'
+      trait  :extension_identifier => 'com.zen.menus'
+      helper :menu_item
+      
+      before_all do
+        csrf_protection(:save, :delete) do
+          respond(lang('zen_general.errors.csrf'), 403)
+        end
+      end
+ 
+      ##
+      # Initializes the class, loads all language packs and sets the form URLs.
+      #
+      # This method loads the following language files:
+      #
+      # * menus
+      # * menu_items
+      #
+      # @author Yorick Peterse
+      # @since  0.2a
+      #
+      def initialize
+        super
+ 
+        @form_save_url   = MenuItems.r(:save)
+        @form_delete_url = MenuItems.r(:delete)
+        
+        Zen::Language.load('menu_items')
+        Zen::Language.load('menus')
+
+        # Set the page title based on the current method
+        if !action.method.nil?
+          method      = action.method.to_sym
+          @page_title = lang("menu_items.titles.#{method}") rescue nil
+        end
+      end
+
+      ##
+      # Show an overview of all navigation items for the current navigation menu.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      #
+      # @author Yorick Peterse
+      # @since  0.2a
+      # @param  [Integer] menu_id The ID of the current navigation menu.
+      #
+      def index(menu_id = nil)
+        if !user_authorized?([:read])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end
+
+        validate_menu(menu_id)
+
+        set_breadcrumbs(
+          anchor_to(lang('menus.titles.index'), Menus.r(:index)), 
+          lang('menu_items.titles.index')
+        )
+
+        @menu_id    = menu_id
+        @menu_items = Menu[menu_id.to_i].menu_items
+      end
+
+      ##
+      # Allow the user to edit an existing navigation item.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * update
+      #
+      # @author Yorick Peterse
+      # @since  0.2a
+      # @param  [Integer] menu_id The ID of the current navigation menu.
+      # @param  [Integer] id The ID of the menu item to edit.
+      #
+      def edit(menu_id = nil, id)
+        if !user_authorized?([:read, :update])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end
+
+        validate_menu(menu_id)
+
+        set_breadcrumbs(
+          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
+          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)), 
+          lang('menu_items.titles.edit')
+        )
+
+        @menu_id = menu_id
+
+        if flash[:form_data]
+          @menu_item = flash[:form_data]
+        else
+          @menu_item = MenuItem[id.to_i]
+        end
+      end
+
+      ##
+      # Allow the user to create a new menu item for the current menu.
+      #
+      # This method requires the following permissions:
+      #
+      # * read
+      # * create
+      #
+      # @author Yorick Peterse
+      # @since  0.2a
+      # @param  [Integer] menu_id  The ID of the current navigation menu.
+      #
+      def new(menu_id = nil)
+        if !user_authorized?([:create, :read])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end  
+
+        validate_menu(menu_id)
+
+        set_breadcrumbs(
+          anchor_to(lang('menus.titles.index'), Menus.r(:index)),
+          anchor_to(lang('menu_items.titles.index'), MenuItems.r(:index, menu_id)), 
+          lang('menu_items.titles.new')
+        )
+
+        @menu_id   = menu_id
+        @menu_item = MenuItem.new
+      end
+
+      ##
+      # Saves an existing menu iten or creates a new one using the supplied POST data. 
+      #
+      # This method requires the following permissions:
+      #
+      # * create
+      # * update
+      #
+      # @author Yorick Peterse
+      # @since  0.2a
+      #
+      def save
+        if !user_authorized?([:create, :update])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end
+
+        post = request.params.dup
+        if post['parent_id'].empty? or post['parent_id'] == post['id']
+          post['parent_id'] = nil
+        end
+
+        # Determine if we're saving changes made to an existing menu item or if we're
+        # going to create a new one.
+        if !post['id'].empty?
+          @menu_item  = MenuItem[post['id'].to_i]
+          save_action = :save
+        else
+          @menu_item  = MenuItem.new
+          save_action = :new
+        end
+
+        # Set our notifications
+        flash_success = lang("menu_items.success.#{save_action}")
+        flash_error   = lang("menu_items.errors.#{save_action}")
+
+        # Time to save the data
+        begin
+          @menu_item.update(post)
+          notification(:success, lang('menu_items.titles.index'), flash_success)
+        rescue
+          notification(:error, lang('menu_items.titles.index'), flash_error)
+
+          flash[:form_data]   = @menu_item
+          flash[:form_errors] = @menu_item.errors
+        end
+
+        if @menu_item.id
+          redirect(MenuItems.r(:edit, @menu_item.menu_id, @menu_item.id))
+        else
+          redirect_referrer
+        end
+      end
+
+      ##
+      # Delete all specified menu items based on the values in the POST array 
+      # "menu_item_ids". This method requires the following permissions:
+      #
+      # * delete
+      #
+      # @author Yorick Peterse
+      # @since  0.2a
+      #
+      def delete
+        if !user_authorized?([:delete])
+          respond(lang('zen_general.errors.not_authorized'), 403)
+        end
+
+        post = request.params.dup
+
+        if !post['menu_item_ids'] or post['menu_item_ids'].empty?
+          notification(
+            :error, 
+            lang('menu_items.titles.index'), 
+            lang('menu_items.errors.no_delete')
+          )
+
+          redirect_referrer
+        end
+
+        post['menu_item_ids'].each do |id|
+          begin
+            MenuItem[id.to_i].destroy
+          rescue
+            notification(
+              :error, 
+              lang('menu_items.titles.index'), 
+              lang('menu_items.errors.delete') % id
+            )
+            redirect_referrer
+          end
+        end
+
+        notification(
+          :success, 
+          lang('menu_items.titles.index'), 
+          lang('menu_items.success.delete')
+        )
+
+        redirect_referrer
+      end
+    end
+  end
+end