fullstack-admin 0.2.1 → 0.2.2

data/TODO.tasks

@@ -2,7 +2,8 @@
 = Fullstack Admin Roadmap =
 ===========================
 
-- Fix positionable/_collection.html.erb not working
+- Fix assets compilation issues (and lock assets-related gems to working versions only)
+✓ Fix positionable/_collection.html.erb not working
 
 - Has many nested:
   has_many_nested = has_many + accepts_nested_attributes_for + :allow_destroy => true [CORE]
@@ -33,17 +34,17 @@
 
 ✓ Ckeditor: upload assets to S3 according to app.config 
 
-- Localizable models
-    - Create Localized module: a model is localizable if has a :locale field (cms?)
-    - Add a scope to Localized to find models within the current locale (cms?)
+✓ Localizable models
+    ✓ Create Localized module: a model is localizable if has a :locale field (cms?)
+    ✓ Add a scope to Localized to find models within the current locale (cms?)
     
-    - Create an option to specify the admin_locale
-    - add a before filter to Admin::BaseController that uses the default locale for the admin
-    - Split localized models index into tabs (either through ajax?)
-    - Let the programmer decide a default locale and a set of available locales
-    - Translations for locale codes
+    ✓ Create an option to specify the admin_locale
+    ✓ add a before filter to Admin::BaseController that uses the default locale for the admin
+    ✓ Split localized models index into tabs (either through ajax?)
+    ✓ Let the programmer decide a default locale and a set of available locales
+    ✓ Translations for locale codes
     
-- Form for accepts_nested_attributes_for and has_one 
+- Form for accepts_nested_attributes_for and has_one (NOT TESTED?)
 - Optional tracking of author/updaters for every model (CMS?)
 
 ==================
@@ -55,9 +56,9 @@
   - find alternative to sortable
   
 - Multiple scopes
-- Tags input with chosen
+- Tags input with select2
 
-- Alternated fields:
+- Conditional fields and Virtual Fields:
   = Group of fields that can be setted exclusively
   = eg
   = field :age
@@ -65,5 +66,10 @@
 
   = virtual_field :link_method, :in => %W(page external)
 
-  = belongs_to :related_page, :meaningful_if => :link_method.eq("page") 
-  = field :url,               :meaningful_if => :link_method.eq("external")
+  = belongs_to :related_page, :meaningful_when => :link_method.eq("page") 
+  = field :url,               :meaningful_when => :link_method.eq("external")
+
+- Validation DSL
+  = field :name,  :string,   :required
+  = field :email, :required, :unique
+  

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/app/assets/stylesheets/admin/base.css

