You are currently browsing the Subversion repository.
Changesets can be listed by changeset number.
The Git repository is here.

Changesets
» Changeset 158

Changeset 158

Reconfigured all applications for use in the ROOL account with its
new layout. All files are set up for the development branch of the
filesystem. Caught up in this changeset is an unrelated modification
to the directory listing routine in Radiant, which now sorts the
entries alphabetically.

Comitted by: rool
Date: Sunday December 10 19:28:59 2006 (over 17 years ago)

Affected files:

rool/perl/awstats/trunk/wwwroot/cgi-bin/awstats.conf:

prev.	current

		# If there is several log files from load balancing servers :
		# Example: "/pathtotools/logresolvemerge.pl *.log \|"
		#
51		~~LogFile="/home/adh/logs/accesslog"~~
	51	LogFile="/home/rool/devel/log/accesslog"


		# Enter the log file type you want to analyze.
...	...
		# Example: "ftp.domain.com"
		# Example: "domain.com"
		#
153		~~SiteDomain="pond.org.uk"~~
	153	SiteDomain="riscosopen.org"


		# Enter here all other possible domain names, addresses or virtual host
...	...
		# Note: You can also use @/mypath/myfile if list of aliases are in a file.
		# Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net\|org)$]"
		#
168		~~HostAliases="localhost 127.0.0.1 www.riscosopen.org www.riscosopen.org.uk www.riscosopen.com www.riscosopen.co.uk riscosopen.org riscosopen.org.uk riscosopen.com riscosopen.co.uk"~~
	168	HostAliases="82.211.77.172 127.1.9.204 www.riscosopen.org www.riscosopen.org.uk www.riscosopen.com www.riscosopen.co.uk riscosopen.org riscosopen.org.uk riscosopen.com riscosopen.co.uk"

		# If you want to have hosts reported by name instead of ip address, AWStats
		# need to make reverse DNS lookups (if not already done in your log file).
...	...
		# Example: "C:/awstats_data_dir"
		# Default: "." (means same directory as awstats.pl)
		#
202		~~DirData="/home/adh/perl/awstats/data"~~
	202	DirData="/home/rool/devel/perl/awstats/data"


		# Relative or absolute web URL of your awstats cgi-bin directory.
...	...
		# Example: "../icon"
		# Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
		#
221		~~DirIcons="/perl/awstats/icon"~~
	221	DirIcons="/stats/icon"


		# When this parameter is set to 1, AWStats add a button on report page to
...	...
		# Possible value: URL of javascript tracker file added in your HTML code.
		# Default: "/js/awstats_misc_tracker.js"
		#
795		~~MiscTrackerUrl="/perl/awstats/js/awstats_misc_tracker.js"~~
	795	MiscTrackerUrl="/stats/js/awstats_misc_tracker.js"

rool/perl/cvsweb/trunk/cvsweb.cgi:

prev.	current

		use filetest qw(access);

		# 2006-08-03 (ADH): Use additional local library files
