zen 0.4 → 0.4.1

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

@@ -55,7 +55,7 @@ Sequel.migration do
     end
 
     entries.each do |entry|
-      Zen.database.filter(:id => entry[:id]) \
+      Zen.database[:section_entries].filter(:id => entry[:id]) \
         .update(:status => statuses[entry[:section_entry_status_id]])
     end
 

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

@@ -7,7 +7,7 @@ module Settings
   #
   # Similar to the custom fields module mentioned above adding methods to this
   # module is relatively easy (though you usually don't need to add your own
-  # methods). This can be done by simply re-opening the module and adding a
+  # methods). This can be done by simply reopening the module and adding a
   # class method to it:
   #
   #     module Settings
@@ -27,7 +27,7 @@ module Settings
   module BlueFormParameters
     class << self
       ##
-      # Generates the required parameters for a textbox (``input type="text"``).
+      # Generates the required parameters for a text box (``input type="text"``).
       #
       # @since 0.3
       # @param [Settings::Setting] setting The setting for which to generate the

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

@@ -20,7 +20,7 @@ module Settings
   module Controller
     ##
     # Controller for managing settings. Settings are used to store the name of
-    # the website, what anti-spam system to use and so on. These settings can be
+    # the website, what anti spam system to use and so on. These settings can be
     # managed via the admin interface rather than having to edit configuration
     # files. Settings can be managed by going to ``/admin/settings``. This page
     # shows an overview of all the available settings organized in a number of
@@ -33,20 +33,65 @@ module Settings
     #
     # Out of the box Zen ships with the following settings:
     #
-    # * **Website name**: the name of the website.
-    # * **Website description**: a short description of the website.
-    # * **Language**: the default language to use for the admin interface.
-    # * **Frontend Language**: the default language to use for the frontend of
-    #   your website.
-    # * **Theme**: the theme to use for the frontend.
-    # * **Date format**: the default date format to use in the backend.
-    # * **Enable anti-spam**: whether or not comments should be verified to see
-    #   if they're spam or ham.
-    # * **Anti-spam system**: the anti-spam system to use. Zen by default only
-    #   comes with Defensio support.
-    # * **Defensio key**: the API key for the Defensio anti-spam system.
-    # * **Allow Registration**: defines whether or not visitors are allowed to
-    #   register a user account.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Website name</td>
+    #             <td>The name of the website.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Website description</td>
+    #             <td>A description of the website.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Language</td>
+    #             <td>The language to use for the backend.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Frontend Language</td>
+    #             <td>The language to use for the frontend of the website.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Theme</td>
+    #             <td>The theme to use for the website.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Date format</td>
+    #             <td>
+    #                 The date format to use for dates displayed in the backend.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Enable anti-spam</td>
+    #             <td>
+    #                 When set comments will be validated before they're saved.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Anti-spam system</td>
+    #             <td>
+    #                 The system to use for validating comments. Out of the box
+    #                 Zen only supports Defensio.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Defensio key</td>
+    #             <td>The API key to use for the Defensio API.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Allow Registration</td>
+    #             <td>
+    #                 When set users are allowed to register user accounts.
+    #             </td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # ## Used Permissions
     #

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

@@ -23,7 +23,7 @@
           f.input_hidden(:csrf_token, get_csrf_token)
 
           @settings_ordered.each do |group, items|
-            f.g.div(:id => "group_#{group}") do
+            f.g.div(:id => "group_#{group}", :class => :tab_field) do
               items.each do |s|
                 f.send(*get_setting(s.name).form_parameters)
               end

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

@@ -22,13 +22,48 @@ module Users
     #
     # In this form you can fill in the following fields:
     #
