zen 0.2.8 → 0.3b

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

@@ -1,4 +1,4 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -20,8 +20,7 @@
         </ul>
     </div>
 
-    #{
-    form_for(
+    #{form_for(
       @custom_field,
       :method => :post,
       :action => CustomFields::Controller::CustomFields.r(:save),
@@ -34,12 +33,15 @@
       f.g.div(:id => 'general') do
         f.input_text(
           lang('custom_fields.labels.name'),
-          :name
+          :name,
+          :required  => :required,
+          :maxlength => 255
         )
 
         f.input_text(
           lang('custom_fields.labels.slug'),
-          :slug
+          :slug,
+          :maxlength => 255
         )
 
         f.select(
@@ -47,13 +49,14 @@
           :custom_field_type_id,
           :values   => @custom_field_types,
           :size     => 1,
-          :selected => @custom_field.custom_field_type_id
+          :selected => @custom_field.custom_field_type_id,
+          :required => :required
         )
 
         f.select(
           lang('custom_fields.labels.format'),
           :format,
-          :values   => Zen::Plugin::Markup::Engines,
+          :values   => ::Zen::Markup.to_hash,
           :size     => 1,
           :selected => @custom_field.format
         )
@@ -88,17 +91,20 @@
 
         f.input_text(
           lang('custom_fields.labels.textarea_rows'),
-          :textarea_rows
+          :textarea_rows,
+          :pattern => '\\\d*'
         )
 
         f.input_text(
           lang('custom_fields.labels.text_limit'),
-          :text_limit
+          :text_limit,
+          :pattern => '\\\d*'
         )
 
         f.input_text(
           lang('custom_fields.labels.sort_order'),
-          :sort_order
+          :sort_order,
+          :pattern => '\\\d*'
         )
       end
 
@@ -108,6 +114,5 @@
           :value => lang('custom_fields.buttons.save')
         )
       end
-    end
-    }
-</article>
+    end}
+</section>

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

@@ -1,4 +1,8 @@
-<article>
+<section>
+    #{render_search_form(
+      ::CustomFields::Controller::CustomFields.r(:index, @custom_field_group_id)
+    )}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -9,12 +13,12 @@
         <input type="hidden" name="custom_field_group_id"
         value="#{@custom_field_group_id}" />
 
-        <?r if @custom_fields and !@custom_fields.empty? ?>
+        <?r if !@custom_fields.empty? ?>
 
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_custom_field) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -23,14 +27,16 @@
                     <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.custom_field_type_id')}</th>
+                    <th>
+                        #{lang('custom_fields.labels.custom_field_type_id')}
+                    </th>
                     <th>#{lang('custom_fields.labels.format')}</th>
                 </tr>
             </thead>
             <tbody>
                 <?r @custom_fields.each do |field| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_custom_field) ?>
                     <td>
                         <input type="checkbox" name="custom_field_ids[]"
                         value="#{field.id}" />
@@ -39,36 +45,39 @@
 
                     <td>#{field.id}</td>
 
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{CustomFields::Controller::CustomFields.a(
-                          field.name, :edit, @custom_field_group_id, field.id
-                        )}
+                        #{if user_authorized?(:edit_custom_field)
+                          CustomFields::Controller::CustomFields.a(
+                            field.name,
+                            :edit,
+                            @custom_field_group_id,
+                            field.id
+                          )
+                        else
+                          field.name
+                        end}
                     </td>
-                    <?r else ?>
-                    <td>#{field.name}</td>
-                    <?r end ?>
 
                     <td>#{field.slug}</td>
                     <td>#{@custom_field_types[field.custom_field_type_id]}</td>
-                    <td>#{Zen::Plugin::Markup::Engines[field.format]}</td>
+                    <td>#{Zen::Markup.to_hash[field.format]}</td>
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
 
-        #{
-        if @custom_fields.respond_to?(:navigation) \
+        #{if @custom_fields.respond_to?(:navigation) \
         and @custom_fields.page_count > 1
           @custom_fields.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('custom_fields.messages.no_fields')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_custom_field) ?>
         <div class="button">
             #{CustomFields::Controller::CustomFields.a(
               lang('custom_fields.buttons.new'),
@@ -78,11 +87,12 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@custom_fields.empty? ?>
+        <?r if user_authorized?(:delete_custom_field) \
+        and !@custom_fields.empty? ?>
         <div class="button">
             <input type="submit"
             value="#{lang('custom_fields.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

