Safeguarding the past, present and future of RISC OS for everyone
Account
News | Downloads | Bugs | Bounties | Forums | Library
You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.
  • Changesets
  • » Changeset 74

Changeset 74

Reapplied changes to Typo 4.0.0 from previous version in order to
configure it for use on the RISC OS Open site. Hopefully, the RISC
OS Open theme can be sorted out so that it works with no further
core changes.

Note that this configured v4.0.0 installation has not been tested.

  • Comitted by: adh
  • Date: Monday August 07 22:34:29 2006 (over 18 years ago)

Affected files:

  • Deleted rool/rails/typo/trunk/config/database.yml-
  • Updated rool/rails/typo/trunk/app/controllers/redirect_controller.rb (diff)
  • Updated rool/rails/typo/trunk/config/environment.rb (diff)
  • Updated rool/rails/typo/trunk/config/routes.rb (diff)
  • Updated rool/rails/typo/trunk/public/dispatch.cgi (diff)
  • Updated rool/rails/typo/trunk/public/dispatch.fcgi (diff)
  • Updated rool/rails/typo/trunk/public/dispatch.rb (diff)

rool/rails/typo/trunk/app/controllers/redirect_controller.rb:

prev.current 
path = url_root + path unless url_root.nil? or path[0,url_root.length] == url_root
redirect_to path
else
13   render :text => "Page not found", :status => 404
  13 render :text => '<html><head><title>Page not found</title></head><body>Internal redirection error - page not found.<br>Please consult the system adminstrator.</body></html>', :status => 404
end
end
end

rool/rails/typo/trunk/config/environment.rb:

prev.current 
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
  10 # Location of application relative to document root in terms of
  11 # URLs (i.e. according to the web server configuration, not the
  12 # filesystem location).
  13
  14 PATH_PREFIX = '/rails/typo'
  15
Rails::Initializer.run do |config|
  17 # We don't run in the document root, so images etc. must come from
  18 # a non-root location too. Hijack the 'asset host' facility to get
  19 # helper-based links pointing in the right place.
  20 config.action_controller.asset_host = PATH_PREFIX
  21
# Skip frameworks you're not going to use
# config.frameworks -= [ :action_web_service, :action_mailer ]
... ...
# Force all environments to use the same logger level
# (by default production uses :info, the others :debug)
37   # config.log_level = :debug
  48 config.log_level = :warn
# Use the database for sessions instead of the file system
# (create the session table with 'rake create_sessions_table')
... ...
# Include your application configuration below
  83 # Allow multiple Rails applications by giving the session cookie a
  84 # unique prefix.
  85
  86 ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:session_key] = 'typoapp_session_id'
  87
# Load included libraries.
require 'redcloth'
require 'bluecloth'

rool/rails/typo/trunk/config/routes.rb:

prev.current 
ActionController::Routing::Routes.draw do |map|
# default
4   map.index '', :controller => 'articles', :action => 'index'
5   map.admin 'admin', :controller => 'admin/general', :action => 'index'
  4 map.index PATH_PREFIX + '/', :controller => 'articles', :action => 'index'
  5 map.admin PATH_PREFIX + '/admin', :controller => 'admin/general', :action => 'index'
# admin/comments controller needs parent article id
8   map.connect 'admin/comments/article/:article_id/:action/:id',
  8 map.connect PATH_PREFIX + '/admin/comments/article/:article_id/:action/:id',
:controller => 'admin/comments', :action => nil, :id => nil
10   map.connect 'admin/trackbacks/article/:article_id/:action/:id',
  10 map.connect PATH_PREFIX + '/admin/trackbacks/article/:article_id/:action/:id',
:controller => 'admin/trackbacks', :action => nil, :id => nil
12   map.connect 'admin/content/:action/:id', :controller => 'admin/content'
  12 map.connect PATH_PREFIX + '/admin/content/:action/:id', :controller => 'admin/content'
# make rss feed urls pretty and let them end in .xml
# this improves caches_page because now apache and webrick will send out the
# cached feeds with the correct xml mime type.
17   map.xml 'xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'
18   map.xml 'xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'
19   map.xml 'xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'
20   map.xml 'xml/trackbackrss/feed.xml', :controller => 'xml', :action => 'trackbackrss'
  17 map.xml PATH_PREFIX + '/xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'
  18 map.xml PATH_PREFIX + '/xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'
  19 map.xml PATH_PREFIX + '/xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'
  20 map.xml PATH_PREFIX + '/xml/trackbackrss/feed.xml', :controller => 'xml', :action => 'trackbackrss'
22   map.xml 'xml/:format/feed.xml', :controller => 'xml', :action => 'feed', :type => 'feed'
23   map.xml 'xml/:format/:type/feed.xml', :controller => 'xml', :action => 'feed'
24   map.xml 'xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'
25   map.xml 'xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'
26   map.xml 'sitemap.xml', :controller => 'xml', :action => 'feed', :format => 'googlesitemap', :type => 'sitemap'
27  
  22 map.xml PATH_PREFIX + '/xml/:format/feed.xml', :controller => 'xml', :action => 'feed', :type => 'feed'
  23 map.xml PATH_PREFIX + '/xml/:format/:type/feed.xml', :controller => 'xml', :action => 'feed'
  24 map.xml PATH_PREFIX + '/xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'
  25 map.xml PATH_PREFIX + '/xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'
  26 map.xml PATH_PREFIX + '/sitemap.xml', :controller => 'xml', :action => 'feed', :format => 'googlesitemap', :type => 'sitemap'
  27
# allow neat perma urls
29   map.connect 'articles',
  29 map.connect PATH_PREFIX + '/articles',
