caseadilla 0.0.1 → 0.0.2

data/app/assets/stylesheets/caseadilla/login.css.scss

@@ -1,81 +1,81 @@
-/*
- *= require ./bootstrap.css
- *= require ./bootstrap-glyphicons.css
- *= require ./caseadilla-bootstrap-overrides.css
-*/
-
-body {
-  padding-top: 0px;
-  padding-bottom: 0px;
-}
-
-.container-narrow {
-  margin: 0 auto;
-  max-width: 400px;
-}
-
-.alert {
-	text-align: center;
-}
-
-.brand {
-	margin-top: 20px;
-	margin-bottom: 40px;
-}
-
-.form-group .checkbox-inline label {
-	margin-top: 5px;
-	margin-bottom: 20px;
-	font-weight: normal;
-}
-
-.form-group .checkbox-inline input[type="checkbox"] {
-	margin-top: 1px;
-}
-
-.form-group input {
-	text-align: center;
-}
-
-form#new_user input.btn-large {
-    background-color: rgb(220, 120, 40);
-    border-color: rgb(175, 92, 32);
-}
-
-.jumbotron {
-  padding: 20px;
-  margin-bottom: 20px;
-  font-size: 14px;
-  line-height: 1;
-  background-color: #eeeeee;
-  text-align: center;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-footer p {
-	font-size: 13px;
-	text-align: center;
-	color: #888;
-}
-
-footer p a {
-	color: #555;
-}
-
-footer p a:hover {
-	color: #000;
-	text-decoration: none;
-}
-
-@media screen and (min-width: 768px) {
-  .jumbotron {
-    border-bottom: 0;
-    padding: 20px;
-    border-radius: 6px;
-  }
-
-  body {
-  	padding-top: 40px;
-  	padding-bottom: 20px;
-  }
+/*
+ *= require ./bootstrap.css
+ *= require ./bootstrap-glyphicons.css
+ *= require ./caseadilla-bootstrap-overrides.css
+*/
+
+body {
+  padding-top: 0px;
+  padding-bottom: 0px;
+}
+
+.container-narrow {
+  margin: 0 auto;
+  max-width: 400px;
+}
+
+.alert {
+	text-align: center;
+}
+
+.brand {
+	margin-top: 20px;
+	margin-bottom: 40px;
+}
+
+.form-group .checkbox-inline label {
+	margin-top: 5px;
+	margin-bottom: 20px;
+	font-weight: normal;
+}
+
+.form-group .checkbox-inline input[type="checkbox"] {
+	margin-top: 1px;
+}
+
+.form-group input {
+	text-align: center;
+}
+
+form#new_user input.btn-large {
+    background-color: rgb(220, 120, 40);
+    border-color: rgb(175, 92, 32);
+}
+
+.jumbotron {
+  padding: 20px;
+  margin-bottom: 20px;
+  font-size: 14px;
+  line-height: 1;
+  background-color: #eeeeee;
+  text-align: center;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+footer p {
+	font-size: 13px;
+	text-align: center;
+	color: #888;
+}
+
+footer p a {
+	color: #555;
+}
+
+footer p a:hover {
+	color: #000;
+	text-decoration: none;
+}
+
+@media screen and (min-width: 768px) {
+  .jumbotron {
+    border-bottom: 0;
+    padding: 20px;
+    border-radius: 6px;
+  }
+
+  body {
+  	padding-top: 40px;
+  	padding-bottom: 20px;
+  }
 }

data/app/controllers/caseadilla/caseadilla_controller.rb

@@ -1,57 +1,57 @@
-module Caseadilla
-  class CaseadillaController < ApplicationController
-
-    require 'caseadilla/caseadilla_helper'
-    include Caseadilla::CaseadillaHelper
-
-    require 'caseadilla/config_helper'
-    include Caseadilla::ConfigHelper
-
-    layout 'caseadilla_main'
-
-    # before_filter :set_time_zone
-    before_action :require_sign_in
-    
-    ActionView::Base.field_error_proc = proc { |input, instance| "#{input}".html_safe }
-
-    def index		
-  		redirect_to caseadilla_config_dashboard_url
-    end
-
-  	def blank
-  		@caseadilla_page_title = "Welcome"
-  	end
-
-  private
-
-    def steak?
-      return false unless Caseadilla::Engine.flavor = :steak
-    end
-
-    def chicken?
-      return false unless Caseadilla::Engine.flavor = :chicken
-    end
-
-    def veggie?
-      return false unless Caseadilla::Engine.flavor = :veggie
-    end
-    
-    # def set_time_zone
-    #   Time.zone = current_user.time_zone if current_user
-    # end
-    
-    def redirect_back_or_default(default)
-      redirect_to(session[:return_to] || default)
-      session[:return_to] = nil
-    end
-
-    def sort_order(default)
-      "#{(params[:c] || default.to_s).gsub(/[\s;'\"]/,'')} #{'ASC' if params[:d] == 'up'} #{'DESC' if params[:d] == 'down'}"
-    end
-
-    def require_sign_in
-      redirect_to caseadilla_sign_in_path unless user_signed_in?
-    end
-
-  end
+module Caseadilla
+  class CaseadillaController < ApplicationController
+
+    require 'caseadilla/caseadilla_helper'
+    include Caseadilla::CaseadillaHelper
+
+    require 'caseadilla/config_helper'
+    include Caseadilla::ConfigHelper
+
+    layout 'caseadilla_main'
+
+    # before_filter :set_time_zone
+    before_action :require_sign_in
+    
+    ActionView::Base.field_error_proc = proc { |input, instance| "#{input}".html_safe }
+
+    def index		
+  		redirect_to caseadilla_config_dashboard_url
+    end
+
+  	def blank
+  		@caseadilla_page_title = "Welcome"
+  	end
+
+  private
+
+    def steak?
+      return false unless Caseadilla::Engine.flavor = :steak
+    end
+
+    def chicken?
+      return false unless Caseadilla::Engine.flavor = :chicken
+    end
+
+    def veggie?
+      return false unless Caseadilla::Engine.flavor = :veggie
+    end
+    
+    # def set_time_zone
+    #   Time.zone = current_user.time_zone if current_user
+    # end
+    
+    def redirect_back_or_default(default)
+      redirect_to(session[:return_to] || default)
+      session[:return_to] = nil
+    end
+
+    def sort_order(default)
+      "#{(params[:c] || default.to_s).gsub(/[\s;'\"]/,'')} #{'ASC' if params[:d] == 'up'} #{'DESC' if params[:d] == 'down'}"
+    end
+
+    def require_sign_in
+      redirect_to caseadilla_sign_in_path unless user_signed_in?
+    end
+
+  end
 end

data/app/controllers/caseadilla/caseadilla_user_sessions_controller.rb

@@ -1,36 +1,36 @@
-module Caseadilla
-  class CaseadillaUserSessionsController < Caseadilla::CaseadillaController
-    
-    skip_before_action :require_sign_in, :only => [:new, :create]
-    before_filter :requires_no_session_user, :except => [:destroy]
-  
-    layout 'caseadilla_auth'
-  
-    def new
-      @user_session = nil
-    end
-  
-    def create
-      @user_session = nil
-      if @user_session.save
-        redirect_back_or_default :controller => :caseadilla, :action => :index
-      else
-        render :action => :new
-      end
-    end
-  
-    def destroy
-      current_user_session.destroy
-      redirect_back_or_default new_caseadilla_user_session_url
-    end
-
-  private
-  
-    def requires_no_session_user
-      if current_user
-        redirect_to :controller => :caseadilla, :action => :index
-      end
-    end
-
-  end
+module Caseadilla
+  class CaseadillaUserSessionsController < Caseadilla::CaseadillaController
+    
+    skip_before_action :require_sign_in, :only => [:new, :create]
+    before_filter :requires_no_session_user, :except => [:destroy]
+  
+    layout 'caseadilla_auth'
+  
+    def new
+      @user_session = nil
+    end
+  
+    def create
+      @user_session = nil
+      if @user_session.save
+        redirect_back_or_default :controller => :caseadilla, :action => :index
+      else
+        render :action => :new
+      end
+    end
+  
+    def destroy
+      current_user_session.destroy
+      redirect_back_or_default new_caseadilla_user_session_url
+    end
+
+  private
+  
+    def requires_no_session_user
+      if current_user
+        redirect_to :controller => :caseadilla, :action => :index
+      end
+    end
+
+  end
 end

data/app/controllers/caseadilla/password_resets_controller.rb

@@ -1,64 +1,64 @@
-module Caseadilla
-  class PasswordResetsController < Caseadilla::CaseadillaController
-  
-    skip_before_filter :authorise
-    before_filter :load_user_using_perishable_token, :only => [:edit, :update]
-
-    layout 'caseadilla_auth'
-    
-    def create
-      users = Caseadilla::User.where(:email => params[:recover_email]).all
-
-      if users.length > 0
-        users.each do |user|
-          user.send_password_reset_instructions
-        end
-
-        if users.length > 1
-          flash[:notice] = "Multiple accounts were found. Emails have been sent to " + params[:recover_email] + " with instructions on how to reset your passwords"
-        else
-          flash[:notice] = "An email has been sent to " + params[:recover_email] + " with instructions on how to reset your password"
-        end
-      else
-        flash[:warning] = "There is no user with that email"
-      end
-
-      redirect_to new_caseadilla_user_session_url
-    end
-
-    def edit
-      render
-    end
-
-    def update
-      
-      if params[:caseadilla_user][:password].empty? || params[:caseadilla_user][:password_confirmation].empty?
-        flash.now[:warning] = "A field has been left empty"
-      else
-      
-        @reset_user.password = params[:caseadilla_user][:password]
-        @reset_user.password_confirmation = params[:caseadilla_user][:password_confirmation]
-      
-        if @reset_user.save
-          flash[:notice] = "Password successfully updated"
-          redirect_to new_caseadilla_user_session_url
-          return
-        end
-      end
-      
-      render :action => :edit
-    end
-
-  private
-    
-    def load_user_using_perishable_token
-      
-      @reset_user = Caseadilla::User.find_using_perishable_token params[:token]
-      
-      unless @reset_user
-        flash[:warning] = "Your account could not be located. Try to copy and paste the URL directly from the email."
-        redirect_to new_caseadilla_user_session_url
-      end
-    end
-  end
+module Caseadilla
+  class PasswordResetsController < Caseadilla::CaseadillaController
+  
+    skip_before_filter :authorise
+    before_filter :load_user_using_perishable_token, :only => [:edit, :update]
+
+    layout 'caseadilla_auth'
+    
+    def create
+      users = Caseadilla::User.where(:email => params[:recover_email]).all
+
+      if users.length > 0
+        users.each do |user|
+          user.send_password_reset_instructions
+        end
+
+        if users.length > 1
+          flash[:notice] = "Multiple accounts were found. Emails have been sent to " + params[:recover_email] + " with instructions on how to reset your passwords"
+        else
+          flash[:notice] = "An email has been sent to " + params[:recover_email] + " with instructions on how to reset your password"
+        end
+      else
+        flash[:warning] = "There is no user with that email"
+      end
+
+      redirect_to new_caseadilla_user_session_url
+    end
+
+    def edit
+      render
+    end
+
+    def update
+      
+      if params[:caseadilla_user][:password].empty? || params[:caseadilla_user][:password_confirmation].empty?
+        flash.now[:warning] = "A field has been left empty"
+      else
+      
+        @reset_user.password = params[:caseadilla_user][:password]
+        @reset_user.password_confirmation = params[:caseadilla_user][:password_confirmation]
+      
+        if @reset_user.save
+          flash[:notice] = "Password successfully updated"
+          redirect_to new_caseadilla_user_session_url
+          return
+        end
+      end
+      
+      render :action => :edit
+    end
+
+  private
+    
+    def load_user_using_perishable_token
+      
+      @reset_user = Caseadilla::User.find_using_perishable_token params[:token]
+      
+      unless @reset_user
+        flash[:warning] = "Your account could not be located. Try to copy and paste the URL directly from the email."
+        redirect_to new_caseadilla_user_session_url
+      end
+    end
+  end
 end