github-migration/collab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added page title

Browse Source
This commit is contained in:
scott 2010-03-06 03:00:02 -05:00
parent e66527947b
commit 497f06e5bc
6 changed files with 84 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -2,11 +2,13 @@
# Likewise, all the methods added will be available for all controllers. # Likewise, all the methods added will be available for all controllers.
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
before_filter :authenticate before_filter :authenticate, :set_page
include Clearance::Authentication include Clearance::Authentication
#helper :all # include all helpers, all the time #helper :all # include all helpers, all the time
protect_from_forgery # See ActionController::RequestForgeryProtection for details protect_from_forgery # See ActionController::RequestForgeryProtection for details
# Scrub sensitive parameters from your log # Scrub sensitive parameters from your log
# filter_parameter_logging :password # filter_parameter_logging :password
def set_page
@page_title = "Collab"
end
end end

11
app/controllers/application_controller.rb~ Normal file
View File

@ -0,0 +1,11 @@
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will be available for all controllers.
class ApplicationController < ActionController::Base
before_filter :authenticate
include Clearance::Authentication
#helper :all # include all helpers, all the time
protect_from_forgery # See ActionController::RequestForgeryProtection for details
# Scrub sensitive parameters from your log
# filter_parameter_logging :password
end

2
app/views/layouts/application.html.erb
View File

@ -5,6 +5,8 @@
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js",
:defaults %> :defaults %>
<%= stylesheet_link_tag 'scaffold', 'style', 'formtastic', 'formtastic_changes', :cache => :all %> <%= stylesheet_link_tag 'scaffold', 'style', 'formtastic', 'formtastic_changes', :cache => :all %>
<%= yield :head %>
<title><%= @page_title %></title>
</head> </head>
<body> <body>
<div id='header'> <div id='header'>

1
app/views/layouts/application.html.erb~
View File

@ -5,6 +5,7 @@
"http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js",
:defaults %> :defaults %>
<%= stylesheet_link_tag 'scaffold', 'style', 'formtastic', 'formtastic_changes', :cache => :all %> <%= stylesheet_link_tag 'scaffold', 'style', 'formtastic', 'formtastic_changes', :cache => :all %>
<%= yield :head %>
</head> </head>
<body> <body>
<div id='header'> <div id='header'>

6
public/stylesheets/style.css
View File

@ -3,6 +3,10 @@
padding:0; padding:0;
} }
h1 {
padding-top:10px
}
div.flash { div.flash {
width:1000px; width:1000px;
margin-left:auto; margin-left:auto;
@ -54,4 +58,4 @@ div#wrapper {
width:1000px; width:1000px;
margin-top:30px; margin-top:30px;
background-color:white; background-color:white;
} }

61
public/stylesheets/style.css~ Normal file
View File

@ -0,0 +1,61 @@
* {
margin:0;
padding:0;
}
h1 {
margin-top:10px
}
div.flash {
width:1000px;
margin-left:auto;
margin-right:auto;
padding:5px;
background-color:white;
margin-top:20px;
}
div#flash_error {
color:red;
border:red 5px solid;
}
div#flash_notice {
color:blue;
border:blue 5px solid;
}
div#flash_success {
color:green;
border:green 5px solid;
}
table.task_list tr.odd{
background-color:#ddd;
}
table.task_list tr.even{
}
body {
background-color:gray;
}
div#header {
width:1000px;
margin-left:auto;
margin-right:auto;
font-size:24;
font-weight:bold;
}
div#wrapper {
margin-left:auto;
margin-right:auto;
width:1000px;
margin-top:30px;
background-color:white;
}