zen 0.2.8 → 0.3b

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

@@ -1,4 +1,6 @@
-<article>
+<section>
+    #{render_search_form(Users::Controller::Users.r(:index))}
+
     <header>
         <h1>#{get_breadcrumbs}</h1>
     </header>
@@ -7,16 +9,18 @@
         <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
 
         <?r if !@users.empty? ?>
+
         <table>
             <thead>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?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>
@@ -27,7 +31,7 @@
             <tbody>
                 <?r @users.each do |user| ?>
                 <tr>
-                    <?r if user_authorized?([:delete]) ?>
+                    <?r if user_authorized?(:delete_user) ?>
                     <td>
                         <input type="checkbox" name="user_ids[]"
                         value="#{user.id}" />
@@ -37,59 +41,42 @@
                     <td>#{user.id}</td>
 
                     <td>
-                        #{
-                        if user_authorized?([:update])
-                          Users::Controller::Users.a(user.email, :edit, user.id)
+                        #{if user_authorized?(:edit_user)
+                          Users::Controller::Users.a(user.name, :edit, user.id)
                         else
-                          user.email
-                        end
-                        }
-                    </td>
-                    <td>
-                        #{lang("users.special.status_hash.#{user.status}")}
-                    </td>
-                    <td>
-                        #{user.created_at.strftime(session[:user].date_format)}
-                    </td>
-                    <td>
-                        #{
-                        if user.updated_at
-                          user.updated_at.strftime(session[:user].date_format)
-                        end
-                        }
-                    </td>
-                    <td>
-                        #{
-                        if user.last_login
-                          user.last_login.strftime(session[:user].date_format)
-                        end
-                        }
+                          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
+        #{if @users.respond_to?(:navigation) and @users.page_count > 1
           @users.navigation
-        end
-        }
+        end}
 
         <?r else ?>
+
         <p>#{lang('users.messages.no_users')}</p>
+
         <?r end ?>
 
-        <?r if user_authorized?([:create]) ?>
+        <?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?([:delete]) and !@users.empty? ?>
+        <?r if user_authorized?(:delete_user) and !@users.empty? ?>
         <div class="button">
             <input type="submit" value="#{lang('users.buttons.delete')}" />
         </div>
         <?r end ?>
     </form>
-</article>
+</section>

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

@@ -1,10 +1,9 @@
-<article>
+<section>
     <header>
         <h1>#{@page_title}</h1>
     </header>
 
-    #{
-    form_for(
+    #{form_for(
       nil,
       :method => :post,
       :action => Users::Controller::Users.r(:login),
@@ -25,6 +24,14 @@
       f.g.div(:class => 'button') do
         f.g.input(:type => :submit, :value => lang('users.buttons.login'))
       end
-    end
-    }
-</article>
+
+      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}
+</section>

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

@@ -0,0 +1,33 @@
+<?r Zen::Package::REGISTERED.each do |name, package| ?>
+<?r unless package.permissions.empty? ?>
+
+<fieldset class="package">
+    <legend>#{package.title}</legend>
+
+    <ul class="permissions">
+        <?r package.permissions.each do |name, title| ?>
+        <?r if @permissions.respond_to?(:include?) \
+        and @permissions.include?(name)
+          checked = 'checked="checked"'
+        else
+          checked = nil
+        end ?>
+
+        <li>
+        <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>
+
+    <div class="button deny">
+        <input type="button" value="#{lang('permissions.buttons.deny_all')}" />
+    </div>
+</fieldset>
+
+<?r end ?>
+<?r end ?>

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

