Merge pull request #64 from tvdeyen/fontawesome

FontAwesome icons

Author: tvdeyen

app/assets/stylesheets/alchemy-devise/users.scss

@@ -5,38 +5,3 @@ form {
     width: 50%;
   }
 }
-
-.icon {
-
-  &.user {
-    background-position: 0 -104px;
-
-    &.female {
-      background-position: -128px -104px;
-    }
-  }
-
-  &.user_add {
-    background-position: -96px -104px;
-  }
-
-  &.user_delete {
-    background-position: -32px -104px;
-
-    &.female {
-      background-position: -160px -104px;
-    }
-  }
-
-  &.user_edit {
-    background-position: -64px -104px;
-
-    &.female {
-      background-position: -192px -104px;
-    }
-  }
-}
-
-span.module.users {
-  background-position: -80px 0;
-}

app/views/alchemy/admin/users/_user.html.erb

@@ -1,9 +1,18 @@
 <tr class="<%= cycle('even', 'odd') %>">
-  <td class="icon"><%= content_tag 'span', '', class: "icon user#{user.gender == 'female' ? ' female' : ' male'}" %></td>
-  <td>
-    <%= render_icon(user.logged_in? ? 'online' : 'offline') %>
+  <td class="icon">
+    <%= render_icon(:user, style: user.logged_in? ? 'solid' : 'regular') %>
+  </td>
+  <td class="login">
+  <% if can?(:edit, user) %>
+    <%= link_to_dialog user.login,
+      alchemy.edit_admin_user_path(user), {
+        title: Alchemy.t(:edit_user),
+        overflow: true,
+        size: '430x560'
+      },
+      title: Alchemy.t(:edit_user) %>
+  <% end %>
   </td>
-  <td class="login"><%= user.login %></td>
   <td class="name"><%= user.firstname %></td>
   <td><%= user.lastname %></td>
   <td class="email"><%= user.email %></td>
@@ -15,20 +24,17 @@
     <%= delete_button alchemy.admin_user_path(user), {
       message: Alchemy.t(:confirm_to_delete_user),
       title: Alchemy.t(:delete_user),
-      icon: "user_delete#{user.gender == 'female' ? ' female' : ' male'}"
+      icon: :minus
     } %>
   <% end %>
   <% if can?(:edit, user) %>
-    <%= link_to_dialog '',
+    <%= link_to_dialog render_icon(:edit),
       alchemy.edit_admin_user_path(user), {
         title: Alchemy.t(:edit_user),
         overflow: true,
         size: '430x560'
-      }, {
-        class: "icon user_edit#{user.gender == 'female' ? ' female' : ' male'}",
-        title: Alchemy.t(:edit_user)
-      }
-    %>
+      },
+      title: Alchemy.t(:edit_user) %>
   <% end %>
   </td>
 </tr>

app/views/alchemy/admin/users/index.html.erb

@@ -1,7 +1,7 @@
 <%= toolbar(
   buttons: [
     {
-      icon: 'user_add',
+      icon: :plus,
       label: Alchemy.t(:create_user),
       url: alchemy.new_admin_user_path,
       title: Alchemy.t(:create_user),
@@ -23,7 +23,6 @@
     <thead>
       <tr>
         <th class="icon"></th>
-        <th class="login_status"></th>
         <th class="login">
           <%= sort_link @query, :login, hide_indicator: true %>
         </th>

app/views/alchemy/user_sessions/new.html.erb

@@ -3,9 +3,11 @@
   <%= alchemy_form_for :user, url: {action: 'create'}, id: 'login' do |f| %>
     <%= f.input Devise.authentication_keys.first, autofocus: true %>
     <%= f.input :password %>
-    <p class="foot_note">
-      <%= link_to Alchemy.t('Forgot your password?'), new_password_path %>
-    </p>
+    <div class="input">
+      <small class="hint">
+        <%= link_to Alchemy.t('Forgot your password?'), new_password_path %>
+      </small>
+    </div>
     <div class="submit">
       <%= hidden_field_tag 'user_screensize' %>
       <button><%= Alchemy.t(:login) %></button>