citygate 0.0.7 → 0.0.8

data/app/controllers/citygate/admin/users_controller.rb

@@ -31,4 +31,11 @@ class Citygate::Admin::UsersController < Citygate::Admin::ApplicationController
       redirect_to :action => 'edit'
     end
   end
+
+  def destroy
+    @user = Citygate::User.find(params[:id])
+    @user.destroy
+
+    redirect_to admin_users_path
+  end
 end

data/app/models/citygate/user.rb

@@ -15,7 +15,7 @@ module Citygate
     devise  :encryptor => :sha1
     # @!endgroup
 
-    attr_accessible :first_name, :last_name, :email, :password, :password_confirmation, :remember_me, :confirmed_at
+    attr_accessible :first_name, :last_name, :email, :password, :password_confirmation, :remember_me, :confirmed_at, :role_id
 
     has_many :authorizations, :dependent => :destroy
     belongs_to :role

data/app/views/citygate/admin/users/index.html.erb

@@ -1,14 +1,24 @@
-<div id="users">
-  <% @users.each do |user| %>
-    <div class="user">
-      <span class="email"><%= user.email %></span>
-      <%= content_tag(:span, user.full_name) if user.full_name %>
-      <div class="user-links">
-        <%= link_to t('admin.users.index.show_link'), admin_user_path(user), :class => "show-link" %>
-        <%= link_to t('admin.users.index.edit_link'), edit_admin_user_path(user), :class => "edit-link" if can? :update, user %>
-      </div>
-    </div>
-  <% end %>
+<h1><%= t('admin.users.index.title') %></h1>
 
-  <%= will_paginate @users %>
-</div>
+<table class='list'>
+  <thead>
+    <tr>
+      <th><%= t('admin.users.show.first_name') %></th>
+      <th><%= t('admin.users.show.last_name') %></th>
+      <th><%= t('admin.users.show.email') %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.first_name %></td>
+        <td><%= user.last_name %></td>
+        <td><%= truncate(user.email, length: 25) %></td>
+        <td><i class='icon-pencil'></i><%= link_to t('admin.users.index.edit_link'), edit_admin_user_path(user) %><i class='icon-trash'></i><%= link_to t('admin.users.index.delete_link'), admin_user_path(user), confirm: t('admin.actions.confirm'), :method => :delete, class: 'danger' if can? :update, user %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate @users %>

data/app/views/citygate/shared/_navigation.html.erb

@@ -1,7 +1,7 @@
 <nav>
   <ul>
     <% if user_signed_in? %>
-      <% if can?(:manage, Citygate::User) and !params[:controller]["admin"]  %>
+      <% if can?(:manage, Citygate::User) %>
         <li><i class='icon-cog'></i><%= link_to t('navigation.links.admin'), citygate.admin_users_path %></li>
       <% end %>
 
@@ -12,7 +12,9 @@
       <li><%= link_to t('navigation.links.sign_up'), citygate.new_user_registration_path %></li>
 
       <% Citygate::User.omniauth_providers.each do |provider| %>
-        <li><%= link_to t('navigation.links.omniauth', provider: provider.to_s.titleize), "/users/auth/#{provider.to_s}", :id => "#{provider.to_s}" %></li>
+        <% if provider != "facebook" %>
+          <li><%= link_to t('navigation.links.omniauth', provider: provider.to_s.titleize), "/users/auth/#{provider.to_s}", :id => "#{provider.to_s}" %></li>
+        <% end %>
       <% end -%>
     <% end %>
   </ul>

data/config/locales/views/admin/users/en.yml

@@ -2,11 +2,15 @@ en:
   admin:
     users:
       index:
+        title: "Users"
         show_link: "Show"
         edit_link: "Edit"
+        delete_link: "Delete"
       show:
         labels:
           name: "Name"
+          first_name: "First name"
+          last_name: "Last name"
           email: "Email"
       edit:
         title: "Edit Profile"
@@ -25,8 +29,9 @@ en:
     label:
       user:
         name: "Name"
+        first_name: "First name"
+        last_name: "Last name"
         email: "Email"
         password: "Password"
         password_confirmation: "Password Confirmation"
         current_password: "Current Password"
-          

data/lib/citygate/engine.rb

@@ -27,7 +27,7 @@ module Citygate
     # Accepts the same options as will_paginate and uses
     # them in the backend
     mattr_accessor :will_paginate_options
-    @@will_paginate_options = {per_page: 1}
+    @@will_paginate_options = {per_page: 10}
     
     # If the mount path of citygate in the app changes,
     # this must change

data/lib/citygate/version.rb

@@ -1,3 +1,3 @@
 module Citygate
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: citygate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Group Buddies
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-17 00:00:00 Z
+date: 2012-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -468,7 +468,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4134967999806487145
+      hash: 2053322453284048139
       segments: 
       - 0
       version: "0"
@@ -477,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4134967999806487145
+      hash: 2053322453284048139
       segments: 
       - 0
       version: "0"