zen 0.3 → 0.4

data/lib/zen/package/sections/lib/sections/view/admin/section-entries/recent_entries.xhtml

@@ -0,0 +1,45 @@
+<?r if !@entries.empty? ?>
+
+<table>
+    <thead>
+        <tr>
+            <th>#{lang('section_entries.labels.id')}</th>
+            <th>#{lang('section_entries.labels.title')}</th>
+            <th>#{lang('section_entries.labels.slug')}</th>
+            <th>#{lang('section_entries.labels.status')}</th>
+            <th>#{lang('section_entries.labels.created_at')}</th>
+        </tr>
+    </thead>
+    <tbody>
+        <?r @entries.each do |entry| ?>
+        <tr>
+            <td>#{entry.id}</td>
+
+            <td>
+                #{if user_authorized?(:edit_section_entry)
+                  edit_link(
+                    Sections::Controller::SectionEntries.r(
+                      :edit,
+                      entry.section_id,
+                      entry.id
+                    ),
+                    entry.title
+                  )
+                else
+                  entry.title
+                end}
+            </td>
+
+            <td>#{entry.slug}</td>
+            <td>#{entry.status_name}</td>
+            <td>#{format_date(entry.created_at)}</td>
+        </tr>
+        <?r end ?>
+    </tbody>
+</table>
+
+<?r else ?>
+
+<p>#{lang('section_entries.messages.no_entries')}</p>
+
+<?r end ?>

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

@@ -0,0 +1,119 @@
+<section>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
+
+    <div class="tabs">
+        <ul>
+            <li>
+                <a href="#general" class="icon edit"
+                title="#{lang('sections.tabs.general')}">
+                    #{lang('sections.tabs.general')}
+                </a>
+            </li>
+            <li>
+                <a href="#comments" class="icon comment"
+                title="#{lang('sections.tabs.comment_settings')}">
+                    #{lang('sections.tabs.comment_settings')}
+                </a>
+            </li>
+            <li>
+                <a href="#groups" class="icon relation"
+                title="#{lang('sections.tabs.group_assignments')}">
+                    #{lang('sections.tabs.group_assignments')}
+                </a>
+            </li>
+        </ul>
+    </div>
+
+    <div class="body">
+        #{form_for(
+          @section,
+          :method              => :post,
+          :action              => Sections::Controller::Sections.r(:save),
+          :id                  => :section_form,
+          :'data-autosave-url' => Sections::Controller::Sections.r(:autosave)
+        ) do |f|
+          f.input_hidden(:id        , @section.id)
+          f.input_hidden(:csrf_token, get_csrf_token)
+
+          f.g.div(:id => 'general') do
+            f.input_text(
+              lang('sections.labels.name'),
+              :name,
+              :required  => :required,
+              :maxlength => 255
+            )
+
+            f.input_text(
+              lang('sections.labels.slug'),
+              :slug,
+              :maxlength => 255
+            )
+
+            f.textarea(
+              lang('sections.labels.description'),
+              :description,
+              :rows  => 10
+            )
+          end # f.g.div(:id => 'general')
+
+          f.g.div(:id => 'comments') do
+            f.input_radio(
+              lang('sections.labels.comment_allow'),
+              :comment_allow,
+              @section.comment_allow,
+              :values   => @boolean_hash.invert,
+              :required => :required
+            )
+
+            f.input_radio(
+              lang('sections.labels.comment_require_account'),
+              :comment_require_account,
+              @section.comment_require_account,
+              :values   => @boolean_hash.invert,
+              :required => :required
+            )
+
+            f.input_radio(
+              lang('sections.labels.comment_moderate'),
+              :comment_moderate,
+              @section.comment_moderate,
+              :values   => @boolean_hash.invert,
+              :required => :required
+            )
+
+            f.select(
+              lang('sections.labels.comment_format'),
+              :comment_format,
+              :values   => Zen::Markup.to_hash,
+              :selected => @section.comment_format,
+              :size     => 1,
+              :required => :required
+            )
+          end # f.g.div(:id => 'comments')
+
+          f.g.div(:id => 'groups') do
+            f.input_checkbox(
+              lang('sections.labels.custom_field_groups'),
+              :custom_field_group_pks,
+              @section.custom_field_group_pks,
+              :values => @custom_field_group_pk_hash,
+            )
+
+            f.input_checkbox(
+              lang('sections.labels.category_groups'),
+              :category_group_pks,
+              @section.category_group_pks,
+              :values => @category_group_pk_hash,
+            )
+          end # f.g.div(:id => 'groups')
+
+          f.g.input(
+            :type  => 'submit',
+            :value => lang('sections.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
+</section>

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

@@ -0,0 +1,96 @@
+<section>
+    <header class="with_search">
+        <h1>#{get_breadcrumbs}</h1>
+
+        #{render_search_form(Sections::Controller::Sections.r(:index))}
+    </header>
+
+    <div class="body">
+        <form method="post"
+        action="#{Sections::Controller::Sections.r(:delete)}">
+            <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+
+            <?r if !@sections.empty? ?>
+
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_section) ?>
+                        <th class="no_sort">
+                            <input type="checkbox" />
+                        </th>
+                        <?r end ?>
+
+                        <th>#{lang('sections.labels.id')}</th>
+                        <th>#{lang('sections.labels.name')}</th>
+                        <th>#{lang('sections.labels.slug')}</th>
+                        <th>#{lang('sections.labels.comment_allow')}</th>
+
+                        <?r if user_authorized?(:show_section_entry) ?>
+                        <th></th>
+                        <?r end ?>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?r @sections.each do |section| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete_section) ?>
+                        <td>
+                            <input type="checkbox" name="section_ids[]"
+                            value="#{section.id}" />
+                        </td>
+                        <?r end ?>
+
+                        <td>#{section.id}</td>
+
+                        <td>
+                            <?r if user_authorized?(:edit_section) ?>
+                            #{edit_link(
+                              Sections::Controller::Sections.r(:edit, section.id),
+                              section.name
+                            )}
+                            <?r else ?>
+                            #{section.name}
+                            <?r end ?>
+                        </td>
+
+                        <td>#{section.slug}</td>
+                        <td>#{@boolean_hash[section.comment_allow]}</td>
+
+                        <?r if user_authorized?(:show_section_entry) ?>
+                        <td>
+                            #{manage_link(
+                              Sections::Controller::SectionEntries.r(
+                                :index,
+                                section.id
+                              ),
+                              lang('sections.labels.manage_entries')
+                            )}
+                        </td>
+                        <?r end ?>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
+
+            #{render_pagination(@sections)}
+
+            <?r else ?>
+
+            <p>#{lang('sections.messages.no_sections')}</p>
+
+            <?r end ?>
+
+            <?r if user_authorized?(:new_section) ?>
+            #{new_button(
+              Sections::Controller::Sections.r(:new),
+              lang('sections.buttons.new')
+            )}
+            <?r end ?>
+
+            <?r if user_authorized?(:delete_section) and !@sections.empty? ?>
+            #{delete_button(lang('sections.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
+</section>

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