-    # * **Name** (required): the name of the user group.
-    # * **Slug**: a URL friendly version of the name. If no name is specified
-    #   one will be generated automatically.
-    # * **Super group** (required): when set to "Yes" all users that are
-    #   assigned to this group will have access to *everything* regardless of
-    #   their individual settings.
-    # * **Description**: a description of the user group.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Name</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>The name of the user group.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Slug</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>
+    #                 A URL friendly version of the user group. If no value is
+    #                 specified one will be generated automatically based on the name
+    #                 of the user group.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Super group</td>
+    #             <td>Yes</td>
+    #             <td></td>
+    #             <td>
+    #                 When set users of this group have full access to the backend.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Description</td>
+    #             <td>No</td>
+    #             <td>Unlimited</td>
+    #             <td>A description of the user group.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # Besides these fields you can also specify all the permissions o the user
     # group similar to how they're managed for individual users. Note that user

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

@@ -48,22 +48,84 @@ module Users
     #
     # In this form the following fields can be filled:
     #
-    # * **Name** (required): the full name of the user.
-    # * **Email** (required): the Email address of the user, used for logging
-    #   in.
-    # * **Website**: the website of the user (if he/she has any).
-    # * **Password** (required for new users): the raw password the user will
-    #   use in order to log in.
-    # * **Confirm password** (required for new users): an extra field to confirm
-    #   that the specified password is the right one. This field should match
-    #   the password specified in the "Password" field.
-    # * **Status**: field that indicates if a user is active or not. If the
-    #   status is set to "Closed" the user will not be able to log in.
-    # * **User Groups**: all the user groups the user belongs to.
-    # * **Language**: the language to use for the admin interface.
-    # * **Frontend language**: the language to use for the frontend of the
-    #   application.
-    # * **Date format**: the date format to use in the admin interface.
+    # <table class="table full">
+    #     <thead>
+    #         <tr>
+    #             <th class="field_name">Field</th>
+    #             <th>Required</th>
+    #             <th>Maximum Length</th>
+    #             <th>Description</th>
+    #         </tr>
+    #     </thead>
+    #     <tbody>
+    #         <tr>
+    #             <td>Name</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>The full name of the user.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Email</td>
+    #             <td>Yes</td>
+    #             <td>255</td>
+    #             <td>The Email address of the user.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Website</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>The website of the user.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Password</td>
+    #             <td>No</td>
+    #             <td>255</td>
+    #             <td>The password for the user.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Confirm Password</td>
+    #             <td>
+    #                 Only when a password has been specified in the "Password"
+    #                 field.
+    #             </td>
+    #             <td>255</td>
+    #             <td>
+    #                 Field used to confirm the password in case of setting a
+    #                 new one.
+    #             </td>
+    #         </tr>
+    #         <tr>
+    #             <td>Status</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>The status of the user, set to closed by default.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>User groups</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>A selection of groups to add the user to.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Language</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>The language to use for the backend of the website.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Frontend Language</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>The language to use for the frontend of the website.</td>
+    #         </tr>
+    #         <tr>
+    #             <td>Date format</td>
+    #             <td>No</td>
+    #             <td></td>
+    #             <td>The date format to use for the backend.</td>
+    #         </tr>
+    #     </tbody>
+    # </table>
     #
     # Besides these fields there's also the tab "Permissions". This tab contains
     # a collection of all installed packages and their permissions. This makes

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

@@ -16,11 +16,12 @@ module Ramaze
       # @return [Users::Model::UserGroup]
       #
       def validate_user_group(user_group_id)
+        redirect_invalid_user_group unless user_group_id =~ /\d+/
+
         group = ::Users::Model::UserGroup[user_group_id]
 
         if group.nil?
-          message(:error, lang('user_groups.errors.invalid_group'))
-          redirect(::Users::Controller::UserGroups.r(:index))
+          redirect_invalid_user_group
         else
           return group
         end
@@ -34,11 +35,12 @@ module Ramaze
       # @return [Users::Model::User]
       #
       def validate_user(user_id)
+        redirect_invalid_user unless user_id =~ /\d+/
+
         user = ::Users::Model::User[user_id]
 
         if user.nil?
-          message(:error, lang('users.errors.invalid_user'))
-          redirect(::Users::Controller::Users.r(:index))
+          redirect_invalid_user
         else
           return user
         end