@@ -0,0 +1,52 @@
+<section>
+    <header>
+        <h1>#{@page_title}</h1>
+    </header>
+
+    #{form_for(
+      @user,
+      :method => :post,
+      :action => Users::Controller::Users.r(:register),
+      :id     => :register_form
+    ) do |f|
+      f.input_text(
+        lang('users.labels.name'),
+        :name,
+        :required  => :required,
+        :maxlength => 255,
+        :tabindex  => 1
+      )
+
+      f.input_text(
+        lang('users.labels.email'),
+        :email,
+        :required  => :required,
+        :maxlength => 255
+      )
+
+      f.input_password(
+        lang('users.labels.password'),
+        :password,
+        :required => :required,
+        :value    => ''
+      )
+
+      f.input_password(
+        lang('users.labels.confirm_password'),
+        :confirm_password,
+        :required => :required,
+        :value    => ''
+      )
+
+      f.g.div(:class => :button) do
+        f.g.input(:type => :submit, :value => lang('users.buttons.register'))
+      end
+
+      f.g.a(
+        :href  => Users::Controller::Users.r(:login),
+        :title => lang('users.titles.login')
+      ) do
+        lang('users.titles.login')
+      end
+    end}
+</section>

data/lib/zen/package/users/migrations/1313786058_update_default_date.rb

@@ -0,0 +1,41 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    users = Zen.database[:users].all
+
+    drop_column(:users, :date_format)
+    add_column(:users, :date_format, String, :default => '%Y-%m-%d %H:%M:%S')
+
+    users.each do |user|
+      if user[:date_format] == '%Y-%m-%d %H:%I:%S'
+        format = '%Y-%m-%d %H:%M:%S'
+      else
+        format = user[:date_format]
+      end
+
+      Zen.database[:users] \
+        .filter(:id => user[:id]) \
+        .update(:date_format => format)
+    end
+  end
+
+  # Reverts the changes made in the up() block.
+  down do
+    users = Zen.database[:users].all
+
+    drop_column(:users, :date_format)
+    add_column(:users, :date_format, String, :default => '%Y-%m-%d %H:%I:%S')
+
+    users.each do |user|
+      if user[:date_format] == '%Y-%m-%d %H:%M:%S'
+        format = '%Y-%m-%d %H:%I:%S'
+      else
+        format = user[:date_format]
+      end
+
+      Zen.database[:users] \
+        .filter(:id => user[:id]) \
+        .update(:date_format => format)
+    end
+  end
+end

data/lib/zen/package/users/migrations/1316432327_permissions.rb

@@ -0,0 +1,36 @@
+Sequel.migration do
+  # Updates the database with the changes specified in the block.
+  up do
+    drop_table(:access_rules)
+
+    create_table(:permissions) do
+      String :permission, :null => false
+
+      # I'd love to use foreign keys here but I kept getting SQLite3 constraint
+      # warnings that made *zero* sense as the data was correct (manually
+      # inserting the data works just fine). Patches are welcome but do note
+      # that I don't consider this a very high priority.
+      Integer :user_id
+      Integer :user_group_id
+    end
+  end
+
+  # Reverts the changes made in the up() block.
+  down do
+    drop_table(:permissions)
+
+    create_table(:access_rules) do
+      String :package   , :null => false
+      String :controller, :null => false, :default => '*'
+
+      TrueClass :read_access,   :default => true,  :null => false
+      TrueClass :create_access, :default => false, :null => false
+      TrueClass :update_access, :default => false, :null => false
+      TrueClass :delete_access, :default => false, :null => false
+
+      # Not using real foreign keys as they can't be empty
+      Integer :user_id
+      Integer :user_group_id
+    end
+  end
+end

data/lib/zen/package/users/migrations/1320272365_status_ids.rb

