zen 0.2.8 → 0.3b

data/lib/zen/package/users/lib/users/public/admin/css/users/permissions.css

@@ -0,0 +1,22 @@
+#permissions .package
+{
+    margin-bottom: 15px;
+}
+
+    #permissions .package .permissions
+    {
+        margin-bottom: 10px;
+    }
+
+        #permissions .package .permissions li
+        {
+            display:         inline-block;
+            margin-bottom:   5px;
+            list-style-type: none;
+            width:           18%;
+        }
+
+    #permissions .package .button
+    {
+        margin-bottom: 10px;
+    }

data/lib/zen/package/users/lib/users/public/admin/js/users/permissions.js

@@ -0,0 +1,33 @@
+/**
+ * Javascript file loaded by the Users package. The code in this file is used to
+ * make it easier for users to check all the checkboxes for a package when
+ * managing a user or user group's permissions.
+ *
+ * @since  0.3
+ */
+window.addEvent('domready', function()
+{
+    // Button that can be used to allow all the permissions for a package.
+    $$('.package .button.allow input').addEvent('click', function()
+    {
+        var checkboxes = this.getParent('.package')
+            .getChildren('.permissions input[type="checkbox"]');
+
+        checkboxes.each(function(checkbox)
+        {
+            checkbox.set('checked', true);
+        });
+    });
+
+    // Button that can be used to deny all the permissions for a package.
+    $$('.package .button.deny input').addEvent('click', function()
+    {
+        var checkboxes = this.getParent('.package')
+            .getChildren('.permissions input[type="checkbox"]');
+
+        checkboxes.each(function(checkbox)
+        {
+            checkbox.set('checked', false);
+        });
+    });
+});

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

@@ -0,0 +1,19 @@
+Settings::SettingsGroup.add do |group|
+  group.title = 'users.tabs.settings'
+  group.name  = :users
+end
+
+Settings::Setting.add do |setting|
+  setting.title       = 'users.labels.allow_registration'
+  setting.description = 'users.descriptions.allow_registration'
+  setting.name        = :allow_registration
+  setting.group       = :users
+  setting.default     = '0'
+  setting.type        = 'radio'
+  setting.values      = lambda do
+    return {
+      lang('zen_general.special.boolean_hash.true')  => '1',
+      lang('zen_general.special.boolean_hash.false') => '0'
+    }
+  end
+end

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

@@ -1,10 +1,29 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{
-    form_for(
+    <div class="tabs">
+        <ul>
+            <li>
+                <a href="#user_group_tab"
+                title="#{lang('user_groups.titles.edit')}">
+                    #{lang('user_groups.titles.edit')}
+                </a>
+            </li>
+
+            <?r if user_authorized?(:show_permission) ?>
+            <li>
+                <a href="#permissions"
+                title="#{lang('permissions.titles.index')}">
+                    #{lang('permissions.titles.index')}
+                </a>
+            </li>
+            <?r end ?>
+        </ul>
+    </div>
+
+    #{form_for(
       @user_group,
       :method => :post,
       :action => Users::Controller::UserGroups.r(:save),
@@ -13,28 +32,40 @@
       f.input_hidden(:id, @user_group.id)
       f.input_hidden(:csrf_token, get_csrf_token)
 
-      f.input_text(
-        lang('user_groups.labels.name'),
-        :name
-      )
-
-      f.input_text(
-        lang('user_groups.labels.slug'),
-        :slug
-      )
-
-      f.input_radio(
-        lang('user_groups.labels.super_group'),
-        :super_group,
-        @user_group.super_group,
-        :values => @boolean_hash.invert
-      )
-
-      f.textarea(
-        lang('user_groups.labels.description'),
-        :description,
-        :rows => 10
-      )
+      f.g.div(:id => 'user_group_tab') do
+        f.input_text(
+          lang('user_groups.labels.name'),
+          :name,
+          :required  => :required,
+          :maxlength => 255
+        )
+
+        f.input_text(
+          lang('user_groups.labels.slug'),
+          :slug,
+          :maxlength => 255
+        )
+
+        f.input_radio(
+          lang('user_groups.labels.super_group'),
+          :super_group,
+          @user_group.super_group,
+          :values   => @boolean_hash.invert,
+          :required => :required
+        )
+
+        f.textarea(
+          lang('user_groups.labels.description'),
+          :description,
+          :rows => 10
+        )
+      end
+
+      if user_authorized?(:show_permission)
+        f.g.div(:id => 'permissions') do
+          render_file(__DIR__('../users/permissions.xhtml'))
+        end
+      end
 
       f.g.div(:class => 'button') do
         f.g.input(
@@ -42,6 +73,5 @@
           :value => lang('user_groups.buttons.save')
         )
       end
-    end
-    }
-</article>
+    end}
+</section>

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

@@ -1,4 +1,6 @@
-<article>
+<section>
+    #{render_search_form(Users::Controller::UserGroups.r(:index))}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -7,10 +9,11 @@
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
         <?r if !@user_groups.empty? ?>
+
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_user_group) ?>
                     <th class="no_sort">
                         <input type="checkbox" />
                     </th>
@@ -25,7 +28,7 @@
             <tbody>
                 <?r @user_groups.each do |group| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_user_group) ?>
                     <td>
                         <input type="checkbox" name="user_group_ids[]"
                         value="#{group.id}" />
@@ -34,15 +37,15 @@
 
                     <td>#{group.id}</td>
                     <td>
