diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/general.yml-example | 5 | ||||
| -rw-r--r-- | config/packages | 1 | ||||
| -rw-r--r-- | config/packages_development | 9 | ||||
| -rw-r--r-- | config/routes.rb | 14 |
4 files changed, 18 insertions, 11 deletions
diff --git a/config/general.yml-example b/config/general.yml-example index 17e1aa552..0753af46b 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -187,3 +187,8 @@ MTA_LOG_PATH: '/var/log/exim4/exim-mainlog-*' # Whether we are using "exim" or "postfix" for our MTA MTA_LOG_TYPE: "exim" + +# URL where people can donate to the organisation running the site. If set, +# this will be included in the message people see when their request is +# successful. +DONATION_URL: "http://www.mysociety.org/donate/" diff --git a/config/packages b/config/packages index fc67cda6b..f4d0a674c 100644 --- a/config/packages +++ b/config/packages @@ -20,7 +20,6 @@ gnuplot-nox php5-cli sharutils unzip -wdg-html-validator mutt tnef (>= 1.4.5) gettext diff --git a/config/packages_development b/config/packages_development new file mode 100644 index 000000000..14ca815a2 --- /dev/null +++ b/config/packages_development @@ -0,0 +1,9 @@ +# This is a list of packages needed on a fresh Ubuntu installation for +# development. +# +# It assumes you're using RVM or a similar Ruby manager and have already +# run `bundle install`. +# +# To install, paste this list after `sudo apt-get install` and run. + +postgresql sharutils pdftk elinks php5-cli tnef python-yaml diff --git a/config/routes.rb b/config/routes.rb index 1895543d7..062973e37 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,7 +14,6 @@ Alaveteli::Application.routes.draw do #### General contoller match '/' => 'general#frontpage', :as => :frontpage match '/blog' => 'general#blog', :as => :blog - match '/stylesheets/custom.css' => 'general#custom_css', :as => :custom_css match '/search' => 'general#search_redirect', :as => :search_redirect match '/search/all' => 'general#search_redirect', :as => :search_redirect # XXX combined is the search query, and then if sorted a "/newest" at the end. @@ -24,8 +23,6 @@ Alaveteli::Application.routes.draw do match '/search/*combined/all' => 'general#search', :as => :search_general, :view => 'all' match '/search(/*combined)' => 'general#search', :as => :search_general match '/advancedsearch' => 'general#search_redirect', :as => :advanced_search, :advanced => true - - match '/random' => 'general#random_request', :as => :random_request ##### ##### Request controller @@ -59,15 +56,12 @@ Alaveteli::Application.routes.draw do match '/upload/request/:url_title' => 'request#upload_response', :as => :upload_response match '/request/:url_title/download' => 'request#download_entire_request', :as => :download_entire_request - - # It would be nice to add :conditions => { :method => :post } to this next one, - # because it ought not really to be available as a GET request since it changes - # the server state. Unfortunately this doesn’t play well with the PostRedirect - # mechanism, which assumes all post-login actions are available via GET, so we - # refrain. - match '/request/:url_title/report' => 'request#report_request', :as => :report #### + resources :request, :only => [] do + resource :report, :only => [:new, :create] + end + #### User controller # Use /profile for things to do with the currently signed in user. # Use /user/XXXX for things that anyone can see about that user. |