@@ -1,4 +1,5 @@
 /*
+*= require admin/login
 *= require support/base
 *= require support/bootstrap
 *= require support/forms
@@ -13,15 +14,113 @@
  }
 }
 
+input {
+-moz-box-sizing: border-box;
+-webkit-box-sizing: border-box;
+box-sizing: border-box;
+width: 100%;
+height: auto !important;
+}
+
+/* ========= */
+/* = Icons = */
+/* ========= */
+
+.icon-white, .nav-tabs > .active > a > [class^="icon-"], .nav-tabs > .active > a > [class*=" icon-"], .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], .nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class*=" icon-"], .navbar-inverse .nav > .active > a > [class^="icon-"], .navbar-inverse .nav > .active > a > [class*=" icon-"], .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"] {
+background-image: url("/img/glyphicons-halflings-white.png");
+}
+
+/* ========== */
+/* = Navbar = */
+/* ========== */
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: white;
+  border-bottom-color: white;
+}
+
+.navbar-inner {
+     background: #3993ba;
+     background: -moz-linear-gradient(top, #3993ba 0%, #067ead 100%);
+     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3993ba), color-stop(100%,#067ead));
+     background: -webkit-linear-gradient(top, #3993ba 0%,#067ead 100%);
+     background: -o-linear-gradient(top, #3993ba 0%,#067ead 100%);
+     background: -ms-linear-gradient(top, #3993ba 0%,#067ead 100%);
+     background: linear-gradient(top, #3993ba 0%,#067ead 100%);
+     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3993ba', endColorstr='#067ead',GradientType=0 );
+     -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+     box-shadow: none;
+
+ }
+
+ .navbar .nav > li > a {
+     color: #c1dce7;
+ }
+
+ .navbar .nav > li:hover > a {
+     color:#fff;
+ }
+
+ .navbar .nav .active > a, .navbar .nav .active > a:hover, .navbar .nav li.dropdown.open > .dropdown-toggle {
+     background: #206484;
+     color: #fff;
+ }
+
+ .navbar .divider-vertical {
+     background-color:#2078A1;
+     border-color:#3497C2;
+ }
+ 
+ .navbar .divider-vertical {
+ border-left-color: #2078A1;
+ border-right-color: #3497C2;
+ }
+ 
+ .dropdown-menu li > a:hover, .dropdown-menu .active > a,
+ .dropdown-menu .active > a:hover,
+ .nav-list > .active > a, .nav-list > .active > a:hover {
+     background: #48a6d2 !important;
+ }
+
+.table thead th {background-color:#ebf2f6 !important}
+.dataTables_wrapper th.sorting_asc,.dataTables_wrapper th.sorting_desc {background-color:#d4e3eb !important}
+
+
 #left-aside .nav {
   padding-bottom: 180px;
 }
 
+.navbar .nav > li > a {
+padding-top: 10px;
+}
+.navbar .nav > li > a {
+text-shadow: none;
+padding: 9px 10px 11px;
+}
+.navbar .nav > li > a {
+color: #C1DCE7;
+}
+
+.navbar .brand {
+  width: 200px;
+  font: 100 16px/16px 'PT Sans', sans-serif;
+  text-decoration: none;
+  color: #c1dce7;
+  text-shadow: none;
+  padding: 10px 20px 0;
+}
+
+.navbar .brand:hover {
+  color: #fff;
+}
+
 .sidenav > li:first-child {
 -webkit-border-radius: 6px 6px 0 0;
 -moz-border-radius: 6px 6px 0 0;
 border-radius: 6px 6px 0 0;
 }
+
 .sidenav > li {
 display: block;
 margin: 0 0 -1px;
@@ -31,7 +130,6 @@ margin-left: -15px;
 margin-right: -15px;
 }
 
-
 .thumbnails > li {
   float: left;
   margin-left: 0 !important;
@@ -58,4 +156,217 @@ margin-right: -15px;
   background: url(/assets/iconic/gray/magnifying_glass_12x12.png) no-repeat left center;
   margin-left: 7px !important;
   padding-left: 12px !important;
+}
+
+/* ======= */
+/* = Box = */
+/* ======= */
+
+.box {
+  -webkit-box-shadow: 0px 1px 2px 0px #EFEFEF;
+  -moz-box-shadow: 0px 1px 2px 0px #EFEFEF;
+  box-shadow: 0px 1px 2px 0px #EFEFEF;
+  margin-bottom: 20px;
+}
+
+.box-header, .box-content, .box-footer {
+  padding: 20px;
+}
+
+.box-header {
+  height: 32px;
+  line-height: 32px;
+  border: 1px solid #DDD;
+  padding: 0 10px;
+  background: #FBFBFB;
+  background: -moz-linear-gradient(top, #FBFBFB 0%, #F1F1F1 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FBFBFB), color-stop(100%,#F1F1F1));
+  background: -webkit-linear-gradient(top, #FBFBFB 0%,#F1F1F1 100%);
+  background: -o-linear-gradient(top, #FBFBFB 0%,#F1F1F1 100%);
+  background: -ms-linear-gradient(top, #FBFBFB 0%,#F1F1F1 100%);
+  background: linear-gradient(top, #FBFBFB 0%,#F1F1F1 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fbfbfb', endColorstr='#f1f1f1',GradientType=0 );
+  font-weight: 700;
+  color: #666;
+  font-size: 11px;
+}
+
+
+.box-content {
+  padding: 10px;
+  border: 1px solid #DDD;
+  border-top: none;  
+}
+
+.box-content:last-child {
+margin-bottom: 0;
+padding-bottom: 0;
+}
+
+.box-footer {
+  border: 1px solid #DDD;
+  padding: 8px 10px;
+  background: #F1F1F1;
+  border-top: none;
+}
+
+.box-footer.align-right {
+  text-align: right;
+}
+
+fieldset.box-content {
+  padding-top: 20px;
+}
+
+/* ========== */
+/* = Layout = */
+/* ========== */
+
+a, button, input {
+outline: none !important;
+}
+
+a {
+color: #08C;
+text-decoration: none;
+}
+
+body {
+  padding-top: 60px;
+}
+
+.main {
+  background: white;
+  border-left: 1px solid transparent;
+  margin-left: 240px;
+}
+
+
+/* =============== */
+/* = Page Header = */
+/* =============== */
+
+.resource_updated_at {
+font: italic 12px/32px Arial, Helvetica, sans-serif;
+color: #888;
+}
+
+.page-header h1, h1.page-header{
+  line-height: 34px;
+  font-size: 18px;
+  margin-top: 0;
+}
+.page-header h1 {
+  margin-bottom: 0;
+}
+
+#center > .page-header {
+  margin-top: 0;
+  margin-bottom: 20px;
+  padding: 0;
+}
+
+.index-actions {
+  float:right;
+}
+
+
+/* =========== */
+/* = Sidebar = */
+/* =========== */
+
+.sidebar {
+position: fixed;
+top: 40px;
+left: 0;
+margin-left: 0;
+padding-top: 20px;
+width: 240px;
+background: #f1f1f1;
+border-right: 1px solid #ccc;
+height: 100%;
+font: 13px/18px "Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+
+.sidebar .accordion {
+border-top: 1px solid #CCC;
+margin-bottom: 20px;
+}
+
+.sidebar .accordion-heading a:hover {
+background-color: #CFCFCF;
+}
+
+.sidebar .accordion-heading {
+text-shadow: 1px 1px 0 #EFEFEF;
+background: #E0E0E0;
+-webkit-box-shadow: inset 0px 1px 0px 0px #ECECEC;
+box-shadow: inset 0px 1px 0px 0px #ECECEC;
+}
+
+.sidebar .accordion-inner {
+border-top: 1px solid #CCC;
+background: #FAFAFA;
+}
+
+.sidebar .accordion-group .accordion-heading a {
+  color: #222;
+}
+
+.sidebar .accordion-group .active a {
+color: white;
+}
+
+.nav-list > li > a, .dropdown-menu li a {
+-webkit-border-radius: 4px;
+-moz-border-radius: 4px;
+-ms-border-radius: 4px;
+border-radius: 4px;
+}
+
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover, .nav-list > .active > a, .nav-list > .active > a:hover {
+background: #48A6D2 !important;
+}
+
+.nav > li > a:hover {
+text-decoration: none;
+background-color: #EEE;
+}
+
+.sidebar .accordion-group a {
+color: #222;
+text-decoration: none!important;
+}
+
+.sidebar .accordion-group {
+-webkit-border-radius: 0;
+-moz-border-radius: 0;
+border-radius: 0;
+margin-bottom: 0;
+border-color: #CCC;
+border-style: solid;
+border-width: 0 0 1px;
+}
+
+.accordion-heading .accordion-toggle {
+display: block;
+padding: 7px 15px;
+}
+
+.accordion-toggle {
+-webkit-transition: background-color 0.2s ease-in-out;
+-moz-transition: background-color 0.2s ease-in-out;
+-o-transition: background-color 0.2s ease-in-out;
+transition: background-color 0.2s ease-in-out;
+}
+.accordion-toggle {
+cursor: pointer;
+}
+
+/* ================ */
+/* = Filter Input = */
+/* ================ */
+
+.filter-inputs {
+  margin: 0;
 }

data/app/assets/stylesheets/admin/login.css

@@ -0,0 +1,54 @@
+.login-box {
+  width: 380px;
+  margin: auto;
+  padding: 0;
+  position: relative;
+  top: 50%;
+  background: white;
+  border: 1px solid #CCC;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  -ms-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 0 6px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 0 6px rgba(0,0,0,0.2);
+  -ms-box-shadow: 0 0 6px rgba(0,0,0,0.2);
+  box-shadow: 0 0 6px rgba(0, 0, 0, 0.2);
+}
+
+.login-box-header, .login-box-content, .form-actions.login-box-footer {
+padding: 20px;
+margin: 0;
+}
+
+.login-box-header {
+text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
+font: 100 18px/42px 'PT Sans', sans-serif;
+height: 42px;
+padding: 0 20px;
+background: #E0E0E0;
+border-bottom: 1px solid #CCC;
+-moz-border-radius-topleft: 6px;
+-moz-border-radius-topright: 6px;
+-moz-border-radius-bottomright: 0px;
+-moz-border-radius-bottomleft: 0px;
+-webkit-border-radius: 6px 6px 0px 0px;
+border-radius: 6px 6px 0px 0px;
+font-size: 15px;
+}
+
+.login-box input[type="text"], .login-box input[type="password"] {
+  width: 298px;
+}
+
+.login-box-footer {
+  padding: 12px 20px;
+  border-top: 1px solid #E7E7E7;
+  background: #F7F7F7;
+  -moz-border-radius-topleft: 0px;
+  -moz-border-radius-topright: 0px;
+  -moz-border-radius-bottomright: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -webkit-border-radius: 0px 0px 6px 6px;
+  border-radius: 0px 0px 6px 6px;
+}

data/app/assets/stylesheets/support/bootstrap-workarounds.css

@@ -8,7 +8,7 @@
 .badge.badge-mini {
 	padding: 0 5px;
 	font-size: 9px;
-	display: inline-block;}
+	display: inline-block;
 	line-height: 18px;
 }
 

data/app/controllers/admin/base_controller.rb

@@ -1,17 +1,13 @@
 class Admin::BaseController < ApplicationController
-  rescue_from Checkin::AccessDenied, :with => :rescue_access_denied
-
+  before_filter :require_login
+  before_filter :fetch_current_resource
+  
   layout 'admin'
-  authorize(:scope => :admin)
 
   protected
 
-  def rescue_access_denied
-    if subject.guest?
-      redirect_to new_admin_session_path
-    else
-      render :text => "Not Authorized", :status => 403
-    end
+  def not_authenticated
+    redirect_to new_admin_session_url, :alert => "First login to access this page."
   end
   
   class << self
@@ -27,19 +23,24 @@ class Admin::BaseController < ApplicationController
                 :current_resource_class,
                 :current_resource, 
                 :current_collection,
-                :title_column
+                :title_column,
+                :subject
 
 
+  def subject
+    @subject ||= ::Admin::SubjectModelAdapter.new(current_user)
+  end
+
   def current_resource_class
-    @current_resource_class ||= controller_name.singularize.camelize.constantize
+    @current_resource_class ||= controller_name.singularize.camelize.constantize rescue nil
   end
   
   def resource_name
-    current_resource_class.name.demodulize.underscore
+    current_resource_class && current_resource_class.name.demodulize.underscore
   end
   
   def collection_name
-    resource_name.pluralize
+    resource_name.try(:pluralize)
   end
 
   alias :singular_name :resource_name
@@ -59,5 +60,9 @@ class Admin::BaseController < ApplicationController
     @_title_columns[model] ||= ( model.column_names.map{ |c| c.to_s } & %W(title name label browser_title seo_title seo_name key claim email) ).first
   end
   
+  def fetch_current_resource
+    return if !params[:id] || current_resource 
+    instance_variable_set("@#{resource_name}", current_resource_class.find(params[:id]))
+  end
   
-end
+end

data/app/controllers/admin/sessions_controller.rb

@@ -1,19 +1,27 @@
 class Admin::SessionsController < ApplicationController
-  layout 'admin'
+  layout 'login'
+  
+  def new
+    @user = Superuser.new
+  end
   
   def create
-    user = login(params[:email], params[:password], params[:remember_me])
-    if user
-      redirect_back_or_to root_url, :notice => "Logged in!"
-    else
-      flash.now.alert = "Email or password was invalid"
-      render :new
+    respond_to do |format|
+      if @user = login(params[:username],params[:password])
+        format.html { redirect_back_or_to("/", :notice => I18n.t("signed_in", :scope => "fullstack.admin", :default  => 'Signed in successfully.')) }
+        format.xml { render :xml => @user, :status => :created, :location => @user }
+      else
+        format.html { flash.now[:alert] = I18n.t("login_failed", :scope => "fullstack.admin", :default  => 'Login failed.'); render :action => "new" }
+        format.xml { render :xml => @user.errors, :status => :unprocessable_entity }
+      end
     end
   end
-
+    
   def destroy
     logout
-    redirect_to root_url, :notice => "Logged out!"
+    redirect_to("/", :notice => I18n.t("signed_out", :scope => "fullstack.admin", :default  => 'Signed out successfully.'))
   end
 
-end
+end
+
+

data/app/controllers/admin/subject_model_adapter.rb

@@ -0,0 +1,57 @@
+class Admin::SubjectModelAdapter
+  attr_accessor :subject_model
+  
+  def initialize(subject_model)
+    @subject_model = subject_model
+  end
+  
+  def guest?
+    !subject_model
+  end
+  
+  def logged_in?
+    !!subject_model
+  end
+  
+  def owner?(object)
+    object && ( object.respond_to?(:author) && ( subject_model == object.author ) ) ||  ( object.respond_to?(:owner) && ( subject_model == object.owner ) )
+  end
+  alias :own? :owner?
+  
+  def administrator?
+    true
+  end
+  
+  def can?(*args)
+    true
+  end
+  
+  def can_edit?(*args)
+    true
+  end
+  
+  def can_create?(*args)
+    true
+  end
+  
+  def can_destroy?(*args)
+    true
+  end
+  
+  def can_new?(*args)
+    true
+  end
+  
+  def can_update?(*args)
+    true
+  end
+
+  def can_sort?(*args)
+    true
+  end
+  
+  def can_show?(*args)
+    true
+  end
+  
+end

data/app/models/superuser.rb

@@ -1,12 +1,6 @@
 class Superuser < ActiveRecord::Base
   authenticates_with_sorcery!
-  
-  attr_accessible :email, :password, :password_confirmation
-
-  validates_confirmation_of :password
-  validates_presence_of :password, :on => :create
-  validates_presence_of :email
-  validates_uniqueness_of :email
-  field :email
-  field :password
-end
+  def has_role?(r)
+    true
+  end
+end

data/app/views/admin/_nav.html.erb

@@ -1,13 +1,15 @@
-<% content_for :menu do -%>
+<% content_for :menu do -%>  
+
+  <%= nav(:class => 'float right') do %>
+  <li class="divider-vertical">
+  </li>
   
-  <%= nav do %>
-  <%= nav_item t('fullstack.admin.dashboard', :default => "Dashboard"), admin_root_path, :icon => "cog"  %>
-  <% end %>
+  <%= nav_item t('fullstack.admin.homepage', :default => "Homepage"), "/", :icon => "globe", :"icon_color" => :white %>
+  <li class="divider-vertical">
+  </li>
   
-  <%= nav(:class => 'float right') do %>
-  <%= nav_item t('fullstack.admin.homepage', :default => "Homepage"), "/", :icon => "home" %>
-    <%= dropdown_nav_item t('fullstack.admin.account', :default => "Account"), :icon => "user" do %>
-        <%= nav_item t('fullstack.admin.logout', :default => "Logout"), destroy_user_session_path, :method => :delete %>
+    <%= dropdown_nav_item t('fullstack.admin.account', :default => "Account"), :icon => "user", :"icon_color" => :white do %>
+        <%= nav_item t('fullstack.admin.logout', :default => "Logout"), admin_sessions_path, :method => :delete %>
     <% end %>
   <% end %>
   
@@ -15,19 +17,34 @@
 
 <% content_for :nav do -%>
 
-  <div class="tabbable tabs-left float right">
-    <%= nav_list :class => "nav-tabs" do %>
 
-    <% Fullstack::Admin.resources.each do |rog| %>
-        <% if rog.type == :group %> 
-        <%= nav_header t("fullstack.admin.groups.#{rog.name}", :default => rog.name.to_s.humanize) %>
-          
-        <% elsif rog.type == :resource %>
-          <%= nav_item t("fullstack.admin.resources.#{rog.name}", :default => rog.name.to_s.humanize), [:admin, rog.name] %>
-        <% end %>
-    <% end %>
-
-    <% end %>
-  </div>
+<div class="sidebar">
+	<div class="sidebar-inner">
+		<div class="accordion sidebar-accordion" id="sidebar-accordion">						
+      <% i = 0 %>
+      <% Fullstack::Admin.grouped_resources.each do |group, resources| %>
+			<div class="accordion-group">
+				<div class="accordion-heading">
+					<a href="#sidebar_group_collapsable_<%= i+=1 %>" data-parent="#sidebar-accordion" data-toggle="collapse" class="accordion-toggle">
+						<i class="icon-<%= group.icon %>"></i> <%= t("fullstack.admin.groups.#{group.name}", :default =>  group.name.to_s.humanize) %>
+					  <% if resources.map(&:name).include?(plural_name) %>
+            <i class="icon-chevron-left float right" style="opacity: 0.4;"></i>
+            <% end %>
+          </a>
+				</div>
+				<div class="accordion-body collapse <%= resources.map(&:name).include?(plural_name) ? 'in' : '' %>" id="sidebar_group_collapsable_<%= i %>">
+					<div class="accordion-inner">
+						<ul class="nav nav-list">
+              <% resources.each do |resource| %>
+               <%= nav_item t("fullstack.admin.resources.#{resource.name}", :default => resource.name.to_s.humanize), [:admin, resource.name] %> 
+              <% end %>
+						</ul>
+					</div>
+				</div>
+			</div>
+      <% end %>
+		</div>
+	</div>
+</div>
 
-<% end -%>
+<% end %>

data/app/views/admin/base/index.html.erb

@@ -1,10 +1,43 @@
+<div class="page-header">
+  <% unless partial?('collection')%>
+  <div class="mb1 index-actions">
+  	<% if subject.can_create?(collection_name) && controller.action_methods.include?("new") %>
+      <%= button t('fullstack.admin.new', :default => "New"), 
+                 send("new_admin_#{resource_name}_path"),
+                 :type => :primary, :icon => :plus, :icon_color => :white %>
+  	<% end %>
+  
+    <% if subject.can_sort?(collection_name) && positionable?(current_collection.klass) %>
+    <%= button t('fullstack.admin.sort', :default => "Sort"), 
+                 send("admin_positionables_path", :type => resource_name)
+                 %>
+  
+    <% end %>
+  
+    <%= button t('fullstack.admin.delete', :default => "Delete"), 
+               'javascript:void(0)', :class => "toggle-delete",
+               :icon => :trash %>
+  </div>
+  
+  <% end %>
+
+<h1>
 <% if content_for?(:title) %>
-  <div class="page-header"><h1><%= yield(:title)  %></h1></div>
+  <%= yield(:title)  %>
+
 <% elsif @title %>
-  <div class="page-header"><h1><%= @title %></h1></div>
+
+  <%= @title %>
+
 <% else -%>
-  <div class="page-header"><h1><%= t(collection_name, :scope => "fullstack.admin.resources") %></h1></div>
+  
+  <%= t(collection_name, :scope => "fullstack.admin.resources") %>
+
 <% end -%>
+</h1>
+
+
+</div>
 
 <% if partial?('collection') %>
   <%= render :partial => "collection", 
@@ -15,24 +48,7 @@
   %>
 <% else %>
 
-<div class="mb1">
-	<% if subject.can_create?(collection_name) && controller.action_methods.include?("new") %>
-    <%= button t('fullstack.admin.new', :default => "New"), 
-               send("new_admin_#{resource_name}_path"),
-               :type => :primary, :icon => :plus, :icon_color => :white %>
-	<% end %>
-  
-  <% if subject.can_sort?(collection_name) && positionable?(current_collection.klass) %>
-  <%= button t('fullstack.admin.sort', :default => "Sort"), 
-               send("admin_positionables_path", :type => resource_name)
-               %>
-  
-  <% end %>
-  
-  <%= button t('fullstack.admin.delete', :default => "Delete"), 
-             'javascript:void(0)', :class => "toggle-delete",
-             :icon => :trash %>
-</div>
+
 
 
 <table class="table table-bordered table-striped index-table">
@@ -56,16 +72,18 @@
 <% content_for :aside do -%>
 
 <% if (!@skip_filter) && (partial?('filter') || title_column(current_resource_class) || has_timestamps?(current_resource_class)) %>
-  	<div class="well">
-      <div class="mb1">
-        <h4><%= t('fullstack.admin.filter', :default => "Filter") %></h4>
+  	<div class="box">
+      <div class="box-header">
+        <%= t('fullstack.admin.filter', :default => "Filter") %>
       </div>
+        
   		<%= admin_form_for @search, :url => self.send("admin_#{collection_name}_path") , :html => {:method => :get} do |f| %>
+      <div class="box-content">
 
       <% if partial?('filter') %>
         <%= render :partial => "filter", :locals => {:f => f} %>
       <% else %>
-        <%= f.inputs do %>
+        <%= f.inputs :class => "filter-inputs"  do %>
 
         <% if tc = title_column(current_resource_class) %>
             <%=  f.input :"#{tc}_contains" %>
@@ -78,9 +96,10 @@
         <% end %>
 
       <% end %>
-        <%= f.actions do %>
-          <%= f.action t('fullstack.admin.filter', :default => "Filter"), :as => :button %>
-        <% end %>
+      </div>
+      <div class="box-footer align-right">
+        <%= f.action t('fullstack.admin.filter', :default => "Filter"), :as => :button %>
+      </div>
   		<% end %>
   	</div>
   <% end %>

data/app/views/admin/sessions/new.html.erb

@@ -0,0 +1,34 @@
+<%= form_tag admin_sessions_path, :method => :post, :class => "login-box" do %>
+  <div class="login-box-header">
+    Login
+  </div>
+  <div class="login-box-content">
+    
+    <% [:notice, :error, :alert].each do |sym| %>
+
+        <% if flash[sym].present? %>
+          <div class="alert  alert-info alert-login ">
+            <%= flash[sym] %>
+          </div>
+          <% flash.discard(sym) %>
+        <% end %>
+  
+    <% end %>
+
+
+    <div class="input-prepend">
+    	<span class="add-on"><i class="icon-user"></i></span>
+      <%= text_field_tag :username, nil, :placeholder => I18n.t("username", :scope => "helpers.label", :default => "Username") %>            
+    </div>
+
+    <div class="input-prepend">
+    	<span class="add-on"><i class="icon-lock"></i></span>
+      <%= password_field_tag :password, nil, :placeholder => I18n.t("password", :scope => "helpers.label", :default => "Password") %>            
+    </div>
+  </div>
+
+  <div class="actions form-actions login-box-footer">
+    <%= submit_tag "Login", :class => "btn btn-primary" %>
+  </div>
+    
+<% end %>

data/app/views/layouts/admin.html.erb

@@ -12,25 +12,23 @@
   <%= render :partial => 'admin/nav' %>
 
   <%= navbar :fluid => true, :fixed => :top do %>
-    <%= brand "#{app_name} Admin", admin_root_path %>
+  <a class="brand" href="/admin">
+    <i class="icon-home icon-white"></i> <%= "#{app_name} Admin" %></a>
     <%= yield :menu %>
   <% end %>
 
   <%= yield :crumbs %>
+  <%= yield :nav %>
   
   <%= container :fluid => true, :class => "main" do %>
-    <%= row do %>
+     <%= row do %>
       
-      <%= span(2, :id => "left-aside") do %>
-          <%= yield :nav %>
-      <% end %>
-      
-      <%= span(content_for?(:aside) ? 6 : 10, :id => "center") do %>
+      <%= span(content_for?(:aside) ? 9 : 12, :id => "center") do %>
           <%= yield %>
       <% end %>
       
       <% if content_for?(:aside) %>
-        <%= span(4, :id => "left-aside") do %>
+      <%= span(3, :id => "right-aside") do %>
             <%= yield :aside %>
         <% end %>
       <% end %>

data/app/views/layouts/login.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="it">
+<head>
+  <%= csrf_meta_tags %>
+  <title><%= ( @title ? "#{@title} - " : "" ) + "#{app_name} Admin" %></title>
+
+  <%= stylesheet_link_tag 'admin/admin' %>
+  <%= yield :stylesheets %>
+</head>
+
+<body>
+    <%= yield %>
+</body>
+</html>
+

data/config/locales/it.yml

@@ -30,6 +30,10 @@ it:
       choose_a_file: "Carica"
       change: "Cambia"
       preview: "Anteprima"
+      signed_in: 'Login effettuato con successo.'
+      signed_out: 'Logout effettuato con successo.'
+      login_failed: 'Nome utente o password non validi.'
+      
       
       form:
         correct_these_errors_and_retry: "Correggi questi errori e riprova"

data/config/locales/labels.it.yml

@@ -65,4 +65,5 @@ it:
       category: "Categoria"
       post_code: "Codice postale"
       kind: "Tipo"
-      state: "Provincia"
+      state: "Provincia"
+      password_confirmation: "Conferma Password"

data/config/routes.rb

@@ -3,6 +3,10 @@ Rails.application.routes.draw do
   mount Ckeditor::Engine => '/ckeditor'
   
   namespace :admin do
+    resources :sessions, :only => [:new, :create] do
+      match :destroy, :via => :delete, :on => :collection
+    end
+    
     resources :positionables, :only => [:index] do
       post :sort, :on => :collection
     end

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-11-04"
+  s.date = "2012-11-05"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -939,6 +939,7 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/support/plupload.js.coffee",
     "app/assets/javascripts/support/uploads.js.coffee",
     "app/assets/stylesheets/admin/base.css",
+    "app/assets/stylesheets/admin/login.css",
     "app/assets/stylesheets/support/ajax_loading.css",
     "app/assets/stylesheets/support/base.css",
     "app/assets/stylesheets/support/bootstrap-workarounds.css",
@@ -952,6 +953,7 @@ Gem::Specification.new do |s|
     "app/controllers/admin/responder.rb",
     "app/controllers/admin/scaffold_controller.rb",
     "app/controllers/admin/sessions_controller.rb",
+    "app/controllers/admin/subject_model_adapter.rb",
     "app/helpers/admin_form_helper.rb",
     "app/helpers/scaffold_helper.rb",
     "app/inputs/country_input.rb",
@@ -993,6 +995,7 @@ Gem::Specification.new do |s|
     "app/views/admin/base/new.html.erb",
     "app/views/admin/base/update.js.coffee",
     "app/views/admin/positionables/_collection.html.erb",
+    "app/views/admin/sessions/new.html.erb",
     "app/views/kaminari/_first_page.html.erb",
     "app/views/kaminari/_gap.html.erb",
     "app/views/kaminari/_last_page.html.erb",
@@ -1001,6 +1004,7 @@ Gem::Specification.new do |s|
     "app/views/kaminari/_paginator.html.erb",
     "app/views/kaminari/_prev_page.html.erb",
     "app/views/layouts/admin.html.erb",
+    "app/views/layouts/login.html.erb",
     "config/initializers/formtastic_bootstrap_timeish_hack.rb",
     "config/locales/devise.en.yml",
     "config/locales/devise.views.en.yml",

data/lib/fullstack/admin/resources.rb

@@ -61,7 +61,7 @@ module Fullstack
     
     # Group
     class Group < Entity      
-      attr_accessor :children, :name
+      attr_accessor :children, :name, :icon
       
       def initialize(name)
         @name = "#{name}"
@@ -128,6 +128,27 @@ module Fullstack
     end
     
     module_function :resources
+  
+    def grouped_resources
+      if !@resource_groups
+        @resource_groups = {}
+        current_group = nil
+      
+        resources.each do |rog|
+          if rog.type == :group
+            @resource_groups[rog] = []
+            current_group = rog
+          elsif current_group
+            @resource_groups[current_group] << rog
+          end
+        end
+      end
+      @resource_groups
+    end
+    
+    module_function :grouped_resources
+  
+  
   end
 end
 

data/lib/generators/fullstack/admin/install_generator.rb

@@ -33,12 +33,13 @@ eos
       
 
       def users
+        generate "sorcery:install remember_me activity_logging brute_force_protection --model Superuser"
         generate "migration:from user"
         append_to_file "db/seeds.rb" do
 <<-eos
 
 if Rails.env.development?
-  user = User.new( :email => "admin@example.com",
+  user = Superuser.new( :email => "admin@example.com",
                     :password => "password" )
                   
   user.skip_confirmation! if user.respond_to?(:skip_confirmation!)             
@@ -64,7 +65,7 @@ eos
 eos
         route(src)
         
-        route("\n  devise_for :users\n")
+        #route("\n  devise_for :users\n")
       end
 
       protected

data/lib/generators/fullstack/admin/templates/root/lib/support/user_subject.rb

@@ -13,7 +13,7 @@ class UserSubject < Checkin::Subject
       end
       
       role :administrator, :require => :logged_in, :alias => :admin do
-          subject_model.has_role?(:administrator)
+          subject_model && subject_model.is_a?(Superuser)
       end
 
       #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1149,6 +1149,7 @@ files:
 - app/assets/javascripts/support/plupload.js.coffee
 - app/assets/javascripts/support/uploads.js.coffee
 - app/assets/stylesheets/admin/base.css
+- app/assets/stylesheets/admin/login.css
 - app/assets/stylesheets/support/ajax_loading.css
 - app/assets/stylesheets/support/base.css
 - app/assets/stylesheets/support/bootstrap-workarounds.css
@@ -1162,6 +1163,7 @@ files:
 - app/controllers/admin/responder.rb
 - app/controllers/admin/scaffold_controller.rb
 - app/controllers/admin/sessions_controller.rb
+- app/controllers/admin/subject_model_adapter.rb
 - app/helpers/admin_form_helper.rb
 - app/helpers/scaffold_helper.rb
 - app/inputs/country_input.rb
@@ -1203,6 +1205,7 @@ files:
 - app/views/admin/base/new.html.erb
 - app/views/admin/base/update.js.coffee
 - app/views/admin/positionables/_collection.html.erb
+- app/views/admin/sessions/new.html.erb
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_last_page.html.erb
@@ -1211,6 +1214,7 @@ files:
 - app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_prev_page.html.erb
 - app/views/layouts/admin.html.erb
+- app/views/layouts/login.html.erb
 - config/initializers/formtastic_bootstrap_timeish_hack.rb
 - config/locales/devise.en.yml
 - config/locales/devise.views.en.yml
@@ -1291,7 +1295,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -697068176308442679
+      hash: 445393833660587370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: