zen 0.2.8 → 0.3b

data/lib/zen/package/menus/lib/menus/view/admin/menu-items/form.xhtml

@@ -1,13 +1,12 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{
-    form_for(
-      @menu_item, 
-      :method => :post, 
-      :action => Menus::Controller::MenuItems.r(:save), 
+    #{form_for(
+      @menu_item,
+      :method => :post,
+      :action => Menus::Controller::MenuItems.r(:save),
       :id     => :menu_item_form
     ) do |f|
       f.input_hidden(:csrf_token, get_csrf_token)
@@ -15,46 +14,54 @@
       f.input_hidden(:menu_id   , @menu_id)
 
       f.input_text(
-        lang('menu_items.labels.name'), 
-        :name, 
-        :placeholder => lang('menu_items.placeholders.name')
+        lang('menu_items.labels.name'),
+        :name,
+        :title     => lang('menu_items.descriptions.name'),
+        :required  => :required,
+        :maxlength => 255
       )
 
       f.input_text(
         lang('menu_items.labels.url'),
-        :url, 
-        :placeholder => lang('menu_items.placeholders.url')
+        :url,
+        :title     => lang('menu_items.descriptions.url'),
+        :required  => :required,
+        :maxlength => 255
       )
 
       f.input_text(
         lang('menu_items.labels.order'),
-        :sort_order, 
-        :placeholder => lang('menu_items.placeholders.order')
+        :sort_order,
+        :title   => lang('menu_items.descriptions.order'),
+        :pattern => '\\\d*'
       )
 
       f.select(
         lang('menu_items.labels.parent_id'),
-        :parent_id, 
-        :values   => menu_item_tree(@menu_id), 
-        :selected => @menu_item.parent_id, 
+        :parent_id,
+        :values   => menu_item_tree(@menu_id),
+        :selected => @menu_item.parent_id,
         :size     => 1
       )
 
       f.input_text(
-        lang('menu_items.labels.html_class'), 
-        :html_class, 
-        :placeholder => lang('menu_items.placeholders.html_class')
+        lang('menu_items.labels.html_class'),
+        :html_class,
+        :title     => lang('menu_items.descriptions.html_class'),
+        :maxlength => 255,
+        :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
       )
 
       f.input_text(
-        lang('menu_items.labels.html_id'), 
-        :html_id, 
-        :placeholder => lang('menu_items.placeholders.html_id')
+        lang('menu_items.labels.html_id'),
+        :html_id,
+        :title     => lang('menu_items.descriptions.html_id'),
+        :maxlength => 255,
+        :pattern   => '^[a-zA-Z\\\-_0-9]*$'
       )
 
       f.g.div(:class => :button) do
         f.g.input(:type => :submit, :value => lang('menu_items.buttons.save'))
       end
-    end
-    }
-</article>
+    end}
+</section>

data/lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml

@@ -1,4 +1,6 @@
-<article>
+<section>
+    #{render_search_form(::Menus::Controller::MenuItems.r(:index, @menu_id))}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -7,10 +9,11 @@
         <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
 
         <?r if !@menu_items.empty? ?>
+
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_menu_item) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -29,7 +32,7 @@
 
                 <?r @menu_items.each do |item| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_menu_item) ?>
                     <td>
                         <input name="menu_item_ids[]" type="checkbox"
                         value="#{item.id}" />
@@ -38,15 +41,18 @@
 
                     <td>#{item.id}</td>
 
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{Menus::Controller::MenuItems.a(
-                          item.name, :edit, @menu_id, item.id
-                        )}
+                        #{if user_authorized?(:edit_menu_item)
+                          Menus::Controller::MenuItems.a(
+                            item.name,
+                            :edit,
+                            @menu_id,
+                            item.id
+                          )
+                        else
+                          item.name
+                        end}
                     </td>
-                    <?r else ?>
-                    <td>#{item.name}</td>
-                    <?r end ?>
 
                     <td>
                         <a href="#{item.url}">#{item.url}</a>
@@ -62,17 +68,17 @@
             </tbody>
         </table>
 
-        #{
-        if @menu_items.respond_to?(:navigation) and @menu_items.page_count > 1
+        #{if @menu_items.respond_to?(:navigation) and @menu_items.page_count > 1
           @menu_items.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('menu_items.messages.no_items')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create, :read]) ?>
+        <?r if user_authorized?(:new_menu_item) ?>
         <div class="button">
             #{Menus::Controller::MenuItems.a(
               lang('menu_items.buttons.new'), :new, @menu_id