@@ -0,0 +1,14 @@
+# Widget that shows the 10 most recent section entries.
+Dashboard::Widget.add do |w|
+  w.name       = :recent_entries
+  w.title      = 'section_entries.widgets.titles.recent_entries'
+  w.permission = :show_section_entry
+  w.data       = lambda do |instance|
+    entries = Sections::Model::SectionEntry.order(:created_at.desc).limit(10)
+
+    return render_file(
+      __DIR__('../view/admin/section-entries/recent_entries.xhtml'),
+      :entries => entries
+    )
+  end
+end

data/lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb

@@ -46,7 +46,7 @@ Sequel.migration do
     end
 
     alter_table(:section_entries) do
-      if Zen.database.adapter_scheme.to_s.include?('mysql')
+      if Zen.database.database_type.to_s.include?('mysql')
         drop_constraint(:section_entries_ibfk_3, :type => :foreign_key)
       end
 

data/lib/zen/package/settings/lib/settings.rb

@@ -7,18 +7,14 @@ Zen::Package.add do |p|
   p.root       = __DIR__('settings')
   p.migrations = __DIR__('../migrations')
 
-  p.menu(
-    'settings.titles.index',
+  p.menu 'settings.titles.index',
     '/admin/settings',
     :permission => :show_setting
-  )
 
   p.permission :show_setting, 'settings.permissions.show'
   p.permission :edit_setting, 'settings.permissions.edit'
 end
 
-Zen::Language.load('settings')
-
 require __DIR__('settings/model/setting')
 require __DIR__('settings/controller/settings')
 require __DIR__('settings/settings_group')
@@ -31,3 +27,16 @@ require __DIR__('settings/setting_groups')
 require __DIR__('settings/settings')
 
 include Settings::SingletonMethods
+
+Zen::Event.listen :post_start do
+  Zen::Language.load('settings')
+
+  begin
+    Settings::Setting.migrate
+  rescue => e
+    Ramaze::Log.warn(
+      'Failed to migrate the settings, make sure the database ' \
+        'table is up to date and that you executed rake db:migrate.'
+    )
+  end
+end

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

@@ -27,9 +27,9 @@ module Settings
     # groups where each group is placed under it's own tab. An example of this
     # overview can be seen in the image below.
     #
-    # ![General](../../_static/settings/overview_general.png)
-    # ![Security](../../_static/settings/overview_security.png)
-    # ![User Settings](../../_static/settings/overview_user.png)
+    # ![General](../../images/settings/overview_general.png)
+    # ![Security](../../images/settings/overview_security.png)
+    # ![User Settings](../../images/settings/overview_user.png)
     #
     # Out of the box Zen ships with the following settings:
     #
@@ -130,7 +130,7 @@ module Settings
           begin
             setting.value = value
           rescue => e
-            Ramaze::Log.error(e.inspect)
+            Ramaze::Log.error(e)
             message(:error, error)
 
             flash[:form_errors] = setting.errors

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