@@ -0,0 +1,67 @@
+Sequel.migration do
+  up do
+    users = Zen.database[:users].all
+
+    create_table(:user_statuses) do
+      primary_key :id
+
+      String :name, :null => false
+      TrueClass :allow_login, :default => false
+    end
+
+    alter_table(:users) do
+      drop_column(:status)
+
+      add_foreign_key(
+        :user_status_id,
+        :user_statuses,
+        :on_delete => :cascade,
+        :on_update => :cascade,
+        :key       => :id
+      )
+    end
+
+    Zen.database[:user_statuses].insert_multiple([
+      {:name => 'active', :allow_login => true},
+      {:name => 'closed'}
+    ])
+
+    open   = Zen.database[:user_statuses].filter(:name => 'active').all[0]
+    closed = Zen.database[:user_statuses].filter(:name => 'closed').all[0]
+
+    # Migrate the existing statuses.
+    users.each do |user|
+      status = user[:status] == 'open' ? open[:id] : closed[:id]
+
+      Zen.database[:users] \
+        .filter(:id => user[:id]) \
+        .update(:user_status_id => status)
+    end
+  end
+
+  down do
+    users  = Zen.database[:users].all
+    open   = Zen.database[:user_statuses].filter(:name => 'active').all[0]
+    closed = Zen.database[:user_statuses].filter(:name => 'closed').all[0]
+
+    alter_table(:users) do
+      if Zen.database.adapter_scheme.to_s.include?('mysql')
+        drop_constraint(:users_ibfk_1, :type => :foreign_key)
+      end
+
+      drop_column(:user_status_id)
+      add_column(:status, String, :null => false, :default => 'open')
+    end
+
+    drop_table(:user_statuses)
+
+    # Put the old statuses back in place.
+    users.each do |user|
+      status = user[:user_status_id] == open[:id] ? 'open' : 'closed'
+
+      Zen.database[:users] \
+        .filter(:id => user[:id]) \
+        .update(:status => status)
+    end
+  end
+end

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

@@ -1,11 +1,3 @@
-@charset "UTF-8";
-
-/**
- * Buttons (such as those used for saving forms).
- *
- * @author Yorick Peterse
- * @since  0.1
- */
 .button
 {
     border:       1px solid #bbb;
@@ -13,7 +5,7 @@
     margin-right: 10px;
 }
 
-    .button a, .button input[type="submit"], .button button
+    .button a, .button input, .button button
     {
         background: #ddd;
         background: #ddd -webkit-gradient(linear, left bottom, left top,
@@ -40,12 +32,12 @@
         padding: 3px 5px;
     }
 
-    .button input[type="submit"]
+    .button input
     {
         padding: 5px 6px 6px 6px;
     }
 
-    .button a:active, .button input[type="submit"]:active, .button button:active
+    .button a:active, .button input:active, .button button:active
     {
         background: #eee -webkit-gradient(linear, left bottom, left top,
             from(#eee), to(#ddd));

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

@@ -1,12 +1,3 @@
-@charset "UTF-8";
-
-/**
- * CSS rules for the datepicker that ships with Zen. The datepciekr system can be found
- * here: https://github.com/arian/mootools-datepicker/
- *
- * @author Yorick Peterse
- * @since    0.2
- */
 .datepicker
 {
     background:    #fff;
@@ -14,11 +5,11 @@
     border:        5px solid #ddd;
     cursor:        move;
     display:       block;
-    height:        285px;
+    height:        295px;
     margin-top:    5px;
     padding:       5px;
     position:      absolute;
-    width:         270px;
+    width:         290px;
 
     -webkit-border-radius: 5px;
     -moz-border-radius:    5px;
@@ -35,9 +26,10 @@
         {
             font-size:  14px;
             margin:     0px auto;
-            padding:    10px 0px 5px 0px;
+            padding:    9px 0px 5px 0px;
             text-align: center;
         }
+
         .datepicker .header .title:hover
         {
             text-decoration: underline;
@@ -49,7 +41,7 @@
             display:    block;
             font-size:  24px;
             height:     10px;
-            padding:    2px 5px 5px 3px;
+            padding:    0px 5px 5px 3px;
             position:   absolute;
             top:        -1px;
             width:      10px;
@@ -161,3 +153,21 @@
             left: 80px;
             top:  55px;
         }
+
+    /* Resets various table elements in the datepicker */
+    .datepicker table
+    {
+        border: none;
+    }
+
+    .datepicker table td, .datepicker table th, .datepicker table thead
+    {
+        background:     none;
+        border-spacing: 0;
+        border:         none;
+    }
+
+    .datepicker table tr:hover
+    {
+        background: none;
+    }