app/controllers/login_controller.rb app/helpers/login_helper.rb app/views/home/_footer.html.erb app/views/home/_header.html.erb app/views/home/_menu.html.erb app/views/layouts/login.html.erb app/views/login/login.html.erb public/images/main_bg.gif test/functional/login_controller_test.rb @@ -36,12 +36,16 @@ Report Bugs: http://railsdb.lighthouseapp.com/projects/12472-railsdb/overview -Contact +Contact: Greg Donald gdonald@gmail.com http://destiney.com/ +Contributors: +Jacek Panachida +jacek.panachida@gmail.com + Ruby on Rails: For more information about Ruby on Rails see the RAILS_README.txt. README.txt @@ -14,7 +14,9 @@ class ApplicationController < ActionController::Base @current_user = nil return end - @current_user = User.find( :first, :conditions => [ 'id = ?', session[:user_id] ] ) + @current_user = User.find( :first, + :conditions => [ 'id = ?', + session[:user_id] ] ) end # app/controllers/application.rb @@ -1,5 +1,7 @@ class DatabaseController < ApplicationController + before_filter :check_perm + require 'paginator' require 'export/dsv_exporter' @@ -334,7 +336,7 @@ class DatabaseController < ApplicationController checked_field_names = (params[:field].delete_if { |k,v| v == '0' }).keys rows = @table.find(:all, :select => "#{checked_field_names.join(',')}") export_data = [] - rows.each { |r| export_data << r.values } + rows.each { |r| export_data << r.values } format = params[:format] delimiter = ',' type = 'text/csv' @@ -350,10 +352,20 @@ class DatabaseController < ApplicationController exporter.header = params[:field].keys send_data exporter.export_as_text(export_data), :filename => "#{@database.name}$#{params[:table]}.csv", :type => type end - + private # + # Check site login + # + def check_perm + unless check_site_perm 'admin' + flash[:notice] = 'please login' + redirect_to :controller => :login + end + end + + # # Finds a table row by table and id # def get_row( table, id ) @@ -404,5 +416,5 @@ class DatabaseController < ApplicationController :action => :databases end end - + end app/controllers/database_controller.rb @@ -1,21 +1,9 @@ class HomeController < ApplicationController - - before_filter :check_perm, :except => [ :login, :logout ] - filter_parameter_logging :password - - layout :get_layout + before_filter :check_perm def index - end - - def top - end - - def menu - end - - def bottom + redirect_to :controller => :home, :action => :databases end def databases @@ -289,33 +277,12 @@ class HomeController < ApplicationController end end - def login - session[:user_id] = nil - if request.post? - user = User.authenticate( params[:login][:username], params[:login][:password] ) - if user - session[:user_id] = user.id - uri = session[:uri] - session[:uri] = nil - flash[:notice] = 'login successful' - redirect_to uri || { :controller => 'home' } - else - flash[:notice] = 'login failed' - end - end - end - - def logout - reset_session - redirect_to :controller => :home, :action => :login - end - private def check_perm unless check_site_perm 'admin' flash[:notice] = 'please login' - redirect_to :controller => 'home', :action => 'login' + redirect_to :controller => :login end end @@ -342,7 +309,7 @@ class HomeController < ApplicationController redirect_to :controller => 'home', :action => 'permissions' end end - + def get_driver( id ) @driver = Driver.find( :first, :conditions => [ 'id = ?', id ] ) if @driver.nil? @@ -350,7 +317,7 @@ class HomeController < ApplicationController redirect_to :controller => 'home', :action => 'drivers' end end - + def get_database( id ) @database = Database.find( :first, :conditions => [ 'id = ?', id ] ) if @database.nil? @@ -359,8 +326,4 @@ class HomeController < ApplicationController end end - def get_layout - ( %w( index top menu bottom login ).include? self.action_name ) ? nil : 'application' - end - end app/controllers/home_controller.rb @@ -1,21 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title><%= SITE_TITLE %></title> -<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> -<script language="javascript" type="text/javascript"> -if(top.location != self.location) top.location = self.location; -</script> -<base target="main" /> -</head> -<frameset rows="60,*,18" border="0" frameborder="0"> -<frame src="<%= url_for :controller => 'home', :action => 'top' %>" name="top" border="0" frameborder="0" /> -<frameset cols="160,*" border="0" frameborder="0"> -<frame src="<%= url_for :controller => 'home', :action => 'menu' %>" name="menu" border="0" frameborder="0" /> -<frame src="<%= url_for :controller => 'home', :action => 'databases' %>" name="main" border="0" frameborder="0" /> -</frameset> -<frame src="<%= url_for :controller => 'home', :action => 'bottom' %>" name="bottom" border="0" frameborder="0" /> -</frameset> -</html> app/views/home/index.html.erb @@ -6,13 +6,25 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <%= javascript_include_tag :defaults %> <%= stylesheet_link_tag 'railsdb' %> - <base target="main" /> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> </head> <body> +<div id="header"> +<%= render :partial => 'home/header' %> +</div> +<div id="main"> +<div id="menu"> +<%= render :partial => 'home/menu' %> +</div> +<div id="content"> <% if flash[:notice] -%> <p class="error"><%= flash[:notice] %></p> <% end -%> <%= yield :layout %> +</div> +</div> +<div id="footer"> +<%= render :partial => 'home/footer' %> +</div> </body> </html> app/views/layouts/application.html.erb @@ -84,7 +84,7 @@ ActionController::Routing::Routes.draw do |map| :requirements => { :id => /[0-9]{1,11}/, :table => /[\.0-9a-z\-_]{1,64}/, :field => /[\.0-9a-z\-_]{1,64}/ } - + map.connect 'database/export/:id', :controller => 'database', :action => 'export_table', @@ -142,8 +142,16 @@ ActionController::Routing::Routes.draw do |map| :action => 'index', :requirements => { :id => /[0-9]{1,11}/ } + map.connect 'logout', + :controller => 'login', + :action => 'logout' + + map.connect 'login', + :controller => 'login', + :action => 'login' + # You can have the root of your site routed with map.root -- just remember to delete public/index.html. - map.root :controller => 'home' + map.root :controller => 'home', :action => 'databases' # See how all your routes lay out with "rake routes" config/routes.rb @@ -1,3 +1,8 @@ +body +{ + background-color: #fff; +} + body, form { margin: 0; @@ -20,8 +25,8 @@ h1 h2 { - padding: 0 0 0 10px; - margin: 8px 0 0 0; + padding: 8px 0 0 10px; + margin: 0 0 0 0; } a @@ -74,8 +79,8 @@ a:hover p.error { - margin: 10px 0 0 0; - padding: 0 0 0 10px; + margin: 0 0 0 0; + padding: 10px 0 0 10px; } table.data, table.form @@ -134,36 +139,37 @@ table.data thead a:hover background-color: inherit; } -#top +#header { - width: 100%; - border-collapse: collapse; - overflow: hidden; + background-color: #ccc; } -#top td +#header table { - padding: 0; + margin: 0 0 0 0; + width: 100%; + border-collapse: collapse; + border-bottom: 1px solid #000; } -#top .l, #top .a +#header .l, #header .a { text-align: right; padding: 5px 5px 1px 0; } -#top .a +#header .a { font-size: 17px; } -#top .l +#header .l { vertical-align: bottom; - padding: 12px 5px 0 0; + padding: 12px 5px 3px 0; } -#top .t +#header .t { font-size: 25px; font-weight: bold; @@ -171,43 +177,56 @@ table.data thead a:hover padding: 0 0 5px 8px; } -#bottom +#main +{ + min-height: 480px; + background: url(/images/main_bg.gif) repeat-y; +} + +#footer table { + border-top: 1px solid #000; width: 100%; } -#bottom td +#footer table td { font-size: 11px; text-align: right; - padding: 2px 2px 0 0; + padding: 2px 4px 0 0; vertical-align: top; height: 11px; } #menu { - width: 100%; + float: left; border-collapse: collapse; - margin: 6px 0 0 0; + margin: 0 0 0 0; } -#menu td +#menu table { + margin: 4px 10px 0 0; +} + +#menu table td +{ + width: 132px; text-align: right; - padding: 5px 10px 0 0; + padding: 0 6px 2px 0; } #menu a { font-size: 15px; - color: #ccc; + color: #333; background-color: inherit; } #menu a:hover { - color: #fff; + color: #000; background-color: inherit; } public/stylesheets/railsdb.css app/views/home/bottom.html.erb app/views/home/login.html.erb app/views/home/menu.html.erb app/views/home/top.html.erb f3f79a1a321c763405632a02b6d70287ec270d26 Greg Donald gdonald@gmail.com http://github.com/gdonald/railsdb/commit/690341aa901b3c321aa2304af016094a2484a6ae 690341aa901b3c321aa2304af016094a2484a6ae

2008-06-22T12:56:11-07:00

get rid of frames 725ae9b1c7aafbe636432e95afadafc89438e3c0 Greg Donald gdonald@gmail.com