Added specific login page for the gallery

Benzene · Aug 31, 2010 · d4ef0e8 · d4ef0e8
1 parent 1f018ed
commit d4ef0e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/runner.rb b/runner.rb
@@ -16,9 +16,11 @@ class Gallery < Sinatra::Base
 
 	before do
 		if @env['rack.session']['uid'] then
-			puts @env['rack.session']['uid']
-		else
-			redirect '/'
+			if @request.path_info == '/login' then
+				redirect '/gallery/'
+			end
+		elsif @request.path_info != '/login' then
+			redirect '/gallery/login'
 		end
 	end
 
@@ -29,6 +31,10 @@ class Gallery < Sinatra::Base
 		@title = "Albums"
 		haml :index
 	end
+
+	get '/login' do
+		haml :login
+	end
 
 	get '/t/:tag/' do
 		@tag = Tag.get(params[:tag])

diff --git a/views/layout.haml b/views/layout.haml
@@ -9,4 +9,5 @@
       %script{ :type => 'text/javascript', :src => '/static/gallery/' + js + '.js' }
 
   %body
+    #loginbox
     = yield
diff --git a/views/login.haml b/views/login.haml