zen 0.2.7 → 0.2.8

data/lib/zen/package/users/lib/users/view/admin/access-rules/index.xhtml

@@ -2,21 +2,20 @@
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post" action="#{Users::Controller::AccessRules.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        
-        <?r if @access_rules and !@access_rules.empty? ?>
-        
-        <table class="table">
+
+        <?r if !@access_rules.empty? ?>
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
-                    
+
                     <th>#{lang('access_rules.labels.id')}</th>
                     <th>#{lang('access_rules.labels.package')}</th>
                     <th>#{lang('access_rules.labels.controller')}</th>
@@ -33,28 +32,32 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="access_rule_ids[]" value="#{rule.id}" />
+                        <input type="checkbox" name="access_rule_ids[]"
+                        value="#{rule.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{rule.id}</td>
                     <td>#{rule.package}</td>
 
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          @form_controllers[rule.package].key(rule.controller), 
-                          Users::Controller::AccessRules.r(:edit, rule.id)
-                        )}
+                        #{
+                        if user_authorized?([:update])
+                          Users::Controller::AccessRules.a(
+                            @form_controllers[rule.package].key(rule.controller),
+                            :edit,
+                            rule.id
+                          )
+                        else
+                          @form_controllers[rule.package].key(rule.controller)
+                        end
+                        }
                     </td>
-                    <?r else ?>
-                    <td>#{@form_controllers[rule.package].key(rule.controller)}</td>
-                    <?r end ?>
-                    
-                    <td>#{@boolean_hash.invert[rule.create_access]}</td>
-                    <td>#{@boolean_hash.invert[rule.read_access]}</td>
-                    <td>#{@boolean_hash.invert[rule.update_access]}</td>
-                    <td>#{@boolean_hash.invert[rule.delete_access]}</td>
+
+                    <td>#{@boolean_hash[rule.create_access]}</td>
+                    <td>#{@boolean_hash[rule.read_access]}</td>
+                    <td>#{@boolean_hash[rule.update_access]}</td>
+                    <td>#{@boolean_hash[rule.delete_access]}</td>
                     <td>
                         <?r if !rule.user_id.nil? ?>
                         #{rule.user.name}
@@ -69,27 +72,31 @@
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @access_rules.respond_to?(:navigation) \
+        and @access_rules.page_count > 1
+          @access_rules.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('access_rules.messages.no_rules')}</p>
         <?r end ?>
-        
-        <div class="clearfix">
-            
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('access_rules.buttons.new'), 
-                  Users::Controller::AccessRules.r(:new)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @access_rules and !@access_rules.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('access_rules.buttons.delete')}" />
-            </div>
-            <?r end ?>
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{Users::Controller::AccessRules.a(
+              lang('access_rules.buttons.new'), :new
+            )}
+        </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@access_rules.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('access_rules.buttons.delete')}" />
         </div>
+        <?r end ?>
     </form>
 </article>

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

@@ -1,37 +1,47 @@
-#{
-  form_for(
-    @user_group, :method => :post, :action => @form_save_url, :id => :user_group_form
-  ) do |f|
-    f.input_hidden(:id, @user_group.id)
-    f.input_hidden(:csrf_token, get_csrf_token)
-  
-    f.input_text(
-      lang('user_groups.labels.name'), 
-      :name
-    )
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
 
-    f.input_text(
-      lang('user_groups.labels.slug'), 
-      :slug
-    )
+    #{
+    form_for(
+      @user_group,
+      :method => :post,
+      :action => Users::Controller::UserGroups.r(:save),
+      :id     => :user_group_form
+    ) do |f|
+      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.input_radio(
-      lang('user_groups.labels.super_group'), 
-      :super_group, 
-      @user_group.super_group,
-      :values => @boolean_hash,
-    )
-      
-    f.textarea(
-      lang('user_groups.labels.description'), 
-      :description, 
-      :rows => 10
-    )
-    
-    f.g.div(:class => 'clearfix') do
       f.g.div(:class => 'button') do
-        f.g.input(:type => 'submit', :value => lang('user_groups.buttons.save'))
+        f.g.input(
+          :type  => 'submit',
+          :value => lang('user_groups.buttons.save')
+        )
       end
     end
-  end
-}
+    }
+</article>

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

@@ -2,21 +2,20 @@
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
-    
-    <form method="post" action="#{@form_delete_url}">
+
+    <form method="post" action="#{Users::Controller::UserGroups.r(:delete)}">
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
-        
-        <?r if @user_groups and !@user_groups.empty? ?>
-        
-        <table class="table">
+
+        <?r if !@user_groups.empty? ?>
+        <table>
             <thead>
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
-                    <th>
+                    <th class="no_sort">
                         <input type="checkbox" />
                     </th>
                     <?r end ?>
-                    
+
                     <th>#{lang('user_groups.labels.id')}</th>
                     <th>#{lang('user_groups.labels.name')}</th>
                     <th>#{lang('user_groups.labels.slug')}</th>
@@ -28,49 +27,55 @@
                 <tr>
                     <?r if user_authorized?([:delete]) ?>
                     <td>
-                        <input type="checkbox" name="user_group_ids[]" value="#{group.id}" />
+                        <input type="checkbox" name="user_group_ids[]"
+                        value="#{group.id}" />
                     </td>
                     <?r end ?>
