adminpanel 0.0.2 → 0.0.3

data/Gemfile

@@ -9,5 +9,4 @@ gem "rmagick", "2.13.2"
 gem "ckeditor", "4.0.6"
 gem "jquery-rails", "3.0.4"
 gem "bcrypt-ruby", "3.0.0"
-gem "rails-i18n", "3.0.0"
-gem "ckeditor",
+gem "rails-i18n", "3.0.0"

data/app/controllers/adminpanel/application_controller.rb

@@ -1,18 +1,18 @@
 module Adminpanel
     class ApplicationController < ::ApplicationController
             layout "admin"
-              # protect_from_forgery
-            # include helper :sessions
+              protect_from_forgery
+            include SessionsHelper
 
-            # before_filter :signed_in_user
+            before_filter :signed_in_user
 
-            # def signed_in_user
-            #         redirect_to signin_url, :notice => "Favor de Iniciar sesion" unless signed_in?
-            # end
+            def signed_in_user
+                redirect_to signin_url, :notice => "Favor de Iniciar sesion" unless signed_in?
+            end
 
-            # def handle_unverified_request
-            #         sign_out
-            #         super
-            # end
+            def handle_unverified_request
+                sign_out
+                super
+            end
     end
 end

data/app/controllers/adminpanel/sessions_controller.rb

@@ -7,7 +7,7 @@ module Adminpanel
 		end
 
 		def create
-			user = Admin::User.find_by_email(params[:session][:email].downcase)
+			user = User.find_by_email(params[:session][:email].downcase)
 			if user && user.authenticate(params[:session][:password])
 					sign_in user
 					flash[:success] = "Bienvenido!"

data/app/helpers/adminpanel/application_helper.rb

@@ -1,5 +1,6 @@
 module Adminpanel
 	module ApplicationHelper
+		include SessionsHelper
 		def custom_form_for(name, *args, &block)
 			options = args.extract_options!
 			options.reverse_merge! :builder => CustomFormBuilder, :html => { :class => "form-horizontal" }
@@ -36,28 +37,6 @@ module Adminpanel
 			'#', :class => "add_fields", :data => {:id => id, :fields => fields.gsub("\n", "")})
 		end
 
-		def sign_in(user)
-			cookies.permanent[:remember_token] = user.remember_token
-			self.current_user = user
-		end
-
-		def signed_in?
-			!current_user.nil?
-		end
-
-		def current_user=(user)
-			@current_user = user
-		end
-
-		def current_user
-			@current_user ||= User.find_by_remember_token(cookies[:remember_token])
-		end
-
-		def sign_out
-			self.current_user = nil
-			cookies.delete(:remember_token)
-		end
-
 		def initialize_breadcrumb
 			@breadcrumb ||= [:title => 'Inicio', :url => root_url] 
 		end

data/app/helpers/adminpanel/sessions_helper.rb

@@ -0,0 +1,26 @@
+module Adminpanel
+	module SessionsHelper
+
+		def sign_in(user)
+			cookies.permanent[:remember_token] = user.remember_token
+			self.current_user = user
+		end
+
+		def signed_in?
+			!current_user.nil?
+		end
+
+		def current_user=(user)
+			@current_user = user
+		end
+
+		def current_user
+			@current_user ||= User.find_by_remember_token(cookies[:remember_token])
+		end
+
+		def sign_out
+			self.current_user = nil
+			cookies.delete(:remember_token)
+		end
+	end
+end

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

@@ -0,0 +1,11 @@
+<% content_for :login do %>
+  <div class="row-fluid">
+    <div class="span12">
+      	<div class="row-fluid">
+			<%= yield %>
+    	</div><!--/row-fluid-->
+    <%= debug(params) if Rails.env.development? %>
+    </div><!--/span10-->
+  </div><!--/row-fluid-->
+<% end %>
+<%= render :template => 'layouts/admin' %>

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -255,6 +255,7 @@ files:
 - app/controllers/adminpanel/sessions_controller.rb
 - app/controllers/adminpanel/users_controller.rb
 - app/helpers/adminpanel/application_helper.rb
+- app/helpers/adminpanel/sessions_helper.rb
 - app/helpers/custom_form_builder.rb
 - app/models/adminpanel/category.rb
 - app/models/adminpanel/contact.rb
@@ -303,6 +304,7 @@ files:
 - app/views/layouts/_side_menu.html.erb
 - app/views/layouts/_top_bar.html.erb
 - app/views/layouts/admin.html.erb
+- app/views/layouts/sessions.html.erb
 - app/views/shared/_breadcrumb.html.erb
 - app/views/shared/_error_messages.html.erb
 - config/locales/en.yml