@@ -80,10 +86,10 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) ?>
+        <?r if user_authorized?(:delete_menu_item) and !@menu_items.empty? ?>
         <div class="button">
             <input type="submit" value="#{lang('menu_items.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

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

@@ -1,51 +1,56 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{
-    form_for(
-      @menu, 
-      :method => :post, 
-      :action => Menus::Controller::Menus.r(:save), 
+    #{form_for(
+      @menu,
+      :method => :post,
+      :action => Menus::Controller::Menus.r(:save),
       :id     => :menu_form
-    ) do |f| 
+    ) do |f|
       f.input_hidden(:csrf_token, get_csrf_token)
       f.input_hidden(:id        , @menu.id)
 
       f.input_text(
-        lang('menus.labels.name'), 
-        :name, 
-        :placeholder => lang('menus.placeholders.name') 
+        lang('menus.labels.name'),
+        :name,
+        :title     => lang('menus.descriptions.name'),
+        :required  => :required,
+        :maxlength => 255
       )
 
       f.input_text(
-        lang('menus.labels.slug'), 
-        :slug, 
-        :placeholder => lang('menus.placeholders.slug')
+        lang('menus.labels.slug'),
+        :slug,
+        :title     => lang('menus.descriptions.slug'),
+        :maxlength => 255
       )
-        
+
       f.input_text(
-        lang('menus.labels.html_class'), 
-        :html_class, 
-        :placeholder => lang('menus.placeholders.html_class')
+        lang('menus.labels.html_class'),
+        :html_class,
+        :title     => lang('menus.descriptions.html_class'),
+        :maxlength => 255,
+        :pattern   => '^[a-zA-Z\\\-_0-9\\\s]*$'
       )
 
       f.input_text(
-        lang('menus.labels.html_id'), 
-        :html_id, 
-        :placeholder => lang('menus.placeholders.html_id')
+        lang('menus.labels.html_id'),
+        :html_id,
+        :title     => lang('menus.descriptions.html_id'),
+        :maxlength => 255,
+        :pattern   => '^[a-zA-Z\\\-_0-9]*$'
       )
 
       f.textarea(
-        lang('menus.labels.description'), 
-        :description, 
+        lang('menus.labels.description'),
+        :description,
         :rows => 8
       )
-      
+
       f.g.div(:class => "button") do
         f.g.input(:type => :submit, :value => lang('menus.buttons.save'))
       end
-    end
-    }
-</article>
+    end}
+</section>

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

@@ -1,4 +1,6 @@
-<article>
+<section>
+    #{render_search_form(::Menus::Controller::Menus.r(:index))}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -6,12 +8,12 @@
     <form action="#{Menus::Controller::Menus.r(:delete)}" method="post">
         <input name="csrf_token" type="hidden" value="#{get_csrf_token}" />
 
-        <?r if @menus and !@menus.empty? ?>
+        <?r if !@menus.empty? ?>
 
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_menu) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -23,9 +25,7 @@
                     <th>#{lang('menus.labels.html_class')}</th>
                     <th>#{lang('menus.labels.html_id')}</th>
 
-                    <?r if user_authorized?(
-                      [:read], true, 'Menus::Controller::MenuItems'
-                    ) ?>
+                    <?r if user_authorized?(:show_menu_item) ?>
                     <th></th>
                     <?r end ?>
                 </tr>
@@ -33,7 +33,7 @@
             <tbody>
                 <?r @menus.each do |menu| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_menu) ?>
                     <td>
                         <input type="checkbox" name="menu_ids[]"
                         value="#{menu.id}" />
@@ -42,21 +42,19 @@
 
                     <td>#{menu.id}</td>
 
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{Menus::Controller::Menus.a(menu.name, :edit, menu.id)}
+                        #{if user_authorized?(:edit_menu)
+                          Menus::Controller::Menus.a(menu.name, :edit, menu.id)
+                        else
+                          menu.name
+                        end}
                     </td>
-                    <?r else ?>
-                    <td>#{menu.name}</td>
-                    <?r end ?>
 
                     <td>#{menu.slug}</td>
                     <td>#{menu.html_class}</td>
                     <td>#{menu.html_id}</td>
 
-                    <?r if user_authorized?(
-                      [:read], true, 'Menus::Controller::MenuItems'
-                    ) ?>
+                    <?r if user_authorized?(:show_menu_item) ?>
                     <td>
                         #{Menus::Controller::MenuItems.a(
                           lang('menus.labels.manage_items'), :index, menu.id
@@ -68,17 +66,17 @@
             </tbody>
         </table>
 