data/lib/zen/package/extensions/lib/extensions.rb

@@ -0,0 +1,20 @@
+Zen::Package.add do |p|
+  p.name   = :extensions
+  p.title  = 'extensions.titles.index'
+  p.author = 'Yorick Peterse'
+  p.url    = 'http://zen-cms.com/'
+  p.about  = 'extensions.description'
+  p.root   = __DIR__('extensions')
+
+  p.menu(
+    'extensions.titles.index',
+    '/admin/extensions',
+    :permission => :show_extension
+  )
+
+  p.permission :show_extension, 'extensions.permissions.show'
+end
+
+Zen::Language.load('extensions')
+
+require __DIR__('extensions/controller/extensions')

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

@@ -0,0 +1,41 @@
+##
+# Package for viewing and managing installed extensions such as packages and
+# languages.
+#
+# ## Controllers
+#
+# * {Extensions::Controller::Extensions}
+#
+# This package does not provide any helpers or models.
+#
+# @since 18-11-2011
+#
+module Extensions
+  module Controller
+    ##
+    # Controller that displays all the installed extensions.
+    #
+    # @since 18-11-2011
+    # @map   /admin/extensions
+    #
+    class Extensions < Zen::Controller::AdminController
+      map   '/admin/extensions'
+      title 'extensions.titles.%s'
+
+      load_asset_group :tabs
+
+      ##
+      # Shows an overview of all the installed themes, packages, added
+      # languages, etc.
+      #
+      # @since 18-11-2011
+      # @permission show_extension
+      #
+      def index
+        authorize_user!(:show_extension)
+
+        set_breadcrumbs(lang('extensions.titles.index'))
+      end
+    end # Extensions
+  end # Controller
+end # Extensions

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

@@ -0,0 +1,23 @@
+Zen::Language::Translation.add do |trans|
+  trans.language = 'en'
+  trans.name     = 'extensions'
+
+  trans.translate do |t|
+    t['titles.index']     = 'Extensions'
+    t['permissions.show'] = 'Show extension'
+
+    t['labels.packages']            = 'Packages'
+    t['labels.themes']              = 'Themes'
+    t['labels.languages']           = 'Languages'
+    t['labels.package']             = 'Package'
+    t['labels.author']              = 'Author'
+    t['labels.description']         = 'Description'
+    t['labels.theme']               = 'Theme'
+    t['labels.language']            = 'Language'
+    t['labels.rtl']                 = 'Right To Left'
+    t['labels.loaded_translations'] = 'Loaded Translations'
+
+    t['description'] = 'Shows all installed extensions such as packages and ' \
+      'language files.'
+  end
+end

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

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+Zen::Language::Translation.add do |trans|
+  trans.language = 'nl'
+  trans.name     = 'extensions'
+
+  trans.translate do |t|
+    t['titles.index']     = 'Extensies'
+    t['permissions.show'] = 'Extensie weergeven'
+
+    t['labels.packages']            = 'Pakketten'
+    t['labels.themes']              = 'Thema\'s'
+    t['labels.languages']           = 'Talen'
+    t['labels.package']             = 'Pakket'
+    t['labels.author']              = 'Auteur'
+    t['labels.description']         = 'Beschrijving'
+    t['labels.theme']               = 'Thema'
+    t['labels.language']            = 'Taal'
+    t['labels.rtl']                 = 'Rechts naar links'
+    t['labels.loaded_translations'] = 'Aantal ingeladen vertalingen'
+
+    t['description'] = 'Laat alle geïnstalleerde extensies zien zoals ' \
+      'pakketten en taal bestanden.'
+  end
+end

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