62		~~use lib qw(/home/adh/perl/lib);~~
	62	use lib qw(/home/rool/perl/lib);

		use vars qw (
		$VERSION $CheckoutMagic $MimeTypes $DEBUG
...	...

		# == EDIT this ==
		# Locations to search for user configuration, in order:
220		~~for (catfile($mydir, 'cvsweb.conf'), '/home/adh/perl/cvsweb/cvsweb.conf') {~~
	220	for (catfile($mydir, 'cvsweb.conf'), '/home/rool/devel/perl/cvsweb/cvsweb.conf') {
		if (-r $_) {
		$config = $_;
		last;

rool/perl/cvsweb/trunk/cvsweb.conf:

prev.	current

		# cvsgraph (if you enable $allow_graph)
		# enscript (if you enable $allow_enscript)
		#
27		~~@command_path = qw(/bin /home/adh/local/bin);~~
	27	@command_path = qw(/bin /home/rool/local/bin);

		# Search the above directories for each command (prefer gtar over tar).
		#
...	...
		# 'symbolic_name' => ['Name to display', '/path/to/cvsroot']
		#
		@CVSrepositories = (
60		~~'risc_os_open' => ['RISC OS Open', '/home/adh/cvsroot'],~~
	60	'risc_os_open' => ['RISC OS Open', '/home/rool/cvsroot'],
		# 'freebsd' => ['FreeBSD', '/var/ncvs'],
		# 'openbsd' => ['OpenBSD', '/var/ncvs'],
		# 'netbsd' => ['NetBSD', '/var/ncvs'],
...	...
		# ports
		# sparc
		#);
102		~~$prcgi = "/rails/collaboa/tickets/%s";~~
	102	$prcgi = "/tracker/tickets/%s";
		$prkeyword = "Ticket";

		# Manual gateway linking. This will be done only for views for which
...	...
		# settings in the configuration file with command line options, see
		# doGraph() and doGraphView() in cvsweb.cgi for details.
		#
475		~~$cvsgraph_config = "/home/adh/local/etc/cvsgraph.conf";~~
	475	$cvsgraph_config = "/home/rool/local/etc/cvsgraph.conf";

		# URL to the CVSHistory script. This should be absolute (but does not need
		# to include the host and port if the script is on the same server as
		# CVSweb).
		#$cvshistory_url = "/python/cvshistory/cvshistory.cgi";
481		~~$cvshistory_url = "/rails/rcvsweb/history";~~
	481	$cvshistory_url = "/viewer/history";

		# Whether to allow downloading a tarball or a zip of the current directory.
		# While downloading of the entire repository is disallowed, depending on

rool/python/cvshistory/trunk/cvshistory.cgi:

prev.	current

		# Jamie Turner <jamwt@jamwt.com>

		##### USER EDITABLE SECTION #####
9		~~CONFIGFILE = "/home/adh/python/cvshistory/cvshistory.conf"~~
	9	CONFIGFILE = "/home/rool/devel/python/cvshistory/cvshistory.conf"
		# END OF USER EDITABLE SECTION!

rool/python/cvshistory/trunk/cvshistory.conf:

prev.	current

		# no cvsroot is explicitly asked.
		#
		HISTORY = {
9		~~'': "/home/adh/cvsroot/CVSROOT/history",~~
	9	'': "/home/rool/cvsroot/CVSROOT/history",
		}

		#
...	...
		#
		# The URL to your ViewCVS or CVSweb script, relative to the URL of CVSHistory.
		#
20		~~SCRIPTPATH = "/rails/rcvsweb/view"~~
	20	SCRIPTPATH = "/viewer/view"

		#
		# Time format: USTIME/WORLDTIME, for "3:42PM, June 14, 2007":
...	...

		# name and email address of site administrator
		# Example: "admin@someserver.com (The Admin)"
58		~~SITE_ADMIN = "cvshistory@pond.org.uk"~~
	58	SITE_ADMIN = "webmaster@riscosopen.org"

		# the domain where the author's email addresses are
		# This is used to build email addresses for the author item of the RSS feed,

rool/python/cvslog2web/trunk/config.py:

prev.	current

		# This setting controls the destination of the output
2		~~PERMALINKDIR="/home/adh/python/cvslog2web/public"~~
	2	PERMALINKDIR="/home/rool/devel/python/cvslog2web/public"
		if not os.path.exists(PERMALINKDIR):
		os.makedirs(PERMALINKDIR)
		FEEDOUT="cvslog2web.xml"
...	...
		REPEAT_FIRST_LINE=REPEAT_ALWAYS

		# Links to CVS server
15		~~DIFFLINKFORMAT="/rails/rcvsweb/view/%(path)s.diff?r1=%(oldversion)s&r2=%(newversion)s"~~
16		~~VIEWLINKFORMAT="/rails/rcvsweb/view/%(path)s?rev=%(newversion)s%(oldversion)s&content-type=text/vnd.viewcvs-markup"~~
	15	DIFFLINKFORMAT="/viewer/view/%(path)s.diff?r1=%(oldversion)s&r2=%(newversion)s"
	16	VIEWLINKFORMAT="/viewer/view/%(path)s?rev=%(newversion)s%(oldversion)s&content-type=text/vnd.viewcvs-markup"

		# List full module names
		DROP_MODULE=0
...	...
		HTMLOUT_MAXHISTORY=20

		# permanent link pages customization
38		~~PERMALINK_URL_PREFIX="/rails/rcvsweb/revisions/logs?ident="~~
	38	PERMALINK_URL_PREFIX="/viewer/revisions/logs?ident="
		PERMALINK_IMG_PREFIX="/python/cvslog2web/"
		PERMALINK_STRUCTURE="%s-%%(us)06d.html"
41		~~PERMALINK_ORDER=["<h1>CVS log entry from the <a href=\"/rails/rcvsweb/view/rool/\">ROOL CVS tree</a></h1>",PL_MESSAGE,PL_TIMESTAMP,PL_AUTHORS,PL_FILELIST,PL_PREVLINK,PL_NEXTLINK,PL_FEEDLINK]~~
	41	PERMALINK_ORDER=["<h1>CVS log entry from the <a href=\"/viewer/view/rool/\">ROOL CVS tree</a></h1>",PL_MESSAGE,PL_TIMESTAMP,PL_AUTHORS,PL_FILELIST,PL_PREVLINK,PL_NEXTLINK,PL_FEEDLINK]
		PERMALINK_STANDALONE=False
		PERMALINK_ADDJS=False
		PERMALINK_OUTERCLASS="cvslog2web_p_entry"
45		~~PERMALINK_STATUSICONS=["/rails/collaboa/images/chg-icon_A.png","/rails/collaboa/images/chg-icon_M.png","/rails/collaboa/images/chg-icon_D.png"]~~
	45	PERMALINK_STATUSICONS=["/tracker/images/chg-icon_A.png","/tracker/images/chg-icon_M.png","/tracker/images/chg-icon_D.png"]
		REBUILDPERMALINKS=True

rool/rails/collaboa/trunk/app/views/layouts/application.rhtml:

prev.	current

		<li>Subversion: <%= link_to 'Browse', :controller => '/repository', :action => 'browse', :path => nil -%></li>
		<% end -%>
		<% if current_user.view_changesets? -%>
99		~~<li>CVS: <a href="/rails/rcvsweb/revisions/">Revisions</a></li>~~
	99	<li>CVS: <a href="/viewer/revisions">Revisions</a></li>
		<% end -%>
		<% if current_user.view_code? -%>
102		~~<li>CVS: <a href="/rails/rcvsweb/view/">Browse</a></li>~~
	102	<li>CVS: <a href="/viewer/view">Browse</a></li>
		<% end -%>
		<% if current_user.view_tickets? -%>
		<li><%= link_to 'Search', :controller => '/search' -%></li>

rool/rails/collaboa/trunk/app/views/repository/_breadcrumbs.rhtml:

prev.	current

		You are currently browsing the <b>Subversion</b> repository.<br />
		Changesets can be listed by
		<%= link_to 'changeset number', { :controller=>'repository', :action=>'changesets' } %>.<br />
4		~~The CVS repository is <a href="/rails/rcvsweb/">here</a>.~~
	4	The CVS repository is <a href="/viewer">here</a>.

		<% if trail -%><div class="breadcrumbs"><%= path_breadcrumbs(params[:path], last_clickable) %></div><% end -%>

rool/rails/collaboa/trunk/config/database.yml:

prev.	current


		dbinfo: &dbinfo
		adapter: postgresql
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
	6	host: /home/rool/postgres/
	7	username: rool
		password: oiarfewa

		# Warning: The database defined as 'test' will be erased and

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

prev.	current

		# Bootstrap the Rails environment, frameworks, and default configuration
		require File.join(File.dirname(__FILE__), 'boot')

	10	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	11
		Rails::Initializer.run do \|config\|
		# We don't run in the document root, so images etc. must come from
		# a non-root location too. Hijack the 'asset host' facility to get
		# helper-based links pointing in the right place.
14		~~config.action_controller.asset_host = "/rails/collaboa"~~
	16	config.action_controller.asset_host = PATH_PREFIX

		# Skip frameworks you're not going to use
		config.frameworks -= [ :action_web_service, :action_mailer ]
...	...
		# unique prefix.

		ActionController::Base.session_options[:session_key] = 'collaboaapp_session_id'
66		~~ActionController::Base.session_options[:tmpdir] = "/home/adh/rails/collaboa/sessions/"~~

		# Make ruby use utf8
		$KCODE = 'u'

rool/rails/collaboa/trunk/config/repository.yml:

prev.	current

		production:
2		~~repos_path: /home/adh/svnroot~~
	2	repos_path: /home/rool/svnroot

		development:
5		~~repos_path: /home/adh/svnroot~~
	5	repos_path: /home/rool/svnroot

		test:
8		~~repos_path: /home/adh/svnroot~~
	8	repos_path: /home/rool/svnroot

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

prev.	current

		# map.connect 'products/:id', :controller => 'catalog', :action => 'view'
		# Keep in mind you can assign values other than :controller and :action

9		~~map.connect '/rails/collaboa/admin', :controller => 'admin/dashboard', :action => 'index'~~
	9	map.connect PATH_PREFIX + '/admin', :controller => 'admin/dashboard', :action => 'index'

11		~~map.connect '/rails/collaboa/repository/browse/*path',~~
	11	map.connect PATH_PREFIX + '/repository/browse/*path',
		:controller => 'repository',
		:action => 'browse'

		# "Routing Error: Path components must occur last" :(
16		~~#map.connect '/rails/collaboa/repository/browse/*path/rev/:rev',~~
	16	#map.connect PATH_PREFIX + '/repository/browse/*path/rev/:rev',
		# :controller => 'repository',
		# :action => 'browse',
		# :rev => /\d+/

		# TODO: Rework this into a general browse/view_file usable thing
22		~~#map.connect '/rails/collaboa/repository/file/rev/:rev/*path',~~
	22	#map.connect PATH_PREFIX + '/repository/file/rev/:rev/*path',
		# :controller => 'repository',
		# :action => 'view_file',
		# :rev => /\d+/

27		~~map.connect '/rails/collaboa/repository/file/*path',~~
	27	map.connect PATH_PREFIX + '/repository/file/*path',
		:controller => 'repository',
		:action => 'view_file'

31		~~map.connect '/rails/collaboa/repository/revisions/*path',~~
	31	map.connect PATH_PREFIX + '/repository/revisions/*path',
		:controller => 'repository',
		:action => 'revisions'

35		~~map.connect '/rails/collaboa/repository/changesets',~~
	35	map.connect PATH_PREFIX + '/repository/changesets',
		:controller => 'repository',
		:action => 'changesets'

39		~~map.connect '/rails/collaboa/repository/changesets/:revision',~~
	39	map.connect PATH_PREFIX + '/repository/changesets/:revision',
		:controller => 'repository',
		:action => 'show_changeset'

43		~~map.connect '/rails/collaboa/tickets',~~
	43	map.connect PATH_PREFIX + '/tickets',
		:controller => 'tickets',
		:action => 'index'

47		~~map.connect '/rails/collaboa/tickets/new',~~
	47	map.connect PATH_PREFIX + '/tickets/new',
		:controller => 'tickets',
		:action => 'new'

51		~~map.connect '/rails/collaboa/tickets/:id',~~
	51	map.connect PATH_PREFIX + '/tickets/:id',
		:controller => 'tickets',
		:action => 'show',
		:requirements => { :id => /\d+/ }

56		~~map.connect '/rails/collaboa/milestones',~~
	56	map.connect PATH_PREFIX + '/milestones',
		:controller => 'milestones',
		:action => 'index'

60		~~map.connect '/rails/collaboa/milestones/:id',~~
	60	map.connect PATH_PREFIX + '/milestones/:id',
		:controller => 'milestones',
		:action => 'show'

		# You can have the root of your site routed by hooking up ''
		# -- just remember to delete public/index.html.
66		~~map.connect '/rails/collaboa/',~~
	66	map.connect PATH_PREFIX + '/',
		:controller => 'tickets'

		# Allow downloading Web Service WSDL as a file with an extension
...	...
		#map.connect ':controller/service.wsdl', :action => 'wsdl'

		# Install the default route as the lowest priority.
74		~~map.connect '/rails/collaboa/:controller/:action/:id'~~
	74	map.connect PATH_PREFIX + '/:controller/:action/:id'
		end

rool/rails/collaboa/trunk/public/stylesheets/screen.css:

prev.	current


		TABLE.listing THEAD TH A.asc
		{
244		~~background-image: url("/rails/collaboa/images/sort_asc.png");~~
	244	background-image: url("/tracker/images/sort_asc.png");
		background-repeat: no-repeat;
		padding-right: 10px;
		background-position: 100% 50%;
...	...

		TABLE.listing THEAD TH A.desc
		{
252		~~background-image: url("/rails/collaboa/images/sort_desc.png");~~
	252	background-image: url("/tracker/images/sort_desc.png");
		background-repeat: no-repeat;
		padding-right: 10px;
		background-position: 100% 50%;
...	...

		#content TABLE#browser TD.File A
		{
479		~~background-image: url("/rails/collaboa/images/icon_file.gif");~~
	479	background-image: url("/tracker/images/icon_file.gif");
		}

		#content TABLE#browser TD.Dir A
		{
484		~~background-image: url("/rails/collaboa/images/icon_folder.gif");~~
	484	background-image: url("/tracker/images/icon_folder.gif");
		}

		#content TABLE#browser TD.parent A
		{
489		~~background-image: url("/rails/collaboa/images/icon_up.gif");~~
	489	background-image: url("/tracker/images/icon_up.gif");
		}

		#download-alternate { margin-top: 10px; }

rool/rails/hub/trunk/app/views/account/signup.rhtml:

prev.	current


		<p />
		We will never pass your details to third parties or send you unsolicited e-mail messages.
42		~~For more information, please see our <a href="/rails/radiant/documents/privacy/">privacy~~
43		~~page</a>.~~
	42	For more information, please see our <a href="/content/documents/privacy/">privacy page</a>.

45
		<p />
		If you don't want to do this, you can
		<%= link_to 'go back to the control panel', :controller => 'tasks', :action => 'index' %>

rool/rails/hub/trunk/app/views/layouts/default.rhtml:

prev.	current

		<form action="http://www.google.com/search" method="get" class="searchform">
		<input type="hidden" name="num" value="10" />
		<input type="hidden" name="hl" value="en" />
42		~~<input type="hidden" name="as_sitesearch" value="pond.org.uk/rails" />~~
	42	<input type="hidden" name="as_sitesearch" value="riscosopen.org" />
		<input type="text" value="" maxlength="256" size="15" name="q" id="q" />
		<b><input type="submit" value="Go" name="btnG" /></b>
		</form>
...	...

		<%= render 'shared/fixed_footer' %>
		</body>
57		~~</html>~~

	58	</html>

rool/rails/hub/trunk/config/database.yml:

prev.	current


		dbinfo: &dbinfo
		adapter: postgresql
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
	6	host: /home/rool/postgres/
	7	username: rool
		password: oiarfewa

		# Warning: The database defined as 'test' will be erased and

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

prev.	current

		# URLs (i.e. according to the web server configuration, not the
		# filesystem location) and location in the filesystem, rather than
		# according to the Web server, of the login indicator icons.
17		~~PATH_PREFIX = '/rails/hub'~~
18		~~LOGIN_ICONS = '/home/adh/rails/hub/public/images/icons'~~
	17	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	18	LOGIN_ICONS = "#{RAILS_ROOT}/public/images/icons"

		Rails::Initializer.run do \|config\|
		# We don't run in the document root, so images etc. must come from
		# a non-root location too. Hijack the 'asset host' facility to get
		# helper-based links pointing in the right place.
24		~~config.action_controller.asset_host = "/rails/hub"~~
	24	config.action_controller.asset_host = PATH_PREFIX

		# Settings in config/environments/* take precedence those specified here

...	...

		# Hostname to use in notification messages. The PATH_PREFIX and
		# controller/action data will be appended to it.
91		~~EMAIL_HOST = 'pond.org.uk'~~
	91	EMAIL_HOST = 'riscosopen.org'

		# Time limit, in seconds, for password reset e-mail codes. The
		# codes persist in the database indefinitely but will be rejected

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

prev.	current

1		~~#!/bin/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/i2/trunk/app/views/layouts/application.rhtml:

prev.	current

		<form action="http://www.google.com/search" method="get" class="searchform">
		<input type="hidden" name="num" value="10" />
		<input type="hidden" name="hl" value="en" />
56		~~<input type="hidden" name="as_sitesearch" value="pond.org.uk/rails" />~~
	56	<input type="hidden" name="as_sitesearch" value="riscosopen.org" />
		<input type="text" value="" maxlength="256" size="15" name="q" id="q" />
		<b><input type="submit" value="Go" name="btnG" /></b>
		</form>
...	...

		<%= render 'shared/fixed_footer' %>
		</body>
83		~~</html>~~

	84	</html>

rool/rails/i2/trunk/config/database.yml:

prev.	current


		dbinfo: &dbinfo
		adapter: postgresql
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
	6	host: /home/rool/postgres/
	7	username: rool
		password: oiarfewa

		# Warning: The database defined as 'test' will be erased and

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

prev.	current

		# Location of application relative to document root in terms of
		# URLs (i.e. according to the web server configuration, not the
		# filesystem location).
13		~~PATH_PREFIX = '/rails/i2'~~
	13	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']

		Rails::Initializer.run do \|config\|
		# We don't run in the document root, so images etc. must come from
		# a non-root location too. Hijack the 'asset host' facility to get
		# helper-based links pointing in the right place.
19		~~config.action_controller.asset_host = "/rails/i2"~~
	19	config.action_controller.asset_host = PATH_PREFIX

		# Skip frameworks you're not going to use
		config.frameworks -= [ :action_web_service, :action_mailer ]

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

prev.	current

1		~~#!/bin/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/i2/trunk/public/stylesheets/instiki.css:

prev.	current

		font-size: 90%
		}

41		/*
42		~~#Container { float: none; margin: 0 15%; text-align: center; }~~
43		~~#Content { margin: 0; padding: 0.3em; text-align: left; border-top: none; float: left; width: 100%; }~~
44
45		~~table { border: double black; border-collapse: collapse; }~~
46		~~td { border: thin solid grey; }~~
47
48		~~li { margin-bottom: 0.5em; }~~
49		*/
50
		.newWikiWord { background-color: #BFBFBF; }
		.newWikiWord a:hover { background-color: white; }

		form#navigationSearchForm { display: inline; }
		form#navigationSearchForm input { font-size: 80%; }

57		~~.navigation { margin-top: 0.3em; font-size : 90%; color: #999; }~~
	47	DIV#Container .navigation { margin-top: 0.3em; font-size : 90%; color: #999; }

		.help { font-family: verdana, arial, helvetica, sans-serif; font-size: 70%; }

...	...
		div.fieldWithErrors input { border: 1px solid #900; }
		div.info { color: #060; background-color: #BFBFBF; padding: 0.5em; margin-top: 0.5em; font-weight: bold; width: 100%; }

86		~~/* div#MarkupHelp { float: right; width: 20%; } */~~
		div#MarkupHelp { margin-left: 10px; }
		div#MarkupHelp table { margin-bottom: 0; border-top: 3px solid #999; border-left: 3px solid #999;
		border-right: 3px solid #BBB; border-bottom: 3px solid #BBB}

rool/rails/radiant/trunk/app/models/page_context.rb:

prev.	current


		excludes = [ 'CVS', '.svn' ]
		html = ''
	613	collect = [];

		dir = base + dir

...	...
		next
		end
		else
624		~~leaf = File.basename(path)~~
625		~~mod = File.mtime(path)~~
626		~~link = "#{path[base.length..-1]}?#{mod.tv_sec}"~~
627		~~size = number_to_human_size(File.size(path))~~
628
629		~~html << "<li><a href=\"#{link}\"><b>#{leaf}</b></a> (#{size})<br /><small>Last modified #{mod}</small></li>"~~
	625	mod = File.mtime(path)
	626	collect.push({
	627	:leaf => File.basename(path),
	628	:mod => File.mtime(path),
	629	:link => "#{path[base.length..-1]}?#{mod.tv_sec}",
	630	:size => number_to_human_size(File.size(path))
	631	});
		end
		end
	634
	635	collect.sort do \|x, y\|
	636	x[:leaf] <=> y[:leaf]
	637	end.each do \|entry\|
	638	html << "<li><a href=\"#{entry[:link]}\"><b>#{entry[:leaf]}</b></a> (#{entry[:size]})<br /><small>Last modified #{entry[:mod]}</small></li>"
	639	end

		html = '<li>There are no files currently available.</li>' if html.empty?
		return html

rool/rails/radiant/trunk/config/database.yml:

prev.	current


		dbinfo: &dbinfo
		adapter: postgresql
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
	6	host: /home/rool/postgres/
	7	username: rool
		password: oiarfewa

		# Warning: The database defined as 'test' will be erased and

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

prev.	current

		# filesystem location). Location of that server document root, as
		# a physical path.

18		~~PATH_PREFIX = '/rails/radiant'~~
19		~~PATH_TO_DOCUMENT_ROOT = '/home/adh/www'~~
	18	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	19	PATH_TO_DOCUMENT_ROOT = ENV['SERVER_DOCUMENT_ROOT']

		require 'radius'

rool/rails/radiant/trunk/public/stylesheets/admin.css:

prev.	current

		/* tabs */

		#content #tabs {
390		~~background-image: url(/rails/radiant/images/brown-bottom-line.gif);~~
	390	background-image: url(/content/images/brown-bottom-line.gif);
		background-position: bottom;
		background-repeat: repeat-x;
		float: left;

rool/rails/rcvsweb/trunk/app/controllers/revisions_controller.rb:

prev.	current


		class RevisionsController < ApplicationController

5		~~# Synthesised revisions: CVS History feed URL~~
6		#
7		~~@@parser_url = 'http://pond.org.uk/python/cvshistory/cvshistory.cgi?revsel1=na&revsel2=na&datesel1=na&datesel2=na&selop=in&opA=on&opM=on&opR=on&opT=on&limit=1&rss=1'~~
8
9		~~# cvslog2web output directory~~
10		#
11		~~@@cvslog2web_output = '/home/adh/python/cvslog2web/public'~~
12
		def list
		# Use cvslog2web output directly for a list of recent changes.

16		~~render :file => "#{@@cvslog2web_output}/recent.html", :layout => 'default'~~
	8	render :file => "#{CVSLOG2WEB_OUTPUT}/recent.html", :layout => 'default'
		end

		def logs
...	...
		log.gsub!(/\.html$/, '')
		log.gsub!(/[\.\/\\]/, '')

29		~~logger.error("FETCH FILE: #{@@cvslog2web_output}/#{log}.html");~~
30
31		~~render :file => "#{@@cvslog2web_output}/#{log}.html", :layout => 'default'~~
	21	render :file => "#{CVSLOG2WEB_OUTPUT}/#{log}.html", :layout => 'default'
		end

		def revisions
...	...
		# revision keys in reverse order of associated date (i.e. most
		# recent first) and iterate through the resulting sorted list.

41		~~parser = RevisionParser.new(@@parser_url)~~
	31	parser = RevisionParser.new(get_parser_url())
		revisions = parser.fetch_and_parse(true)
		sort_keys = revisions.keys.sort do \|key_x, key_y\|
		revisions[key_y][0][:date] <=> revisions[key_x][0][:date]
...	...
		# @params hash. This is a key to a revision hash entry. Extract the relevant
		# hash and pass it to the view.

75		~~parser = RevisionParser.new(@@parser_url)~~
	65	parser = RevisionParser.new(get_parser_url())
		revisions = parser.fetch_and_parse(true)
		@output = revisions[@params[:ident]]

...	...
		# TO DO: Move these icons to the shared pool and update Collaboa accordingly.

		@category_map = {
92		~~'Addition' => { :image => '/rails/collaboa/images/chg-icon_A.png', :text => '(+)' },~~
93		~~'Removal' => { :image => '/rails/collaboa/images/chg-icon_D.png', :text => '(-)' },~~
94		~~'Commit' => { :image => '/rails/collaboa/images/chg-icon_M.png', :text => '' },~~
95		~~:unknown => { :image => '/rails/collaboa/images/icon_file.gif', :text => '?' }~~
	82	'Addition' => { :image => '/tracker/images/chg-icon_A.png', :text => '(+)' },
	83	'Removal' => { :image => '/tracker/images/chg-icon_D.png', :text => '(-)' },
	84	'Commit' => { :image => '/tracker/images/chg-icon_M.png', :text => '' },
	85	:unknown => { :image => '/tracker/images/icon_file.gif', :text => '?' }
		}

		render :layout => 'default'
		end
	90
	91	# Synthesised revisions: return the CVS History feed URL.
	92
	93	def get_parser_url
	94
	95	# For sites that hold a development service on usual port numbers,
	96	# check to see if we're using the development HTTPS port. If so,
	97	# change to the development HTTP port. Then check to see if we're
	98	# on the development HTTP port; if not, change to port 80 for a
	99	# regular HTTP service.
	100
	101	port = request.env['SERVER_PORT']
	102	port = DEVEL_HTTP_PORT if (port == DEVEL_HTTPS_PORT)
	103	port = 80 if (port != DEVEL_HTTP_PORT)
	104
	105	"http://#{request.env['SERVER_ADDR']}:#{port}#{CVSLOG2WEB_PREFIX}" +
	106	'?revsel1=na&revsel2=na&datesel1=na&datesel2=na&selop=in&opA=on&opM=on&opR=on&opT=on&limit=1&rss=1'
	107	end
		end

rool/rails/rcvsweb/trunk/app/helpers/application_helper.rb:

prev.	current

		# and replace them with Collaboa ticket display links.
		#
		def format_with_collaboa_links(text)
8		~~simple_format(text).gsub(/([Tt]icket #)([0-9]*)/, '<a href="/rails/collaboa/tickets/\2">\1\2</a>')~~
	8	simple_format(text).gsub(/([Tt]icket #)([0-9]*)/, '<a href="/tracker/tickets/\2">\1\2</a>')
		end
		end

rool/rails/rcvsweb/trunk/app/views/layouts/default.rhtml:

prev.	current

		Revisions can be listed by
		<%= link_to 'log message', { :controller => 'revisions', :action => 'list' } %> (fast) or
		<%= link_to 'revision number', { :controller => 'revisions', :action => 'revisions' } %> (slow).<br />
28		~~The Subversion repository is <a href="/rails/collaboa/repository/browse">here</a>.~~
	28	The Subversion repository is <a href="/tracker/repository/browse">here</a>.
		<hr />

		<%= @content_for_layout %>
...	...

		<p />
		<ul>
62		~~<li><a href="/rails/collaboa/">Tickets</a></li>~~
63		~~<li><a href="/rails/collaboa/milestones">Milestones</a></li>~~
64		~~<li>Subversion: <a href="/rails/collaboa/repository/changesets">Changesets</a></li>~~
65		~~<li>Subversion: <a href="/rails/collaboa/repository/browse">Browse</a></li>~~
	62	<li><a href="/tracker">Tickets</a></li>
	63	<li><a href="/tracker/milestones">Milestones</a></li>
	64	<li>Subversion: <a href="/tracker/repository/changesets">Changesets</a></li>
	65	<li>Subversion: <a href="/tracker/repository/browse">Browse</a></li>
		<li>CVS: <%= link_to 'Revisions', { :controller => 'revisions', :action => 'list' } %></li>
		<li>CVS: <%= link_to 'Browse', { :controller => 'rcvsweb', :action => 'run' } %></li>
		</ul>

rool/rails/rcvsweb/trunk/app/views/shared/_powered.rhtml:

prev.	current

1		~~-->Powered by <a href="/rails/radiant/sources/source-code-web-site">various scripts</a> under <a href="http://pond.org.uk/ruby/">RCVSweb</a><!--~~
	1	-->Powered by <a href="/content/sources/source-code-web-site">various scripts</a> under <a href="http://pond.org.uk/ruby/rcvsweb/">RCVSweb</a><!--

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

prev.	current

		# URLs (i.e. according to the web server configuration, not the
		# filesystem location) and location in the filesystem, rather than
		# according to the Web server, of the CVSweb and CVShistory scripts.
	17	# Next up is the filesystem location of CVSLog2Web output and the
	18	# path to use for URLs for CVShistory - the bit up to and including
	19	# the ".cgi", before the query string is appended, excluding the
	20	# host. The host is taken from ENV['SERVER_ADDR']. If the request
	21	# uses port DEVEL_HTTPS_PORT, it is switched to DEVEL_HTTP_PORT for
	22	# a normal HTTP request. If the port is already DEVEL_HTTP_PORT it
	23	# is left alone, again for a normal HTTP request. Otherwise, the
	24	# port is reset to 80.

18		~~PATH_PREFIX = '/rails/rcvsweb'~~
19		~~CVSWEB_LOCATION = '/home/adh/perl/cvsweb/cvsweb.cgi'~~
20		~~CVSHISTORY_LOCATION = '/home/adh/python/cvshistory/cvshistory.cgi'~~
	26	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	27	CVSWEB_LOCATION = '/home/rool/devel/perl/cvsweb/cvsweb.cgi'
	28	CVSHISTORY_LOCATION = '/home/rool/devel/python/cvshistory/cvshistory.cgi'
	29	CVSLOG2WEB_OUTPUT = '/home/rool/devel/python/cvslog2web/public'
	30	CVSLOG2WEB_PREFIX = '/python/cvshistory/cvshistory.cgi'
	31	DEVEL_HTTP_PORT = '25080'
	32	DEVEL_HTTPS_PORT = '25081'

		Rails::Initializer.run do \|config\|
		# We don't run in the document root, so images etc. must come from

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

prev.	current

1		~~#!/bin/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/rcvsweb/trunk/public/stylesheets/rcvsweb.css:

prev.	current


		TABLE.dir * TH.sorted
		{
255		~~background-image: url("/rails/collaboa/images/sort_desc.png");~~
	255	background-image: url("/tracker/images/sort_desc.png");
		background-repeat: no-repeat;
		padding-right: 12px;
		background-position: 99% 50%;

rool/rails/rforum/trunk/app/controllers/navbar.rb:

prev.	current

		# these functions they should at least do something sane.

		def user_settings
37		~~Item.new(@user.guest? ? l(:nav_register) : l(:nav_settings), '/rails/hub/tasks')~~
	37	Item.new(@user.guest? ? l(:nav_register) : l(:nav_settings), '/hub/tasks')
		end

		def user_list
		if (@user.admin?)
42		~~Item.new(l(:nav_user_list), '/rails/hub/account/list')~~
	42	Item.new(l(:nav_user_list), '/hub/account/list')
		end
		end

		def login_info
		if @user.guest?
48		~~Item.new(l(:nav_log_in), '/rails/hub/account/login_hop')~~
	48	Item.new(l(:nav_log_in), '/hub/account/login_hop')
		else
		link_text = l(:nav_log_out, @user.firstname) # Actually the Hub unique name
		link_text << " (#{@user.role})" unless @user.class == User
52		~~Item.new(link_text, '/rails/hub/account/logout')~~
	52	Item.new(link_text, '/hub/account/logout')
		end
		end
		end # class NavBar

rool/rails/rforum/trunk/app/models/attachment.rb:

prev.	current

		Dir.delete self.dir_path
		end

33		~~# Returns the directory of this attachment, e.g. /rails/public/attachments/12/~~
	33	# Returns the directory of this attachment, e.g. /forum/public/attachments/12/
		def dir_path
		RAILS_ROOT + RForum::CONFIG[:attachment_path] + "/#{self.id}/"
		end

rool/rails/rforum/trunk/app/views/layouts/default.rhtml:

prev.	current


		<%= stylesheet_link_tag "main.css" %>
		<%= stylesheet_link_tag "syntax.css" %>
10		~~<% if @skin %><link type="text/css" rel="stylesheet" href="/rails/rforum/skins/<%= h @skin %>/style.css" /><% end %>~~
	10	<% if @skin %><link type="text/css" rel="stylesheet" href="/forum/skins/<%= h @skin %>/style.css" /><% end %>

12		~~<% if @forum %><link rel="alternate" type="application/atom+xml" title="<%= l(:feed_description_forum) %> "<%=h @forum.name %>"" href="/rails/rforum/feed/forum/<%= @forum.id %>" /><% end %>~~
13		<% if @topic %><link rel="alternate" type="application/atom+xml" title="<%= l(:feed_description_topic) %> "<%=h @topic.subject %>"" href="/rails/rforum/feed/topic/<%= @topic.id %>" /><% end %>
14		~~<link rel="alternate" type="application/atom+xml" title="<%= l(:feed_description_global) %>" href="/rails/rforum/feed/global" />~~
	12	<% if @forum %><link rel="alternate" type="application/atom+xml" title="<%= l(:feed_description_forum) %> "<%=h @forum.name %>"" href="/forum/feed/forum/<%= @forum.id %>" /><% end %>
	13	<% if @topic %><link rel="alternate" type="application/atom+xml" title="<%= l(:feed_description_topic) %> "<%=h @topic.subject %>"" href="/forum/feed/topic/<%= @topic.id %>" /><% end %>
	14	<link rel="alternate" type="application/atom+xml" title="<%= l(:feed_description_global) %>" href="/forum/feed/global" />
		</head>
		<body>
		<%= render 'shared/fixed_header' %>

rool/rails/rforum/trunk/app/views/sidebar.rhtml:

prev.	current

		<h3>Search forums</h3>

		<p />
5		~~<form method="post" action="/rails/rforum/forum/search">~~
	5	<form method="post" action="/forum/forum/search">
		<input type="text" name="query" size="15" value="<%=h @query.to_s %>" />
		<input type="submit" name="submit" value="Go" />
		</form>

rool/rails/rforum/trunk/app/views/topic/_post.rhtml:

prev.	current

		<% end %>
		<div class="post<%= "_new" if @last_read_at and post.created_at > @last_read_at %><%= "_deleted" if post.hidden? %>">
		<div class="subject">
7		~~<strong><a name="<%=h post.id %>" href="/rails/rforum/#<%=h post.id %>"><%=h post.subject %><%= ' (' + l(:deleted_post) + ')' if post.hidden? %></a></strong>~~
	7	<strong><a name="<%=h post.id %>" href="/forum/#<%=h post.id %>"><%=h post.subject %><%= ' (' + l(:deleted_post) + ')' if post.hidden? %></a></strong>
		</div>

		<div class="info">
...	...
		<% for attachment in post.attachments %>
		<div class="attachment">
		<%=l :attachment %>:
41		~~<a href="/rails/rforum<%=h attachment.url %>"><%=h attachment.filename %></a>~~
	41	<a href="/forum<%=h attachment.url %>"><%=h attachment.filename %></a>
		</div>
		<% end %>

rool/rails/rforum/trunk/app/views/user/login.rhtml:

prev.	current

		<% end %>

		<div class="box">
9		~~<strong><%=l :login_no_account %></strong> <a href="/rails/rforum<%=h url_for(:action => 'register') %>"><%=l :login_register_here %></a>~~
	9	<strong><%=l :login_no_account %></strong> <a href="/forum<%=h url_for(:action => 'register') %>"><%=l :login_register_here %></a>
		</div>

		<div class="box">

rool/rails/rforum/trunk/app/views/user/show.rhtml:

prev.	current

		</div>
		<% else -%>
		<div class="box">
69		~~Guests cannot view user details. Please <a href="/rails/hub/account/login">log in</a>.~~
	69	Guests cannot view user details. Please <a href="/hub/account/login">log in</a>.
		</div>
		<% end -%>
		</div>

rool/rails/rforum/trunk/config/database.yml:

prev.	current


		dbinfo: &dbinfo
		adapter: postgresql
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
	6	host: /home/rool/postgres/
	7	username: rool
		password: oiarfewa

		# Warning: The database defined as 'test' will be erased and

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

prev.	current

		# Bootstrap the Rails environment, frameworks, and default configuration
		require File.join(File.dirname(__FILE__), 'boot')

	10	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']
	11
		Rails::Initializer.run do \|config\|
		# We don't run in the document root, so images etc. must come from
		# a non-root location too. Hijack the 'asset host' facility to get
		# helper-based links pointing in the right place.
14		~~config.action_controller.asset_host = "/rails/rforum"~~
	16	config.action_controller.asset_host = PATH_PREFIX

		# Skip frameworks you're not going to use
		config.frameworks -= [ :action_web_service ]

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

prev.	current

		ActionController::Routing::Routes.draw do \|map\|
2		~~map.connect '/rails/rforum/', :controller => 'forum', :action => 'list'~~
3		~~map.connect '/rails/rforum/topic/:id', :controller => 'topic', :action => 'show',~~
	2	map.connect PATH_PREFIX + '/', :controller => 'forum', :action => 'list'
	3	map.connect PATH_PREFIX + '/topic/:id', :controller => 'topic', :action => 'show',
		:requirements => {:id => /^[0-9]+$/}
5		~~map.connect '/rails/rforum/forum/:id', :controller => 'forum', :action => 'forum',~~
	5	map.connect PATH_PREFIX + '/forum/:id', :controller => 'forum', :action => 'forum',
		:requirements => {:id => /^[0-9]+$/}
7		~~map.connect '/rails/rforum/search', :controller => 'forum', :action => 'search'~~
8		~~map.connect '/rails/rforum/attachment/:id/:filename', :controller => 'attachment',~~
	7	map.connect PATH_PREFIX + '/search', :controller => 'forum', :action => 'search'
	8	map.connect PATH_PREFIX + '/attachment/:id/:filename', :controller => 'attachment',
		:action => 'fetch', :requirements => {:id => /^[0-9]+$/}
10		~~map.connect '/rails/rforum/:controller/:action/:id'~~
11		~~map.connect '/rails/rforum/:controller/:action'~~
	10	map.connect PATH_PREFIX + '/:controller/:action/:id'
	11	map.connect PATH_PREFIX + '/:controller/:action'
		end

rool/rails/rforum/trunk/public/skins/risc_os_open/style.css:

prev.	current

		font-size: 80%;
		margin-left: 6px;
		color: #9a9a9b;
152		~~background: url(/rails/typo/images/theme/bracket.gif) no-repeat;~~
	152	background: url(/news/images/theme/bracket.gif) no-repeat;
		}

		.date

rool/rails/shared/trunk/layouts/fixed_header.rhtml:

prev.	current

		</td>
		<td valign="middle">
		<div class="logo" align="right">
20		~~<a href="/rails/radiant/" class="powered">~~
21		~~<img src="/images/risc_os_open/rool_cog_c.png" border="0" alt="ROOL" width="56" height="56" />~~
	20	<a href="/content/" class="powered">
	21	<img src="/images/risc_os_open/rool_cog_t.png" border="0" alt="ROOL" width="56" height="56" />
		</a>
		<a href="http://www.castle-technology.co.uk/" class="powered">
		<img src="/images/third_party/castle_logo.gif" border="0" alt="Castle" width="62" height="58" />
...	...
		<tr bgcolor="#d5ffc4" class="navigation_background">
		<td valign="bottom" align="left"><img src="/images/risc_os_open/bl_white.png" width="3" height="3" alt="\" border="0" /></td>
		<td class="navigation_left" align="left">
38		~~<a href="/rails/radiant/" class="navigation">Home</a>~~
	38	<a href="/content/" class="navigation">Home</a>
		<span class="navigation_divider"> \| </span>
40		~~<a href="/rails/typo/" class="navigation">News</a>~~
	40	<a href="/news/" class="navigation">News</a>
		<span class="navigation_divider"> \| </span>
42		~~<a href="/rails/rforum/" class="navigation">Forum</a>~~
	42	<a href="/forum/" class="navigation">Forum</a>
		<span class="navigation_divider"> \| </span>
44		~~<a href="/rails/radiant/sources/" class="navigation">Sources</a>~~
	44	<a href="/content/sources" class="navigation">Sources</a>
		<span class="navigation_divider"> \| </span>
46		~~<a href="/rails/collaboa/" class="navigation">Bugs</a>~~
	46	<a href="/tracker/" class="navigation">Bugs</a>
		<span class="navigation_divider"> \| </span>
48		~~<a href="/rails/radiant/documents/" class="navigation">Documents</a>~~
	48	<a href="/content/documents" class="navigation">Documents</a>
		<span class="navigation_divider"> \| </span>
50		~~<a href="/rails/radiant/contact/" class="navigation">Contact us</a>~~
	50	<a href="/content/contact" class="navigation">Contact us</a>
		</td>
52		~~<td class="navigation_login" align="right"><a href="/rails/hub/account/login_conditional"><img src="/rails/hub/account/login_indication" width="72" height="18" alt="Account" border="0" /></a></td>~~
	52	<td class="navigation_login" align="right"><a href="/hub/account/login_conditional"><img src="/hub/account/login_indication" width="72" height="18" alt="Account" border="0" /></a></td>
		<td valign="bottom" align="right"><img src="/images/risc_os_open/br_white.png" width="3" height="3" alt="/" border="0" /></td>
		</tr>
		</table>

rool/rails/shared/trunk/layouts/fixed_sidebar.rhtml:

prev.	current


		<p />
		<div class="sidebar-node">
16		~~<h3>Donate! <a href="/rails/radiant/donations" style="border: none">Why?</a></h3>~~
	16	<h3>Donate! <a href="/content/donations" style="border: none">Why?</a></h3>

		<p />
		<div class="sidebar_static">

rool/rails/typo/trunk/app/views/articles/read.rhtml:

prev.	current

		<% if hubssolib_logged_in? -%>
		<small><a href="#respond">Add a comment about this article</a></small>
		<% else -%>
37		~~<b>To add a comment</b> about this article, <a href="/rails/hub/account/login_hop">please log in</a>.~~
	37	<b>To add a comment</b> about this article, <a href="/hub/account/login_hop">please log in</a>.
		<% end -%>
		</p>
		<% end -%>

rool/rails/typo/trunk/config/database.yml:

prev.	current


		dbinfo: &dbinfo
		adapter: postgresql
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
	6	host: /home/rool/postgres/
	7	username: rool
		password: oiarfewa

		# Warning: The database defined as 'test' will be erased and

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

prev.	current

		# URLs (i.e. according to the web server configuration, not the
		# filesystem location).

14		~~PATH_PREFIX = '/rails/typo'~~
	14	PATH_PREFIX = ENV['RAILS_RELATIVE_URL_ROOT']

		Rails::Initializer.run do \|config\|
		# We don't run in the document root, so images etc. must come from

rool/rails/typo/trunk/themes/risc_os_open/about.markdown:

prev.	current

		### RISC OS Open

3		~~RISC OS Open site theme theme by [Andrew Hodgkinson][1]~~
	3	RISC OS Open site theme by [Andrew Hodgkinson][1]

		[1]: http://pond.org.uk/ "Pond's Place"

rool/rails/typo/trunk/themes/risc_os_open/stylesheets/risc_os_open.css:

prev.	current

		margin-top: 1em;
		}

	21	DIV.lightboxplugin
	22	{
	23	margin-bottom: 1em;
	24	}
	25
		/*+-------------------------------------------+
		\| SEARCH \|
		+-------------------------------------------+*/
...	...
		font-size: 80%;
		margin-left: 6px;
		color: #9a9a9b;
73		~~background: url(/rails/typo/images/theme/bracket.gif) no-repeat;~~
	78	background: url(/news/images/theme/bracket.gif) no-repeat;
		}

		H4.blueblk
...	...
		font: 150%/1.5em Times, Helvetica, "Times New Roman", serif;
		color: #666;
		margin: 10px;
156		~~background: url(/rails/typo/images/theme/q-close.gif) no-repeat 70% 100% !important;~~
	161	background: url(/news/images/theme/q-close.gif) no-repeat 70% 100% !important;
		background /*/:url(); / removing quote graphic in IE5+ */
		padding: 0 25px 5px 0;
		}

		.pullquote:first-letter
		{
163		~~background: url(/rails/typo/images/theme/q-open.gif) no-repeat left top !important;~~
	168	background: url(/news/images/theme/q-open.gif) no-repeat left top !important;
		padding:5px 2px 10px 35px!important;
		padding /*/:0px; / resetting padding in IE5+ */
		background /*/: url(); / removing quote graphic in IE5+ */