-        #{
-        if @menus.respond_to?(:navigation) and @menus.page_count > 1
+        #{if @menus.respond_to?(:navigation) and @menus.page_count > 1
           @menus.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('menus.messages.no_menus')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create, :read]) ?>
+        <?r if user_authorized?(:new_menu) ?>
         <div class="button">
             #{Menus::Controller::Menus.a(
               lang('menus.buttons.new'), :new
@@ -86,10 +84,10 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) ?>
+        <?r if user_authorized?(:delete_menu) and !@menus.empty? ?>
         <div class="button">
             <input type="submit" value="#{lang('menus.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

data/lib/zen/package/sections/lib/sections.rb

@@ -1,75 +1,32 @@
-Ramaze::HelpersHelper.options.paths.push(__DIR__('sections'))
+Zen::Package.add do |p|
+  p.name       = :sections
+  p.title      = 'sections.titles.index'
+  p.author     = 'Yorick Peterse'
+  p.url        = 'http://zen-cms.com/'
+  p.about      = 'sections.description'
+  p.root       = __DIR__('sections')
+  p.migrations = __DIR__('../migrations')
+
+  p.menu('sections.titles.index', '/admin', :permission => :show_section)
+
+  p.permission :show_section  , 'sections.permissions.show'
+  p.permission :edit_section  , 'sections.permissions.edit'
+  p.permission :new_section   , 'sections.permissions.new'
+  p.permission :delete_section, 'sections.permissions.delete'
+
+  p.permission :show_section_entry  , 'section_entries.permissions.show'
+  p.permission :edit_section_entry  , 'section_entries.permissions.edit'
+  p.permission :new_section_entry   , 'section_entries.permissions.new'
+  p.permission :delete_section_entry, 'section_entries.permissions.delete'
+end
+
+Zen::Language.load('sections')
+Zen::Language.load('section_entries')
 
 require __DIR__('sections/model/section')
 require __DIR__('sections/model/section_entry')
 require __DIR__('sections/model/section_entry_status')
 require __DIR__('sections/controller/sections')
 require __DIR__('sections/controller/section_entries')
-require __DIR__('sections/plugin/sections')
-require __DIR__('sections/plugin/section_entries')
-
-Zen::Language.options.paths.push(__DIR__('sections'))
-Zen::Language.load('sections')
-Zen::Language.load('section_entries')
-
-Zen::Package.add do |p|
-  p.name        = 'sections'
-  p.author      = 'Yorick Peterse'
-  p.url         = 'http://yorickpeterse.com/'
-  p.about       = "The sections module allows users to create and manage sections. 
-Sections can be seen as small web applications that live inside the CMS. 
-For example, you could have a section for your blog and for your pages."
-  
-  p.directory     = __DIR__('sections')
-  p.migration_dir = __DIR__('../migrations')
-  
-  p.menu = [{
-    :title => lang('sections.titles.index'),
-    :url   => "admin"
-  }]
 
-  p.controllers = {
-    lang('sections.titles.index')        => Sections::Controller::Sections, 
-    lang('section_entries.titles.index') => Sections::Controller::SectionEntries
-  }
-end
-
-Zen::Plugin.add do |p|
-  p.name       = 'sections'
-  p.author     = 'Yorick Peterse'
-  p.about      = 'Plugin for retrieving multiple or individual sections.'
-  p.url        = 'http://yorickpeterse.com/'
-  p.plugin     = Sections::Plugin::Sections
-end
-
-Zen::Plugin.add do |p|
-  p.name       = 'section_entries'
-  p.author     = 'Yorick Peterse'
-  p.about      = 'Plugin for retrieving multiple or individual section entries.'
-  p.url        = 'http://yorickpeterse.com/'
-  p.plugin     = Sections::Plugin::SectionEntries
-end
-
-# Register all the settings
-plugin(:settings, :register) do |setting|
-  setting.title       = lang('settings.labels.default_section')
-  setting.description = lang('settings.placeholders.default_section')
-  setting.name        = 'default_section'
-  setting.group       = 'general'
-  setting.type        = 'select'
-  setting.values      = lambda do
-    section_hash = {}
-
-    begin
-      Sections::Model::Section.select(:name, :id).all.each do |s|
-        section_hash[s.id] = s.name
-      end
-
-      return section_hash
-    rescue => e
-      Ramaze::Log.warn(
-        "The settings plugin failed to retrieve all sections: #{e.message}"
-      )
-    end
-  end
-end
+Zen::Controller::FrontendController.helper(:section_frontend)