-                        #{
-                        if user_authorized?([:update])
+                        #{if user_authorized?(:edit_user_group)
                           Users::Controller::UserGroups.a(
-                            group.name, :edit, group.id
+                            group.name,
+                            :edit,
+                            group.id
                           )
                         else
                           group.name
-                        end
-                        }
+                        end}
                     </td>
                     <td>#{group.slug}</td>
                     <td>#{@boolean_hash[group.super_group]}</td>
@@ -51,18 +54,18 @@
             </tbody>
         </table>
 
-        #{
-        if @user_groups.respond_to?(:navigation) \
+        #{if @user_groups.respond_to?(:navigation) \
         and @user_groups.page_count > 1
           @user_groups.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('user_groups.messages.no_groups')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?r if user_authorized?(:new_user_group) ?>
         <div class="button">
             #{Users::Controller::UserGroups.a(
               lang('user_groups.buttons.new'),
@@ -71,11 +74,12 @@
         </div>
         <?r end ?>
 
-        <?r if user_authorized?([:delete]) and !@user_groups.empty? ?>
+        <?r if user_authorized?(:delete_user_group) \
+        and !@user_groups.empty? ?>
         <div class="button">
             <input type="submit"
             value="#{lang('user_groups.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

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

@@ -1,10 +1,30 @@
-<article>
+<section>
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    #{
-    form_for(
+    <?r if !@user.id.nil? ?>
+    <div class="tabs">
+        <ul>
+            <li>
+                <a href="#user_tab" title="#{lang('users.titles.edit')}">
+                    #{lang('users.titles.edit')}
+                </a>
+            </li>
+
+            <?r if user_authorized?(:show_permission) ?>
+            <li>
+                <a href="#permissions"
+                title="#{lang('permissions.titles.index')}">
+                    #{lang('permissions.titles.index')}
+                </a>
+            </li>
+            <?r end ?>
+        </ul>
+    </div>
+    <?r end ?>
+
+    #{form_for(
       @user,
       :method => :post,
       :action => Users::Controller::Users.r(:save),
@@ -13,75 +33,86 @@
       f.input_hidden(:csrf_token, get_csrf_token)
       f.input_hidden(:id, @user.id)
 
-      f.input_text(
-        lang('users.labels.name'),
-        :name
-      )
+      f.g.div(:id => 'user_tab') do
+        f.input_text(
+          lang('users.labels.name'),
+          :name,
+          :required  => :required,
+          :maxlength => 255
+        )
 
-      f.input_text(
-        lang('users.labels.email'),
-        :email
-      )
+        f.input_text(
+          lang('users.labels.email'),
+          :email,
+          :required  => :required,
+          :maxlength => 255
+        )
 
-      f.input_text(
-        lang('users.labels.website'),
-        :website
-      )
+        f.input_text(
+          lang('users.labels.website'),
+          :website,
+          :maxlength => 255
+        )
 
-      f.input_password(
-        lang('users.labels.new_password'),
-        :new_password
-      )
+        f.input_password(
+          lang('users.labels.password'),
+          :password,
+          :value => ''
+        )
 
-      f.input_password(
-        lang('users.labels.confirm_password'),
-        :confirm_password
-      )
+        f.input_password(
+          lang('users.labels.confirm_password'),
+          :confirm_password
+        )
 
-      f.select(
-        lang('users.labels.status'),
-        :status,
-        :values   => @status_hash,
-        :selected => @user.status,
-        :size     => 1
-      )
+        f.select(
+          lang('users.labels.status'),
+          :user_status_id,
+          :values   => Users::Model::UserStatus.dropdown,
+          :selected => @user.user_status_id,
+          :size     => 1
+        )
 
-      f.select(
-        lang('users.labels.user_groups'),
-        :user_group_pks,
-        :values   => @user_group_pks,
-        :selected => @user.user_group_pks,
-        :multiple => :multiple,
-        :size     => 1
-      )
+        f.input_checkbox(
+          lang('users.labels.user_groups'),
+          :user_group_pks,
+          @user.user_group_pks,
+          :values => @user_group_pks,
+        )
 
-      f.select(
-        lang('users.labels.language'),
-        :language,
-        :values   => ::Zen::Language::Languages,
-        :selected => @user.language,
-        :size     => 1
-      )
+        f.select(
+          lang('users.labels.language'),
+          :language,
+          :values   => ::Zen::Language.to_hash,
+          :selected => @user.language,
+          :size     => 1
+        )
 
-      f.select(
-        lang('users.labels.frontend_language'),
-        :frontend_language,
-        :values   => ::Zen::Language::Languages,
-        :selected => @user.frontend_language,
-        :size     => 1
-      )
+        f.select(
+          lang('users.labels.frontend_language'),
+          :frontend_language,
+          :values   => ::Zen::Language.to_hash,
+          :selected => @user.frontend_language,
+          :size     => 1
+        )
 
-      f.select(
-        lang('users.labels.date_format'),
-        :date_format,
-        :values   => plugin(:settings, :get, 'date_format').values,
-        :selected => @user.date_format,
-        :size     => 1
-      )
+        f.select(
+          lang('users.labels.date_format'),
+          :date_format,
+          :values   => get_setting(:date_format).values,
+          :selected => @user.date_format,
+          :size     => 1
+        )
+      end
+
+      if user_authorized?(:show_permission)
+        f.g.div(:id => 'permissions') do
+          render_view(:permissions)
+        end
+      end
 
       f.g.div(:class => 'button') do
         f.g.input(:type => 'submit', :value => lang('users.buttons.save'))
       end
-    end
-    }
-</article>
+    end}
+</section>