@@ -0,0 +1,86 @@
+<section>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+
+    <div class="tabs">
+        <ul>
+            <li>
+                <a href="#packages">#{lang('extensions.labels.packages')}</a>
+            </li>
+            <li>
+                <a href="#themes">#{lang('extensions.labels.themes')}</a>
+            </li>
+            <li>
+                <a href="#languages">#{lang('extensions.labels.languages')}</a>
+            </li>
+        </ul>
+    </div>
+
+    <div id="packages">
+        <table class="no_sort">
+            <thead>
+                <tr>
+                    <th>#{lang('extensions.labels.package')}</th>
+                    <th>#{lang('extensions.labels.author')}</th>
+                    <th>#{lang('extensions.labels.description')}</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?r Zen::Package::REGISTERED.each do |name, package| ?>
+                <tr>
+                    <td>#{package.formatted_title}</td>
+                    <td>#{package.author}</td>
+                    <td>#{package.about}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+    </div>
+
+    <div id="themes">
+        <table class="no_sort">
+            <thead>
+                <tr>
+                    <th>#{lang('extensions.labels.theme')}</th>
+                    <th>#{lang('extensions.labels.author')}</th>
+                    <th>#{lang('extensions.labels.description')}</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?r Zen::Theme::REGISTERED.each do |name, theme| ?>
+                <tr>
+                    <td>#{theme.formatted_name}</td>
+                    <td>#{theme.author}</td>
+                    <td>#{theme.about}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+    </div>
+
+    <div id="languages">
+        <table class="no_sort">
+            <thead>
+                <tr>
+                    <th>#{lang('extensions.labels.language')}</th>
+                    <th>#{lang('extensions.labels.rtl')}</th>
+                    <th>#{lang('extensions.labels.loaded_translations')}</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?r Zen::Language::REGISTERED.each do |name, lang| ?>
+                <tr>
+                    <td>#{lang.title}</td>
+                    <td>
+                        #{lang(
+                          "zen_general.special.boolean_hash.#{lang.rtl}"
+                        )}
+                    </td>
+                    <td>#{lang.collections.keys.length}</td>
+                </tr>
+                <?r end ?>
+            </tbody>
+        </table>
+    </div>
+</section>

data/lib/zen/package/menu.rb

@@ -0,0 +1,109 @@
+require 'ramaze/gestalt'
+require __DIR__('../package/users/lib/users/helper/acl')
+
+module Zen
+  class Package
+    ##
+    # Class that represents a single navigation item that optionally contains a
+    # number of sub elements.
+    #
+    # @since  0.3
+    #
+    class Menu
+      include Ramaze::Trinity
+      include Ramaze::Helper::ACL
+
+      # A string containing the URL of the current element.
+      attr_reader :url
+
+      # All the child elements of the current navigation element.
+      attr_reader :children
+
+      ##
+      # Creates a new instance of the class and optionally processes all sub
+      # navigation items.
+      #
+      # @since  0.3
+      # @param  [String] title The title or language key of the navigation
+      #  element.
+      # @param  [String] url The URL of the navigation element.
+      # @param  [Hash] options A hash containing various options for the
+      #  element.
+      # @option options :permission A symbol containing the name of the
+      #  permission required to show the navigation item.
+      # @yield  [self]
+      #
+      def initialize(title, url, options = {})
+        @title, @url = title, url
+        @children    = []
+        @options     = options
+
+        yield(self) if block_given?
+      end
+
+      ##
+      # Adds a new child element to the navigation menu.
+      #
+      # @since  0.3
+      # @see    Zen::Package::Menu#initialize()
+      #
+      def menu(title, url, options = {}, &block)
+        @children << self.class.new(title, url, options, &block)
+      end
+
+      ##
+      # Returns the title of the navigation item. If possible it will be
+      # translated, otherwise the original value will be used.
+      #
+      # @since  0.3
+      # @return [String]
+      #
+      def title
+        begin
+          return lang(@title)
+        rescue
+          return @title
+        end
+      end
+
+      ##
+      # Builds the HTML for the current navigation menu using Ramaze::Gestalt.
+      #
+      # @since  0.3
+      # @param  [Array] permissions An array of permissions for the current
+      #  user.
+      # @return [String|NilClass] The HTML of the navigation menu.
+      #
+      def html(permissions = [])
+        # Skip the navigation menu and all it's child elements if the user isn't
+        # allowed to view it.
+        return if !user_authorized?(@options[:permission])
+
+        g        = Ramaze::Gestalt.new
+        children = []
+
+        g.li do
+          g.a(title, :href => url, :title => title)
+
+          unless @children.empty?
+            @children.each do |child|
+              html = child.html(permissions)
+
+              unless html.nil?
+                children << html
+              end
+            end
+
+            unless children.empty?
+              g.ul do
+                g.out << children
+              end
+            end
+          end
+        end
+
+        return g.to_s
+      end
+    end # Menu
+  end # Package
+end # Zen