:controller => 'articles', :action => 'index'
31   map.connect 'articles/page/:page',
  31 map.connect PATH_PREFIX + '/articles/page/:page',
:controller => 'articles', :action => 'index',
:page => /\d+/
35   map.connect 'articles/:year/:month/:day',
  35 map.connect PATH_PREFIX + '/articles/:year/:month/:day',
:controller => 'articles', :action => 'find_by_date',
:year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
38   map.connect 'articles/:year/:month',
  38 map.connect PATH_PREFIX + '/articles/:year/:month',
:controller => 'articles', :action => 'find_by_date',
:year => /\d{4}/, :month => /\d{1,2}/
41   map.connect 'articles/:year',
  41 map.connect PATH_PREFIX + '/articles/:year',
:controller => 'articles', :action => 'find_by_date',
:year => /\d{4}/
45   map.connect 'articles/:year/:month/:day/page/:page',
  45 map.connect PATH_PREFIX + '/articles/:year/:month/:day/page/:page',
:controller => 'articles', :action => 'find_by_date',
:year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/, :page => /\d+/
48   map.connect 'articles/:year/:month/page/:page',
  48 map.connect PATH_PREFIX + '/articles/:year/:month/page/:page',
:controller => 'articles', :action => 'find_by_date',
:year => /\d{4}/, :month => /\d{1,2}/, :page => /\d+/
51   map.connect 'articles/:year/page/:page',
  51 map.connect PATH_PREFIX + '/articles/:year/page/:page',
:controller => 'articles', :action => 'find_by_date',
:year => /\d{4}/, :page => /\d+/
55   map.connect 'articles/:year/:month/:day/:title',
  55 map.connect PATH_PREFIX + '/articles/:year/:month/:day/:title',
:controller => 'articles', :action => 'permalink',
:year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
59   map.connect 'articles/category/:id',
  59 map.connect PATH_PREFIX + '/articles/category/:id',
:controller => 'articles', :action => 'category'
61   map.connect 'articles/category/:id/page/:page',
  61 map.connect PATH_PREFIX + '/articles/category/:id/page/:page',
:controller => 'articles', :action => 'category',
:page => /\d+/
65   map.connect 'articles/tag/:id',
  65 map.connect PATH_PREFIX + '/articles/tag/:id',
:controller => 'articles', :action => 'tag'
67   map.connect 'articles/tag/:id/page/:page',
  67 map.connect PATH_PREFIX + '/articles/tag/:id/page/:page',
:controller => 'articles', :action => 'tag',
:page => /\d+/
71   map.connect 'pages/*name',:controller => 'articles', :action => 'view_page'
  71 map.connect PATH_PREFIX + '/pages/*name',:controller => 'articles', :action => 'view_page'
73   map.connect 'stylesheets/theme/:filename',
  73 map.connect PATH_PREFIX + '/stylesheets/theme/:filename',
:controller => 'theme', :action => 'stylesheets'
75   map.connect 'javascript/theme/:filename',
  75 map.connect PATH_PREFIX + '/javascript/theme/:filename',
:controller => 'theme', :action => 'javascript'
77   map.connect 'images/theme/:filename',
  77 map.connect PATH_PREFIX + '/images/theme/:filename',
:controller => 'theme', :action => 'images'
80   map.connect 'plugins/filters/:filter/:public_action',
  80 map.connect PATH_PREFIX + '/plugins/filters/:filter/:public_action',
:controller => 'textfilter', :action => 'public_action'
# Kill attempts to connect directly to the theme controller.
# Ideally we'd disable these by removing the default route (below),
# but that breaks too many things for Typo 2.5.
86   map.connect 'theme/*stuff',
  86 map.connect PATH_PREFIX + '/theme/*stuff',
:controller => 'theme', :action => 'error'
# Allow legacy urls to still work
90   map.connect ':controller/:action/:id'
  90 map.connect PATH_PREFIX + '/:controller/:action/:id'
92   map.connect '*from', :controller => 'redirect', :action => 'redirect'
  92 map.connect PATH_PREFIX + '/*from', :controller => 'redirect', :action => 'redirect'
end

rool/rails/typo/trunk/public/dispatch.cgi:

prev.current 
1   #!/usr/bin/env ruby
  1 #!/bin/env ruby
require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

rool/rails/typo/trunk/public/dispatch.fcgi:

prev.current 
1   #!/usr/bin/env ruby
  1 #!/bin/env ruby
#
# You may specify the path to the FastCGI crash log (a log of unhandled
# exceptions which forced the FastCGI instance to exit, great for debugging)

rool/rails/typo/trunk/public/dispatch.rb:

prev.current 
1   #!/usr/bin/ruby
  1 #!/bin/ruby
require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

Search tickets

Social

Follow us on and

ROOL Store

Buy RISC OS Open merchandise here, including SD cards for Raspberry Pi and more.

Donate! Why?

Help ROOL make things happen – please consider donating!

RISC OS IPR

RISC OS is an Open Source operating system owned by RISC OS Developments Ltd and licensed primarily under the Apache 2.0 license.

Options

  • Tickets
  • New ticket
  • Milestones
  • Subversion: Changesets
  • Subversion: Browse
  • CVS: Revisions
  • CVS: Browse
  • Search

RSS feeds Rss

  • Changesets
  • Everything!
  • More feeds...
Contact Us  |  About Us

The RISC OS Open Collaboa theme is distantly based on the Collaboa default layout
Site design © RISC OS Open Limited 2024 except where indicated

Hosted by Arachsys

Powered by Collaboa
This site runs on Rails