@@ -84,6 +86,29 @@ module Ramaze
         session[:super_group] = nil
         session[:permissions] = nil
       end
+
+      ##
+      # Redirects the user back to the users overview and shows a message
+      # informing the current user that the user he/she tried to access is
+      # invalid.
+      #
+      # @since 09-04-2012
+      #
+      def redirect_invalid_user
+        message(:error, lang('users.errors.invalid_user'))
+        redirect(::Users::Controller::Users.r(:index))
+      end
+
+      ##
+      # Redirects the user back to the user groups overview and informs the user
+      # that the group he/she tried to access is invalid.
+      #
+      # @since 09-04-2012
+      #
+      def redirect_invalid_user_group
+        message(:error, lang('user_groups.errors.invalid_group'))
+        redirect(::Users::Controller::UserGroups.r(:index))
+      end
     end # Users
   end # Helper
 end # Ramaze

data/lib/zen/package/users/lib/users/view/admin/user-groups/form.xhtml

@@ -36,7 +36,7 @@
           f.input_hidden(:id, @user_group.id)
           f.input_hidden(:csrf_token, get_csrf_token)
 
-          f.g.div(:id => 'user_group_tab') do
+          f.g.div(:id => 'user_group_tab', :class => :tab_field) do
             f.input_text(
               lang('user_groups.labels.name'),
               :name,
@@ -66,7 +66,7 @@
           end
 
           if user_authorized?(:show_permission) and @user_group.exists?
-            f.g.div(:id => 'permissions') do
+            f.g.div(:id => 'permissions', :class => :tab_field) do
               render_file(__DIR__('../users/permissions.xhtml'))
             end
           end

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

@@ -36,7 +36,7 @@
           f.input_hidden(:csrf_token, get_csrf_token)
           f.input_hidden(:id, @user.id)
 
-          f.g.div(:id => 'user_tab') do
+          f.g.div(:id => 'user_tab', :class => :tab_field) do
             f.input_text(
               lang('users.labels.name'),
               :name,
@@ -113,7 +113,7 @@
           end
 
           if user_authorized?(:show_permission) and @user.exists?
-            f.g.div(:id => 'permissions') do
+            f.g.div(:id => 'permissions', :class => :tab_field) do
               render_view(:permissions)
             end
           end

data/lib/zen/public/admin/zen/css/general.css

@@ -157,6 +157,11 @@ pre
     background-image: url('/admin/zen/images/icons/categories.png');
 }
 
+.icon.error
+{
+    background-image: url('/admin/zen/images/icons/error.png');
+}
+
 .label
 {
     color:   #fff;

data/lib/zen/public/admin/zen/css/messages.css

@@ -2,6 +2,7 @@
 {
     border-bottom: 1px solid #000;
     color:         #fff;
+    cursor:        pointer;
     padding:       8px 10px 10px 10px;
     text-align:    center;
     text-shadow:   1px 1px #000;

data/lib/zen/public/admin/zen/css/tables.css

@@ -55,3 +55,36 @@ table
 {
     background: #fff;
 }
+
+/* Styles for the pager. */
+.pager
+{
+    float:         right;
+    margin-bottom: 20px;
+}
+
+.pager .grey
+{
+    display: none;
+}
+
+.pager span, .pager a
+{
+    border:       1px solid #ccc;
+    color:        #000;
+    display:      inline-block;
+    min-width:    20px;
+    margin-right: 8px;
+    padding:      5px;
+    text-align:   center;
+
+    border-radius:         3px;
+    -webkit-border-radius: 3px;
+    -moz-border-radius:    3px;
+}
+
+.pager a:hover, .pager .current
+{
+    background:      #eee;
+    text-decoration: none;
+}

data/lib/zen/public/admin/zen/css/tabs.css

@@ -56,6 +56,14 @@
             padding-left: 23px;
         }
 
+        .tabs ul li .tab_error
+        {
+            height:   16px;
+            margin:   -5px 0px 0px -5px;
+            position: absolute;
+            width:    16px;
+        }
+
     .tabs ul li.active
     {
         background:    #fff;