@@ -10,7 +10,7 @@ Zen::Language::Translation.add do |trans|
     t['labels.website_name']           = 'Website naam'
     t['labels.website_description']    = 'Website beschrijving'
     t['labels.language']               = 'Taal'
-    t['labels.frontend_langauge']      = 'Taal voor bezoekers'
+    t['labels.frontend_language']      = 'Frontend taal'
     t['labels.theme']                  = 'Thema'
     t['labels.enable_antispam']        = 'Anti-spam inschakelen'
     t['labels.date_format']            = 'Datum formaat'

data/lib/zen/package/settings/lib/settings/setting.rb

@@ -259,7 +259,7 @@ module Settings
     # @param  [String] value The value to set the setting to.
     #
     def value=(value)
-      value = serialize(value)
+      value = serialize(Zen::Security.sanitize(value))
 
       # First we'll update the SQL database
       ::Settings::Model::Setting[:name => name.to_s].update(:value => value)

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

@@ -13,24 +13,28 @@
         </ul>
     </div>
 
-    #{form_for(
-      @settings_ordered,
-      :method => :post,
-      :action => ::Settings::Controller::Settings.r(:save),
-      :id     => :setting_form
-    ) do |f|
-      f.input_hidden(:csrf_token, get_csrf_token)
+    <div class="body">
+        #{form_for(
+          @settings_ordered,
+          :method => :post,
+          :action => ::Settings::Controller::Settings.r(:save),
+          :id     => :setting_form
+        ) do |f|
+          f.input_hidden(:csrf_token, get_csrf_token)
 
-      @settings_ordered.each do |group, items|
-        f.g.div(:id => "group_#{group}") do
-          items.each do |s|
-            f.send(*get_setting(s.name).form_parameters)
+          @settings_ordered.each do |group, items|
+            f.g.div(:id => "group_#{group}") do
+              items.each do |s|
+                f.send(*get_setting(s.name).form_parameters)
+              end
+            end
           end
-        end
-      end
 
-      f.g.div(:class => 'button') do
-        f.g.input(:type => 'submit', :value => lang('settings.buttons.save'))
-      end
-    end}
+          f.g.input(
+            :type  => 'submit',
+            :value => lang('settings.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>

data/lib/zen/package/users/lib/users.rb

@@ -7,36 +7,30 @@ Zen::Package.add do |p|
   p.root       = __DIR__('users')
   p.migrations = __DIR__('../migrations')
 
-  p.menu(
-    'users.titles.index',
+  p.menu 'users.titles.index',
     '/admin/users',
     :permission => :show_user
-  ) do |sub|
-    sub.menu(
-      'user_groups.titles.index',
-      '/admin/user-groups',
-      :permission => :show_user_group
-    )
-  end
+
+  p.menu 'user_groups.titles.index',
+    '/admin/user-groups',
+    :permission => :show_user_group
 
   p.permission :show_user_group  , 'user_groups.permissions.show'
   p.permission :edit_user_group  , 'user_groups.permissions.edit'
   p.permission :new_user_group   , 'user_groups.permissions.new'
   p.permission :delete_user_group, 'user_groups.permissions.delete'
+  p.permission :assign_user_group, 'user_groups.permissions.assign'
 
-  p.permission :show_user  , 'users.permissions.show'
-  p.permission :edit_user  , 'users.permissions.edit'
-  p.permission :new_user   , 'users.permissions.new'
-  p.permission :delete_user, 'users.permissions.delete'
+  p.permission :show_user       , 'users.permissions.show'
+  p.permission :edit_user       , 'users.permissions.edit'
+  p.permission :new_user        , 'users.permissions.new'
+  p.permission :delete_user     , 'users.permissions.delete'
+  p.permission :edit_user_status, 'users.permissions.status'
 
   p.permission :show_permission, 'permissions.permissions.show'
   p.permission :edit_permission, 'permissions.permissions.edit'
 end
 
-Zen::Language.load('users')
-Zen::Language.load('user_groups')
-Zen::Language.load('permissions')
-
 require __DIR__('users/settings')
 require __DIR__('users/model/user')
 require __DIR__('users/model/user_group')
@@ -44,8 +38,7 @@ require __DIR__('users/model/permission')
 require __DIR__('users/model/user_status')
 
 # The trait for the User helper has to be specified in the constructor as our
-# user model is loaded after this class is loaded (but before it's
-# initialized)
+# user model is loaded after this class is loaded (but before it's initialized)
 Zen::Controller::BaseController.trait(:user_model => Users::Model::User)
 Zen::Controller::AdminController.helper(:acl, :access)
 
@@ -56,3 +49,9 @@ Ramaze::Helper::Access.add_block(Settings::Controller::Settings)
 # Load the controllers after the helpers have been loaded.
 require __DIR__('users/controller/users')
 require __DIR__('users/controller/user_groups')
+
+Zen::Event.listen :post_start do
+  Zen::Language.load('users')
+  Zen::Language.load('user_groups')
+  Zen::Language.load('permissions')
+end