tb_core 1.0.2 → 1.1.0

data/app/assets/stylesheets/admin/split_pane.css.scss

@@ -0,0 +1,126 @@
+// Split Pane View
+.split-pane{
+  border: 1px solid #eee;
+  overflow: hidden;
+  height: 640px;
+  margin: 0 0 20px;
+}
+
+// Left Side
+.split-pane-left{
+  float: left;
+  width: 300px;
+  height: 600px;
+  position: relative;
+}
+.split-pane-left-content{
+  height: 560px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+.split-pane-left-content-empty{
+  padding: 10px;
+  margin: 0;
+  font-style: italic;
+}
+.split-pane-left-pagination{
+  margin: 0;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 20px;
+  padding: 10px 0;
+  width: 100%;
+  border-top: 1px solid #eee;
+  background: #4C4C4C;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  .pagination{
+    text-align: center;
+    margin: 0;
+    color: white;
+  }
+  a{
+    color: white;
+  }
+}
+
+// Items
+.split-pane-item{
+  cursor: pointer;
+  border-bottom: 1px solid #eee;
+  :first-last{
+    border-bottom: 0;
+  }
+  padding: 10px;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.split-pane-item-title{
+  display: block;
+  font-weight: bold;
+  font-size: 14px;
+  line-height: 14px;
+}
+.split-pane-item-meta{
+  font-style: italic;
+  font-size: 12px;
+  line-height: 12px;
+}
+.split-pane-item:hover{
+  background: #FFEDDF;
+}
+.split-pane-item-selected{
+  background: #f1f1f1;
+}
+
+// Toolbars
+.split-pane-toolbar{
+  height: 30px;
+  padding: 5px 10px;
+  background: #4C4C4C;
+}
+.split-pane-toolbar-left{
+  float: left;
+  max-width: 290px;
+}
+.split-pane-toolbar-right{
+  margin-left: 305px; 
+}
+.split-pane-toolbar-title{
+  color: white;
+  font: bold 18px/30px sans-serif;
+}
+.split-pane-search-form{
+  margin: 0;
+  display: inline;
+  input{
+    margin: 0;
+  }
+}
+
+// Right Side
+.split-pane-right{
+  margin-left: 300px;
+  padding: 15px;
+  border-left: 1px solid #eee;
+  height: 570px;
+  overflow-y: scroll;
+}
+.split-pane-right h2{
+  margin-top: 0;
+  line-height: 1em;
+}
+.split-pane-right{
+  form, .form-actions{
+    margin-bottom: 0;
+  } 
+}

data/app/assets/stylesheets/admin/users.css.scss

@@ -0,0 +1,9 @@
+// User Show
+.admin-user-show{
+  :first-child{
+    margin-top: 0;
+  }
+}
+.admin-user-show-controls{
+  float: right;
+}

data/app/controllers/{spud/admin → admin}/application_controller.rb

@@ -1,11 +1,15 @@
-class Spud::Admin::ApplicationController < Spud::ApplicationController
-	before_filter :require_admin_user
-	before_filter :verify_site_mode
-	add_breadcrumb "Dashboard", :spud_admin_root_path
-	layout 'spud/admin/application'
-	respond_to :html,:json,:xml,:js
-  helper_method :sort_column, :sort_direction
-	unloadable
+class Admin::ApplicationController < Spud::ApplicationController
+
+  before_filter :require_user
+  before_filter :verify_site_mode
+  add_breadcrumb "Dashboard", :admin_root_path
+  layout 'admin/detail'
+  respond_to :html, :json, :xml, :js
+  unloadable
+
+  rescue_from Spud::AccessDeniedError do |exception|
+    redirect_to admin_root_path, :flash => {:error => exception.message}
+  end
 
   def current_admin_site
     if(session[:admin_site] == nil)
@@ -13,37 +17,32 @@ class Spud::Admin::ApplicationController < Spud::ApplicationController
     else
       return session[:admin_site]
     end
-
   end
 
 private
 
-  def sort_column
-    params[:sort]
-  end
-
-  def sort_direction
-    %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
+  def require_user
+    if current_user.blank?
+      flash[:notice] = "You must be logged in to access the requested page"
+      redirect_to admin_login_path
+      return false
+    elsif !current_user.has_admin_rights?
+      flash[:notice] = "You do not have permission to access the requested page"
+      redirect_to root_path
+      return false
+    else
+      return true
+    end
   end
 
-	def require_admin_user
-    return false if !require_user
-    if !@current_user.super_admin && current_user_permissions.count == 0
-      store_location
-			flash[:error] = "User must be an administrator to view this area."
-			redirect_to root_path
+  def verify_site_mode
+    if(session[:admin_site] == nil)
+      session[:admin_site] = 0
     end
-		return true
-	end
 
-	def verify_site_mode
-		if(session[:admin_site] == nil)
-	    session[:admin_site] = 0
-		end
-
-	end
+  end
 
-	def multisite_caching
+  def multisite_caching
     if Spud::Core.multisite_mode_enabled
       @old_cache_directory = Rails.application.config.action_controller.page_cache_directory
       if(@old_cache_directory.blank?)

data/app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,23 @@
+class Admin::DashboardController < Admin::ApplicationController
+
+  layout 'admin/application'
+
+  def index
+    @admin_applications = Spud::Core.admin_applications.select do |admin_application|
+      current_user.can_view_app?(admin_application)
+    end
+  end
+
+  def switch
+    if !params[:multisite_select].blank?
+      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
+    else
+      session[:admin_site] = 0
+    end
+    redirect_to(back_or_default(!request.referer.blank? ? request.referer : admin_root_path)) and return
+  end
+end

data/app/controllers/admin/password_resets_controller.rb

@@ -0,0 +1,51 @@
+class Admin::PasswordResetsController < Admin::ApplicationController
+
+  before_filter :load_user_using_perishable_token, :only => [:show, :update]
+  skip_before_filter :require_user
+  layout 'admin/login'
+
+  def index
+
+  end
+
+  def create
+    @user = SpudUser.find_by_email(params[:email])
+    if @user
+      CoreMailer.forgot_password_notification(@user, admin_password_reset_url(@user.perishable_token)).deliver
+      flash[:notice] = "Instructions to reset your password have been emailed to you. " +
+      "Please check your email."
+      redirect_to admin_login_path
+    else
+      flash.now[:error] = "No user was found with that email address"
+      render 'index'
+    end
+  end
+
+  def show
+
+  end
+
+  def update
+    @user.password = params[:spud_user][:password]
+    @user.password_confirmation = params[:spud_user][:password_confirmation]
+    if @user.save
+      flash[:notice] = "Password successfully updated"
+      redirect_to admin_login_path
+    else
+      render 'show'
+    end
+  end
+
+private
+
+  def load_user_using_perishable_token
+    @user = SpudUser.find_using_perishable_token(params[:id])
+    unless @user
+      flash[:notice] = "We're sorry, but we could not locate your account. " +
+      "If you are having issues try copying and pasting the URL " +
+      "from your email into your browser or restarting the " +
+      "reset password process."
+      redirect_to admin_login_path
+    end
+  end
+end

data/app/controllers/admin/roles_controller.rb

@@ -0,0 +1,58 @@
+class Admin::RolesController < Admin::ApplicationController
+
+  before_filter :get_record, :only => [:show, :edit, :update, :destroy]
+  respond_to :html, :json, :xml
+  belongs_to_spud_app :users
+  add_breadcrumb "Users", :admin_users_path
+  add_breadcrumb "Roles", :admin_roles_path
+
+  def index
+    @roles = SpudRole.all
+    respond_with @roles
+  end
+  
+  def show
+    respond_with @role
+  end
+  
+  def new
+    @role = SpudRole.new
+    respond_with @role
+  end
+  
+  def create
+    @role = SpudRole.new(params[:spud_role])
+    flash[:notice] = 'SpudRole created successfully' if @role.save
+    respond_with @role, :location => admin_roles_path
+  end
+  
+  def edit
+    respond_with @role
+  end
+  
+  def update
+    params[:spud_role][:permission_tags] ||= []
+    if @role.update_attributes(params[:spud_role])
+      flash[:notice] = 'SpudRole updated successfully'
+    end
+    respond_with @role, :location => admin_roles_path
+  end
+  
+  def destroy
+    flash[:notice] = 'SpudRole deleted successfully' if @role.destroy
+    respond_with @role, :location => admin_roles_path
+  end
+
+  private
+
+  def get_record
+    begin
+      @role = SpudRole.find(params[:id])
+    rescue ActiveRecord::RecordNotFound => e
+      flash[:error] = "Could not find the requested SpudRole"
+      redirect_to admin_roles_path
+      return false
+    end
+  end
+
+end

data/app/controllers/admin/settings_controller.rb

@@ -0,0 +1,19 @@
+class Admin::SettingsController < Admin::ApplicationController
+
+  add_breadcrumb "Dashboard", :admin_root_path
+  add_breadcrumb "Settings", :admin_settings_path
+
+  def edit
+    
+  end
+
+  def update
+    if @current_user.update_attributes(params[:spud_user].slice :login,:first_name,:last_name,:email,:password,:password_confirmation,:time_zone)
+      flash[:notice] = "User settings saved successfully."
+      redirect_to admin_root_path
+    else
+      render 'edit'
+    end
+  end
+
+end

data/app/controllers/admin/setup_controller.rb

@@ -0,0 +1,24 @@
+class Admin::SetupController < Admin::ApplicationController
+
+  skip_before_filter :require_user
+
+  def new
+    if SpudUser.count != 0
+      flash[:error] = "Access Denied! This wizard may only be executed when the database is empty."
+      redirect_to admin_login_path and return
+    else
+      @spud_user = SpudUser.new  
+    end
+  end
+
+  def create
+    @spud_user = SpudUser.new(params[:spud_user])
+    @spud_user.super_admin = true
+    if @spud_user.save
+      redirect_to admin_root_path
+    else
+      render 'new', :status => 422
+    end
+  end
+
+end

data/app/controllers/{spud/admin → admin}/user_sessions_controller.rb

@@ -1,14 +1,14 @@
-class Spud::Admin::UserSessionsController < Spud::ApplicationController
+class Admin::UserSessionsController < Admin::ApplicationController
 
-  before_filter :require_user, :only => :destroy
-  layout 'spud/login/application'
+  skip_before_filter :require_user
+  layout 'admin/login'
 
   def new
     if current_user
-      redirect_to spud_admin_root_path
+      redirect_to admin_root_path
     elsif SpudUser.all.count == 0
       logger.debug "NO USERS!"
-      redirect_to spud_setup_url() and return
+      redirect_to admin_setup_path and return
     end
     @user_session = SpudUserSession.new
   end
@@ -17,7 +17,7 @@ class Spud::Admin::UserSessionsController < Spud::ApplicationController
     @user_session = SpudUserSession.new(params[:spud_user_session])
     if @user_session.save
       flash[:notice] = "Login successful!"
-      redirect_to spud_admin_root_path
+      redirect_to admin_root_path
     else
       render :action => :new
     end
@@ -29,11 +29,11 @@ class Spud::Admin::UserSessionsController < Spud::ApplicationController
     if !request.referer.blank?
       session[:return_to] = request.referer
     end
-    redirect_back_or_default spud_admin_login_path
+    redirect_to admin_login_path
   end
 
   def legacy_redirect
-    redirect_to spud_admin_login_path
+    redirect_to admin_login_path
   end
 
 end

data/app/controllers/admin/users_controller.rb

@@ -0,0 +1,69 @@
+class Admin::UsersController < Admin::ApplicationController
+
+  layout false
+  belongs_to_spud_app :users
+  add_breadcrumb "Users", :admin_users_path
+  before_filter :load_user, :only => [:edit, :update, :show, :destroy]
+  respond_to :html
+
+  def index
+    @users = SpudUser.order('login asc')
+    if params[:search]
+      @users = @users.where_name_like(params[:search])
+    end
+    @users = @users.paginate(:page => params[:page])
+    respond_with @users do |format|
+      format.html{
+        if request.xhr?
+          render :partial => 'index'
+        else
+          render 'index', :layout => 'admin/detail' 
+        end
+      }
+    end
+  end
+
+  def show
+    respond_with @user
+  end
+
+  def new
+    @user = SpudUser.new
+    respond_with @user
+  end
+
+  def create
+    @user = SpudUser.new(params[:spud_user], :as => :admin)
+    if @user.save
+      render 'show', :status => 200
+    else
+      render 'new', :status => 422
+    end
+  end
+
+  def edit
+    respond_with @user
+  end
+
+  def update
+    @user.update_attributes(params[:spud_user], :as => :admin)
+    respond_with @user, :location => admin_user_path(@user), :status => 200
+  end
+
+  def destroy
+    @user.destroy
+    respond_with @user, :location => admin_users_path
+  end
+
+private
+
+  def load_user
+    @user = SpudUser.where(:id => params[:id]).first
+    if @user.blank?
+      flash[:error] = "User not found!"
+      redirect_to admin_users_path and return false
+    end
+    return true
+  end
+
+end

data/app/controllers/password_resets_controller.rb

@@ -0,0 +1,52 @@
+class PasswordResetsController < ApplicationController
+
+  before_filter :load_user_using_perishable_token, :only => [:show, :update]
+  skip_before_filter :require_user
+  respond_to :html
+
+  def index
+
+  end
+
+  def create
+    @user = SpudUser.find_by_email(params[:email])
+    if @user
+      CoreMailer.forgot_password_notification(@user, password_reset_url(@user.perishable_token)).deliver
+      flash[:notice] = "Password reset instructions have been sent to your email"
+      redirect_to login_path
+    else
+      flash.now[:error] = "No user was found with that email address"
+      render 'index'
+    end
+  end
+
+  def show
+    
+  end
+
+  def update
+    if params[:spud_user][:password].blank?
+      @user.errors.add(:password, 'must not be blank')
+    else
+      @user.password = params[:spud_user][:password]
+      @user.password_confirmation = params[:spud_user][:password_confirmation]
+      if @user.save()
+        flash[:notice] = "Password successfully updated"
+        redirect_back_or_default(root_path)
+        return
+      end
+    end
+    render 'show'
+  end
+
+private
+
+  def load_user_using_perishable_token
+    @user = SpudUser.find_using_perishable_token(params[:id])
+    unless @user
+      flash[:error] = "Password reset token was invalid or expired"
+      redirect_to login_path
+    end
+  end
+
+end

data/app/controllers/sitemaps_controller.rb

@@ -0,0 +1,8 @@
+class SitemapsController < Spud::ApplicationController
+  respond_to :xml
+  caches_page :show,:expires_in => 1.day
+  def show
+    @sitemap_urls = Spud::Core.sitemap_urls
+    respond_with @sitemap_urls
+  end
+end

data/app/controllers/spud/application_controller.rb

@@ -1,9 +1,9 @@
 class Spud::ApplicationController < ActionController::Base
 
-	unloadable
-	protect_from_forgery
-	helper_method :current_user_session, :current_user
-	around_filter :set_time_zone
+  unloadable
+  protect_from_forgery
+  helper_method :current_user_session, :current_user
+  around_filter :set_time_zone
 
   if Spud::Core.multisite_mode_enabled
     before_filter :multisite_caching
@@ -27,30 +27,16 @@ private
     @current_user = current_user_session && current_user_session.spud_user
   end
 
-  def current_user_permissions
-    return @current_user_permissions if defined?(@current_user_permissions)
-    @current_user_permissions = current_user.spud_admin_permissions.where(:access => true).all
-  end
-
   def require_user
     unless current_user
       store_location
-      flash[:notice] = "You must be logged in to access this page"
-      redirect_to spud_admin_login_path
+      flash[:notice] = "You must be logged in to access the requested page"
+      redirect_to login_path
       return false
     end
     return true
   end
 
-  def require_no_user
-    if current_user
-      store_location
-      flash[:notice] = "You must be logged out to access this page"
-      redirect_to root_path
-      return false
-    end
-  end
-
   def store_location
     session[:return_to] = request.url
   end

data/app/controllers/user_sessions_controller.rb

@@ -0,0 +1,26 @@
+class UserSessionsController < ApplicationController
+
+  skip_before_filter :require_user
+  respond_to :html
+  
+  def new
+    @user_session = SpudUserSession.new
+  end
+  
+  def create
+    @user_session = SpudUserSession.new(params[:spud_user_session])
+    if @user_session.save
+      flash[:notice] = "Login successful!"
+      redirect_back_or_default(root_path)
+    else
+      render 'new'
+    end
+  end
+  
+  def destroy
+    current_user_session.destroy unless current_user_session.blank?
+    flash[:notice] = "Logout successful!"
+    redirect_to login_path
+  end
+
+end

data/app/helpers/{spud/admin → admin}/application_helper.rb

@@ -1,4 +1,4 @@
-module Spud::Admin::ApplicationHelper
+module Admin::ApplicationHelper
 
   def timestamp(timedate=nil)
     return "Never" if timedate.blank?

data/app/helpers/admin/roles_helper.rb

@@ -0,0 +1,2 @@
+module Admin::RolesHelper
+end

data/app/helpers/spud/application_helper.rb

@@ -12,11 +12,4 @@ module Spud::ApplicationHelper
     return config[:site_id] unless config.blank?
   end
 
-  def sortable(column, title = nil)
-    title ||= column.titleize
-    css_class = column == sort_column ? "current #{sort_direction}" : nil
-    direction = column == sort_column && sort_direction == "asc" ? "desc" : "asc"
-    link_to title, {:sort => column, :direction => direction}, {:class => css_class}
-  end
-
 end

data/app/mailers/core_mailer.rb

@@ -0,0 +1,9 @@
+class CoreMailer < ActionMailer::Base
+
+  def forgot_password_notification(user, url)
+    @user = user
+    @url = url
+    mail(:from =>Spud::Core.from_address,:to => user.email, :subject => "Forgot Password Request from #{Spud::Core.config.site_name}")
+  end
+
+end