-                    
+
                     <td>#{group.id}</td>
-                    
-                    <?r if user_authorized?([:update]) ?>
                     <td>
-                        #{anchor_to(
-                          group.name, Users::Controller::UserGroups.r(:edit, group.id)
-                        )}
+                        #{
+                        if user_authorized?([:update])
+                          Users::Controller::UserGroups.a(
+                            group.name, :edit, group.id
+                          )
+                        else
+                          group.name
+                        end
+                        }
                     </td>
-                    <?r else ?>
-                    <td>#{group.name}</td>
-                    <?r end ?>
-                    
                     <td>#{group.slug}</td>
-                    <td>#{@boolean_hash.invert[group.super_group]}</td>
+                    <td>#{@boolean_hash[group.super_group]}</td>
                 </tr>
                 <?r end ?>
             </tbody>
         </table>
-        
+
+        #{
+        if @user_groups.respond_to?(:navigation) \
+        and @user_groups.page_count > 1
+          @user_groups.navigation
+        end
+        }
+
         <?r else ?>
         <p>#{lang('user_groups.messages.no_groups')}</p>
         <?r end ?>
-        
-        <div class="clearfix">
-            
-            <?r if user_authorized?([:create]) ?>
-            <div class="button">
-                #{anchor_to(
-                  lang('user_groups.buttons.new'), 
-                  Users::Controller::UserGroups.r(:new)
-                )}
-            </div>
-            <?r end ?>
-            
-            <?r if user_authorized?([:delete]) and @user_groups and !@user_groups.empty? ?>
-            <div class="button">
-                <input type="submit" value="#{lang('user_groups.buttons.delete')}" />
-            </div>
-            <?r end ?>
+
+        <?r if user_authorized?([:create]) ?>
+        <div class="button">
+            #{Users::Controller::UserGroups.a(
+              lang('user_groups.buttons.new'),
+              :new
+            )}
+        </div>
+        <?r end ?>
+
+        <?r if user_authorized?([:delete]) and !@user_groups.empty? ?>
+        <div class="button">
+            <input type="submit"
+            value="#{lang('user_groups.buttons.delete')}" />
         </div>
+        <?r end ?>
     </form>
 </article>

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

@@ -1,78 +1,87 @@
-#{
-  form_for(@user, :method => :post, :action => @form_save_url, :id => :user_form) do |f|
-    f.input_hidden(:csrf_token, get_csrf_token)
-    f.input_hidden(:id, @user.id)
-    
-    f.input_text(
-      lang('users.labels.name'), 
-      :name
-    )
+<article>
+    <header>
+        <h1>#{get_breadcrumbs}</h1>
+    </header>
 
-    f.input_text(
-      lang('users.labels.email'), 
-      :email
-    )
+    #{
+    form_for(
+      @user,
+      :method => :post,
+      :action => Users::Controller::Users.r(:save),
+      :id     => :user_form
+    ) do |f|
+      f.input_hidden(:csrf_token, get_csrf_token)
+      f.input_hidden(:id, @user.id)
 
-    f.input_text(
-      lang('users.labels.website'), 
-      :website
-    )
-      
-    f.input_password(
-      lang('users.labels.new_password'), 
-      :new_password
-    )
+      f.input_text(
+        lang('users.labels.name'),
+        :name
+      )
 
-    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.user_groups'), 
-      :user_group_pks, 
-      :values   => @user_group_pks,
-      :selected => @user.user_group_pks, 
-      :multiple => :multiple,
-      :size     => 1
-    )
+      f.input_text(
+        lang('users.labels.email'),
+        :email
+      )
 
-    f.select(
-      lang('users.labels.language'),
-      :language,
-      :values   => ::Zen::Language::Languages,
-      :selected => @user.language,
-      :size     => 1
-    )
+      f.input_text(
+        lang('users.labels.website'),
+        :website
+      )
 
-    f.select(
-      lang('users.labels.frontend_language'),
-      :frontend_language,
-      :values   => ::Zen::Language::Languages,
-      :selected => @user.frontend_language,
-      :size     => 1
-    )
+      f.input_password(
+        lang('users.labels.new_password'),
+        :new_password
+      )
 
-    f.select(
-      lang('users.labels.date_format'),
-      :date_format,
-      :values   => plugin(:settings, :get, 'date_format').values,
-      :selected => @user.date_format,
-      :size     => 1
-    )
+      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.user_groups'),
+        :user_group_pks,
+        :values   => @user_group_pks,
+        :selected => @user.user_group_pks,
+        :multiple => :multiple,
+        :size     => 1
+      )
+
+      f.select(
+        lang('users.labels.language'),
+        :language,
+        :values   => ::Zen::Language::Languages,
+        :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.date_format'),
+        :date_format,
+        :values   => plugin(:settings, :get, 'date_format').values,
+        :selected => @user.date_format,
+        :size     => 1
+      )
 
-    f.g.div(:class => 'clearfix') do
       f.g.div(:class => 'button') do
         f.g.input(:type => 'submit', :value => lang('users.buttons.save'))
       end
     end
-  end
-}
+    }
+</article>