zen 0.3 → 0.4

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

@@ -3,18 +3,19 @@
         <h1>#{get_breadcrumbs}</h1>
     </header>
 
-    <?r if !@user.id.nil? ?>
+    <?r if @user.exists? ?>
     <div class="tabs">
         <ul>
             <li>
-                <a href="#user_tab" title="#{lang('users.titles.edit')}">
+                <a href="#user_tab" class="icon user"
+                title="#{lang('users.titles.edit')}">
                     #{lang('users.titles.edit')}
                 </a>
             </li>
 
             <?r if user_authorized?(:show_permission) ?>
             <li>
-                <a href="#permissions"
+                <a href="#permissions" class="icon lock"
                 title="#{lang('permissions.titles.index')}">
                     #{lang('permissions.titles.index')}
                 </a>
@@ -24,95 +25,104 @@
     </div>
     <?r end ?>
 
-    #{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)
+    <div class="body">
+        #{form_for(
+          @user,
+          :method              => :post,
+          :action              => Users::Controller::Users.r(:save),
+          :id                  => :user_form,
+          :'data-autosave-url' => Users::Controller::Users.r(:autosave)
+        ) do |f|
+          f.input_hidden(:csrf_token, get_csrf_token)
+          f.input_hidden(:id, @user.id)
 
-      f.g.div(:id => 'user_tab') do
-        f.input_text(
-          lang('users.labels.name'),
-          :name,
-          :required  => :required,
-          :maxlength => 255
-        )
+          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,
-          :required  => :required,
-          :maxlength => 255
-        )
+            f.input_text(
+              lang('users.labels.email'),
+              :email,
+              :required  => :required,
+              :maxlength => 255
+            )
 
-        f.input_text(
-          lang('users.labels.website'),
-          :website,
-          :maxlength => 255
-        )
+            f.input_text(
+              lang('users.labels.website'),
+              :website,
+              :maxlength => 255
+            )
 
-        f.input_password(
-          lang('users.labels.password'),
-          :password,
-          :value => ''
-        )
+            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'),
-          :user_status_id,
-          :values   => Users::Model::UserStatus.dropdown,
-          :selected => @user.user_status_id,
-          :size     => 1
-        )
+            if user_authorized?(:edit_user_status)
+              f.select(
+                lang('users.labels.status'),
+                :user_status_id,
+                :values   => Users::Model::UserStatus.dropdown,
+                :selected => @user.user_status_id,
+                :size     => 1
+              )
+            end
 
-        f.input_checkbox(
-          lang('users.labels.user_groups'),
-          :user_group_pks,
-          @user.user_group_pks,
-          :values => @user_group_pks,
-        )
+            if user_authorized?(:assign_user_group)
+              f.input_checkbox(
+                lang('users.labels.user_groups'),
+                :user_group_pks,
+                @user.user_group_pks,
+                :values => @user_group_pks,
+              )
+            end
 
-        f.select(
-          lang('users.labels.language'),
-          :language,
-          :values   => ::Zen::Language.to_hash,
-          :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.to_hash,
-          :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   => get_setting(:date_format).values,
-          :selected => @user.date_format,
-          :size     => 1
-        )
-      end
+            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
+          if user_authorized?(:show_permission) and @user.exists?
+            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}
+          f.g.input(
+            :type  => 'submit',
+            :value => lang('users.buttons.save'),
+            :class => 'button'
+          )
+        end}
+    </div>
 </section>

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

@@ -1,82 +1,84 @@
 <section>
-    #{render_search_form(Users::Controller::Users.r(:index))}
-
-    <header>
+    <header class="with_search">
         <h1>#{get_breadcrumbs}</h1>
+
+        #{render_search_form(Users::Controller::Users.r(:index))}
     </header>
 
-    <form method="post" action="#{Users::Controller::Users.r(:delete)}">
-        <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
+    <div class="body">
+        <form method="post" action="#{Users::Controller::Users.r(:delete)}">
+            <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
-        <?r if !@users.empty? ?>
+            <?r if !@users.empty? ?>
 
-        <table>
-            <thead>
-                <tr>
-                    <?r if user_authorized?(:delete_user) ?>
-                    <th class="no_sort">
-                        <input type="checkbox" />
-                    </th>
-                    <?r end ?>
+            <table>
+                <thead>
+                    <tr>
+                        <?r if user_authorized?(:delete_user) ?>
+                        <th class="no_sort">
+                            <input type="checkbox" />
+                        </th>
+                        <?r end ?>
 
-                    <th>#{lang('users.labels.id')}</th>
-                    <th>#{lang('users.labels.name')}</th>
-                    <th>#{lang('users.labels.email')}</th>
-                    <th>#{lang('users.labels.status')}</th>
-                    <th>#{lang('users.labels.created_at')}</th>
-                    <th>#{lang('users.labels.updated_at')}</th>
-                    <th>#{lang('users.labels.last_login')}</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?r @users.each do |user| ?>
-                <tr>
-                    <?r if user_authorized?(:delete_user) ?>
-                    <td>
-                        <input type="checkbox" name="user_ids[]"
-                        value="#{user.id}" />
-                    </td>
-                    <?r end ?>
+                        <th>#{lang('users.labels.id')}</th>
+                        <th>#{lang('users.labels.name')}</th>
+                        <th>#{lang('users.labels.email')}</th>
+                        <th>#{lang('users.labels.status')}</th>
+                        <th>#{lang('users.labels.created_at')}</th>
+                        <th>#{lang('users.labels.updated_at')}</th>
+                        <th>#{lang('users.labels.last_login')}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?r @users.each do |user| ?>
+                    <tr>
+                        <?r if user_authorized?(:delete_user) ?>
+                        <td>
+                            <input type="checkbox" name="user_ids[]"
+                            value="#{user.id}" />
+                        </td>
+                        <?r end ?>
 
