spud_core 0.8.0 → 0.8.1

data/app/assets/javascripts/spud/admin/application.js

@@ -6,6 +6,10 @@
 //= require bootstrap/js/bootstrap
 //= require_self
 //= require_tree .
+
+Spud = (typeof(Spud) == 'undefined') ? {} : Spud;
+Spud.Admin = (typeof(Spud.Admin) == 'undefined') ? {} : Spud.Admin;
+
 $(document).ready(function() {
     $('#user_table').dataTable({
     	"bJQueryUI": true,
@@ -47,8 +51,11 @@ $(document).ready(function() {
 
       $('input[type=submit].btn').click(function() {$(this).button('loading')});
 
-    
-	  initFormTabs(); 
+    $('#multisite_switcher select').change(function() {
+      $(this).parent().submit();
+      // alert('test');
+    });
+	  initFormTabs();
 } );
 
 

data/app/assets/javascripts/spud/admin/dashboard.js

@@ -0,0 +1,80 @@
+Spud = (typeof(Spud) == 'undefined') ? {} : Spud;
+Spud.Admin = (typeof(Spud.Admin) == 'undefined') ? {} : Spud.Admin;
+
+Spud.Admin.Dashboard = new function() {
+	var self=this;
+
+	self.editMode = false;
+	self.mouseIsDown = false;
+	self.init = function() {
+		// $('.admin_application').effect('shake',{},100,self.shakeLoop)
+		$('.admin_application').bind('mousedown',self.mouseDown);
+		$('.admin_application').bind('mouseup',self.mouseUp);
+
+		$('.admin_application').bind('click',self.mouseClick);
+		$('#dashboard-editsave').click(self.saveDashboard);
+		$('#dashboard-editcancel').click(self.cancelDashboard);
+		$('.sortable').sortable({disabled:true});
+		// $('.admin_application').addClass('jiggly')
+		// $('.admin_application').draggable();
+	}
+	self.mouseDown = function() {
+		self.mouseIsDown = true;
+		if(self.editMode == false)
+		{
+			setTimeout(function() {
+				if(self.mouseIsDown)
+				{
+					self.enableEditMode();
+				}
+			},1000);
+		}
+	}
+
+	self.mouseClick = function(evt) {
+		if(self.editMode)
+		{
+			evt.stopPropagation();
+			return false;
+		}
+	}
+	self.mouseUp = function() {
+		self.mouseIsDown = false;
+	}
+	self.enableEditMode = function() {
+		self.editMode = true;
+		$('.admin_application').addClass('jiggly');
+		
+		$('.sortable').sortable("enable");
+		$('#dashboard-editmode').show();
+	}
+	self.saveDashboard = function() {
+		self.saveOrder();
+		self.disableEditMode();
+	}
+	self.cancelDashboard = function() {
+		$('.sortable').sortable("cancel");
+		self.disableEditMode();
+	}
+	self.disableEditMode = function() {
+		self.editMode = false;
+		$('#dashboard-editmode').hide();
+		$('.admin_application').removeClass('jiggly');
+		$('.sortable').sortable("disable");
+	}
+
+	
+	self.saveOrder = function() {
+		var appOrder = $('.sortable').sortable("toArray");
+		for(var appCounter=0;appCounter < appOrder.length;appCounter++)
+		{
+			appOrder[appCounter] = appOrder[appCounter].replace('application_name_',"");
+			
+		}
+		var keyvalue = appOrder.join(",")
+		console.log(keyvalue);
+		jQuery.ajax('/spud/save_key?key=app_order&value=' + keyvalue);
+	}
+
+	
+}

data/app/assets/stylesheets/spud/admin/application.css

@@ -25,22 +25,22 @@ a:hover .ui-button-text {
 }
 #header {
 	height:100px;
-	background:rgb(199,90,0);
-	background-image: linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-	background-image: -o-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-	background-image: -moz-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-	background-image: -webkit-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-	background-image: -ms-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
+	background:#fc862a;
+	background-image: linear-gradient(top, #fc862a 5%, #f56a0e 53%);
+	background-image: -o-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
+	background-image: -moz-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
+	background-image: -webkit-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
+	background-image: -ms-linear-gradient(top, #fc862a 5%, #f56a0e 53%);
 
 	background-image: -webkit-gradient(
 	linear,
 	left top,
 	left bottom,
-	color-stop(0.05, rgb(199,90,0)),
-	color-stop(0.53, rgb(179,72,0))
+	color-stop(0.05, #fc862a),
+	color-stop(0.53, #f56a0e)
 	);
 
-	border-bottom:1px solid rgb(180,72,0);
+	
 	color:#fff;
 }
 #header a,
@@ -49,7 +49,7 @@ a:hover .ui-button-text {
 	font-weight:normal;	
 }
 .greeting {
-	color:#ddd;
+	color:#fff;
 }
 
 #header #user_meta {
@@ -61,18 +61,32 @@ a:hover .ui-button-text {
 #header h1 {
 	float:left;
 	color:#fff;
+	margin:0 5px;
+	
+	line-height:100px;
+	width:200px;
+	height:100px;
+	text-indent:-10000px;
+	background: url('/assets/spud/admin/spud_logo.png') center left no-repeat;
+	background-size:200px 90px;
+}
+#header h1 .site_name {
+	color:#CCC;
+	font-size:.7em;
+}
+#header #multisite_switcher
+{
 	margin:0 15px;
 	line-height:100px;
 }
-
 #breadcrumbs {
 	background:#fff;
 	height:25px;
-	border-top:1px solid rgb(200,148,72);
+	/*border-top:1px solid rgb(200,148,72);*/
 	border-bottom:1px solid #999;
 	line-height:25px;
 	padding:5px 15px;
-	box-shadow: 0px 0px 10px #888;
+	/*box-shadow: 0px 0px 10px #888;*/
 
 }
 #breadcrumbs a,
@@ -104,6 +118,12 @@ div.admin_application {
 	border:1px solid transparent;
 	border-radius:10px;
 	margin: 0 10px 20px 10px;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 div.admin_application:hover {
 	background:#fff;
@@ -237,7 +257,7 @@ div.field_with_errors label {
 	border-collapse:collapse;
 }
 .admin-table thead tr{
-	background:rgb(199,90,0);
+	background:#fc862a;
 	color:#fff;
 	
 	border-radius:10px 10px 0 0;
@@ -356,3 +376,49 @@ form input.full-width {
 .spud_admin_pagination .pagination{
 	float: right;
 }
+
+#dashboard-editmode {
+	clear:both;
+	background:#ccc;
+	padding:10px;
+	text-align:center;
+	display:none;
+}
+/*Jiggle Animation*/
+.jiggly { 
+    -webkit-animation: jiggle 0.2s infinite; 
+    -moz-animation-duration: 0.2s; 
+    -moz-animation-name: jiggle; 
+    -moz-animation-iteration-count: infinite; 
+    -webkit-transform: rotate(-1deg); 
+    -moz-transform: rotate(-1deg); 
+} 
+
+@-moz-keyframes jiggle { 
+    0% { 
+        -moz-transform: rotate(-1deg); 
+    } 
+    50% { 
+        -moz-transform: rotate(1deg); 
+    } 
+} 
+
+@-webkit-keyframes jiggle { 
+    0% { 
+        -webkit-transform: rotate(-1deg); 
+    } 
+    50% { 
+        -webkit-transform: rotate(1deg); 
+    } 
+}
+
+
+/*Retina CSS*/
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
+	only screen and (-o-min-device-pixel-ratio: 3/2),
+	only screen and (min--moz-device-pixel-ratio: 1.5),
+	only screen and (min-device-pixel-ratio: 1.5) {
+		#header h1 {
+			background: url('/assets/spud/admin/spud_logo@2x.png') top left no-repeat;
+		}
+}

data/app/controllers/spud/admin/dashboard_controller.rb

@@ -2,6 +2,34 @@ class Spud::Admin::DashboardController < Spud::Admin::ApplicationController
   
 	def index
 		permission_set = current_user_permissions.collect{|p| p.name}
-		@admin_applications = Spud::Core.admin_applications.select{|app| @current_user.super_admin || permission_set.include?(app[:name])}
+		@unsorted_applications = Spud::Core.admin_applications.select{|app| @current_user.super_admin || permission_set.include?(app[:name])}.sort_by{|obj| obj[:order]}
+		@admin_applications = []
+
+		@app_order = @current_user.spud_user_settings.where(:key => "app_order").first
+		if !@app_order.blank?
+			names = @app_order.value.split(",")
+			names.each do |name|
+				@app = @unsorted_applications.select{|app| app[:name] == name}
+				@unsorted_applications = @unsorted_applications.reject{|app| app[:name] == name}
+				@admin_applications += @app
+			end
+			@admin_applications += @unsorted_applications
+		else
+			@admin_applications = @unsorted_applications
+		end
+	end
+
+	def switch
+		if params[:multisite_select].blank?
+			# flash[:error] = "Site variable does not exist."
+			session[:admin_site] = nil
+			redirect_to request.referer and return
+		end	
+		if Spud::Core.multisite_config.select{|p| p[:site_id].to_i == params[:multisite_select].to_i}.blank? == false
+			session[:admin_site] = params[:multisite_select].to_i
+		else
+			flash[:error] = "Site does not exist."
+		end
+		redirect_to request.referer and return
 	end
 end

data/app/controllers/spud/application_controller.rb

@@ -3,7 +3,7 @@ class Spud::ApplicationController < ActionController::Base
 	protect_from_forgery
 	helper_method :current_user_session, :current_user
 	around_filter :set_time_zone
-
+  around_filter :multisite_caching
   private
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
@@ -53,4 +53,23 @@ class Spud::ApplicationController < ActionController::Base
     ensure
       Time.zone = old_time_zone
     end
+
+    def multisite_caching
+      yield and return if !Spud::Core.multisite_mode_enabled
+      old_cache_directory = Rails.application.config.action_controller.page_cache_directory
+      if(old_cache_directory.blank?)
+        old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
+      end
+      site_config = Spud::Core.site_config_for_host request.host_with_port
+      if !site_config.blank?
+        Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,site_config[:short_name].to_s)
+      else
+        Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,"main")
+      end
+      yield
+
+    ensure
+      Rails.application.config.action_controller.page_cache_directory = old_cache_directory
+
+    end
 end

data/app/controllers/spud/users_controller.rb

@@ -21,4 +21,22 @@ class Spud::UsersController < Spud::ApplicationController
 			render :action => "settings"
 		end
 	end
+
+
+	def save_setting
+		if params[:key].blank?
+			render :status => 500,:text => nil and return
+		end
+
+		setting = @current_user.spud_user_settings.where(:key => params[:key]).first
+		if setting.blank?
+			setting = @current_user.spud_user_settings.new(:key => params[:key])
+		end
+		setting.value = params[:value]
+		if setting.save
+			render :status => 200,:text => nil and return
+		else
+			render :status => 500,:text => nil and return
+		end
+	end
 end

data/app/helpers/spud/admin/application_helper.rb

@@ -4,6 +4,25 @@ module Spud::Admin::ApplicationHelper
     return Time.now() - timedate > 604800 ? timedate.strftime("%B %d") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'
   end
 
+  def current_site_name
+    return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled || session[:admin_site].blank?
+
+    config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
+    return Spud::Core.site_name if config.blank?
+
+    return config[0][:site_name]
+
+  end
+  def header_style
+    if !Spud::Core.multisite_mode_enabled
+      return ''
+    end
+    config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
+    return '' if config.blank?
+
+    return config[0][:header_style]
+  end
+
   def link_to_remove_fields(name, f)
     f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)",:class => "btn btn-danger")
   end

data/app/models/spud_user.rb

@@ -1,5 +1,6 @@
 class SpudUser < ActiveRecord::Base
 	has_many :spud_admin_permissions,:foreign_key => :user_id
+	has_many :spud_user_settings
 	accepts_nested_attributes_for :spud_admin_permissions, :allow_destroy => true
 	
 	attr_accessible :login,:email,:first_name,:last_name,:password,:password_confirmation,:password_salt,:last_login_at,:last_request_at,:last_login_ip,:failed_login_count,:current_login_at,:login_count,:persistence_token,:perishable_token,:single_access_token,:crypted_password, :current_login_ip, :created_at, :updated_at,:spud_admin_permissions_attributes,:time_zone

data/app/models/spud_user_setting.rb

@@ -0,0 +1,6 @@
+class SpudUserSetting < ActiveRecord::Base
+	belongs_to :spud_user
+
+	validates :key,:presence=>true
+	validates_uniqueness_of :key,:scope => :spud_user_id
+end

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

@@ -8,24 +8,41 @@
   <%=yield :head%>
 </head>
 <body>
-<div id="header">
+<div id="header" style="<%=header_style%>">
 	<h1>Spud Admin</h1>
+
 	<div id="user_meta">
 		<span class="greeting">Hello <%=@current_user.login%></span>&nbsp;|&nbsp;<%=link_to "Settings", spud_settings_path%>&nbsp;|&nbsp;<%=link_to "Logout",spud_user_session_url,:method => :delete%></a>
 	</div>
+  <%if Spud::Core.multisite_mode_enabled == true%>
+    <div id="multisite_switcher" class="right_floated">
+      <%=form_tag spud_admin_switch_url do%>
+        <%=select_tag :multisite_select,options_for_select([[Spud::Core.site_name,nil]] + Spud::Core.multisite_config.collect{|c| [c[:site_name],c[:site_id]]},session[:admin_site])%>
+      <%end%>
+    </div>
+  <%end%>
 </div>
 <div id="breadcrumbs">
 <%= render_breadcrumbs :separator => ' / ' %>
 </div>
 <div id="content">
 <% if flash[:notice] %>
-  <div class="flash notice"><%= flash[:notice] %></div>
+  <div class="alert alert-success">
+    <a class="close" data-dismiss="alert">×</a>
+    <%= flash[:notice] %>
+  </div>
 <% end %>
 <% if flash[:warning] %>
-  <div class="flash warning"><%= flash[:warning] %></div>
+  
+  <div class="alert alert-warning">
+    <a class="close" data-dismiss="alert">×</a>
+    <%= flash[:warning] %>
+  </div>
 <% end %>
 <% if flash[:error]%>
-<div class="flash error">
+
+<div class="alert alert-error">
+    <a class="close" data-dismiss="alert">×</a>
 	  <%= flash[:error] %>
 </div>
 <%-end%>

data/app/views/spud/admin/dashboard/index.html.erb

@@ -1,11 +1,18 @@
 
+<div class="sortable">
+<%@admin_applications.each do |admin_application|%>
 
-<%@admin_applications.sort_by{|obj| obj[:order]}.each do |admin_application|%>
-
-	<div class="admin_application"><a href="<%=admin_application[:url]%>">
+	<div class="admin_application" id="application_name_<%=admin_application[:name]%>"><a href="<%=admin_application[:url]%>">
 		<div class="image_wrapper"><%=image_tag(admin_application[:thumbnail])%></div>
 		<span class="application_name"><%=admin_application[:name]%></span>
 		</a>
 	</div>
 
-<%end%>
+<%end%>
+</div>
+<div id="dashboard-editmode">
+	<a href="#" class="btn btn-primary" id="dashboard-editsave">Done Editing</a>&nbsp;<a id="dashboard-editcancel" href="#" class="btn">Cancel</a>
+</div>
+<script type="text/javascript">
+$(document).ready(Spud.Admin.Dashboard.init);
+</script>

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

@@ -19,13 +19,13 @@
 			<%@users.each do |user|%>
 				<tr id="row_user_<%=user.id%>">
 					
-					<td><%=link_to user.login,spud_admin_user_path(:id => user.id)%></td>
+					<td><%=link_to user.login,edit_spud_admin_user_path(:id => user.id),:class => "ajax"%></td>
 					<td><%=user.email%></td>
 					<td><%=user.first_name%>&nbsp;<%=user.last_name%></td>
 					
 					<td><%=timestamp user.last_login_at%></td>
 					<td><%=timestamp user.created_at%></td>
-					<td align="right"><%=link_to "Edit",edit_spud_admin_user_path(:id => user.id),:class => "ajax", :title => "Edit User"%>&nbsp;|&nbsp;<%=link_to "Remove",spud_admin_user_path(:id => user.id),:method => :delete,:remote => true,:confirm => "Are you sure you want to remove this user?"%></td>
+					<td align="right"><%=link_to "Remove",spud_admin_user_path(:id => user.id),:method => :delete,:remote => true,:confirm => "Are you sure you want to remove this user?",:class => "btn btn-danger"%></td>
 				</tr>
 			<%end%>
 		</tbody>

data/config/routes.rb

@@ -3,9 +3,11 @@ Rails.application.routes.draw do
 	   	resource :user_session
 	   	resource :user
 	   	match 'settings' => "users#settings"
+         match 'save_key' => "users#save_setting"
    		namespace :admin do
    			root :to => "dashboard#index"
    			resources :users
+            match 'switch' => "dashboard#switch"
    		end
          resource :sitemap,:only => [:show]
 	   	match 'setup' => 'setup#index'

data/db/migrate/20120328235431_add_scope_to_spud_admin_permissions.rb

@@ -0,0 +1,6 @@
+class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
+  def change
+    add_column :spud_admin_permissions, :scope, :string
+
+  end
+end

data/db/migrate/20120329174000_create_spud_user_settings.rb

@@ -0,0 +1,11 @@
+class CreateSpudUserSettings < ActiveRecord::Migration
+  def change
+    create_table :spud_user_settings do |t|
+      t.integer :spud_user_id
+      t.string :key
+      t.string :value
+
+      t.timestamps
+    end
+  end
+end

data/lib/spud_core/configuration.rb

@@ -1,9 +1,20 @@
 module Spud
   module Core
     include ActiveSupport::Configurable
-    config_accessor :site_name,:admin_applications,:sitemap_urls
+    config_accessor :site_name,:admin_applications,:sitemap_urls,:multisite_mode_enabled,:multisite_config
     self.admin_applications = [{:name => "Users",:thumbnail => "spud/admin/users_thumb.png",:url => "/spud/admin/users",:order => 100}]
     self.site_name = "Company Name"
     self.sitemap_urls = []
+    self.multisite_mode_enabled = false
+    self.multisite_config = []
+
+    def self.site_config_for_host(host)
+        configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}
+        if configs.blank?
+          return nil
+        else
+          return configs[0]
+        end
+  	end
   end
 end

data/lib/spud_core/engine.rb

@@ -30,6 +30,8 @@ module Spud
         ]
       end
 
+      
+
      initializer :controller_overrides do |config|
      	ActionController::Base.class_eval do
      		include Spud::BelongsToApp
@@ -43,5 +45,7 @@ module Spud
 
      
  end
+
+ 
 end
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.8.0"
+	  VERSION = "0.8.1"
 	end
 end

data/test/fixtures/spud_user_settings.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  spud_user_id: 1
+  key: MyString
+  value: MyString
+
+two:
+  spud_user_id: 1
+  key: MyString
+  value: MyString

data/test/unit/spud_user_settings_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SpudUserSettingsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_core
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70273803954200 !ruby/object:Gem::Requirement
+  requirement: &70317239775300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70273803954200
+  version_requirements: *70317239775300
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70273803953780 !ruby/object:Gem::Requirement
+  requirement: &70317239771800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273803953780
+  version_requirements: *70317239771800
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70273803953320 !ruby/object:Gem::Requirement
+  requirement: &70317239769540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273803953320
+  version_requirements: *70317239769540
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
-  requirement: &70273803952900 !ruby/object:Gem::Requirement
+  requirement: &70317239768840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273803952900
+  version_requirements: *70317239768840
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70273803952480 !ruby/object:Gem::Requirement
+  requirement: &70317239783960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273803952480
+  version_requirements: *70317239783960
 - !ruby/object:Gem::Dependency
   name: bootstrap-will_paginate
-  requirement: &70273803952060 !ruby/object:Gem::Requirement
+  requirement: &70317239782100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273803952060
+  version_requirements: *70317239782100
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70273803951640 !ruby/object:Gem::Requirement
+  requirement: &70317239781240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273803951640
+  version_requirements: *70317239781240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70273803951220 !ruby/object:Gem::Requirement
+  requirement: &70317239780600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273803951220
+  version_requirements: *70317239780600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70273803950800 !ruby/object:Gem::Requirement
+  requirement: &70317239779080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273803950800
+  version_requirements: *70317239779080
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70273803950300 !ruby/object:Gem::Requirement
+  requirement: &70317239777020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70273803950300
+  version_requirements: *70317239777020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70273803949800 !ruby/object:Gem::Requirement
+  requirement: &70317239797900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70273803949800
+  version_requirements: *70317239797900
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70273803949340 !ruby/object:Gem::Requirement
+  requirement: &70317239825720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,7 +142,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70273803949340
+  version_requirements: *70317239825720
 description: Spud Core Engine
 email:
 - destes@redwindsw.com
@@ -173,8 +173,11 @@ files:
 - app/assets/images/spud/admin/flick/ui-icons_666666_256x240.png
 - app/assets/images/spud/admin/flick/ui-icons_ff0084_256x240.png
 - app/assets/images/spud/admin/flick/ui-icons_ffffff_256x240.png
+- app/assets/images/spud/admin/spud_logo.png
+- app/assets/images/spud/admin/spud_logo@2x.png
 - app/assets/images/spud/admin/users_thumb.png
 - app/assets/javascripts/spud/admin/application.js
+- app/assets/javascripts/spud/admin/dashboard.js
 - app/assets/javascripts/spud/admin/jquery.dataTables.min.js
 - app/assets/libs/bootstrap/css/bootstrap-responsive.css
 - app/assets/libs/bootstrap/css/bootstrap-responsive.min.css
@@ -461,6 +464,7 @@ files:
 - app/models/spud_admin_permission.rb
 - app/models/spud_user.rb
 - app/models/spud_user_session.rb
+- app/models/spud_user_setting.rb
 - app/views/layouts/spud/admin/application.html.erb
 - app/views/layouts/spud/admin/detail.html.erb
 - app/views/layouts/spud/login/application.html.erb
@@ -482,6 +486,8 @@ files:
 - db/migrate/20111214161011_create_spud_admin_permissions.rb
 - db/migrate/20111214161146_create_spud_users.rb
 - db/migrate/20120327124229_add_time_zone_to_spud_user.rb
+- db/migrate/20120328235431_add_scope_to_spud_admin_permissions.rb
+- db/migrate/20120329174000_create_spud_user_settings.rb
 - lib/spud_core/belongs_to_app.rb
 - lib/spud_core/configuration.rb
 - lib/spud_core/engine.rb
@@ -526,6 +532,8 @@ files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
+- test/fixtures/spud_user_settings.yml
+- test/unit/spud_user_settings_test.rb
 homepage: http://github.com/davydotcom/spud_core_admin
 licenses: []
 post_install_message: 
@@ -540,7 +548,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -686726374285239373
+      hash: -1745941500780882783
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -549,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -686726374285239373
+      hash: -1745941500780882783
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -590,3 +598,5 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
+- test/fixtures/spud_user_settings.yml
+- test/unit/spud_user_settings_test.rb