Small fix concerning static serving with Passenger; updated gitignore.
This commit is contained in:
parent
cfb8fd37ee
commit
08a7ef3c01
|
@ -1,4 +1,7 @@
|
||||||
.sass-cache
|
.sass-cache
|
||||||
|
htpasswd
|
||||||
|
db/*
|
||||||
public/*.pdf
|
public/*.pdf
|
||||||
public/*.tex
|
public/*.tex
|
||||||
public/stylesheets/*.css
|
public/stylesheets/*.css
|
||||||
|
tmp/*
|
||||||
|
|
|
@ -982,7 +982,7 @@ module StopTime::Controllers
|
||||||
#
|
#
|
||||||
# path:: /static/_path_
|
# path:: /static/_path_
|
||||||
# view:: N/A (X-Sendfile)
|
# view:: N/A (X-Sendfile)
|
||||||
class Static < R '/static/(.+)'
|
class Static < R '/static/(.*?)'
|
||||||
# Sets the headers such that the web server will fetch and offer
|
# Sets the headers such that the web server will fetch and offer
|
||||||
# the file identified by the _path_ relative to the +public/+ subdirectory.
|
# the file identified by the _path_ relative to the +public/+ subdirectory.
|
||||||
def get(path)
|
def get(path)
|
||||||
|
@ -1007,8 +1007,10 @@ module StopTime::Views
|
||||||
xhtml_strict do
|
xhtml_strict do
|
||||||
head do
|
head do
|
||||||
title "Stop… Camping Time!"
|
title "Stop… Camping Time!"
|
||||||
|
# FIXME: improve static serving so that the hack below is not needed.
|
||||||
link :rel => "stylesheet", :type => "text/css",
|
link :rel => "stylesheet", :type => "text/css",
|
||||||
:media => "screen", :href => R(Static, "stylesheets/style.css")
|
:media => "screen",
|
||||||
|
:href => (R(Static, "") + "stylesheets/style.css")
|
||||||
end
|
end
|
||||||
body do
|
body do
|
||||||
div.wrapper! do
|
div.wrapper! do
|
||||||
|
|
Loading…
Reference in New Issue