-                    <td>#{user.id}</td>
+                        <td>#{user.id}</td>
 
-                    <td>
-                        #{if user_authorized?(:edit_user)
-                          Users::Controller::Users.a(user.name, :edit, user.id)
-                        else
-                          user.name
-                        end}
-                    </td>
-                    <td>#{user.email}</td>
-                    <td>#{user.user_status_name}</td>
-                    <td>#{format_date(user.created_at)}</td>
-                    <td>#{format_date(user.updated_at)}</td>
-                    <td>#{format_date(user.last_login)}</td>
-                </tr>
-                <?r end ?>
-            </tbody>
-        </table>
+                        <td>
+                            #{if user_authorized?(:edit_user)
+                              edit_link(
+                                Users::Controller::Users.r(:edit, user.id),
+                                user.name
+                              )
+                            else
+                              user.name
+                            end}
+                        </td>
+                        <td>#{user.email}</td>
+                        <td>#{user.user_status_name}</td>
+                        <td>#{format_date(user.created_at)}</td>
+                        <td>#{format_date(user.updated_at)}</td>
+                        <td>#{format_date(user.last_login)}</td>
+                    </tr>
+                    <?r end ?>
+                </tbody>
+            </table>
 
-        #{if @users.respond_to?(:navigation) and @users.page_count > 1
-          @users.navigation
-        end}
+            #{render_pagination(@users)}
 
-        <?r else ?>
+            <?r else ?>
 
-        <p>#{lang('users.messages.no_users')}</p>
+            <p>#{lang('users.messages.no_users')}</p>
 
-        <?r end ?>
+            <?r end ?>
 
-        <?r if user_authorized?(:new_user) ?>
-        <div class="button">
-            #{Users::Controller::Users.a(lang('users.buttons.new'), :new)}
-        </div>
-        <?r end ?>
+            <?r if user_authorized?(:new_user) ?>
+            #{new_button(
+              Users::Controller::Users.r(:new),
+              lang('users.buttons.new')
+            )}
+            <?r end ?>
 
-        <?r if user_authorized?(:delete_user) and !@users.empty? ?>
-        <div class="button">
-            <input type="submit" value="#{lang('users.buttons.delete')}" />
-        </div>
-        <?r end ?>
-    </form>
+            <?r if user_authorized?(:delete_user) and !@users.empty? ?>
+            #{delete_button(lang('users.buttons.delete'))}
+            <?r end ?>
+        </form>
+    </div>
 </section>

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

@@ -3,35 +3,43 @@
         <h1>#{@page_title}</h1>
     </header>
 
-    #{form_for(
-      nil,
-      :method => :post,
-      :action => Users::Controller::Users.r(:login),
-      :id     => 'login_form'
-    ) do |f|
-      f.input_text(
-        lang('users.labels.email'),
-        :email,
-        :tabindex => 1
-      )
+    <div class="body">
+        #{form_for(
+          nil,
+          :method => :post,
+          :action => Users::Controller::Users.r(:login),
+          :id     => 'login_form'
+        ) do |f|
+          f.input_text(
+            lang('users.labels.email'),
+            :email,
+            :tabindex  => 1,
+            :autofocus => :autofocus,
+            :required  => :required
+          )
 
-      f.input_password(
-        lang('users.labels.password'),
-        :password,
-        :tabindex => 2
-      )
+          f.input_password(
+            lang('users.labels.password'),
+            :password,
+            :tabindex => 2,
+            :required => :required
+          )
 
-      f.g.div(:class => 'button') do
-        f.g.input(:type => :submit, :value => lang('users.buttons.login'))
-      end
+          f.g.input(
+            :type  => :submit,
+            :value => lang('users.buttons.login'),
+            :class => 'button'
+          )
 
-      if get_setting(:allow_registration).true?
-        f.g.a(
-          :href  => Users::Controller::Users.r(:register),
-          :title => lang('users.titles.login')
-        ) do
-          lang('users.titles.register')
-        end
-      end
-    end}
+          if get_setting(:allow_registration).true?
+            f.g.a(
+              :href  => Users::Controller::Users.r(:register),
+              :title => lang('users.titles.login'),
+              :class => 'button'
+            ) do
+              lang('users.titles.register')
+            end
+          end
+        end}
+    </div>
 </section>

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

@@ -14,19 +14,17 @@
         end ?>
 
         <li>
-        <input name="permissions[]" value="#{name}" id="permission_#{name}"
+            <input name="permissions[]" value="#{name}" id="permission_#{name}"
             type="checkbox" #{checked} /> #{title}
         </li>
         <?r end ?>
     </ul>
 
-    <div class="button allow">
-        <input type="button" value="#{lang('permissions.buttons.allow_all')}" />
-    </div>
+    <input type="button" class="button allow"
+    value="#{lang('permissions.buttons.allow_all')}" />
 
-    <div class="button deny">
-        <input type="button" value="#{lang('permissions.buttons.deny_all')}" />
-    </div>
+    <input type="button" class="button deny"
+    value="#{lang('permissions.buttons.deny_all')}" />
 </fieldset>
 
 <?r end ?>