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

Changesets
» Changeset 344

Changeset 344

Massive changeset which brings the old, ROOL customised Instiki
version up to date, but without any ROOL customisations in this
latest checked-in version (which is 0.19.1). This is deliberate,
so that it's easy to see the changes made for the ROOL version
in a subsequent changeset. The 'app/views/shared' directory is not
part of Instiki but is kept to maintain the change history with
updated ROOL customisations, some of which involve the same files
in that same directory.

Comitted by: rool
Date: Saturday March 19 19:52:13 2011 (over 13 years ago)

Affected files:

rool/rails/instiki/trunk/CHANGELOG:

prev.	current

1		* TRUNK:
2		~~SQL-based backend (ActiveRecord)~~
3		~~File uploads (finally)~~
4		~~Upgraded to Rails 1.0.0~~
5		~~Replaced internal link generator with routing~~
6		~~Fixed --daemon option~~
7		~~Removed Rubygem and native OS X distributions~~
8		~~Improved HTML diff~~
9		~~More accurate "See Changes"~~
	1	N.B.: You must run

	3	ruby bundle
	4	rake upgrade_instiki
	5
	6	after installing the new software, to enjoy the benefits of this new version.
	7
	8	------------------------------------------------------------------------------
	9	* 0.19.1
	10
	11	New Features:
	12	* From the "All" or Category listings, you can export selected pages (in any
	13	desired order) to a single LaTeX file.
	14	* LaTeX export supports \array{} (with no options) and a LaTeX-style optional
	15	argument for \sqrt[]{}. The latter requires itextomml 1.4.5 or later.
	16	* Updated to itextomml 1.4.5 (a bunch of new itex language features).
	17	* Updated to Rails 2.3.10. (There were security issues in 2.3.9 which, happily,
	18	did NOT affect Instiki 0.19. But 2.3.10 has other improvements, as well.)
	19
	20	Bugs Fixed:
	21	* Several SVG-Edit bugs fixed.
	22	* Removed some superfluous junk, to slim down the distribution (cuts the size of
	23	the compressed .tar.gz nearly in half).
	24
	25	------------------------------------------------------------------------------
	26	* 0.19
	27
	28	New Features:
	29
	30	* WYSIWYG SVG editing (via SVG-edit)
	31	* One-click S5 templates
	32	* Itex2MML is now a Rubygem. Latest is itextomml-1.4.2.
	33	* Rails Metal itex endpoint
	34	* HTML5 support
	35	* Support IALs on Markdown list items
	36	* Updated to Rails 2.3.9 and Erubis (now at 2.6.6)
	37	* Updated for Rack 1.2.1, sqlite3-ruby 1.3.1
	38	* Manages dependencies using Bundler. Before running Instiki for the first time
	39	(and whenever you update), run
	40
	41	ruby bundle
	42	rake upgrade_instiki
	43
	44	from the instiki directory. (You may need to run
	45
	46	ruby bundle exec rake upgrade_instiki
	47
	48	instead, if you get a complaint about your version of rake.)
	49
	50	Bugs Fixed:
	51
	52	* Works with Ruby 1.9.2
	53	* Fixed a bug in non-Latin WikiWord processing. (Reported by Alexander Hambug)
	54	* Fixed Cyrillic WikiWord support.
	55	* More informative dnsbl lookup responses (suggested by Toby Bartels)
	56	* Fixed a bug in LaTeX output
	57	* No longer conflicts with sqlite3-ruby 1.3.x Rubygem
	58	* Fixed some Category listing bugs
	59	* Fixed an escaping bug in 'new' and 'edit' templates. (Reported by Toby Bartels)
	60	* Allow special characters ('.', '/', etc) in page names.
	61	* Fix BlahTeX/PNG path, so equations render in diff and
	62	previous revision pages.
	63	* Fix HTML Export feature so that uploaded files are
	64	included, stylesheets load, etc.
	65	* Uploaded files inclided in Markup Export.
	66	* Fix Print View, so that uploaded images work.
	67	* Fix some more Ruby 1.9 isues.
	68	* Prevent page from being renamed to null.
	69	* Fix Migration to work under PostgreSQL (from J. Zellman).
	70	* Updated vendored plugins
	71
	72	------------------------------------------------------------------------------
	73	* 0.18.1
	74
	75	New Features:
	76
	77	* (Markdown-Extra syle) fenced codeblocks. [From Jason Blevins]
	78	* Fortran syntax colouring. [From Jason Blevins]
	79
	80	Bugs Fixed:
	81
	82	* Fixed some Ruby 1.9 encoding issues, with unicode page names,
	83	author names and categories.
	84	* Better display of inter-web wikilinks
	85	* various syntax-colouring fixes
	86	* Corrected length of wiki_references referenced_name (affects
	87	MySQL users)
	88
	89	------------------------------------------------------------------------------
	90	* 0.18
	91
	92	New Features:
	93
	94	* Syntax colouring: 'ansic', 'javascript', 'sqlite', 'yaml' and 'css' modes,
	95	in addition to the existing 'html', 'xml', and 'ruby' modes,
	96	* Source view [suggested by Andrew Stacey]
	97	* Auto-resizing Textareas scale to fit viewing area.
	98	* Instiki upgraded to Rails 2.3.5 and Rack 1.1.
	99	* Now runs on Ruby 1.9. (If you're a Passenger user, you may need to upgrade to Passenger
	100	2.2.8, which works around some bugs in Ruby 1.9.1.)
	101	* Upgraded for itex2MML 1.3.19 (which works under Ruby 1.9, and has several new feautures,
	102	relative to 1.3.15).
	103
	104	Bugs Fixed:
	105
	106	* Fixed a CSS bug, which screwed up printing (unless you used the "Print" view).
	107	* Fixed a well-formedness bug in the page-name truncation algorithm [reported by Toby Bartels]
	108	* Fixed a cache-sweeping bug [reported by Toby Bartels]
	109	* Better accessibility.
	110	* Improved log rotation under Passenger.
	111	* Omit a (seemingly superfluous) javascript hack which causes Gecko-based browsers to request
	112	/my_wiki/s5/null
	113	when they load an s5 slideshow.
	114	* Upgraded vendored sqlite3-ruby and rubyzip
	115	* Move files when renaming a web (so that links to uploaded files don't break).
	116	* Many Ruby 1.9 fixes, including removing the html5lib Sanitizer.
	117
	118	------------------------------------------------------------------------------
	119	* 0.17.3
	120
	121	The most important facet of this release is a small change in the database
	122	schema. Previously, people migrating from the default SQLite3 database to MySQL
	123	ran the risk of silent data loss, because MySQL had a more strict interpretation
	124	of the column types in the database. The new schema will prevent such problems.
	125
	126	rake upgrade_instiki
	127
	128	will seamlessly upgrade your existing database to the new schema.
	129
	130	New Features:
	131	* Passenger support (including X-Sendfile support, if the Apache mod_xsendfile
	132	module is installed).
	133	* Update for itex2MML 1.3.13. (You should upgrade your itex2MML to the latest
	134	version, too.)
	135
	136	Bugs Fixed:
	137	* Refactored the Web model (from James Herdman).
	138	* Clean malformed utf-8 strings, rather than complaining about them.
	139	* Updated location of Textile help, since _why_the_lucky_stiff left the 'net.
	140	* Fixed a TeX rendering bug.
	141	* Updated list of XHTML+MathML named entities to match W3C Working Draft.
	142	* Refactored the Sanitizer (speedup).
	143	* Fix S5 Slideshows for non-root Instiki URLs.
	144	* Work around a Rails flash bug.
	145	* Links from published webs should work right (finally?).
	146	* An important database migration for MySQL users.
	147
	148	------------------------------------------------------------------------------
	149	* 0.17.2
	150
	151	Security: Updated to Rails 2.3.4
	152	* Fixes Timing Weakness in Rails MessageVerifier and the Cookie Store
	153	http://weblog.rubyonrails.org/2009/9/4/timing-weakness-in-ruby-on-rails
	154	* Fixes XSS Vulnerability in Rails
	155	http://weblog.rubyonrails.org/2009/9/4/xss-vulnerability-in-ruby-on-rails
	156
	157	New Features:
	158	* Syntax colouring (`ruby` and `html`) for code blocks.
	159	* Updated for itex2MML 1.3.10 (supports \rlap{} and \underline{}). You should upgrade that, too.
	160	* Add a "Create New Page" Link to the Search Page. (Based on an idea by nowa)
	161	* Updated to Rails 2.3.4
	162
	163	Bugs Fixed:
	164	* Wikilinks to published webs should be to the published action. This didn't work
	165	right for inter-web links. (Reported by Mike Shulman)
	166	* Use .size, rather than .length for ActiveRecord associations. A huge memory saving
	167	in building the recently_revised page.
	168	* Refactor the upgrade_instiki rake task, to make it database-agnostic. (Many thanks to James Herdman)
	169	* Web#files_path and Web#blatex_pngs_path now return Pathname objects. (Thanks, again, to James Herdman)
	170	* Workaround for Mozilla Bug 449396. (Reported by Andrew Stacey)
	171	* Correctly Set noindex,nofollow On /diff Pages.
	172	* Page-renaming javascript deals correctly with page names containing ampersands, slashes, and other garbage.
	173	* List of Wanted Pages should not include redirected pages.
	174	* The Regexp, used in Maruku to detect "email" headers (used, e.g., for S5 slideshow metadata) could, for some inputs, interact badly with Instiki's Chunk Handler. Fixed.
	175	* Ensure "rollback" locks page for editing.
	176	* Generate relative URLs, when possible. (Patch by Dennis Knauf)
	177	* Expire revisions of an edited page. Use a `before_save` hook to deal with the situation where a page's name has been changed.
	178
	179	------------------------------------------------------------------------------
	180	* 0.17
	181
	182	New features:
	183	* Ability to rename pages
	184	* Ability to redirect Wikilinks, using
	185	[[!redirect ...]]
	186	* HTTP 302 redirects, for redirected/renamed pages
	187
	188	Bugs Fixed:
	189	* Rails gets very unhappy with "." in page or author names.
	190	Make sure that doesn't happen.
	191	* Fix a Maruku escaping bug.
	192	* WEBrick should respond to TERM signals
	193	(needed by MacOSX and, perhaps, others).
	194	* Add a flash message for redirection to "new" page
	195	when the target of "show" action is not found.
	196	* Flash[:info] messages use Web's colour scheme.
	197	* Uploaded files in published webs should be accessible
	198
	199	------------------------------------------------------------------------------
	200	* 0.16.6
	201
	202	New Features:
	203	* More colour schemes: blue, brown, scarlet red, and plum.
	204	(From Jason Blevins)
	205	* History Pages: created a history page for each wiki page.
	206	Link to it and to the "Diff" page from "Recently Revised".
	207	(from Jason Blevins)
	208	* Support for SVG clipping paths
	209	(requested by Andrew Stacey)
	210	* Updated for itex2MML 1.3.8. (You should
	211	upgrade that, as well.) Support for blackboard bold lowercase
	212	letters and digits.
	213
	214	Bugs Fixed:
	215	* Fixed several bugs in Maruku, where "greedy" regexps
	216	could lead to exponential slowdown on certain inputs.
	217	* Fixed a bug in listing/deleting links to uploaded video and
	218	audio files.
	219	* Fixed some caching bugs.
	220	* Removed the defunct list.dsbl.org from anti-spam dnsbl lookups.
	221	* Resolved a conflict between form_spam_protect plugin and IE7.
	222	(thanks to Jason Blevins)
	223
	224	------------------------------------------------------------------------------
	225	* 0.16.5: Rails 2.3.2
	226
	227	* Runs on the Stable Release, Rails 2.3.2.
	228	* Support for audio/speex audio files.
	229	* Updated for itex2MML 1.3.7. (You should
	230	upgrade that, as well.)
	231	* Tests for BlahTeX/PNG (if installed).
	232
	233	------------------------------------------------------------------------------
	234	* 0.16.4
	235
	236	New Features:
	237	* Add x-sendfile support for downloading uploaded files in Instiki.
	238	* Add support for HTML5 <video> and <audio> elements:
	239	[[mymovie.ogv:video]], [[mysound.wav:audio]].
	240	* Runs on Rails 2.3.1
	241
	242	Bugs Fixed:
	243	* Update to Rails 2.3.1, which fixes several bugs.
	244	* Removed bundled Rack (Rails 2.3.1 comes bundled with Rack 1.0).
	245	* Add config.action_view.cache_template_loading = true to production
	246	environment.
	247	* Fix FastCGI bug
	248	(http://rubyforge.org/tracker/index.php?func=detail&aid=24191&group_id=186 &atid=783).
	249	* Fix WikiWords bug
	250	(http://rubyforge.org/pipermail/instiki-users/2009-February/001181.html).
	251	* Fix bug on Windows
	252	(http://rubyforge.org/pipermail/instiki-users/2009-March/001183.html)
	253
	254	------------------------------------------------------------------------------
	255	* 0.16.3: Big steps, Rails 2.3.0-RC1 and tons of new stuff!
	256
	257	All the patching, developing and great hacking from Jacques Distler was
	258	merged into the main codebase of instiki. Jaques is now also maintaining the
	259	main branch (together with parasew), which brings instiki up-to-date!
	260
	261	Find more information about all the changes in his site:
	262
	263	http://golem.ph.utexas.edu/instiki/
	264
	265	New Features:
	266	* Instiki comes and runs with Rails 2.3.0-RC1
	267	* New Markdown interpreter: Maruku
	268	* Default markup dialect is Markdown+itex2MML
	269	* Mathematics suport, using itex2MML (Markdown+itex2MML)
	270	http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html
	271	or BlahTeX (Markdown+BlahTeX/PNG)
	272	http://golem.ph.utexas.edu/instiki/show/BlahTeX
	273	* Theorem Environments
	274	* Automatic Equation numbering and automatic Theorem numbering,
	275	* Integrated presentation software
	276	http://golem.ph.utexas.edu/instiki/show/S5
	277	complete with support for themes
	278	(available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG)
	279	* Sends application/xhtml+xml to compatible browsers
	280	(available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG)
	281	Serve Webs which use non-Markdown Text Filters (Textile, RDoc or Mixed) as
	282	text/html. This makes those Text Filters usable, again.
	283	* Scalable Vector Graphics (SVG) enabled
	284	(available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG).
	285	* Nifty SVG Logo
	286	(available with Markdown, Markdown+itex2MML or Markdown+BlahTeX/PNG).
	287	* Atom 1.0 feeds.
	288	* ETag support.
	289	* Filesystem-based caching.
	290	* New, industrial-strength Sanitizer (anti-XSS protection).
	291	* Uses xhtmldiff for redline diff pages.
	292	* (Actually functional) LaTeX output.
	293	* InterWeb WikiLinks
	294	* Add a user interface to manage uploaded files.
	295	* Add a user interface to delete a Web.
	296	* Add a user interface to delete orphaned pages in a Category. In addition to
	297	deleting all orphaned pages, you can now delete just the orphaned pages in a
	298	particular category. Among other things, this provides a handy way to delete
	299	a (selection of) page(s): just assign them to a new category (“delete”, say)
	300	and delete the orphaned pages in that category.
	301	* Add the manage_fixtures plugin for easy database migration
	302	* Descriptions in the File Upload Dialog are used as the default alt text (for
	303	pictures) or the default link text (for files).
	304
	305	Bugfixes:
	306	(see http://golem.ph.utexas.edu/~distler/blog/archives/001893.html for a
	307	complete list)
	308
	309	* fixes to xhtmldiff
	310	* fixed Sanitizer issues
	311	* Do dnsbl lookups more judiciously. Anti-spam effectiveness is undiminished,
	312	but the application is more responsive.
	313	* Fix a Session CookieOverflow when rescuing Instiki::ValidationError
	314	* Domain independent caching
	315	* Fix for no Flash Messages
	316	* Links on “published” Webs were all screwed-up. Fixed.
	317	* Make uploaded pictures display in the “published” view.
	318	* Make @import rules in the “Stylesheet Tweaks” work in the “published” view.
	319	* Actually verify the password, when setting a password for a Web, rather than
	320	just pretending to do so.
	321	* fixes for nowiki “<nowiki>[[!include foo]]</nowiki>”)
	322	* Hide Equations From WikiChunk Processing
	323	* Fix a bug in the Chunk handler, which was mangling backslashes in included
	324	pages.
	325	* Entering the wrong password on the “CreateWeb” form now redirects back to
	326	the form, as it should.
	327	* Allow single-letter WikiLinks (e.g. “[[a]]”). Requested by a Japanese user.
	328	* Allow single-letter includes (e.g. “[[!include a]]”).
	329	* Huge improvements to caching and cache-sweeping
	330	* Category listing restricts to current Web.
	331	* All WikiReference methods limit results to the current web
	332	* File uploads work right.
	333	* Make WEBrick respond to TERM signal. (Launchd, in particular, requires this.)
	334	* Ditch the URIChunk and LocalURIChunk handlers. Slow, buggy, and of dubious
	335	utility.
	336	* Ensure unsafe operations (new, save,...) are POSTs, not GETs.
	337	* Fix utf-8 bug in WikiChunk handling.
	338	* Disable WikiChunk processing in tags.
	339	* Hide Equations From WikiChunk Processing
	340	* Fix for the "Backslashes in Included Equations" bug.
	341	* Sessions are now stored in a cookie (signed and Base-64 encoded).
	342	Form_spam_protection stores form_keys in the session.
	343	Make sure spambots implement both cookies and javascript, by storing
	344	hashed (with salt) keys in the session.
	345	* Make sure request.ip is a valid IPv4 or IPv6 address.
	346	* Make remove_orphaned_pages work in a proxied situation.
	347	* In the wiki_controller, only apply the dnsbl_check before_filter
	348	to the :edit, :new, and :save :export actions, instead of all actions.
	349	This makes mundane "show" requests faster, but does not
	350	compromise spam-fighting ability.
	351	* Be a little gentler in recovering from Instiki::ValidationErrors, when
	352	saving a page. Previously, we threw away all the user's changes upon
	353	the redirect. Now we attempt to salvage what he wrote.
	354	* Drop hostname from cache key.
	355	* Fix Recursive Includes.
	356	* Entering an incorrect password on the Create Web form should redirect
	357	back to the form, with a flash error.
	358	* In the Stylesheet Tweaks, the owner of a Web can specify an @import rule
	359	to pull in CSS styles form an external file. This worked in the "show"
	360	view, but was broken in the "published" view. Fixed.
	361	* Allow multiple leading capital letters in a WikiWord.
	362
	363	------------------------------------------------------------------------------
	364	* 0.13.0:
	365
	366	Mainly a Bugfix Release, which fixes two XSS Vulnerabilities.
	367	More information can be found on Jacques Distler's Blog:
	368	http://golem.ph.utexas.edu/~distler/blog/archives/001634.html
	369
	370	------------------------------------------------------------------------------
	371	* 0.12.0:
	372
	373	0.12 is mainly a bugfix release. We recommend all instiki Users to upgrade.
	374	In this version, some security holes where fixed
	375	- An XSS vulnerability in categories
	376	- An XSS vulnerability in <nowiki>
	377	- fixes that Instiki allows "dangerous" operations as HTTP GETs
	378
	379	as well as some other small improvements.
	380	- fixes for instiki running on mongrel
	381	- fixes for instiki running on mongrel_cluster
	382
	383	We added a lot of tests, synced with Jacques Distler's version and fixed
	384	small bugs as well. A note to Mac OSX users: use the Ruby One-Click-Installer
	385	for OSX ( http://rubyosx.com ) or make sure you are not running into problems
	386	with sqlite (see http://instiki.5uper.net/instiki/show/SQLite+issues+on+OSX)
	387
	388	------------------------------------------------------------------------------
	389	* 0.11.pl1
	390
	391	- ANTISPAM:
	392	- updated and included spam_patterns.txt
	393	- included dnsbl_check - DNS Blackhole Lists check
	394	[thanks to joost from http://www.spacebabies.nl ]
	395	- included the form-spam-protection rails plugin
	396	http://form-spam-protection.googlecode.com/svn/form_spam_protection/
	397
	398	- BUGFIXES:
	399	- fix PDF output not to contain garbage chars [Jesse Newland]
	400	- fixed the pages and authors display for single webs
	401	- web list does not show a link to a published version if it has none
	402	[Jesse Newland]
	403	- Fixed bug that failed to expire cached diff view of a page
	404	- Fixed rendering of WikiLinks in included pages in published or export
	405	mode
	406	- lots of small bugfixes and changes
	407
	408	- UPDATES:
	409	- Rails 1.2.1 tested and packaged with instiki
	410	- updated RubyZip to 0.9.1
	411	- updated packaged sqlite3-ruby
	412
	413	- FEATURES:
	414	- fix: being logged in on more Webs at once works now [Jaques Distler]
	415	- Stylesheet tweaks
	416	- visual display if webs are pass-protected (div background)
	417	- Linux packaging
	418
	419	------------------------------------------------------------------------------
	420	* 0.11.0:
	421	- SQL-based backend (ActiveRecord)
	422	- File uploads (finally)
	423	- Upgraded to Rails 1.0.0
	424	- Replaced internal link generator with routing
	425	- Fixed --daemon option
	426	- Removed Rubygem and native OS X distributions
	427	- Improved HTML diff
	428	- More accurate "See Changes"
	429	------------------------------------------------------------------------------
		* 0.10.2:
12		~~Upgraded to Rails 0.13.1~~
13		~~Fixed HTML export~~
14		~~Added layout=no option to the export_html action (it exports page contents processed~~
15		~~by the markup engine, but without the default layout - so that they can be wrapped in~~
16		~~some other layout)~~
17		~~<nowiki> tag can span several lines (before it was applied when both opening and closing~~
18		~~tags were on the same line only)~~
19		~~Resolved the "endless redirection loop" condition and otherwise improved handling of~~
20		~~errors in the rendering engines~~
21		~~Fixed rendering of Markdown hyperlinks such as [Text](http://something.com/foo)~~
22
	431	- Upgraded to Rails 0.13.1
	432	- Fixed HTML export
	433	- Added layout=no option to the export_html action (it exports page
	434	contents processed by the markup engine, but without the default layout -
	435	so that they can be wrapped in some other layout)
	436	- <nowiki> tag can span several lines (before it was applied when both
	437	opening and closing tags were on the same line only)
	438	- Resolved the "endless redirection loop" condition and otherwise improved
	439	handling of errors in the rendering engines
	440	- Fixed rendering of Markdown hyperlinks such as
	441	[Text](http://something.com/foo)
	442	------------------------------------------------------------------------------
		* 0.10.1:
24		~~Upgraded Rails to 0.12.0~~
25		~~Upgraded rubyzip to version 0.5.8~~
26		~~BlueCloth is back (RedCloth didn't do pure Markdown well enough)~~
27		~~Handling of line breaks in Textile is as in 0.9 (inserts <br/> tag)~~
28		~~Fixed HTML export (to enclose the output in <html> tags, include the stylesheet etc)~~
29		~~Corrected some compatibility issues with storages from earlier Instiki versions~~
30		~~Some other bug fixes~~
31
	444	- Upgraded Rails to 0.12.0
	445	- Upgraded rubyzip to version 0.5.8
	446	- BlueCloth is back (RedCloth didn't do pure Markdown well enough)
	447	- Handling of line breaks in Textile is as in 0.9 (inserts <br/> tag)
	448	- Fixed HTML export (to enclose the output in <html> tags, include the
	449	stylesheet etc)
	450	- Corrected some compatibility issues with storages from earlier Instiki
	451	versions
	452	- Some other bug fixes
	453	------------------------------------------------------------------------------
		* 0.10.0:
33		~~Ported to ActionPack~~
34		~~RedCloth 3.0.3~~
35		~~BlueCloth is phased out, Markdown is rendered by RedCloth~~
36		~~Mix markup option understands both Textile and Markdown on the same page~~
37		~~Instiki can serve static content (such as HTML or plain-text files) from ./public~~
38		~~directory~~
39		~~Much friendlier admin interface~~
40		~~Wiki link syntax doesn't conflict with Textile hyperlink syntax. Therefore~~
41		~~"textile link":LinkToSomePlace will not look insane.~~
42		~~RSS feeds accept query parameters, sush as~~
43		~~http://localhost:2500/wiki/rss_with_headlines?start=2005-02-18&end=2005-02-19&limit=10~~
44		~~RSS feed with page contents for a password-protected web behaves as follows:~~
45		~~if the web is published, RSS feed links to the published version of the web~~
46		~~otherwise, the feed is not available~~
47		~~Madeleine will check every hour if there are new commands in the log or 24 hours have~~
48		~~passed since last snapshot, and take snapshot if either of these conditions is true~~
49		~~Madeleine will also not log read-only operations, resulting in a better performance~~
50		~~Wiki extracts (to HTML and plain text) will leave only the last extract file in ./storage~~
51		~~Wiki search handles multibyte (UTF-8) characters correctly~~
52		~~Local hyperlinks in published pages point to published pages [Michael DeHaan]~~
53		~~Fixed a bug that sometimes caused all past revisions of a page to be "forgotten" on~~
54		~~restart~~
55		~~Fixed parsing of URIs with a port number (http://someplace.org:8080)~~
56		~~Instiki will not fork itself on a *nix, unless explicitly asked to~~
57		~~Instiki can bind to IPs other than 127.0.0.1 (command-line option)~~
58		~~Revisions that do not change anything on the page are rejected~~
59		~~Automated tests for all controller actions~~
60		~~category: lines are presented as links to "All Pages" for relevant categories~~
61		~~Search looks at page titles, as well as content~~
62		~~Multiple other usability enhancements and bug fixes~~
63
	455	- Ported to ActionPack
	456	- RedCloth 3.0.3
	457	- BlueCloth is phased out, Markdown is rendered by RedCloth
	458	- Mix markup option understands both Textile and Markdown on the same page
	459	- Instiki can serve static content (such as HTML or plain-text files) from
	460	./public directory
	461	- Much friendlier admin interface
	462	- Wiki link syntax doesn't conflict with Textile hyperlink syntax.
	463	Therefore "textile link":LinkToSomePlace will not look insane.
	464	- RSS feeds accept query parameters, such as
	465	http://localhost:2500/wiki/rss_with_headlines?start=2005-02-18&end=2005-02-19&limit=10
	466	- RSS feed with page contents for a password-protected web behaves as
	467	follows: if the web is published, RSS feed links to the published version
	468	of the web. otherwise, the feed is not available
	469	Madeleine will check every hour if there are new commands in the log or
	470	24 hours have passed since last snapshot, and take snapshot if either of
	471	these conditions is true. Madeleine will also not log read-only
	472	operations, resulting in a better performance
	473	- Wiki extracts (to HTML and plain text) will leave only the last extract
	474	file in ./storage
	475	- Wiki search handles multibyte (UTF-8) characters correctly
	476	- Local hyperlinks in published pages point to published pages [Michael
	477	DeHaan]
	478	- Fixed a bug that sometimes caused all past revisions of a page to be
	479	"forgotten" on restart
	480	- Fixed parsing of URIs with a port number (http://someplace.org:8080)
	481	- Instiki will not fork itself on a *nix, unless explicitly asked to
	482	- Instiki can bind to IPs other than 127.0.0.1 (command-line option)
	483	- Revisions that do not change anything on the page are rejected
	484	- Automated tests for all controller actions
	485	- category: lines are presented as links to "All Pages" for relevant
	486	categories
	487	- Search looks at page titles, as well as content
	488	- Multiple other usability enhancements and bug fixes
	489	------------------------------------------------------------------------------
		* 0.9.2:
65		~~Rollback takes the user to an edit form. The form has to be submitted for the change to~~
66		~~take place.~~
67		~~Changed to use inline style on published pages~~
68		~~Fixed "forward in time" on the last revision before current page~~
69		~~Instiki won't log bogus error messages when creating a new Wiki~~
70		~~Fixed deprecation warning for Object.id (introduced in Ruby 1.8.2)~~
71		~~Madeleine upgraded to 0.7.1~~
72		~~Madeleine snapshots are compressed~~
73		~~Packaged as a gem~~
74
	491	- Rollback takes the user to an edit form. The form has to be submitted for
	492	the change to take place.
	493	- Changed to use inline style on published pages
	494	- Fixed "forward in time" on the last revision before current page
	495	- Instiki won't log bogus error messages when creating a new Wiki
	496	- Fixed deprecation warning for Object.id (introduced in Ruby 1.8.2)
	497	- Madeleine upgraded to 0.7.1
	498	- Madeleine snapshots are compressed
	499	- Packaged as a gem
	500	------------------------------------------------------------------------------
		* 0.9.1:
76		~~Added performance improvements for updating existing pages~~
77		~~Fixed IP logging and RSS feeds behind proxies [With help from Guan Yang]~~
78		~~Fixed default storage directory (borked running on Windows) [Spotted by Curt Hibbs]~~
79
	502	- Added performance improvements for updating existing pages
	503	- Fixed IP logging and RSS feeds behind proxies [With help from Guan Yang]
	504	- Fixed default storage directory (borked running on Windows)
	505	[Spotted by Curt Hibbs]
	506	------------------------------------------------------------------------------
		* 0.9.0:
81		~~Added aliased links such as [[HomePage\|that nice home page]] [Mark Reid]~~
82		~~Added include other page content with [[!include TableOfContents]] [Mark Reid]~~
83		~~Added delete orphan pages from the Edit Web screen [by inspiration from Simon Arnaud]~~
84		~~Added logging of IP address for authors (who's behind the rollback wars)~~
85		~~Added Categories pages through backlinks (use "categories: news, instiki" on start of line) [Mark Reid]~~
86		~~Added option to use bracket-style wiki links only (and hence ban WikiWords)~~
87		~~Added command-line option to specify different storage path~~
88		~~Added print view without navigation~~
89		~~Added character and page (2275 characters including spaces) counter (important for student papers)~~
90		~~Off by default, activate it on the Edit Web screen~~
91		~~Added LaTeX/PDF integration on Textile installations with pdflatex installed on system (EXPERIMENTAL)~~
92		~~Use the home page as a table of contents with a unordered list to control sections~~
93		~~Added limit of 15 to the number of pages included in RSS feed~~
94		~~Moved static parts of stylesheet to separate file [Lau T�rnskov]~~
95		~~Fixed better semantics for revision movement [Ryan Singer]~~
96		~~Fixed color diffs to work much better [Xen/Mertz/Atkins]~~
97		~~Fixed performance problems for All Pages list [Dennis Mertz]~~
98		~~Fixed lots of rendering bugs [Mark Reid]~~
99		~~Upgraded to RedCloth 2.0.11 [integrating the fine work of Dennis Mertz]~~
100
	508	- Added aliased links such as [[HomePage\|that nice home page]] [Mark Reid]
	509	- Added include other page content with [[!include TableOfContents]]
	510	[Mark Reid]
	511	- Added delete orphan pages from the Edit Web screen [by inspiration from
	512	Simon Arnaud]
	513	- Added logging of IP address for authors (who's behind the rollback wars)
	514	- Added Categories pages through backlinks (use "categories: news, instiki"
	515	on start of line) [Mark Reid]
	516	- Added option to use bracket-style wiki links only (and hence ban
	517	WikiWords)
	518	- Added command-line option to specify different storage path
	519	- Added print view without navigation
	520	- Added character and page (2275 characters including spaces) counter
	521	(important for student papers)
	522	- Off by default, activate it on the Edit Web screen
	523	- Added LaTeX/PDF integration on Textile installations with pdflatex
	524	installed on system (EXPERIMENTAL)
	525	- Use the home page as a table of contents with a unordered list to control
	526	sections
	527	- Added limit of 15 to the number of pages included in RSS feed
	528	- Moved static parts of stylesheet to separate file [Lau T?rnskov]
	529	- Fixed better semantics for revision movement [Ryan Singer]
	530	- Fixed color diffs to work much better [Xen/Mertz/Atkins]
	531	- Fixed performance problems for All Pages list [Dennis Mertz]
	532	- Fixed lots of rendering bugs [Mark Reid]
	533	- Upgraded to RedCloth 2.0.11 [integrating the fine work of Dennis Mertz]
	534	------------------------------------------------------------------------------
		* 0.8.9:
102		~~Added color diffs to see changes between revisions [Bill Atkins]~~
103		~~They're aren't quite perfect yet as new paragraphs split the <ins> tags (hence 0.8.9, not 0.9.0)~~
104		~~Added redirect to edit if content of page generates an error~~
105		~~(so the page doesn't become unusable on bugs in the markup engines)~~
106		~~Fixed update Web with different address bug [Denis Metz]~~
107		~~Fixed a bunch of wiki word rendering issues by doing wiki word detection and replacment at once~~
108		~~Upgraded to BlueCloth 0.0.3b (should fix loads of problems on Markdown wikis)~~
109
	536	- Added color diffs to see changes between revisions [Bill Atkins]
	537	They're aren't quite perfect yet as new paragraphs split the <ins> tags
	538	(hence 0.8.9, not 0.9.0)
	539	- Added redirect to edit if content of page generates an error
	540	(so the page doesn't become unusable on bugs in the markup engines)
	541	- Fixed update Web with different address bug [Denis Metz]
	542	- Fixed a bunch of wiki word rendering issues by doing wiki word detection
	543	and replacment at once
	544	- Upgraded to BlueCloth 0.0.3b (should fix loads of problems on Markdown
	545	wikis)
	546	------------------------------------------------------------------------------
		* 0.8.5:
111		~~Instiki can now serve as a CMS by running a password-protected web with a published front~~
112		~~Added version check at startup (Instiki needs Ruby 1.8.1)~~
113
	548	- Instiki can now serve as a CMS by running a password-protected web with a
	549	published front
	550	- Added version check at startup (Instiki needs Ruby 1.8.1)
	551	------------------------------------------------------------------------------
		* 0.8.1:
115		~~Actually included RedCloth 2.0.7 in the release~~
116
	553	- Actually included RedCloth 2.0.7 in the release
	554	------------------------------------------------------------------------------
		* 0.8.0:
118		~~NOTE: Single-web wikis created in versions prior to 0.8.0 have "instiki" as their system password~~
119		~~Accepts wiki words in bracket style. Ex: [[wiki word]], [[c]], [[We could'nt have done it!]]~~
120		~~Accepts camel-case wiki words in all latin, greek, cyrillian, and armenian unicode characters~~
121		~~Many thanks to Guan Yang for building the higher- and lower-case lookup tables~~
122		~~And thanks to Simon Arnaud for the initial patch that got the work started~~
123		~~Changed charset to UTF-8~~
124		~~Cut down on command-line options and replaced them with an per-web config screen~~
125		~~Added option to extend the stylesheet on a per-web basis to tweak the look in details~~
126		~~Added simple color options for variety~~
127		~~Added option to add/remove password protection on each web~~
128		~~Added the wiki name of the author locking a given page (instead of just "someone")~~
129		~~Removed single/multi-web distinction -- all Instikis are now multi-web~~
130		~~Load libraries from an unshifted load path, so that old installed libraries doesn't clash [Emiel van de Laar]~~
131		~~Keeps the author cookie forever, so you don't have to enter your name again and again~~
132		~~Fixed XHTML so it validates [Bruce D'Arcus]~~
133		~~Authors are no longer listed under orphan pages~~
134		~~Added export to markup (great for backups, potentially for switching wiki engine)~~
135		~~Don't link wiki words that proceeds from either /, = or ?~~
136		~~(http://c2.com/cgi/wiki?WikiWikiClones, /show/HomePage, cgi.pl?show=WikiWord without escaping)~~
137		~~Accessing an unexisting page redirects to a different url (/new/PageName)~~
138		~~Increased snapshot time to just once a day (cuts down on disk storage requirements)~~
139		~~Made RDoc support work better with 1.8.1 [Mauricio Fern�ndez]~~
140		~~Added convinient redirect from /wiki/ to /wiki/show/HomePage~~
141		~~Fixed BlueCloth bug with backticks at start of line~~
142		~~Updated to RedCloth 2.0.7 (and linked to the new Textile reference)~~
143
	556	- NOTE: Single-web wikis created in versions prior to 0.8.0 have "instiki"
	557	as their system password
	558	- Accepts wiki words in bracket style.
	559	Examples: [[wiki word]], [[c]], [[We could'nt have done it!]]
	560	- Accepts camel-case wiki words in all latin, greek, cyrillian, and
	561	armenian unicode characters
	562	- Many thanks to Guan Yang for building the higher- and lower-case lookup
	563	tables. And thanks to Simon Arnaud for the initial patch that got the
	564	work started
	565	- Changed charset to UTF-8
	566	- Cut down on command-line options and replaced them with an per-web config
	567	screen
	568	- Added option to extend the stylesheet on a per-web basis to tweak the
	569	look in details
	570	- Added simple color options for variety
	571	- Added option to add/remove password protection on each web
	572	- Added the wiki name of the author locking a given page (instead of just
	573	"someone")
	574	- Removed single/multi-web distinction -- all Instikis are now multi-web
	575	- Load libraries from an unshifted load path, so that old installed
	576	libraries doesn't clash [Emiel van de Laar]
	577	- Keeps the author cookie forever, so you don't have to enter your name
	578	again and again
	579	- Fixed XHTML so it validates [Bruce D'Arcus]
	580	- Authors are no longer listed under orphan pages
	581	- Added export to markup (great for backups, potentially for switching wiki
	582	engine)
	583	- Don't link wiki words that proceeds from either /, = or ?
	584	(http://c2.com/cgi/wiki?WikiWikiClones,
	585	/show/HomePage, cgi.pl?show=WikiWord without escaping)
	586	- Accessing an unexisting page redirects to a different url (/new/PageName)
	587	- Increased snapshot time to just once a day (cuts down on disk storage
	588	requirements)
	589	- Made RDoc support work better with 1.8.1 [Mauricio Fern?ndez]
	590	- Added convinient redirect from /wiki/ to /wiki/show/HomePage
	591	- Fixed BlueCloth bug with backticks at start of line
	592	- Updated to RedCloth 2.0.7 (and linked to the new Textile reference)
	593	------------------------------------------------------------------------------
		* 0.7.0:
145		~~Added Markdown (BlueCloth) and RDoc [Mauricio Fern�ndez] as command-line markup choices~~
146		~~Added wanted and orphan page lists to All pages (only show up if there's actually orphan or wanted pages)~~
147		~~Added ISO-8859-1 as XML encoding in RSS feeds (makes FeedReader among others happy for special entities)~~
148		~~Added proper links in the RSS feed (but the body links are still relative, which NNW and others doesn't grok)~~
149		~~Added access keys: E => Edit, H => HomePage, A => All Pages, U => Recently Revised, X => Export~~
150		~~Added password-login through URL (so you can subscribe to feed on a protected web)~~
151		~~Added web passwords to the feed links for protected webs, so they work without manual login~~
152		~~Added the web name in small letters above all pages within a web~~
153		~~Polished authors and recently revised~~
154		~~Updated to RedCloth 2.0.6~~
155		~~Changed content type for RSS feeds to text/xml (makes Mozilla Aggreg8 happy)~~
156		~~Changed searching to be case insensitive~~
157		~~Changed HomePage to display the name of the web instead~~
158		~~Changed exported HTML pages to be valid XHTML (which can be preprocessed by XSLT)~~
159		~~Fixed broken recently revised~~
160
	595	- Added Markdown (BlueCloth) and RDoc [Mauricio Fern?ndez] as command-line
	596	markup choices
	597	- Added wanted and orphan page lists to All pages (only show up if there's
	598	actually orphan or wanted pages)
	599	- Added ISO-8859-1 as XML encoding in RSS feeds (makes FeedReader among
	600	others happy for special entities)
	601	- Added proper links in the RSS feed (but the body links are still
	602	relative, which NNW and others doesn't grok)
	603	- Added access keys: E => Edit, H => HomePage, A => All Pages,
	604	U => Recently Revised, X => Export
	605	- Added password-login through URL (so you can subscribe to feed on a
	606	protected web)
	607	- Added web passwords to the feed links for protected webs, so they work
	608	without manual login
	609	- Added the web name in small letters above all pages within a web
	610	- Polished authors and recently revised
	611	- Updated to RedCloth 2.0.6
	612	- Changed content type for RSS feeds to text/xml (makes Mozilla Aggreg8
	613	happy)
	614	- Changed searching to be case insensitive
	615	- Changed HomePage to display the name of the web instead
	616	- Changed exported HTML pages to be valid XHTML (which can be preprocessed
	617	by XSLT)
	618	- Fixed broken recently revised
	619	------------------------------------------------------------------------------
		* 0.6.0:
162		~~Fixed Windows compatibility [Florian]~~
163		~~Fixed bug that would prevent Madeleine from taking snapshots in Daemon mode~~
164		~~Added export entire web as HTML in a zip file~~
165		~~Added RSS feeds~~
166		~~Added proper getops support for the growing number of options [Florian]~~
167		~~Added safe mode that forbids style options in RedCloth [Florian]~~
168		~~Updated RedCloth to 2.0.5~~
169
	621	- Fixed Windows compatibility [Florian]
	622	- Fixed bug that would prevent Madeleine from taking snapshots in Daemon
	623	mode
	624	- Added export entire web as HTML in a zip file
	625	- Added RSS feeds
	626	- Added proper getops support for the growing number of options [Florian]
	627	- Added safe mode that forbids style options in RedCloth [Florian]
	628	- Updated RedCloth to 2.0.5
	629	------------------------------------------------------------------------------
		* 0.5.0:
171		~~NOTE: 0.5.0 is NOT compatible with databases from earlier versions~~
172		~~Added revisions~~
173		~~Added multiple webs~~
174		~~Added password protection for webs on multi-web setups~~
175		~~Added the notion of authors (that are saved in a cookie)~~
176		~~Added command-line option for not running as a Daemon on Unix~~
177
	631	- NOTE: 0.5.0 is NOT compatible with databases from earlier versions
	632	- Added revisions
	633	- Added multiple webs
	634	- Added password protection for webs on multi-web setups
	635	- Added the notion of authors (that are saved in a cookie)
	636	- Added command-line option for not running as a Daemon on Unix
	637	------------------------------------------------------------------------------
		* 0.3.1:
179		~~Added option to escape wiki words with \~~
180
	639	- Added option to escape wiki words with \
	640	------------------------------------------------------------------------------
		* 0.3.0:
182		~~Brought all files into common style (including Textile help on the edit page)~~
183		~~Added page locking (if someone already is editing a page there's a warning)~~
184		~~Added daemon abilities on Unix (keep Instiki running after you close the terminal)~~
185		~~Made port 2500 the default port, so Instiki can be launched by dobbelt-click~~
186		~~Added Textile cache to speed-up rendering of large pages~~
187		~~Made WikiWords look like "Wiki Words"~~
188		~~Updated RedCloth to 2.0.4~~
189
	642	- Brought all files into common style (including Textile help on the edit
	643	page)
	644	- Added page locking (if someone already is editing a page there's a
	645	warning)
	646	- Added daemon abilities on Unix (keep Instiki running after you close the
	647	terminal)
	648	- Made port 2500 the default port, so Instiki can be launched by
	649	dobbelt-click
	650	- Added Textile cache to speed-up rendering of large pages
	651	- Made WikiWords look like "Wiki Words"
	652	- Updated RedCloth to 2.0.4
	653	------------------------------------------------------------------------------
		* 0.2.5:
191		~~Upgraded to RedCloth 2.0.2 and Madeleine 0.6.1, which means the~~
192		~~Windows problems are gone. Also fixed a problem with wikiwords~~
193		~~that used part of other wikiwords.~~
194
	655	- Upgraded to RedCloth 2.0.2 and Madeleine 0.6.1, which means the
	656	- Windows problems are gone. Also fixed a problem with wikiwords
	657	- that used part of other wikiwords.
	658	------------------------------------------------------------------------------
		* 0.2.0:
196		~~First public release~~
	660	- First public release

rool/rails/instiki/trunk/README:

prev.	current

1		~~===What is Instiki?~~

3		~~Admitted, it's YetAnotherWikiClone[http://c2.com/cgi/wiki?WikiWikiClones], but with a strong focus~~
4		~~on simplicity of installation and running:~~
	2	= Instiki

6		~~Step 1. Download~~
7		~~Step 2. Run "instiki"~~
	4	Instiki is a wiki clone so pretty and easy to set up, you'll wonder if it’s really a wiki. Runs on Rails and focuses on portability and stability. Supports file uploads, PDF export, RSS, multiple users and password protection. Some use Instiki as a CMS (Content Management System) because of its ability to export static pages.

9		~~If you are on Windows:~~
10		~~"Step 3. Chuckle... "There's no step three!" (TM)"~~
	6	Instiki lowers the barriers of interest for when you might consider using a wiki. It's so simple to get running that you'll find yourself using it for anything -- taking notes, brainstorming, organizing a gathering.

12		~~You're now running a perfectly suitable wiki on port 2500~~
13		~~that'll present you with one-step setup, followed by a textarea for the home page~~
14		~~on http://localhost:2500~~

16		~~Instiki lowers the barriers of interest for when you might consider~~
17		~~using a wiki. It's so simple to get running that you'll find yourself~~
18		~~using it for anything -- taking notes, brainstorming, organizing a~~
19		~~gathering.~~
	9	== Supported Platforms

21		~~Having said all that, if you are not on Windows, in this version of Instiki it is a somewhat different story.~~
22		~~Since the author has no Linux or Mac at hand, and Instiki is moving to a SQL-based backend, this is what it takes~~
23		~~to install (until somebody sends a patch to properly package Instiki for all those other platforms):~~
	11	Instiki only relies on Ruby - the sole external dependency (it includes all other dependencies). Any OS that can run Ruby can run Instiki - that includes Windows, Linux, Mac OS X and most known Unix flavors.

25		~~3. Kill "instiki"~~
26		~~4. Install SQLite 3 database engine from http://www.sqlite.org/~~
27		~~5. Install SQLite 3 driver for Ruby from http://sqlite-ruby.rubyforge.org/~~
28		~~6. Install Rake from http://rake.rubyforge.org/~~
29		~~7. Execute rm -f db/*.db~~
30		~~8. Execute 'rake migrate'~~
31		~~9. Make an embarrassed sigh (as I do while writing this)~~
32		~~10. Run 'instiki' again~~
33		~~11. Pat yourself on the shoulder for being such a talented geek~~
34		~~12. At least, there is no step twelve! (TM)~~
	13	Instiki on BeOS, Amiga OS, OS2, Zeta OS and support for various exotic Platforms is planned. Mostly it already works, if Ruby runs there (download the linux version in this case). Please contact parasew if you want to help out for your OS that is not listed. Please also get in touch if you are able to create an instiki package for your favorite unix or linux distribution.

36		~~===Features:~~
	15
	16	== 3 easy Steps to get the Instiki experience
	17
	18	Step 1. Get Ruby and Instiki, run "ruby bundle"
	19	Step 2. Run "instiki"
	20	Step 3. Chuckle... "There's no step three!" (TM)
	21
	22
	23	== Details
	24
	25	You need at least Ruby Version 1.8.6, and Rubygems 1.3.6, installed on your System. The second dependency is a Database System, but don't worry, the default sqlite3 will be installed for you, if it's not already installed. You can also use any other database system (MySQL, PostgreSQL, ...) supported by Rails.
	26
	27
	28	=== If you are on Windows
	29
	30	- Get the Ruby One-Click Installer - Windows http://rubyforge.org/projects/rubyinstaller
	31	- Get Development Kit http://github.com/oneclick/rubyinstaller/wiki/development-kit
	32	- In the Instiki directory, execute "ruby bundle"
	33	- double-click instiki.bat or instiki.cmd and there you go!
	34
	35	=== If you are on Mac OSX
	36
	37	On Leopard and Snow Leopard, you are all set.
	38	- run "sudo gem update --system" via the command-line.
	39	- run "ruby bundle" in the instiki directory.
	40	- run "ruby instiki" and there you go!
	41
	42	Tiger ships with a really old Ruby Version (1.8.2) and a broken Readline Library you have to
	43	- use the Ruby One-Click-Installer for OSX ( http://rubyosx.com ) if you don't already have macports' Ruby
	44
	45	=== If you are on Linux
	46
	47
	48	=== Any other System
	49
	50	- get Ruby for your System, compile if nessesary: http://ruby-lang.org
	51	- Depending on the version of Rubygems that came with your Ruby, you may need to
	52
	53	sudo gem update --system
	54
	55	- get SQLite or compile from http://sqlite.org (you can also use mysql or any other supported database system if you want)
	56	- run "ruby bundle"
	57	- run instiki
	58
	59	You're now running a perfectly suitable wiki on port 2500 that'll present you with one-step setup, followed by a textarea for the home page on http://localhost:2500
	60
	61
	62	== Features
	63
		* Regular expression search: Find deep stuff really fast
		* Revisions: Follow the changes on every page from birth. Rollback to an earlier rev
		* Export to HTML or markup in a zip: Take the entire wiki with you home or for reference
...	...
		* Password-protected webs: Keep it private
		* Authors: Each revision is associated with an author, so you can see who changed what
		* Reference tracker: Which other pages are pointing to the current?
45		* Speed: Using Madelein[http://madeleine.sourceforge.net] for persistence (all pages are in memory)
46		* Three markup choices: Textile[http://www.textism.com/tools/textile]
47		~~(default / RedCloth[http://www.whytheluckystiff.net/ruby/redcloth]),~~
48		~~Markdown (BlueCloth[http://bluecloth.rubyforge.org]), and RDoc[http://rdoc.sourceforge.net/doc]~~
49		* Embedded webserver: Through WEBrick[http://www.webrick.org]
	72	* Five markup choices:
	73	Markdown-based choices [http://daringfireball.net/projects/markdown/syntax]:
	74	Markdown+itex2MML (the default; requires itex2MML)
	75	Markdown+BlahTeX/PNG (requires blahtex and a working TeX installation)
	76	Markdown
	77	Textile [http://www.textism.com/tools/textile]
	78	RDoc [http://rdoc.sourceforge.net/doc]
	79	* Support for Math (using itex syntax [http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html])
	80	* Support for WYSIWYG SVG editing -- embed SVG graphics right in your wiki page.
	81	* Embedded webserver: uses Mongrel (if installed), or the bundled WEBrick webserver (if not).
		* Internationalization: Wiki words in any latin, greek, cyrillian, or armenian characters
		* Color diffs: Track changes through revisions
52		* Definitely can run on SQLite and MySQL
53		* May be able to run on Postgres, Oracle, DB2 and SqlServer. If you try this, and it works
54		~~(or, it doesn't, but you make it work) please write about it on Instiki.org.~~
	84	* Runs on SQLite3 per default, can be configured to run on PostgreSQL, MySQL, DB2, Firebird, Openbase, Oracle, SQL Server or Sybase

56		~~===Command-line options:~~
	86
	87	== Command-line options:
	88
		* Run "ruby instiki --help"

59		~~===History:~~
60		* See CHANGELOG

62		~~===Migrating Instiki 0.10.2 storage to Instiki 0.11.0 database~~
63		~~1. Install Instiki 0.11 and check that it works (you should be able to create a web, edit and save a HomePage)~~
64		~~2. Execute~~
65		~~ruby script\import_storage \~~
66		~~-t /full/path/to/instiki0.10/storage \~~
67		~~-i /full/path/to/instiki0.10/installation \~~
68		~~-d sqlite (or mysql, or postgres, depending on what you use) \~~
69		~~-o instiki_import.sql~~
70		~~for example (Windows):~~
71		~~ruby script\import_storage -t c:\instiki-0.10.2\storage\2500 -i c:\instiki-0.10.2 -d sqlite -o instiki_import.sql~~
72		~~3. This will produce instiki_import.sql file in the current working directory.~~
73		~~Open it in a text editor and inspect carefully.~~
74		~~4. Connect to your production database (e.g., 'sqlite3 db\prod.db'),~~
75		~~and have it execute instiki_import.sql (e.g., '.read instiki_import.sql')~~
76		~~5. Execute ruby script\reset_references~~
77		~~(this script parses all pages for crosslinks between them, so it may take a few minutes)~~
78		~~6. Restart Instiki~~
79		~~7. Go over some pages, especially those with a lot of complex markup, and see if anything is broken.~~
	92	== History:

81		~~The most common migration problem is this: if you open All Pages and see a lot of orphaned pages,~~
82		~~you forgot to run ruby script\reset_references after importing the data.~~
	94	* See CHANGELOG

84		~~===Upgrading from Instiki-AR Beta 1~~
85		~~In Beta 2, we switch to ActiveRecord:Migrations. Therefore:~~
86		~~1. Back up your production database.~~
87		~~2. Open command-line session to your database and execute:~~
88		~~create table schema_info (version integer(11));~~
89		~~insert into schema_info (version) values (1);~~
90		~~3. Go back to the shell, change directory to the new Instiki and execute "rake migrate".~~
	96	== Migrating from Instiki 0.11-0.18 to 0.19

92		~~Step 2 creates a table that tells to ActiveRecord:Migrations that the current version~~
93		~~of this database is 1 (corresponding to Beta 1), and step 3 makes it up-to-date with~~
94		~~the current version of Instiki.~~
	98	ruby bundle
	99	ruby bundle exec rake upgrade_instiki
	100
	101	== Download the latest release from:

96		~~===Download the latest release from:~~
		* http://rubyforge.org/project/showfiles.php?group_id=186

99		~~===Visit the "official" Instiki wiki:~~
100		* http://instiki.org

102		~~===License:~~
	106	== Visit the Instiki wiki:
	107
	108	* http://golem.ph.utexas.edu/wiki/instiki/
	109
	110
	111	== License:
	112
		* same as Ruby's

	115
		---
	117
		Authors::

		Versions 0.0 to 0.9.1:: David Heinemeier Hansson
109		~~Email:: david@loudthinking.com~~
110		~~Weblog:: http://www.loudthinking.com~~
	121	Email:: david[AT]loudthinking.com
	122	Weblog:: http://www.loudthinking.com[http://www.loudthinking.com]

		From 0.9.2 onwards:: Alexey Verkhovsky
113		~~Email:: alex@verk.info~~
	125	Email:: alex[AT]verk.info
	126
	127	From 0.11 onwards:: Matthias Tarasiewicz and 5uper.net
	128	Email:: parasew[AT]gmail.com
	129	Website:: http://5uper.net[http://5uper.net]
	130
	131	From 0.13 onwards:: Matthias Tarasiewicz and Jacques Distler
	132	Email:: instiki-devel[AT]rubyforge.org
	133	Weblog Jacques: http://golem.ph.utexas.edu/~distler/blog/
	134	Weblog Parasew: http://parasew.com

rool/rails/instiki/trunk/app/controllers/admin_controller.rb:

prev.	current

1		~~require 'application'~~
2
		class AdminController < ApplicationController

		layout 'default'
	4	cache_sweeper :web_sweeper
	5	before_filter :dnsbl_check

		def create_system
		if @wiki.setup?
...	...
		"\n\n" +
		"(WARNING: this will destroy content of your current wiki)."
		redirect_home(@wiki.webs.keys.first)
15		~~elsif @params['web_name']~~
	15	elsif params['web_name']
		# form submitted -> create a wiki
17		~~@wiki.setup(@params['password'], @params['web_name'], @params['web_address'])~~
18		~~flash[:info] = "Your new wiki '#{@params['web_name']}' is created!\n" +~~
	17	@wiki.setup(params['password'], params['web_name'], params['web_address'])
	18	flash[:info] = "Your new wiki '#{params['web_name']}' is created!\n" +
		"Please edit its home page and press Submit when finished."
20		~~redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new',~~
	20	redirect_to :web => params['web_address'], :controller => 'wiki', :action => 'new',
		:id => 'HomePage'
		else
		# no form submitted -> go to template
...	...
		end

		def create_web
28		~~if @params['address']~~
	28	if params['address']
	29	return unless is_post
		# form submitted
30		~~if @wiki.authenticate(@params['system_password'])~~
	31	if @wiki.authenticate(params['system_password'])
		begin
32		~~@wiki.create_web(@params['name'], @params['address'])~~
33		~~flash[:info] = "New web '#{@params['name']}' successfully created."~~
34		~~redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new',~~
	33	@wiki.create_web(params['name'], params['address'])
	34	flash[:info] = "New web '#{params['name']}' successfully created."
	35	redirect_to :web => params['address'], :controller => 'wiki', :action => 'new',
		:id => 'HomePage'
		rescue Instiki::ValidationError => e
		@error = e.message
		# and re-render the form again
		end
40		~~else~~
41		~~redirect_to :controller => 'wiki', :action => 'index'~~
	41	else
	42	flash[:error] = "System Password incorrect. Try again."
	43	redirect_to :controller => 'admin', :action => 'create_web'
		end
		else
		# no form submitted -> render template
...	...
		end

		def edit_web
49		~~system_password = @params['system_password']~~
	51	system_password = params['system_password']
		if system_password
	53	return unless is_post
		# form submitted
		if wiki.authenticate(system_password)
		begin
	57	raise Instiki::ValidationError.new("Password for this Web didn't match") unless
	58	(params['password'].empty? or params['password'] == params['password_check'])
		wiki.edit_web(
55		~~@web.address, @params['address'], @params['name'],~~
56		~~@params['markup'].intern,~~
57		~~@params['color'], @params['additional_style'],~~
58		~~@params['safe_mode'] ? true : false,~~
59		~~@params['password'].empty? ? nil : @params['password'],~~
60		~~@params['published'] ? true : false,~~
61		~~@params['brackets_only'] ? true : false,~~
62		~~@params['count_pages'] ? true : false,~~
63		~~@params['allow_uploads'] ? true : false,~~
64		~~@params['max_upload_size']~~
	60	@web.address, params['address'], params['name'],
	61	params['markup'].intern,
	62	params['color'], params['additional_style'],
	63	params['safe_mode'] ? true : false,
	64	params['password'].empty? ? nil : params['password'],
	65	params['published'] ? true : false,
	66	params['brackets_only'] ? true : false,
	67	params['count_pages'] ? true : false,
	68	params['allow_uploads'] ? true : false,
	69	params['max_upload_size']
		)
66		~~flash[:info] = "Web '#{@params['address']}' was successfully updated"~~
67		~~redirect_home(@params['address'])~~
	71	flash[:info] = "Web '#{params['address']}' was successfully updated"
	72	redirect_home(params['address'])
		rescue Instiki::ValidationError => e
		logger.warn e.message
		@error = e.message
...	...
		end

		def remove_orphaned_pages
83		~~if wiki.authenticate(@params['system_password_orphaned'])~~
	88	return unless is_post
	89	if wiki.authenticate(params['system_password_orphaned'])
		wiki.remove_orphaned_pages(@web_name)
		flash[:info] = 'Orphaned pages removed'
		redirect_to :controller => 'wiki', :web => @web_name, :action => 'list'
		else
88		~~flash[:error] = password_error(@params['system_password_orphaned'])~~
	94	flash[:error] = password_error(params['system_password_orphaned'])
		redirect_to :controller => 'admin', :web => @web_name, :action => 'edit_web'
		end
		end
	98
	99	def remove_orphaned_pages_in_category
	100	return unless is_post
	101	if wiki.authenticate(params['system_password_orphaned_in_category'])
	102	category = params['category']
	103	wiki.remove_orphaned_pages_in_category(@web_name, category)
	104	flash[:info] = "Orphaned pages in category \"#{category}\" removed"
	105	redirect_to :controller => 'wiki', :web => @web_name, :action => 'list'
	106	else
	107	flash[:error] = password_error(params['system_password_orphaned_in_category'])
	108	redirect_to :controller => 'admin', :web => @web_name, :action => 'edit_web'
	109	end
	110	end

	112	def delete_web
	113	return unless is_post
	114	if wiki.authenticate(params['system_password_delete_web'])
	115	wiki.delete_web(@web_name)
	116	flash[:info] = "Web \"#{@web_name}\" has been deleted."
	117	redirect_to :controller => 'wiki', :action => 'web_list'
	118	else
	119	flash[:error] = password_error(params['system_password_delete_web'])
	120	redirect_to :controller => 'admin', :web => @web_name, :action => 'edit_web'
	121	end
	122	end
	123
	124	def delete_files
	125	return unless is_post
	126	some_deleted = false
	127	if wiki.authenticate(params['system_password'])
	128	params.each do \|file, p\|
	129	if p == 'delete'
	130	WikiFile.find_by_file_name(file).destroy
	131	some_deleted = true
	132	end
	133	end
	134	flash[:info] = "File(s) successfully deleted." if some_deleted
	135	else
	136	flash[:error] = password_error(params['system_password'])
	137	end
	138	redirect_to :back
	139	end
	140
		end

rool/rails/instiki/trunk/app/controllers/file_controller.rb:

prev.	current

		# Controller responsible for serving files and pictures.

	3	require 'zip/zip'
	4	require 'instiki_stringsupport'
	5
		class FileController < ApplicationController

		layout 'default'

7		~~before_filter :check_allow_uploads~~
	10	before_filter :check_authorized
	11	before_filter :check_allow_uploads, :dnsbl_check, :except => [:file, :blahtex_png]

		def file
10		~~if @params['file']~~
	14	@file_name = params['id']
	15	if params['file']
	16	return unless is_post and check_allow_uploads
		# form supplied
12		~~new_file = @web.wiki_files.create(@params['file'])~~
	18	new_file = @web.wiki_files.create(params['file'])
		if new_file.valid?
		flash[:info] = "File '#{@file_name}' successfully uploaded"
15		~~return_to_last_remembered~~
	21	redirect_to(params['referring_page'])
		else
		# pass the file with errors back into the form
		@file = new_file
		render
		end
		else
22		~~render(:status => 404, :text => 'Unspecified file name') and return unless @file_name~~
		# no form supplied, this is a request to download the file
24		~~file = WikiFile.find_by_file_name(@file_name)~~
25		~~if file~~
26		~~send_data(file.content, determine_file_options_for(@file_name, :filename => @file_name))~~
	29	file = @web.files_path.join(@file_name)
	30	if File.exists?(file)
	31	send_file(file)
		else
	33	return unless check_allow_uploads
		@file = WikiFile.new(:file_name => @file_name)
		render
		end
		end
		end
	39
	40	def blahtex_png
	41	send_file(@web.blahtex_pngs_path.join(params['id']))
	42	end
	43
	44	def delete
	45	@file_name = params['id']
	46	file = WikiFile.find_by_file_name(@file_name)
	47	unless file
	48	flash[:error] = "File '#{@file_name}' not found."
	49	redirect_to_page(@page_name)
	50	end
	51	system_password = params['system_password']
	52	if system_password
	53	return unless is_post
	54	# form supplied
	55	if wiki.authenticate(system_password)
	56	file.destroy
	57	flash[:info] = "File '#{@file_name}' deleted."
	58	else
	59	flash[:error] = "System Password incorrect."
	60	end
	61	redirect_to_page(@page_name)
	62	else
	63	# no system password supplied, display the form
	64	end
	65	end

		def cancel_upload
		return_to_last_remembered
		end

		def import
39		~~if @params['file']~~
	72	if params['file']
		@problems = []
		import_file_name = "#{@web.address}-import-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}.zip"
42		~~file_yard.upload_file(import_file_name, @params['file'])~~
43		~~import_from_archive(file_yard.file_path(import_file_name))~~
	75	import_from_archive(params['file'].path)
		if @problems.empty?
		flash[:info] = 'Import successfully finished'
		else
...	...
		end

		protected
	89
	90	def check_authorized
	91	if authorized? or @web.published?
	92	return true
	93	else
	94	@hide_navigation = true
	95	render(:status => 403, :text => 'This web is private', :layout => true)
	96	return false
	97	end
	98	end

		def check_allow_uploads
59		~~if @web.allow_uploads?~~
	101	render(:status => 404, :text => "Web #{params['web'].inspect} not found", :layout => 'error') and return false unless @web
	102	if @web.allow_uploads? and authorized?
		return true
		else
62		~~render :status => 403, :text => 'File uploads are blocked by the webmaster'~~
	105	@hide_navigation = true
	106	render(:status => 403, :text => 'File uploads are blocked by the webmaster', :layout => true)
		return false
		end
		end

67		~~def connect_to_model~~
68		~~super~~
69		~~@file_name = @params['id']~~
70		~~end~~
71
		private

		def import_from_archive(archive)
...	...
		zip = Zip::ZipInputStream.open(archive)
		while (entry = zip.get_next_entry) do
		ext_length = File.extname(entry.name).length
79		~~page_name = entry.name[0..-(ext_length + 1)]~~
80		~~page_content = entry.get_input_stream.read~~
	118	page_name = entry.name[0..-(ext_length + 1)].purify
	119	page_content = entry.get_input_stream.read.purify
		logger.info "Processing page '#{page_name}'"
		begin
		existing_page = @wiki.read_page(@web.address, page_name)
...	...
		next
		else
		logger.info "Page '#{page_name}' already exists. Adding a new revision to it."
90		~~wiki.revise_page(@web.address, page_name, page_content, Time.now, @author)~~
	129	wiki.revise_page(@web.address, page_name, page_name, page_content, Time.now, @author, PageRenderer.new)
		end
		else
93		~~wiki.write_page(@web.address, page_name, page_content, Time.now, @author)~~
	132	wiki.write_page(@web.address, page_name, page_content, Time.now, @author, PageRenderer.new)
		end
		rescue => e
		logger.error(e)

rool/rails/instiki/trunk/app/controllers/revision_sweeper.rb:

prev.	current

	1	require_dependency 'cache_sweeping_helper'
	2
		class RevisionSweeper < ActionController::Caching::Sweeper
	4
	5	include CacheSweepingHelper
	6
		observe Revision, Page

	9	def before_save(record)
	10	if record.is_a?(Revision)
	11	expire_cached_page(record.page.web, record.page.name)
	12	expire_cached_revisions(record.page)
	13	end
	14	end
	15
		def after_save(record)
		if record.is_a?(Revision)
		expire_caches(record.page)
...	...
		private

		def expire_caches(page)
19		~~web = page.web~~
20
21		~~([page.name] + WikiReference.pages_that_reference(page.name)).uniq.each do \|page_name\|~~
22		~~expire_action :controller => 'wiki', :web => web.address,~~
23		~~:action => %w(show published), :id => page_name~~
24		~~end~~
25
26		~~expire_action :controller => 'wiki', :web => web.address,~~
27		~~:action => %w(authors recently_revised list)~~
28		~~expire_fragment :controller => 'wiki', :web => web.address,~~
29		~~:action => %w(rss_with_headlines rss_with_content)~~
	31	expire_cached_summary_pages(page.web)
	32	pages_to_expire = ([page.name] + WikiReference.pages_that_reference(page.web, page.name) +
	33	WikiReference.pages_redirected_to(page.web, page.name) +
	34	WikiReference.pages_that_include(page.web, page.name)).uniq
	35	pages_to_expire.each { \|page_name\| expire_cached_page(page.web, page_name) }
		end

		end

rool/rails/instiki/trunk/app/controllers/wiki_controller.rb:

prev.	current

		require 'fileutils'
2		~~require 'redcloth_for_tex'~~
3		~~require 'parsedate'~~
	2	require 'maruku'
	3	require 'maruku/ext/math'
		require 'zip/zip'
	5	require 'instiki_stringsupport'
	6	require 'resolv'

		class WikiController < ApplicationController

8		~~caches_action :show, :published, :authors, :recently_revised, :list~~
	10	before_filter :load_page
	11	before_filter :dnsbl_check, :only => [:edit, :new, :save, :export_html, :export_markup]
	12	caches_action :show, :published, :authors, :tex, :s5, :print, :recently_revised, :list, :file_list, :source,
	13	:history, :revision, :atom_with_content, :atom_with_headlines, :if => Proc.new { \|c\| c.send(:do_caching?) }
		cache_sweeper :revision_sweeper

11		~~layout 'default', :except => [:rss_feed, :rss_with_content, :rss_with_headlines, :tex, :export_tex, :export_html]~~
	16	layout 'default', :except => [:atom_with_content, :atom_with_headlines, :atom, :source, :tex, :s5, :export_html]

		def index
		if @web_name
		redirect_home
		elsif not @wiki.setup?
		redirect_to :controller => 'admin', :action => 'create_system'
18		~~elsif @wiki.webs.length == 1~~
	23	elsif @wiki.webs.size == 1
		redirect_home @wiki.webs.values.first.address
		else
		redirect_to :action => 'web_list'
...	...
		# Outside a single web --------------------------------------------------------

		def authenticate
28		~~if password_check(@params['password'])~~
	33	if password_check(params['password'])
		redirect_home
		else
31		~~flash[:info] = password_error(@params['password'])~~
	36	flash[:info] = password_error(params['password'])
		redirect_to :action => 'login', :web => @web_name
		end
		end
...	...
		@authors = @page_names_by_author.keys.sort
		end

	57	def file_list
	58	sort_order = params['sort_order'] \|\| 'file_name'
	59	case sort_order
	60	when 'file_name'
	61	@alt_sort_order = 'created_at'
	62	@alt_sort_name = 'date'
	63	else
	64	@alt_sort_order = 'file_name'
	65	@alt_sort_name = 'filename'
	66	end
	67	@file_list = @web.file_list(sort_order)
	68	end
	69
		def export_html
53		~~stylesheet = File.read(File.join(RAILS_ROOT, 'public', 'stylesheets', 'instiki.css'))~~
54		~~export_pages_as_zip('html') do \|page\|~~
55
	71	export_pages_as_zip(html_ext) do \|page\|
		renderer = PageRenderer.new(page.revisions.last)
		rendered_page = <<-EOL
58		~~<!DOCTYPE html~~
59		~~PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"~~
60		~~"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">~~
61		~~<html xmlns="http://www.w3.org/1999/xhtml">~~
62		~~<head>~~
63		~~<title>#{page.plain_name} in #{@web.name}</title>~~
64		~~<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />~~
	74	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" >
	75	<html xmlns="http://www.w3.org/1999/xhtml">
	76	<head>
	77	<title>#{page.plain_name} in #{@web.name}</title>
	78	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

66		~~<style type="text/css">~~
67		~~h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover {~~
68		~~color: ##{@web ? @web.color : "393" };~~
69		}
70		~~.newWikiWord { background-color: white; font-style: italic; }~~
71		~~#{stylesheet}~~
72		~~</style>~~
73		~~<style type="text/css">~~
74		~~#{@web.additional_style}~~
75		~~</style>~~
76		~~</head>~~
77		~~<body>~~
78		~~#{renderer.display_content_for_export}~~
79		~~<div class="byline">~~
80		~~#{page.revisions? ? "Revised" : "Created" } on #{ page.revised_at.strftime('%B %d, %Y %H:%M:%S') }~~
81		by
82		~~#{ UrlGenerator.new(self).make_link(page.author.name, @web, nil, { :mode => :export }) }~~
83		~~</div>~~
84		~~</body>~~
85		~~</html>~~
86		~~EOL~~
	80	<script src="public/javascripts/page_helper.js" type="text/javascript"></script>
	81	<link href="public/stylesheets/instiki.css" media="all" rel="stylesheet" type="text/css" />
	82	<link href="public/stylesheets/syntax.css" media="all" rel="stylesheet" type="text/css" />
	83	<style type="text/css">
	84	h1#pageName, div.info, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, [actiontype="toggle"]:hover, #TextileHelp h3 {
	85	color: ##{@web ? @web.color : "393"};
	86	}
	87	a:visited.existingWikiWord {
	88	color: ##{darken(@web ? @web.color : "393")};
	89	}
	90	</style>
	91
	92	<style type="text/css"><!--/--><![CDATA[/><!--*/
	93	#{@web ? @web.additional_style : ''}
	94	/]]>/--></style>
	95	<script src="public/javascripts/prototype.js" type="text/javascript"></script>
	96	<script src="public/javascripts/effects.js" type="text/javascript"></script>
	97	<script src="public/javascripts/dragdrop.js" type="text/javascript"></script>
	98	<script src="public/javascripts/controls.js" type="text/javascript"></script>
	99	<script src="public/javascripts/application.js" type="text/javascript"></script>
	100
	101	</head>
	102	<body>
	103	<div id="Container">
	104	<div id="Content">
	105	<h1 id="pageName">
	106	#{xhtml_enabled? ? %{<span id="svg_logo"><svg version="1.1" width="100%" height="100%" viewBox='0 -1 180 198' xmlns='http://www.w3.org/2000/svg'>
	107	<path id="svg_logo_path" fill="##{@web ? @web.color : "393"}" stroke-width='0.5' stroke='#000' d='
	108	M170,60c4,11-1,20-12,25c-9,4-25,3-20,15c5,5,15,0,24,1c11,1,21,11,14,21c-10,15-35,6-48-1c-5-3-27-23-32-10c-1,13,15,10,22,16
	109	c11,4,24,14,34,20c12,10,7,25-9,23c-11-1-22-9-30-16c-5-5-13-18-21-9c-2,6,2,11,5,14c9,9,22,14,22,31c-2,8-12,8-18,4c-4-3-9-8-11-13
	110	c-3-6-5-18-12-18c-14-1-5,28-18,30c-9,2-13-9-12-16c1-14,12-24,21-31c5-4,17-13,10-20c-9-10-19,12-23,16c-7,7-17,16-31,15
	111	c-9-1-18-9-11-17c5-7,14-4,23-6c6-1,15-8,8-15c-5-6-57,2-42-24c7-12,51,4,61,6c6,1,17,4,18-4c2-11-12-7-21-8c-21-2-49-14-49-34
	112	c0-5,3-11,8-11C31,42,34,65,42,67c6,1,9-3,8-9C49,49,38,40,40,25c1-5,4-15,13-14c10,2,11,18,13,29c1,8,0,24,7,28c15,0,5-22,4-30
	113	C74,23,78,7,87,1c8-4,14,1,16,9c2,11-8,21-2,30c8,2,11-6,14-12c9-14,36-18,30,5c-3,9-12,19-21,24c-6,4-22,10-23,19c-2,14,15,2,18-2
	114	c9-9,20-18,33-22C159,52,166,54,170,60' />
	115	</svg></span>} : ''}
	116	<span class="webName">#{@web.name}</span><br />
	117	#{page.plain_name}
	118	</h1>
	119	#{renderer.display_content_for_export}
	120	<div class="byline">
	121	#{page.revisions? ? "Revised" : "Created" } on #{ page.revised_at.strftime('%B %d, %Y %H:%M:%S') }
	122	by
	123	#{ UrlGenerator.new(self).make_link(@web, page.author.name, @web, nil, { :mode => :export }) }
	124	</div>
	125	</div>
	126	</div>
	127	</body>
	128	</html>
	129	EOL
		rendered_page
		end
		end
...	...
		export_pages_as_zip(@web.markup) { \|page\| page.content }
		end

95		~~def export_pdf~~
96		~~file_name = "#{@web.address}-tex-#{@web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}"~~
97		~~file_path = File.join(@wiki.storage_path, file_name)~~
	138	# def export_pdf
	139	# file_name = "#{@web.address}-tex-#{@web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}"
	140	# file_path = File.join(@wiki.storage_path, file_name)
	141	#
	142	# export_web_to_tex "#{file_path}.tex" unless FileTest.exists? "#{file_path}.tex"
	143	# convert_tex_to_pdf "#{file_path}.tex"
	144	# send_file "#{file_path}.pdf"
	145	# end

99		~~export_web_to_tex "#{file_path}.tex" unless FileTest.exists? "#{file_path}.tex"~~
100		~~convert_tex_to_pdf "#{file_path}.tex"~~
101		~~send_file "#{file_path}.pdf"~~
102		~~end~~
	147	# def export_tex
	148	# file_name = "#{@web.address}-tex-#{@web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}.tex"
	149	# file_path = File.join(@wiki.storage_path, file_name)
	150	# export_web_to_tex(file_path) unless FileTest.exists?(file_path)
	151	# send_file file_path
	152	# end

104		~~def export_tex~~
105		~~file_name = "#{@web.address}-tex-#{@web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}.tex"~~
106		~~file_path = File.join(@wiki.storage_path, file_name)~~
107		~~export_web_to_tex(file_path) unless FileTest.exists?(file_path)~~
108		~~send_file file_path~~
109		~~end~~
110
		def feeds
		@rss_with_content_allowed = rss_with_content_allowed?
		# show the template
...	...
		end
		end

132		~~def rss_with_content~~
133		~~if rss_with_content_allowed?~~
134		~~render_rss(hide_description = false, *parse_rss_params)~~
	175	def atom_with_content
	176	if rss_with_content_allowed?
	177	render_atom(hide_description = false)
		else
136		~~render_text 'RSS feed with content for this web is blocked for security reasons. ' +~~
137		~~'The web is password-protected and not published', '403 Forbidden'~~
	179	render :text => 'Atom feed with content for this web is blocked for security reasons. ' +
	180	'The web is password-protected and not published', :status => 403, :layout => 'error'
		end
		end

141		~~def rss_with_headlines~~
142		~~render_rss(hide_description = true, *parse_rss_params)~~
	184	def atom_with_headlines
	185	render_atom(hide_description = true)
		end
	187
	188	def tex_list
	189	return unless is_post
	190	if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
	191	@tex_content = ''
	192	# Ruby 1.9.x has ordered hashes; 1.8.x doesn't. So let's just parse the query ourselves.
	193	ordered_params = ActiveSupport::OrderedHash[*request.raw_post.split('&').collect {\|k_v\| k_v.split('=').collect {\|x\| CGI::unescape(x)}}.flatten]
	194	ordered_params.each do \|name, p\|
	195	if p == 'tex' && @web.has_page?(name)
	196	@tex_content << "\\section*\{#{Maruku.new(name).to_latex.strip}\}\n\n"
	197	@tex_content << Maruku.new(@web.page(name).content).to_latex
	198	end
	199	end
	200	else
	201	@tex_content = 'TeX export only supported with the Markdown text filters.'
	202	end
	203	if @tex_content == ''
	204	flash[:error] = "You didn't select any pages to export."
	205	redirect_to :back
	206	return
	207	end
	208	expire_action :controller => 'wiki', :web => @web.address, :action => 'list', :category => params['category']
	209	render(:layout => 'tex')
	210	end

	212
		def search
146		~~@query = @params['query']~~
	214	@query = params['query'].purify
		@title_results = @web.select { \|page\| page.name =~ /#{@query}/i }.sort
		@results = @web.select { \|page\| page.content =~ /#{@query}/i }.sort
		all_pages_found = (@results + @title_results).uniq
...	...
		def edit
		if @page.nil?
		redirect_home
165		~~elsif @page.locked?(Time.now) and not @params['break_lock']~~
	233	elsif @page.locked?(Time.now) and not params['break_lock']
		redirect_to :web => @web_name, :action => 'locked', :id => @page_name
		else
		@page.lock(Time.now, @author)
...	...
		# to template
		end

180		~~def pdf~~
181		~~page = wiki.read_page(@web_name, @page_name)~~
182		~~safe_page_name = @page.name.gsub(/\W/, '')~~
183		~~file_name = "#{safe_page_name}-#{@web.address}-#{@page.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}"~~
184		~~file_path = File.join(@wiki.storage_path, file_name)~~
	248	# def pdf
	249	# page = wiki.read_page(@web_name, @page_name)
	250	# safe_page_name = @page.name.gsub(/\W/, '')
	251	# file_name = "#{safe_page_name}-#{@web.address}-#{@page.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}"
	252	# file_path = File.join(@wiki.storage_path, file_name)
	253	#
	254	# export_page_to_tex("#{file_path}.tex") unless FileTest.exists?("#{file_path}.tex")
	255	# # NB: this is _very_ slow
	256	# convert_tex_to_pdf("#{file_path}.tex")
	257	# send_file "#{file_path}.pdf"
	258	# end

186		~~export_page_to_tex("#{file_path}.tex") unless FileTest.exists?("#{file_path}.tex")~~
187		~~# NB: this is _very_ slow~~
188		~~convert_tex_to_pdf("#{file_path}.tex")~~
189		~~send_file "#{file_path}.pdf"~~
190		~~end~~
191
		def print
		if @page.nil?
		redirect_home
...	...

		def published
		if not @web.published?
203		~~render(:text => "Published version of web '#{@web_name}' is not available", :status => 404)~~
	271	render(:text => "Published version of web '#{@web_name}' is not available", :status => 404, :layout => 'error')
		return
		end

207		~~page_name = @page_name \|\| 'HomePage'~~
208		~~page = wiki.read_page(@web_name, page_name)~~
209		~~render(:text => "Page '#{page_name}' not found", status => 404) and return unless page~~
210
211		~~@renderer = PageRenderer.new(page.revisions.last)~~
	275	@page_name \|\|= 'HomePage'
	276	@page \|\|= wiki.read_page(@web_name, @page_name)
	277	@link_mode \|\|= :publish
	278	if @page
	279	@renderer = PageRenderer.new(@page.revisions.last)
	280	else
	281	real_page = WikiReference.page_that_redirects_for(@web, @page_name)
	282	if real_page
	283	flash[:info] = "Redirected from \"#{@page_name}\"."
	284	redirect_to :web => @web_name, :action => 'published', :id => real_page, :status => 301
	285	else
	286	render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error')
	287	end
	288	end
		end

		def revision
		get_page_and_revision
216		~~@show_diff = (@params[:mode] == 'diff')~~
	293	@show_diff = (params[:mode] == 'diff')
		@renderer = PageRenderer.new(@revision)
		end

		def rollback
		get_page_and_revision
	299	if @page.locked?(Time.now) and not params['break_lock']
	300	redirect_to :web => @web_name, :action => 'locked', :id => @page_name
	301	else
	302	@page.lock(Time.now, @author)
	303	end
		end

		def save
225		~~render(:status => 404, :text => 'Undefined page name') and return if @page_name.nil?~~
226
227		~~author_name = @params['author']~~
	307	render(:status => 404, :text => 'Undefined page name', :layout => 'error') and return if @page_name.nil?
	308	return unless is_post
	309	author_name = params['author'].purify
		author_name = 'AnonymousCoward' if author_name =~ /^\s*$/
229		~~cookies['author'] = { :value => author_name, :expires => Time.utc(2030) }~~

		begin
232		~~filter_spam(@params['content'])~~
	313	the_content = params['content'].purify
	314	prev_content = ''
	315	filter_spam(the_content)
	316	cookies['author'] = { :value => author_name.dup.as_bytes, :expires => Time.utc(2030) }
		if @page
234		~~wiki.revise_page(@web_name, @page_name, @params['content'], Time.now,~~
	318	new_name = params['new_name'] ? params['new_name'].purify : @page_name
	319	new_name = @page_name if new_name.empty?
	320	prev_content = @page.current_revision.content
	321	raise Instiki::ValidationError.new('A page named "' + new_name.escapeHTML + '" already exists.') if
	322	@page_name != new_name && @web.has_page?(new_name)
	323	wiki.revise_page(@web_name, @page_name, new_name, the_content, Time.now,
		Author.new(author_name, remote_ip), PageRenderer.new)
		@page.unlock
	326	@page_name = new_name
		else
238		~~wiki.write_page(@web_name, @page_name, @params['content'], Time.now,~~
	328	wiki.write_page(@web_name, @page_name, the_content, Time.now,
		Author.new(author_name, remote_ip), PageRenderer.new)
		end
		redirect_to_page @page_name
242		~~rescue => e~~
243		~~flash[:error] = e~~
	332	rescue Instiki::ValidationError => e
	333	flash[:error] = e.to_s
		logger.error e
245		~~flash[:content] = @params['content']~~
	335	param_hash = {:web => @web_name, :id => @page_name}
	336	# Work around Rails bug: flash will not display if query string is longer than 10192 bytes
	337	param_hash.update( :content => the_content ) if the_content &&
	338	CGI::escape(the_content).length < 10183 && the_content != prev_content
		if @page
		@page.unlock
248		~~redirect_to :action => 'edit', :web => @web_name, :id => @page_name~~
	341	redirect_to param_hash.update( :action => 'edit' )
		else
250		~~redirect_to :action => 'new', :web => @web_name, :id => @page_name~~
	343	redirect_to param_hash.update( :action => 'new' )
		end
		end
		end
...	...
		if @page
		begin
		@renderer = PageRenderer.new(@page.revisions.last)
259		~~@show_diff = (@params[:mode] == 'diff')~~
260		~~render_action 'page'~~
	352	@show_diff = (params[:mode] == 'diff')
	353	render :action => 'page'
		# TODO this rescue should differentiate between errors due to rendering and errors in
		# the application itself (for application errors, it's better not to rescue the error at all)
		rescue => e
		logger.error e
265		~~flash[:error] = e.message~~
	358	flash[:error] = e.to_s
		if in_a_web?
		redirect_to :action => 'edit', :web => @web_name, :id => @page_name
		else
...	...
		end
		else
		if not @page_name.nil? and not @page_name.empty?
	367	real_page = WikiReference.page_that_redirects_for(@web, @page_name)
	368	if real_page
	369	flash[:info] = "Redirected from \"#{@page_name}\"."
	370	redirect_to :web => @web_name, :action => 'show', :id => real_page, :status => 301
	371	else
	372	flash[:info] = "Page \"#{@page_name}\" does not exist.\n" +
	373	"Please create it now, or hit the \"back\" button in your browser."
	374	redirect_to :web => @web_name, :action => 'new', :id => @page_name
	375	end
	376	else
	377	render :text => 'Page name is not specified', :status => 404, :layout => 'error'
	378	end
	379	end
	380	end
	381
	382	def history
	383	if @page
	384	@revisions_by_day = Hash.new { \|h, day\| h[day] = [] }
	385	@revision_numbers = Hash.new { \|h, id\| h[id] = [] }
	386	revision_number = @page.revisions.size
	387	@page.revisions.reverse.each do \|rev\|
	388	day = Date.new(rev.revised_at.year, rev.revised_at.month, rev.revised_at.day)
	389	@revisions_by_day[day] << rev
	390	@revision_numbers[rev.id] = revision_number
	391	revision_number = revision_number - 1
	392	end
	393	render :action => 'history'
	394	else
	395	if not @page_name.nil? and not @page_name.empty?
		redirect_to :web => @web_name, :action => 'new', :id => @page_name
		else
276		~~render_text 'Page name is not specified', '404 Not Found'~~
	398	render :text => 'Page name is not specified', :status => 404, :layout => 'error'
		end
		end
		end

	403	def source
	404	#to template
	405	end
	406
		def tex
282		~~@tex_content = RedClothForTex.new(@page.content).to_tex~~
	408	if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
	409	@tex_content = Maruku.new(@page.content).to_latex
	410	else
	411	@tex_content = 'TeX export only supported with the Markdown text filters.'
	412	end
	413	render(:layout => 'tex')
		end

	416	def s5
	417	if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
	418	my_rendered = PageRenderer.new(@page.revisions.last)
	419	@s5_content = my_rendered.display_s5
	420	@s5_theme = my_rendered.s5_theme
	421	else
	422	@s5_content = "S5 not supported with this text filter"
	423	@s5_theme = "default"
	424	end
	425	end
	426
		protected
	428
	429	def do_caching?
	430	flash.empty?
	431	end

287		~~def connect_to_model~~
288		~~super~~
289		~~@page_name = @params['id']~~
	433	def load_page
	434	@page_name = params['id'] ? params['id'].purify : nil
		@page = @wiki.read_page(@web_name, @page_name) if @page_name
		end

		private

295		~~def convert_tex_to_pdf(tex_path)~~
296		~~# TODO remove earlier PDF files with the same prefix~~
297		~~# TODO handle gracefully situation where pdflatex is not available~~
298		~~begin~~
299		~~wd = Dir.getwd~~
300		~~Dir.chdir(File.dirname(tex_path))~~
301		~~logger.info `pdflatex --interaction=nonstopmode #{File.basename(tex_path)}`~~
302		~~ensure~~
303		~~Dir.chdir(wd)~~
304		~~end~~
305		~~end~~
	440	# def convert_tex_to_pdf(tex_path)
	441	# # TODO remove earlier PDF files with the same prefix
	442	# # TODO handle gracefully situation where pdflatex is not available
	443	# begin
	444	# wd = Dir.getwd
	445	# Dir.chdir(File.dirname(tex_path))
	446	# logger.info `pdflatex --interaction=nonstopmode #{File.basename(tex_path)}`
	447	# ensure
	448	# Dir.chdir(wd)
	449	# end
	450	# end

		def export_page_to_tex(file_path)
308		~~tex~~
309		~~File.open(file_path, 'w') { \|f\| f.write(render_to_string(:template => 'wiki/tex', :layout => nil)) }~~
	453	if @web.markup == :markdownMML \|\| @web.markup == :markdownPNG
	454	@tex_content = Maruku.new(@page.content).to_latex
	455	else
	456	@tex_content = 'TeX export only supported with the Markdown text filters.'
	457	end
	458	File.open(file_path, 'w') { \|f\| f.write(render_to_string(:template => 'wiki/tex', :layout => 'tex')) }
		end

		def export_pages_as_zip(file_type, &block)
313
	462
		file_prefix = "#{@web.address}-#{file_type}-"
		timestamp = @web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')
316		~~file_path = File.join(@wiki.storage_path, file_prefix + timestamp + '.zip')~~
	465	file_path = @wiki.storage_path.join(file_prefix + timestamp + '.zip')
		tmp_path = "#{file_path}.tmp"

319		~~Zip::ZipOutputStream.open(tmp_path) do \|zip_out\|~~
	468	Zip::ZipFile.open(tmp_path, Zip::ZipFile::CREATE) do \|zip_out\|
		@web.select.by_name.each do \|page\|
321		~~zip_out.put_next_entry("#{CGI.escape(page.name)}.#{file_type}")~~
322		~~zip_out.puts(block.call(page))~~
	470	zip_out.get_output_stream("#{CGI.escape(page.name)}.#{file_type}") do \|f\|
	471	f.puts(block.call(page))
	472	end
		end
324		~~# add an index file, if exporting to HTML~~
325		~~if file_type.to_s.downcase == 'html'~~
326		~~zip_out.put_next_entry 'index.html'~~
327		~~zip_out.puts "<html><head>" +~~
328		~~"<META HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=HomePage.#{file_type}\"></head></html>"~~
	474	# add an index file, and the stylesheet and javascript directories, if exporting to HTML
	475	if file_type.to_s.downcase == html_ext
	476	zip_out.get_output_stream("index.#{html_ext}") do \|f\|
	477	f.puts "<html xmlns='http://www.w3.org/1999/xhtml'><head>" +
	478	"<meta http-equiv=\"Refresh\" content=\"0;URL=HomePage.#{html_ext}\" /></head></html>"
	479	end
	480	dir = Rails.root.join('public')
	481	Dir["#{dir}/*/"].each do \|f\|
	482	zip_out.add "public#{f.sub(dir.to_s,'')}", f
	483	end
		end
	485	files = @web.files_path
	486	Dir["#{files}/*/"].each do \|f\|
	487	zip_out.add "files#{f.sub(files.to_s,'')}", f
	488	end
		end
331		~~FileUtils.rm_rf(Dir[File.join(@wiki.storage_path, file_prefix + '*.zip')])~~
	490	FileUtils.rm_rf(Dir[@wiki.storage_path.join(file_prefix + '*.zip').to_s])
		FileUtils.mv(tmp_path, file_path)
		send_file file_path
		end

336		~~def export_web_to_tex(file_path)~~
337		~~@tex_content = table_of_contents(@web.page('HomePage').content, render_tex_web)~~
338		~~File.open(file_path, 'w') { \|f\| f.write(render_to_string(:template => 'wiki/tex_web', :layout => nil)) }~~
339		~~end~~
	495	# def export_web_to_tex(file_path)
	496	# if @web.markup == :markdownMML
	497	# @tex_content = Maruku.new(@page.content).to_latex
	498	# else
	499	# @tex_content = 'TeX export only supported with the Markdown text filters.'
	500	# end
	501	# @tex_content = table_of_contents(@web.page('HomePage').content, render_tex_web)
	502	# File.open(file_path, 'w') { \|f\| f.write(render_to_string(:template => 'wiki/tex_web', :layout => tex)) }
	503	# end

		def get_page_and_revision
342		~~@revision_number = @params['rev'].to_i~~
	506	if params['rev']
	507	@revision_number = params['rev'].to_i
	508	else
	509	@revision_number = @page.revisions.size
	510	end
		@revision = @page.revisions[@revision_number - 1]
		end

		def parse_category
347		~~@categories = WikiReference.list_categories.sort~~
348		~~@category = @params['category']~~
	515	@categories = WikiReference.list_categories(@web).sort
	516	@category = params['category']
		if @category
		@set_name = "category '#{@category}'"
351		~~pages = WikiReference.pages_in_category(@category).sort.map { \|page_name\| @web.page(page_name) }~~
	519	pages = WikiReference.pages_in_category(@web, @category).sort.map { \|page_name\| @web.page(page_name) }
		@pages_in_category = PageSet.new(@web, pages)
		else
		# no category specified, return all pages of the web
...	...
		@set_name = 'the web'
		end
		end
359
360		~~def parse_rss_params~~
361		~~if @params.include? 'limit'~~
362		~~limit = @params['limit'].to_i rescue nil~~
363		~~limit = nil if limit == 0~~
364		~~else~~
365		~~limit = 15~~
366		~~end~~
367		~~start_date = Time.local(*ParseDate::parsedate(@params['start'])) rescue nil~~
368		~~end_date = Time.local(*ParseDate::parsedate(@params['end'])) rescue nil~~
369		~~[ limit, start_date, end_date ]~~
370		~~end~~

		def remote_ip
373		~~ip = @request.remote_ip~~
	529	ip = request.remote_ip
		logger.info(ip)
375		ip
	531	ip.dup.gsub!(Regexp.union(Resolv::IPv4::Regex, Resolv::IPv6::Regex), '\0') \|\| 'bogus address'
		end

378		~~def render_rss(hide_description = false, limit = 15, start_date = nil, end_date = nil)~~
379		~~if limit && !start_date && !end_date~~
380		~~@pages_by_revision = @web.select.by_revision.first(limit)~~
381		~~else~~
382		~~@pages_by_revision = @web.select.by_revision~~
383		~~@pages_by_revision.reject! { \|page\| page.revised_at < start_date } if start_date~~
384		~~@pages_by_revision.reject! { \|page\| page.revised_at > end_date } if end_date~~
385		~~end~~
386
	534	def render_atom(hide_description = false, limit = 15)
	535	@pages_by_revision = @web.select.by_revision.first(limit)
		@hide_description = hide_description
		@link_action = @web.password ? 'published' : 'show'
389
390		~~render :action => 'rss_feed'~~
391		~~end~~
	538	render :action => 'atom'
	539	end

		def render_tex_web
		@web.select.by_name.inject({}) do \|tex_web, page\|
395		~~tex_web[page.name] = RedClothForTex.new(page.content).to_tex~~
	543	if @web.markup == :markdownMML \|\| @web.markup == :markdownPNG
	544	tex_web[page.name] = Maruku.new(page.content).to_latex
	545	else
	546	tex_web[page.name] = 'TeX export only supported with the Markdown text filters.'
	547	end
		tex_web
		end
		end
...	...
		def rss_with_content_allowed?
		@web.password.nil? or @web.published?
		end
403
404		~~def truncate(text, length = 30, truncate_string = '...')~~
405		~~if text.length > length then text[0..(length - 3)] + truncate_string else text end~~
406		~~end~~
407
	555
		def filter_spam(content)
		@@spam_patterns \|\|= load_spam_patterns
		@@spam_patterns.each do \|pattern\|
411		~~raise "Your edit was blocked by spam filtering" if content =~ pattern~~
	559	raise Instiki::ValidationError.new("Your edit was blocked by spam filtering") if content =~ pattern
		end
		end
414
	562
		def load_spam_patterns
416		~~spam_patterns_file = "#{RAILS_ROOT}/config/spam_patterns.txt"~~
	564	spam_patterns_file = Rails.root.join('config', 'spam_patterns.txt')
		if File.exists?(spam_patterns_file)
418		~~File.readlines(spam_patterns_file).inject([]) { \|patterns, line\| patterns << Regexp.new(line.chomp, Regexp::IGNORECASE) }~~
	566	spam_patterns_file.readlines.inject([]) { \|patterns, line\| patterns << Regexp.new(line.chomp, Regexp::IGNORECASE) }
		else
		[]
		end
		end
423
	571
		end

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

prev.	current

		# The methods added to this helper will be available to all templates in the application.
		module ApplicationHelper
	3	require 'instiki_stringsupport'

		# Accepts a container (hash, array, enumerable, your type) and returns a string of option tags. Given a container
		# where the elements respond to first and last (such as a two-element array), the "lasts" serve as option values and
...	...
		container = container.to_a if Hash === container

		html_options = container.inject([]) do \|options, element\|
22		~~if element.respond_to?(:first) && element.respond_to?(:last)~~
	23	if element.is_a? Array
		if element.last != selected
		options << "<option value=\"#{element.last}\">#{element.first}</option>"
		else
26		~~options << "<option value=\"#{element.last}\" selected>#{element.first}</option>"~~
	27	options << "<option value=\"#{element.last}\" selected=\"selected\">#{element.first}</option>"
		end
		else
		options << ((element != selected) ? "<option>#{element}</option>" : "<option selected>#{element}</option>")
		end
		end

33		~~html_options.join("\n")~~
	34	html_options.join("\n").html_safe
		end

		# Creates a hyperlink to a Wiki page, without checking if the page exists or not
...	...
		link_to(
		text \|\| page.plain_name,
		{:web => @web.address, :action => 'show', :id => page.name, :only_path => true},
41		~~html_options)~~
	42	html_options).html_safe
		end

		# Creates a hyperlink to a Wiki page, or to a "new page" form if the page doesn't exist yet
		def link_to_page(page_name, web = @web, text = nil, options = {})
		raise 'Web not defined' if web.nil?
47		~~UrlGenerator.new(@controller).make_link(page_name, web, text,~~
48		~~options.merge(:base_url => "#{base_url}/#{web.address}"))~~
	48	UrlGenerator.new(@controller).make_link(@web, page_name, web, text,
	49	options.merge(:base_url => "#{base_url}/#{web.address}")).html_safe
		end

		def author_link(page, options = {})
52		~~UrlGenerator.new(@controller).make_link(page.author.name, page.web, nil, options)~~
	53	UrlGenerator.new(@controller).make_link(@web, page.author.name, page.web, nil, options).purify.html_safe
		end

	56	# Create a hyperlink to a particular revision of a Wiki page
	57	def link_to_revision(page, revision_number, text = nil, mode = nil, html_options = {})
	58	revision_number == page.revisions.size ?
	59	link_to(
	60	text \|\| page.plain_name,
	61	{:web => @web.address, :action => 'show', :id => page.name,
	62	:mode => mode}, html_options).html_safe :
	63	link_to(
	64	text \|\| page.plain_name + "(rev # #{revision_number})".html_safe,
	65	{:web => @web.address, :action => 'revision', :id => page.name,
	66	:rev => revision_number, :mode => mode}, html_options).html_safe
	67	end
	68
	69	# Create a hyperlink to the history of a particular Wiki page
	70	def link_to_history(page, text = nil, html_options = {})
	71	link_to(
	72	text \|\| page.plain_name + "(history)".html_safe,
	73	{:web => @web.address, :action => 'history', :id => page.name},
	74	html_options).html_safe
	75	end
	76
		def base_url
		home_page_url = url_for :controller => 'admin', :action => 'create_system', :only_path => true
		home_page_url.sub(%r-/create_system/?$-, '')
...	...
		if @categories.empty?
		''
		else
65		~~"<div id=\"categories\">\n" +~~
	87	("<div id=\"categories\">\n" +
		'<strong>Categories</strong>:' +
67		~~'[' + link_to_unless_current('Any', :web => @web.address, :action => @action_name) + "]\n" +~~
	89	'[' + link_to_unless_current('Any', :web => @web.address, :action => self.action_name, :category => nil) + "]\n" +
		@categories.map { \|c\|
69		~~link_to_unless_current(c, :web => @web.address, :action => @action_name, :category => c)~~
	91	link_to_unless_current(c.html_safe, :web => @web.address, :action => self.action_name, :category => c)
		}.join(', ') + "\n" +
71		~~'</div>'~~
	93	'</div>').html_safe
		end
		end

		# Performs HTML escaping on text, but keeps linefeeds intact (by replacing them with <br/>)
		def escape_preserving_linefeeds(text)
77		~~h(text).gsub(/\n/, '<br/>')~~
	99	h(text).gsub(/\n/, '<br/>').as_utf8
		end

		def format_date(date, include_time = true)
...	...
		PageRenderer.new(page.revisions.last).display_content
		end

	115	def truncate(text, *args)
	116	options = args.extract_options!
	117	options.reverse_merge!(:length => 30, :omission => "...")
	118	return text.html_safe if text.num_chars <= options[:length]
	119	len = options[:length] - options[:omission].as_utf8.num_chars
	120	t = ''
	121	text.split.collect do \|word\|
	122	if t.num_chars + word.num_chars <= len
	123	t << word + ' '
	124	else
	125	return (t.chop + options[:omission]).html_safe
	126	end
	127	end
	128	end
	129
		end

rool/rails/instiki/trunk/app/helpers/wiki_helper.rb:

prev.	current

		menu << back_for_revision if @revision_number > 1
		menu << current_revision
		menu << see_or_hide_changes_for_revision if @revision_number > 1
	9	menu << history if @page.revisions.size > 1
		menu << rollback
		menu
		end
...	...
		menu = []
		menu << edit_page
		menu << edit_web if @page.name == "HomePage"
17		~~if @page.revisions.length > 1~~
	18	if @page.revisions.size > 1
		menu << back_for_page
		menu << see_or_hide_changes_for_page
		end
	22	menu << history if @page.revisions.size > 1
		menu
		end

		def edit_page
		link_text = (@page.name == "HomePage" ? 'Edit Page' : 'Edit')
		link_to(link_text, {:web => @web.address, :action => 'edit', :id => @page.name},
27		~~{:class => 'navlink', :accesskey => 'E', :name => 'edit'})~~
	29	{:class => 'navlink', :accesskey => 'E', :id => 'edit', :rel => 'nofollow'})
		end

		def edit_web
		link_to('Edit Web', {:web => @web.address, :action => 'edit_web'},
32		~~{:class => 'navlink', :accesskey => 'W', :name => 'edit_web'})~~
	34	{:class => 'navlink', :accesskey => 'W', :id => 'edit_web', :rel => 'nofollow'})
		end
	36
	37	def history
	38	link_to_history(@page, 'History',
	39	{:class => 'navlink', :accesskey => 'S', :id => 'history', :rel => 'nofollow'})
	40	end

		def forward
36		~~if @revision_number < @page.revisions.length - 1~~
	43	if @revision_number < @page.revisions.size - 1
		link_to('Forward in time',
		{:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number + 1},
39		~~{:class => 'navlink', :accesskey => 'F', :name => 'to_next_revision'}) +~~
40		~~" <small>(#{@revision.page.revisions.length - @revision_number} more)</small> "~~
	46	{:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision', :rel => 'nofollow'}) +
	47	" <span class='revisions'>(#{@revision.page.revisions.size - @revision_number} more)</span> ".html_safe
		else
		link_to('Forward in time', {:web => @web.address, :action => 'show', :id => @page.name},
43		~~{:class => 'navlink', :accesskey => 'F', :name => 'to_next_revision'}) +~~
44		~~" <small> (to current)</small>"~~
	50	{:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision', :rel => 'nofollow'}) +
	51	" <span class='revisions'>(to current)</span>".html_safe
		end
		end

		def back_for_revision
		link_to('Back in time',
		{:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number - 1},
51		~~{:class => 'navlink', :name => 'to_previous_revision'}) +~~
52		~~" <small>(#{@revision_number - 1} more)</small>"~~
	58	{:class => 'navlink', :id => 'to_previous_revision', :rel => 'nofollow'}) +
	59	" <span class='revisions'>(#{@revision_number - 1} more)</span>".html_safe
		end

		def back_for_page
		link_to('Back in time',
		{:web => @web.address, :action => 'revision', :id => @page.name,
58		~~:rev => @page.revisions.length - 1},~~
59		~~{:class => 'navlink', :accesskey => 'B', :name => 'to_previous_revision'}) +~~
60		~~" <small>(#{@page.revisions.length - 1} #{@page.revisions.length - 1 == 1 ? 'revision' : 'revisions'})</small>"~~
	65	:rev => @page.revisions.size - 1},
	66	{:class => 'navlink', :accesskey => 'B', :id => 'to_previous_revision', :rel => 'nofollow'}) +
	67	" <span class='revisions'>(#{@page.revisions.size - 1} #{@page.revisions.size - 1 == 1 ? 'revision' : 'revisions'})</span>".html_safe
		end

		def current_revision
		link_to('See current', {:web => @web.address, :action => 'show', :id => @page.name},
65		~~{:class => 'navlink', :name => 'to_current_revision'})~~
	72	{:class => 'navlink', :id => 'to_current_revision'})
		end

		def see_or_hide_changes_for_revision
		link_to(@show_diff ? 'Hide changes' : 'See changes',
		{:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number,
		:mode => (@show_diff ? nil : 'diff') },
72		~~{:class => 'navlink', :accesskey => 'C', :name => 'see_changes'})~~
	79	{:class => 'navlink', :accesskey => 'C', :id => 'see_changes', :rel => 'nofollow'})
		end

		def see_or_hide_changes_for_page
		link_to(@show_diff ? 'Hide changes' : 'See changes',
		{:web => @web.address, :action => 'show', :id => @page.name, :mode => (@show_diff ? nil : 'diff') },
78		~~{:class => 'navlink', :accesskey => 'C', :name => 'see_changes'})~~
	85	{:class => 'navlink', :accesskey => 'C', :id => 'see_changes', :rel => 'nofollow'})
		end

		def rollback
		link_to('Rollback',
		{:web => @web.address, :action => 'rollback', :id => @page.name, :rev => @revision_number},
84		~~{:class => 'navlink', :name => 'rollback'})~~
	91	{:class => 'navlink', :id => 'rollback', :rel => 'nofollow'})
		end

87
88
89		~~end~~

	95	end

rool/rails/instiki/trunk/app/models/author.rb:

prev.	current

		attr_reader :name
		def initialize(name, ip = nil)
		@ip = ip
6		~~super(name)~~
	6	super(name.as_utf8)
		end

		def name=(value)

rool/rails/instiki/trunk/app/models/page.rb:

prev.	current

		class Page < ActiveRecord::Base
		belongs_to :web
3		~~has_many :revisions, :order => 'id'~~
	3	has_many :revisions, :order => 'id', :dependent => :destroy
		has_many :wiki_references, :order => 'referenced_name'
		has_one :current_revision, :class_name => 'Revision', :order => 'id DESC'

7		~~def revise(content, time, author, renderer)~~
	7	def name
	8	read_attribute(:name).as_utf8
	9	end
	10
	11	def revise(content, name, time, author, renderer)
		revisions_size = new_record? ? 0 : revisions.size
9		~~if (revisions_size > 0) and content == current_revision.content~~
	13	if (revisions_size > 0) and content == current_revision.content and name == self.name
		raise Instiki::ValidationError.new(
		"You have tried to save page '#{name}' without changing its content")
		end

	18	self.name = name
		author = Author.new(author.to_s) unless author.is_a?(Author)

		# Try to render content to make sure that markup engine can take it,
...	...
		if (revisions_size > 0) && continous_revision?(time, author)
		current_revision.update_attributes(:content => content, :revised_at => time)
		else
28		~~revisions.create(:content => content, :author => author, :revised_at => time)~~
	33	revisions.build(:content => content, :author => author, :revised_at => time)
		end
		save
		self
...	...
		raise Instiki::ValidationError.new("Revision #{revision_number} not found")
		end
		author = Author.new(roll_back_revision.author.name, author_ip)
40		~~revise(roll_back_revision.content, time, author, renderer)~~
	45	revise(roll_back_revision.content, self.name, time, author, renderer)
		end

		def revisions?
...	...
		wiki_references.select { \|ref\| ref.wiki_word? }.map { \|ref\| ref.referenced_name }
		end

	75	def categories
	76	wiki_references.select { \|ref\| ref.category? }.map { \|ref\| ref.referenced_name }
	77	end
	78
		def linked_from
		web.select.pages_that_link_to(name)
		end

	83	def redirects
	84	wiki_references.select { \|ref\| ref.redirected_page? }.map { \|ref\| ref.referenced_name }
	85	end
	86
		def included_from
		web.select.pages_that_include(name)
		end

		# Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page".
		def plain_name
80		~~web.brackets_only? ? name : WikiWords.separate(name)~~
	93	web.brackets_only? ? name.escapeHTML.html_safe : WikiWords.separate(name).escapeHTML.html_safe
		end

		LOCKING_PERIOD = 30.minutes
...	...
		end

		def to_param
102		~~name~~
	115	name.as_utf8
		end

		private

rool/rails/instiki/trunk/app/models/page_set.rb:

prev.	current

		end

		def pages_that_reference(page_name)
34		~~all_referring_pages = WikiReference.pages_that_reference(page_name)~~
	34	all_referring_pages = WikiReference.pages_that_reference(@web, page_name)
		self.select { \|page\| all_referring_pages.include?(page.name) }
		end

		def pages_that_link_to(page_name)
39		~~all_linking_pages = WikiReference.pages_that_link_to(page_name)~~
	39	all_linking_pages = WikiReference.pages_that_link_to(@web, page_name)
		self.select { \|page\| all_linking_pages.include?(page.name) }
		end

		def pages_that_include(page_name)
44		~~all_including_pages = WikiReference.pages_that_include(page_name)~~
	44	all_including_pages = WikiReference.pages_that_include(@web, page_name)
		self.select { \|page\| all_including_pages.include?(page.name) }
		end

...	...
		if never_orphans.include? page.name
		false
		else
70		~~references = pages_that_reference(page.name)~~
71		~~references.empty? or references == [page]~~
	70	references = (WikiReference.pages_that_reference(@web, page.name) +
	71	WikiReference.pages_redirected_to(@web, page.name)).uniq
	72	references.empty? or references == [page.name]
		end
		}
		end

	77	def pages_in_category(category)
	78	self.select { \|page\|
	79	WikiReference.pages_in_category(web, category).map.include?(page.name)
	80	}
	81	end
	82
		# Returns all the wiki words in this page set for which
		# there are no pages in this page set's web
		def wanted_pages
79		~~wiki_words - web.select.names~~
	86	known_pages = (web.select.names + redirected_names).uniq
	87	wiki_words - known_pages
		end

		def names
		self.map { \|page\| page.name }
		end
	93
	94	def redirected_names
	95	self.wiki_words.select {\|name\| web.has_redirect_for?(name) }.uniq.sort
	96	end

		def wiki_words
		self.inject([]) { \|wiki_words, page\|
88		~~wiki_words + page.wiki_words~~
	100	wiki_words + page.wiki_words
		}.flatten.uniq.sort
		end

rool/rails/instiki/trunk/app/models/revision.rb:

prev.	current

		class Revision < ActiveRecord::Base
		belongs_to :page
		composed_of :author, :mapping => [ %w(author name), %w(ip ip) ]
	4
	5	def content
	6	read_attribute(:content).as_utf8
	7	end
		end

rool/rails/instiki/trunk/app/models/web.rb:

prev.	current

		class Web < ActiveRecord::Base
2		~~has_many :pages~~
3		~~has_many :wiki_files~~
	2	## Associations

	4	has_many :pages, :dependent => :destroy
	5	has_many :wiki_files, :dependent => :destroy
	6
	7	has_many :revisions, :through => :pages
	8
	9	## Hooks
	10
	11	before_save :sanitize_markup
	12	after_save :create_files_directory
	13
	14	before_validation :validate_address
	15
	16	## Validations
	17
	18	validates_uniqueness_of :address
	19
	20	validates_length_of :color, :in => 3..6
	21
	22	## Methods
	23
	24	# @return [Wiki] a new Wiki instance
		def wiki
		Wiki.new
		end
8
	28
		def settings_changed?(markup, safe_mode, brackets_only)
		self.markup != markup \|\|
		self.safe_mode != safe_mode \|\|
		self.brackets_only != brackets_only
		end
14
	34
		def add_page(name, content, time, author, renderer)
16		~~page = page(name) \|\| Page.new(:web => self, :name => name)~~
17		~~page.revise(content, time, author, renderer)~~
	36	page = page(name) \|\| pages.build(:name => name)
	37	page.revise(content, name, time, author, renderer)
		end
19
	39
	40	# @return [Array<String>] a collection of all the names of the authors that
	41	# have ever contributed to the pages for this Web
		def authors
21		~~connection.select_all(~~
22		~~'SELECT DISTINCT r.author AS author ' +~~
23		~~'FROM revisions r ' +~~
24		~~'JOIN pages p ON p.id = r.page_id ' +~~
25		~~'ORDER by 1').collect { \|row\| row['author'] }~~
	43	revisions.all(
	44	:select => "DISTINCT revisions.author",
	45	:order => "1"
	46	).collect(&:author)
		end

		def categories
		select.map { \|page\| page.categories }.flatten.uniq.sort
		end

	53	# @param [String] name the name of some associated Page record to find
	54	# @return [Page, nil] the associated Page record, or +nil+ if no record is
	55	# found with the provided name
		def page(name)
33		~~pages.find(:first, :conditions => ['name = ?', name])~~
	57	pages.find_by_name(name)
		end

	60	# @return [Page] the last associated Page record
	61	def last_page
	62	pages.last
	63	end
	64
	65	# @param [String] name the name of some potential Page record
	66	# @return [Boolean] whether or not a given Page record exists with a given
	67	# name
		def has_page?(name)
37		~~Page.count(['web_id = ? AND name = ?', id, name]) > 0~~
	69	pages.exists?(:name => name)
		end

	72	def has_redirect_for?(name)
	73	WikiReference.page_that_redirects_for(self, name)
	74	end
	75
	76	def page_that_redirects_for(name)
	77	page(WikiReference.page_that_redirects_for(self, name))
	78	end
	79
		def has_file?(file_name)
41		~~WikiFile.find_by_file_name(file_name) != nil~~
	81	wiki_files.exists?(:file_name => file_name)
		end

	84	def file_list(sort_order="file_name")
	85	wiki_files.all(:order => sort_order)
	86	end
	87
	88	def pages_that_link_to(page_name)
	89	WikiReference.pages_that_link_to(self, page_name)
	90	end
	91
	92	def pages_that_link_to_file(file_name)
	93	WikiReference.pages_that_link_to_file(self, file_name)
	94	end
	95
	96	# @param [String] file_name the name of some WikiFile of interest
	97	# @return [String, nil] the description of some WikiFile of interest, nil if
	98	# the WikiFile could not be found
	99	def description(file_name)
	100	wiki_files.find_by_file_name(file_name).try(:description)
	101	end
	102
	103	# @return [Symbol] the type of markup used by this Web
		def markup
45		~~read_attribute('markup').to_sym~~
	105	self[:markup].to_sym
		end

	108	# @return [Hash] a Hash wherein the key is some author's name, and the
	109	# values are an array of page names for that author.
		def page_names_by_author
49		~~connection.select_all(~~
50		~~'SELECT DISTINCT r.author AS author, p.name AS page_name ' +~~
51		~~'FROM revisions r ' +~~
52		~~'JOIN pages p ON r.page_id = p.id ' +~~
53		~~"WHERE p.web_id = #{self.id} " +~~
54		~~'ORDER by p.name'~~
55		~~).inject({}) { \|result, row\|~~
56		~~author, page_name = row['author'], row['page_name']~~
57		~~result[author] = [] unless result.has_key?(author)~~
58		~~result[author] << page_name~~
59		~~result~~
60		}
	111	data = revisions.all(
	112	:select => "DISTINCT revisions.author AS author, pages.name AS page_name",
	113	:order => "pages.name"
	114	)
	115
	116	data.inject({}) do \|result, revision\|
	117	result[revision.author] \|\|= []
	118	result[revision.author] << revision.page_name
	119	result
	120	end
		end

	123	# OPTIMIZE Use the +delete_all+ with conditions for extra efficiency
		def remove_pages(pages_to_be_removed)
		pages_to_be_removed.each { \|p\| p.destroy }
		end
66
	127
		def revised_at
		select.most_recent_revision
		end
70
	131
		def select(&condition)
		PageSet.new(self, pages, condition)
		end
74
	135
		def select_all
		PageSet.new(self, pages, nil)
		end
78
	139
	140	# @return [String] uses the +address+ attribute for this record's parameter name
		def to_param
		address
		end
82
	144
	145	# Called by an +after_save+ hook. Creates the directory that houses this
	146	# Web's associated files.
	147	#
	148	# TODO Move this into the WikiFile model
		def create_files_directory
		return unless allow_uploads == 1
85		~~dummy_file = self.wiki_files.build(:file_name => '0', :description => '0', :content => '0')~~
86		~~dir = File.dirname(dummy_file.content_path)~~
	151
	152	dummy_file = wiki_files.build(
	153	:file_name => "0",
	154	:description => "0",
	155	:content => "0"
	156	)
	157
	158	File.umask(0002)
	159
		begin
88		~~require 'fileutils'~~
89		~~FileUtils.mkdir_p dir~~
	161	dummy_file.content_path.parent.mkpath
		dummy_file.save
		dummy_file.destroy
		rescue => e
93		~~logger.error("Failed create files directory for #{self.address}: #{e}")~~
	165	logger.error "Failed create files directory for #{address}: #{e}"
		raise "Instiki could not create directory to store uploaded files. " +
		"Please make sure that Instiki is allowed to create directory " +
96		~~"#{File.expand_path(dir)} and add files to it."~~
	168	"#{dummy_file.content_path.expand_path} and add files to it."
		end
		end
99
	171
	172	# @return [Pathname] the path to the files for this record
	173	def files_path
	174	path = Rails.root.join("webs")
	175	if default_web?
	176	path.join("files")
	177	else
	178	path.join(address, "files")
	179	end
	180	end
	181
	182	# @return [Pathname] the path to PNGs for this record
	183	def blahtex_pngs_path
	184	files_path.join("pngs")
	185	end
	186
		private

		# Returns an array of all the wiki words in any current revision
		def wiki_words
		pages.inject([]) { \|wiki_words, page\| wiki_words << page.wiki_words }.flatten.uniq
		end
106
	193
		# Returns an array of all the page names on this web
		def page_names
		pages.map { \|p\| p.name }
		end
111
	198
		protected
113		~~before_save :sanitize_markup~~
114		~~after_save :create_files_directory~~
115		~~before_validation :validate_address~~
116		~~validates_uniqueness_of :address~~
117		~~validates_length_of :color, :in => 3..6~~
118
	200
		def sanitize_markup
		self.markup = markup.to_s
		end
122
	204
		def validate_address
		unless address == CGI.escape(address)
		self.errors.add(:address, 'should contain only valid URI characters')
		raise Instiki::ValidationError.new("#{self.class.human_attribute_name('address')} #{errors.on(:address)}")
		end
		end
129
	211
	212	# @return [Boolean] whether or not this record is considered the default Web
		def default_web?
131		~~defined? DEFAULT_WEB and self.address == DEFAULT_WEB~~
	214	defined?(DEFAULT_WEB) && address == DEFAULT_WEB
		end
133
134		~~def files_path~~
135		~~if default_web?~~
136		~~"#{RAILS_ROOT}/public/files"~~
137		~~else~~
138		~~"#{RAILS_ROOT}/public/#{self.address}/files"~~
139		~~end~~
140		~~end~~
		end

rool/rails/instiki/trunk/app/models/wiki.rb:

prev.	current

1		~~class Wiki~~
	1	class Wiki

		cattr_accessor :storage_path, :logger
4		~~self.storage_path = "#{RAILS_ROOT}/storage/"~~
5		~~self.logger = RAILS_DEFAULT_LOGGER~~
	4	self.storage_path = Rails.root.join('storage')

		def authenticate(password)
		password == (system.password \|\| 'instiki')
...	...
		if not (web = Web.find_by_address(old_address))
		raise Instiki::ValidationError.new("Web with address '#{old_address}' does not exist")
		end
	30	old_files_path = web.files_path

		web.update_attributes(:address => new_address, :name => name, :markup => markup, :color => color,
		:additional_style => additional_style, :safe_mode => safe_mode, :password => password, :published => published,
...	...
		@webs = nil
		raise Instiki::ValidationError.new("There is already a web with address '#{new_address}'") unless web.errors.on(:address).nil?
		web
	38	move_files(old_files_path, web.files_path)
		end
	40
	41	def move_files(old_path, new_path)
	42	return if new_path == old_path
	43	default_path = Rails.root.join("webs", "files")
	44	FileUtils.rmdir(new_path) if File.exist?(new_path)
	45	if [old_path, new_path].include? default_path
	46	File.rename(old_path, new_path)
	47	FileUtils.rmdir(old_path.parent) unless old_path == default_path
	48	else
	49	File.rename(old_path.parent, new_path.parent)
	50	end
	51	end

		def read_page(web_address, page_name)
41		~~self.class.logger.debug "Reading page '#{page_name}' from web '#{web_address}'"~~
	54	ApplicationController.logger.debug "Reading page '#{page_name}' from web '#{web_address}'"
		web = Web.find_by_address(web_address)
		if web.nil?
44		~~self.class.logger.debug "Web '#{web_address}' not found"~~
	57	ApplicationController.logger.debug "Web '#{web_address}' not found"
		return nil
		else
47		~~page = web.pages.find(:first, :conditions => ['name = ?', page_name])~~
48		~~self.class.logger.debug "Page '#{page_name}' #{page.nil? ? 'not' : ''} found"~~
	60	page = web.pages.first(:conditions => ['name = ?', page_name])
	61	ApplicationController.logger.debug "Page '#{page_name}' #{page.nil? ? 'not' : ''} found"
		return page
		end
		end
...	...
		web.remove_pages(web.select.orphaned_pages)
		end

58		~~def revise_page(web_address, page_name, content, revised_at, author, renderer)~~
	71	def remove_orphaned_pages_in_category(web_address,category)
	72	web = Web.find_by_address(web_address)
	73	pages_in_category = PageSet.new(web, web.select.pages_in_category(category))
	74	web.remove_pages(pages_in_category.orphaned_pages)
	75	end
	76
	77	def revise_page(web_address, page_name, new_name, content, revised_at, author, renderer)
		page = read_page(web_address, page_name)
60		~~page.revise(content, revised_at, author, renderer)~~
	79	page.revise(content, new_name, revised_at, author, renderer)
		end

		def rollback_page(web_address, page_name, revision_number, time, author_id = nil)
...	...
		end

		def system
74		~~@system \|\|= (System.find(:first) \|\| System.create)~~
	93	@system \|\|= (System.first() \|\| System.create)
		end

		def setup?
...	...
		end

		def webs
82		~~@webs \|\|= Web.find(:all).inject({}) { \|webs, web\| webs.merge(web.address => web) }~~
	101	@webs \|\|= Web.all.inject({}) { \|webs, web\| webs.merge(web.address => web) }
		end

		def storage_path
...	...
		def write_page(web_address, page_name, content, written_on, author, renderer)
		Web.find_by_address(web_address).add_page(page_name, content, written_on, author, renderer)
		end
92		~~end~~

	112	end

rool/rails/instiki/trunk/app/models/wiki_file.rb:

prev.	current

		validates_length_of :description, :maximum=>255

		def self.find_by_file_name(file_name)
12		~~find(:first, :conditions => ['file_name = ?', file_name])~~
	12	first(:conditions => ['file_name = ?', file_name])
		end

		SANE_FILE_NAME = /^[a-zA-Z0-9\-_\. ]*$/
...	...
		end

		def content_path
49		~~web.files_path + '/' + file_name~~
	49	web.files_path.join(file_name)
		end

		def write_content_to_file

rool/rails/instiki/trunk/app/models/wiki_reference.rb:

prev.	current


		LINKED_PAGE = 'L'
		WANTED_PAGE = 'W'
	5	REDIRECTED_PAGE = 'R'
		INCLUDED_PAGE = 'I'
		CATEGORY = 'C'
		AUTHOR = 'A'
...	...
		WANTED_FILE = 'E'

		belongs_to :page
12		~~validates_inclusion_of :link_type, :in => [LINKED_PAGE, WANTED_PAGE, INCLUDED_PAGE, CATEGORY, AUTHOR, FILE, WANTED_FILE]~~
	13	validates_inclusion_of :link_type, :in => [LINKED_PAGE, WANTED_PAGE, REDIRECTED_PAGE, INCLUDED_PAGE, CATEGORY, AUTHOR, FILE, WANTED_FILE]

14		~~# FIXME all finders below MUST restrict their results to pages belonging to a particular web~~
	15	def referenced_name
	16	read_attribute(:referenced_name).as_utf8
	17	end

		def self.link_type(web, page_name)
17		~~web.has_page?(page_name) ? LINKED_PAGE : WANTED_PAGE~~
	20	if web.has_page?(page_name) \|\| self.page_that_redirects_for(web, page_name)
	21	LINKED_PAGE
	22	else
	23	WANTED_PAGE
	24	end
		end

20		~~def self.pages_that_reference(page_name)~~
21		~~query = 'SELECT name FROM pages JOIN wiki_references ON pages.id = wiki_references.page_id ' +~~
22		~~'WHERE wiki_references.referenced_name = ?' +~~
23		~~"AND wiki_references.link_type in ('#{LINKED_PAGE}', '#{WANTED_PAGE}', '#{INCLUDED_PAGE}')"~~
	27	def self.pages_that_reference(web, page_name)
	28	query = 'SELECT name FROM pages JOIN wiki_references ' +
	29	'ON pages.id = wiki_references.page_id ' +
	30	'WHERE wiki_references.referenced_name = ? ' +
	31	"AND wiki_references.link_type in ('#{LINKED_PAGE}', '#{WANTED_PAGE}', '#{INCLUDED_PAGE}') " +
	32	"AND pages.web_id = '#{web.id}'"
		names = connection.select_all(sanitize_sql([query, page_name])).map { \|row\| row['name'] }
		end

27		~~def self.pages_that_link_to(page_name)~~
28		~~query = 'SELECT name FROM pages JOIN wiki_references ON pages.id = wiki_references.page_id ' +~~
29		~~'WHERE wiki_references.referenced_name = ? ' +~~
30		~~"AND wiki_references.link_type in ('#{LINKED_PAGE}', '#{WANTED_PAGE}')"~~
	36	def self.pages_that_link_to(web, page_name)
	37	query = 'SELECT name FROM pages JOIN wiki_references ' +
	38	'ON pages.id = wiki_references.page_id ' +
	39	'WHERE wiki_references.referenced_name = ? ' +
	40	"AND wiki_references.link_type in ('#{LINKED_PAGE}','#{WANTED_PAGE}') " +
	41	"AND pages.web_id = '#{web.id}'"
		names = connection.select_all(sanitize_sql([query, page_name])).map { \|row\| row['name'] }
		end
33
34		~~def self.pages_that_include(page_name)~~
35		~~query = 'SELECT name FROM pages JOIN wiki_references ON pages.id = wiki_references.page_id ' +~~
36		~~'WHERE wiki_references.referenced_name = ? ' +~~
37		~~"AND wiki_references.link_type = '#{INCLUDED_PAGE}'"~~
	44
	45	def self.pages_that_link_to_file(web, file_name)
	46	query = 'SELECT name FROM pages JOIN wiki_references ' +
	47	'ON pages.id = wiki_references.page_id ' +
	48	'WHERE wiki_references.referenced_name = ? ' +
	49	"AND wiki_references.link_type in ('#{FILE}') " +
	50	"AND pages.web_id = '#{web.id}'"
	51	names = connection.select_all(sanitize_sql([query, file_name])).map { \|row\| row['name'] }
	52	end
	53
	54	def self.pages_that_include(web, page_name)
	55	query = 'SELECT name FROM pages JOIN wiki_references ' +
	56	'ON pages.id = wiki_references.page_id ' +
	57	'WHERE wiki_references.referenced_name = ? ' +
	58	"AND wiki_references.link_type = '#{INCLUDED_PAGE}' " +
	59	"AND pages.web_id = '#{web.id}'"
		names = connection.select_all(sanitize_sql([query, page_name])).map { \|row\| row['name'] }
		end

41		~~def self.pages_in_category(category)~~
	63	def self.pages_redirected_to(web, page_name)
	64	names = []
	65	redirected_pages = []
	66	page = web.page(page_name)
	67	redirected_pages.concat page.redirects
	68	redirected_pages.concat Thread.current[:page_redirects][page] if
	69	Thread.current[:page_redirects] && Thread.current[:page_redirects][page]
	70	redirected_pages.uniq.each { \|name\| names.concat self.pages_that_reference(web, name) }
	71	names.uniq
	72	end
	73
	74	def self.page_that_redirects_for(web, page_name)
	75	query = 'SELECT name FROM pages JOIN wiki_references ' +
	76	'ON pages.id = wiki_references.page_id ' +
	77	'WHERE wiki_references.referenced_name = ? ' +
	78	"AND wiki_references.link_type = '#{REDIRECTED_PAGE}' " +
	79	"AND pages.web_id = '#{web.id}'"
	80	row = connection.select_one(sanitize_sql([query, page_name]))
	81	row['name'].as_utf8 if row
	82	end
	83
	84	def self.pages_in_category(web, category)
		query =
43		~~'SELECT name FROM pages JOIN wiki_references ON pages.id = wiki_references.page_id ' +~~
44		~~'WHERE wiki_references.referenced_name = ? ' +~~
45		~~"AND wiki_references.link_type = '#{CATEGORY}'"~~
46		~~names = connection.select_all(sanitize_sql([query, category])).map { \|row\| row['name'] }~~
	86	"SELECT name FROM pages JOIN wiki_references " +
	87	"ON pages.id = wiki_references.page_id " +
	88	"WHERE wiki_references.referenced_name = ? " +
	89	"AND wiki_references.link_type = '#{CATEGORY}' " +
	90	"AND pages.web_id = '#{web.id}'"
	91	names = connection.select_all(sanitize_sql([query, category])).map { \|row\| row['name'].as_utf8 }
		end

49		~~def self.list_categories~~
50		~~query = "SELECT DISTINCT referenced_name FROM wiki_references WHERE link_type = '#{CATEGORY}'"~~
51		~~connection.select_all(query).map { \|row\| row['referenced_name'] }~~
	94	def self.list_categories(web)
	95	query = "SELECT DISTINCT wiki_references.referenced_name " +
	96	"FROM wiki_references LEFT OUTER JOIN pages " +
	97	"ON wiki_references.page_id = pages.id " +
	98	"WHERE wiki_references.link_type = '#{CATEGORY}' " +
	99	"AND pages.web_id = '#{web.id}'"
	100	connection.select_all(query).map { \|row\| row['referenced_name'].as_utf8 }
		end

		def wiki_word?
...	...
		link_type == LINKED_PAGE
		end

	115	def redirected_page?
	116	link_type == REDIRECTED_PAGE
	117	end
	118
		def wanted_page?
		link_type == WANTED_PAGE
		end
...	...
		link_type == WANTED_FILE
		end

	135	def category?
	136	link_type == CATEGORY
	137	end
	138
		end

rool/rails/instiki/trunk/app/views/admin/create_system.rhtml:

prev.	current

1		~~<% @title = "Instiki Setup"; @content_width = 500 %>~~
	1	<%- @title = "Instiki Setup"; @content_width = 500 -%>

		<p>
		Congratulations on succesfully installing and starting Instiki.
...	...
		you'll need to do a brief one-time setup.
		</p>

9		~~<%= form_tag({ :controller => 'admin', :action => 'create_system'},~~
10		~~{'id' => 'setup', 'method' => 'post', 'onSubmit' => 'return validateSetup()'})~~
	9	<% form_tag({ :controller => 'admin', :action => 'create_system' },
	10	{ 'id' => 'setup', 'method' => 'post', 'onsubmit' => 'return validateSetup()',
	11	'accept-charset' => 'utf-8' }) do
		%>
		<ol class="setup">
		<li>
...	...
		The address can only consist of letters and digits.
		</div>
		<div class="inputBox">
23		~~Name: <input type="text" id="web_name" name="web_name" value="Wiki"~~
24		~~onChange="proposeAddress();" onClick="this.value == 'Wiki' ? this.value = '' : true" />~~
25		~~  ~~
26		~~Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();"~~
	24	<label for="web_name">Name:</label> <input type="text" id="web_name" name="web_name" value="Wiki"
	25	onchange="proposeAddress();" onclick="this.value == 'Wiki' ? this.value = '' : true" />
	26
	27	<label for="web_address">Address:</label> <input type="text" id="web_address" name="web_address" onchange="cleanAddress();"
		value="wiki" />
		</div>
		</li>
...	...
		</div>
		<div class="help"><em>Everyone with this password will be able to do this, so pick it carefully!</em></div>
		<div class="inputBox">
38		~~Password: <input type="password" id="password" name="password" />~~
39		~~  ~~
40		~~Verify: <input type="password" id="password_check" name="password_check" />~~
	39	<label for="password">Password:</label> <input type="password" id="password" name="password" />
	40
	41	<label for="password_check">Verify:</label> <input type="password" id="password_check" name="password_check" />
		</div>
		</li>
		</ol>

45		~~<p align="right">~~
	46	<p style="text-align:right">
		<input type="submit" value="Setup" style="margin-left: 40px" />
		</p>
48		~~<%= end_form_tag %>~~
	49	<% end %>

50		~~<script>~~
	51	<script type="text/javascript">
		function proposeAddress() {
		document.getElementById('web_address').value =
		document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();

rool/rails/instiki/trunk/app/views/admin/create_web.rhtml:

prev.	current

1		~~<% @title = "New Wiki Web"; @content_width = 500 %>~~
	1	<%- @title = "New Wiki Web"; @content_width = 500 -%>

		<p>
		Each web serves as an isolated name space for wiki pages,
		so different subjects or projects can write about different <i>MuppetShows</i>.
		</p>

8		~~<%= form_tag({ :controller => 'admin', :action => 'create_web'},~~
9		~~{'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})~~
	8	<% form_tag({ :controller => 'admin', :action => 'create_web' },
	9	{ 'id' => 'setup', 'method' => 'post',
	10	'onsubmit' => 'cleanAddress(); return validateSetup()',
	11	'accept-charset' => 'utf-8' }) do
		%>

		<ol class="setup">
...	...
		The address can only consist of letters and digits.
		</div>
		<div class="inputBox">
22		~~Name: <input type="text" id="web_name" name="name" onChange="proposeAddress();" />~~
23		~~  ~~
24		~~Address: <input type="text" id="web_address" name="address" onChange="cleanAddress();" />~~
	24	<label for="web_name">Name:</label> <input type="text" id="web_name" name="name" onchange="proposeAddress();" />
	25
	26	<label for="web_address">Address:</label> <input type="text" id="web_address" name="address" onchange="cleanAddress();" />
		</div>
		</li>
		</ol>


30		~~<p align="right">~~
31		~~<small>~~
32		~~Enter system password~~
	32	<p style="text-align:right;font-size:.85em;">
	33	<label for="system_password">Enter system password</label>
		<input type="password" id="system_password" name="system_password" />
		and
		<input type="submit" value="Create Web" />
36		~~</small>~~
		</p>

39		~~<%= end_form_tag %>~~
	39	<%- end -%>

41		~~<script>~~
	41	<script type="text/javascript">
		function proposeAddress() {
		document.getElementById('web_address').value =
		document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();

rool/rails/instiki/trunk/app/views/admin/edit_web.rhtml:

prev.	current

1		~~<% @title = "Edit Web" %>~~
	1	<%- @title = "Edit Web" -%>

3		~~<%= form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },~~
4		~~{'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})~~
	3	<% form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
	4	{ 'id' => 'setup', 'method' => 'post',
	5	'onsubmit' => 'cleanAddress(); return validateSetup()',
	6	'accept-charset' => 'utf-8' }) do
		%>

		<h2 style="margin-bottom: 3px">Name and address</h2>
...	...
		</div>

		<div class="inputBox">
15		~~Name: <input type="text" id="name" name="name" class="disableAutoComplete" value="<%= @web.name %>"~~
16		~~onChange="proposeAddress();" />   ~~
17		~~Address: <input type="text" class="disableAutoComplete" id="address" name="address" value="<%= @web.address %>"~~
18		~~onChange="cleanAddress();" />~~
19		~~<small><em>(Letters and digits only)</em></small>~~
	17	<label for ="name">Name:</label> <input type="text" id="name" name="name" class="disableAutoComplete" value="<%= @web.name %>"
	18	onchange="proposeAddress();" />
	19	<label for="address">Address:</label> <input type="text" class="disableAutoComplete" id="address" name="address" value="<%= @web.address %>"
	20	onchange="cleanAddress();" />
	21	<em>(Letters and digits only)</em>
		</div>

		<h2 style="margin-bottom: 3px">Specialize</h2>
		<div class="inputBox">
24		~~Markup:~~
25		~~<select name="markup">~~
26		~~<%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Mixed' => :mixed,~~
27		~~'RDoc' => :rdoc }, @web.markup) %>~~
	26	<label for="markup">Markup:</label>
	27	<select id="markup" name="markup">
	28	<%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Markdown+itex2MML' => :markdownMML, 'Markdown+blahtex/PNG' => :markdownPNG,
	29	'Mixed' => :mixed, 'RDoc' => :rdoc }, @web.markup) %>
		</select>

30		~~  ~~
	32

32		~~Color:~~
33		~~<select name="color">~~
34		~~<%= html_options({ 'Green' => '008B26', 'Purple' => '504685', 'Red' => 'DA0006',~~
35		~~'Orange' => 'FA6F00', 'Grey' => '8BA2B0' }, @web.color) %>~~
	34	<label for="color">Color:</label>
	35	<select id="color" name="color">
	36	<%= html_options({
	37	'Green' => '008B26',
	38	'Purple' => '504685',
	39	'Red' => 'DA0006',
	40	'Orange' => 'C50',
	41	'Grey' => '8BA2B0',
	42	'Blue' => '204A87',
	43	'Brown' => '8F5902',
	44	'Scarlet Red' => 'AA0006',
	45	'Plum' => '5C3566'
	46	}, @web.color) %>
		</select>
37		~~<br/>~~
		<p>
39		~~<small>~~
40		~~<input type="checkbox" class="disableAutoComplete" name="safe_mode" <%= 'checked="on"' if @web.safe_mode? %> />~~
41		~~Safe mode~~
42		~~<em>- strip HTML tags and stylesheet options from the content of all pages</em>~~
	49	<input type="checkbox" class="disableAutoComplete" id="safe_mode" name="safe_mode" <%= raw 'checked="checked"' if @web.safe_mode? %> />
	50	<label for="safe_mode">Safe mode
	51	<em>- strip HTML tags and stylesheet options from the content of all pages</em></label>
		<br/>
44		~~<input type="checkbox" class="disableAutoComplete" name="brackets_only" <%= 'checked="on"' if @web.brackets_only? %> />~~
45		~~Brackets only~~
46		~~<em>- require all wiki words to be as [[wiki word]], WikiWord links won't be created</em>~~
	53	<input type="checkbox" class="disableAutoComplete" id="brackets_only" name="brackets_only" <%= raw 'checked="checked"' if @web.brackets_only? %> />
	54	<label for="brackets_only">Brackets only
	55	<em>- require all wiki words to be as [[wiki word]], WikiWord links won't be created</em></label>
		<br/>
48		~~<input type="checkbox" class="disableAutoComplete" name="count_pages" <%= 'checked="on"' if @web.count_pages? %> />~~
49		~~Count pages~~
	57	<input type="checkbox" class="disableAutoComplete" id="count_pages" name="count_pages" <%= raw 'checked="checked"' if @web.count_pages? %> />
	58	<label for="count_pages">Count pages</label>
		<br/>
51
52		~~<input type="checkbox" class="disableAutoComplete" name="allow_uploads" <%= 'checked="on"' if @web.allow_uploads? %> />~~
	60	<input type="checkbox" class="disableAutoComplete" name="allow_uploads" <%= raw 'checked="checked"' if @web.allow_uploads? %> />
		Allow uploads of no more than
		<input type="text" class="disableAutoComplete" name="max_upload_size" value="<%= @web.max_upload_size %>"
55		~~width="20" />~~
	63	size="20" />
		kbytes
		<em>-
		allow users to upload pictures and other files and include them on wiki pages
		</em>
60		~~<br/>~~
61		~~</small>~~
		</p>

64		~~<a href="#"~~
65		~~onClick="document.getElementById('additionalStyle').style.display='block';return false;">~~
	70	<a href="#" onclick="toggleView('additionalStyle');return false;">
		Stylesheet tweaks >></a>
67		~~<small><em>~~
	72	<em>
		- add or change styles used by this web; styles defined here take precedence over
69		~~instiki.css. Hint: View HTML source of a page you want to style to find ID names on individual~~
70		~~tags.</em></small>~~
	74	instiki.css.<br/>
	75	Hint: View HTML source of a page you want to style to find ID names on individual
	76	tags.</em>
		<br/>
72		~~<textarea id="additionalStyle" class="disableAutoComplete"~~
73		~~style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px"~~
74		~~name="additional_style"><%= @web.additional_style %>~~
	78	<textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20"
	79	style="display:none" name="additional_style"><%= h(@web.additional_style) %>
		</textarea>
		</div>

...	...
		Setting the password to nothing will remove the password protection.
		</div>
		<div class="inputBox">
84		~~Password: <input class="disableAutoComplete" type="password" id="password"~~
	89	<label for="password">Password:</label> <input class="disableAutoComplete" type="password" id="password"
		name="password" value="<%= @web.password %>" />
86		~~  ~~
87		~~Verify: <input class="disableAutoComplete" type="password" id="password_check"~~
	91
	92	<label for="password_check">Verify:</label> <input class="disableAutoComplete" type="password" id="password_check"
		value="<%= @web.password %>" name="password_check" />
		</div>

...	...
		<div class="help">
		You can turn on a read-only version of this web that's accessible even when the regular web
		is password protected.
95		~~The published version is accessible through URLs like /wiki/published/HomePage.~~
	100	The published version is accessible through URLs like /<%= @web.address %>/published/HomePage.
		</div>
		<div class="inputBox">
98		~~<input type="checkbox" name="published" class="disableAutoComplete" <%= 'checked="on"' if @web.published? %> />~~
99		~~Publish this web~~
	103	<input type="checkbox" id="published" name="published" class="disableAutoComplete" <%= raw 'checked="checked"' if @web.published? %> />
	104	<label for="published">Publish this web</label>
		</div>

102		~~<p align="right">~~
103		~~<small>~~
104		~~Enter system password~~
	107	<p style="text-align:right;font-size:.85em;">
	108	<label for="system_password">Enter system password</label>
		<input type="password" class="disableAutoComplete" id="system_password"
		name="system_password" />
		and
		<input type="submit" value="Update Web" />
		<br/><br/>
		...or forget changes and <%= link_to 'create a new web', :action => 'create_web' %>
111		~~</small>~~
		</p>
	116	<%- end %>

114		~~<%= end_form_tag %>~~
115
116		~~<br/>~~
		<h1>Other administrative tasks</h1>

119		~~<%= form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},~~
120		~~{:id => 'remove_orphaned_pages',~~
121		~~:onSubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)"~~
122		})
	120	<% form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},
	121	{ :id => 'remove_orphaned_pages',
	122	:onsubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned').value)",
	123	'accept-charset' => 'utf-8' }) do
		%>
124		~~<p align="right">~~
125		~~<small>~~
126		~~Clean up by entering system password~~
	125	<div class="inputBox">
	126	<%= link_to ' Manage uploaded files',
	127	{:controller => 'wiki', :web => @web.address, :action => 'file_list'}, :style => 'font-weight:bold' %>
	128	for this web (<%= @web.name %>)
	129	</div>
	130	<p style="text-align:right;font-size:.85em;">
	131	Clean up this web (<%= @web.name %>) by entering the system password
		<input type="password" id="system_password_orphaned" class="disableAutoComplete" name="system_password_orphaned" />
		and
		<input type="submit" value="Delete Orphan Pages" />
130		~~</small>~~
		</p>
132		~~<%= end_form_tag %>~~
	136	<%- end -%>

	138	<%- categories = WikiReference.list_categories(@web).sort
	139	if categories.length > 0 -%>
	140	<% form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages_in_category'},
	141	{ :id => 'remove_orphaned_pages_in_category',
	142	:onsubmit => "return checkSystemPassword(document.getElementById('system_password_orphaned_in_category').value)",
	143	'accept-charset' => 'utf-8' }) do
	144	%>
	145	<p style="text-align:right;font-size:.85em;">
	146	Clean up selected category:
	147	<select id="category" name="category">
	148	<%= html_options(categories) %>
	149	</select>
	150	Enter system password
	151	<input type="password" id="system_password_orphaned_in_category" class="disableAutoComplete" name="system_password_orphaned_in_category" />
	152	and
	153	<input type="submit" value="Delete Orphan Pages in Category" />
	154	</p>
	155	<%- end -%>
	156	<%- end -%>
	157
	158	<div class="inputBox">
	159	<% form_tag({:controller => 'admin', :web => @web.address, :action => 'delete_web'},
	160	{ :id => 'delete_web',
	161	:onsubmit => "return checkSystemPassword(document.getElementById('system_password_delete_web').value)",
	162	'accept-charset' => 'utf-8' }) do
	163	%>
	164	<p style="text-align:right;">
	165	Delete this web (<%= @web.name %>), and all its pages. Enter system password
	166	<input type="password" id="system_password_delete_web" class="disableAutoComplete" name="system_password_delete_web" />
	167	and
	168	<input type="submit" value="Delete Web" />
	169	</p>
	170	<%- end %>
	171	</div>
	172
		<%= javascript_include_tag 'edit_web' %>

rool/rails/instiki/trunk/app/views/file/file.rhtml:

prev.	current

1		<%
	1	<%-
		@title = "Upload #{h @file_name}"
		@hide_navigation = false
4		%>
	4	@referring_page \|\|= request.env["HTTP_REFERER"]
	5	-%>

		<%= error_messages_for 'file' %>

8		~~<%= form_tag({:controller => 'file', :web => @web_name, :action => 'file'}, {:multipart => true}) %>~~
9		~~<%= hidden_field 'file', 'file_name' %>~~
	9	<% form_tag({ :controller => 'file', :web => @web_name, :action => 'file' },
	10	{ 'multipart' => true , 'accept-charset' => 'utf-8' }) do %>
		<div class="inputFieldWithPrompt">
11		~~<b>Content of <%= h @file_name %> to upload <small>(required)</small>:</b>~~
12		~~<br/>~~
13		~~<input type="file" name="file[content]" size="40" />~~
14		~~<br/>~~
15		~~<small>~~
16		~~Please note that the file you are uploadng will be named <%= h @file_name %> on the wiki -~~
	12	<input type="hidden" name="referring_page" value="<%= h @referring_page %>" />
	13	<%= hidden_field 'file', 'file_name' %>
	14	<label for="file_content"><b>Content of <%= h @file_name %> to upload</b>:</label>
	15	<br />
	16	<input type="file" id="file_content" name="file[content]" size="40" />
	17	<br />
	18	Please note that the file you are uploading will be named <%= h @file_name %> on the wiki -
		regardless of how it is named on your computer. To change the wiki name of the file, please go
18		~~<%= link_to :back %> and edit the wiki page that refers to the file.~~
19		~~</small>~~
	20	<%= link_to("back", @referring_page) %> and edit the wiki page that refers to the file.
		</div>
		<div class="inputFieldWithPrompt">
22		~~<b>Description <small>(optional)</small>:</b>~~
	23	<label for="file_description"><b>Description</b>:</label>
		<br/>
		<%= text_field "file", "description", "size" => 40 %>
		</div>
...	...
		:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
		:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
		</div>
32		~~<%= end_form_tag %>~~

	34	<%- end -%>

rool/rails/instiki/trunk/app/views/file/import.rhtml:

prev.	current

		<p>
2		~~<%= form_tag({}, {:multipart => true}) %>~~
	2	<% form_tag({}, { 'multipart' => true, 'accept-charset' => 'utf-8' }) do %>
		<p>
		File to upload:
		<br/>
...	...
		<p>
		<input type="submit" value="Update" /> as
		<input type="text" name="author" id="authorName" value="<%= @author %>"
16		~~onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />~~
17		~~<% if @page %>~~
18		~~\| <%= link_to 'Cancel', :web => @web.address, :action => 'file'%> <small>(unlocks page)</small>~~
19		~~<% end %>~~
	16	onclick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
	17	<%- if @page -%>
	18	\| <%= link_to 'Cancel', :web => @web.address, :action => 'file'%> <em>(unlocks page)</em>
	19	<%- end -%>

		</p>
22		~~<%= end_form_tag %>~~
23		~~</p>~~

	23	<%- end -%>
	24	</p>

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

prev.	current

1		~~<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">~~
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" >
		<html xmlns="http://www.w3.org/1999/xhtml">
3		~~<head>~~
4		~~<title>~~
5		~~RISC OS Open:~~
6		~~<% if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(@action_name)) %>~~
7		~~<%= h @web.name %>~~
8		~~<% elsif @web %>~~
9		~~<%= h @web.name %>: <%= @title %>~~
10		~~<% else %>~~
11		~~<%= @title %>~~
12		~~<% end %>~~
13		~~<%= @show_diff ? ' (changes)' : '' %>~~
14		~~</title>~~
	3	<head>
	4	<title>
	5	<%- if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(params['action'])) -%>
	6	<%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
	7	<%- elsif @web -%>
	8	<%= @title %> in <%= h @web.name %>
	9	<%- else -%>
	10	<%= @title %>
	11	<%- end -%>
	12	</title>

16		~~<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />~~
17		~~<meta name="robots" content="<%= @robots_metatag_value %>" />~~
	14	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
	15	<meta name="robots" content="<%= @robots_metatag_value %>" />
	16
	17	<%= javascript_include_tag 'page_helper' %>
	18
	19	<%= stylesheet_link_tag 'instiki', :media => 'all' unless @inline_style %>
	20	<%= stylesheet_link_tag 'syntax', :media => 'all' unless @inline_style %>
	21	<style type="text/css">
	22	h1#pageName, div.info, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, [actiontype="toggle"]:hover, #TextileHelp h3 {
	23	color: #<%= @web ? @web.color : "393" %>;
	24	}
	25	a:visited.existingWikiWord {
	26	color: #<%= darken(@web ? @web.color : "393") %>;
	27	}
	28	<%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
	29	<%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %>
	30	</style>
	31	<%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
	32	<style type="text/css"><!--/--><![CDATA[/><!--*/
	33	<%= @web && @web.additional_style ? @web.additional_style.html_safe : '' %>
	34	/]]>/--></style>
	35	<%= javascript_include_tag :defaults %>
	36	<%- if @web -%>
	37	<%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines'},
	38	:title => 'Atom with headlines') %>
	39	<%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_content'},
	40	:title => 'Atom with full content') %>
	41	<%- end -%>
	42	</head>

19		~~<style type="text/css">~~
20		~~<%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>~~
21		~~</style>~~
	44	<body>

23		~~<%= stylesheet_link_tag 'instiki' unless @inline_style %>~~
	46	<div id="Container">
	47	<div id="Content">
	48	<h1 id="pageName">
	49	<%= render(:file => 'svg_logo') if xhtml_enabled? %>
	50	<%- if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) -%>
	51	<%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
	52	<%- elsif @web -%>
	53	<span class="webName"><%= @web.name %></span><br />
	54	<%= @title %>
	55	<%- else -%>
	56	<%= @title %>
	57	<%- end %>
	58	</h1>

25		~~<style type="text/css">~~
26		~~<%= @style_additions %>~~
27		~~<%= @web ? @web.additional_style : '' %>~~
28		~~</style>~~
	60	<%= render(:file => 'navigation') unless @web.nil? \|\| @hide_navigation %>

30		~~<% if @web %><%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %>~~
31		~~<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_content') %><% end %>~~
32		~~</head>~~
	62	<%- if flash[:info] -%>
	63	<div class="info"><%= escape_preserving_linefeeds flash[:info] %></div>
	64	<%- end -%>

34		~~<body>~~
35		~~<%= render 'shared/fixed_header' %>~~
	66	<%- if @error or flash[:error] -%>
	67	<div class="errorExplanation"><%= escape_preserving_linefeeds(@error \|\| flash[:error]) %></div>
	68	<%- end -%>

37		~~<!-- Forum contents table -->~~
	70	<%= @content_for_layout %>

39		~~<p />~~
40		~~<table width="85%" cellspacing="0" cellpadding="0" align="center">~~
41		~~<tr valign="top" align="left">~~
42		~~<td width="75%">~~
43		~~<h2 id="pageName">~~
44		~~<% def home_link(text)~~
45		~~link_to h(text), { :controller => 'wiki', :action => 'show', :id => 'HomePage' }~~
46		~~end %>~~
47		~~<% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %>~~
48		~~<%= home_link(@web.name) %><span style="font-weight: normal"><%= (@show_diff ? ' (changes)' : '') %></span>~~
49		~~<% elsif @web %>~~
50		~~<%= home_link(@web.name + ':') %> <span style="font-weight: normal"><%= @title %></span>~~
51		~~<% else %>~~
52		~~<%= home_link(@title) %>~~
53		~~<% end %>~~
54		~~</h2>~~
	72	<%- if @show_footer -%>
	73	<div id="footer">
	74	<div>This site is running on <a href="http://golem.ph.utexas.edu/instiki/show/HomePage">Instiki <%= "#{Instiki::VERSION::STRING}" %></a></div>
	75	<div>Powered by <a href="http://rubyonrails.com/">Ruby on Rails</a> <%= "#{Rails::VERSION::STRING}" %></div>
	76	</div>
	77	<%- end -%>

56		~~<% if @flash[:info] %><div class="info">~~
57		~~<%= escape_preserving_linefeeds @flash[:info] %>~~
58		~~</div><% end %>~~
59		~~<% if @error or @flash[:error] %><div class="errorExplanation">~~
60		~~<%= escape_preserving_linefeeds(@error \|\| @flash[:error]) %>~~
61		~~</div><% end %>~~
	79	</div> <!-- Content -->

63		~~<%= @content_for_layout %>~~
64		~~</td>~~
	81	</div> <!-- Container -->

66		~~<td>  </td>~~
67		~~<td bgcolor="#bbbbbb" class="column_divider"><img src="/images/utilities/blank.gif" width="1" height="1" alt="." border="0" /></td>~~
68		~~<td>  </td>~~
69
70		~~<td width="25%">~~
71		~~<div id="sidebar">~~
72		~~<%= if (@web.nil? \|\| @hide_navigation) then render 'shared/fixed_sidebar' else render 'navigation' end %>~~
73		~~</div>~~
74		~~</td>~~
75		~~</tr>~~
76		~~</table>~~
77
78		~~<%= render 'shared/fixed_footer' %>~~
79		~~</body>~~
	83	</body>
		</html>

rool/rails/instiki/trunk/app/views/markdown_help.rhtml:

prev.	current

1		~~<h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">advanced</a>)</h3>~~
2		~~<table cellspacing="0" cellpadding="0">~~
3		~~<tr><td>_your text_</td><td class="arrow">→</td><td><em>your text</em></td></tr>~~
4		~~<tr><td>your text</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>~~
5		~~<tr><td>`my code`</td><td class="arrow">→</td><td><code>my code</code></td></tr>~~
6		~~<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>~~
7		~~<tr><td>1. Numbered list<br />1. Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>~~
8		~~<tr><td>[link name](URL)</td><td class="arrow">→</td><td><a href="URL">link name</a></td></tr>~~
9		~~<tr><td>***</td><td class="arrow">→</td><td>Horizontal ruler</td></tr>~~
10		~~<tr><td><http://url><br /><email@add.com></td><td class="arrow">→</td><td>Auto-linked</td></tr>~~
11		~~<tr><td>![Alt text](URL)</td><td class="arrow">→</td><td>Image</td></tr>~~
12		~~</table>~~
	1	<h3>Markdown formatting tips (<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">basics</a>, <a target="_new" href="http://michelf.com/projects/php-markdown/extra/">extended syntax</a>, <a target="_new" href="http://maruku.rubyforge.org/proposal.html">metadata</a>)</h3>
	2	<%= render(:file => "markdown_table") -%>

rool/rails/instiki/trunk/app/views/mixed_help.rhtml:

prev.	current

1		~~<%= render 'textile_help' %>~~
	1	<%= render(:file => 'textile_help') %>

		<h3>Markdown</h3>
		<p>
		In addition to Textile, this wiki also understands
		<a target="_new" href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>.
7		~~</p>~~

	8	</p>

rool/rails/instiki/trunk/app/views/navigation.rhtml:

prev.	current

1		~~<div class="sidebar-node">~~
2		~~<h3>Search documentation</h3>~~
3
4		~~<p />~~
5		~~<%= form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},~~
6		~~{'id' => 'navigationSearchForm', 'method' => 'get'}) %>~~
7		~~<input type="text" id="searchField" name="query" size="15" value="Search"~~
8		~~onfocus="this.value == 'Search' ? this.value = '' : true"~~
9		~~onblur="this.value == '' ? this.value = 'Search' : true" />~~
10		~~<input type="submit" name="submit" value="Go" />~~
11		~~<%= end_form_tag %>~~
12		~~</div>~~
		<%
		def list_item(text, link_options, description, accesskey = nil)
		link_options[:controller] = 'wiki'
		link_options[:web] = @web.address
		link_to_unless_current(text, link_options, :title => description, :accesskey => accesskey) {
18		~~content_tag('b', text, 'title' => description, 'class' => 'navOn')~~
	6	content_tag('b', text, 'title' => description, 'class' => 'navOn')
		}
		end
		%>

23		~~<%= render 'shared/fixed_sidebar' %>~~
24
25		~~<p />~~
26		~~<div class="sidebar-node">~~
27		~~<h3>Options</h3>~~
28
29		~~<ul>~~
30		~~<% if @action_name != 'published' then %>~~
31		~~<li><%= list_item 'Documentation Home', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %></li>~~
32		~~<li><%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %></li>~~
33		~~<li><%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %></li>~~
34		~~<li><%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %></li>~~
35		~~<li><%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by RSS' %></li>~~
36		~~<li><%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %></li>~~
37		~~<% else %>~~
38		~~<li><%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %></li>~~
39		~~<% end%>~~
40		~~</ul>~~
41		~~</div>~~
	11	<div class="navigation">
	12	<span class="skipNav"><a href='#navEnd'>Skip the Navigation Links</a> \| </span>
	13	<%- if params['action'] != 'published' then -%>
	14	<%= list_item 'Home Page', {:action => 'show', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> \|
	15	<%= list_item 'All Pages', {:action => 'list'}, 'Alphabetically sorted list of pages', 'A' %> \|
	16	<%= list_item 'Recently Revised', {:action =>'recently_revised'}, 'Pages sorted by when they were last changed', 'U' %> \|
	17	<%= list_item 'Authors', {:action => 'authors'}, 'Who wrote what' %> \|
	18	<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %> \|
	19	<%= list_item 'Export', {:action => 'export'}, 'Download a zip with all the pages in this wiki', 'X' %> \|
	20	<% form_tag({ :controller => 'wiki', :action => 'search', :web => @web.address},
	21	{'id' => 'navigationSearchForm', 'method' => 'get', 'accept-charset' => 'utf-8' }) do %>
	22	<fieldset class="search"><input type="text" id="searchField" name="query" value="Search"
	23	onfocus="this.value == 'Search' ? this.value = '' : true"
	24	onblur="this.value == '' ? this.value = 'Search' : true" /></fieldset>
	25	<% end %>
	26	<%- else -%>
	27	<%= list_item 'Home Page', {:action => 'published', :id => 'HomePage'}, 'Home, Sweet Home', 'H' %> \|
	28	<%= list_item 'Feeds', {:action => 'feeds'}, 'Subscribe to changes by Atom' %>
	29	<% end-%>
	30	<span id='navEnd'></span>
	31	</div>

rool/rails/instiki/trunk/app/views/textile_help.rhtml:

prev.	current

1		~~<h3>Formatting: Textile</h3>~~
2		~~<p style="border-top: 1px dotted #ccc; margin-top: 0px">~~
3		~~Text is formatted using the Textile markup syntax - find help~~
4		~~<a href="http://hobix.com/textile/quick.html" target="_blank" onClick="quickRedReference(); return false;">here</a>.~~
5
	1	<h3>Textile formatting tips (<a href="http://redcloth.org/hobix.com/textile/quick.html" onclick="quickRedReference(); return false;">advanced</a>)</h3>
	2	<table cellspacing="0" cellpadding="0">
	3	<tr><td>_your text_</td><td class="arrow">→</td><td><em>your text</em></td></tr>
	4	<tr><td>your text</td><td class="arrow">→</td><td><strong>your text</strong></td></tr>
	5	<tr><td style="padding-right:0.75em">%{color:red}hello%</td><td class="arrow">→</td><td><span style="color: red;">hello</span></td></tr>
	6	<tr><td>* Bulleted list<br />* Second item</td><td class="arrow">→</td><td>• Bulleted list<br />• Second item</td></tr>
	7	<tr><td># Numbered list<br /># Second item</td><td class="arrow">→</td><td>1. Numbered list<br />2. Second item</td></tr>
	8	<tr><td>"linkname":URL</td><td class="arrow">→</td><td><a href="URL">linkname</a></td></tr>
	9	<tr><td>\|a\|table\|row\|<br />\|b\|table\|row\|</td><td class="arrow">→</td><td>Table</td></tr>
	10	<tr><td>!imageURL!</td><td class="arrow">→</td><td>Image</td></tr>
	11	</table>
	12
		<script language="JavaScript">
		function quickRedReference() {
8		~~window.open(~~
9		~~"http://hobix.com/textile/quick.html",~~
	15	window.open(
	16	"http://redcloth.org/hobix.com/textile/quick.html",
		"redRef",
		"height=600,width=550,channelmode=0,dependent=0," +
		"directories=0,fullscreen=0,location=0,menubar=0," +
13		~~"resizable=0,scrollbars=1,status=1,toolbar=0"~~
	20	"resizable=0,scrollbars=1,status=1,toolbar=0"
		);
		}
		</script>

rool/rails/instiki/trunk/app/views/wiki/_inbound_links.rhtml:

prev.	current

1		~~<% unless @page.linked_from.empty? %>~~
2		~~<small>~~
	1	<%- unless @page.linked_from.empty? -%>
	2	<span class="linked">
		\| Linked from:
4		~~<%= @page.linked_from.collect { \|referring_page\| link_to_existing_page referring_page }.join(", ") %>~~
5		~~</small>~~
6		~~<% end %>~~
	4	<%= @page.linked_from.collect { \|referring_page\| link_to_existing_page referring_page }.join(", ").html_safe %>
	5	</span>
	6	<%- end -%>

8		~~<% unless @page.included_from.empty? %>~~
9		~~<small>~~
	8	<%- unless @page.included_from.empty? -%>
	9	<span class="linked">
		\| Included from:
11		~~<%= @page.included_from.collect { \|referring_page\| link_to_existing_page referring_page }.join(", ") %>~~
12		~~</small>~~
13		~~<% end %>~~
	11	<%= @page.included_from.collect { \|referring_page\| link_to_existing_page referring_page }.join(", ").html_safe %>
	12	</span>
	13	<%- end -%>

rool/rails/instiki/trunk/app/views/wiki/authors.rhtml:

prev.	current

1		~~<% @title = 'Authors' %>~~
	1	<%- @title = 'Authors' -%>

		<ul id="authorList">
4		~~<% for author in @authors %>~~
	4	<%- for author in @authors -%>
		<li>
6		~~<%= link_to_page author %>~~
	6	<%= link_to_page author.purify %>
		co- or authored:
8		~~<%= @page_names_by_author[author].collect { \|page_name\| link_to_page(page_name) }.sort.join ', ' %>~~
	8	<%= raw @page_names_by_author[author].collect { \|page_name\| link_to_page(page_name) }.sort.join ', ' %>
		</li>
10		~~<% end %>~~
	10	<%- end -%>
		</ul>

rool/rails/instiki/trunk/app/views/wiki/edit.rhtml:

prev.	current

1		<%
2		~~@title = "Editing #{@page.name}"~~
	1	<%-
	2	@title = "Editing #{@page.name.escapeHTML}".html_safe
		@content_width = 720
		@hide_navigation = true
5		%>
	5	-%>

7		~~<table border="0" cellspacing="0" cellpadding="0" width="100%">~~
8		~~<tr valign="top">~~
9		~~<td align="left">~~
10		~~<%= form_tag({ :action => 'save', :web => @web.address, :id => @page.name},~~
11		~~{'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()'})~~
12		%>
	7	<div id="MarkupHelp">
	8	<%= render(:file => "#{@web.markup}_help") -%>
	9	<%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>
	10	</div>

14		~~<textarea name="content" id="content" cols="48" rows="24"><%= h(@flash[:content] \|\| @page.content) %></textarea>~~
	12	<% form_tag({ :action => 'save', :web => @web.address, :id => @page.name },
	13	{ 'id' => 'editForm', 'method' => 'post', 'onsubmit' => 'cleanAuthorName()',
	14	'accept-charset' => 'utf-8' }) do %>
	15	<div>
	16	<textarea name="content" id="content" rows="24" cols="60"><%= h(flash[:content] \|\|
	17	(params['content'] ? params['content'] : @page.content).purify) %></textarea>
	18	<% if @page_name != 'HomePage' -%>
	19	<p>
	20	<%= check_box_tag :alter_title, value = "1", checked=false,
	21	'onchange' => "toggleVisibility();" %> <label for="alter_title">Change page name.</label><br/>
	22	<span id="title_change" style="display:none"><label for="new_name">New name:</label> <%= text_field_tag :new_name, h(@page.name.purify),
	23	:onblur => "addRedirect();" %></span>
	24	</p>
	25	<% else -%>
	26	<%= hidden_field_tag 'new_name', @page_name %>
	27	<% end%>
	28	<div id="editFormButtons">
	29	<input type="submit" value="Submit" accesskey="s"/> as
	30	<%= text_field_tag :author, h(@author.purify),
	31	:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
	32	:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
	33	\|
	34	<span>
	35	<%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
	36	{:accesskey => 'c'}) %>
	37	<span class="unlock">(unlocks page)</span>
	38	</span>
	39	</div>
	40	</div>
	41	<%- end -%>

16		~~<p>~~
17		~~<input type="submit" value="Submit" accesskey="s"/> as~~
18		~~<%= text_field_tag :author, @author,~~
19		~~:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",~~
20		~~:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>~~
21		\|
22		~~<%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},~~
23		~~{:accesskey => 'c'})~~
24		%>
25		~~<small>(unlocks page)</small>~~
26		~~</p>~~
27		~~<%= end_form_tag %>~~
28		~~</td>~~
29		~~<td align="left">~~
30		~~<div id="MarkupHelp">~~
31		~~<%= render("#{@web.markup}_help") %>~~
32		~~<%= render('wiki_words_help') %>~~
33		~~</div>~~
34		~~</td>~~
35		~~</tr>~~
36		~~</table>~~
	43	<script type="text/javascript">
	44	<!--//--><![CDATA[//><!--
	45	function toggleVisibility() {
	46	var span = document.getElementById('title_change');
	47	if (span.style.display =='inline') {
	48	span.style.display ='none';
	49	document.getElementById('new_name').value = "<%= escape_javascript(@page.name) %>";
	50	var content = document.getElementById('content').value
	51	document.getElementById('content').value = content.replace(/\[\[!redirects <%= Regexp.escape(@page.name).gsub('/', '\\/') %>\]\]\n/, '')
	52	}
	53	else
	54	span.style.display ='inline'
	55	}

38		~~<script language="JavaScript1.2">~~
	57	function addRedirect(){
	58	var e = document.getElementById('new_name').value;
	59	if ( e != "<%= escape_javascript(@page.name) %>" && e != '') {
	60	var content = document.getElementById('content');
	61	content.value = '[[!redirects <%= escape_javascript(@page.name) %>]]\n' + content.value
	62	}
	63	}
	64
		function cleanAuthorName() {
		if (document.getElementById('authorName').value == "") {
		document.getElementById('authorName').value = 'AnonymousCoward';
		}
		}
	70
		document.forms["editForm"].elements["content"].focus();
	72	<%- if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) and !@page.categories.include?('S5-slideshow') -%>
	73	setupSVGedit('<%= compute_public_path("editor/svg-editor.html", "svg-edit").split(/\?/)[0] %>');
	74	addS5button('<%= @page.name.escapeHTML %>');
	75	<%- end -%>
	76	//--><!]]>
		</script>

rool/rails/instiki/trunk/app/views/wiki/export.rhtml:

prev.	current

1		~~<% @title = "Export" %>~~
	1	<%- @title = "Export" -%>

		<p>You can export all the pages in this web as a zip file in either HTML (with working links and all) or the pure markup (to import in another wiki).</p>

		<ul id="feedsList">
		<li><%= link_to 'HTML', :web => @web.address, :action => 'export_html' %></li>
		<li><%= link_to "Markup (#{@web.markup.to_s.capitalize})", :web => @web.address, :action => 'export_markup' %></li>
8		~~<% if OPTIONS[:pdflatex] && @web.markup == :textile %>~~
9		~~<li><%= link_to 'TeX', :web => @web.address, :action => 'export_tex' %></li>~~
10		~~<li><%= link_to 'PDF', :web => @web.address, :action => 'export_pdf' %></li>~~
11		~~<% end %>~~
		</ul>

rool/rails/instiki/trunk/app/views/wiki/feeds.rhtml:

prev.	current

1		~~<% @title = "Feeds" %>~~
	1	<%- @title = "Feeds" -%>

3		~~<p>You can subscribe to this wiki by RSS and get either just the headlines of the pages that change or the entire page.</p>~~
	3	<p>You can subscribe to this wiki's Atom feed and get either just the headlines of the pages that change or the entire page.</p>

		<ul id="feedsList">
	6	<%- if @rss_with_content_allowed -%>
		<li>
7		~~<% if @rss_with_content_allowed %>~~
8		~~<%= link_to 'Full content (RSS 2.0)', :web => @web.address, :action => :rss_with_content %>~~
9		~~<% end %>~~
	8	<%= link_to 'Full content (Atom 1.0)', :web => @web.address, :action => :atom_with_content %>
		</li>
	10	<%- end -%>
		<li>
12		~~<%= link_to 'Headlines (RSS 2.0)', :web => @web.address, :action => :rss_with_headlines %>~~
	12	<%= link_to 'Headlines (Atom 1.0)', :web => @web.address, :action => :atom_with_headlines %>
		</li>
		</ul>

rool/rails/instiki/trunk/app/views/wiki/list.rhtml:

prev.	current

1		~~<% @title = "All Pages" %>~~
	1	<%- @title = "All Pages" -%>

		<%= categories_menu unless @categories.empty? %>

5		~~<div id="allPages" style="float: left; width: 280px; margin-right: 30px">~~
6		~~<% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>~~
	5	<div id="allPages">
	6	<%- unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? -%>
		<h2>
		All Pages
9		~~<br/><small style="font-size: 12px"><i>All pages in <%= @set_name %> listed alphabetically</i></small>~~
	9	<br/><span class="pageType">All pages in <%= raw @set_name %> listed alphabetically</span>
		</h2>
11		~~<% end %>~~
	11	<%- end -%>

	13	<% if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) -%>
	14	<% form_tag({ :controller => 'wiki', :action => 'tex_list', :web => @web.address },
	15	{'method' => 'post', 'accept-charset' => 'utf-8' }) do
	16	%>
	17	<div>
	18	<% if params['category'] -%>
	19	<input type="hidden" name="category" value="<%= params['category'] %>"/>
	20	<%- end -%>
	21	<ul id="sortable_pages">
	22	<% @pages_in_category.each do \|page\| %>
	23	<% content_tag_for :li, page do %>
	24
	25	<input type="checkbox" name="<%= page.name %>" value="tex"/>
	26	<%= link_to_existing_page page, truncate(page.plain_name, :length => 35) %>
	27	<% end %>
	28
	29	<% end %>
	30	</ul>
	31	<%= sortable_element('sortable_pages', {:onUpdate => 'function(){}'}) %>
	32	<label for="commit"> Export selected pages (drag to re-order them) to a LaTeX file.</label>
	33	<%= submit_tag("Export") %>
	34	</div>
	35	<%- end -%>
	36	<%- else -%>
		<ul>
14		~~<% @pages_in_category.each do \|page\| %>~~
	38	<%- @pages_in_category.each do \|page\| -%>
		<li>
16		~~<%= link_to_existing_page page, truncate(page.plain_name, 35) %>~~
	40	<%= link_to_existing_page page, truncate(page.plain_name, :length => 35) %>
		</li>
18		~~<% end %></ul>~~
	42	<%- end -%>
	43	</ul>
	44	<%- end -%>

20		~~<% if @web.count_pages? %>~~
	46	<%- if @web.count_pages? -%>
		<% total_chars = @pages_in_category.characters %>
22		~~<p><small>All content: <%= total_chars %> chars / approx. <%= sprintf("%-.1f", (total_chars / 2275 )) %> printed pages</small></p>~~
23		~~<% end %>~~
	48	<p class="pageStats">All content: <%= total_chars %> chars / approx. <%= sprintf("%-.1f", (total_chars / 2275 )) %> printed pages</p>
	49	<%- end -%>
		</div>

26		~~<div style="float: left; width: 280px">~~
27		~~<% unless @page_names_that_are_wanted.empty? %>~~
	52	<div id="wantedPages">
	53	<%- unless @page_names_that_are_wanted.empty? -%>
		<h2>
		Wanted Pages
		<br/>
31		~~<small style="font-size: 12px">~~
32		~~<i>Unexisting pages that other pages in <%= @set_name %> reference</i>~~
33		~~</small>~~
	57	<span class="pageType">
	58	Nonexistent pages that other pages in <%= raw @set_name %> reference
	59	</span>
		</h2>

		<ul style="margin-bottom: 10px">
37		~~<% @page_names_that_are_wanted.each do \|wanted_page_name\| %>~~
	63	<%- @page_names_that_are_wanted.each do \|wanted_page_name\| -%>
		<li>
39		~~<%= link_to_page(wanted_page_name, @web, truncate(WikiWords.separate(wanted_page_name), 35)) %>~~
	65	<%= link_to_page(wanted_page_name, @web, truncate(WikiWords.separate(wanted_page_name), :length => 35)) %>
		wanted by
		<%= @web.select.pages_that_reference(wanted_page_name).collect { \|referring_page\|
		link_to_existing_page referring_page
43		~~}.join(", ")~~
	69	}.join(", ").html_safe
		%>
		</li>
46		~~<% end %>~~
	72	<%- end -%>
		</ul>
48		~~<% end %>~~
	74	<%- end -%>

50		~~<% unless @pages_that_are_orphaned.empty? %>~~
	76	<%- unless @pages_that_are_orphaned.empty? -%>
		<h2>
		Orphaned Pages
53		~~<br/><small style="font-size: 12px"><i>Pages in <%= @set_name %> that no other page reference</i></small>~~
	79	<br/><span class="pageType">Pages in <%= raw @set_name %> that no other page reference</span>
		</h2>

		<ul style="margin-bottom: 35px">
57		~~<% @pages_that_are_orphaned.each do \|orphan_page\| %>~~
	83	<%- @pages_that_are_orphaned.each do \|orphan_page\| -%>
		<li>
59		~~<%= link_to_existing_page orphan_page, truncate(orphan_page.plain_name, 35) %>~~
	85	<%= link_to_existing_page orphan_page, truncate(orphan_page.plain_name, :length => 35) %>
		</li>
61		~~<% end %>~~
	87	<%- end -%>
		</ul>
63		~~<% end %>~~
	89	<%- end -%>
		</div>

rool/rails/instiki/trunk/app/views/wiki/locked.rhtml:

prev.	current

1		~~<% @title = "#{@page.plain_name} is locked" %>~~
	1	<%- @title = "#{@page.plain_name} is locked".html_safe -%>

		<p>
4		~~<%= link_to_page(@page.locked_by) %>~~
5		~~<% if @page.lock_duration(Time.now) == 0 %>~~
	4	<%= link_to_page(h(@page.locked_by.purify)) %>
	5	<%- if @page.lock_duration(Time.now) == 0 -%>
		just started editing this page.
7		~~<% else %>~~
	7	<%- else -%>
		has been editing this page for <%= @page.lock_duration(Time.now) %> minutes.
9		~~<% end %>~~
	9	<%- end -%>
		</p>

		<p>

rool/rails/instiki/trunk/app/views/wiki/login.rhtml:

prev.	current

1		~~<% @title = "#{@web_name} Login" %><% @hide_navigation = true %>~~
	1	<%- @title = "#{@web_name} Login" %><% @hide_navigation = true -%>

3		~~<p>~~
4		~~<%= form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},~~
5		~~{ 'name' => 'loginForm', 'id' => 'loginForm', 'method' => 'post'})~~
6		%>
	3	<% form_tag({ :controller => 'wiki', :action => 'authenticate', :web => @web.address},
	4	{ 'id' => 'loginForm', 'method' => 'post', 'accept-charset' => 'utf-8' }) do %>
		<p>
		This web is password-protected. Please enter the password.
		<% if @web.published? %>
...	...
		<% end %>
		</p>
		<p>
14		~~<b>Password: </b>~~
	12	<label for="password"><b>Password:</b></label>
		<input type="password" name="password" id="password" />
16		~~<input type="submit" value="Login" default="yes" />~~
	14	<input type="submit" value="Login" />
		</p>
18		~~<%= end_form_tag %>~~
19		~~</p>~~
	16	<%- end -%>

21		~~<script language="JavaScript">~~
22		~~document.forms["loginForm"].elements["password"].focus();~~
	18	<script type="text/javascript">
	19	document.forms["loginForm"].elements["password"].focus();
		</script>

rool/rails/instiki/trunk/app/views/wiki/new.rhtml:

prev.	current

1		<%
2		~~@title = "Creating #{WikiWords.separate(@page_name)}"~~
	1	<%-
	2	@title = "Creating #{WikiWords.separate(@page_name).escapeHTML}".html_safe
		@content_width = 720
		@hide_navigation = true
5		%>
	5	-%>

7		~~<table border="0" cellspacing="0" cellpadding="0" width="100%">~~
8		~~<tr valign="top">~~
9		~~<td align="left">~~
10		~~<%= form_tag({ :action => 'save', :web => @web.address, :id => @page_name},~~
11		~~{'id' => 'editForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName();'})~~
12		%>
13		~~<textarea name="content" id="content" cols="48" rows="24"><%= h(@flash[:content] \|\| '') %></textarea>~~
	7	<div id="MarkupHelp">
	8	<%= render(:file => "#{@web.markup}_help") -%>
	9	<%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>
	10	</div>

15		~~<p>~~
16		~~<input type="submit" value="Submit" accesskey="s"/> as~~
17		~~<%= text_field_tag :author, @author,~~
18		~~:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",~~
19		~~:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>~~
20		~~</p>~~
21		~~<%= end_form_tag %>~~
22		~~</td>~~
23		~~<td align="left">~~
24		~~<div id="MarkupHelp">~~
25		~~<%= render("#{@web.markup}_help") %>~~
26		~~<%= render('wiki_words_help') %>~~
27		~~</div>~~
28		~~</td>~~
29		~~</tr>~~
30		~~</table>~~
	12	<div id="editForm">
	13	<% form_tag({ :action => 'save', :web => @web.address, :id => @page_name },
	14	{ 'id' => 'editForm', 'method' => 'post', 'onsubmit' => 'cleanAuthorName();', 'accept-charset' => 'utf-8' }) do %>
	15
	16	<textarea name="content" id="content" rows="24" cols="60"><%= h(flash[:content] \|\|
	17	params['content'] ? params['content'].purify : '' ) %></textarea>
	18	<div id="editFormButtons">
	19	<input type="submit" value="Submit" accesskey="s"/> as
	20	<%= text_field_tag :author, @author,
	21	:onfocus => "this.value == 'AnonymousCoward' ? this.value = '' : true;",
	22	:onblur => "this.value == '' ? this.value = 'AnonymousCoward' : true" %>
	23	</div>
	24	<%- end -%>
	25	</div>

32		~~<script language="JavaScript1.2">~~
	27	<script type="text/javascript">
		function cleanAuthorName() {
		if (document.getElementById('authorName').value == "") {
		document.getElementById('authorName').value = 'AnonymousCoward';
		}
		}
		document.forms["editForm"].elements["content"].focus();
	34	<%- if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) -%>
	35	setupSVGedit('<%= compute_public_path("editor/svg-editor.html", "svg-edit").split(/\?/)[0] %>');
	36	addS5button('<%= @page_name.escapeHTML %>');
	37	<%- end -%>
		</script>

rool/rails/instiki/trunk/app/views/wiki/page.rhtml:

prev.	current

1		<%
	1	<%-
		@title = @page.plain_name
3		~~@title += ' (changes)' if @show_diff~~
	3	@title += ' (changes)' if @show_diff
		@show_footer = true
5		%>
	5	-%>

		<div id="revision">
8		~~<% if @show_diff %>~~
9		~~<p style="background: #eee; padding: 3px; border: 1px solid silver">~~
10		~~<small>~~
	8	<%- if @show_diff -%>
	9	<p class="show_diff">
		Showing changes from revision #<%= @page.revisions.size - 1 %> to #<%= @page.revisions.size %>:
12		~~<ins class="diffins">Added</ins> \| <del class="diffdel">Removed</del>~~
13		~~</small>~~
	11	<ins class="diffins">Added</ins> \| <del class="diffdel">Removed</del> \| <del class="diffmod">Chan</del><ins class="diffmod">ged</ins>
		</p>
		<%= @renderer.display_diff %>
16		~~<% else %>~~
	14	<%- else -%>
		<%= @renderer.display_content %>
18		~~<% end %>~~
	16	<%- end -%>
		</div>

		<div class="byline">
...	...
		<% end %>
		</div>

31		~~<div class="navigation">~~
	29	<div class="navigation navfoot">

33		~~<%= navigation_menu_for_page.join(' \| ') %>~~
	31	<%= raw navigation_menu_for_page.join(' \| ') %>

35		~~<small>~~
	33	<span class="views">
		\| Views:
		<%= link_to('Print',
		{ :web => @web.address, :action => 'print', :id => @page.name },
39		~~{ :accesskey => 'p', :name => 'view_print' }) %>~~
40		~~<% if defined? RedClothForTex and RedClothForTex.available? and @web.markup == :textile %>~~
	37	{ :accesskey => 'p', :id => 'view_print', :rel => 'nofollow' }) %>
	38	<%- if @web.markup == :markdownMML or @web.markup == :markdown or @web.markup == :markdownPNG -%>
		\|
		<%= link_to 'TeX', {:web => @web.address, :action => 'tex', :id => @page.name},
43		~~{:name => 'view_tex'} %>~~
44		\|
45		~~<%= link_to 'PDF', {:web => @web.address, :action => 'pdf', :id => @page.name},~~
46		~~{:name => 'view_pdf'} %>~~
47		~~<% end %>~~
48		~~</small>~~
	41	{:id => 'view_tex', :rel => 'nofollow' } %>
	42	<% if WikiReference.pages_in_category(@web, 'S5-slideshow').map.include?(@page.name) %>
	43	\|
	44	<%= link_to 'S5', {:web => @web.address, :action => 's5', :id => @page.name},
	45	{:id => 'view_S5'} %>
	46	<%- end -%>
	47	<%- end -%>
	48	\|
	49	<%= link_to 'Source', {:web => @web.address, :action => 'source', :id => @page.name},
	50	{:id => 'view_source', :rel => 'nofollow' } %>
	51	</span>

		<%= render :partial => 'inbound_links' %>
		</div>

rool/rails/instiki/trunk/app/views/wiki/print.rhtml:

prev.	current

1		<%
	1	<%-
		@title = @page.plain_name
		@hide_navigation = true
		@style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
5		~~@inline_style = true~~
6		%>
	5	-%>

8		~~<%= @renderer.display_content_for_export %>~~
	7	<%= @renderer.display_content %>

		<div class="byline">
		<%= @page.revisions? ? "Revised" : "Created" %> on <%= format_date(@page.revised_at) %>

rool/rails/instiki/trunk/app/views/wiki/published.rhtml:

prev.	current

1		<%
	1	<%-
		@title = @page.plain_name
		@hide_navigation = false
		@style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
5		~~@inline_style = true~~
	5	@inline_style = false
		@show_footer = true
7		%>
	7	-%>

		<%= @renderer.display_published %>
	10
	11	<div class="byline">
	12	<%= @page.revisions? ? "Revised" : "Created" %> on <%= format_date(@page.revised_at) %>
	13	by
	14	<%= author_link(@page, { :mode => (@link_mode \|\| :show) }) %>
	15	</div>
	16
	17	<div class="navigation navfoot">
	18	<span class="views">
	19	<%- if WikiReference.pages_in_category(@web, 'S5-slideshow').map.include?(@page.name) -%>
	20	Views:
	21	<%= link_to 'S5', {:web => @web.address, :action => 's5',
	22	:id => @page.name}, {:id => 'view_S5'} %>
	23	<%- end -%>
	24	</span>
	25	</div>

rool/rails/instiki/trunk/app/views/wiki/recently_revised.rhtml:

prev.	current

1		~~<% @title = "Recently Revised" %>~~
	1	<%- @title = "Recently Revised" -%>

		<%= categories_menu %>

5		~~<% @pages_by_day.keys.sort.reverse.each do \|day\| %>~~
	5	<%- @pages_by_day.keys.sort.reverse.each do \|day\| -%>
		<h3><%= format_date(day, include_time = false) %></h3>
		<ul>
8		~~<% for page in @pages_by_day[day] %>~~
	8	<%- for page in @pages_by_day[day] -%>
		<li>
		<%= link_to_existing_page page %>
	11	<%- if page.revisions.size > 1 %>
	12	<span class="views">
	13	( <%= link_to_revision(page, page.revisions.size, text='diff',
	14	mode='diff') %> \| <%= link_to_history(page, text='history') %> )
	15	</span>
	16	<%- end -%>
		<div class="byline" style="margin-bottom: 0px">
		by <%= link_to_page(page.author) %>
		at <%= format_date(page.revised_at) %>
		<%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
		</div>
		</li>
17		~~<% end %>~~
	23	<%- end -%>
		</ul>
19		~~<% end %>~~
	25	<%- end -%>

rool/rails/instiki/trunk/app/views/wiki/revision.rhtml:

prev.	current

1		<%
2		~~@title = "#{@page.plain_name} (Rev ##{@revision_number}#{@show_diff ? ', changes' : ''})"~~
3		%>
	1	<%-
	2	@title = "#{@page.plain_name} (Rev ##{@revision_number}#{@show_diff ? ', changes' : ''})".html_safe
	3	-%>


		<div id="revision">
7		~~<% if @show_diff %>~~
8		~~<p style="background: #eee; padding: 3px; border: 1px solid silver">~~
9		~~<small>~~
	7	<%- if @show_diff -%>
	8	<p class="show_diff">
		Showing changes from revision #<%= @revision_number - 1 %> to #<%= @revision_number %>:
11		~~<ins class="diffins">Added</ins> \| <del class="diffdel">Removed</del>~~
12		~~</small>~~
	10	<ins class="diffins">Added</ins> \| <del class="diffdel">Removed</del> \| <del class="diffmod">Chan</del><ins class="diffmod">ged</ins>
		</p>
		<%= @renderer.display_diff %>
15		~~<% else %>~~
	13	<%- else -%>
		<%= @renderer.display_content %>
17		~~<% end %>~~
18		~~</div>~~
	15	<%- end -%>
	16	</div> <!-- Revision -->

		<div class="byline">
		<%= "Revision from #{format_date(@revision.revised_at)} by" %>
22		~~<%= link_to_page @revision.author %>~~
	20	<%= link_to_page @revision.author.purify %>
		</div>

25		~~<div class="navigation">~~
26		~~<%= navigation_menu_for_revision.join(' \| ') %>~~
	23	<div class="navigation navfoot">
	24	<%= raw navigation_menu_for_revision.join(' \| ') %>
		<%= render :partial => 'inbound_links' %>
		</div>

rool/rails/instiki/trunk/app/views/wiki/rollback.rhtml:

prev.	current

1		<%
2		~~@title = "Rollback to #{@page.plain_name} Rev ##{@revision_number}"~~
	1	<%-
	2	@title = "Rollback to #{@page.plain_name} Rev ##{@revision_number}".html_safe
		@content_width = 720
		@hide_navigation = true
5		%>
	5	-%>

7		~~<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>~~
	7	<div id="MarkupHelp">
	8	<%= render(:file => "#{@web.markup}_help") -%>
	9	<%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>
	10	</div>

9		~~<table border="0" cellspacing="0" cellpadding="0" width="100%">~~
10		~~<tr valign="top">~~
11		~~<td align="left">~~
12		~~<%= form_tag({:web => @web.address, :action => 'save', :id => @page.name},~~
13		~~{:id => 'editForm', :method => 'post', :onSubmit => 'cleanAuthorName();'})~~
14		%>
15		~~<textarea name="content" id="content" cols="48" rows="24"><%= @revision.content %></textarea>~~
	12	<% form_tag({:web => @web.address, :action => 'save', :id => @page.name},
	13	{ :id => 'editForm', :method => 'post', :onsubmit => 'cleanAuthorName();',
	14	'accept-charset' => 'utf-8' }) do %>
	15	<div>
	16	<textarea name="content" id="content" rows="24" cols="60"><%= h(@revision.content.purify) %></textarea>
	17	<div id="editFormButtons">
	18	<input type="submit" value="Update" accesskey="u" /> as
	19	<input type="text" name="author" id="authorName" value="<%= h(@author.purify) %>"
	20	onclick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
	21	\|
	22	<span>
	23	<%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
	24	{:accesskey => 'c'}) %>
	25	<span class="unlock">(unlocks page)</span>
	26	</span>
	27	</div>
	28	</div>
	29	<%- end -%>

17		~~<p>~~
18		~~<input type="submit" value="Update" accesskey="u" /> as~~
19		~~<input type="text" name="author" id="authorName" value="<%= @author %>"~~
20		~~onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />~~
21		\|
22		~~<%= link_to('Cancel',~~
23		~~{:web => @web.address, :action => 'cancel_edit', :id => @page.name},~~
24		~~{:accesskey => 'c'})~~
25		%>
26		~~<small>(unlocks page)</small>~~
27		~~</p>~~
28		~~<%= end_form_tag %>~~
29		~~</td>~~
30		~~<td align="left">~~
31		~~<div id="MarkupHelp">~~
32		~~<%= render("#{@web.markup}_help") if @web %>~~
33		~~<%= render('wiki_words_help') if @web %>~~
34		~~</div>~~
35		~~</td>~~
36		~~</tr>~~
37		~~</table>~~
38
39		~~<script language="JavaScript1.2">~~
	31	<script type="text/javascript">
		function cleanAuthorName() {
		if (document.getElementById('authorName').value == "") {
		document.getElementById('authorName').value = 'AnonymousCoward';

rool/rails/instiki/trunk/app/views/wiki/search.rhtml:

prev.	current

1		~~<% @title = "Search results for \"#{@params["query"]}\"" %>~~
	1	<%- @title = "Search results for \"#{h @query}\"".html_safe -%>

3		~~<% unless @title_results.empty? %>~~
	3	<%- unless @title_results.empty? -%>
		<h2><%= @title_results.length %> page(s) containing search string in the page name:</h2>
		<ul>
6		~~<% for page in @title_results %>~~
	6	<%- for page in @title_results -%>
		<li>
		<%= link_to page.plain_name, :web => @web.address, :action => 'show', :id => page.name %>
		</li>
10		~~<% end %>~~
	10	<%- end -%>
		</ul>
12		~~<% end %>~~
	12	<%- end -%>


15		~~<% unless @results.empty? %>~~
	15	<%- unless @results.empty? -%>
		<h2> <%= @results.length %> page(s) containing search string in the page text:</h2>
		<ul>
18		~~<% for page in @results %>~~
	18	<%- for page in @results -%>
		<li>
		<%= link_to page.plain_name, :web => @web.address, :action => 'show', :id => page.name %>
		</li>
22		~~<% end %>~~
	22	<%- end -%>
		</ul>
24		~~<% end %>~~
	24	<%- end -%>

26		~~<% if (@results + @title_results).empty? %>~~
27		~~<h2>No pages contain "<%= @params["query"] %>" </h2>~~
	26	<%- if (@results + @title_results).empty? -%>
	27	<h2>No pages contain "<%= h @query %>" </h2>
		<p>
		Perhaps you should try expanding your query. Remember that Instiki searches for entire
		phrases, so if you search for "all that jazz" it will not match pages that contain these
31		~~words in separation—only as a sentence fragment.~~
	31	words in separation — only as a sentence fragment.
		</p>
		<p>
		If you're a high-tech computer wizard, you might even want try constructing a Ruby regular
		expression. That's actually what Instiki uses, so go right ahead and flex your
		"[a-z]*Leet?RegExpSkill(s\|z)"
		</p>
38		~~<% end %>~~
	38	<p>
	39	<b>Create a new page, named:</b> "<span class='newWikiWord'><%= link_to h(@query), :web => @web.address, :action => 'new', :id => @query %></span>"
	40	</p>
	41	<%- end -%>

rool/rails/instiki/trunk/app/views/wiki/tex.rhtml:

prev.	current

1		~~\documentclass[12pt,titlepage]{article}~~
2
3		~~\usepackage[danish]{babel} %danske tekster~~
4		~~\usepackage[OT1]{fontenc} %rigtige danske bogstaver...~~
5		~~\usepackage{a4}~~
6		~~\usepackage{graphicx}~~
7		~~\usepackage{ucs}~~
8		~~\usepackage[utf8x]{inputenc}~~
9		~~\input epsf~~
10
11		~~%-------------------------------------------------------------------~~
12
13		~~\begin{document}~~
14
15		~~\sloppy~~
16
17		~~%-------------------------------------------------------------------~~
18
		\section*{<%= @page.name %>}

21		~~<%= @tex_content %>~~
22
23		~~\end{document}~~

	4	<%= @tex_content.html_safe %>

rool/rails/instiki/trunk/app/views/wiki/tex_web.rhtml:

prev.	current

		\documentclass[12pt,titlepage]{article}

3		~~\usepackage{fancyhdr}~~
4		~~\pagestyle{fancy}~~
5
6		~~\fancyhead[LE,RO]{}~~
7		~~\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}~~
8		~~\fancyfoot[C]{\thepage}~~
9
10		~~\usepackage[danish]{babel} %danske tekster~~
11		~~\usepackage{a4}~~
	3	\usepackage{amsmath}
	4	\usepackage{amsfonts}
		\usepackage{graphicx}
		\usepackage{ucs}
14		~~\usepackage[utf8]{inputenc}~~
15		~~\input epsf~~
	7	\usepackage[utf8x]{inputenc}
	8	\usepackage{hyperref}

17
		%-------------------------------------------------------------------

		\title{<%= @web_name %>}
...	...
		\tableofcontents
		\pagebreak

29		~~\sloppy~~
30
		%-------------------------------------------------------------------

		<%= @tex_content %>

35		~~\end{document}~~

	26	\end{document}

rool/rails/instiki/trunk/app/views/wiki/web_list.rhtml:

prev.	current

1		~~<% @title = "Wiki webs" %>~~
	1	<%- @title = "Wiki webs" -%>

		<ul>
4		~~<% @webs.each do \|web\| %>~~
5		~~<li>~~
6		~~<% if web.published %>~~
7		~~<%= link_to_page 'HomePage', web, web.name, :mode => 'publish' %>~~
8		~~(read-only) /~~
9		~~<%= link_to_page 'HomePage', web, 'editable version', :mode => 'show' %> (requires login)~~
10		~~<% else %>~~
11		~~<%= link_to_page 'HomePage', web, web.name, :mode => 'show' %>~~
12		~~<% end %>~~
	4	<%- @webs.each do \|web\| -%>
	5
	6	<li>
	7	<%- if web.password -%>
	8	<div class="web_protected">
	9	<%- else -%>
	10	<div class="web_normal">
	11	<%- end -%>
	12	<%= link_to(web.name, {:web => web.address, :action => 'show', :id => 'HomePage'}) %>
	13	<%- if web.published? -%>
	14	(<%= link_to_page 'HomePage', web, 'published version', :mode => 'publish' %>)
	15	<%- end -%>
	16
		<div class="byline" style="margin-bottom: 0px">
14		~~<%= web.pages.length %> pages by <%= web.authors.length %> authors~~
	18	<%= web.pages.size %> page<% if web.pages.size != 1 %>s<% end %> by <%= web.authors.size %> author<% if web.authors.size != 1 %>s<% end %>
	19	- Last Update: <%= web.last_page.nil? ? format_date(web.created_at) : format_date(web.last_page.revised_at) %><br/>
	20	<%- if ! web.last_page.nil? -%>
	21	Last Document: <%= link_to_page(web.last_page.name,web) %>
	22	<%= web.last_page.revisions? ? "Revised" : "Created" %> by <%= author_link(web.last_page) %> (<%= web.last_page.current_revision.ip %>)
	23	<%- end -%>
		</div>
16		~~</li>~~
17		~~<% end %>~~
	25	</div>
	26	</li>
	27	<%- end -%>
		</ul>

rool/rails/instiki/trunk/app/views/wiki_words_help.rhtml:

prev.	current

1		~~<h3>Links: Wiki words</h3>~~
	1	<h3>Wiki words</h3>
		<p style="border-top: 1px dotted #ccc; margin-top: 0px">
3		~~Two or more uppercase words stuck together (camel case) or any phrase surrounded by double~~
4		~~brackets is a Wiki word. A camel-case wiki word can be escaped by putting \ in front of it.~~
	3	Two or more uppercase words stuck together (camel case) or any phrase surrounded by double
	4	brackets is a wiki word. A camel-case wiki word can be escaped by putting \ in front of it.
		</p>
		<p>
		Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
8		~~Not Wiki words: <i>IBM, School</i>~~
	8	Not wiki words: <i>IBM, School</i>
		</p>

rool/rails/instiki/trunk/config/boot.rb:

prev.	current

1		~~unless defined?(RAILS_ROOT)~~
2		~~root_path = File.join(File.dirname(__FILE__), '..')~~
3		~~unless RUBY_PLATFORM =~ /mswin32/~~
4		~~require 'pathname'~~
5		~~root_path = Pathname.new(root_path).cleanpath.to_s~~
	1	# Don't change this file!
	2	# Configure your app in config/environment.rb and config/environments/*.rb
	3
	4	RAILS_ROOT = File.join(File.dirname(__FILE__), '..') unless defined?(RAILS_ROOT)
	5
	6	module Rails
	7	class << self
	8	def boot!
	9	unless booted?
	10	preinitialize
	11	pick_boot.run
	12	end
	13	end
	14
	15	def booted?
	16	defined? Rails::Initializer
	17	end
	18
	19	def pick_boot
	20	(vendor_rails? ? VendorBoot : GemBoot).new
	21	end
	22
	23	def vendor_rails?
	24	File.exist?(File.join(RAILS_ROOT, 'vendor', 'rails'))
	25	end
	26
	27	def preinitialize
	28	load(preinitializer_path) if File.exist?(preinitializer_path)
	29	end
	30
	31	def preinitializer_path
	32	File.join(RAILS_ROOT, 'config', 'preinitializer.rb')
	33	end
		end
7		~~RAILS_ROOT = root_path~~
	35
	36	class Boot
	37	def run
	38	load_initializer
	39	Rails::Initializer.run(:set_load_path)
	40	end
	41	end
	42
	43	class VendorBoot < Boot
	44	def load_initializer
	45	require File.join(RAILS_ROOT, 'vendor', 'rails', 'railties', 'lib', 'initializer')
	46	Rails::Initializer.run(:install_gem_spec_stubs)
	47	Rails::GemDependency.add_frozen_gem_path
	48	end
	49	end
	50
	51	class GemBoot < Boot
	52	def load_initializer
	53	self.class.load_rubygems
	54	load_rails_gem
	55	require 'initializer'
	56	end
	57
	58	def load_rails_gem
	59	if version = self.class.gem_version
	60	gem 'rails', version
	61	else
	62	gem 'rails'
	63	end
	64	rescue Gem::LoadError => load_error
	65	$stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
	66	exit 1
	67	end
	68
	69	class << self
	70	def rubygems_version
	71	Gem::RubyGemsVersion rescue nil
	72	end
	73
	74	def gem_version
	75	if defined? RAILS_GEM_VERSION
	76	RAILS_GEM_VERSION
	77	elsif ENV.include?('RAILS_GEM_VERSION')
	78	ENV['RAILS_GEM_VERSION']
	79	else
	80	parse_gem_version(read_environment_rb)
	81	end
	82	end
	83
	84	def load_rubygems
	85	min_version = '1.3.6'
	86	require 'rubygems'
	87	unless rubygems_version >= min_version
	88	$stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
	89	exit 1
	90	end
	91
	92	rescue LoadError
	93	$stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
	94	exit 1
	95	end
	96
	97	def parse_gem_version(text)
	98	$1 if text =~ /^[^#]RAILS_GEM_VERSION\s=\s["']([!~<>=]\s*[\d.]+)["']/
	99	end
	100
	101	private
	102	def read_environment_rb
	103	File.read(File.join(RAILS_ROOT, 'config', 'environment.rb'))
	104	end
	105	end
	106	end
		end

10		~~if File.directory?("#{RAILS_ROOT}/vendor/rails")~~
11		~~require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"~~
12		~~else~~
13		~~require 'rubygems'~~
14		~~require 'initializer'~~
	109	class Rails::Boot
	110	def run
	111	load_initializer
	112
	113	Rails::Initializer.class_eval do
	114	def load_gems
	115	@bundler_loaded \|\|= Bundler.require :default, Rails.env
	116	end
	117	end
	118
	119	Rails::Initializer.run(:set_load_path)
	120	end
		end

17		~~Rails::Initializer.run(:set_load_path)~~

	124	# All that for this:
	125	Rails.boot!

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

prev.	current

1		~~# Instiki PostgreSQL database configuration. Syntax taken from~~
2		~~# "http://blog.bleything.net/" (Ben Bleything, June 2006).~~

4		~~dbinfo: &dbinfo~~
5		~~adapter: postgresql~~
6		~~host: /home/adh/postgres/~~
7		~~username: adh~~
8		~~password: set-password-here~~
	2	# "Out of the box", Instiki stores it's data in sqlite3 database. Other options are listed below.
	3
	4	development:
	5	adapter: sqlite3
	6	database: db/development.db.sqlite3
	7
	8	test:
	9	adapter: sqlite3
	10	database: db/test.db.sqlite3
	11
	12	production:
	13	adapter: sqlite3
	14	database: db/production.db.sqlite3

	16	# MySQL (default setup). Versions 4.1 and 5.0 are recommended.
	17	#
	18	# Install the MySQL driver:
	19	# gem install mysql
	20	# On MacOS X:
	21	# gem install mysql -- --include=/usr/local/lib
	22	# On Windows:
	23	# There is no gem for Windows. Install mysql.so from RubyForApache.
	24	# http://rubyforge.org/projects/rubyforapache
	25	#
	26	# And be sure to use new-style password hashing:
	27	# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
	28
	29
	30	# Get the fast C bindings:
	31	# gem install mysql
	32	# (on OS X: gem install mysql -- --include=/usr/local/lib)
	33	# And be sure to use new-style password hashing:
	34	# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
	35
	36	mysql_example:
	37	adapter: mysql
	38	database: instiki_development
	39	username: root
	40	password:
	41	socket: /path/to/your/mysql.sock
	42
	43	# Connect on a TCP socket. If omitted, the adapter will connect on the
	44	# domain socket given by socket instead.
	45	#host: localhost
	46	#port: 3306
	47
		# Warning: The database defined as 'test' will be erased and
		# re-generated from your development database when you run 'rake'.
		# Do not set this db to the same as development or production.
	51	mysql_example:
	52	adapter: mysql
	53	database: instiki_test
	54	username: root
	55	password:
	56	socket: /path/to/your/mysql.sock

14		~~development:~~
15		~~<<: *dbinfo~~
16		~~database: instiki~~
	58	# PostgreSQL versions 7.4 - 8.2
	59	#
	60	# Get the C bindings:
	61	# gem install postgres
	62	# or use the pure-Ruby bindings (the only know way on Windows):
	63	# gem install postgres-pr

18		~~test:~~
19		~~<<: *dbinfo~~
20		~~database: instiki-test~~
	65	postgresql_example:
	66	adapter: postgresql
	67	database: instiki_development
	68	username: instiki
	69	password:

22		~~production:~~
23		~~<<: *dbinfo~~
24		~~database: instiki~~
	71	# Connect on a TCP socket. Omitted by default since the client uses a
	72	# domain socket that doesn't need configuration.
	73	#host: remote-database
	74	#port: 5432

	76	# Schema search path. The server defaults to $user,public
	77	#schema_search_path: myapp,sharedapp,public
	78
	79	# Character set encoding. The server defaults to sql_ascii.
	80	#encoding: UTF8
	81
	82	# Minimum log levels, in increasing order:
	83	# debug5, debug4, debug3, debug2, debug1,
	84	# info, notice, warning, error, log, fatal, or panic
	85	# The server defaults to notice.
	86	#min_messages: warning
	87
	88
	89	# SQLite version 2.x
	90	# gem install sqlite-ruby
	91	sqlite_example:
	92	adapter: sqlite
	93	database: db/development.sqlite2
	94
	95
	96	# SQLite version 3.x
	97	# gem install sqlite3-ruby
	98	sqlite3_example:
	99	adapter: sqlite3
	100	database: db/development.sqlite3
	101
	102	# In-memory SQLite 3 database. Useful for tests.
	103	sqlite3_in_memory_example:
	104	adapter: sqlite3
	105	database: ":memory:"

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

prev.	current

	1	#####
		# Bootstrap the Rails environment, frameworks, and default configuration
	3	####
	4
	5	# Make sure we are using the latest rexml
	6	rexml_versions = ['', File.join(File.dirname(__FILE__), '..', 'vendor', 'plugins', 'rexml', 'lib', '')].collect { \|v\|
	7	`ruby -r "#{v + 'rexml/rexml'}" -e 'p REXML::VERSION'`.split('.').collect {\|n\| n.to_i} }
	8	$:.unshift(File.join(File.dirname(__FILE__), '..', 'vendor', 'plugins', 'rexml', 'lib')) if (rexml_versions[0] <=> rexml_versions[1]) == -1
	9
		require File.join(File.dirname(__FILE__), 'boot')

	12	require 'active_support/secure_random'
	13
		Rails::Initializer.run do \|config\|
5		~~# We don't run in the document root, so images etc. must come from~~
6		~~# a non-root location too. Hijack the 'asset host' facility to get~~
7		~~# helper-based links pointing in the right place.~~
8		~~config.action_controller.asset_host = "/rails/instiki"~~

	16	# Secret session key
	17	# The secret session key is automatically generated, and stored
	18	# in a file, for reuse between server restarts. If you want to
	19	# change the key, just delete the file, and it will be regenerated
	20	# on the next restart. Doing so will invalitate all existing sessions.
	21	secret_file = Rails.root.join("secret")
	22	if File.exist?(secret_file)
	23	secret = secret_file.read
	24	else
	25	secret = ActiveSupport::SecureRandom.hex(64)
	26	File.open(secret_file, 'w', 0600) { \|f\| f.write(secret) }
	27	end
	28	config.action_controller.session = {
	29	:key => "instiki_session",
	30	:secret => secret
	31	}
	32
	33	# Don't do file system STAT calls to check to see if the templates have changed.
	34	#config.action_view.cache_template_loading = true
	35
		# Skip frameworks you're not going to use
		config.frameworks -= [ :action_web_service, :action_mailer ]

13		~~# Force all environments to use the same logger level~~
14		~~# (by default production uses :info, the others :debug)~~
15		~~config.log_level = :warn~~
16
		# Use the database for sessions instead of the file system
		# (create the session table with 'rake create_sessions_table')
19		~~config.action_controller.session_store = :active_record_store~~
	41	#config.action_controller.session_store = :active_record_store

		# Enable page/fragment caching by setting a file-based store
		# (remember to create the caching directory and make it readable to the application)
23		~~# config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"~~
	45	config.cache_store = :file_store, "#{RAILS_ROOT}/cache"

		# Activate observers that should always be running
		config.active_record.observers = :page_observer

		# Use Active Record's schema dumper instead of SQL when creating the test database
		# (enables use of different database adapters for development and test environments)
30		~~config.active_record.schema_format = :ruby~~
	52	config.active_record.schema_format = :sql

32		~~# config.load_paths << "#{RAILS_ROOT}/vendor/sqlite3-ruby"~~
	54	File.umask(0026)
		end

35		~~# Allow multiple Rails applications by giving the session cookie a~~
36		~~# unique prefix.~~
37
38		~~ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:session_key] = 'instikiapp_session_id'~~
39
		# Instiki-specific configuration below
		require_dependency 'instiki_errors'

43		~~OPTIONS = Hash.new;~~
44		~~OPTIONS[:pdflatex] = false;~~
	60	#require 'jcode'

46		~~# Enable UTF-8 support~~
47		~~$KCODE = 'u'~~
48		~~require 'jcode'~~
	62	# Miscellaneous monkey patches (here be dragons ...)
	63	require 'caching_stuff'
	64	require 'logging_stuff'
	65	require 'rack_stuff'
	66
	67	#Additional Mime-types
	68	mime_types = YAML.load_file(File.join(File.dirname(__FILE__), 'mime_types.yml'))
	69	Rack::Mime::MIME_TYPES.merge!(mime_types)

rool/rails/instiki/trunk/config/environments/development.rb:

prev.	current

		# Log error messages when you accidentally call methods on nil.
		config.whiny_nils = true

9		~~# Enable the breakpoint server that script/breakpointer connects to~~
10		~~config.breakpoint_server = true~~
11
		# Show full error reports and disable caching
		config.action_controller.consider_all_requests_local = true
		config.action_controller.perform_caching = false

rool/rails/instiki/trunk/config/environments/production.rb:

prev.	current

		# Use a different logger for distributed setups
		# config.logger = SyslogLogger.new

	8	####
	9	# This rotates the log file, keeping 25 files, of 1MB each.

	11	config.action_controller.logger = Logger.new(Rails.root.join('log', "#{RAILS_ENV}.log"), 25, 1024000)
	12
	13	# Unfortunately, the above does not work well under Mongrel, as the default Ruby logger class
	14	# does no locking and you will have several processes running, each wanting to write to (and
	15	# rotate) the log file. One solution is to have each mongrel instance writes to a different log file:
	16	# http://blog.caboo.se/articles/2006/11/14/configure-mongrel-rails-logger-per-port for a solution.
	17	# Another is to use the default logging behaviour (comment out the above line)
	18	# and use an external program (e.g. logrotate) to rotate the logs.
	19	####
	20
		# Full error reports are disabled and caching is turned on
		config.action_controller.consider_all_requests_local = false
		config.action_controller.perform_caching = true
	24	config.action_view.cache_template_loading = true

		# Enable serving of images, stylesheets, and javascripts from an asset server
		# config.action_controller.asset_host = "http://assets.example.com"

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

prev.	current

		# Create a route to DEFAULT_WEB, if such is specified; also register a generic route
		def connect_to_web(map, generic_path, generic_routing_options)
		if defined? DEFAULT_WEB
4		~~explicit_path = generic_path.gsub(/:web\/?/, '/rails/instiki/')~~
	4	explicit_path = generic_path.gsub(/:web\/?/, '')
		explicit_routing_options = generic_routing_options.merge(:web => DEFAULT_WEB)
		map.connect(explicit_path, explicit_routing_options)
		end
		map.connect(generic_path, generic_routing_options)
		end

	11	# :id's can be arbitrary junk
	12	id_regexp = /.+/
	13
		ActionController::Routing::Routes.draw do \|map\|
12		~~map.connect '/rails/instiki/create_system', :controller => 'admin', :action => 'create_system'~~
13		~~map.connect '/rails/instiki/create_web', :controller => 'admin', :action => 'create_web'~~
14		~~map.connect '/rails/instiki/remove_orphaned_pages', :controller => 'admin', :action => 'remove_orphaned_pages'~~
15		~~map.connect '/rails/instiki/web_list', :controller => 'wiki', :action => 'web_list'~~
	15	map.connect 'create_system', :controller => 'admin', :action => 'create_system'
	16	map.connect 'create_web', :controller => 'admin', :action => 'create_web'
	17	map.connect 'delete_web', :controller => 'admin', :action => 'delete_web'
	18	map.connect 'delete_files', :controller => 'admin', :action => 'delete_files'
	19	map.connect 'web_list', :controller => 'wiki', :action => 'web_list'

17		~~connect_to_web map, '/rails/instiki/:web/edit_web', :controller => 'admin', :action => 'edit_web'~~
18		~~connect_to_web map, '/rails/instiki/:web/files/:id', :controller => 'file', :action => 'file'~~
19		~~connect_to_web map, '/rails/instiki/:web/import/:id', :controller => 'file', :action => 'import'~~
20		~~connect_to_web map, '/rails/instiki/:web/login', :controller => 'wiki', :action => 'login'~~
21		~~connect_to_web map, '/rails/instiki/:web/web_list', :controller => 'wiki', :action => 'web_list'~~
22		~~connect_to_web map, '/rails/instiki/:web/show/diff/:id', :controller => 'wiki', :action => 'show', :mode => 'diff'~~
23		~~connect_to_web map, '/rails/instiki/:web/revision/diff/:id', :controller => 'wiki', :action => 'revision', :mode => 'diff'~~
24		~~connect_to_web map, '/rails/instiki/:web/:action/:id', :controller => 'wiki'~~
25		~~connect_to_web map, '/rails/instiki/:web/:action', :controller => 'wiki'~~
26		~~connect_to_web map, '/rails/instiki/:web', :controller => 'wiki', :action => 'index'~~
	21	connect_to_web map, ':web/edit_web', :controller => 'admin', :action => 'edit_web'
	22	connect_to_web map, ':web/remove_orphaned_pages', :controller => 'admin', :action => 'remove_orphaned_pages'
	23	connect_to_web map, ':web/remove_orphaned_pages_in_category', :controller => 'admin', :action => 'remove_orphaned_pages_in_category'
	24	connect_to_web map, ':web/file/delete/:id', :controller => 'file', :action => 'delete', :requirements => {:id => /[-._\w]+/}, :id => nil
	25	connect_to_web map, ':web/files/pngs/:id', :controller => 'file', :action => 'blahtex_png', :requirements => {:id => /[-._\w]+/}, :id => nil
	26	connect_to_web map, ':web/files/:id', :controller => 'file', :action => 'file', :requirements => {:id => /[-._\w]+/}, :id => nil
	27	connect_to_web map, ':web/file_list/:sort_order', :controller => 'wiki', :action => 'file_list', :sort_order => nil
	28	connect_to_web map, ':web/import/:id', :controller => 'file', :action => 'import'
	29	connect_to_web map, ':web/login', :controller => 'wiki', :action => 'login'
	30	connect_to_web map, ':web/web_list', :controller => 'wiki', :action => 'web_list'
	31	connect_to_web map, ':web/show/diff/:id', :controller => 'wiki', :action => 'show', :mode => 'diff', :requirements => {:id => id_regexp}
	32	connect_to_web map, ':web/revision/diff/:id/:rev', :controller => 'wiki', :action => 'revision', :mode => 'diff',
	33	:requirements => { :rev => /\d+/, :id => id_regexp}
	34	connect_to_web map, ':web/revision/:id/:rev', :controller => 'wiki', :action => 'revision', :requirements => { :rev => /\d+/, :id => id_regexp}
	35	connect_to_web map, ':web/list/:category', :controller => 'wiki', :action => 'list', :requirements => { :category => /.*/}, :category => nil
	36	connect_to_web map, ':web/recently_revised/:category', :controller => 'wiki', :action => 'recently_revised', :requirements => { :category => /.*/}, :category => nil
	37	connect_to_web map, ':web/:action/:id', :controller => 'wiki', :requirements => {:id => id_regexp}
	38	connect_to_web map, ':web/:action', :controller => 'wiki'
	39	connect_to_web map, ':web', :controller => 'wiki', :action => 'index'

		if defined? DEFAULT_WEB
29		~~map.connect '/rails/instiki/', :controller => 'wiki', :web => DEFAULT_WEB, :action => 'index'~~
	42	map.connect '', :controller => 'wiki', :web => DEFAULT_WEB, :action => 'index'
		else
31		~~map.connect '/rails/instiki/', :controller => 'wiki', :action => 'index'~~
	44	map.connect '', :controller => 'wiki', :action => 'index'
		end
		end

rool/rails/instiki/trunk/db/migrate/001_beta1_schema.rb:

prev.	current

		t.column "name", :string, :limit => 60
		t.column "locked_at", :datetime
		end
11
	11
		create_table "revisions", :force => true do \|t\|
		t.column "created_at", :datetime, :null => false
		t.column "updated_at", :datetime, :null => false
		t.column "revised_at", :datetime, :null => false
		t.column "page_id", :integer, :default => 0, :null => false
17		~~t.column "content", :text, :default => "", :null => false~~
	17	t.column "content", :text
		t.column "author", :string, :limit => 60
		t.column "ip", :string, :limit => 60
		end
21
	21
		create_table "system", :force => true do \|t\|
		t.column "password", :string, :limit => 60
		end
25
	25
		create_table "webs", :force => true do \|t\|
		t.column "created_at", :datetime, :null => false
		t.column "updated_at", :datetime, :null => false
...	...
		t.column "allow_uploads", :integer, :default => 1
		t.column "published", :integer, :default => 0
		t.column "count_pages", :integer, :default => 0
36		~~t.column "markup", :string, :limit => 50, :default => "textile"~~
	36	t.column "markup", :string, :limit => 50, :default => "markdownMML"
		t.column "color", :string, :limit => 6, :default => "008B26"
		t.column "max_upload_size", :integer, :default => 100
		t.column "safe_mode", :integer, :default => 0
		t.column "brackets_only", :integer, :default => 0
		end
42
	42
		create_table "wiki_references", :force => true do \|t\|
		t.column "created_at", :datetime, :null => false
		t.column "updated_at", :datetime, :null => false

rool/rails/instiki/trunk/db/production.db.sqlite3:

rool/rails/instiki/trunk/db/schema.rb:

prev.	current

1		~~# This file is autogenerated. Instead of editing this file, please use the~~
2		~~# migrations feature of ActiveRecord to incrementally modify your database, and~~
	1	# This file is auto-generated from the current state of the database. Instead of editing this file,
	2	# please use the migrations feature of Active Record to incrementally modify your database, and
		# then regenerate this schema definition.
	4	#
	5	# Note that this schema.rb definition is the authoritative source for your database schema. If you need
	6	# to create the application database on another system, you should be using db:schema:load, not running
	7	# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
	8	# you'll amass, the slower it'll run and the greater likelihood for issues).
	9	#
	10	# It's strongly recommended to check this file into your version control system.

5		~~ActiveRecord::Schema.define(:version => 2) do~~
	12	ActiveRecord::Schema.define(:version => 20100101192755) do

		create_table "pages", :force => true do \|t\|
8		~~t.column "created_at", :datetime, :null => false~~
9		~~t.column "updated_at", :datetime, :null => false~~
10		~~t.column "web_id", :integer, :default => 0, :null => false~~
11		~~t.column "locked_by", :string, :limit => 60~~
12		~~t.column "name", :string, :limit => 60~~
13		~~t.column "locked_at", :datetime~~
	15	t.datetime "created_at", :null => false
	16	t.datetime "updated_at", :null => false
	17	t.integer "web_id", :default => 0, :null => false
	18	t.string "locked_by", :limit => 60
	19	t.string "name"
	20	t.datetime "locked_at"
		end

		create_table "revisions", :force => true do \|t\|
17		~~t.column "created_at", :datetime, :null => false~~
18		~~t.column "updated_at", :datetime, :null => false~~
19		~~t.column "revised_at", :datetime, :null => false~~
20		~~t.column "page_id", :integer, :default => 0, :null => false~~
21		~~t.column "content", :text, :default => "", :null => false~~
22		~~t.column "author", :string, :limit => 60~~
23		~~t.column "ip", :string, :limit => 60~~
	24	t.datetime "created_at", :null => false
	25	t.datetime "updated_at", :null => false
	26	t.datetime "revised_at", :null => false
	27	t.integer "page_id", :default => 0, :null => false
	28	t.text "content", :limit => 16777215, :default => "", :null => false
	29	t.string "author", :limit => 60
	30	t.string "ip", :limit => 60
		end

26		~~add_index "revisions", ["author"], :name => "revisions_author_index"~~
27		~~add_index "revisions", ["created_at"], :name => "revisions_created_at_index"~~
28		~~add_index "revisions", ["page_id"], :name => "revisions_page_id_index"~~
	33	add_index "revisions", ["author"], :name => "index_revisions_on_author"
	34	add_index "revisions", ["created_at"], :name => "index_revisions_on_created_at"
	35	add_index "revisions", ["page_id"], :name => "index_revisions_on_page_id"

		create_table "sessions", :force => true do \|t\|
31		~~t.column "session_id", :string~~
32		~~t.column "data", :text~~
33		~~t.column "updated_at", :datetime~~
	38	t.string "session_id"
	39	t.text "data"
	40	t.datetime "updated_at"
		end

36		~~add_index "sessions", ["session_id"], :name => "sessions_session_id_index"~~
	43	add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"

		create_table "system", :force => true do \|t\|
39		~~t.column "password", :string, :limit => 60~~
	46	t.string "password", :limit => 60
		end

		create_table "webs", :force => true do \|t\|
43		~~t.column "created_at", :datetime, :null => false~~
44		~~t.column "updated_at", :datetime, :null => false~~
45		~~t.column "name", :string, :limit => 60, :default => "", :null => false~~
46		~~t.column "address", :string, :limit => 60, :default => "", :null => false~~
47		~~t.column "password", :string, :limit => 60~~
48		~~t.column "additional_style", :string~~
49		~~t.column "allow_uploads", :integer, :default => 1~~
50		~~t.column "published", :integer, :default => 0~~
51		~~t.column "count_pages", :integer, :default => 0~~
52		~~t.column "markup", :string, :limit => 50, :default => "textile"~~
53		~~t.column "color", :string, :limit => 6, :default => "008B26"~~
54		~~t.column "max_upload_size", :integer, :default => 100~~
55		~~t.column "safe_mode", :integer, :default => 0~~
56		~~t.column "brackets_only", :integer, :default => 0~~
	50	t.datetime "created_at", :null => false
	51	t.datetime "updated_at", :null => false
	52	t.string "name", :limit => 60, :default => "", :null => false
	53	t.string "address", :limit => 60, :default => "", :null => false
	54	t.string "password", :limit => 60
	55	t.text "additional_style", :limit => 255
	56	t.integer "allow_uploads", :default => 1
	57	t.integer "published", :default => 0
	58	t.integer "count_pages", :default => 0
	59	t.string "markup", :limit => 50, :default => "markdownMML"
	60	t.string "color", :limit => 6, :default => "008B26"
	61	t.integer "max_upload_size", :default => 100
	62	t.integer "safe_mode", :default => 0
	63	t.integer "brackets_only", :default => 0
		end

		create_table "wiki_files", :force => true do \|t\|
60		~~t.column "created_at", :datetime, :null => false~~
61		~~t.column "updated_at", :datetime, :null => false~~
62		~~t.column "web_id", :integer, :null => false~~
63		~~t.column "file_name", :string, :null => false~~
64		~~t.column "description", :string, :null => false~~
	67	t.datetime "created_at", :null => false
	68	t.datetime "updated_at", :null => false
	69	t.integer "web_id", :null => false
	70	t.string "file_name", :null => false
	71	t.string "description", :null => false
		end

		create_table "wiki_references", :force => true do \|t\|
68		~~t.column "created_at", :datetime, :null => false~~
69		~~t.column "updated_at", :datetime, :null => false~~
70		~~t.column "page_id", :integer, :default => 0, :null => false~~
71		~~t.column "referenced_name", :string, :limit => 60, :default => "", :null => false~~
72		~~t.column "link_type", :string, :limit => 1, :default => "", :null => false~~
	75	t.datetime "created_at", :null => false
	76	t.datetime "updated_at", :null => false
	77	t.integer "page_id", :default => 0, :null => false
	78	t.string "referenced_name", :default => "", :null => false
	79	t.string "link_type", :limit => 1, :default => "", :null => false
		end

75		~~add_index "wiki_references", ["page_id"], :name => "wiki_references_page_id_index"~~
76		~~add_index "wiki_references", ["referenced_name"], :name => "wiki_references_referenced_name_index"~~
	82	add_index "wiki_references", ["page_id"], :name => "index_wiki_references_on_page_id"
	83	add_index "wiki_references", ["referenced_name"], :name => "index_wiki_references_on_referenced_name"

		end

rool/rails/instiki/trunk/lib/chunks/category.rb:

prev.	current

		require 'chunks/chunk'
	2	require 'instiki_stringsupport'

		# The category chunk looks for "category: news" on a line by
		# itself and parses the terms after the ':' as categories.
...	...
		#
		# Category lines can be hidden using ':category: news', for example
		class Category < Chunk::Abstract
	12
		CATEGORY_PATTERN = /^(:)?category\s:(.)$/i
		def self.pattern() CATEGORY_PATTERN end

...	...

		def initialize(match_data, content)
		super(match_data, content)
	20	@content = content
		@hidden = match_data[1]
19		~~@list = match_data[2].split(',').map { \|c\| c.strip }~~
	22	@list = match_data[2].split(',').map { \|c\| clean = c.purify.strip.escapeHTML; clean if clean != ''}
	23	@list.compact!
		@unmask_text = ''
		if @hidden
		@unmask_text = ''
...	...

		# TODO move presentation of page metadata to controller/view
		def url(category)
31		~~%{<a class="category_link" href="../list/?category=#{category}">#{category}</a>}~~
	35	%{<a class="category_link" href="#{@content.url_generator.url_for :web => @content.web.address,
	36	:action => 'list', :only_path => true}/#{CGI.escape(category)}">#{category}</a>}
		end
		end

rool/rails/instiki/trunk/lib/chunks/chunk.rb:

prev.	current

1		~~require 'uri/common'~~
	1	#require 'uri/common'

		# A chunk is a pattern of text that can be protected
		# and interrogated by a renderer. Each Chunk class has a
...	...
		module Chunk
		class Abstract

	12	# Rails's default utf-8 support causes problems here. So, for Chunk::Abstract class, turn off
	13	# multibyte character support.
	14	$KCODE = 'n' unless ''.respond_to?(:force_encoding)
	15
		# automatically construct the array of derivatives of Chunk::Abstract
		@derivatives = []

...	...
		end

		def unmask
60		~~@content.sub!(mask, @unmask_text)~~
	64	@content.sub!(mask){\|s\| s.replace @unmask_text}
		end

		def rendered?
...	...
		end

		def revert
72		~~@content.sub!(mask, @text)~~
	76	@content.sub!(mask){\|s\| s.replace @text}
		# unregister
		@content.delete_chunk(self)
		end

rool/rails/instiki/trunk/lib/chunks/engines.rb:

prev.	current

		$: << File.dirname(__FILE__) + "../../lib"

		require_dependency 'chunks/chunk'
	4	require 'instiki_stringsupport'
	5	require 'maruku'
	6	require 'maruku/ext/math'
	7	require_dependency 'rdocsupport'
	8	require 'redcloth'

		# The markup engines are Chunks that call the one of RedCloth
		# or RDoc to convert text. This markup occurs when the chunk is required
...	...

		class Textile < AbstractEngine
		def mask
28		~~require_dependency 'redcloth'~~
29
30		~~# 2006-08-04 (ADH): Hacks to work around RedCloth 3.0.4~~
31		~~# appearing to malfunction - filter_html doesn't work (though~~
32		~~# Instiki had it turned off anyway) and hard_breaks really~~
33		~~# breaks things badly.~~
34
35		~~# Was: redcloth = RedCloth.new(@content, [:hard_breaks] + @content.options[:engine_opts])~~
36
37		~~redcloth = RedCloth.new(@content.to_s.gsub(/</, '<').gsub(/>/, '>'), @content.options[:engine_opts])~~
38		~~redcloth.hard_breaks = false~~
39
	33	@content.as_utf8
	34	redcloth = RedCloth.new(@content, [:hard_breaks] + @content.options[:engine_opts])
		redcloth.filter_html = false
		redcloth.no_span_caps = false
42		~~redcloth.to_html(:textile)~~
	37	html = redcloth.to_html(:textile)
		end
		end

		class Markdown < AbstractEngine
		def mask
48		~~require_dependency 'bluecloth_tweaked'~~
49		~~BlueCloth.new(@content, @content.options[:engine_opts]).to_html~~
	43	@content.as_utf8
	44	# If the request is for S5, call Maruku accordingly (without math)
	45	if @content.options[:mode] == :s5
	46	my_content = Maruku.new(@content.delete("\r").to_utf8,
	47	{:math_enabled => false, :content_only => true,
	48	:author => @content.options[:engine_opts][:author],
	49	:title => @content.options[:engine_opts][:title]})
	50	@content.options[:renderer].s5_theme = my_content.s5_theme
	51	else
	52	html = Maruku.new(@content.delete("\r").to_utf8, {:math_enabled => false}).to_html
	53	html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
	54	end
	55
		end
		end

	59	class MarkdownMML < AbstractEngine
	60	def mask
	61	@content.as_utf8
	62	# If the request is for S5, call Maruku accordingly
	63	if @content.options[:mode] == :s5
	64	my_content = Maruku.new(@content.delete("\r").to_utf8,
	65	{:math_enabled => true,
	66	:math_numbered => ['\\[','\\begin{equation}'],
	67	:content_only => true,
	68	:author => @content.options[:engine_opts][:author],
	69	:title => @content.options[:engine_opts][:title]})
	70	@content.options[:renderer].s5_theme = my_content.s5_theme
	71	my_content.to_s5
	72	else
	73	html = Maruku.new(@content.delete("\r").to_utf8,
	74	{:math_enabled => true,
	75	:math_numbered => ['\\[','\\begin{equation}']}).to_html
	76	html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
	77	end
	78	end
	79	end
	80
	81	class MarkdownPNG < AbstractEngine
	82	def mask
	83	@content.as_utf8
	84	# If the request is for S5, call Maruku accordingly
	85	if @content.options[:mode] == :s5
	86	my_content = Maruku.new(@content.delete("\r").to_utf8,
	87	{:math_enabled => true,
	88	:math_numbered => ['\\[','\\begin{equation}'],
	89	:html_math_output_mathml => false,
	90	:html_math_output_png => true,
	91	:html_png_engine => 'blahtex',
	92	:html_png_dir => @content.web.files_path.join('pngs').to_s,
	93	:html_png_url => @content.options[:png_url],
	94	:content_only => true,
	95	:author => @content.options[:engine_opts][:author],
	96	:title => @content.options[:engine_opts][:title]})
	97	@content.options[:renderer].s5_theme = my_content.s5_theme
	98	my_content.to_s5
	99	else
	100	html = Maruku.new(@content.delete("\r").to_utf8,
	101	{:math_enabled => true,
	102	:math_numbered => ['\\[','\\begin{equation}'],
	103	:html_math_output_mathml => false,
	104	:html_math_output_png => true,
	105	:html_png_engine => 'blahtex',
	106	:html_png_dir => @content.web.files_path.join('pngs').to_s,
	107	:html_png_url => @content.options[:png_url]}).to_html
	108	html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
	109	end
	110	end
	111	end
	112
		class Mixed < AbstractEngine
		def mask
55		~~require_dependency 'redcloth'~~
	115	@content.as_utf8
		redcloth = RedCloth.new(@content, @content.options[:engine_opts])
		redcloth.filter_html = false
		redcloth.no_span_caps = false
59		~~redcloth.to_html~~
	119	html = redcloth.to_html
		end
		end

		class RDoc < AbstractEngine
		def mask
65		~~require_dependency 'rdocsupport'~~
66		~~RDocSupport::RDocFormatter.new(@content).to_html~~
	125	@content.as_utf8
	126	html = RDocSupport::RDocFormatter.new(@content).to_html
		end
		end

70		~~MAP = { :textile => Textile, :markdown => Markdown, :mixed => Mixed, :rdoc => RDoc }~~
71		~~MAP.default = Textile~~
	130	MAP = { :textile => Textile, :markdown => Markdown, :markdownMML => MarkdownMML, :markdownPNG => MarkdownPNG, :mixed => Mixed, :rdoc => RDoc }
	131	MAP.default = MarkdownMML
		end

rool/rails/instiki/trunk/lib/chunks/include.rb:

prev.	current


		class Include < WikiChunk::WikiReference

12		~~INCLUDE_PATTERN = /\[\[!include\s+(.?)\]\]\s/i~~
	12	INCLUDE_PATTERN = /\[\[!include\s+([^\]\s][^\]]?)\s\]\]/i
		def self.pattern() INCLUDE_PATTERN end

		def initialize(match_data, content)
		super
		@page_name = match_data[1].strip
18		~~@unmask_text = get_unmask_text_avoiding_recursion_loops~~
	18	rendering_mode = content.options[:mode] \|\| :show
	19	add_to_include_list
	20	@unmask_text = get_unmask_text_avoiding_recursion_loops(rendering_mode)
		end

		private

23		~~def get_unmask_text_avoiding_recursion_loops~~
	25	def get_unmask_text_avoiding_recursion_loops(rendering_mode)
		if refpage
25		~~# TODO This way of instantiating a renderer is ugly.~~
	27	return "<em>Recursive include detected: #{@content.page_name} " +
	28	"→ #{@content.page_name}</em>\n" if self_inclusion(refpage)
		renderer = PageRenderer.new(refpage.current_revision)
27		~~if renderer.wiki_includes.include?(@content.page_name)~~
28		~~# this will break the recursion~~
29		~~@content.delete_chunk(self)~~
30		~~return "<em>Recursive include detected; #{@page_name} --> #{@content.page_name} " +~~
31		~~"--> #{@page_name}</em>\n"~~
32		~~else~~
33		~~included_content = renderer.display_content~~
34		~~@content.merge_chunks(included_content)~~
35		~~return included_content.pre_rendered~~
36		~~end~~
	30	included_content =
	31	case rendering_mode
	32	when :show then renderer.display_content
	33	when :publish then renderer.display_published
	34	when :export then renderer.display_content_for_export
	35	when :s5 then renderer.display_s5
	36	else
	37	raise "Unsupported rendering mode #{@mode.inspect}"
	38	end
	39	@content.merge_chunks(included_content)
	40	clear_include_list
	41	return included_content.pre_rendered
		else
	43	clear_include_list
		return "<em>Could not include #{@page_name}</em>\n"
		end
		end
	47
	48	# We track included pages in a thread-local variable.
	49	# This allows a multi-threaded Rails to handle multiple
	50	# simultaneous requests (one request/thread), without
	51	# getting confused.
	52
	53	def add_to_include_list
	54	Thread.current[:chunk_included_by] ?
	55	Thread.current[:chunk_included_by].push(@content.page_name) :
	56	Thread.current[:chunk_included_by] = [@content.page_name]
	57	end

	59	def clear_include_list
	60	Thread.current[:chunk_included_by] = []
	61	end
	62
	63	def self_inclusion(refpage)
	64	if Thread.current[:chunk_included_by].include?(refpage.page.name)
	65	@content.delete_chunk(self)
	66	clear_include_list
	67	else
	68	return false
	69	end
	70	end
	71
		end

rool/rails/instiki/trunk/lib/chunks/literal.rb:

prev.	current


		# A literal chunk that protects 'code' and 'pre' tags from wiki rendering.
		class Pre < AbstractLiteral
20		~~PRE_BLOCKS = "a\|pre\|code"~~
	20	PRE_BLOCKS = "a\|pre\|code\|math"
		PRE_PATTERN = Regexp.new('<('+PRE_BLOCKS+')\b[^>]?>.?</\1>', Regexp::MULTILINE)
		def self.pattern() PRE_PATTERN end
		end

		# A literal chunk that protects HTML tags from wiki rendering.
		class Tags < AbstractLiteral
27		~~TAGS = "a\|img\|em\|strong\|div\|span\|table\|td\|th\|ul\|ol\|li\|dl\|dt\|dd"~~
28		~~TAGS_PATTERN = Regexp.new('<(?:'+TAGS+')[^>]*?>', Regexp::MULTILINE)~~
	27	TAGS_PATTERN = Regexp.new('</?[-a-zA-Z:]+\b[^>]*?>', Regexp::MULTILINE)
		def self.pattern() TAGS_PATTERN end
		end
	30
	31	# A literal chunk that protects equations from wiki rendering.
	32	class Math < AbstractLiteral
	33	MATH_START = '(\${1,2}\|' + Regexp.escape('\[') + '\|\\begin\{equation\})'
	34	MATH_END = '(\${1,2}\|' + Regexp.escape('\]') + '\|\\end\{equation\})'
	35	MATH_PATTERN = Regexp.new(MATH_START + '([^$]\|\\\$)+?' + MATH_END, Regexp::MULTILINE)
	36	def self.pattern() MATH_PATTERN end
	37	end
	38
		end

rool/rails/instiki/trunk/lib/chunks/nowiki.rb:

prev.	current

		require 'chunks/chunk'
	2	require 'sanitizer'

		# This chunks allows certain parts of a wiki page to be hidden from the
		# rest of the rendering pipeline. It should be run at the beginning
...	...
		#
		# Author: Mark Reid <mark at threewordslong dot com>
		# Created: 8th June 2004
	17
		class NoWiki < Chunk::Abstract

	20	include Sanitizer
	21
		NOWIKI_PATTERN = Regexp.new('<nowiki>(.*?)</nowiki>', Regexp::MULTILINE)
		def self.pattern() NOWIKI_PATTERN end

...	...

		def initialize(match_data, content)
		super
25		~~@plain_text = @unmask_text = match_data[1]~~
	29	@plain_text = @unmask_text = safe_xhtml_sanitize(match_data[1])
		end

		end

rool/rails/instiki/trunk/lib/chunks/uri.rb:

prev.	current

		SUSPICIOUS_PRECEDING_CHARACTER = '(!\|\"\:\|\"\|\\\'\|\]\()?' # any of !, ":, ", ', ](

		INTERNET_URI_REGEXP =
77		~~Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED, 'N')~~
	77	# Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED, 'N')
	78	Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED)

		end

...	...
		'(?=\.?(?:\s\|\)\|\z))' # ends only with optional dot + space or ")"
		# or end of the string

175		~~LOCAL_URI_REGEXP = Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + LOCAL_URI, Regexp::EXTENDED, 'N')~~
	176	# LOCAL_URI_REGEXP = Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + LOCAL_URI, Regexp::EXTENDED, 'N')
	177	LOCAL_URI_REGEXP = Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + LOCAL_URI, Regexp::EXTENDED)
		end

		def LocalURIChunk.pattern

rool/rails/instiki/trunk/lib/chunks/wiki.rb:

prev.	current

1		~~require 'wiki_words'~~
		require 'chunks/chunk'
3		~~require 'chunks/wiki'~~
4		~~require 'cgi'~~
	2	require 'instiki_stringsupport'

		# Contains all the methods for finding and replacing wiki related links.
		module WikiChunk
...	...

		# Name of the referenced page
		attr_reader :page_name
16
	14
	15	# Name of the referenced page
	16	attr_reader :web_name
	17
		# the referenced page
		def refpage
		@content.web.page(@page_name)
		end
21
	22
		end

		# A wiki link is the top-level class for links that refers to
		# another wiki page.
		class WikiLink < WikiReference
27
	28
		attr_reader :link_text, :link_type

		def initialize(match_data, content)
...	...
		end

		def self.apply_to(content)
36		~~content.gsub!( self.pattern ) do \|matched_text\|~~
	37	content.as_utf8.gsub!( self.pattern ) do \|matched_text\|
		chunk = self.new($~, content)
		if chunk.textile_url?
		# do not substitute
...	...
		not @textile_link_suffix.nil?
		end

	53	def interweb_link?
	54	not @web_name.nil? and Web.find_by_name(@web_name) or
	55	Web.find_by_address(@web_name)
	56	end
	57
		# replace any sequence of whitespace characters with a single space
		def normalize_whitespace(line)
		line.gsub(/\s+/, ' ')
		end
56
	62
		end

		# This chunk matches a WikiWord. WikiWords can be escaped
...	...
		class Word < WikiLink

		attr_reader :escaped_text
66
	72
		unless defined? WIKI_WORD
68		~~WIKI_WORD = Regexp.new('(":)?(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')\b', 0, "utf-8")~~
	74	WIKI_WORD = ''.respond_to?(:force_encoding) ?
	75	Regexp.new('(":)?(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')\b', 0) :
	76	Regexp.new('(":)?(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')\b', 0, 'u')
		end

		def self.pattern
...	...
		def initialize(match_data, content)
		super
		@textile_link_suffix, @escape, @page_name = match_data[1..3]
78		~~if @escape~~
	86	if @escape
		@unmask_mode = :escape
		@escaped_text = @page_name
		else
		@escaped_text = nil
		end
		@link_text = WikiWords.separate(@page_name)
85		~~@unmask_text = (@escaped_text \|\| @content.page_link(@page_name, @link_text, @link_type))~~
	93	@unmask_text = (@escaped_text \|\| @content.page_link(@web_name, @page_name, @link_text, @link_type))
		end

		end

90		~~# This chunk handles [[bracketted wiki words]] and~~
	98	# This chunk handles [[bracketted wiki words]] and
		# [[AliasedWords\|aliased wiki words]]. The first part of an
		# aliased wiki word must be a WikiWord. If the WikiWord
		# is aliased, the +link_text+ field will contain the
...	...
		# contents within the double brackets.
		#
		# NOTE: This chunk must be tested before WikiWord since
98		~~# a WikiWords can be a substring of a WikiLink.~~
	106	# a WikiWords can be a substring of a WikiLink.
		class Link < WikiLink
100
	108
		unless defined? WIKI_LINK
102		~~WIKI_LINK = /(":)?\[\[\s([^\]\s][^\]]+?)\s\]\]/~~
103		~~LINK_TYPE_SEPARATION = Regexp.new('^(.+):((file)\|(pic))$', 0, 'utf-8')~~
104		~~ALIAS_SEPARATION = Regexp.new('^(.+)\\|(.+)$', 0, 'utf-8')~~
105		~~end~~
106
	110	WIKI_LINK = /(":)?\[\[\s([^\]\s][^\]]?)\s*\]\]/
	111	LINK_TYPE_SEPARATION = Regexp.new('^(.+):((file)\|(pic)\|(video)\|(audio)\|(delete))$', 0)
	112	ALIAS_SEPARATION = Regexp.new('^(.+)\\|(.+)$', 0)
	113	WEB_SEPARATION = Regexp.new('^(.+):(.+)$', 0)
	114	end
	115
		def self.pattern() WIKI_LINK end

		def initialize(match_data, content)
...	...
		@link_text = @page_name = normalize_whitespace(match_data[2])
		separate_link_type
		separate_alias
115		~~@unmask_text = @content.page_link(@page_name, @link_text, @link_type)~~
	124	separate_web
	125	@unmask_text = @content.page_link(@web_name, @page_name, @link_text, @link_type)
		end

		private

120		~~# if link wihin the brackets has a form of [[filename:file]] or [[filename:pic]],~~
	130	# if link wihin the brackets has a form of [[filename:file]] or [[filename:pic]],
		# this means a link to a picture or a file
		def separate_link_type
		link_type_match = LINK_TYPE_SEPARATION.match(@page_name)
...	...
		@link_text = alias_match[2]
		end
		# note that [[filename\|link text:file]] is also supported
138		~~end~~
139
	148	end
	149
	150	# Interweb links have the form [[Web Name:Page Name]] or
	151	# [[address:PageName]]. Alternate text links of the form
	152	# [[address:PageName\|Other text]] are also supported.
	153	def separate_web
	154	web_match = WEB_SEPARATION.match(@page_name)
	155	if web_match
	156	@web_name = normalize_whitespace(web_match[1])
	157	@page_name = web_match[2]
	158	@link_text = @page_name if @link_text == web_match[0]
	159	end
	160	end
	161
		end

142
		end

rool/rails/instiki/trunk/lib/page_renderer.rb:

prev.	current

1		~~require 'diff'~~
	1	require 'xhtmldiff'
	2
		# Temporary class containing all rendering stuff from a Revision
		# I want to shift all rendering loguc to the controller eventually

		class PageRenderer

7		~~include HTMLDiff~~
8
		def self.setup_url_generator(url_generator)
		@@url_generator = url_generator
		end
...	...
		def display_diff
		previous_revision = @revision.page.previous_revision(@revision)
		if previous_revision
44		~~rendered_previous_revision = WikiContent.new(previous_revision, @@url_generator).render!~~
45		~~diff(rendered_previous_revision, display_content)~~
	43
	44	previous_content = "<div>" + WikiContent.new(previous_revision, @@url_generator).render!.to_s + "</div>"
	45	current_content = "<div>" + display_content.to_s + "</div>"
	46	diff_doc = REXML::Document.new
	47	div = REXML::Element.new('div', nil, {:respect_whitespace =>:all})
	48	div.attributes['class'] = 'xhtmldiff_wrapper'
	49	diff_doc << div
	50	hd = XHTMLDiff.new(div)
	51
	52	parsed_previous_revision = REXML::HashableElementDelegator.new(
	53	REXML::XPath.first(REXML::Document.new(previous_content), '/div'))
	54	parsed_display_content = REXML::HashableElementDelegator.new(
	55	REXML::XPath.first(REXML::Document.new(current_content), '/div'))
	56	Diff::LCS.traverse_balanced(parsed_previous_revision, parsed_display_content, hd)
	57
	58	diffs = ''
	59	diff_doc.write(diffs, -1, true, true)
	60	diffs.gsub(/\A<div class='xhtmldiff_wrapper'>(.*)<\/div>\Z/m, '\1').html_safe
		else
		display_content
		end
		end

	66	attr :s5_theme
	67	def s5_theme=(s)
	68	@s5_theme = s
	69	end
	70
	71	# Renders an S5 slideshow
	72	def display_s5
	73	@display_s5 \|\|= render(:mode => :s5,
	74	:engine_opts => {:author => @author, :title => @plain_name},
	75	:renderer => self)
	76	end
	77
		# Returns an array of all the WikiIncludes present in the content of this revision.
		def wiki_includes
		unless @wiki_includes_cache
...	...
		def wiki_words
		@wiki_words_cache \|\|= find_wiki_words(display_content)
		end
73
	100
		def find_wiki_words(rendering_result)
75		~~wiki_links = rendering_result.find_chunks(WikiChunk::WikiLink)~~
	102	the_wiki_words = wiki_links(rendering_result)
		# Exclude backslash-escaped wiki words, such as \WikiWord, as well as links to files
		# and pictures, such as [[foo.txt:file]] or [[foo.jpg:pic]]
78		~~wiki_links.delete_if { \|link\| link.escaped? or [:pic, :file].include?(link.link_type) }~~
	105	the_wiki_words.delete_if { \|link\| link.escaped? or [:pic, :file, :audio, :video, :delete].include?(link.link_type) }
		# convert to the list of unique page names
80		~~wiki_links.map { \|link\| ( link.page_name ) }.uniq~~
	107	the_wiki_words.map { \|link\| ( link.page_name ) }.uniq
		end

		# Returns an array of all the WikiWords present in the content of this revision.
	111	def wiki_files
	112	@wiki_files_cache \|\|= find_wiki_files(display_content)
	113	end
	114
	115	def find_wiki_files(rendering_result)
	116	the_wiki_files = wiki_links(rendering_result)
	117	the_wiki_files.delete_if { \|link\| ![:pic, :file, :audio, :video].include?(link.link_type) }
	118	the_wiki_files.map { \|link\| ( link.page_name ) }.uniq
	119	end
	120
	121	def wiki_links(rendering_result)
	122	rendering_result.find_chunks(WikiChunk::WikiLink)
	123	end
	124
	125	# Returns an array of all the WikiWords present in the content of this revision.
		# that already exists as a page in the web.
		def existing_pages
		wiki_words.select { \|wiki_word\| @revision.page.web.page(wiki_word) }
...	...
		else
		link_type = WikiReference.link_type(@revision.page.web, referenced_name)
		end
119		~~references.create :referenced_name => referenced_name, :link_type => link_type~~
	161	references.build :referenced_name => referenced_name, :link_type => link_type
		end

	164	wiki_files = find_wiki_files(rendering_result)
	165	wiki_files.each do \|referenced_name\|
	166	references.build :referenced_name => referenced_name, :link_type => WikiReference::FILE
	167	end
	168
		include_chunks = rendering_result.find_chunks(Include)
		includes = include_chunks.map { \|c\| ( c.escaped? ? nil : c.page_name ) }.compact.uniq
		includes.each do \|included_page_name\|
125		~~references.create :referenced_name => included_page_name,~~
	172	references.build :referenced_name => included_page_name,
		:link_type => WikiReference::INCLUDED_PAGE
		end

	176	redirect_chunks = rendering_result.find_chunks(Redirect)
	177	redirects = redirect_chunks.map { \|c\| ( c.escaped? ? nil : c.page_name ) }.compact.uniq
	178	redirects.each do \|redirected_page_name\|
	179	references.build :referenced_name => redirected_page_name,
	180	:link_type => WikiReference::REDIRECTED_PAGE
	181	end
	182
	183	# ugly hack: store these in a thread-local variable, so that the cache-sweeper has access to it.
	184	Thread.current[:page_redirects] ?
	185	Thread.current[:page_redirects].update({ @revision.page => redirects}) :
	186	Thread.current[:page_redirects] = { @revision.page => redirects}
	187
		categories = rendering_result.find_chunks(Category).map { \|cat\| cat.list }.flatten
		categories.each do \|category\|
131		~~references.create :referenced_name => category, :link_type => WikiReference::CATEGORY~~
	190	references.build :referenced_name => category, :link_type => WikiReference::CATEGORY
		end
		end
		end

rool/rails/instiki/trunk/lib/rdocsupport.rb:

prev.	current

		require "rdoc/markup/simple_markup"
		require 'rdoc/markup/simple_markup/to_html'
		rescue LoadError
5		~~# use old version if available~~
6		~~require 'markup/simple_markup'~~
7		~~require 'markup/simple_markup/to_html'~~
	5	# Ruby 1.9
	6	require "rdoc/markup"
	7	require 'rdoc/markup/to_html'
	8	module SM
	9	class SimpleMarkup < RDoc::Markup
	10	end
	11	class ToHtml <RDoc::Markup::ToHtml
	12	end
	13	end
		end

		module RDocSupport
...	...
		end
		end

152		~~end~~

	159	end

rool/rails/instiki/trunk/lib/url_generator.rb:

prev.	current

	1	require 'instiki_stringsupport'
	2
		class AbstractUrlGenerator

		def initialize(controller)
...	...
		# Create a link for the given page (or file) name and link text based
		# on the render mode in options and whether the page (file) exists
		# in the web.
11		~~def make_link(name, web, text = nil, options = {})~~
12		~~text = CGI.escapeHTML(text \|\| WikiWords.separate(name))~~
	13	def make_link(current_web, asked_name, web, text = nil, options = {})
	14	@web = current_web
		mode = (options[:mode] \|\| :show).to_sym
		link_type = (options[:link_type] \|\| :show).to_sym

		if (link_type == :show)
17		~~known_page = web.has_page?(name)~~
	19	page_exists = web.has_page?(asked_name)
	20	known_page = page_exists \|\| web.has_redirect_for?(asked_name)
	21	if known_page && !page_exists
	22	name = web.page_that_redirects_for(asked_name).name
	23	else
	24	name = asked_name
	25	end
		else
	27	name = asked_name
		known_page = web.has_file?(name)
	29	description = web.description(name)
	30	description = description.unescapeHTML.escapeHTML if description
		end
	32	if (text == asked_name)
	33	text = description \|\| text
	34	else
	35	text = text \|\| description
	36	end
	37	text = (text \|\| WikiWords.separate(asked_name)).unescapeHTML.escapeHTML

		case link_type
		when :show
		page_link(mode, name, text, web.address, known_page)
		when :file
26		~~file_link(mode, name, text, web.address, known_page)~~
	43	file_link(mode, name, text, web.address, known_page, description)
		when :pic
		pic_link(mode, name, text, web.address, known_page)
	46	when :audio
	47	media_link(mode, name, text, web.address, known_page, 'audio')
	48	when :video
	49	media_link(mode, name, text, web.address, known_page, 'video')
	50	when :delete
	51	delete_link(mode, name, web.address, known_page)
		else
		raise "Unknown link type: #{link_type}"
		end
		end
33
	56
	57	def url_for(hash = {})
	58	@controller.url_for hash
	59	end
		end

		class UrlGenerator < AbstractUrlGenerator

		private

40		~~def file_link(mode, name, text, web_address, known_file)~~
	66	def file_link(mode, name, text, web_address, known_file, description)
		case mode
		when :export
		if known_file
44		~~%{<a class="existingWikiWord" href="#{CGI.escape(name)}.html">#{text}</a>}~~
	70	%{<a class="existingWikiWord" title="#{description}" href="files/#{CGI.escape(name)}">#{text}</a>}
		else
		%{<span class="newWikiWord">#{text}</span>}
		end
		when :publish
		if known_file
50		~~href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',~~
51		~~:id => name~~
52		~~%{<a class="existingWikiWord" href="#{href}">#{text}</a>}~~
	76	href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
	77	:id => name, :only_path => true
	78	%{<a class="existingWikiWord" title="#{description}" href="#{href}">#{text}</a>}
		else
		%{<span class="newWikiWord">#{text}</span>}
		end
		else
		href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
58		~~:id => name~~
	84	:id => name, :only_path => true
		if known_file
60		~~%{<a class="existingWikiWord" href="#{href}">#{text}</a>}~~
	86	%{<a class="existingWikiWord" title="#{description}" href="#{href}">#{text}</a>}
		else
		%{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
		end
...	...
		case mode
		when :export
		if known_page
71		~~%{<a class="existingWikiWord" href="#{CGI.escape(name)}.html">#{text}</a>}~~
	97	%{<a class="existingWikiWord" href="#{CGI.escape(name)}.#{html_ext}">#{text}</a>}
		else
		%{<span class="newWikiWord">#{text}</span>}
		end
		when :publish
		if known_page
77		~~href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'published',~~
78		~~:id => name~~
79		~~%{<a class="existingWikiWord" href="#{href}">#{text}</a>}~~
	103	wikilink_for(mode, name, text, web_address)
		else
		%{<span class="newWikiWord">#{text}</span>}
		end
		else
		if known_page
85		~~href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'show',~~
86		~~:id => name~~
87		~~%{<a class="existingWikiWord" href="#{href}">#{text}</a>}~~
	109	wikilink_for(mode, name, text, web_address)
		else
		href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'new',
90		~~:id => name~~
	112	:id => name, :only_path => true
		%{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
		end
		end
		end

		def pic_link(mode, name, text, web_address, known_pic)
	119	href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
	120	:id => name, :only_path => true
		case mode
		when :export
		if known_pic
100		~~%{<img alt="#{text}" src="#{CGI.escape(name)}" />}~~
	124	%{<img alt="#{text}" src="files/#{CGI.escape(name)}" />}
		else
		%{<img alt="#{text}" src="no image" />}
		end
		when :publish
		if known_pic
106		~~%{<img alt="#{text}" src="#{CGI.escape(name)}" />}~~
	130	%{<img alt="#{text}" src="#{href}" />}
		else
		%{<span class="newWikiWord">#{text}</span>}
		end
		else
111		~~href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',~~
112		~~:id => name~~
		if known_pic
		%{<img alt="#{text}" src="#{href}" />}
		else
...	...
		end
		end

	143	def media_link(mode, name, text, web_address, known_media, media_type)
	144	href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
	145	:id => name, :only_path => true
	146	case mode
	147	when :export
	148	if known_media
	149	%{<#{media_type} src="files/#{CGI.escape(name)}" controls="controls">#{text}</#{media_type}>}
	150	else
	151	text
	152	end
	153	when :publish
	154	if known_media
	155	%{<#{media_type} src="#{href}" controls="controls">#{text}</#{media_type}>}
	156	else
	157	%{<span class="newWikiWord">#{text}</span>}
	158	end
	159	else
	160	if known_media
	161	%{<#{media_type} src="#{href}" controls="controls">#{text}</#{media_type}>}
	162	else
	163	%{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
	164	end
	165	end
	166	end
	167
	168	def delete_link(mode, name, web_address, known_file)
	169	href = @controller.url_for :controller => 'file', :web => web_address,
	170	:action => 'delete', :id => name, :only_oath => true
	171	if mode == :show and known_file
	172	%{<span class="deleteWikiWord"><a href="#{href}">Delete #{name}</a></span>}
	173	else
	174	%{<span class="deleteWikiWord">[[#{name}:delete]]</span>}
	175	end
	176	end
	177
	178	private
	179
	180	def wikilink_for(mode, name, text, web_address)
	181	web = Web.find_by_address(web_address)
	182	action = web.published? && (web != @web \|\| [:publish, :s5].include?(mode) ) ? 'published' : 'show'
	183	href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
	184	:id => name, :only_path => true
	185	title = web == @web ? '' : %{ title="#{web_address}"}
	186	%{<a class="existingWikiWord" href="#{href}"#{title}>#{text}</a>}
	187	end
	188
	189	def html_ext
	190	@html_ext \|\|= @controller.method(:html_ext).call
	191	# Why method().call ? A Ruby 1.9.2preview1 bug:
	192	# http://redmine.ruby-lang.org/issues/show/1802
	193	end
		end

rool/rails/instiki/trunk/lib/wiki_content.rb:

prev.	current

		require 'cgi'
2		~~require_dependency 'chunks/engines'~~
3		~~require_dependency 'chunks/category'~~
	2	require 'chunks/engines'
	3	require 'chunks/category'
		require_dependency 'chunks/include'
	5	require_dependency 'chunks/redirect'
		require_dependency 'chunks/wiki'
		require_dependency 'chunks/literal'
7		~~require_dependency 'chunks/uri'~~
8		~~require_dependency 'chunks/nowiki'~~
	8	require 'chunks/nowiki'
	9	require 'sanitizer'
	10	require 'instiki_stringsupport'

	12
		# Wiki content is just a string that can process itself with a chain of
		# actions. The actions can modify wiki content so that certain parts of
		# it are protected from being rendered by later actions.
		#
14		~~# When wiki content is rendered, it can be interrogated to find out~~
15		~~# which chunks were rendered. This means things like categories, wiki~~
	17	# When wiki content is rendered, it can be interrogated to find out
	18	# which chunks were rendered. This means things like categories, wiki
		# links, can be determined.
		#
18		~~# Exactly how wiki content is rendered is determined by a number of~~
	21	# Exactly how wiki content is rendered is determined by a number of
		# settings that are optionally passed in to a constructor. The current
		# options are:
21		~~# * :engine~~
	24	# * :engine
		# => The structural markup engine to use (Textile, Markdown, RDoc)
		# * :engine_opts
		# => A list of options to pass to the markup engines (safe modes, etc)
		# * :pre_engine_actions
		# => A list of render actions or chunks to be processed before the
27		~~# markup engine is applied. By default this is:~~
28		~~# Category, Include, URIChunk, WikiChunk::Link, WikiChunk::Word~~
	30	# markup engine is applied. By default this is:
	31	# Category, Include, URIChunk, WikiChunk::Link, WikiChunk::Word
		# * :post_engine_actions
30		~~# => A list of render actions or chunks to apply after the markup~~
31		~~# engine. By default these are:~~
	33	# => A list of render actions or chunks to apply after the markup
	34	# engine. By default these are:
		# Literal::Pre, Literal::Tags
		# * :mode
34		~~# => How should the content be rendered? For normal display (show),~~
	37	# => How should the content be rendered? For normal display (show),
		# publishing (:publish) or export (:export)?

		module ChunkManager
		attr_reader :chunks_by_type, :chunks_by_id, :chunks, :chunk_id
39
40		~~ACTIVE_CHUNKS = [ NoWiki, Category, WikiChunk::Link, URIChunk, LocalURIChunk,~~
41		~~WikiChunk::Word ]~~

43		~~HIDE_CHUNKS = [ Literal::Pre, Literal::Tags ]~~
	43	ACTIVE_CHUNKS = [ NoWiki, Category, Redirect, WikiChunk::Link,
	44	WikiChunk::Word ]

45		~~MASK_RE = {~~
	46	HIDE_CHUNKS = [ Literal::Pre, Literal::Tags, Literal::Math ]
	47
	48	MASK_RE = {
		ACTIVE_CHUNKS => Chunk::Abstract.mask_re(ACTIVE_CHUNKS),
		HIDE_CHUNKS => Chunk::Abstract.mask_re(HIDE_CHUNKS)
		}
49
	52
		def init_chunk_manager
		@chunks_by_type = Hash.new
52		~~Chunk::Abstract::derivatives.each{\|chunk_type\|~~
53		~~@chunks_by_type[chunk_type] = Array.new~~
	55	Chunk::Abstract::derivatives.each{\|chunk_type\|
	56	@chunks_by_type[chunk_type] = Array.new
		}
		@chunks_by_id = Hash.new
		@chunks = []
...	...
		def scan_chunkid(text)
		text.scan(MASK_RE[ACTIVE_CHUNKS]){\|a\| yield a[0] }
		end
80
	83
		def find_chunks(chunk_type)
		@chunks.select { \|chunk\| chunk.kind_of?(chunk_type) and chunk.rendered? }
		end

		end

87		~~# A simplified version of WikiContent. Useful to avoid recursion problems in~~
	90	# A simplified version of WikiContent. Useful to avoid recursion problems in
		# WikiContent.new
		class WikiContentStub < String
90
91		~~attr_reader :options~~
	93
	94	attr_reader :web, :options
		include ChunkManager
93
94		~~def initialize(content, options)~~
	96
	97	def initialize(content, web, options)
		super(content)
	99	@web = web
		@options = options
		init_chunk_manager
		end

		# Detects the mask strings contained in the text of chunks of type chunk_types
		# and yields the corresponding chunk ids
102		~~# example: content = "chunk123categorychunk <pre>chunk456categorychunk</pre>"~~
	106	# example: content = "chunk123categorychunk <pre>chunk456categorychunk</pre>"
		# inside_chunks(Literal::Pre) ==> yield 456
		def inside_chunks(chunk_types)
		chunk_types.each{\|chunk_type\| chunk_type.apply_to(self) }
106
	110
		chunk_types.each{\|chunk_type\| @chunks_by_type[chunk_type].each{\|hide_chunk\|
		scan_chunkid(hide_chunk.text){\|id\| yield id }
		}
110		}
	114	}
		end
		end

114		~~class WikiContent < String~~
	118	class WikiContent < ActiveSupport::SafeBuffer

		include ChunkManager
	121	include Sanitizer

		DEFAULT_OPTS = {
		:active_chunks => ACTIVE_CHUNKS,
120		~~:engine => Engines::Textile,~~
	125	:hide_chunks => HIDE_CHUNKS,
	126	:engine => Engines::MarkdownMML,
		:engine_opts => [],
		:mode => :show
		}.freeze

125		~~attr_reader :web, :options, :revision, :not_rendered, :pre_rendered~~
	131	attr_reader :web, :options, :revision, :not_rendered, :pre_rendered, :url_generator

		# Create a new wiki content string from the given one.
		# The options are explained at the top of this file.
...	...
		@web = @revision.page.web

		@options = DEFAULT_OPTS.dup.merge(options)
135		~~@options[:engine] = Engines::MAP[@web.markup]~~
	141	@options[:engine] = Engines::MAP[@web.markup]
		@options[:engine_opts] = [:filter_html, :filter_styles] if @web.safe_mode?
		@options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only?
138
	144	@options[:hide_chunks] = (HIDE_CHUNKS - [Literal::Math] ) unless
	145	[Engines::MarkdownMML, Engines::MarkdownPNG].include?(@options[:engine])
	146	if @options[:engine] == Engines::MarkdownPNG
	147	@options[:png_url] =
	148	@options[:mode] == :export ? 'files/pngs/' :
	149	(@url_generator.url_for :controller => 'file', :web => @web.address,
	150	:action => 'file', :id => 'pngs', :only_path => true) + '/'
	151	end
	152
		@not_rendered = @pre_rendered = nil
140
	154
		super(@revision.content)
		init_chunk_manager
		build_chunks
...	...
		end

		# Call @web.page_link using current options.
148		~~def page_link(name, text, link_type)~~
	162	def page_link(web_name, name, text, link_type)
	163	web = Web.find_by_name(web_name) \|\| Web.find_by_address(web_name) \|\| @web
		@options[:link_type] = (link_type \|\| :show)
150		~~@url_generator.make_link(name, @web, text, @options)~~
	165	@url_generator.make_link(@web, name, web, text, @options)
		end

		def build_chunks
		# create and mask Includes and "active_chunks" chunks
	170	NoWiki.apply_to(self) if @options[:active_chunks].include?(NoWiki)
		Include.apply_to(self)
156		~~@options[:active_chunks].each{\|chunk_type\| chunk_type.apply_to(self)}~~
	172	@options[:active_chunks].each{\|chunk_type\| chunk_type.apply_to(self) unless chunk_type == NoWiki}

		# Handle hiding contexts like "pre" and "code" etc..
		# The markup (textile, rdoc etc) can produce such contexts with its own syntax.
		# To reveal them, we work on a copy of the content.
161		~~# The copy is rendered and used to detect the chunks that are inside protecting context~~
	177	# The copy is rendered and used to detect the chunks that are inside protecting context
		# These chunks are reverted on the original content string.

164		~~copy = WikiContentStub.new(self, @options)~~
	180	copy = WikiContentStub.new(self, @web, @options)
		@options[:engine].apply_to(copy)

167		~~copy.inside_chunks(HIDE_CHUNKS) do \|id\|~~
168		~~@chunks_by_id[id.to_i].revert~~
	183	copy.inside_chunks(@options[:hide_chunks]) do \|id\|
	184	@chunks_by_id[id.to_i].revert if @chunks_by_id[id.to_i]
		end
		end

		def pre_render!
173		~~unless @pre_rendered~~
	189	unless @pre_rendered
		@chunks_by_type[Include].each{\|chunk\| chunk.unmask }
		@pre_rendered = String.new(self)
		end
177		~~@pre_rendered~~
	193	@pre_rendered
		end

		def render!
		pre_render!
		@options[:engine].apply_to(self)
	199	as_utf8
		# unmask in one go. $~[1] is the chunk id
184		~~gsub!(MASK_RE[ACTIVE_CHUNKS]) do~~
	201	gsub!(MASK_RE[ACTIVE_CHUNKS]) do
		chunk = @chunks_by_id[$~[1].to_i]
186		~~if chunk.nil?~~
	203	if chunk.nil?
		# if we match a chunkmask that existed in the original content string
		# just keep it as it is
		$~[0]
190		~~else~~
191		~~chunk.unmask_text~~
	207	else
	208	chunk.unmask_text
		end
		end
194		~~self~~
	211	self.replace xhtml_sanitize(self)
	212	self.html_safe
		end

		def page_name

rool/rails/instiki/trunk/lib/wiki_words.rb:

prev.	current

	1	#coding: utf-8
		# Contains all the methods for finding and replacing wiki words
	3
	4	require 'instiki_stringsupport'
	5
		module WikiWords
3		~~# In order of appearance: Latin, greek, cyrillian, armenian~~
	7	# In order of appearance: Latin, greek, cyrillic, armenian
		I18N_HIGHER_CASE_LETTERS =
5		"À�?ÂÃÄÅĀĄĂÆÇĆČĈĊĎ�?ÈÉÊËĒĘĚĔĖĜĞĠĢĤĦÌ�?Î�?ĪĨĬĮİĲĴĶ�?ĽĹĻĿÑŃŇŅŊÒÓÔÕÖØŌ�?ŎŒŔŘŖŚŠŞŜȘŤŢŦȚÙÚÛÜŪŮŰŬŨŲŴ�?ŶŸŹŽŻ" +
6		~~"ΑΒΓΔΕΖΗΘΙΚΛΜ�?ΞΟΠΡΣΤΥΦΧΨΩ" +~~
7		~~"ΆΈΉΊΌΎ�?ѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎ�?ҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾ�?ӃӅӇӉӋ�?�?ӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӸЖ" +~~
8		~~"ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�?ՂՃՄՅՆՇՈՉՊՋՌ�?�?�?ՑՒՓՔՕՖ"~~
	9	"ÀÁÂÃÄÅĀĄĂÆÇĆČĈĊĎĐÈÉÊËĒĘĚĔĖĜĞĠĢĤĦÌÍÎÏĪĨĬĮİĲĴĶŁĽĹĻĿÑŃŇŅŊÒÓÔÕÖØŌŐŎŒŔŘŖŚŠŞŜȘŤŢŦȚÙÚÛÜŪŮŰŬŨŲŴŶŸȲÝŹŽŻ" +
	10	"ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ" +
	11	"ЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎҐҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾӀӁӃӅӇӉӋӍӐӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӶӸӺӼӾԀԂԄԆԈԊԌԎԐԒԔԖԘԚԜԞԠԢ" +
	12	"ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖ"

		I18N_LOWER_CASE_LETTERS =
11		"àáâãäå�?ąăæçć�?ĉċ�?đèéêëēęěĕėƒ�?ğġģĥħìíîïīĩĭįıĳĵķĸłľĺļŀñńňņŉŋòóôõöø�?ő�?œŕřŗśšş�?șťţŧțùúûüūůűŭũųŵýÿŷžżźÞþßſ�?ð" +
12		~~"άέήίΰαβγδεζηθικλμνξοπ�?ςστυφχψωϊϋό�?ώ�?" +~~
13		"абвгдежзийклмнопр�?туфхцчшщъыь�?ю�?�?ёђѓєѕіїјљћќ�?ўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿ�?ҋ�?�?ґғҕҗҙқ�?ҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛ�?ӟӡӣӥӧөӫӭӯӱӳӵӹ" +
14		~~"աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտր�?ւփքօֆև"~~
	15	"àáâãäåāąăæçćĉċčďđèéêëēęěĕėƒĝğġģĥħìíîïīĩĭįıĳĵķĸłľĺļŀñńňņŉŋòóôõöøōŏőœŕřŗśŝšşșťţŧțùúûüūůűŭũųŵýÿŷžżźÞþßſð" +
	16	"άέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώΐ" +
	17	"абвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿҁҋҍҏґғҕҗҙқҝҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӂӄӆӈӊӌӎӏӑӓӕӗәӛӝӟӡӣӥӧөӫӭӯӱӳӵӷӹӻӽӿԁԃԅԇԉԋԍԏԑԓԕԗԙԛԝԟԡԣ" +
	18	"աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև"

16		~~WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + '][a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + ']\w+'~~
	20	WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + ']+[a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS +
	21	'][A-Za-z0-9_' + I18N_HIGHER_CASE_LETTERS + I18N_LOWER_CASE_LETTERS + ']+'
		CAMEL_CASED_WORD_BORDER = /([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}])/u

		def self.separate(wiki_word)
20		~~wiki_word.gsub(CAMEL_CASED_WORD_BORDER, '\1 \2')~~
	25	wiki_word.dup.as_utf8.gsub(CAMEL_CASED_WORD_BORDER, '\1 \2')
		end

		end

rool/rails/instiki/trunk/public/404.html:

prev.	current

1		~~<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"~~
2		~~"http://www.w3.org/TR/html4/loose.dtd">~~
3		~~<html>~~
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd" >
	2	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
	3	<head>
	4	<title>404</title>
	5	</head>
		<body>
		<h1>File not found</h1>
6		~~<p>Change this error message for pages not found in public/404.html</p>~~
	8	<p>You were, perhaps, looking for <strong>cheese</strong>?</p>
		</body>
8		~~</html>~~

	11	</html>

rool/rails/instiki/trunk/public/500.html:

prev.	current

1		~~<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"~~
2		~~"http://www.w3.org/TR/html4/loose.dtd">~~
3		~~<html>~~
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd" >
	2	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
	3	<head>
	4	<title>500</title>
	5	</head>
		<body>
		<h1>Application error (Apache)</h1>
6		~~<p>Change this error message for exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code) in public/500.html</p>~~
	8	<p>Something <em>very bad</em> just happened. I just <em>know it</em>. Do you smell smoke?</p>
		</body>
8		~~</html>~~

	11	</html>

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

prev.	current

1		~~#!/bin/ruby~~
	1	#!/usr/bin/env ruby

		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

...	...
		require "dispatcher"

		ADDITIONAL_LOAD_PATHS.reverse.each { \|dir\| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
10		~~Dispatcher.dispatch~~
	10	Dispatcher.dispatch

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

prev.	current

1		~~#!/bin/env ruby~~
	1	#!/usr/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/instiki/trunk/public/dispatch.rb:

prev.	current

1		~~#!/bin/ruby~~
	1	#!/usr/bin/env ruby

		require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)

...	...
		require "dispatcher"

		ADDITIONAL_LOAD_PATHS.reverse.each { \|dir\| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
10		~~Dispatcher.dispatch~~
	10	Dispatcher.dispatch

rool/rails/instiki/trunk/public/favicon.ico:

prev.	current

	1	h( ��E~0.�)ol�`9 ��^�PpH�0��Cu0P}@��h��8w n�`,x��S�@!y��#�`�P&� " "!""""""
	2	" " "!!!"""" """""" "
	3	"" +"""""""""""""!
	4	" """"""!"!""""""! !"! +

rool/rails/instiki/trunk/public/javascripts/controls.js:

prev.	current

1		~~// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)~~
2		~~// (c) 2005 Ivan Krstic (http://blogs.law.harvard.edu/ivan)~~
3		~~// (c) 2005 Jon Tirsen (http://www.tirsen.com)~~
	1	// script.aculo.us controls.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
	2
	3	// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
	4	// (c) 2005-2009 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
	5	// (c) 2005-2009 Jon Tirsen (http://www.tirsen.com)
		// Contributors:
		// Richard Livsey
		// Rahul Bhargava
		// Rob Wills
8		//
9		~~// See scriptaculous.js for full license.~~
	10	//
	11	// script.aculo.us is freely distributable under the terms of an MIT-style license.
	12	// For details, see the script.aculo.us web site: http://script.aculo.us/

11		~~// Autocompleter.Base handles all the autocompletion functionality~~
	14	// Autocompleter.Base handles all the autocompletion functionality
		// that's independent of the data source for autocompletion. This
		// includes drawing the autocompletion menu, observing keyboard
		// and mouse events, and similar.
		//
16		~~// Specific autocompleters need to provide, at the very least,~~
	19	// Specific autocompleters need to provide, at the very least,
		// a getUpdatedChoices function that will be invoked every time
18		~~// the text inside the monitored textbox changes. This method~~
	21	// the text inside the monitored textbox changes. This method
		// should get the text for which to provide autocompletion by
		// invoking this.getToken(), NOT by directly accessing
		// this.element.value. This is to allow incremental tokenized
...	...
		// will incrementally autocomplete with a comma as the token.
		// Additionally, ',' in the above example can be replaced with
		// a token array, e.g. { tokens: [',', '\n'] } which
32		~~// enables autocompletion on multiple tokens. This is most~~
33		~~// useful when one of the tokens is \n (a newline), as it~~
	35	// enables autocompletion on multiple tokens. This is most
	36	// useful when one of the tokens is \n (a newline), as it
		// allows smart autocompletion after linebreaks.

36		~~var Autocompleter = {}~~
37		~~Autocompleter.Base = function() {};~~
38		~~Autocompleter.Base.prototype = {~~
	39	if(typeof Effect == 'undefined')
	40	throw("controls.js requires including script.aculo.us' effects.js library");
	41
	42	var Autocompleter = { };
	43	Autocompleter.Base = Class.create({
		baseInitialize: function(element, update, options) {
40		~~this.element = $(element);~~
41		~~this.update = $(update);~~
42		~~this.hasFocus = false;~~
43		~~this.changed = false;~~
44		~~this.active = false;~~
45		~~this.index = 0;~~
	45	element = $(element);
	46	this.element = element;
	47	this.update = $(update);
	48	this.hasFocus = false;
	49	this.changed = false;
	50	this.active = false;
	51	this.index = 0;
		this.entryCount = 0;
	53	this.oldElementValue = this.element.value;

48		~~if (this.setOptions)~~
	55	if(this.setOptions)
		this.setOptions(options);
		else
51		~~this.options = options \|\| {};~~
	58	this.options = options \|\| { };

		this.options.paramName = this.options.paramName \|\| this.element.name;
		this.options.tokens = this.options.tokens \|\| [];
		this.options.frequency = this.options.frequency \|\| 0.4;
		this.options.minChars = this.options.minChars \|\| 1;
57		~~this.options.onShow = this.options.onShow \|\|~~
58		~~function(element, update){~~
59		~~if(!update.style.position \|\| update.style.position=='absolute') {~~
60		~~update.style.position = 'absolute';~~
61		~~Position.clone(element, update, {setHeight: false, offsetTop: element.offsetHeight});~~
62		}
63		~~Effect.Appear(update,{duration:0.15});~~
64		};
65		~~this.options.onHide = this.options.onHide \|\|~~
66		~~function(element, update){ new Effect.Fade(update,{duration:0.15}) };~~
	64	this.options.onShow = this.options.onShow \|\|
	65	function(element, update){
	66	if(!update.style.position \|\| update.style.position=='absolute') {
	67	update.style.position = 'absolute';
	68	Position.clone(element, update, {
	69	setHeight: false,
	70	offsetTop: element.offsetHeight
	71	});
	72	}
	73	Effect.Appear(update,{duration:0.15});
	74	};
	75	this.options.onHide = this.options.onHide \|\|
	76	function(element, update){ new Effect.Fade(update,{duration:0.15}) };

68		~~if (typeof(this.options.tokens) == 'string')~~
	78	if(typeof(this.options.tokens) == 'string')
		this.options.tokens = new Array(this.options.tokens);
	80	// Force carriage returns as token delimiters anyway
	81	if (!this.options.tokens.include('\n'))
	82	this.options.tokens.push('\n');

		this.observer = null;
72
	85
		this.element.setAttribute('autocomplete','off');

		Element.hide(this.update);

77		~~Event.observe(this.element, "blur", this.onBlur.bindAsEventListener(this));~~
78		~~Event.observe(this.element, "keypress", this.onKeyPress.bindAsEventListener(this));~~
	90	Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
	91	Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
		},

		show: function() {
		if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
83		~~if(!this.iefix && (navigator.appVersion.indexOf('MSIE')>0) && (Element.getStyle(this.update, 'position')=='absolute')) {~~
84		~~new Insertion.After(this.update,~~
	96	if(!this.iefix &&
	97	(Prototype.Browser.IE) &&
	98	(Element.getStyle(this.update, 'position')=='absolute')) {
	99	new Insertion.After(this.update,
		'<iframe id="' + this.update.id + '_iefix" '+
		'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
		'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
...	...
		}
		if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
		},
92
	107
		fixIEOverlapping: function() {
94		~~Position.clone(this.update, this.iefix);~~
	109	Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
		this.iefix.style.zIndex = 1;
		this.update.style.zIndex = 2;
		Element.show(this.iefix);
...	...
		case Event.KEY_UP:
		this.markPrevious();
		this.render();
132		~~if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event);~~
	147	Event.stop(event);
		return;
		case Event.KEY_DOWN:
		this.markNext();
		this.render();
137		~~if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event);~~
	152	Event.stop(event);
		return;
		}
140		~~else~~
141		~~if(event.keyCode==Event.KEY_TAB \|\| event.keyCode==Event.KEY_RETURN)~~
142		~~return;~~
	155	else
	156	if(event.keyCode==Event.KEY_TAB \|\| event.keyCode==Event.KEY_RETURN \|\|
	157	(Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;

		this.changed = true;
		this.hasFocus = true;

		if(this.observer) clearTimeout(this.observer);
148		~~this.observer =~~
	163	this.observer =
		setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
		},

	167	activate: function() {
	168	this.changed = false;
	169	this.hasFocus = true;
	170	this.getUpdatedChoices();
	171	},
	172
		onHover: function(event) {
		var element = Event.findElement(event, 'LI');
154		~~if(this.index != element.autocompleteIndex)~~
	175	if(this.index != element.autocompleteIndex)
		{
		this.index = element.autocompleteIndex;
		this.render();
		}
		Event.stop(event);
		},
161
	182
		onClick: function(event) {
		var element = Event.findElement(event, 'LI');
		this.index = element.autocompleteIndex;
		this.selectEntry();
		this.hide();
		},
168
	189
		onBlur: function(event) {
		// needed to make click events working
		setTimeout(this.hide.bind(this), 250);
		this.hasFocus = false;
173		~~this.active = false;~~
174		},
175
	194	this.active = false;
	195	},
	196
		render: function() {
		if(this.entryCount > 0) {
		for (var i = 0; i < this.entryCount; i++)
179		~~this.index==i ?~~
180		~~Element.addClassName(this.getEntry(i),"selected") :~~
	200	this.index==i ?
	201	Element.addClassName(this.getEntry(i),"selected") :
		Element.removeClassName(this.getEntry(i),"selected");
182
183		~~if(this.hasFocus) {~~
	203	if(this.hasFocus) {
		this.show();
		this.active = true;
		}
187		~~} else this.hide();~~
	207	} else {
	208	this.active = false;
	209	this.hide();
	210	}
		},
189
	212
		markPrevious: function() {
191		~~if(this.index > 0) this.index--~~
	214	if(this.index > 0) this.index--;
		else this.index = this.entryCount-1;
	216	this.getEntry(this.index).scrollIntoView(true);
		},
194
	218
		markNext: function() {
196		~~if(this.index < this.entryCount-1) this.index++~~
	220	if(this.index < this.entryCount-1) this.index++;
		else this.index = 0;
	222	this.getEntry(this.index).scrollIntoView(false);
		},
199
	224
		getEntry: function(index) {
		return this.update.firstChild.childNodes[index];
		},
203
	228
		getCurrentEntry: function() {
		return this.getEntry(this.index);
		},
207
	232
		selectEntry: function() {
		this.active = false;
		this.updateElement(this.getCurrentEntry());
...	...
		this.options.updateElement(selectedElement);
		return;
		}
	243	var value = '';
	244	if (this.options.select) {
	245	var nodes = $(selectedElement).select('.' + this.options.select) \|\| [];
	246	if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
	247	} else
	248	value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');

219		~~var value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');~~
220		~~var lastTokenPos = this.findLastToken();~~
221		~~if (lastTokenPos != -1) {~~
222		~~var newValue = this.element.value.substr(0, lastTokenPos + 1);~~
223		~~var whitespace = this.element.value.substr(lastTokenPos + 1).match(/^\s+/);~~
	250	var bounds = this.getTokenBounds();
	251	if (bounds[0] != -1) {
	252	var newValue = this.element.value.substr(0, bounds[0]);
	253	var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
		if (whitespace)
		newValue += whitespace[0];
226		~~this.element.value = newValue + value;~~
	256	this.element.value = newValue + value + this.element.value.substr(bounds[1]);
		} else {
		this.element.value = value;
		}
	260	this.oldElementValue = this.element.value;
		this.element.focus();
231
	262
		if (this.options.afterUpdateElement)
		this.options.afterUpdateElement(this.element, selectedElement);
		},
...	...
		if(!this.changed && this.hasFocus) {
		this.update.innerHTML = choices;
		Element.cleanWhitespace(this.update);
240		~~Element.cleanWhitespace(this.update.firstChild);~~
	271	Element.cleanWhitespace(this.update.down());

242		~~if(this.update.firstChild && this.update.firstChild.childNodes) {~~
243		~~this.entryCount =~~
244		~~this.update.firstChild.childNodes.length;~~
	273	if(this.update.firstChild && this.update.down().childNodes) {
	274	this.entryCount =
	275	this.update.down().childNodes.length;
		for (var i = 0; i < this.entryCount; i++) {
		var entry = this.getEntry(i);
		entry.autocompleteIndex = i;
		this.addObservers(entry);
		}
250		~~} else {~~
	281	} else {
		this.entryCount = 0;
		}

		this.stopIndicator();
	286	this.index = 0;

256		~~this.index = 0;~~
257		~~this.render();~~
	288	if(this.entryCount==1 && this.options.autoSelect) {
	289	this.selectEntry();
	290	this.hide();
	291	} else {
	292	this.render();
	293	}
		}
		},

...	...
		},

		onObserverEvent: function() {
267		~~this.changed = false;~~
	303	this.changed = false;
	304	this.tokenBounds = null;
		if(this.getToken().length>=this.options.minChars) {
269		~~this.startIndicator();~~
		this.getUpdatedChoices();
		} else {
		this.active = false;
		this.hide();
		}
	311	this.oldElementValue = this.element.value;
		},

		getToken: function() {
278		~~var tokenPos = this.findLastToken();~~
279		~~if (tokenPos != -1)~~
280		~~var ret = this.element.value.substr(tokenPos + 1).replace(/^\s+/,'').replace(/\s+$/,'');~~
281		~~else~~
282		~~var ret = this.element.value;~~
283
284		~~return /\n/.test(ret) ? '' : ret;~~
	315	var bounds = this.getTokenBounds();
	316	return this.element.value.substring(bounds[0], bounds[1]).strip();
		},

287		~~findLastToken: function() {~~
288		~~var lastTokenPos = -1;~~
289
290		~~for (var i=0; i<this.options.tokens.length; i++) {~~
291		~~var thisTokenPos = this.element.value.lastIndexOf(this.options.tokens[i]);~~
292		~~if (thisTokenPos > lastTokenPos)~~
293		~~lastTokenPos = thisTokenPos;~~
	319	getTokenBounds: function() {
	320	if (null != this.tokenBounds) return this.tokenBounds;
	321	var value = this.element.value;
	322	if (value.strip().empty()) return [-1, 0];
	323	var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
	324	var offset = (diff == this.oldElementValue.length ? 1 : 0);
	325	var prevTokenPos = -1, nextTokenPos = value.length;
	326	var tp;
	327	for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
	328	tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
	329	if (tp > prevTokenPos) prevTokenPos = tp;
	330	tp = value.indexOf(this.options.tokens[index], diff + offset);
	331	if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
		}
295		~~return lastTokenPos;~~
	333	return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
		}
297		}
	335	});

299		~~Ajax.Autocompleter = Class.create();~~
300		~~Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {~~
	337	Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
	338	var boundary = Math.min(newS.length, oldS.length);
	339	for (var index = 0; index < boundary; ++index)
	340	if (newS[index] != oldS[index])
	341	return index;
	342	return boundary;
	343	};
	344
	345	Ajax.Autocompleter = Class.create(Autocompleter.Base, {
		initialize: function(element, update, url, options) {
302		~~this.baseInitialize(element, update, options);~~
	347	this.baseInitialize(element, update, options);
		this.options.asynchronous = true;
		this.options.onComplete = this.onComplete.bind(this);
		this.options.defaultParams = this.options.parameters \|\| null;
...	...
		},

		getUpdatedChoices: function() {
310		~~entry = encodeURIComponent(this.options.paramName) + '=' +~~
	355	this.startIndicator();
	356
	357	var entry = encodeURIComponent(this.options.paramName) + '=' +
		encodeURIComponent(this.getToken());

		this.options.parameters = this.options.callback ?
		this.options.callback(this.element, entry) : entry;

316		~~if(this.options.defaultParams)~~
	363	if(this.options.defaultParams)
		this.options.parameters += '&' + this.options.defaultParams;

		new Ajax.Request(this.url, this.options);
...	...
		onComplete: function(request) {
		this.updateChoices(request.responseText);
		}
325
		});

		// The local array autocompleter. Used when you'd prefer to
...	...
		// - choices - How many autocompletion choices to offer
		//
		// - partialSearch - If false, the autocompleter will match entered
341		~~// text only at the beginning of strings in the~~
	387	// text only at the beginning of strings in the
		// autocomplete array. Defaults to true, which will
		// match text at the beginning of any word in the
		// strings in the autocomplete array. If you want to
...	...
		// - ignoreCase - Whether to ignore case when autocompleting.
		// Defaults to true.
		//
358		~~// It's possible to pass in a custom function as the 'selector'~~
	404	// It's possible to pass in a custom function as the 'selector'
		// option, if you prefer to write your own autocompletion logic.
		// In that case, the other options above will not apply unless
		// you support them.

363		~~Autocompleter.Local = Class.create();~~
364		~~Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {~~
	409	Autocompleter.Local = Class.create(Autocompleter.Base, {
		initialize: function(element, update, array, options) {
		this.baseInitialize(element, update, options);
		this.options.array = array;
...	...
		var entry = instance.getToken();
		var count = 0;

387		~~for (var i = 0; i < instance.options.array.length &&~~
388		~~ret.length < instance.options.choices ; i++) {~~
	432	for (var i = 0; i < instance.options.array.length &&
	433	ret.length < instance.options.choices ; i++) {

		var elem = instance.options.array[i];
391		~~var foundPos = instance.options.ignoreCase ?~~
392		~~elem.toLowerCase().indexOf(entry.toLowerCase()) :~~
	436	var foundPos = instance.options.ignoreCase ?
	437	elem.toLowerCase().indexOf(entry.toLowerCase()) :
		elem.indexOf(entry);

		while (foundPos != -1) {
396		~~if (foundPos == 0 && elem.length != entry.length) {~~
397		~~ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +~~
	441	if (foundPos == 0 && elem.length != entry.length) {
	442	ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
		elem.substr(entry.length) + "</li>");
		break;
400		~~} else if (entry.length >= instance.options.partialChars &&~~
	445	} else if (entry.length >= instance.options.partialChars &&
		instance.options.partialSearch && foundPos != -1) {
		if (instance.options.fullSearch \|\| /\s/.test(elem.substr(foundPos-1,1))) {
		partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
...	...
		}
		}

410		~~foundPos = instance.options.ignoreCase ?~~
411		~~elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :~~
	455	foundPos = instance.options.ignoreCase ?
	456	elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
		elem.indexOf(entry, foundPos + 1);

		}
		}
		if (partial.length)
417		~~ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))~~
	462	ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
		return "<ul>" + ret.join('') + "</ul>";
		}
420		~~}, options \|\| {});~~
	465	}, options \|\| { });
		}
		});

424		~~// AJAX in-place editor~~
425		//
426		~~// see documentation on http://wiki.script.aculo.us/scriptaculous/show/Ajax.InPlaceEditor~~
	469	// AJAX in-place editor and collection editor
	470	// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).

428		~~Ajax.InPlaceEditor = Class.create();~~
429		~~Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";~~
430		~~Ajax.InPlaceEditor.prototype = {~~
	472	// Use this if you notice weird scrolling problems on some browsers,
	473	// the DOM might be a bit confused when this gets called so do this
	474	// waits 1 ms (with setTimeout) until it does the activation
	475	Field.scrollFreeActivate = function(field) {
	476	setTimeout(function() {
	477	Field.activate(field);
	478	}, 1);
	479	};
	480
	481	Ajax.InPlaceEditor = Class.create({
		initialize: function(element, url, options) {
		this.url = url;
433		~~this.element = $(element);~~
434
435		~~this.options = Object.extend({~~
436		~~okText: "ok",~~
437		~~cancelText: "cancel",~~
438		~~savingText: "Saving...",~~
439		~~clickToEditText: "Click to edit",~~
440		~~okText: "ok",~~
441		~~rows: 1,~~
442		~~onComplete: function(transport, element) {~~
443		~~new Effect.Highlight(element, {startcolor: this.options.highlightcolor});~~
444		},
445		~~onFailure: function(transport) {~~
446		~~alert("Error communicating with the server: " + transport.responseText.stripTags());~~
447		},
448		~~callback: function(form) {~~
449		~~return Form.serialize(form);~~
450		},
451		~~handleLineBreaks: true,~~
452		~~loadingText: 'Loading...',~~
453		~~savingClassName: 'inplaceeditor-saving',~~
454		~~loadingClassName: 'inplaceeditor-loading',~~
455		~~formClassName: 'inplaceeditor-form',~~
456		~~highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,~~
457		~~highlightendcolor: "#FFFFFF",~~
458		~~externalControl: null,~~
459		~~ajaxOptions: {}~~
460		~~}, options \|\| {});~~
461
462		~~if(!this.options.formId && this.element.id) {~~
463		~~this.options.formId = this.element.id + "-inplaceeditor";~~
464		~~if ($(this.options.formId)) {~~
465		~~// there's already a form with that name, don't specify an id~~
466		~~this.options.formId = null;~~
467		}
	484	this.element = element = $(element);
	485	this.prepareOptions();
	486	this._controls = { };
	487	arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
	488	Object.extend(this.options, options \|\| { });
	489	if (!this.options.formId && this.element.id) {
	490	this.options.formId = this.element.id + '-inplaceeditor';
	491	if ($(this.options.formId))
	492	this.options.formId = '';
		}
469
470		~~if (this.options.externalControl) {~~
	494	if (this.options.externalControl)
		this.options.externalControl = $(this.options.externalControl);
472		}
473
474		~~this.originalBackground = Element.getStyle(this.element, 'background-color');~~
475		~~if (!this.originalBackground) {~~
476		~~this.originalBackground = "transparent";~~
477		}
478
	496	if (!this.options.externalControl)
	497	this.options.externalControlOnly = false;
	498	this._originalBackground = this.element.getStyle('background-color') \|\| 'transparent';
		this.element.title = this.options.clickToEditText;
480
481		~~this.onclickListener = this.enterEditMode.bindAsEventListener(this);~~
482		~~this.mouseoverListener = this.enterHover.bindAsEventListener(this);~~
483		~~this.mouseoutListener = this.leaveHover.bindAsEventListener(this);~~
484		~~Event.observe(this.element, 'click', this.onclickListener);~~
485		~~Event.observe(this.element, 'mouseover', this.mouseoverListener);~~
486		~~Event.observe(this.element, 'mouseout', this.mouseoutListener);~~
487		~~if (this.options.externalControl) {~~
488		~~Event.observe(this.options.externalControl, 'click', this.onclickListener);~~
489		~~Event.observe(this.options.externalControl, 'mouseover', this.mouseoverListener);~~
490		~~Event.observe(this.options.externalControl, 'mouseout', this.mouseoutListener);~~
491		}
	500	this._boundCancelHandler = this.handleFormCancellation.bind(this);
	501	this._boundComplete = (this.options.onComplete \|\| Prototype.emptyFunction).bind(this);
	502	this._boundFailureHandler = this.handleAJAXFailure.bind(this);
	503	this._boundSubmitHandler = this.handleFormSubmission.bind(this);
	504	this._boundWrapperHandler = this.wrapUp.bind(this);
	505	this.registerListeners();
		},
493		~~enterEditMode: function() {~~
494		~~if (this.saving) return;~~
495		~~if (this.editing) return;~~
496		~~this.editing = true;~~
497		~~this.onEnterEditMode();~~
498		~~if (this.options.externalControl) {~~
499		~~Element.hide(this.options.externalControl);~~
500		}
501		~~Element.hide(this.element);~~
502		~~this.createForm();~~
503		~~this.element.parentNode.insertBefore(this.form, this.element);~~
504		~~Field.focus(this.editField);~~
505		~~// stop the event to avoid a page refresh in Safari~~
506		~~if (arguments.length > 1) {~~
507		~~Event.stop(arguments[0]);~~
508		}
	507	checkForEscapeOrReturn: function(e) {
	508	if (!this._editing \|\| e.ctrlKey \|\| e.altKey \|\| e.shiftKey) return;
	509	if (Event.KEY_ESC == e.keyCode)
	510	this.handleFormCancellation(e);
	511	else if (Event.KEY_RETURN == e.keyCode)
	512	this.handleFormSubmission(e);
		},
510		~~createForm: function() {~~
511		~~this.form = document.createElement("form");~~
512		~~this.form.id = this.options.formId;~~
513		~~Element.addClassName(this.form, this.options.formClassName)~~
514		~~this.form.onsubmit = this.onSubmit.bind(this);~~
515
516		~~this.createEditField();~~
517
518		~~if (this.options.textarea) {~~
519		~~var br = document.createElement("br");~~
520		~~this.form.appendChild(br);~~
	514	createControl: function(mode, handler, extraClasses) {
	515	var control = this.options[mode + 'Control'];
	516	var text = this.options[mode + 'Text'];
	517	if ('button' == control) {
	518	var btn = document.createElement('input');
	519	btn.type = 'submit';
	520	btn.value = text;
	521	btn.className = 'editor_' + mode + '_button';
	522	if ('cancel' == mode)
	523	btn.onclick = this._boundCancelHandler;
	524	this._form.appendChild(btn);
	525	this._controls[mode] = btn;
	526	} else if ('link' == control) {
	527	var link = document.createElement('a');
	528	link.href = '#';
	529	link.appendChild(document.createTextNode(text));
	530	link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
	531	link.className = 'editor_' + mode + '_link';
	532	if (extraClasses)
	533	link.className += ' ' + extraClasses;
	534	this._form.appendChild(link);
	535	this._controls[mode] = link;
		}
522
523		~~okButton = document.createElement("input");~~
524		~~okButton.type = "submit";~~
525		~~okButton.value = this.options.okText;~~
526		~~this.form.appendChild(okButton);~~
527
528		~~cancelLink = document.createElement("a");~~
529		~~cancelLink.href = "#";~~
530		~~cancelLink.appendChild(document.createTextNode(this.options.cancelText));~~
531		~~cancelLink.onclick = this.onclickCancel.bind(this);~~
532		~~this.form.appendChild(cancelLink);~~
		},
534		~~hasHTMLLineBreaks: function(string) {~~
535		~~if (!this.options.handleLineBreaks) return false;~~
536		~~return string.match(/<br/i) \|\| string.match(/<p>/i);~~
537		},
538		~~convertHTMLLineBreaks: function(string) {~~
539		~~return string.replace(/<br>/gi, "\n").replace(/<br\/>/gi, "\n").replace(/<\/p>/gi, "\n").replace(/<p>/gi, "");~~
540		},
		createEditField: function() {
542		~~var text;~~
543		~~if(this.options.loadTextURL) {~~
544		~~text = this.options.loadingText;~~
545		~~} else {~~
546		~~text = this.getText();~~
547		}
548
549		~~if (this.options.rows == 1 && !this.hasHTMLLineBreaks(text)) {~~
550		~~this.options.textarea = false;~~
551		~~var textField = document.createElement("input");~~
552		~~textField.type = "text";~~
553		~~textField.name = "value";~~
554		~~textField.value = text;~~
555		~~textField.style.backgroundColor = this.options.highlightcolor;~~
	539	var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
	540	var fld;
	541	if (1 >= this.options.rows && !/\r\|\n/.test(this.getText())) {
	542	fld = document.createElement('input');
	543	fld.type = 'text';
		var size = this.options.size \|\| this.options.cols \|\| 0;
557		~~if (size != 0) textField.size = size;~~
558		~~this.editField = textField;~~
	545	if (0 < size) fld.size = size;
		} else {
560		~~this.options.textarea = true;~~
561		~~var textArea = document.createElement("textarea");~~
562		~~textArea.name = "value";~~
563		~~textArea.value = this.convertHTMLLineBreaks(text);~~
564		~~textArea.rows = this.options.rows;~~
565		~~textArea.cols = this.options.cols \|\| 40;~~
566		~~this.editField = textArea;~~
	547	fld = document.createElement('textarea');
	548	fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
	549	fld.cols = this.options.cols \|\| 40;
		}
568
569		~~if(this.options.loadTextURL) {~~
	551	fld.name = this.options.paramName;
	552	fld.value = text; // No HTML breaks conversion anymore
	553	fld.className = 'editor_field';
	554	if (this.options.submitOnBlur)
	555	fld.onblur = this._boundSubmitHandler;
	556	this._controls.editor = fld;
	557	if (this.options.loadTextURL)
		this.loadExternalText();
571		}
572		~~this.form.appendChild(this.editField);~~
	559	this._form.appendChild(this._controls.editor);
		},
574		~~getText: function() {~~
575		~~return this.element.innerHTML;~~
	561	createForm: function() {
	562	var ipe = this;
	563	function addText(mode, condition) {
	564	var text = ipe.options['text' + mode + 'Controls'];
	565	if (!text \|\| condition === false) return;
	566	ipe._form.appendChild(document.createTextNode(text));
	567	};
	568	this._form = $(document.createElement('form'));
	569	this._form.id = this.options.formId;
	570	this._form.addClassName(this.options.formClassName);
	571	this._form.onsubmit = this._boundSubmitHandler;
	572	this.createEditField();
	573	if ('textarea' == this._controls.editor.tagName.toLowerCase())
	574	this._form.appendChild(document.createElement('br'));
	575	if (this.options.onFormCustomization)
	576	this.options.onFormCustomization(this, this._form);
	577	addText('Before', this.options.okControl \|\| this.options.cancelControl);
	578	this.createControl('ok', this._boundSubmitHandler);
	579	addText('Between', this.options.okControl && this.options.cancelControl);
	580	this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
	581	addText('After', this.options.okControl \|\| this.options.cancelControl);
		},
577		~~loadExternalText: function() {~~
578		~~Element.addClassName(this.form, this.options.loadingClassName);~~
579		~~this.editField.disabled = true;~~
580		~~new Ajax.Request(~~
581		~~this.options.loadTextURL,~~
582		~~Object.extend({~~
583		~~asynchronous: true,~~
584		~~onComplete: this.onLoadedExternalText.bind(this)~~
585		~~}, this.options.ajaxOptions)~~
586		);
	583	destroy: function() {
	584	if (this._oldInnerHTML)
	585	this.element.innerHTML = this._oldInnerHTML;
	586	this.leaveEditMode();
	587	this.unregisterListeners();
		},
588		~~onLoadedExternalText: function(transport) {~~
589		~~Element.removeClassName(this.form, this.options.loadingClassName);~~
590		~~this.editField.disabled = false;~~
591		~~this.editField.value = transport.responseText.stripTags();~~
	589	enterEditMode: function(e) {
	590	if (this._saving \|\| this._editing) return;
	591	this._editing = true;
	592	this.triggerCallback('onEnterEditMode');
	593	if (this.options.externalControl)
	594	this.options.externalControl.hide();
	595	this.element.hide();
	596	this.createForm();
	597	this.element.parentNode.insertBefore(this._form, this.element);
	598	if (!this.options.loadTextURL)
	599	this.postProcessEditField();
	600	if (e) Event.stop(e);
		},
593		~~onclickCancel: function() {~~
594		~~this.onComplete();~~
595		~~this.leaveEditMode();~~
596		~~return false;~~
	602	enterHover: function(e) {
	603	if (this.options.hoverClassName)
	604	this.element.addClassName(this.options.hoverClassName);
	605	if (this._saving) return;
	606	this.triggerCallback('onEnterHover');
		},
598		~~onFailure: function(transport) {~~
599		~~this.options.onFailure(transport);~~
600		~~if (this.oldInnerHTML) {~~
601		~~this.element.innerHTML = this.oldInnerHTML;~~
602		~~this.oldInnerHTML = null;~~
	608	getText: function() {
	609	return this.element.innerHTML.unescapeHTML();
	610	},
	611	handleAJAXFailure: function(transport) {
	612	this.triggerCallback('onFailure', transport);
	613	if (this._oldInnerHTML) {
	614	this.element.innerHTML = this._oldInnerHTML;
	615	this._oldInnerHTML = null;
		}
604		~~return false;~~
		},
606		~~onSubmit: function() {~~
607		~~// onLoading resets these so we need to save them away for the Ajax call~~
608		~~var form = this.form;~~
609		~~var value = this.editField.value;~~
610
611		~~// do this first, sometimes the ajax call returns before we get a chance to switch on Saving...~~
612		~~// which means this will actually switch on Saving... after we've left edit mode causing Saving...~~
613		~~// to be displayed indefinitely~~
614		~~this.onLoading();~~
615
616		~~new Ajax.Updater(~~
617		{
618		~~success: this.element,~~
619		~~// don't update on failure (this could be an option)~~
620		~~failure: null~~
621		},
622		~~this.url,~~
623		~~Object.extend({~~
624		~~parameters: this.options.callback(form, value),~~
625		~~onComplete: this.onComplete.bind(this),~~
626		~~onFailure: this.onFailure.bind(this)~~
627		~~}, this.options.ajaxOptions)~~
628		);
629		~~// stop the event to avoid a page refresh in Safari~~
630		~~if (arguments.length > 1) {~~
631		~~Event.stop(arguments[0]);~~
	618	handleFormCancellation: function(e) {
	619	this.wrapUp();
	620	if (e) Event.stop(e);
	621	},
	622	handleFormSubmission: function(e) {
	623	var form = this._form;
	624	var value = $F(this._controls.editor);
	625	this.prepareSubmission();
	626	var params = this.options.callback(form, value) \|\| '';
	627	if (Object.isString(params))
	628	params = params.toQueryParams();
	629	params.editorId = this.element.id;
	630	if (this.options.htmlResponse) {
	631	var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
	632	Object.extend(options, {
	633	parameters: params,
	634	onComplete: this._boundWrapperHandler,
	635	onFailure: this._boundFailureHandler
	636	});
	637	new Ajax.Updater({ success: this.element }, this.url, options);
	638	} else {
	639	var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
	640	Object.extend(options, {
	641	parameters: params,
	642	onComplete: this._boundWrapperHandler,
	643	onFailure: this._boundFailureHandler
	644	});
	645	new Ajax.Request(this.url, options);
		}
633		~~return false;~~
	647	if (e) Event.stop(e);
		},
635		~~onLoading: function() {~~
636		~~this.saving = true;~~
	649	leaveEditMode: function() {
	650	this.element.removeClassName(this.options.savingClassName);
		this.removeForm();
		this.leaveHover();
	653	this.element.style.backgroundColor = this._originalBackground;
	654	this.element.show();
	655	if (this.options.externalControl)
	656	this.options.externalControl.show();
	657	this._saving = false;
	658	this._editing = false;
	659	this._oldInnerHTML = null;
	660	this.triggerCallback('onLeaveEditMode');
	661	},
	662	leaveHover: function(e) {
	663	if (this.options.hoverClassName)
	664	this.element.removeClassName(this.options.hoverClassName);
	665	if (this._saving) return;
	666	this.triggerCallback('onLeaveHover');
	667	},
	668	loadExternalText: function() {
	669	this._form.addClassName(this.options.loadingClassName);
	670	this._controls.editor.disabled = true;
	671	var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
	672	Object.extend(options, {
	673	parameters: 'editorId=' + encodeURIComponent(this.element.id),
	674	onComplete: Prototype.emptyFunction,
	675	onSuccess: function(transport) {
	676	this._form.removeClassName(this.options.loadingClassName);
	677	var text = transport.responseText;
	678	if (this.options.stripLoadedTextTags)
	679	text = text.stripTags();
	680	this._controls.editor.value = text;
	681	this._controls.editor.disabled = false;
	682	this.postProcessEditField();
	683	}.bind(this),
	684	onFailure: this._boundFailureHandler
	685	});
	686	new Ajax.Request(this.options.loadTextURL, options);
	687	},
	688	postProcessEditField: function() {
	689	var fpc = this.options.fieldPostCreation;
	690	if (fpc)
	691	$(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
	692	},
	693	prepareOptions: function() {
	694	this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
	695	Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
	696	[this._extraDefaultOptions].flatten().compact().each(function(defs) {
	697	Object.extend(this.options, defs);
	698	}.bind(this));
	699	},
	700	prepareSubmission: function() {
	701	this._saving = true;
	702	this.removeForm();
	703	this.leaveHover();
		this.showSaving();
		},
	706	registerListeners: function() {
	707	this._listeners = { };
	708	var listener;
	709	$H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
	710	listener = this[pair.value].bind(this);
	711	this._listeners[pair.key] = listener;
	712	if (!this.options.externalControlOnly)
	713	this.element.observe(pair.key, listener);
	714	if (this.options.externalControl)
	715	this.options.externalControl.observe(pair.key, listener);
	716	}.bind(this));
	717	},
	718	removeForm: function() {
	719	if (!this._form) return;
	720	this._form.remove();
	721	this._form = null;
	722	this._controls = { };
	723	},
		showSaving: function() {
642		~~this.oldInnerHTML = this.element.innerHTML;~~
	725	this._oldInnerHTML = this.element.innerHTML;
		this.element.innerHTML = this.options.savingText;
644		~~Element.addClassName(this.element, this.options.savingClassName);~~
645		~~this.element.style.backgroundColor = this.originalBackground;~~
646		~~Element.show(this.element);~~
	727	this.element.addClassName(this.options.savingClassName);
	728	this.element.style.backgroundColor = this._originalBackground;
	729	this.element.show();
		},
648		~~removeForm: function() {~~
649		~~if(this.form) {~~
650		~~if (this.form.parentNode) Element.remove(this.form);~~
651		~~this.form = null;~~
	731	triggerCallback: function(cbName, arg) {
	732	if ('function' == typeof this.options[cbName]) {
	733	this.options[cbName](this, arg);
		}
		},
654		~~enterHover: function() {~~
655		~~if (this.saving) return;~~
656		~~this.element.style.backgroundColor = this.options.highlightcolor;~~
657		~~if (this.effect) {~~
658		~~this.effect.cancel();~~
659		}
660		~~Element.addClassName(this.element, this.options.hoverClassName)~~
	736	unregisterListeners: function() {
	737	$H(this._listeners).each(function(pair) {
	738	if (!this.options.externalControlOnly)
	739	this.element.stopObserving(pair.key, pair.value);
	740	if (this.options.externalControl)
	741	this.options.externalControl.stopObserving(pair.key, pair.value);
	742	}.bind(this));
		},
662		~~leaveHover: function() {~~
663		~~if (this.options.backgroundColor) {~~
664		~~this.element.style.backgroundColor = this.oldBackground;~~
665		}
666		~~Element.removeClassName(this.element, this.options.hoverClassName)~~
667		~~if (this.saving) return;~~
668		~~this.effect = new Effect.Highlight(this.element, {~~
669		~~startcolor: this.options.highlightcolor,~~
670		~~endcolor: this.options.highlightendcolor,~~
671		~~restorecolor: this.originalBackground~~
	744	wrapUp: function(transport) {
	745	this.leaveEditMode();
	746	// Can't use triggerCallback due to backward compatibility: requires
	747	// binding + direct element
	748	this._boundComplete(transport, this.element);
	749	}
	750	});
	751
	752	Object.extend(Ajax.InPlaceEditor.prototype, {
	753	dispose: Ajax.InPlaceEditor.prototype.destroy
	754	});
	755
	756	Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
	757	initialize: function($super, element, url, options) {
	758	this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
	759	$super(element, url, options);
	760	},
	761
	762	createEditField: function() {
	763	var list = document.createElement('select');
	764	list.name = this.options.paramName;
	765	list.size = 1;
	766	this._controls.editor = list;
	767	this._collection = this.options.collection \|\| [];
	768	if (this.options.loadCollectionURL)
	769	this.loadCollection();
	770	else
	771	this.checkForExternalText();
	772	this._form.appendChild(this._controls.editor);
	773	},
	774
	775	loadCollection: function() {
	776	this._form.addClassName(this.options.loadingClassName);
	777	this.showLoadingText(this.options.loadingCollectionText);
	778	var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
	779	Object.extend(options, {
	780	parameters: 'editorId=' + encodeURIComponent(this.element.id),
	781	onComplete: Prototype.emptyFunction,
	782	onSuccess: function(transport) {
	783	var js = transport.responseText.strip();
	784	if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
	785	throw('Server returned an invalid collection representation.');
	786	this._collection = eval(js);
	787	this.checkForExternalText();
	788	}.bind(this),
	789	onFailure: this.onFailure
		});
	791	new Ajax.Request(this.options.loadCollectionURL, options);
		},
674		~~leaveEditMode: function() {~~
675		~~Element.removeClassName(this.element, this.options.savingClassName);~~
676		~~this.removeForm();~~
677		~~this.leaveHover();~~
678		~~this.element.style.backgroundColor = this.originalBackground;~~
679		~~Element.show(this.element);~~
680		~~if (this.options.externalControl) {~~
681		~~Element.show(this.options.externalControl);~~
	793
	794	showLoadingText: function(text) {
	795	this._controls.editor.disabled = true;
	796	var tempOption = this._controls.editor.firstChild;
	797	if (!tempOption) {
	798	tempOption = document.createElement('option');
	799	tempOption.value = '';
	800	this._controls.editor.appendChild(tempOption);
	801	tempOption.selected = true;
		}
683		~~this.editing = false;~~
684		~~this.saving = false;~~
685		~~this.oldInnerHTML = null;~~
686		~~this.onLeaveEditMode();~~
	803	tempOption.update((text \|\| '').stripScripts().stripTags());
		},
688		~~onComplete: function(transport) {~~
689		~~this.leaveEditMode();~~
690		~~this.options.onComplete.bind(this)(transport, this.element);~~
	805
	806	checkForExternalText: function() {
	807	this._text = this.getText();
	808	if (this.options.loadTextURL)
	809	this.loadExternalText();
	810	else
	811	this.buildOptionList();
		},
692		~~onEnterEditMode: function() {},~~
693		~~onLeaveEditMode: function() {},~~
694		~~dispose: function() {~~
695		~~if (this.oldInnerHTML) {~~
696		~~this.element.innerHTML = this.oldInnerHTML;~~
	813
	814	loadExternalText: function() {
	815	this.showLoadingText(this.options.loadingText);
	816	var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
	817	Object.extend(options, {
	818	parameters: 'editorId=' + encodeURIComponent(this.element.id),
	819	onComplete: Prototype.emptyFunction,
	820	onSuccess: function(transport) {
	821	this._text = transport.responseText.strip();
	822	this.buildOptionList();
	823	}.bind(this),
	824	onFailure: this.onFailure
	825	});
	826	new Ajax.Request(this.options.loadTextURL, options);
	827	},
	828
	829	buildOptionList: function() {
	830	this._form.removeClassName(this.options.loadingClassName);
	831	this._collection = this._collection.map(function(entry) {
	832	return 2 === entry.length ? entry : [entry, entry].flatten();
	833	});
	834	var marker = ('value' in this.options) ? this.options.value : this._text;
	835	var textFound = this._collection.any(function(entry) {
	836	return entry[0] == marker;
	837	}.bind(this));
	838	this._controls.editor.update('');
	839	var option;
	840	this._collection.each(function(entry, index) {
	841	option = document.createElement('option');
	842	option.value = entry[0];
	843	option.selected = textFound ? entry[0] == marker : 0 == index;
	844	option.appendChild(document.createTextNode(entry[1]));
	845	this._controls.editor.appendChild(option);
	846	}.bind(this));
	847	this._controls.editor.disabled = false;
	848	Field.scrollFreeActivate(this._controls.editor);
	849	}
	850	});
	851
	852	//** DEPRECATION LAYER FOR InPlace[Collection]Editor! **
	853	//** This only exists for a while, in order to let **
	854	//** users adapt to the new API. Read up on the new **
	855	//** API and convert your code to it ASAP! **
	856
	857	Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
	858	if (!options) return;
	859	function fallback(name, expr) {
	860	if (name in options \|\| expr === undefined) return;
	861	options[name] = expr;
	862	};
	863	fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
	864	options.cancelLink == options.cancelButton == false ? false : undefined)));
	865	fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
	866	options.okLink == options.okButton == false ? false : undefined)));
	867	fallback('highlightColor', options.highlightcolor);
	868	fallback('highlightEndColor', options.highlightendcolor);
	869	};
	870
	871	Object.extend(Ajax.InPlaceEditor, {
	872	DefaultOptions: {
	873	ajaxOptions: { },
	874	autoRows: 3, // Use when multi-line w/ rows == 1
	875	cancelControl: 'link', // 'link'\|'button'\|false
	876	cancelText: 'cancel',
	877	clickToEditText: 'Click to edit',
	878	externalControl: null, // id\|elt
	879	externalControlOnly: false,
	880	fieldPostCreation: 'activate', // 'activate'\|'focus'\|false
	881	formClassName: 'inplaceeditor-form',
	882	formId: null, // id\|elt
	883	highlightColor: '#ffff99',
	884	highlightEndColor: '#ffffff',
	885	hoverClassName: '',
	886	htmlResponse: true,
	887	loadingClassName: 'inplaceeditor-loading',
	888	loadingText: 'Loading...',
	889	okControl: 'button', // 'link'\|'button'\|false
	890	okText: 'ok',
	891	paramName: 'value',
	892	rows: 1, // If 1 and multi-line, uses autoRows
	893	savingClassName: 'inplaceeditor-saving',
	894	savingText: 'Saving...',
	895	size: 0,
	896	stripLoadedTextTags: false,
	897	submitOnBlur: false,
	898	textAfterControls: '',
	899	textBeforeControls: '',
	900	textBetweenControls: ''
	901	},
	902	DefaultCallbacks: {
	903	callback: function(form) {
	904	return Form.serialize(form);
	905	},
	906	onComplete: function(transport, element) {
	907	// For backward compatibility, this one is bound to the IPE, and passes
	908	// the element directly. It was too often customized, so we don't break it.
	909	new Effect.Highlight(element, {
	910	startcolor: this.options.highlightColor, keepBackgroundImage: true });
	911	},
	912	onEnterEditMode: null,
	913	onEnterHover: function(ipe) {
	914	ipe.element.style.backgroundColor = ipe.options.highlightColor;
	915	if (ipe._effect)
	916	ipe._effect.cancel();
	917	},
	918	onFailure: function(transport, ipe) {
	919	alert('Error communication with the server: ' + transport.responseText.stripTags());
	920	},
	921	onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
	922	onLeaveEditMode: null,
	923	onLeaveHover: function(ipe) {
	924	ipe._effect = new Effect.Highlight(ipe.element, {
	925	startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
	926	restorecolor: ipe._originalBackground, keepBackgroundImage: true
	927	});
		}
698		~~this.leaveEditMode();~~
699		~~Event.stopObserving(this.element, 'click', this.onclickListener);~~
700		~~Event.stopObserving(this.element, 'mouseover', this.mouseoverListener);~~
701		~~Event.stopObserving(this.element, 'mouseout', this.mouseoutListener);~~
702		~~if (this.options.externalControl) {~~
703		~~Event.stopObserving(this.options.externalControl, 'click', this.onclickListener);~~
704		~~Event.stopObserving(this.options.externalControl, 'mouseover', this.mouseoverListener);~~
705		~~Event.stopObserving(this.options.externalControl, 'mouseout', this.mouseoutListener);~~
706		}
	929	},
	930	Listeners: {
	931	click: 'enterEditMode',
	932	keydown: 'checkForEscapeOrReturn',
	933	mouseover: 'enterHover',
	934	mouseout: 'leaveHover'
		}
708		};

	937	});
	938
	939	Ajax.InPlaceCollectionEditor.DefaultOptions = {
	940	loadingCollectionText: 'Loading options...'
	941	};
	942
	943	// Delayed observer, like Form.Element.Observer,
	944	// but waits for delay after last key input
	945	// Ideal for live-search fields
	946
	947	Form.Element.DelayedObserver = Class.create({
	948	initialize: function(element, delay, callback) {
	949	this.delay = delay \|\| 0.5;
	950	this.element = $(element);
	951	this.callback = callback;
	952	this.timer = null;
	953	this.lastValue = $F(this.element);
	954	Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
	955	},
	956	delayedListener: function(event) {
	957	if(this.lastValue == $F(this.element)) return;
	958	if(this.timer) clearTimeout(this.timer);
	959	this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
	960	this.lastValue = $F(this.element);
	961	},
	962	onTimerEvent: function() {
	963	this.timer = null;
	964	this.callback(this.element, $F(this.element));
	965	}
	966	});

rool/rails/instiki/trunk/public/javascripts/dragdrop.js:

prev.	current

1		~~// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)~~
2		//
3		~~// Element.Class part Copyright (c) 2005 by Rick Olson~~
4		//
5		~~// See scriptaculous.js for full license.~~
	1	// script.aculo.us dragdrop.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009

7		~~/--------------------------------------------------------------------------/~~
	3	// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
	4	//
	5	// script.aculo.us is freely distributable under the terms of an MIT-style license.
	6	// For details, see the script.aculo.us web site: http://script.aculo.us/

	8	if(Object.isUndefined(Effect))
	9	throw("dragdrop.js requires including script.aculo.us' effects.js library");
	10
		var Droppables = {
		drops: [],

		remove: function(element) {
13		~~this.drops = this.drops.reject(function(d) { return d.element==element });~~
	15	this.drops = this.drops.reject(function(d) { return d.element==$(element) });
		},

		add: function(element) {
		element = $(element);
		var options = Object.extend({
		greedy: true,
20		~~hoverclass: null~~
21		~~}, arguments[1] \|\| {});~~
	22	hoverclass: null,
	23	tree: false
	24	}, arguments[1] \|\| { });

		// cache containers
		if(options.containment) {
		options._containers = [];
		var containment = options.containment;
27		~~if((typeof containment == 'object') &&~~
28		~~(containment.constructor == Array)) {~~
	30	if(Object.isArray(containment)) {
		containment.each( function(c) { options._containers.push($(c)) });
		} else {
		options._containers.push($(containment));
		}
		}

	37	if(options.accept) options.accept = [options.accept].flatten();
	38
		Element.makePositioned(element); // fix IE
		options.element = element;

		this.drops.push(options);
		},

	45	findDeepestChild: function(drops) {
	46	deepest = drops[0];
	47
	48	for (i = 1; i < drops.length; ++i)
	49	if (Element.isParent(drops[i].element, deepest.element))
	50	deepest = drops[i];
	51
	52	return deepest;
	53	},
	54
		isContained: function(element, drop) {
42		~~var parentNode = element.parentNode;~~
43		~~return drop._containers.detect(function(c) { return parentNode == c });~~
	56	var containmentNode;
	57	if(drop.tree) {
	58	containmentNode = element.treeNode;
	59	} else {
	60	containmentNode = element.parentNode;
	61	}
	62	return drop._containers.detect(function(c) { return containmentNode == c });
		},

46		~~isAffected: function(pX, pY, element, drop) {~~
	65	isAffected: function(point, element, drop) {
		return (
		(drop.element!=element) &&
		((!drop._containers) \|\|
		this.isContained(element, drop)) &&
		((!drop.accept) \|\|
52		~~(Element.Class.has_any(element, drop.accept))) &&~~
53		~~Position.within(drop.element, pX, pY) );~~
	71	(Element.classNames(element).detect(
	72	function(v) { return drop.accept.include(v) } ) )) &&
	73	Position.within(drop.element, point[0], point[1]) );
		},

		deactivate: function(drop) {
		if(drop.hoverclass)
58		~~Element.Class.remove(drop.element, drop.hoverclass);~~
	78	Element.removeClassName(drop.element, drop.hoverclass);
		this.last_active = null;
		},

		activate: function(drop) {
63		~~if(this.last_active) this.deactivate(this.last_active);~~
		if(drop.hoverclass)
65		~~Element.Class.add(drop.element, drop.hoverclass);~~
	84	Element.addClassName(drop.element, drop.hoverclass);
		this.last_active = drop;
		},

69		~~show: function(event, element) {~~
	88	show: function(point, element) {
		if(!this.drops.length) return;
71		~~var pX = Event.pointerX(event);~~
72		~~var pY = Event.pointerY(event);~~
73		~~Position.prepare();~~
	90	var drop, affected = [];

75		~~var i = this.drops.length-1; do {~~
76		~~var drop = this.drops[i];~~
77		~~if(this.isAffected(pX, pY, element, drop)) {~~
78		~~if(drop.onHover)~~
79		~~drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));~~
80		~~if(drop.greedy) {~~
81		~~this.activate(drop);~~
82		~~return;~~
83		}
84		}
85		~~} while (i--);~~
86
87		~~if(this.last_active) this.deactivate(this.last_active);~~
	92	this.drops.each( function(drop) {
	93	if(Droppables.isAffected(point, element, drop))
	94	affected.push(drop);
	95	});
	96
	97	if(affected.length>0)
	98	drop = Droppables.findDeepestChild(affected);
	99
	100	if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
	101	if (drop) {
	102	Position.within(drop.element, point[0], point[1]);
	103	if(drop.onHover)
	104	drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
	105
	106	if (drop != this.last_active) Droppables.activate(drop);
	107	}
		},

		fire: function(event, element) {
		if(!this.last_active) return;
		Position.prepare();

94		~~if (this.isAffected(Event.pointerX(event), Event.pointerY(event), element, this.last_active))~~
95		~~if (this.last_active.onDrop)~~
	114	if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
	115	if (this.last_active.onDrop) {
		this.last_active.onDrop(element, this.last_active.element, event);
	117	return true;
	118	}
		},

		reset: function() {
		if(this.last_active)
		this.deactivate(this.last_active);
		}
103		}
	125	};

		var Draggables = {
	128	drags: [],
		observers: [],
	130
	131	register: function(draggable) {
	132	if(this.drags.length == 0) {
	133	this.eventMouseUp = this.endDrag.bindAsEventListener(this);
	134	this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
	135	this.eventKeypress = this.keyPress.bindAsEventListener(this);
	136
	137	Event.observe(document, "mouseup", this.eventMouseUp);
	138	Event.observe(document, "mousemove", this.eventMouseMove);
	139	Event.observe(document, "keypress", this.eventKeypress);
	140	}
	141	this.drags.push(draggable);
	142	},
	143
	144	unregister: function(draggable) {
	145	this.drags = this.drags.reject(function(d) { return d==draggable });
	146	if(this.drags.length == 0) {
	147	Event.stopObserving(document, "mouseup", this.eventMouseUp);
	148	Event.stopObserving(document, "mousemove", this.eventMouseMove);
	149	Event.stopObserving(document, "keypress", this.eventKeypress);
	150	}
	151	},
	152
	153	activate: function(draggable) {
	154	if(draggable.options.delay) {
	155	this._timeout = setTimeout(function() {
	156	Draggables._timeout = null;
	157	window.focus();
	158	Draggables.activeDraggable = draggable;
	159	}.bind(this), draggable.options.delay);
	160	} else {
	161	window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
	162	this.activeDraggable = draggable;
	163	}
	164	},
	165
	166	deactivate: function() {
	167	this.activeDraggable = null;
	168	},
	169
	170	updateDrag: function(event) {
	171	if(!this.activeDraggable) return;
	172	var pointer = [Event.pointerX(event), Event.pointerY(event)];
	173	// Mozilla-based browsers fire successive mousemove events with
	174	// the same coordinates, prevent needless redrawing (moz bug?)
	175	if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
	176	this._lastPointer = pointer;
	177
	178	this.activeDraggable.updateDrag(event, pointer);
	179	},
	180
	181	endDrag: function(event) {
	182	if(this._timeout) {
	183	clearTimeout(this._timeout);
	184	this._timeout = null;
	185	}
	186	if(!this.activeDraggable) return;
	187	this._lastPointer = null;
	188	this.activeDraggable.endDrag(event);
	189	this.activeDraggable = null;
	190	},
	191
	192	keyPress: function(event) {
	193	if(this.activeDraggable)
	194	this.activeDraggable.keyPress(event);
	195	},
	196
		addObserver: function(observer) {
108		~~this.observers.push(observer);~~
	198	this.observers.push(observer);
	199	this._cacheObserverCallbacks();
		},
110		~~removeObserver: function(element) { // element instead of obsever fixes mem leaks~~
	201
	202	removeObserver: function(element) { // element instead of observer fixes mem leaks
		this.observers = this.observers.reject( function(o) { return o.element==element });
	204	this._cacheObserverCallbacks();
		},
113		~~notify: function(eventName, draggable) { // 'onStart', 'onEnd'~~
114		~~this.observers.invoke(eventName, draggable);~~
	206
	207	notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag'
	208	if(this[eventName+'Count'] > 0)
	209	this.observers.each( function(o) {
	210	if(o[eventName]) o[eventName](eventName, draggable, event);
	211	});
	212	if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
	213	},
	214
	215	_cacheObserverCallbacks: function() {
	216	['onStart','onEnd','onDrag'].each( function(eventName) {
	217	Draggables[eventName+'Count'] = Draggables.observers.select(
	218	function(o) { return o[eventName]; }
	219	).length;
	220	});
		}
116		}
	222	};

		/--------------------------------------------------------------------------/

120		~~var Draggable = Class.create();~~
121		~~Draggable.prototype = {~~
	226	var Draggable = Class.create({
		initialize: function(element) {
123		~~var options = Object.extend({~~
	228	var defaults = {
		handle: false,
125		~~starteffect: function(element) {~~
126		~~new Effect.Opacity(element, {duration:0.2, from:1.0, to:0.7});~~
127		},
		reverteffect: function(element, top_offset, left_offset) {
		var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
130		~~new Effect.MoveBy(element, -top_offset, -left_offset, {duration:dur});~~
	232	new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
	233	queue: {scope:'_draggable', position:'end'}
	234	});
		},
132		~~endeffect: function(element) {~~
133		~~new Effect.Opacity(element, {duration:0.2, from:0.7, to:1.0});~~
	236	endeffect: function(element) {
	237	var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
	238	new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
	239	queue: {scope:'_draggable', position:'end'},
	240	afterFinish: function(){
	241	Draggable._dragging[element] = false
	242	}
	243	});
		},
		zindex: 1000,
136		~~revert: false~~
137		~~}, arguments[1] \|\| {});~~
	246	revert: false,
	247	quiet: false,
	248	scroll: false,
	249	scrollSensitivity: 20,
	250	scrollSpeed: 15,
	251	snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] }
	252	delay: 0
	253	};

139		~~this.element = $(element);~~
140		~~if(options.handle && (typeof options.handle == 'string'))~~
141		~~this.handle = Element.Class.childrenWith(this.element, options.handle)[0];~~
142
	255	if(!arguments[1] \|\| Object.isUndefined(arguments[1].endeffect))
	256	Object.extend(defaults, {
	257	starteffect: function(element) {
	258	element._opacity = Element.getOpacity(element);
	259	Draggable._dragging[element] = true;
	260	new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
	261	}
	262	});
	263
	264	var options = Object.extend(defaults, arguments[1] \|\| { });
	265
	266	this.element = $(element);
	267
	268	if(options.handle && Object.isString(options.handle))
	269	this.handle = this.element.down('.'+options.handle, 0);
	270
		if(!this.handle) this.handle = $(options.handle);
		if(!this.handle) this.handle = this.element;

146		~~Element.makePositioned(this.element); // fix IE~~
	274	if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
	275	options.scroll = $(options.scroll);
	276	this._isScrollChild = Element.childOf(this.element, options.scroll);
	277	}

148		~~this.offsetX = 0;~~
149		~~this.offsetY = 0;~~
150		~~this.originalLeft = this.currentLeft();~~
151		~~this.originalTop = this.currentTop();~~
152		~~this.originalX = this.element.offsetLeft;~~
153		~~this.originalY = this.element.offsetTop;~~
	279	Element.makePositioned(this.element); // fix IE

155		~~this.options = options;~~
	281	this.options = options;
	282	this.dragging = false;

157		~~this.active = false;~~
158		~~this.dragging = false;~~
	284	this.eventMouseDown = this.initDrag.bindAsEventListener(this);
	285	Event.observe(this.handle, "mousedown", this.eventMouseDown);

160		~~this.eventMouseDown = this.startDrag.bindAsEventListener(this);~~
161		~~this.eventMouseUp = this.endDrag.bindAsEventListener(this);~~
162		~~this.eventMouseMove = this.update.bindAsEventListener(this);~~
163		~~this.eventKeypress = this.keyPress.bindAsEventListener(this);~~
164
165		~~this.registerEvents();~~
	287	Draggables.register(this);
		},
	289
		destroy: function() {
		Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
169		~~this.unregisterEvents();~~
	292	Draggables.unregister(this);
		},
171		~~registerEvents: function() {~~
172		~~Event.observe(document, "mouseup", this.eventMouseUp);~~
173		~~Event.observe(document, "mousemove", this.eventMouseMove);~~
174		~~Event.observe(document, "keypress", this.eventKeypress);~~
175		~~Event.observe(this.handle, "mousedown", this.eventMouseDown);~~
	294
	295	currentDelta: function() {
	296	return([
	297	parseInt(Element.getStyle(this.element,'left') \|\| '0'),
	298	parseInt(Element.getStyle(this.element,'top') \|\| '0')]);
		},
177		~~unregisterEvents: function() {~~
178		~~//if(!this.active) return;~~
179		~~//Event.stopObserving(document, "mouseup", this.eventMouseUp);~~
180		~~//Event.stopObserving(document, "mousemove", this.eventMouseMove);~~
181		~~//Event.stopObserving(document, "keypress", this.eventKeypress);~~
182		},
183		~~currentLeft: function() {~~
184		~~return parseInt(this.element.style.left \|\| '0');~~
185		},
186		~~currentTop: function() {~~
187		~~return parseInt(this.element.style.top \|\| '0')~~
188		},
189		~~startDrag: function(event) {~~
	300
	301	initDrag: function(event) {
	302	if(!Object.isUndefined(Draggable._dragging[this.element]) &&
	303	Draggable._dragging[this.element]) return;
		if(Event.isLeftClick(event)) {
191
		// abort on form elements, fixes a Firefox issue
		var src = Event.element(event);
194		~~if(src.tagName && (~~
195		~~src.tagName=='INPUT' \|\|~~
196		~~src.tagName=='SELECT' \|\|~~
197		~~src.tagName=='BUTTON' \|\|~~
198		~~src.tagName=='TEXTAREA')) return;~~
199
200		~~// this.registerEvents();~~
201		~~this.active = true;~~
	307	if((tag_name = src.tagName.toUpperCase()) && (
	308	tag_name=='INPUT' \|\|
	309	tag_name=='SELECT' \|\|
	310	tag_name=='OPTION' \|\|
	311	tag_name=='BUTTON' \|\|
	312	tag_name=='TEXTAREA')) return;
	313
		var pointer = [Event.pointerX(event), Event.pointerY(event)];
203		~~var offsets = Position.cumulativeOffset(this.element);~~
204		~~this.offsetX = (pointer[0] - offsets[0]);~~
205		~~this.offsetY = (pointer[1] - offsets[1]);~~
	315	var pos = this.element.cumulativeOffset();
	316	this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
	317
	318	Draggables.activate(this);
		Event.stop(event);
		}
		},
	322
	323	startDrag: function(event) {
	324	this.dragging = true;
	325	if(!this.delta)
	326	this.delta = this.currentDelta();
	327
	328	if(this.options.zindex) {
	329	this.originalZ = parseInt(Element.getStyle(this.element,'z-index') \|\| 0);
	330	this.element.style.zIndex = this.options.zindex;
	331	}
	332
	333	if(this.options.ghosting) {
	334	this._clone = this.element.cloneNode(true);
	335	this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
	336	if (!this._originallyAbsolute)
	337	Position.absolutize(this.element);
	338	this.element.parentNode.insertBefore(this._clone, this.element);
	339	}
	340
	341	if(this.options.scroll) {
	342	if (this.options.scroll == window) {
	343	var where = this._getWindowScroll(this.options.scroll);
	344	this.originalScrollLeft = where.left;
	345	this.originalScrollTop = where.top;
	346	} else {
	347	this.originalScrollLeft = this.options.scroll.scrollLeft;
	348	this.originalScrollTop = this.options.scroll.scrollTop;
	349	}
	350	}
	351
	352	Draggables.notify('onStart', this, event);
	353
	354	if(this.options.starteffect) this.options.starteffect(this.element);
	355	},
	356
	357	updateDrag: function(event, pointer) {
	358	if(!this.dragging) this.startDrag(event);
	359
	360	if(!this.options.quiet){
	361	Position.prepare();
	362	Droppables.show(pointer, this.element);
	363	}
	364
	365	Draggables.notify('onDrag', this, event);
	366
	367	this.draw(pointer);
	368	if(this.options.change) this.options.change(this);
	369
	370	if(this.options.scroll) {
	371	this.stopScrolling();
	372
	373	var p;
	374	if (this.options.scroll == window) {
	375	with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
	376	} else {
	377	p = Position.page(this.options.scroll);
	378	p[0] += this.options.scroll.scrollLeft + Position.deltaX;
	379	p[1] += this.options.scroll.scrollTop + Position.deltaY;
	380	p.push(p[0]+this.options.scroll.offsetWidth);
	381	p.push(p[1]+this.options.scroll.offsetHeight);
	382	}
	383	var speed = [0,0];
	384	if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
	385	if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
	386	if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
	387	if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
	388	this.startScrolling(speed);
	389	}
	390
	391	// fix AppleWebKit rendering
	392	if(Prototype.Browser.WebKit) window.scrollBy(0,0);
	393
	394	Event.stop(event);
	395	},
	396
		finishDrag: function(event, success) {
210		~~// this.unregisterEvents();~~
211
212		~~this.active = false;~~
		this.dragging = false;

	400	if(this.options.quiet){
	401	Position.prepare();
	402	var pointer = [Event.pointerX(event), Event.pointerY(event)];
	403	Droppables.show(pointer, this.element);
	404	}
	405
		if(this.options.ghosting) {
216		~~Position.relativize(this.element);~~
	407	if (!this._originallyAbsolute)
	408	Position.relativize(this.element);
	409	delete this._originallyAbsolute;
		Element.remove(this._clone);
		this._clone = null;
		}

221		~~if(success) Droppables.fire(event, this.element);~~
222		~~Draggables.notify('onEnd', this);~~
	414	var dropped = false;
	415	if(success) {
	416	dropped = Droppables.fire(event, this.element);
	417	if (!dropped) dropped = false;
	418	}
	419	if(dropped && this.options.onDropped) this.options.onDropped(this.element);
	420	Draggables.notify('onEnd', this, event);

		var revert = this.options.revert;
225		~~if(revert && typeof revert == 'function') revert = revert(this.element);~~
	423	if(revert && Object.isFunction(revert)) revert = revert(this.element);

	425	var d = this.currentDelta();
		if(revert && this.options.reverteffect) {
228		~~this.options.reverteffect(this.element,~~
229		~~this.currentTop()-this.originalTop,~~
230		~~this.currentLeft()-this.originalLeft);~~
	427	if (dropped == 0 \|\| revert != 'failure')
	428	this.options.reverteffect(this.element,
	429	d[1]-this.delta[1], d[0]-this.delta[0]);
		} else {
232		~~this.originalLeft = this.currentLeft();~~
233		~~this.originalTop = this.currentTop();~~
	431	this.delta = d;
		}

		if(this.options.zindex)
		this.element.style.zIndex = this.originalZ;

239		~~if(this.options.endeffect)~~
	437	if(this.options.endeffect)
		this.options.endeffect(this.element);

242
	440	Draggables.deactivate(this);
		Droppables.reset();
		},
	443
		keyPress: function(event) {
246		~~if(this.active) {~~
247		~~if(event.keyCode==Event.KEY_ESC) {~~
248		~~this.finishDrag(event, false);~~
249		~~Event.stop(event);~~
250		}
251		}
	445	if(event.keyCode!=Event.KEY_ESC) return;
	446	this.finishDrag(event, false);
	447	Event.stop(event);
		},
	449
		endDrag: function(event) {
254		~~if(this.active && this.dragging) {~~
255		~~this.finishDrag(event, true);~~
256		~~Event.stop(event);~~
	451	if(!this.dragging) return;
	452	this.stopScrolling();
	453	this.finishDrag(event, true);
	454	Event.stop(event);
	455	},
	456
	457	draw: function(point) {
	458	var pos = this.element.cumulativeOffset();
	459	if(this.options.ghosting) {
	460	var r = Position.realOffset(this.element);
	461	pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
		}
258		~~this.active = false;~~
259		~~this.dragging = false;~~
260		},
261		~~draw: function(event) {~~
262		~~var pointer = [Event.pointerX(event), Event.pointerY(event)];~~
263		~~var offsets = Position.cumulativeOffset(this.element);~~
264		~~offsets[0] -= this.currentLeft();~~
265		~~offsets[1] -= this.currentTop();~~
	463
	464	var d = this.currentDelta();
	465	pos[0] -= d[0]; pos[1] -= d[1];
	466
	467	if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
	468	pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
	469	pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
	470	}
	471
	472	var p = [0,1].map(function(i){
	473	return (point[i]-pos[i]-this.offset[i])
	474	}.bind(this));
	475
	476	if(this.options.snap) {
	477	if(Object.isFunction(this.options.snap)) {
	478	p = this.options.snap(p[0],p[1],this);
	479	} else {
	480	if(Object.isArray(this.options.snap)) {
	481	p = p.map( function(v, i) {
	482	return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
	483	} else {
	484	p = p.map( function(v) {
	485	return (v/this.options.snap).round()*this.options.snap }.bind(this));
	486	}
	487	}}
	488
		var style = this.element.style;
		if((!this.options.constraint) \|\| (this.options.constraint=='horizontal'))
268		~~style.left = (pointer[0] - offsets[0] - this.offsetX) + "px";~~
	491	style.left = p[0] + "px";
		if((!this.options.constraint) \|\| (this.options.constraint=='vertical'))
270		~~style.top = (pointer[1] - offsets[1] - this.offsetY) + "px";~~
	493	style.top = p[1] + "px";
	494
		if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
		},
273		~~update: function(event) {~~
274		~~if(this.active) {~~
275		~~if(!this.dragging) {~~
276		~~var style = this.element.style;~~
277		~~this.dragging = true;~~
278
279		~~if(Element.getStyle(this.element,'position')=='')~~
280		~~style.position = "relative";~~
281
282		~~if(this.options.zindex) {~~
283		~~this.options.originalZ = parseInt(Element.getStyle(this.element,'z-index') \|\| 0);~~
284		~~style.zIndex = this.options.zindex;~~
285		}

287		~~if(this.options.ghosting) {~~
288		~~this._clone = this.element.cloneNode(true);~~
289		~~Position.absolutize(this.element);~~
290		~~this.element.parentNode.insertBefore(this._clone, this.element);~~
	498	stopScrolling: function() {
	499	if(this.scrollInterval) {
	500	clearInterval(this.scrollInterval);
	501	this.scrollInterval = null;
	502	Draggables._lastScrollPointer = null;
	503	}
	504	},
	505
	506	startScrolling: function(speed) {
	507	if(!(speed[0] \|\| speed[1])) return;
	508	this.scrollSpeed = [speed[0]this.options.scrollSpeed,speed[1]this.options.scrollSpeed];
	509	this.lastScrolled = new Date();
	510	this.scrollInterval = setInterval(this.scroll.bind(this), 10);
	511	},
	512
	513	scroll: function() {
	514	var current = new Date();
	515	var delta = current - this.lastScrolled;
	516	this.lastScrolled = current;
	517	if(this.options.scroll == window) {
	518	with (this._getWindowScroll(this.options.scroll)) {
	519	if (this.scrollSpeed[0] \|\| this.scrollSpeed[1]) {
	520	var d = delta / 1000;
	521	this.options.scroll.scrollTo( left + dthis.scrollSpeed[0], top + dthis.scrollSpeed[1] );
		}
292
293		~~Draggables.notify('onStart', this);~~
294		~~if(this.options.starteffect) this.options.starteffect(this.element);~~
		}
	524	} else {
	525	this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
	526	this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000;
	527	}

297		~~Droppables.show(event, this.element);~~
298		~~this.draw(event);~~
299		~~if(this.options.change) this.options.change(this);~~
	529	Position.prepare();
	530	Droppables.show(Draggables._lastPointer, this.element);
	531	Draggables.notify('onDrag', this);
	532	if (this._isScrollChild) {
	533	Draggables._lastScrollPointer = Draggables._lastScrollPointer \|\| $A(Draggables._lastPointer);
	534	Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
	535	Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
	536	if (Draggables._lastScrollPointer[0] < 0)
	537	Draggables._lastScrollPointer[0] = 0;
	538	if (Draggables._lastScrollPointer[1] < 0)
	539	Draggables._lastScrollPointer[1] = 0;
	540	this.draw(Draggables._lastScrollPointer);
	541	}

301		~~// fix AppleWebKit rendering~~
302		~~if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);~~
	543	if(this.options.change) this.options.change(this);
	544	},

304		~~Event.stop(event);~~
305		}
	546	_getWindowScroll: function(w) {
	547	var T, L, W, H;
	548	with (w.document) {
	549	if (w.document.documentElement && documentElement.scrollTop) {
	550	T = documentElement.scrollTop;
	551	L = documentElement.scrollLeft;
	552	} else if (w.document.body) {
	553	T = body.scrollTop;
	554	L = body.scrollLeft;
	555	}
	556	if (w.innerWidth) {
	557	W = w.innerWidth;
	558	H = w.innerHeight;
	559	} else if (w.document.documentElement && documentElement.clientWidth) {
	560	W = documentElement.clientWidth;
	561	H = documentElement.clientHeight;
	562	} else {
	563	W = body.offsetWidth;
	564	H = body.offsetHeight;
	565	}
	566	}
	567	return { top: T, left: L, width: W, height: H };
		}
307		}
	569	});

	571	Draggable._dragging = { };
	572
		/--------------------------------------------------------------------------/

311		~~var SortableObserver = Class.create();~~
312		~~SortableObserver.prototype = {~~
	575	var SortableObserver = Class.create({
		initialize: function(element, observer) {
		this.element = $(element);
		this.observer = observer;
		this.lastValue = Sortable.serialize(this.element);
		},
	581
		onStart: function() {
		this.lastValue = Sortable.serialize(this.element);
		},
	585
		onEnd: function() {
		Sortable.unmark();
		if(this.lastValue != Sortable.serialize(this.element))
		this.observer(this.element)
		}
326		}
	591	});

		var Sortable = {
329		~~sortables: new Array(),~~
330		~~options: function(element){~~
331		~~element = $(element);~~
332		~~return this.sortables.detect(function(s) { return s.element == element });~~
	594	SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_])[_](.)$/,
	595
	596	sortables: { },
	597
	598	_findRootElement: function(element) {
	599	while (element.tagName.toUpperCase() != "BODY") {
	600	if(element.id && Sortable.sortables[element.id]) return element;
	601	element = element.parentNode;
	602	}
		},
	604
	605	options: function(element) {
	606	element = Sortable._findRootElement($(element));
	607	if(!element) return;
	608	return Sortable.sortables[element.id];
	609	},
	610
		destroy: function(element){
		element = $(element);
336		~~this.sortables.findAll(function(s) { return s.element == element }).each(function(s){~~
	613	var s = Sortable.sortables[element.id];
	614
	615	if(s) {
		Draggables.removeObserver(s.element);
		s.droppables.each(function(d){ Droppables.remove(d) });
		s.draggables.invoke('destroy');
340		~~});~~
341		~~this.sortables = this.sortables.reject(function(s) { return s.element == element });~~
	619
	620	delete Sortable.sortables[s.element.id];
	621	}
		},
	623
		create: function(element) {
		element = $(element);
345		~~var options = Object.extend({~~
	626	var options = Object.extend({
		element: element,
		tag: 'li', // assumes li children, override with tag: 'tagname'
		dropOnEmpty: false,
349		~~tree: false, // fixme: unimplemented~~
	630	tree: false,
	631	treeTag: 'ul',
		overlap: 'vertical', // one of 'vertical', 'horizontal'
		constraint: 'vertical', // one of 'vertical', 'horizontal', false
		containment: element, // also takes array of elements (or id's); or false
		handle: false, // or a CSS class
		only: false,
	637	delay: 0,
		hoverclass: null,
		ghosting: false,
357		~~format: null,~~
358		~~onChange: function() {},~~
359		~~onUpdate: function() {}~~
360		~~}, arguments[1] \|\| {});~~
	640	quiet: false,
	641	scroll: false,
	642	scrollSensitivity: 20,
	643	scrollSpeed: 15,
	644	format: this.SERIALIZE_RULE,

	646	// these take arrays of elements or ids and can be
	647	// used for better initialization performance
	648	elements: false,
	649	handles: false,
	650
	651	onChange: Prototype.emptyFunction,
	652	onUpdate: Prototype.emptyFunction
	653	}, arguments[1] \|\| { });
	654
		// clear any old sortable with same element
		this.destroy(element);

		// build options for the draggables
		var options_for_draggable = {
		revert: true,
	661	quiet: options.quiet,
	662	scroll: options.scroll,
	663	scrollSpeed: options.scrollSpeed,
	664	scrollSensitivity: options.scrollSensitivity,
	665	delay: options.delay,
		ghosting: options.ghosting,
		constraint: options.constraint,
		handle: options.handle };
...	...
		if(options.zindex)
		options_for_draggable.zindex = options.zindex;

389		~~// build options for the droppables~~
	687	// build options for the droppables
		var options_for_droppable = {
		overlap: options.overlap,
		containment: options.containment,
	691	tree: options.tree,
		hoverclass: options.hoverclass,
394		~~onHover: Sortable.onHover,~~
395		~~greedy: !options.dropOnEmpty~~
396		}
	693	onHover: Sortable.onHover
	694	};

	696	var options_for_tree = {
	697	onHover: Sortable.onEmptyHover,
	698	overlap: options.overlap,
	699	containment: options.containment,
	700	hoverclass: options.hoverclass
	701	};
	702
		// fix for gecko engine
399		~~Element.cleanWhitespace(element);~~
	704	Element.cleanWhitespace(element);

		options.draggables = [];
		options.droppables = [];

404		~~// make it so~~
405
		// drop on empty handling
407		~~if(options.dropOnEmpty) {~~
408		~~Droppables.add(element,~~
409		~~{containment: options.containment, onHover: Sortable.onEmptyHover, greedy: false});~~
	710	if(options.dropOnEmpty \|\| options.tree) {
	711	Droppables.add(element, options_for_tree);
		options.droppables.push(element);
		}

413		~~(this.findElements(element, options) \|\| []).each( function(e) {~~
414		~~// handles are per-draggable~~
415		~~var handle = options.handle ?~~
416		~~Element.Class.childrenWith(e, options.handle)[0] : e;~~
	715	(options.elements \|\| this.findElements(element, options) \|\| []).each( function(e,i) {
	716	var handle = options.handles ? $(options.handles[i]) :
	717	(options.handle ? $(e).select('.' + options.handle)[0] : e);
		options.draggables.push(
		new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
		Droppables.add(e, options_for_droppable);
420		~~options.droppables.push(e);~~
	721	if(options.tree) e.treeNode = element;
	722	options.droppables.push(e);
		});

	725	if(options.tree) {
	726	(Sortable.findTreeElements(element, options) \|\| []).each( function(e) {
	727	Droppables.add(e, options_for_tree);
	728	e.treeNode = element;
	729	options.droppables.push(e);
	730	});
	731	}
	732
		// keep reference
424		~~this.sortables.push(options);~~
	734	this.sortables[element.identify()] = options;

		// for onupdate
		Draggables.addObserver(new SortableObserver(element, options.onUpdate));
...	...

		// return all suitable-for-sortable elements in a guaranteed order
		findElements: function(element, options) {
433		~~if(!element.hasChildNodes()) return null;~~
434		~~var elements = [];~~
435		~~$A(element.childNodes).each( function(e) {~~
436		~~if(e.tagName && e.tagName==options.tag.toUpperCase() &&~~
437		~~(!options.only \|\| (Element.Class.has(e, options.only))))~~
438		~~elements.push(e);~~
439		~~if(options.tree) {~~
440		~~var grandchildren = this.findElements(e, options);~~
441		~~if(grandchildren) elements.push(grandchildren);~~
442		}
443		~~});~~
	743	return Element.findChildren(
	744	element, options.only, options.tree ? true : false, options.tag);
	745	},

445		~~return (elements.length>0 ? elements.flatten() : null);~~
	747	findTreeElements: function(element, options) {
	748	return Element.findChildren(
	749	element, options.only, options.tree ? true : false, options.treeTag);
		},

		onHover: function(element, dropon, overlap) {
449		~~if(overlap>0.5) {~~
	753	if(Element.isParent(dropon, element)) return;
	754
	755	if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
	756	return;
	757	} else if(overlap>0.5) {
		Sortable.mark(dropon, 'before');
		if(dropon.previousSibling != element) {
		var oldParentNode = element.parentNode;
		element.style.visibility = "hidden"; // fix gecko rendering
		dropon.parentNode.insertBefore(element, dropon);
455		~~if(dropon.parentNode!=oldParentNode)~~
	763	if(dropon.parentNode!=oldParentNode)
		Sortable.options(oldParentNode).onChange(element);
		Sortable.options(dropon.parentNode).onChange(element);
		}
...	...
		var oldParentNode = element.parentNode;
		element.style.visibility = "hidden"; // fix gecko rendering
		dropon.parentNode.insertBefore(element, nextElement);
466		~~if(dropon.parentNode!=oldParentNode)~~
	774	if(dropon.parentNode!=oldParentNode)
		Sortable.options(oldParentNode).onChange(element);
		Sortable.options(dropon.parentNode).onChange(element);
		}
		}
		},

473		~~onEmptyHover: function(element, dropon) {~~
474		~~if(element.parentNode!=dropon) {~~
475		~~dropon.appendChild(element);~~
	781	onEmptyHover: function(element, dropon, overlap) {
	782	var oldParentNode = element.parentNode;
	783	var droponOptions = Sortable.options(dropon);
	784
	785	if(!Element.isParent(dropon, element)) {
	786	var index;
	787
	788	var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
	789	var child = null;
	790
	791	if(children) {
	792	var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
	793
	794	for (index = 0; index < children.length; index += 1) {
	795	if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
	796	offset -= Element.offsetSize (children[index], droponOptions.overlap);
	797	} else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
	798	child = index + 1 < children.length ? children[index + 1] : null;
	799	break;
	800	} else {
	801	child = children[index];
	802	break;
	803	}
	804	}
	805	}
	806
	807	dropon.insertBefore(element, child);
	808
	809	Sortable.options(oldParentNode).onChange(element);
	810	droponOptions.onChange(element);
		}
		},

		unmark: function() {
480		~~if(Sortable._marker) Element.hide(Sortable._marker);~~
	815	if(Sortable._marker) Sortable._marker.hide();
		},

		mark: function(dropon, position) {
		// mark on ghosting only
		var sortable = Sortable.options(dropon.parentNode);
486		~~if(sortable && !sortable.ghosting) return;~~
	821	if(sortable && !sortable.ghosting) return;

		if(!Sortable._marker) {
489		~~Sortable._marker = $('dropmarker') \|\| document.createElement('DIV');~~
490		~~Element.hide(Sortable._marker);~~
491		~~Element.Class.add(Sortable._marker, 'dropmarker');~~
492		~~Sortable._marker.style.position = 'absolute';~~
	824	Sortable._marker =
	825	($('dropmarker') \|\| Element.extend(document.createElement('DIV'))).
	826	hide().addClassName('dropmarker').setStyle({position:'absolute'});
		document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
494		}
495		~~var offsets = Position.cumulativeOffset(dropon);~~
496		~~Sortable._marker.style.top = offsets[1] + 'px';~~
497		~~if(position=='after') Sortable._marker.style.top = (offsets[1]+dropon.clientHeight) + 'px';~~
498		~~Sortable._marker.style.left = offsets[0] + 'px';~~
499		~~Element.show(Sortable._marker);~~
	828	}
	829	var offsets = dropon.cumulativeOffset();
	830	Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
	831
	832	if(position=='after')
	833	if(sortable.overlap == 'horizontal')
	834	Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
	835	else
	836	Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
	837
	838	Sortable._marker.show();
		},

502		~~serialize: function(element) {~~
	841	_tree: function(element, options, parent) {
	842	var children = Sortable.findElements(element, options) \|\| [];
	843
	844	for (var i = 0; i < children.length; ++i) {
	845	var match = children[i].id.match(options.format);
	846
	847	if (!match) continue;
	848
	849	var child = {
	850	id: encodeURIComponent(match ? match[1] : null),
	851	element: element,
	852	parent: parent,
	853	children: [],
	854	position: parent.children.length,
	855	container: $(children[i]).down(options.treeTag)
	856	};
	857
	858	/* Get the element containing the children and recurse over it */
	859	if (child.container)
	860	this._tree(child.container, options, child);
	861
	862	parent.children.push (child);
	863	}
	864
	865	return parent;
	866	},
	867
	868	tree: function(element) {
		element = $(element);
		var sortableOptions = this.options(element);
		var options = Object.extend({
506		~~tag: sortableOptions.tag,~~
	872	tag: sortableOptions.tag,
	873	treeTag: sortableOptions.treeTag,
		only: sortableOptions.only,
		name: element.id,
509		~~format: sortableOptions.format \|\| /^[^_]_(.)$/~~
510		~~}, arguments[1] \|\| {});~~
511		~~return $(this.findElements(element, options) \|\| []).collect( function(item) {~~
512		~~return (encodeURIComponent(options.name) + "[]=" +~~
513		~~encodeURIComponent(item.id.match(options.format) ? item.id.match(options.format)[1] : ''));~~
514		~~}).join("&");~~
	876	format: sortableOptions.format
	877	}, arguments[1] \|\| { });
	878
	879	var root = {
	880	id: null,
	881	parent: null,
	882	children: [],
	883	container: element,
	884	position: 0
	885	};
	886
	887	return Sortable._tree(element, options, root);
	888	},
	889
	890	/* Construct a [i] index for a particular node */
	891	_constructIndex: function(node) {
	892	var index = '';
	893	do {
	894	if (node.id) index = '[' + node.position + ']' + index;
	895	} while ((node = node.parent) != null);
	896	return index;
	897	},
	898
	899	sequence: function(element) {
	900	element = $(element);
	901	var options = Object.extend(this.options(element), arguments[1] \|\| { });
	902
	903	return $(this.findElements(element, options) \|\| []).map( function(item) {
	904	return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
	905	});
	906	},
	907
	908	setSequence: function(element, new_sequence) {
	909	element = $(element);
	910	var options = Object.extend(this.options(element), arguments[2] \|\| { });
	911
	912	var nodeMap = { };
	913	this.findElements(element, options).each( function(n) {
	914	if (n.id.match(options.format))
	915	nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
	916	n.parentNode.removeChild(n);
	917	});
	918
	919	new_sequence.each(function(ident) {
	920	var n = nodeMap[ident];
	921	if (n) {
	922	n[1].appendChild(n[0]);
	923	delete nodeMap[ident];
	924	}
	925	});
	926	},
	927
	928	serialize: function(element) {
	929	element = $(element);
	930	var options = Object.extend(Sortable.options(element), arguments[1] \|\| { });
	931	var name = encodeURIComponent(
	932	(arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
	933
	934	if (options.tree) {
	935	return Sortable.tree(element, arguments[1]).children.map( function (item) {
	936	return [name + Sortable._constructIndex(item) + "[id]=" +
	937	encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
	938	}).flatten().join('&');
	939	} else {
	940	return Sortable.sequence(element, arguments[1]).map( function(item) {
	941	return name + "[]=" + encodeURIComponent(item);
	942	}).join('&');
	943	}
		}
516		}

	946	};
	947
	948	// Returns true if child is contained within element
	949	Element.isParent = function(child, element) {
	950	if (!child.parentNode \|\| child == element) return false;
	951	if (child.parentNode == element) return true;
	952	return Element.isParent(child.parentNode, element);
	953	};
	954
	955	Element.findChildren = function(element, only, recursive, tagName) {
	956	if(!element.hasChildNodes()) return null;
	957	tagName = tagName.toUpperCase();
	958	if(only) only = [only].flatten();
	959	var elements = [];
	960	$A(element.childNodes).each( function(e) {
	961	if(e.tagName && e.tagName.toUpperCase()==tagName &&
	962	(!only \|\| (Element.classNames(e).detect(function(v) { return only.include(v) }))))
	963	elements.push(e);
	964	if(recursive) {
	965	var grandchildren = Element.findChildren(e, only, recursive, tagName);
	966	if(grandchildren) elements.push(grandchildren);
	967	}
	968	});
	969
	970	return (elements.length>0 ? elements.flatten() : []);
	971	};
	972
	973	Element.offsetSize = function (element, type) {
	974	return element['offset' + ((type=='vertical' \|\| type=='height') ? 'Height' : 'Width')];
	975	};

rool/rails/instiki/trunk/public/javascripts/effects.js:

prev.	current

1		~~// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)~~
	1	// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
	2
	3	// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
		// Contributors:
		// Justin Palmer (http://encytemedia.com/)
		// Mark Pilgrim (http://diveintomark.org/)
		// Martin Bialasinki
6		//
7		~~// See scriptaculous.js for full license.~~
	8	//
	9	// script.aculo.us is freely distributable under the terms of an MIT-style license.
	10	// For details, see the script.aculo.us web site: http://script.aculo.us/

9		~~Object.debug = function(obj) {~~
10		~~var info = [];~~
11
12		~~if(typeof obj in ["string","number"]) {~~
13		~~return obj;~~
14		~~} else {~~
15		~~for(property in obj)~~
16		~~if(typeof obj[property]!="function")~~
17		~~info.push(property + ' => ' +~~
18		~~(typeof obj[property] == "string" ?~~
19		~~'"' + obj[property] + '"' :~~
20		~~obj[property]));~~
21		}
22
23		~~return ("'" + obj + "' #" + typeof obj +~~
24		~~": {" + info.join(", ") + "}");~~
25		}
26
27
28		~~/--------------------------------------------------------------------------/~~
29
30		~~var Builder = {~~
31		~~NODEMAP: {~~
32		~~AREA: 'map',~~
33		~~CAPTION: 'table',~~
34		~~COL: 'table',~~
35		~~COLGROUP: 'table',~~
36		~~LEGEND: 'fieldset',~~
37		~~OPTGROUP: 'select',~~
38		~~OPTION: 'select',~~
39		~~PARAM: 'object',~~
40		~~TBODY: 'table',~~
41		~~TD: 'table',~~
42		~~TFOOT: 'table',~~
43		~~TH: 'table',~~
44		~~THEAD: 'table',~~
45		~~TR: 'table'~~
46		},
47		~~// note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,~~
48		~~// due to a Firefox bug~~
49		~~node: function(elementName) {~~
50		~~elementName = elementName.toUpperCase();~~
51
52		~~// try innerHTML approach~~
53		~~var parentTag = this.NODEMAP[elementName] \|\| 'div';~~
54		~~var parentElement = document.createElement(parentTag);~~
55		~~parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";~~
56		~~var element = parentElement.firstChild \|\| null;~~
57
58		~~// see if browser added wrapping tags~~
59		~~if(element && (element.tagName != elementName))~~
60		~~element = element.getElementsByTagName(elementName)[0];~~
61
62		~~// fallback to createElement approach~~
63		~~if(!element) element = document.createElement(elementName);~~
64
65		~~// abort if nothing could be created~~
66		~~if(!element) return;~~
67
68		~~// attributes (or text)~~
69		~~if(arguments[1])~~
70		~~if(this._isStringOrNumber(arguments[1]) \|\|~~
71		~~(arguments[1] instanceof Array)) {~~
72		~~this._children(element, arguments[1]);~~
73		~~} else {~~
74		~~var attrs = this._attributes(arguments[1]);~~
75		~~if(attrs.length) {~~
76		~~parentElement.innerHTML = "<" +elementName + " " +~~
77		~~attrs + "></" + elementName + ">";~~
78		~~element = parentElement.firstChild \|\| null;~~
79		~~// workaround firefox 1.0.X bug~~
80		~~if(!element) {~~
81		~~element = document.createElement(elementName);~~
82		~~for(attr in arguments[1])~~
83		~~element[attr == 'class' ? 'className' : attr] = arguments[1][attr];~~
84		}
85		~~if(element.tagName != elementName)~~
86		~~element = parentElement.getElementsByTagName(elementName)[0];~~
87		}
88		}
89
90		~~// text, or array of children~~
91		~~if(arguments[2])~~
92		~~this._children(element, arguments[2]);~~
93
94		~~return element;~~
95		},
96		~~_text: function(text) {~~
97		~~return document.createTextNode(text);~~
98		},
99		~~_attributes: function(attributes) {~~
100		~~var attrs = [];~~
101		~~for(attribute in attributes)~~
102		~~attrs.push((attribute=='className' ? 'class' : attribute) +~~
103		~~'="' + attributes[attribute].toString().escapeHTML() + '"');~~
104		~~return attrs.join(" ");~~
105		},
106		~~_children: function(element, children) {~~
107		~~if(typeof children=='object') { // array can hold nodes and text~~
108		~~children.flatten().each( function(e) {~~
109		~~if(typeof e=='object')~~
110		~~element.appendChild(e)~~
111		~~else~~
112		~~if(Builder._isStringOrNumber(e))~~
113		~~element.appendChild(Builder._text(e));~~
114		~~});~~
115		~~} else~~
116		~~if(Builder._isStringOrNumber(children))~~
117		~~element.appendChild(Builder._text(children));~~
118		},
119		~~_isStringOrNumber: function(param) {~~
120		~~return(typeof param=='string' \|\| typeof param=='number');~~
121		}
122		}
123
124		~~/* ------------- element ext -------------- */~~
125
		// converts rgb() and #xxx to #xxxxxx format,
		// returns self (or first argument) if not convertable
		String.prototype.parseColor = function() {
129		~~color = "#";~~
130		~~if(this.slice(0,4) == "rgb(") {~~
	15	var color = '#';
	16	if (this.slice(0,4) == 'rgb(') {
		var cols = this.slice(4,this.length-1).split(',');
		var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
		} else {
134		~~if(this.slice(0,1) == '#') {~~
135		~~if(this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();~~
136		~~if(this.length==7) color = this.toLowerCase();~~
	20	if (this.slice(0,1) == '#') {
	21	if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
	22	if (this.length==7) color = this.toLowerCase();
		}
		}
139		~~return(color.length==7 ? color : (arguments[0] \|\| this));~~
140		}
	25	return (color.length==7 ? color : (arguments[0] \|\| this));
	26	};

142		~~Element.collectTextNodesIgnoreClass = function(element, ignoreclass) {~~
143		~~var children = $(element).childNodes;~~
144		~~var text = "";~~
145		~~var classtest = new RegExp("^([^ ]+ )" + ignoreclass+ "( [^ ]+)$","i");~~
	28	/--------------------------------------------------------------------------/

147		~~for (var i = 0; i < children.length; i++) {~~
148		~~if(children[i].nodeType==3) {~~
149		~~text+=children[i].nodeValue;~~
150		~~} else {~~
151		~~if((!children[i].className.match(classtest)) && children[i].hasChildNodes())~~
152		~~text += Element.collectTextNodesIgnoreClass(children[i], ignoreclass);~~
153		}
154		}
	30	Element.collectTextNodes = function(element) {
	31	return $A($(element).childNodes).collect( function(node) {
	32	return (node.nodeType==3 ? node.nodeValue :
	33	(node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
	34	}).flatten().join('');
	35	};

156		~~return text;~~
157		}
	37	Element.collectTextNodesIgnoreClass = function(element, className) {
	38	return $A($(element).childNodes).collect( function(node) {
	39	return (node.nodeType==3 ? node.nodeValue :
	40	((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
	41	Element.collectTextNodesIgnoreClass(node, className) : ''));
	42	}).flatten().join('');
	43	};

		Element.setContentZoom = function(element, percent) {
		element = $(element);
161		~~element.style.fontSize = (percent/100) + "em";~~
162		~~if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);~~
163		}
	47	element.setStyle({fontSize: (percent/100) + 'em'});
	48	if (Prototype.Browser.WebKit) window.scrollBy(0,0);
	49	return element;
	50	};

165		~~Element.getOpacity = function(element){~~
166		~~var opacity;~~
167		~~if (opacity = Element.getStyle(element, "opacity"))~~
168		~~return parseFloat(opacity);~~
169		~~if (opacity = (Element.getStyle(element, "filter") \|\| '').match(/alpha$opacity=(.*)$/))~~
170		~~if(opacity[1]) return parseFloat(opacity[1]) / 100;~~
171		~~return 1.0;~~
172		}
173
174		~~Element.setOpacity = function(element, value){~~
175		~~element= $(element);~~
176		~~var els = element.style;~~
177		~~if (value == 1){~~
178		~~els.opacity = '0.999999';~~
179		~~if(/MSIE/.test(navigator.userAgent))~~
180		~~els.filter = Element.getStyle(element,'filter').replace(/alpha$[^$]*\)/gi,'');~~
181		~~} else {~~
182		~~if(value < 0.00001) value = 0;~~
183		~~els.opacity = value;~~
184		~~if(/MSIE/.test(navigator.userAgent))~~
185		~~els.filter = Element.getStyle(element,'filter').replace(/alpha$[^$]*\)/gi,'') +~~
186		~~"alpha(opacity="+value*100+")";~~
187		}
188		}
189
		Element.getInlineOpacity = function(element){
191		~~element= $(element);~~
192		~~var op;~~
193		~~op = element.style.opacity;~~
194		~~if (typeof op != "undefined" && op != "") return op;~~
195		~~return "";~~
196		}
	53	return $(element).style.opacity \|\| '';
	54	};

198		~~Element.setInlineOpacity = function(element, value){~~
199		~~element= $(element);~~
200		~~var els = element.style;~~
201		~~els.opacity = value;~~
202		}
	56	Element.forceRerendering = function(element) {
	57	try {
	58	element = $(element);
	59	var n = document.createTextNode(' ');
	60	element.appendChild(n);
	61	element.removeChild(n);
	62	} catch(e) { }
	63	};

		/--------------------------------------------------------------------------/

206		~~Element.Class = {~~
207		~~// Element.toggleClass(element, className) toggles the class being on/off~~
208		~~// Element.toggleClass(element, className1, className2) toggles between both classes,~~
209		~~// defaulting to className1 if neither exist~~
210		~~toggle: function(element, className) {~~
211		~~if(Element.Class.has(element, className)) {~~
212		~~Element.Class.remove(element, className);~~
213		~~if(arguments.length == 3) Element.Class.add(element, arguments[2]);~~
214		~~} else {~~
215		~~Element.Class.add(element, className);~~
216		~~if(arguments.length == 3) Element.Class.remove(element, arguments[2]);~~
217		}
	67	var Effect = {
	68	_elementDoesNotExistError: {
	69	name: 'ElementDoesNotExistError',
	70	message: 'The specified DOM element does not exist, but is required for this effect to operate'
	71	},
	72	Transitions: {
	73	linear: Prototype.K,
	74	sinoidal: function(pos) {
	75	return (-Math.cos(pos*Math.PI)/2) + .5;
		},
219
220		~~// gets space-delimited classnames of an element as an array~~
221		~~get: function(element) {~~
222		~~return $(element).className.split(' ');~~
	77	reverse: function(pos) {
	78	return 1-pos;
		},
224
225		~~// functions adapted from original functions by Gavin Kistner~~
226		~~remove: function(element) {~~
227		~~element = $(element);~~
228		~~var removeClasses = arguments;~~
229		~~$R(1,arguments.length-1).each( function(index) {~~
230		~~element.className =~~
231		~~element.className.split(' ').reject(~~
232		~~function(klass) { return (klass == removeClasses[index]) } ).join(' ');~~
233		~~});~~
	80	flicker: function(pos) {
	81	var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
	82	return pos > 1 ? 1 : pos;
		},
235
236		~~add: function(element) {~~
237		~~element = $(element);~~
238		~~for(var i = 1; i < arguments.length; i++) {~~
239		~~Element.Class.remove(element, arguments[i]);~~
240		~~element.className += (element.className.length > 0 ? ' ' : '') + arguments[i];~~
241		}
	84	wobble: function(pos) {
	85	return (-Math.cos(posMath.PI(9*pos))/2) + .5;
		},
243
244		~~// returns true if all given classes exist in said element~~
245		~~has: function(element) {~~
246		~~element = $(element);~~
247		~~if(!element \|\| !element.className) return false;~~
248		~~var regEx;~~
249		~~for(var i = 1; i < arguments.length; i++) {~~
250		~~if((typeof arguments[i] == 'object') &&~~
251		~~(arguments[i].constructor == Array)) {~~
252		~~for(var j = 0; j < arguments[i].length; j++) {~~
253		~~regEx = new RegExp("(^\|\\s)" + arguments[i][j] + "(\\s\|$)");~~
254		~~if(!regEx.test(element.className)) return false;~~
255		}
256		~~} else {~~
257		~~regEx = new RegExp("(^\|\\s)" + arguments[i] + "(\\s\|$)");~~
258		~~if(!regEx.test(element.className)) return false;~~
259		}
260		}
261		~~return true;~~
	87	pulse: function(pos, pulses) {
	88	return (-Math.cos((pos((pulses\|\|5)-.5)2)*Math.PI)/2) + .5;
		},
263
264		~~// expects arrays of strings and/or strings as optional paramters~~
265		~~// Element.Class.has_any(element, ['classA','classB','classC'], 'classD')~~
266		~~has_any: function(element) {~~
267		~~element = $(element);~~
268		~~if(!element \|\| !element.className) return false;~~
269		~~var regEx;~~
270		~~for(var i = 1; i < arguments.length; i++) {~~
271		~~if((typeof arguments[i] == 'object') &&~~
272		~~(arguments[i].constructor == Array)) {~~
273		~~for(var j = 0; j < arguments[i].length; j++) {~~
274		~~regEx = new RegExp("(^\|\\s)" + arguments[i][j] + "(\\s\|$)");~~
275		~~if(regEx.test(element.className)) return true;~~
276		}
277		~~} else {~~
278		~~regEx = new RegExp("(^\|\\s)" + arguments[i] + "(\\s\|$)");~~
279		~~if(regEx.test(element.className)) return true;~~
280		}
281		}
282		~~return false;~~
	90	spring: function(pos) {
	91	return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
		},
284
285		~~childrenWith: function(element, className) {~~
286		~~var children = $(element).getElementsByTagName('*');~~
287		~~var elements = new Array();~~
288
289		~~for (var i = 0; i < children.length; i++)~~
290		~~if (Element.Class.has(children[i], className))~~
291		~~elements.push(children[i]);~~
292
293		~~return elements;~~
	93	none: function(pos) {
	94	return 0;
	95	},
	96	full: function(pos) {
	97	return 1;
		}
295		}
	99	},
	100	DefaultOptions: {
	101	duration: 1.0, // seconds
	102	fps: 100, // 100= assume 66fps max.
	103	sync: false, // true for combining
	104	from: 0.0,
	105	to: 1.0,
	106	delay: 0.0,
	107	queue: 'parallel'
	108	},
	109	tagifyText: function(element) {
	110	var tagifyStyle = 'position:relative';
	111	if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';

297		~~/--------------------------------------------------------------------------/~~
298
299		~~var Effect = {~~
300		~~tagifyText: function(element) {~~
301		~~var tagifyStyle = "position:relative";~~
302		~~if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ";zoom:1";~~
		element = $(element);
		$A(element.childNodes).each( function(child) {
305		~~if(child.nodeType==3) {~~
	115	if (child.nodeType==3) {
		child.nodeValue.toArray().each( function(character) {
		element.insertBefore(
308		~~Builder.node('span',{style: tagifyStyle},~~
309		~~character == " " ? String.fromCharCode(160) : character),~~
	118	new Element('span', {style: tagifyStyle}).update(
	119	character == ' ' ? String.fromCharCode(160) : character),
		child);
		});
		Element.remove(child);
...	...
		},
		multiple: function(element, effect) {
		var elements;
318		~~if(((typeof element == 'object') \|\|~~
319		~~(typeof element == 'function')) &&~~
	128	if (((typeof element == 'object') \|\|
	129	Object.isFunction(element)) &&
		(element.length))
		elements = element;
		else
		elements = $(element).childNodes;
324
	134
		var options = Object.extend({
		speed: 0.1,
		delay: 0.0
328		~~}, arguments[2] \|\| {});~~
329		~~var speed = options.speed;~~
330		~~var delay = options.delay;~~
	138	}, arguments[2] \|\| { });
	139	var masterDelay = options.delay;

		$A(elements).each( function(element, index) {
333		~~new effect(element, Object.extend(options, { delay: delay + index * speed }));~~
	142	new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
		});
	144	},
	145	PAIRS: {
	146	'slide': ['SlideDown','SlideUp'],
	147	'blind': ['BlindDown','BlindUp'],
	148	'appear': ['Appear','Fade']
	149	},
	150	toggle: function(element, effect, options) {
	151	element = $(element);
	152	effect = (effect \|\| 'appear').toLowerCase();
	153
	154	return Effect[ Effect.PAIRS[ effect ][ element.visible() ? 1 : 0 ] ](element, Object.extend({
	155	queue: { position:'end', scope:(element.id \|\| 'global'), limit: 1 }
	156	}, options \|\| {}));
		}
		};

338		~~var Effect2 = Effect; // deprecated~~
	160	Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;

340		~~/* ------------- transitions ------------- */~~
341
342		~~Effect.Transitions = {}~~
343
344		~~Effect.Transitions.linear = function(pos) {~~
345		~~return pos;~~
346		}
347		~~Effect.Transitions.sinoidal = function(pos) {~~
348		~~return (-Math.cos(pos*Math.PI)/2) + 0.5;~~
349		}
350		~~Effect.Transitions.reverse = function(pos) {~~
351		~~return 1-pos;~~
352		}
353		~~Effect.Transitions.flicker = function(pos) {~~
354		~~return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;~~
355		}
356		~~Effect.Transitions.wobble = function(pos) {~~
357		~~return (-Math.cos(posMath.PI(9*pos))/2) + 0.5;~~
358		}
359		~~Effect.Transitions.pulse = function(pos) {~~
360		~~return (Math.floor(pos*10) % 2 == 0 ?~~
361		~~(pos10-Math.floor(pos10)) : 1-(pos10-Math.floor(pos10)));~~
362		}
363		~~Effect.Transitions.none = function(pos) {~~
364		~~return 0;~~
365		}
366		~~Effect.Transitions.full = function(pos) {~~
367		~~return 1;~~
368		}
369
		/* ------------- core effects ------------- */

372		~~Effect.Queue = {~~
373		~~effects: [],~~
374		~~interval: null,~~
	164	Effect.ScopedQueue = Class.create(Enumerable, {
	165	initialize: function() {
	166	this.effects = [];
	167	this.interval = null;
	168	},
	169	_each: function(iterator) {
	170	this.effects._each(iterator);
	171	},
		add: function(effect) {
		var timestamp = new Date().getTime();
377
378		~~switch(effect.options.queue) {~~
	174
	175	var position = Object.isString(effect.options.queue) ?
	176	effect.options.queue : effect.options.queue.position;
	177
	178	switch(position) {
		case 'front':
380		~~// move unstarted effects after this effect~~
	180	// move unstarted effects after this effect
		this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
		e.startOn += effect.finishOn;
		e.finishOn += effect.finishOn;
		});
		break;
	186	case 'with-last':
	187	timestamp = this.effects.pluck('startOn').max() \|\| timestamp;
	188	break;
		case 'end':
		// start effect after last queued effect has finished
		timestamp = this.effects.pluck('finishOn').max() \|\| timestamp;
		break;
		}
391
	194
		effect.startOn += timestamp;
		effect.finishOn += timestamp;
394		~~this.effects.push(effect);~~
395		~~if(!this.interval)~~
396		~~this.interval = setInterval(this.loop.bind(this), 40);~~
	197
	198	if (!effect.options.queue.limit \|\| (this.effects.length < effect.options.queue.limit))
	199	this.effects.push(effect);
	200
	201	if (!this.interval)
	202	this.interval = setInterval(this.loop.bind(this), 15);
		},
		remove: function(effect) {
		this.effects = this.effects.reject(function(e) { return e==effect });
400		~~if(this.effects.length == 0) {~~
	206	if (this.effects.length == 0) {
		clearInterval(this.interval);
		this.interval = null;
		}
		},
		loop: function() {
		var timePos = new Date().getTime();
407		~~this.effects.invoke('loop', timePos);~~
	213	for(var i=0, len=this.effects.length;i<len;i++)
	214	this.effects[i] && this.effects[i].loop(timePos);
		}
409		}
	216	});

411		~~Effect.Base = function() {};~~
412		~~Effect.Base.prototype = {~~
	218	Effect.Queues = {
	219	instances: $H(),
	220	get: function(queueName) {
	221	if (!Object.isString(queueName)) return queueName;
	222
	223	return this.instances.get(queueName) \|\|
	224	this.instances.set(queueName, new Effect.ScopedQueue());
	225	}
	226	};
	227	Effect.Queue = Effect.Queues.get('global');
	228
	229	Effect.Base = Class.create({
		position: null,
414		~~setOptions: function(options) {~~
415		~~this.options = Object.extend({~~
416		~~transition: Effect.Transitions.sinoidal,~~
417		~~duration: 1.0, // seconds~~
418		~~fps: 25.0, // max. 25fps due to Effect.Queue implementation~~
419		~~sync: false, // true for combining~~
420		~~from: 0.0,~~
421		~~to: 1.0,~~
422		~~delay: 0.0,~~
423		~~queue: 'parallel'~~
424		~~}, options \|\| {});~~
425		},
		start: function(options) {
427		~~this.setOptions(options \|\| {});~~
	232	if (options && options.transition === false) options.transition = Effect.Transitions.linear;
	233	this.options = Object.extend(Object.extend({ },Effect.DefaultOptions), options \|\| { });
		this.currentFrame = 0;
		this.state = 'idle';
		this.startOn = this.options.delay*1000;
431		~~this.finishOn = this.startOn + (this.options.duration*1000);~~
	237	this.finishOn = this.startOn+(this.options.duration*1000);
	238	this.fromToDelta = this.options.to-this.options.from;
	239	this.totalTime = this.finishOn-this.startOn;
	240	this.totalFrames = this.options.fps*this.options.duration;
	241
	242	this.render = (function() {
	243	function dispatch(effect, eventName) {
	244	if (effect.options[eventName + 'Internal'])
	245	effect.options[eventName + 'Internal'](effect);
	246	if (effect.options[eventName])
	247	effect.options[eventName](effect);
	248	}
	249
	250	return function(pos) {
	251	if (this.state === "idle") {
	252	this.state = "running";
	253	dispatch(this, 'beforeSetup');
	254	if (this.setup) this.setup();
	255	dispatch(this, 'afterSetup');
	256	}
	257	if (this.state === "running") {
	258	pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
	259	this.position = pos;
	260	dispatch(this, 'beforeUpdate');
	261	if (this.update) this.update(pos);
	262	dispatch(this, 'afterUpdate');
	263	}
	264	};
	265	})();
	266
		this.event('beforeStart');
433		~~if(!this.options.sync) Effect.Queue.add(this);~~
	268	if (!this.options.sync)
	269	Effect.Queues.get(Object.isString(this.options.queue) ?
	270	'global' : this.options.queue.scope).add(this);
		},
		loop: function(timePos) {
436		~~if(timePos >= this.startOn) {~~
437		~~if(timePos >= this.finishOn) {~~
	273	if (timePos >= this.startOn) {
	274	if (timePos >= this.finishOn) {
		this.render(1.0);
		this.cancel();
		this.event('beforeFinish');
441		~~if(this.finish) this.finish();~~
	278	if (this.finish) this.finish();
		this.event('afterFinish');
443		~~return;~~
	280	return;
		}
445		~~var pos = (timePos - this.startOn) / (this.finishOn - this.startOn);~~
446		~~var frame = Math.round(pos * this.options.fps * this.options.duration);~~
447		~~if(frame > this.currentFrame) {~~
	282	var pos = (timePos - this.startOn) / this.totalTime,
	283	frame = (pos * this.totalFrames).round();
	284	if (frame > this.currentFrame) {
		this.render(pos);
		this.currentFrame = frame;
		}
		}
		},
453		~~render: function(pos) {~~
454		~~if(this.state == 'idle') {~~
455		~~this.state = 'running';~~
456		~~this.event('beforeSetup');~~
457		~~if(this.setup) this.setup();~~
458		~~this.event('afterSetup');~~
459		}
460		~~if(this.options.transition) pos = this.options.transition(pos);~~
461		~~pos *= (this.options.to-this.options.from);~~
462		~~pos += this.options.from;~~
463		~~this.position = pos;~~
464		~~this.event('beforeUpdate');~~
465		~~if(this.update) this.update(pos);~~
466		~~this.event('afterUpdate');~~
467		},
		cancel: function() {
469		~~if(!this.options.sync) Effect.Queue.remove(this);~~
	291	if (!this.options.sync)
	292	Effect.Queues.get(Object.isString(this.options.queue) ?
	293	'global' : this.options.queue.scope).remove(this);
		this.state = 'finished';
		},
		event: function(eventName) {
473		~~if(this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);~~
474		~~if(this.options[eventName]) this.options[eventName](this);~~
	297	if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
	298	if (this.options[eventName]) this.options[eventName](this);
	299	},
	300	inspect: function() {
	301	var data = $H();
	302	for(property in this)
	303	if (!Object.isFunction(this[property])) data.set(property, this[property]);
	304	return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
		}
476		}
	306	});

478		~~Effect.Parallel = Class.create();~~
479		~~Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {~~
	308	Effect.Parallel = Class.create(Effect.Base, {
		initialize: function(effects) {
		this.effects = effects \|\| [];
		this.start(arguments[1]);
...	...
		effect.render(1.0);
		effect.cancel();
		effect.event('beforeFinish');
492		~~if(effect.finish) effect.finish(position);~~
	321	if (effect.finish) effect.finish(position);
		effect.event('afterFinish');
		});
		}
		});

498		~~Effect.Opacity = Class.create();~~
499		~~Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {~~
	327	Effect.Tween = Class.create(Effect.Base, {
	328	initialize: function(object, from, to) {
	329	object = Object.isString(object) ? $(object) : object;
	330	var args = $A(arguments), method = args.last(),
	331	options = args.length == 5 ? args[3] : null;
	332	this.method = Object.isFunction(method) ? method.bind(object) :
	333	Object.isFunction(object[method]) ? object[method].bind(object) :
	334	function(value) { object[method] = value };
	335	this.start(Object.extend({ from: from, to: to }, options \|\| { }));
	336	},
	337	update: function(position) {
	338	this.method(position);
	339	}
	340	});
	341
	342	Effect.Event = Class.create(Effect.Base, {
	343	initialize: function() {
	344	this.start(Object.extend({ duration: 0 }, arguments[0] \|\| { }));
	345	},
	346	update: Prototype.emptyFunction
	347	});
	348
	349	Effect.Opacity = Class.create(Effect.Base, {
		initialize: function(element) {
		this.element = $(element);
	352	if (!this.element) throw(Effect._elementDoesNotExistError);
		// make this work on IE on elements without 'layout'
503		~~if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))~~
504		~~this.element.style.zoom = 1;~~
	354	if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
	355	this.element.setStyle({zoom: 1});
		var options = Object.extend({
506		~~from: Element.getOpacity(this.element) \|\| 0.0,~~
	357	from: this.element.getOpacity() \|\| 0.0,
		to: 1.0
508		~~}, arguments[1] \|\| {});~~
	359	}, arguments[1] \|\| { });
		this.start(options);
		},
		update: function(position) {
512		~~Element.setOpacity(this.element, position);~~
	363	this.element.setOpacity(position);
		}
		});

516		~~Effect.MoveBy = Class.create();~~
517		~~Object.extend(Object.extend(Effect.MoveBy.prototype, Effect.Base.prototype), {~~
518		~~initialize: function(element, toTop, toLeft) {~~
519		~~this.element = $(element);~~
520		~~this.toTop = toTop;~~
521		~~this.toLeft = toLeft;~~
522		~~this.start(arguments[3]);~~
	367	Effect.Move = Class.create(Effect.Base, {
	368	initialize: function(element) {
	369	this.element = $(element);
	370	if (!this.element) throw(Effect._elementDoesNotExistError);
	371	var options = Object.extend({
	372	x: 0,
	373	y: 0,
	374	mode: 'relative'
	375	}, arguments[1] \|\| { });
	376	this.start(options);
		},
		setup: function() {
525		~~// Bug in Opera: Opera returns the "real" position of a static element or~~
526		~~// relative element that does not have top/left explicitly set.~~
527		~~// ==> Always set top and left for position relative elements in your stylesheets~~
528		~~// (to 0 if you do not need them)~~
529
530		~~Element.makePositioned(this.element);~~
531		~~this.originalTop = parseFloat(Element.getStyle(this.element,'top') \|\| '0');~~
532		~~this.originalLeft = parseFloat(Element.getStyle(this.element,'left') \|\| '0');~~
	379	this.element.makePositioned();
	380	this.originalLeft = parseFloat(this.element.getStyle('left') \|\| '0');
	381	this.originalTop = parseFloat(this.element.getStyle('top') \|\| '0');
	382	if (this.options.mode == 'absolute') {
	383	this.options.x = this.options.x - this.originalLeft;
	384	this.options.y = this.options.y - this.originalTop;
	385	}
		},
		update: function(position) {
535		~~var topd = this.toTop * position + this.originalTop;~~
536		~~var leftd = this.toLeft * position + this.originalLeft;~~
537		~~this.setPosition(topd, leftd);~~
538		},
539		~~setPosition: function(topd, leftd) {~~
540		~~this.element.style.top = topd + "px";~~
541		~~this.element.style.left = leftd + "px";~~
	388	this.element.setStyle({
	389	left: (this.options.x * position + this.originalLeft).round() + 'px',
	390	top: (this.options.y * position + this.originalTop).round() + 'px'
	391	});
		}
		});

545		~~Effect.Scale = Class.create();~~
546		~~Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {~~
	395	// for backwards compatibility
	396	Effect.MoveBy = function(element, toTop, toLeft) {
	397	return new Effect.Move(element,
	398	Object.extend({ x: toLeft, y: toTop }, arguments[3] \|\| { }));
	399	};
	400
	401	Effect.Scale = Class.create(Effect.Base, {
		initialize: function(element, percent) {
548		~~this.element = $(element)~~
	403	this.element = $(element);
	404	if (!this.element) throw(Effect._elementDoesNotExistError);
		var options = Object.extend({
		scaleX: true,
		scaleY: true,
		scaleContent: true,
		scaleFromCenter: false,
554		~~scaleMode: 'box', // 'box' or 'contents' or {} with provided values~~
	410	scaleMode: 'box', // 'box' or 'contents' or { } with provided values
		scaleFrom: 100.0,
		scaleTo: percent
557		~~}, arguments[2] \|\| {});~~
	413	}, arguments[2] \|\| { });
		this.start(options);
		},
		setup: function() {
561		~~var effect = this;~~
562
		this.restoreAfterFinish = this.options.restoreAfterFinish \|\| false;
564		~~this.elementPositioning = Element.getStyle(this.element,'position');~~
565
566		~~effect.originalStyle = {};~~
	418	this.elementPositioning = this.element.getStyle('position');
	419
	420	this.originalStyle = { };
		['top','left','width','height','fontSize'].each( function(k) {
568		~~effect.originalStyle[k] = effect.element.style[k];~~
569		~~});~~
570
	422	this.originalStyle[k] = this.element.style[k];
	423	}.bind(this));
	424
		this.originalTop = this.element.offsetTop;
		this.originalLeft = this.element.offsetLeft;
573
574		~~var fontSize = Element.getStyle(this.element,'font-size') \|\| "100%";~~
575		~~['em','px','%'].each( function(fontSizeType) {~~
576		~~if(fontSize.indexOf(fontSizeType)>0) {~~
577		~~effect.fontSize = parseFloat(fontSize);~~
578		~~effect.fontSizeType = fontSizeType;~~
	427
	428	var fontSize = this.element.getStyle('font-size') \|\| '100%';
	429	['em','px','%','pt'].each( function(fontSizeType) {
	430	if (fontSize.indexOf(fontSizeType)>0) {
	431	this.fontSize = parseFloat(fontSize);
	432	this.fontSizeType = fontSizeType;
		}
580		~~});~~
581
	434	}.bind(this));
	435
		this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
583
	437
		this.dims = null;
585		~~if(this.options.scaleMode=='box')~~
586		~~this.dims = [this.element.clientHeight, this.element.clientWidth];~~
587		~~if(this.options.scaleMode=='content')~~
	439	if (this.options.scaleMode=='box')
	440	this.dims = [this.element.offsetHeight, this.element.offsetWidth];
	441	if (/^content/.test(this.options.scaleMode))
		this.dims = [this.element.scrollHeight, this.element.scrollWidth];
589		~~if(!this.dims)~~
	443	if (!this.dims)
		this.dims = [this.options.scaleMode.originalHeight,
		this.options.scaleMode.originalWidth];
		},
		update: function(position) {
		var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
595		~~if(this.options.scaleContent && this.fontSize)~~
596		~~this.element.style.fontSize = this.fontSize*currentScale + this.fontSizeType;~~
	449	if (this.options.scaleContent && this.fontSize)
	450	this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
		this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
		},
		finish: function(position) {
600		~~if (this.restoreAfterFinish) {~~
601		~~var effect = this;~~
602		~~['top','left','width','height','fontSize'].each( function(k) {~~
603		~~effect.element.style[k] = effect.originalStyle[k];~~
604		~~});~~
605		}
	454	if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
		},
		setDimensions: function(height, width) {
608		~~var els = this.element.style;~~
609		~~if(this.options.scaleX) els.width = width + 'px';~~
610		~~if(this.options.scaleY) els.height = height + 'px';~~
611		~~if(this.options.scaleFromCenter) {~~
	457	var d = { };
	458	if (this.options.scaleX) d.width = width.round() + 'px';
	459	if (this.options.scaleY) d.height = height.round() + 'px';
	460	if (this.options.scaleFromCenter) {
		var topd = (height - this.dims[0])/2;
		var leftd = (width - this.dims[1])/2;
614		~~if(this.elementPositioning == 'absolute') {~~
615		~~if(this.options.scaleY) els.top = this.originalTop-topd + "px";~~
616		~~if(this.options.scaleX) els.left = this.originalLeft-leftd + "px";~~
	463	if (this.elementPositioning == 'absolute') {
	464	if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
	465	if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
		} else {
618		~~if(this.options.scaleY) els.top = -topd + "px";~~
619		~~if(this.options.scaleX) els.left = -leftd + "px";~~
	467	if (this.options.scaleY) d.top = -topd + 'px';
	468	if (this.options.scaleX) d.left = -leftd + 'px';
		}
		}
	471	this.element.setStyle(d);
		}
		});

625		~~Effect.Highlight = Class.create();~~
626		~~Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), {~~
	475	Effect.Highlight = Class.create(Effect.Base, {
		initialize: function(element) {
		this.element = $(element);
629		~~var options = Object.extend({~~
630		~~startcolor: "#ffff99"~~
631		~~}, arguments[1] \|\| {});~~
	478	if (!this.element) throw(Effect._elementDoesNotExistError);
	479	var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] \|\| { });
		this.start(options);
		},
		setup: function() {
	483	// Prevent executing on elements not in the layout flow
	484	if (this.element.getStyle('display')=='none') { this.cancel(); return; }
		// Disable background image during the effect
636		~~this.oldBgImage = this.element.style.backgroundImage;~~
637		~~this.element.style.backgroundImage = "none";~~
638		~~if(!this.options.endcolor)~~
639		~~this.options.endcolor = Element.getStyle(this.element, 'background-color').parseColor('#ffffff');~~
640		~~if (typeof this.options.restorecolor == "undefined")~~
641		~~this.options.restorecolor = this.element.style.backgroundColor;~~
	486	this.oldStyle = { };
	487	if (!this.options.keepBackgroundImage) {
	488	this.oldStyle.backgroundImage = this.element.getStyle('background-image');
	489	this.element.setStyle({backgroundImage: 'none'});
	490	}
	491	if (!this.options.endcolor)
	492	this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
	493	if (!this.options.restorecolor)
	494	this.options.restorecolor = this.element.getStyle('background-color');
		// init color calculations
643		~~this.colors_base = [~~
644		~~parseInt(this.options.startcolor.slice(1,3),16),~~
645		~~parseInt(this.options.startcolor.slice(3,5),16),~~
646		~~parseInt(this.options.startcolor.slice(5),16) ];~~
647		~~this.colors_delta = [~~
648		~~parseInt(this.options.endcolor.slice(1,3),16)-this.colors_base[0],~~
649		~~parseInt(this.options.endcolor.slice(3,5),16)-this.colors_base[1],~~
650		~~parseInt(this.options.endcolor.slice(5),16)-this.colors_base[2]];~~
	496	this._base = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i2+1,i2+3),16) }.bind(this));
	497	this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i2+1,i2+3),16)-this._base[i] }.bind(this));
		},
		update: function(position) {
653		~~var effect = this; var colors = $R(0,2).map( function(i){~~
654		~~return Math.round(effect.colors_base[i]+(effect.colors_delta[i]*position))~~
655		~~});~~
656		~~this.element.style.backgroundColor = "#" +~~
657		~~colors[0].toColorPart() + colors[1].toColorPart() + colors[2].toColorPart();~~
	500	this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
	501	return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
		},
		finish: function() {
660		~~this.element.style.backgroundColor = this.options.restorecolor;~~
661		~~this.element.style.backgroundImage = this.oldBgImage;~~
	504	this.element.setStyle(Object.extend(this.oldStyle, {
	505	backgroundColor: this.options.restorecolor
	506	}));
		}
		});

665		~~Effect.ScrollTo = Class.create();~~
666		~~Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {~~
667		~~initialize: function(element) {~~
668		~~this.element = $(element);~~
669		~~this.start(arguments[1] \|\| {});~~
670		},
671		~~setup: function() {~~
672		~~Position.prepare();~~
673		~~var offsets = Position.cumulativeOffset(this.element);~~
674		~~var max = window.innerHeight ?~~
675		~~window.height - window.innerHeight :~~
676		~~document.body.scrollHeight -~~
677		~~(document.documentElement.clientHeight ?~~
678		~~document.documentElement.clientHeight : document.body.clientHeight);~~
679		~~this.scrollStart = Position.deltaY;~~
680		~~this.delta = (offsets[1] > max ? max : offsets[1]) - this.scrollStart;~~
681		},
682		~~update: function(position) {~~
683		~~Position.prepare();~~
684		~~window.scrollTo(Position.deltaX,~~
685		~~this.scrollStart + (position*this.delta));~~
686		}
687		~~});~~
	510	Effect.ScrollTo = function(element) {
	511	var options = arguments[1] \|\| { },
	512	scrollOffsets = document.viewport.getScrollOffsets(),
	513	elementOffsets = $(element).cumulativeOffset();

	515	if (options.offset) elementOffsets[1] += options.offset;
	516
	517	return new Effect.Tween(null,
	518	scrollOffsets.top,
	519	elementOffsets[1],
	520	options,
	521	function(p){ scrollTo(scrollOffsets.left, p.round()); }
	522	);
	523	};
	524
		/* ------------- combination effects ------------- */

		Effect.Fade = function(element) {
692		~~var oldOpacity = Element.getInlineOpacity(element);~~
	528	element = $(element);
	529	var oldOpacity = element.getInlineOpacity();
		var options = Object.extend({
694		~~from: Element.getOpacity(element) \|\| 1.0,~~
695		~~to: 0.0,~~
696		~~afterFinishInternal: function(effect)~~
697		~~{ if (effect.options.to == 0) {~~
698		~~Element.hide(effect.element);~~
699		~~Element.setInlineOpacity(effect.element, oldOpacity);~~
700		}
	531	from: element.getOpacity() \|\| 1.0,
	532	to: 0.0,
	533	afterFinishInternal: function(effect) {
	534	if (effect.options.to!=0) return;
	535	effect.element.hide().setStyle({opacity: oldOpacity});
		}
702		~~}, arguments[1] \|\| {});~~
	537	}, arguments[1] \|\| { });
		return new Effect.Opacity(element,options);
704		}
	539	};

		Effect.Appear = function(element) {
	542	element = $(element);
		var options = Object.extend({
708		~~from: (Element.getStyle(element, "display") == "none" ? 0.0 : Element.getOpacity(element) \|\| 0.0),~~
	544	from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() \|\| 0.0),
		to: 1.0,
710		~~beforeSetup: function(effect)~~
711		~~{ Element.setOpacity(effect.element, effect.options.from);~~
712		~~Element.show(effect.element); }~~
713		~~}, arguments[1] \|\| {});~~
	546	// force Safari to render floated elements properly
	547	afterFinishInternal: function(effect) {
	548	effect.element.forceRerendering();
	549	},
	550	beforeSetup: function(effect) {
	551	effect.element.setOpacity(effect.options.from).show();
	552	}}, arguments[1] \|\| { });
		return new Effect.Opacity(element,options);
715		}
	554	};

		Effect.Puff = function(element) {
		element = $(element);
719		~~var oldOpacity = Element.getInlineOpacity(element);~~
720		~~var oldPosition = element.style.position;~~
	558	var oldStyle = {
	559	opacity: element.getInlineOpacity(),
	560	position: element.getStyle('position'),
	561	top: element.style.top,
	562	left: element.style.left,
	563	width: element.style.width,
	564	height: element.style.height
	565	};
		return new Effect.Parallel(
722		~~[ new Effect.Scale(element, 200,~~
723		~~{ sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),~~
724		~~new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],~~
725		~~Object.extend({ duration: 1.0,~~
726		~~beforeSetupInternal: function(effect)~~
727		~~{ effect.effects[0].element.style.position = 'absolute'; },~~
728		~~afterFinishInternal: function(effect)~~
729		~~{ Element.hide(effect.effects[0].element);~~
730		~~effect.effects[0].element.style.position = oldPosition;~~
731		~~Element.setInlineOpacity(effect.effects[0].element, oldOpacity); }~~
732		~~}, arguments[1] \|\| {})~~
	567	[ new Effect.Scale(element, 200,
	568	{ sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
	569	new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
	570	Object.extend({ duration: 1.0,
	571	beforeSetupInternal: function(effect) {
	572	Position.absolutize(effect.effects[0].element);
	573	},
	574	afterFinishInternal: function(effect) {
	575	effect.effects[0].element.hide().setStyle(oldStyle); }
	576	}, arguments[1] \|\| { })
		);
734		}
	578	};

		Effect.BlindUp = function(element) {
		element = $(element);
738		~~Element.makeClipping(element);~~
739		~~return new Effect.Scale(element, 0,~~
740		~~Object.extend({ scaleContent: false,~~
741		~~scaleX: false,~~
742		~~restoreAfterFinish: true,~~
743		~~afterFinishInternal: function(effect)~~
744		{
745		~~Element.hide(effect.element);~~
746		~~Element.undoClipping(effect.element);~~
747		}
748		~~}, arguments[1] \|\| {})~~
749		);
750		}
751
752		~~Effect.BlindDown = function(element) {~~
753		~~element = $(element);~~
754		~~var oldHeight = element.style.height;~~
755		~~var elementDimensions = Element.getDimensions(element);~~
756		~~return new Effect.Scale(element, 100,~~
757		~~Object.extend({ scaleContent: false,~~
	582	element.makeClipping();
	583	return new Effect.Scale(element, 0,
	584	Object.extend({ scaleContent: false,
		scaleX: false,
759		~~scaleFrom: 0,~~
760		~~scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},~~
		restoreAfterFinish: true,
762		~~afterSetup: function(effect) {~~
763		~~Element.makeClipping(effect.element);~~
764		~~effect.element.style.height = "0px";~~
765		~~Element.show(effect.element);~~
766		},
		afterFinishInternal: function(effect) {
768		~~Element.undoClipping(effect.element);~~
769		~~effect.element.style.height = oldHeight;~~
	588	effect.element.hide().undoClipping();
		}
771		~~}, arguments[1] \|\| {})~~
	590	}, arguments[1] \|\| { })
		);
773		}
	592	};

	594	Effect.BlindDown = function(element) {
	595	element = $(element);
	596	var elementDimensions = element.getDimensions();
	597	return new Effect.Scale(element, 100, Object.extend({
	598	scaleContent: false,
	599	scaleX: false,
	600	scaleFrom: 0,
	601	scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
	602	restoreAfterFinish: true,
	603	afterSetup: function(effect) {
	604	effect.element.makeClipping().setStyle({height: '0px'}).show();
	605	},
	606	afterFinishInternal: function(effect) {
	607	effect.element.undoClipping();
	608	}
	609	}, arguments[1] \|\| { }));
	610	};
	611
		Effect.SwitchOff = function(element) {
		element = $(element);
777		~~var oldOpacity = Element.getInlineOpacity(element);~~
778		~~return new Effect.Appear(element, {~~
	614	var oldOpacity = element.getInlineOpacity();
	615	return new Effect.Appear(element, Object.extend({
		duration: 0.4,
		from: 0,
		transition: Effect.Transitions.flicker,
		afterFinishInternal: function(effect) {
783		~~new Effect.Scale(effect.element, 1, {~~
	620	new Effect.Scale(effect.element, 1, {
		duration: 0.3, scaleFromCenter: true,
		scaleX: false, scaleContent: false, restoreAfterFinish: true,
786		~~beforeSetup: function(effect) {~~
787		~~Element.makePositioned(effect.element);~~
788		~~Element.makeClipping(effect.element);~~
	623	beforeSetup: function(effect) {
	624	effect.element.makePositioned().makeClipping();
		},
790		~~afterFinishInternal: function(effect) {~~
791		~~Element.hide(effect.element);~~
792		~~Element.undoClipping(effect.element);~~
793		~~Element.undoPositioned(effect.element);~~
794		~~Element.setInlineOpacity(effect.element, oldOpacity);~~
	626	afterFinishInternal: function(effect) {
	627	effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
		}
796		})
	629	});
		}
798		~~});~~
799		}
	631	}, arguments[1] \|\| { }));
	632	};

		Effect.DropOut = function(element) {
		element = $(element);
803		~~var oldTop = element.style.top;~~
804		~~var oldLeft = element.style.left;~~
805		~~var oldOpacity = Element.getInlineOpacity(element);~~
	636	var oldStyle = {
	637	top: element.getStyle('top'),
	638	left: element.getStyle('left'),
	639	opacity: element.getInlineOpacity() };
		return new Effect.Parallel(
807		~~[ new Effect.MoveBy(element, 100, 0, { sync: true }),~~
	641	[ new Effect.Move(element, {x: 0, y: 100, sync: true }),
		new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
		Object.extend(
		{ duration: 0.5,
811		~~beforeSetup: function(effect) {~~
812		~~Element.makePositioned(effect.effects[0].element); },~~
813		~~afterFinishInternal: function(effect) {~~
814		~~Element.hide(effect.effects[0].element);~~
815		~~Element.undoPositioned(effect.effects[0].element);~~
816		~~effect.effects[0].element.style.left = oldLeft;~~
817		~~effect.effects[0].element.style.top = oldTop;~~
818		~~Element.setInlineOpacity(effect.effects[0].element, oldOpacity); }~~
819		~~}, arguments[1] \|\| {}));~~
820		}
	645	beforeSetup: function(effect) {
	646	effect.effects[0].element.makePositioned();
	647	},
	648	afterFinishInternal: function(effect) {
	649	effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
	650	}
	651	}, arguments[1] \|\| { }));
	652	};

		Effect.Shake = function(element) {
		element = $(element);
824		~~var oldTop = element.style.top;~~
825		~~var oldLeft = element.style.left;~~
826		~~return new Effect.MoveBy(element, 0, 20,~~
827		~~{ duration: 0.05, afterFinishInternal: function(effect) {~~
828		~~new Effect.MoveBy(effect.element, 0, -40,~~
829		~~{ duration: 0.1, afterFinishInternal: function(effect) {~~
830		~~new Effect.MoveBy(effect.element, 0, 40,~~
831		~~{ duration: 0.1, afterFinishInternal: function(effect) {~~
832		~~new Effect.MoveBy(effect.element, 0, -40,~~
833		~~{ duration: 0.1, afterFinishInternal: function(effect) {~~
834		~~new Effect.MoveBy(effect.element, 0, 40,~~
835		~~{ duration: 0.1, afterFinishInternal: function(effect) {~~
836		~~new Effect.MoveBy(effect.element, 0, -20,~~
837		~~{ duration: 0.05, afterFinishInternal: function(effect) {~~
838		~~Element.undoPositioned(effect.element);~~
839		~~effect.element.style.left = oldLeft;~~
840		~~effect.element.style.top = oldTop;~~
841		~~}}) }}) }}) }}) }}) }});~~
842		}
	656	var options = Object.extend({
	657	distance: 20,
	658	duration: 0.5
	659	}, arguments[1] \|\| {});
	660	var distance = parseFloat(options.distance);
	661	var split = parseFloat(options.duration) / 10.0;
	662	var oldStyle = {
	663	top: element.getStyle('top'),
	664	left: element.getStyle('left') };
	665	return new Effect.Move(element,
	666	{ x: distance, y: 0, duration: split, afterFinishInternal: function(effect) {
	667	new Effect.Move(effect.element,
	668	{ x: -distance2, y: 0, duration: split2, afterFinishInternal: function(effect) {
	669	new Effect.Move(effect.element,
	670	{ x: distance2, y: 0, duration: split2, afterFinishInternal: function(effect) {
	671	new Effect.Move(effect.element,
	672	{ x: -distance2, y: 0, duration: split2, afterFinishInternal: function(effect) {
	673	new Effect.Move(effect.element,
	674	{ x: distance2, y: 0, duration: split2, afterFinishInternal: function(effect) {
	675	new Effect.Move(effect.element,
	676	{ x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
	677	effect.element.undoPositioned().setStyle(oldStyle);
	678	}}); }}); }}); }}); }}); }});
	679	};

		Effect.SlideDown = function(element) {
845		~~element = $(element);~~
846		~~Element.cleanWhitespace(element);~~
	682	element = $(element).cleanWhitespace();
		// SlideDown need to have the content of the element wrapped in a container element with fixed height!
848		~~var oldInnerBottom = element.firstChild.style.bottom;~~
849		~~var elementDimensions = Element.getDimensions(element);~~
850		~~return new Effect.Scale(element, 100,~~
851		~~Object.extend({ scaleContent: false,~~
852		~~scaleX: false,~~
853		~~scaleFrom: 0,~~
854		~~scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},~~
	684	var oldInnerBottom = element.down().getStyle('bottom');
	685	var elementDimensions = element.getDimensions();
	686	return new Effect.Scale(element, 100, Object.extend({
	687	scaleContent: false,
	688	scaleX: false,
	689	scaleFrom: window.opera ? 0 : 1,
	690	scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
		restoreAfterFinish: true,
		afterSetup: function(effect) {
857		~~Element.makePositioned(effect.element.firstChild);~~
858		~~if (window.opera) effect.element.firstChild.style.top = "";~~
859		~~Element.makeClipping(effect.element);~~
860		~~element.style.height = '0';~~
861		~~Element.show(element);~~
862		},
863		~~afterUpdateInternal: function(effect) {~~
864		~~effect.element.firstChild.style.bottom =~~
865		~~(effect.originalHeight - effect.element.clientHeight) + 'px'; },~~
866		~~afterFinishInternal: function(effect) {~~
867		~~Element.undoClipping(effect.element);~~
868		~~Element.undoPositioned(effect.element.firstChild);~~
869		~~effect.element.firstChild.style.bottom = oldInnerBottom; }~~
870		~~}, arguments[1] \|\| {})~~
	693	effect.element.makePositioned();
	694	effect.element.down().makePositioned();
	695	if (window.opera) effect.element.setStyle({top: ''});
	696	effect.element.makeClipping().setStyle({height: '0px'}).show();
	697	},
	698	afterUpdateInternal: function(effect) {
	699	effect.element.down().setStyle({bottom:
	700	(effect.dims[0] - effect.element.clientHeight) + 'px' });
	701	},
	702	afterFinishInternal: function(effect) {
	703	effect.element.undoClipping().undoPositioned();
	704	effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
	705	}, arguments[1] \|\| { })
		);
872		}
873
	707	};
	708
		Effect.SlideUp = function(element) {
875		~~element = $(element);~~
876		~~Element.cleanWhitespace(element);~~
877		~~var oldInnerBottom = element.firstChild.style.bottom;~~
878		~~return new Effect.Scale(element, 0,~~
879		~~Object.extend({ scaleContent: false,~~
880		~~scaleX: false,~~
	710	element = $(element).cleanWhitespace();
	711	var oldInnerBottom = element.down().getStyle('bottom');
	712	var elementDimensions = element.getDimensions();
	713	return new Effect.Scale(element, window.opera ? 0 : 1,
	714	Object.extend({ scaleContent: false,
	715	scaleX: false,
		scaleMode: 'box',
		scaleFrom: 100,
	718	scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
		restoreAfterFinish: true,
884		~~beforeStartInternal: function(effect) {~~
885		~~Element.makePositioned(effect.element.firstChild);~~
886		~~if (window.opera) effect.element.firstChild.style.top = "";~~
887		~~Element.makeClipping(effect.element);~~
888		~~Element.show(element);~~
889		},
890		~~afterUpdateInternal: function(effect) {~~
891		~~effect.element.firstChild.style.bottom =~~
892		~~(effect.originalHeight - effect.element.clientHeight) + 'px'; },~~
893		~~afterFinishInternal: function(effect) {~~
894		~~Element.hide(effect.element);~~
895		~~Element.undoClipping(effect.element);~~
896		~~Element.undoPositioned(effect.element.firstChild);~~
897		~~effect.element.firstChild.style.bottom = oldInnerBottom; }~~
898		~~}, arguments[1] \|\| {})~~
	720	afterSetup: function(effect) {
	721	effect.element.makePositioned();
	722	effect.element.down().makePositioned();
	723	if (window.opera) effect.element.setStyle({top: ''});
	724	effect.element.makeClipping().show();
	725	},
	726	afterUpdateInternal: function(effect) {
	727	effect.element.down().setStyle({bottom:
	728	(effect.dims[0] - effect.element.clientHeight) + 'px' });
	729	},
	730	afterFinishInternal: function(effect) {
	731	effect.element.hide().undoClipping().undoPositioned();
	732	effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
	733	}
	734	}, arguments[1] \|\| { })
		);
900		}
	736	};

	738	// Bug in opera makes the TD containing this element expand for a instance after finish
		Effect.Squish = function(element) {
903		~~// Bug in opera makes the TD containing this element expand for a instance after finish~~
904		~~return new Effect.Scale(element, window.opera ? 1 : 0,~~
905		~~{ restoreAfterFinish: true,~~
906		~~beforeSetup: function(effect) {~~
907		~~Element.makeClipping(effect.element); },~~
908		~~afterFinishInternal: function(effect) {~~
909		~~Element.hide(effect.element);~~
910		~~Element.undoClipping(effect.element); }~~
	740	return new Effect.Scale(element, window.opera ? 1 : 0, {
	741	restoreAfterFinish: true,
	742	beforeSetup: function(effect) {
	743	effect.element.makeClipping();
	744	},
	745	afterFinishInternal: function(effect) {
	746	effect.element.hide().undoClipping();
	747	}
		});
912		}
	749	};

		Effect.Grow = function(element) {
		element = $(element);
916		~~var options = arguments[1] \|\| {};~~
917
918		~~var elementDimensions = Element.getDimensions(element);~~
919		~~var originalWidth = elementDimensions.width;~~
920		~~var originalHeight = elementDimensions.height;~~
921		~~var oldTop = element.style.top;~~
922		~~var oldLeft = element.style.left;~~
923		~~var oldHeight = element.style.height;~~
924		~~var oldWidth = element.style.width;~~
925		~~var oldOpacity = Element.getInlineOpacity(element);~~
926
927		~~var direction = options.direction \|\| 'center';~~
928		~~var moveTransition = options.moveTransition \|\| Effect.Transitions.sinoidal;~~
929		~~var scaleTransition = options.scaleTransition \|\| Effect.Transitions.sinoidal;~~
930		~~var opacityTransition = options.opacityTransition \|\| Effect.Transitions.full;~~
931
	753	var options = Object.extend({
	754	direction: 'center',
	755	moveTransition: Effect.Transitions.sinoidal,
	756	scaleTransition: Effect.Transitions.sinoidal,
	757	opacityTransition: Effect.Transitions.full
	758	}, arguments[1] \|\| { });
	759	var oldStyle = {
	760	top: element.style.top,
	761	left: element.style.left,
	762	height: element.style.height,
	763	width: element.style.width,
	764	opacity: element.getInlineOpacity() };
	765
	766	var dims = element.getDimensions();
		var initialMoveX, initialMoveY;
		var moveX, moveY;
934
935		~~switch (direction) {~~
	769
	770	switch (options.direction) {
		case 'top-left':
937		~~initialMoveX = initialMoveY = moveX = moveY = 0;~~
	772	initialMoveX = initialMoveY = moveX = moveY = 0;
		break;
		case 'top-right':
940		~~initialMoveX = originalWidth;~~
	775	initialMoveX = dims.width;
		initialMoveY = moveY = 0;
942		~~moveX = -originalWidth;~~
	777	moveX = -dims.width;
		break;
		case 'bottom-left':
		initialMoveX = moveX = 0;
946		~~initialMoveY = originalHeight;~~
947		~~moveY = -originalHeight;~~
	781	initialMoveY = dims.height;
	782	moveY = -dims.height;
		break;
		case 'bottom-right':
950		~~initialMoveX = originalWidth;~~
951		~~initialMoveY = originalHeight;~~
952		~~moveX = -originalWidth;~~
953		~~moveY = -originalHeight;~~
	785	initialMoveX = dims.width;
	786	initialMoveY = dims.height;
	787	moveX = -dims.width;
	788	moveY = -dims.height;
		break;
		case 'center':
956		~~initialMoveX = originalWidth / 2;~~
957		~~initialMoveY = originalHeight / 2;~~
958		~~moveX = -originalWidth / 2;~~
959		~~moveY = -originalHeight / 2;~~
	791	initialMoveX = dims.width / 2;
	792	initialMoveY = dims.height / 2;
	793	moveX = -dims.width / 2;
	794	moveY = -dims.height / 2;
		break;
		}
962
963		~~return new Effect.MoveBy(element, initialMoveY, initialMoveX, {~~
964		~~duration: 0.01,~~
965		~~beforeSetup: function(effect) {~~
966		~~Element.hide(effect.element);~~
967		~~Element.makeClipping(effect.element);~~
968		~~Element.makePositioned(effect.element);~~
	797
	798	return new Effect.Move(element, {
	799	x: initialMoveX,
	800	y: initialMoveY,
	801	duration: 0.01,
	802	beforeSetup: function(effect) {
	803	effect.element.hide().makeClipping().makePositioned();
		},
		afterFinishInternal: function(effect) {
		new Effect.Parallel(
972		~~[ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: opacityTransition }),~~
973		~~new Effect.MoveBy(effect.element, moveY, moveX, { sync: true, transition: moveTransition }),~~
	807	[ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
	808	new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
		new Effect.Scale(effect.element, 100, {
975		~~scaleMode: { originalHeight: originalHeight, originalWidth: originalWidth },~~
976		~~sync: true, scaleFrom: window.opera ? 1 : 0, transition: scaleTransition, restoreAfterFinish: true})~~
	810	scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
	811	sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
		], Object.extend({
		beforeSetup: function(effect) {
979		~~effect.effects[0].element.style.height = 0;~~
980		~~Element.show(effect.effects[0].element);~~
981		},
	814	effect.effects[0].element.setStyle({height: '0px'}).show();
	815	},
		afterFinishInternal: function(effect) {
983		~~var el = effect.effects[0].element;~~
984		~~var els = el.style;~~
985		~~Element.undoClipping(el);~~
986		~~Element.undoPositioned(el);~~
987		~~els.top = oldTop;~~
988		~~els.left = oldLeft;~~
989		~~els.height = oldHeight;~~
990		~~els.width = originalWidth;~~
991		~~Element.setInlineOpacity(el, oldOpacity);~~
	817	effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
		}
		}, options)
994		)
	820	);
		}
		});
997		}
	823	};

		Effect.Shrink = function(element) {
		element = $(element);
1001		~~var options = arguments[1] \|\| {};~~
1002
1003		~~var originalWidth = element.clientWidth;~~
1004		~~var originalHeight = element.clientHeight;~~
1005		~~var oldTop = element.style.top;~~
1006		~~var oldLeft = element.style.left;~~
1007		~~var oldHeight = element.style.height;~~
1008		~~var oldWidth = element.style.width;~~
1009		~~var oldOpacity = Element.getInlineOpacity(element);~~
	827	var options = Object.extend({
	828	direction: 'center',
	829	moveTransition: Effect.Transitions.sinoidal,
	830	scaleTransition: Effect.Transitions.sinoidal,
	831	opacityTransition: Effect.Transitions.none
	832	}, arguments[1] \|\| { });
	833	var oldStyle = {
	834	top: element.style.top,
	835	left: element.style.left,
	836	height: element.style.height,
	837	width: element.style.width,
	838	opacity: element.getInlineOpacity() };

1011		~~var direction = options.direction \|\| 'center';~~
1012		~~var moveTransition = options.moveTransition \|\| Effect.Transitions.sinoidal;~~
1013		~~var scaleTransition = options.scaleTransition \|\| Effect.Transitions.sinoidal;~~
1014		~~var opacityTransition = options.opacityTransition \|\| Effect.Transitions.none;~~
1015
	840	var dims = element.getDimensions();
		var moveX, moveY;
1017
1018		~~switch (direction) {~~
	842
	843	switch (options.direction) {
		case 'top-left':
		moveX = moveY = 0;
		break;
		case 'top-right':
1023		~~moveX = originalWidth;~~
	848	moveX = dims.width;
		moveY = 0;
		break;
		case 'bottom-left':
		moveX = 0;
1028		~~moveY = originalHeight;~~
	853	moveY = dims.height;
		break;
		case 'bottom-right':
1031		~~moveX = originalWidth;~~
1032		~~moveY = originalHeight;~~
	856	moveX = dims.width;
	857	moveY = dims.height;
		break;
1034		~~case 'center':~~
1035		~~moveX = originalWidth / 2;~~
1036		~~moveY = originalHeight / 2;~~
	859	case 'center':
	860	moveX = dims.width / 2;
	861	moveY = dims.height / 2;
		break;
		}
1039
	864
		return new Effect.Parallel(
1041		~~[ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: opacityTransition }),~~
1042		~~new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: scaleTransition, restoreAfterFinish: true}),~~
1043		~~new Effect.MoveBy(element, moveY, moveX, { sync: true, transition: moveTransition })~~
1044		~~], Object.extend({~~
1045		~~beforeStartInternal: function(effect) {~~
1046		~~Element.makePositioned(effect.effects[0].element);~~
1047		~~Element.makeClipping(effect.effects[0].element);~~
	866	[ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
	867	new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
	868	new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
	869	], Object.extend({
	870	beforeStartInternal: function(effect) {
	871	effect.effects[0].element.makePositioned().makeClipping();
		},
		afterFinishInternal: function(effect) {
1050		~~var el = effect.effects[0].element;~~
1051		~~var els = el.style;~~
1052		~~Element.hide(el);~~
1053		~~Element.undoClipping(el);~~
1054		~~Element.undoPositioned(el);~~
1055		~~els.top = oldTop;~~
1056		~~els.left = oldLeft;~~
1057		~~els.height = oldHeight;~~
1058		~~els.width = oldWidth;~~
1059		~~Element.setInlineOpacity(el, oldOpacity);~~
1060		}
	874	effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
		}, options)
		);
1063		}
	877	};

		Effect.Pulsate = function(element) {
		element = $(element);
1067		~~var options = arguments[1] \|\| {};~~
1068		~~var oldOpacity = Element.getInlineOpacity(element);~~
1069		~~var transition = options.transition \|\| Effect.Transitions.sinoidal;~~
1070		~~var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos)) };~~
1071		~~reverser.bind(transition);~~
1072		~~return new Effect.Opacity(element,~~
1073		~~Object.extend(Object.extend({ duration: 3.0, from: 0,~~
1074		~~afterFinishInternal: function(effect) { Element.setInlineOpacity(effect.element, oldOpacity); }~~
	881	var options = arguments[1] \|\| { },
	882	oldOpacity = element.getInlineOpacity(),
	883	transition = options.transition \|\| Effect.Transitions.linear,
	884	reverser = function(pos){
	885	return 1 - transition((-Math.cos((pos(options.pulses\|\|5)2)*Math.PI)/2) + .5);
	886	};
	887
	888	return new Effect.Opacity(element,
	889	Object.extend(Object.extend({ duration: 2.0, from: 0,
	890	afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
		}, options), {transition: reverser}));
1076		}
	892	};

		Effect.Fold = function(element) {
		element = $(element);
1080		~~var originalTop = element.style.top;~~
1081		~~var originalLeft = element.style.left;~~
1082		~~var originalWidth = element.style.width;~~
1083		~~var originalHeight = element.style.height;~~
1084		~~Element.makeClipping(element);~~
1085		~~return new Effect.Scale(element, 5, Object.extend({~~
	896	var oldStyle = {
	897	top: element.style.top,
	898	left: element.style.left,
	899	width: element.style.width,
	900	height: element.style.height };
	901	element.makeClipping();
	902	return new Effect.Scale(element, 5, Object.extend({
		scaleContent: false,
		scaleX: false,
		afterFinishInternal: function(effect) {
1089		~~new Effect.Scale(element, 1, {~~
1090		~~scaleContent: false,~~
	906	new Effect.Scale(element, 1, {
	907	scaleContent: false,
		scaleY: false,
1092		~~afterFinishInternal: function(effect) {~~
1093		~~Element.hide(effect.element);~~
1094		~~Element.undoClipping(effect.element);~~
1095		~~effect.element.style.top = originalTop;~~
1096		~~effect.element.style.left = originalLeft;~~
1097		~~effect.element.style.width = originalWidth;~~
1098		~~effect.element.style.height = originalHeight;~~
	909	afterFinishInternal: function(effect) {
	910	effect.element.hide().undoClipping().setStyle(oldStyle);
		} });
1100		~~}}, arguments[1] \|\| {}));~~
	912	}}, arguments[1] \|\| { }));
	913	};
	914
	915	Effect.Morph = Class.create(Effect.Base, {
	916	initialize: function(element) {
	917	this.element = $(element);
	918	if (!this.element) throw(Effect._elementDoesNotExistError);
	919	var options = Object.extend({
	920	style: { }
	921	}, arguments[1] \|\| { });
	922
	923	if (!Object.isString(options.style)) this.style = $H(options.style);
	924	else {
	925	if (options.style.include(':'))
	926	this.style = options.style.parseStyle();
	927	else {
	928	this.element.addClassName(options.style);
	929	this.style = $H(this.element.getStyles());
	930	this.element.removeClassName(options.style);
	931	var css = this.element.getStyles();
	932	this.style = this.style.reject(function(style) {
	933	return style.value == css[style.key];
	934	});
	935	options.afterFinishInternal = function(effect) {
	936	effect.element.addClassName(effect.options.style);
	937	effect.transforms.each(function(transform) {
	938	effect.element.style[transform.style] = '';
	939	});
	940	};
	941	}
	942	}
	943	this.start(options);
	944	},
	945
	946	setup: function(){
	947	function parseColor(color){
	948	if (!color \|\| ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
	949	color = color.parseColor();
	950	return $R(0,2).map(function(i){
	951	return parseInt( color.slice(i2+1,i2+3), 16 );
	952	});
	953	}
	954	this.transforms = this.style.map(function(pair){
	955	var property = pair[0], value = pair[1], unit = null;
	956
	957	if (value.parseColor('#zzzzzz') != '#zzzzzz') {
	958	value = value.parseColor();
	959	unit = 'color';
	960	} else if (property == 'opacity') {
	961	value = parseFloat(value);
	962	if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
	963	this.element.setStyle({zoom: 1});
	964	} else if (Element.CSS_LENGTH.test(value)) {
	965	var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
	966	value = parseFloat(components[1]);
	967	unit = (components.length == 3) ? components[2] : null;
	968	}
	969
	970	var originalValue = this.element.getStyle(property);
	971	return {
	972	style: property.camelize(),
	973	originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue \|\| 0),
	974	targetValue: unit=='color' ? parseColor(value) : value,
	975	unit: unit
	976	};
	977	}.bind(this)).reject(function(transform){
	978	return (
	979	(transform.originalValue == transform.targetValue) \|\|
	980	(
	981	transform.unit != 'color' &&
	982	(isNaN(transform.originalValue) \|\| isNaN(transform.targetValue))
	983	)
	984	);
	985	});
	986	},
	987	update: function(position) {
	988	var style = { }, transform, i = this.transforms.length;
	989	while(i--)
	990	style[(transform = this.transforms[i]).style] =
	991	transform.unit=='color' ? '#'+
	992	(Math.round(transform.originalValue[0]+
	993	(transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
	994	(Math.round(transform.originalValue[1]+
	995	(transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
	996	(Math.round(transform.originalValue[2]+
	997	(transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
	998	(transform.originalValue +
	999	(transform.targetValue - transform.originalValue) * position).toFixed(3) +
	1000	(transform.unit === null ? '' : transform.unit);
	1001	this.element.setStyle(style, true);
	1002	}
	1003	});
	1004
	1005	Effect.Transform = Class.create({
	1006	initialize: function(tracks){
	1007	this.tracks = [];
	1008	this.options = arguments[1] \|\| { };
	1009	this.addTracks(tracks);
	1010	},
	1011	addTracks: function(tracks){
	1012	tracks.each(function(track){
	1013	track = $H(track);
	1014	var data = track.values().first();
	1015	this.tracks.push($H({
	1016	ids: track.keys().first(),
	1017	effect: Effect.Morph,
	1018	options: { style: data }
	1019	}));
	1020	}.bind(this));
	1021	return this;
	1022	},
	1023	play: function(){
	1024	return new Effect.Parallel(
	1025	this.tracks.map(function(track){
	1026	var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
	1027	var elements = [$(ids) \|\| $$(ids)].flatten();
	1028	return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
	1029	}).flatten(),
	1030	this.options
	1031	);
	1032	}
	1033	});
	1034
	1035	Element.CSS_PROPERTIES = $w(
	1036	'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
	1037	'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
	1038	'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
	1039	'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
	1040	'fontSize fontWeight height left letterSpacing lineHeight ' +
	1041	'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
	1042	'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
	1043	'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
	1044	'right textIndent top width wordSpacing zIndex');
	1045
	1046	Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em\|ex\|px\|in\|cm\|mm\|pt\|pc\|\%))\|0$/;
	1047
	1048	String.__parseStyleElement = document.createElement('div');
	1049	String.prototype.parseStyle = function(){
	1050	var style, styleRules = $H();
	1051	if (Prototype.Browser.WebKit)
	1052	style = new Element('div',{style:this}).style;
	1053	else {
	1054	String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
	1055	style = String.__parseStyleElement.childNodes[0].style;
	1056	}
	1057
	1058	Element.CSS_PROPERTIES.each(function(property){
	1059	if (style[property]) styleRules.set(property, style[property]);
	1060	});
	1061
	1062	if (Prototype.Browser.IE && this.include('opacity'))
	1063	styleRules.set('opacity', this.match(/opacity:\s((?:0\|1)?(?:\.\d)?)/)[1]);
	1064
	1065	return styleRules;
	1066	};
	1067
	1068	if (document.defaultView && document.defaultView.getComputedStyle) {
	1069	Element.getStyles = function(element) {
	1070	var css = document.defaultView.getComputedStyle($(element), null);
	1071	return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
	1072	styles[property] = css[property];
	1073	return styles;
	1074	});
	1075	};
	1076	} else {
	1077	Element.getStyles = function(element) {
	1078	element = $(element);
	1079	var css = element.currentStyle, styles;
	1080	styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
	1081	results[property] = css[property];
	1082	return results;
	1083	});
	1084	if (!styles.opacity) styles.opacity = element.getOpacity();
	1085	return styles;
	1086	};
		}
	1088
	1089	Effect.Methods = {
	1090	morph: function(element, style) {
	1091	element = $(element);
	1092	new Effect.Morph(element, Object.extend({ style: style }, arguments[2] \|\| { }));
	1093	return element;
	1094	},
	1095	visualEffect: function(element, effect, options) {
	1096	element = $(element);
	1097	var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
	1098	new Effect[klass](element, options);
	1099	return element;
	1100	},
	1101	highlight: function(element, options) {
	1102	element = $(element);
	1103	new Effect.Highlight(element, options);
	1104	return element;
	1105	}
	1106	};
	1107
	1108	$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
	1109	'pulsate shake puff squish switchOff dropOut').each(
	1110	function(effect) {
	1111	Effect.Methods[effect] = function(element, options){
	1112	element = $(element);
	1113	Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
	1114	return element;
	1115	};
	1116	}
	1117	);
	1118
	1119	$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
	1120	function(f) { Effect.Methods[f] = Element[f]; }
	1121	);
	1122
	1123	Element.addMethods(Effect.Methods);

rool/rails/instiki/trunk/public/javascripts/prototype.js:

prev.	current

1		~~/* Prototype JavaScript framework, version 1.4.0_rc0~~
2		* (c) 2005 Sam Stephenson <sam@conio.net>
	1	/* Prototype JavaScript framework, version 1.6.1
	2	* (c) 2005-2009 Sam Stephenson
		*
4		* THIS FILE IS AUTOMATICALLY GENERATED. When sending patches, please diff
5		* against the source tree, available from the Prototype darcs repository.
6		*
		* Prototype is freely distributable under the terms of an MIT-style license.
	5	* For details, see the Prototype web site: http://www.prototypejs.org/
		*
9		* For details, see the Prototype web site: http://prototype.conio.net/
10		*
11		~~/--------------------------------------------------------------------------/~~
	7	--------------------------------------------------------------------------/

		var Prototype = {
14		~~Version: '1.4.0_rc0',~~
	10	Version: '1.6.1',

16		~~emptyFunction: function() {},~~
17		~~K: function(x) {return x}~~
18		}
19
20		~~var Class = {~~
21		~~create: function() {~~
22		~~return function() {~~
23		~~this.initialize.apply(this, arguments);~~
	12	Browser: (function(){
	13	var ua = navigator.userAgent;
	14	var isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]';
	15	return {
	16	IE: !!window.attachEvent && !isOpera,
	17	Opera: isOpera,
	18	WebKit: ua.indexOf('AppleWebKit/') > -1,
	19	Gecko: ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1,
	20	MobileSafari: /Apple.Mobile.Safari/.test(ua)
		}
25		}
26		}
	22	})(),

28		~~var Abstract = new Object();~~
	24	BrowserFeatures: {
	25	XPath: !!document.evaluate,
	26	SelectorsAPI: !!document.querySelector,
	27	ElementExtensions: (function() {
	28	var constructor = window.Element \|\| window.HTMLElement;
	29	return !!(constructor && constructor.prototype);
	30	})(),
	31	SpecificElementExtensions: (function() {
	32	if (typeof window.HTMLDivElement !== 'undefined')
	33	return true;

30		~~Object.extend = function(destination, source) {~~
31		~~for (property in source) {~~
32		~~destination[property] = source[property];~~
33		}
34		~~return destination;~~
35		}
	35	var div = document.createElement('div');
	36	var form = document.createElement('form');
	37	var isSupported = false;

37		~~Object.inspect = function(object) {~~
38		~~try {~~
39		~~if (object == undefined) return 'undefined';~~
40		~~if (object == null) return 'null';~~
41		~~return object.inspect ? object.inspect() : object.toString();~~
42		~~} catch (e) {~~
43		~~if (e instanceof RangeError) return '...';~~
44		~~throw e;~~
45		}
46		}
	39	if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) {
	40	isSupported = true;
	41	}

48		~~Function.prototype.bind = function(object) {~~
49		~~var __method = this;~~
50		~~return function() {~~
51		~~return __method.apply(object, arguments);~~
52		}
53		}
	43	div = form = null;

55		~~Function.prototype.bindAsEventListener = function(object) {~~
56		~~var __method = this;~~
57		~~return function(event) {~~
58		~~return __method.call(object, event \|\| window.event);~~
59		}
60		}
61
62		~~Object.extend(Number.prototype, {~~
63		~~toColorPart: function() {~~
64		~~var digits = this.toString(16);~~
65		~~if (this < 16) return '0' + digits;~~
66		~~return digits;~~
	45	return isSupported;
	46	})()
		},

69		~~succ: function() {~~
70		~~return this + 1;~~
71		},
	49	ScriptFragment: '<script[^>]>([\\S\\s]?)<\/script>',
	50	JSONFilter: /^\/\-secure-([\s\S])\\/\s$/,

73		~~times: function(iterator) {~~
74		~~$R(0, this, true).each(iterator);~~
75		~~return this;~~
76		}
77		~~});~~
	52	emptyFunction: function() { },
	53	K: function(x) { return x }
	54	};

	56	if (Prototype.Browser.MobileSafari)
	57	Prototype.BrowserFeatures.SpecificElementExtensions = false;
	58
	59
	60	var Abstract = { };
	61
	62
		var Try = {
		these: function() {
		var returnValue;

83		~~for (var i = 0; i < arguments.length; i++) {~~
	67	for (var i = 0, length = arguments.length; i < length; i++) {
		var lambda = arguments[i];
		try {
		returnValue = lambda();
		break;
88		~~} catch (e) {}~~
	72	} catch (e) { }
		}

		return returnValue;
		}
93		}
	77	};

95		~~/--------------------------------------------------------------------------/~~
	79	/* Based on Alex Arnell's inheritance implementation. */

97		~~var PeriodicalExecuter = Class.create();~~
98		~~PeriodicalExecuter.prototype = {~~
	81	var Class = (function() {
	82	function subclass() {};
	83	function create() {
	84	var parent = null, properties = $A(arguments);
	85	if (Object.isFunction(properties[0]))
	86	parent = properties.shift();
	87
	88	function klass() {
	89	this.initialize.apply(this, arguments);
	90	}
	91
	92	Object.extend(klass, Class.Methods);
	93	klass.superclass = parent;
	94	klass.subclasses = [];
	95
	96	if (parent) {
	97	subclass.prototype = parent.prototype;
	98	klass.prototype = new subclass;
	99	parent.subclasses.push(klass);
	100	}
	101
	102	for (var i = 0; i < properties.length; i++)
	103	klass.addMethods(properties[i]);
	104
	105	if (!klass.prototype.initialize)
	106	klass.prototype.initialize = Prototype.emptyFunction;
	107
	108	klass.prototype.constructor = klass;
	109	return klass;
	110	}
	111
	112	function addMethods(source) {
	113	var ancestor = this.superclass && this.superclass.prototype;
	114	var properties = Object.keys(source);
	115
	116	if (!Object.keys({ toString: true }).length) {
	117	if (source.toString != Object.prototype.toString)
	118	properties.push("toString");
	119	if (source.valueOf != Object.prototype.valueOf)
	120	properties.push("valueOf");
	121	}
	122
	123	for (var i = 0, length = properties.length; i < length; i++) {
	124	var property = properties[i], value = source[property];
	125	if (ancestor && Object.isFunction(value) &&
	126	value.argumentNames().first() == "$super") {
	127	var method = value;
	128	value = (function(m) {
	129	return function() { return ancestor[m].apply(this, arguments); };
	130	})(property).wrap(method);
	131
	132	value.valueOf = method.valueOf.bind(method);
	133	value.toString = method.toString.bind(method);
	134	}
	135	this.prototype[property] = value;
	136	}
	137
	138	return this;
	139	}
	140
	141	return {
	142	create: create,
	143	Methods: {
	144	addMethods: addMethods
	145	}
	146	};
	147	})();
	148	(function() {
	149
	150	var _toString = Object.prototype.toString;
	151
	152	function extend(destination, source) {
	153	for (var property in source)
	154	destination[property] = source[property];
	155	return destination;
	156	}
	157
	158	function inspect(object) {
	159	try {
	160	if (isUndefined(object)) return 'undefined';
	161	if (object === null) return 'null';
	162	return object.inspect ? object.inspect() : String(object);
	163	} catch (e) {
	164	if (e instanceof RangeError) return '...';
	165	throw e;
	166	}
	167	}
	168
	169	function toJSON(object) {
	170	var type = typeof object;
	171	switch (type) {
	172	case 'undefined':
	173	case 'function':
	174	case 'unknown': return;
	175	case 'boolean': return object.toString();
	176	}
	177
	178	if (object === null) return 'null';
	179	if (object.toJSON) return object.toJSON();
	180	if (isElement(object)) return;
	181
	182	var results = [];
	183	for (var property in object) {
	184	var value = toJSON(object[property]);
	185	if (!isUndefined(value))
	186	results.push(property.toJSON() + ': ' + value);
	187	}
	188
	189	return '{' + results.join(', ') + '}';
	190	}
	191
	192	function toQueryString(object) {
	193	return $H(object).toQueryString();
	194	}
	195
	196	function toHTML(object) {
	197	return object && object.toHTML ? object.toHTML() : String.interpret(object);
	198	}
	199
	200	function keys(object) {
	201	var results = [];
	202	for (var property in object)
	203	results.push(property);
	204	return results;
	205	}
	206
	207	function values(object) {
	208	var results = [];
	209	for (var property in object)
	210	results.push(object[property]);
	211	return results;
	212	}
	213
	214	function clone(object) {
	215	return extend({ }, object);
	216	}
	217
	218	function isElement(object) {
	219	return !!(object && object.nodeType == 1);
	220	}
	221
	222	function isArray(object) {
	223	return _toString.call(object) == "[object Array]";
	224	}
	225
	226
	227	function isHash(object) {
	228	return object instanceof Hash;
	229	}
	230
	231	function isFunction(object) {
	232	return typeof object === "function";
	233	}
	234
	235	function isString(object) {
	236	return _toString.call(object) == "[object String]";
	237	}
	238
	239	function isNumber(object) {
	240	return _toString.call(object) == "[object Number]";
	241	}
	242
	243	function isUndefined(object) {
	244	return typeof object === "undefined";
	245	}
	246
	247	extend(Object, {
	248	extend: extend,
	249	inspect: inspect,
	250	toJSON: toJSON,
	251	toQueryString: toQueryString,
	252	toHTML: toHTML,
	253	keys: keys,
	254	values: values,
	255	clone: clone,
	256	isElement: isElement,
	257	isArray: isArray,
	258	isHash: isHash,
	259	isFunction: isFunction,
	260	isString: isString,
	261	isNumber: isNumber,
	262	isUndefined: isUndefined
	263	});
	264	})();
	265	Object.extend(Function.prototype, (function() {
	266	var slice = Array.prototype.slice;
	267
	268	function update(array, args) {
	269	var arrayLength = array.length, length = args.length;
	270	while (length--) array[arrayLength + length] = args[length];
	271	return array;
	272	}
	273
	274	function merge(array, args) {
	275	array = slice.call(array, 0);
	276	return update(array, args);
	277	}
	278
	279	function argumentNames() {
	280	var names = this.toString().match(/^[\s$]function[^(]\(([^)]*)$/)[1]
	281	.replace(/\/\/.?[\r\n]\|\/\(?:.\|[\r\n])?\\//g, '')
	282	.replace(/\s+/g, '').split(',');
	283	return names.length == 1 && !names[0] ? [] : names;
	284	}
	285
	286	function bind(context) {
	287	if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
	288	var __method = this, args = slice.call(arguments, 1);
	289	return function() {
	290	var a = merge(args, arguments);
	291	return __method.apply(context, a);
	292	}
	293	}
	294
	295	function bindAsEventListener(context) {
	296	var __method = this, args = slice.call(arguments, 1);
	297	return function(event) {
	298	var a = update([event \|\| window.event], args);
	299	return __method.apply(context, a);
	300	}
	301	}
	302
	303	function curry() {
	304	if (!arguments.length) return this;
	305	var __method = this, args = slice.call(arguments, 0);
	306	return function() {
	307	var a = merge(args, arguments);
	308	return __method.apply(this, a);
	309	}
	310	}
	311
	312	function delay(timeout) {
	313	var __method = this, args = slice.call(arguments, 1);
	314	timeout = timeout * 1000
	315	return window.setTimeout(function() {
	316	return __method.apply(__method, args);
	317	}, timeout);
	318	}
	319
	320	function defer() {
	321	var args = update([0.01], arguments);
	322	return this.delay.apply(this, args);
	323	}
	324
	325	function wrap(wrapper) {
	326	var __method = this;
	327	return function() {
	328	var a = update([__method.bind(this)], arguments);
	329	return wrapper.apply(this, a);
	330	}
	331	}
	332
	333	function methodize() {
	334	if (this._methodized) return this._methodized;
	335	var __method = this;
	336	return this._methodized = function() {
	337	var a = update([this], arguments);
	338	return __method.apply(null, a);
	339	};
	340	}
	341
	342	return {
	343	argumentNames: argumentNames,
	344	bind: bind,
	345	bindAsEventListener: bindAsEventListener,
	346	curry: curry,
	347	delay: delay,
	348	defer: defer,
	349	wrap: wrap,
	350	methodize: methodize
	351	}
	352	})());
	353
	354
	355	Date.prototype.toJSON = function() {
	356	return '"' + this.getUTCFullYear() + '-' +
	357	(this.getUTCMonth() + 1).toPaddedString(2) + '-' +
	358	this.getUTCDate().toPaddedString(2) + 'T' +
	359	this.getUTCHours().toPaddedString(2) + ':' +
	360	this.getUTCMinutes().toPaddedString(2) + ':' +
	361	this.getUTCSeconds().toPaddedString(2) + 'Z"';
	362	};
	363
	364
	365	RegExp.prototype.match = RegExp.prototype.test;
	366
	367	RegExp.escape = function(str) {
	368	return String(str).replace(/([.*+?^=!:${}()\|[\]\/\\])/g, '\\$1');
	369	};
	370	var PeriodicalExecuter = Class.create({
		initialize: function(callback, frequency) {
		this.callback = callback;
		this.frequency = frequency;
...	...
		},

		registerCallback: function() {
108		~~setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);~~
	380	this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
		},

	383	execute: function() {
	384	this.callback(this);
	385	},
	386
	387	stop: function() {
	388	if (!this.timer) return;
	389	clearInterval(this.timer);
	390	this.timer = null;
	391	},
	392
		onTimerEvent: function() {
		if (!this.currentlyExecuting) {
		try {
		this.currentlyExecuting = true;
115		~~this.callback();~~
116		~~} finally {~~
	397	this.execute();
		this.currentlyExecuting = false;
	399	} catch(e) {
	400	this.currentlyExecuting = false;
	401	throw e;
		}
		}
		}
121		}
	405	});
	406	Object.extend(String, {
	407	interpret: function(value) {
	408	return value == null ? '' : String(value);
	409	},
	410	specialChar: {
	411	'\b': '\\b',
	412	'\t': '\\t',
	413	'\n': '\\n',
	414	'\f': '\\f',
	415	'\r': '\\r',
	416	'\\': '\\\\'
	417	}
	418	});

123		~~/--------------------------------------------------------------------------/~~
	420	Object.extend(String.prototype, (function() {

125		~~function $() {~~
126		~~var elements = new Array();~~
	422	function prepareReplacement(replacement) {
	423	if (Object.isFunction(replacement)) return replacement;
	424	var template = new Template(replacement);
	425	return function(match) { return template.evaluate(match) };
	426	}

128		~~for (var i = 0; i < arguments.length; i++) {~~
129		~~var element = arguments[i];~~
130		~~if (typeof element == 'string')~~
131		~~element = document.getElementById(element);~~
	428	function gsub(pattern, replacement) {
	429	var result = '', source = this, match;
	430	replacement = prepareReplacement(replacement);

133		~~if (arguments.length == 1)~~
134		~~return element;~~
	432	if (Object.isString(pattern))
	433	pattern = RegExp.escape(pattern);

136		~~elements.push(element);~~
	435	if (!(pattern.length \|\| pattern.source)) {
	436	replacement = replacement('');
	437	return replacement + source.split('').join(replacement) + replacement;
	438	}
	439
	440	while (source.length > 0) {
	441	if (match = source.match(pattern)) {
	442	result += source.slice(0, match.index);
	443	result += String.interpret(replacement(match));
	444	source = source.slice(match.index + match[0].length);
	445	} else {
	446	result += source, source = '';
	447	}
	448	}
	449	return result;
		}

139		~~return elements;~~
140		}
141		~~Object.extend(String.prototype, {~~
142		~~stripTags: function() {~~
143		~~return this.replace(/<\/?[^>]+>/gi, '');~~
144		},
	452	function sub(pattern, replacement, count) {
	453	replacement = prepareReplacement(replacement);
	454	count = Object.isUndefined(count) ? 1 : count;

146		~~escapeHTML: function() {~~
147		~~var div = document.createElement('div');~~
148		~~var text = document.createTextNode(this);~~
149		~~div.appendChild(text);~~
150		~~return div.innerHTML;~~
151		},
	456	return this.gsub(pattern, function(match) {
	457	if (--count < 0) return match[0];
	458	return replacement(match);
	459	});
	460	}

153		~~unescapeHTML: function() {~~
154		~~var div = document.createElement('div');~~
155		~~div.innerHTML = this.stripTags();~~
156		~~return div.childNodes[0] ? div.childNodes[0].nodeValue : '';~~
157		},
	462	function scan(pattern, iterator) {
	463	this.gsub(pattern, iterator);
	464	return String(this);
	465	}

159		~~toQueryParams: function() {~~
160		~~var pairs = this.match(/^\??(.*)$/)[1].split('&');~~
161		~~return pairs.inject({}, function(params, pairString) {~~
162		~~var pair = pairString.split('=');~~
163		~~params[pair[0]] = pair[1];~~
164		~~return params;~~
	467	function truncate(length, truncation) {
	468	length = length \|\| 30;
	469	truncation = Object.isUndefined(truncation) ? '...' : truncation;
	470	return this.length > length ?
	471	this.slice(0, length - truncation.length) + truncation : String(this);
	472	}
	473
	474	function strip() {
	475	return this.replace(/^\s+/, '').replace(/\s+$/, '');
	476	}
	477
	478	function stripTags() {
	479	return this.replace(/<\w+(\s+("[^"]"\|'[^']'\|[^>])+)?>\|<\/\w+>/gi, '');
	480	}
	481
	482	function stripScripts() {
	483	return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
	484	}
	485
	486	function extractScripts() {
	487	var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
	488	var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
	489	return (this.match(matchAll) \|\| []).map(function(scriptTag) {
	490	return (scriptTag.match(matchOne) \|\| ['', ''])[1];
		});
166		},
	492	}

168		~~toArray: function() {~~
	494	function evalScripts() {
	495	return this.extractScripts().map(function(script) { return eval(script) });
	496	}
	497
	498	function escapeHTML() {
	499	return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
	500	}
	501
	502	function unescapeHTML() {
	503	return this.stripTags().replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&');
	504	}
	505
	506
	507	function toQueryParams(separator) {
	508	var match = this.strip().match(/([^?#])(#.)?$/);
	509	if (!match) return { };
	510
	511	return match[1].split(separator \|\| '&').inject({ }, function(hash, pair) {
	512	if ((pair = pair.split('='))[0]) {
	513	var key = decodeURIComponent(pair.shift());
	514	var value = pair.length > 1 ? pair.join('=') : pair[0];
	515	if (value != undefined) value = decodeURIComponent(value);
	516
	517	if (key in hash) {
	518	if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
	519	hash[key].push(value);
	520	}
	521	else hash[key] = value;
	522	}
	523	return hash;
	524	});
	525	}
	526
	527	function toArray() {
		return this.split('');
170		},
	529	}

172		~~camelize: function() {~~
173		~~var oStringList = this.split('-');~~
174		~~if (oStringList.length == 1) return oStringList[0];~~
	531	function succ() {
	532	return this.slice(0, this.length - 1) +
	533	String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
	534	}

176		~~var camelizedString = this.indexOf('-') == 0~~
177		~~? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)~~
178		~~: oStringList[0];~~
	536	function times(count) {
	537	return count < 1 ? '' : new Array(count + 1).join(this);
	538	}

180		~~for (var i = 1, len = oStringList.length; i < len; i++) {~~
181		~~var s = oStringList[i];~~
182		~~camelizedString += s.charAt(0).toUpperCase() + s.substring(1);~~
183		}
	540	function camelize() {
	541	var parts = this.split('-'), len = parts.length;
	542	if (len == 1) return parts[0];

185		~~return camelizedString;~~
	544	var camelized = this.charAt(0) == '-'
	545	? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
	546	: parts[0];
	547
	548	for (var i = 1; i < len; i++)
	549	camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
	550
	551	return camelized;
	552	}
	553
	554	function capitalize() {
	555	return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
	556	}
	557
	558	function underscore() {
	559	return this.replace(/::/g, '/')
	560	.replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
	561	.replace(/([a-z\d])([A-Z])/g, '$1_$2')
	562	.replace(/-/g, '_')
	563	.toLowerCase();
	564	}
	565
	566	function dasherize() {
	567	return this.replace(/_/g, '-');
	568	}
	569
	570	function inspect(useDoubleQuotes) {
	571	var escapedString = this.replace(/[\x00-\x1f\\]/g, function(character) {
	572	if (character in String.specialChar) {
	573	return String.specialChar[character];
	574	}
	575	return '\\u00' + character.charCodeAt().toPaddedString(2, 16);
	576	});
	577	if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
	578	return "'" + escapedString.replace(/'/g, '\\\'') + "'";
	579	}
	580
	581	function toJSON() {
	582	return this.inspect(true);
	583	}
	584
	585	function unfilterJSON(filter) {
	586	return this.replace(filter \|\| Prototype.JSONFilter, '$1');
	587	}
	588
	589	function isJSON() {
	590	var str = this;
	591	if (str.blank()) return false;
	592	str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
	593	return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
	594	}
	595
	596	function evalJSON(sanitize) {
	597	var json = this.unfilterJSON();
	598	try {
	599	if (!sanitize \|\| json.isJSON()) return eval('(' + json + ')');
	600	} catch (e) { }
	601	throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
	602	}
	603
	604	function include(pattern) {
	605	return this.indexOf(pattern) > -1;
	606	}
	607
	608	function startsWith(pattern) {
	609	return this.indexOf(pattern) === 0;
	610	}
	611
	612	function endsWith(pattern) {
	613	var d = this.length - pattern.length;
	614	return d >= 0 && this.lastIndexOf(pattern) === d;
	615	}
	616
	617	function empty() {
	618	return this == '';
	619	}
	620
	621	function blank() {
	622	return /^\s*$/.test(this);
	623	}
	624
	625	function interpolate(object, pattern) {
	626	return new Template(this, pattern).evaluate(object);
	627	}
	628
	629	return {
	630	gsub: gsub,
	631	sub: sub,
	632	scan: scan,
	633	truncate: truncate,
	634	strip: String.prototype.trim ? String.prototype.trim : strip,
	635	stripTags: stripTags,
	636	stripScripts: stripScripts,
	637	extractScripts: extractScripts,
	638	evalScripts: evalScripts,
	639	escapeHTML: escapeHTML,
	640	unescapeHTML: unescapeHTML,
	641	toQueryParams: toQueryParams,
	642	parseQuery: toQueryParams,
	643	toArray: toArray,
	644	succ: succ,
	645	times: times,
	646	camelize: camelize,
	647	capitalize: capitalize,
	648	underscore: underscore,
	649	dasherize: dasherize,
	650	inspect: inspect,
	651	toJSON: toJSON,
	652	unfilterJSON: unfilterJSON,
	653	isJSON: isJSON,
	654	evalJSON: evalJSON,
	655	include: include,
	656	startsWith: startsWith,
	657	endsWith: endsWith,
	658	empty: empty,
	659	blank: blank,
	660	interpolate: interpolate
	661	};
	662	})());
	663
	664	var Template = Class.create({
	665	initialize: function(template, pattern) {
	666	this.template = template.toString();
	667	this.pattern = pattern \|\| Template.Pattern;
		},

188		~~inspect: function() {~~
189		~~return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'";~~
	670	evaluate: function(object) {
	671	if (object && Object.isFunction(object.toTemplateReplacements))
	672	object = object.toTemplateReplacements();
	673
	674	return this.template.gsub(this.pattern, function(match) {
	675	if (object == null) return (match[1] + '');
	676
	677	var before = match[1] \|\| '';
	678	if (before == '\\') return match[2];
	679
	680	var ctx = object, expr = match[3];
	681	var pattern = /^([^.[]+\|\[((?:.*?[^\\])?)\])(\.\|\[\|$)/;
	682	match = pattern.exec(expr);
	683	if (match == null) return before;
	684
	685	while (match != null) {
	686	var comp = match[1].startsWith('[') ? match[2].replace(/\\\\]/g, ']') : match[1];
	687	ctx = ctx[comp];
	688	if (null == ctx \|\| '' == match[3]) break;
	689	expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
	690	match = pattern.exec(expr);
	691	}
	692
	693	return before + String.interpret(ctx);
	694	});
		}
		});
	697	Template.Pattern = /(^\|.\|\r\|\n)(#\{(.*?)\})/;

193		~~String.prototype.parseQuery = String.prototype.toQueryParams;~~
	699	var $break = { };

195		~~var $break = new Object();~~
196		~~var $continue = new Object();~~
197
198		~~var Enumerable = {~~
199		~~each: function(iterator) {~~
	701	var Enumerable = (function() {
	702	function each(iterator, context) {
		var index = 0;
		try {
		this._each(function(value) {
203		~~try {~~
204		~~iterator(value, index++);~~
205		~~} catch (e) {~~
206		~~if (e != $continue) throw e;~~
207		}
	706	iterator.call(context, value, index++);
		});
		} catch (e) {
		if (e != $break) throw e;
		}
212		},
	711	return this;
	712	}

214		~~all: function(iterator) {~~
	714	function eachSlice(number, iterator, context) {
	715	var index = -number, slices = [], array = this.toArray();
	716	if (number < 1) return array;
	717	while ((index += number) < array.length)
	718	slices.push(array.slice(index, index+number));
	719	return slices.collect(iterator, context);
	720	}
	721
	722	function all(iterator, context) {
	723	iterator = iterator \|\| Prototype.K;
		var result = true;
		this.each(function(value, index) {
217		~~if (!(result &= (iterator \|\| Prototype.K)(value, index)))~~
218		~~throw $break;~~
	726	result = result && !!iterator.call(context, value, index);
	727	if (!result) throw $break;
		});
		return result;
221		},
	730	}

223		~~any: function(iterator) {~~
224		~~var result = true;~~
	732	function any(iterator, context) {
	733	iterator = iterator \|\| Prototype.K;
	734	var result = false;
		this.each(function(value, index) {
226		~~if (result &= (iterator \|\| Prototype.K)(value, index))~~
	736	if (result = !!iterator.call(context, value, index))
		throw $break;
		});
		return result;
230		},
	740	}

232		~~collect: function(iterator) {~~
	742	function collect(iterator, context) {
	743	iterator = iterator \|\| Prototype.K;
		var results = [];
		this.each(function(value, index) {
235		~~results.push(iterator(value, index));~~
	746	results.push(iterator.call(context, value, index));
		});
		return results;
238		},
	749	}

240		~~detect: function (iterator) {~~
	751	function detect(iterator, context) {
		var result;
		this.each(function(value, index) {
243		~~if (iterator(value, index)) {~~
	754	if (iterator.call(context, value, index)) {
		result = value;
		throw $break;
		}
		});
		return result;
249		},
	760	}

251		~~findAll: function(iterator) {~~
	762	function findAll(iterator, context) {
		var results = [];
		this.each(function(value, index) {
254		~~if (iterator(value, index))~~
	765	if (iterator.call(context, value, index))
		results.push(value);
		});
		return results;
258		},
	769	}

260		~~grep: function(pattern, iterator) {~~
	771	function grep(filter, iterator, context) {
	772	iterator = iterator \|\| Prototype.K;
		var results = [];
	774
	775	if (Object.isString(filter))
	776	filter = new RegExp(RegExp.escape(filter));
	777
		this.each(function(value, index) {
263		~~var stringValue = value.toString();~~
264		~~if (stringValue.match(pattern))~~
265		~~results.push((iterator \|\| Prototype.K)(value, index));~~
266		})
	779	if (filter.match(value))
	780	results.push(iterator.call(context, value, index));
	781	});
		return results;
268		},
	783	}

270		~~include: function(object) {~~
	785	function include(object) {
	786	if (Object.isFunction(this.indexOf))
	787	if (this.indexOf(object) != -1) return true;
	788
		var found = false;
		this.each(function(value) {
		if (value == object) {
...	...
		}
		});
		return found;
279		},
	797	}

281		~~inject: function(memo, iterator) {~~
	799	function inGroupsOf(number, fillWith) {
	800	fillWith = Object.isUndefined(fillWith) ? null : fillWith;
	801	return this.eachSlice(number, function(slice) {
	802	while(slice.length < number) slice.push(fillWith);
	803	return slice;
	804	});
	805	}
	806
	807	function inject(memo, iterator, context) {
		this.each(function(value, index) {
283		~~memo = iterator(memo, value, index);~~
	809	memo = iterator.call(context, memo, value, index);
		});
		return memo;
286		},
	812	}

288		~~invoke: function(method) {~~
	814	function invoke(method) {
		var args = $A(arguments).slice(1);
290		~~return this.collect(function(value) {~~
	816	return this.map(function(value) {
		return value[method].apply(value, args);
		});
293		},
	819	}

295		~~max: function(iterator) {~~
	821	function max(iterator, context) {
	822	iterator = iterator \|\| Prototype.K;
		var result;
		this.each(function(value, index) {
298		~~value = (iterator \|\| Prototype.K)(value, index);~~
299		~~if (value >= (result \|\| value))~~
	825	value = iterator.call(context, value, index);
	826	if (result == null \|\| value >= result)
		result = value;
		});
		return result;
303		},
	830	}

305		~~min: function(iterator) {~~
	832	function min(iterator, context) {
	833	iterator = iterator \|\| Prototype.K;
		var result;
		this.each(function(value, index) {
308		~~value = (iterator \|\| Prototype.K)(value, index);~~
309		~~if (value <= (result \|\| value))~~
	836	value = iterator.call(context, value, index);
	837	if (result == null \|\| value < result)
		result = value;
		});
		return result;
313		},
	841	}

315		~~partition: function(iterator) {~~
	843	function partition(iterator, context) {
	844	iterator = iterator \|\| Prototype.K;
		var trues = [], falses = [];
		this.each(function(value, index) {
318		~~((iterator \|\| Prototype.K)(value, index) ?~~
	847	(iterator.call(context, value, index) ?
		trues : falses).push(value);
		});
		return [trues, falses];
322		},
	851	}

324		~~pluck: function(property) {~~
	853	function pluck(property) {
		var results = [];
326		~~this.each(function(value, index) {~~
	855	this.each(function(value) {
		results.push(value[property]);
		});
		return results;
330		},
	859	}

332		~~reject: function(iterator) {~~
	861	function reject(iterator, context) {
		var results = [];
		this.each(function(value, index) {
335		~~if (!iterator(value, index))~~
	864	if (!iterator.call(context, value, index))
		results.push(value);
		});
		return results;
339		},
	868	}

341		~~sortBy: function(iterator) {~~
342		~~return this.collect(function(value, index) {~~
343		~~return {value: value, criteria: iterator(value, index)};~~
	870	function sortBy(iterator, context) {
	871	return this.map(function(value, index) {
	872	return {
	873	value: value,
	874	criteria: iterator.call(context, value, index)
	875	};
		}).sort(function(left, right) {
		var a = left.criteria, b = right.criteria;
		return a < b ? -1 : a > b ? 1 : 0;
		}).pluck('value');
348		},
	880	}

350		~~toArray: function() {~~
351		~~return this.collect(Prototype.K);~~
352		},
	882	function toArray() {
	883	return this.map();
	884	}

354		~~zip: function() {~~
	886	function zip() {
		var iterator = Prototype.K, args = $A(arguments);
356		~~if (typeof args.last() == 'function')~~
	888	if (Object.isFunction(args.last()))
		iterator = args.pop();

		var collections = [this].concat(args).map($A);
		return this.map(function(value, index) {
361		~~iterator(value = collections.pluck(index));~~
362		~~return value;~~
	893	return iterator(collections.pluck(index));
		});
364		},
	895	}

366		~~inspect: function() {~~
	897	function size() {
	898	return this.toArray().length;
	899	}
	900
	901	function inspect() {
		return '#<Enumerable:' + this.toArray().inspect() + '>';
		}
	904
	905
	906
	907
	908
	909
	910
	911
	912
	913	return {
	914	each: each,
	915	eachSlice: eachSlice,
	916	all: all,
	917	every: all,
	918	any: any,
	919	some: any,
	920	collect: collect,
	921	map: collect,
	922	detect: detect,
	923	findAll: findAll,
	924	select: findAll,
	925	filter: findAll,
	926	grep: grep,
	927	include: include,
	928	member: include,
	929	inGroupsOf: inGroupsOf,
	930	inject: inject,
	931	invoke: invoke,
	932	max: max,
	933	min: min,
	934	partition: partition,
	935	pluck: pluck,
	936	reject: reject,
	937	sortBy: sortBy,
	938	toArray: toArray,
	939	entries: toArray,
	940	zip: zip,
	941	size: size,
	942	inspect: inspect,
	943	find: detect
	944	};
	945	})();
	946	function $A(iterable) {
	947	if (!iterable) return [];
	948	if ('toArray' in Object(iterable)) return iterable.toArray();
	949	var length = iterable.length \|\| 0, results = new Array(length);
	950	while (length--) results[length] = iterable[length];
	951	return results;
		}

371		~~Object.extend(Enumerable, {~~
372		~~map: Enumerable.collect,~~
373		~~find: Enumerable.detect,~~
374		~~select: Enumerable.findAll,~~
375		~~member: Enumerable.include,~~
376		~~entries: Enumerable.toArray~~
377		~~});~~
378		~~var $A = Array.from = function(iterable) {~~
379		~~if (iterable.toArray) {~~
380		~~return iterable.toArray();~~
381		~~} else {~~
382		~~var results = [];~~
383		~~for (var i = 0; i < iterable.length; i++)~~
384		~~results.push(iterable[i]);~~
385		~~return results;~~
386		}
	954	function $w(string) {
	955	if (!Object.isString(string)) return [];
	956	string = string.strip();
	957	return string ? string.split(/\s+/) : [];
		}

389		~~Object.extend(Array.prototype, Enumerable);~~
	960	Array.from = $A;

391		~~Object.extend(Array.prototype, {~~
392		~~_each: function(iterator) {~~
393		~~for (var i = 0; i < this.length; i++)~~
	962
	963	(function() {
	964	var arrayProto = Array.prototype,
	965	slice = arrayProto.slice,
	966	_each = arrayProto.forEach; // use native browser JS 1.6 implementation if available
	967
	968	function each(iterator) {
	969	for (var i = 0, length = this.length; i < length; i++)
		iterator(this[i]);
395		},
	971	}
	972	if (!_each) _each = each;

397		~~first: function() {~~
	974	function clear() {
	975	this.length = 0;
	976	return this;
	977	}
	978
	979	function first() {
		return this[0];
399		},
	981	}

401		~~last: function() {~~
	983	function last() {
		return this[this.length - 1];
403		},
	985	}

405		~~compact: function() {~~
	987	function compact() {
		return this.select(function(value) {
407		~~return value != undefined \|\| value != null;~~
	989	return value != null;
		});
409		},
	991	}

411		~~flatten: function() {~~
	993	function flatten() {
		return this.inject([], function(array, value) {
413		~~return array.concat(value.constructor == Array ?~~
414		~~value.flatten() : [value]);~~
	995	if (Object.isArray(value))
	996	return array.concat(value.flatten());
	997	array.push(value);
	998	return array;
		});
416		},
	1000	}

418		~~without: function() {~~
419		~~var values = $A(arguments);~~
	1002	function without() {
	1003	var values = slice.call(arguments, 0);
		return this.select(function(value) {
		return !values.include(value);
		});
423		},
	1007	}

425		~~indexOf: function(object) {~~
426		~~for (var i = 0; i < this.length; i++)~~
427		~~if (this[i] == object) return i;~~
428		~~return false;~~
429		},
	1009	function reverse(inline) {
	1010	return (inline !== false ? this : this.toArray())._reverse();
	1011	}

431		~~reverse: function() {~~
432		~~var result = [];~~
433		~~for (var i = this.length; i > 0; i--)~~
434		~~result.push(this[i-1]);~~
435		~~return result;~~
436		},
	1013	function uniq(sorted) {
	1014	return this.inject([], function(array, value, index) {
	1015	if (0 == index \|\| (sorted ? array.last() != value : !array.include(value)))
	1016	array.push(value);
	1017	return array;
	1018	});
	1019	}

438		~~inspect: function() {~~
	1021	function intersect(array) {
	1022	return this.uniq().findAll(function(item) {
	1023	return array.detect(function(value) { return item === value });
	1024	});
	1025	}
	1026
	1027
	1028	function clone() {
	1029	return slice.call(this, 0);
	1030	}
	1031
	1032	function size() {
	1033	return this.length;
	1034	}
	1035
	1036	function inspect() {
		return '[' + this.map(Object.inspect).join(', ') + ']';
		}
441		~~});~~
442		~~var Hash = {~~
443		~~_each: function(iterator) {~~
444		~~for (key in this) {~~
445		~~var value = this[key];~~
446		~~if (typeof value == 'function') continue;~~

448		~~var pair = [key, value];~~
	1040	function toJSON() {
	1041	var results = [];
	1042	this.each(function(object) {
	1043	var value = Object.toJSON(object);
	1044	if (!Object.isUndefined(value)) results.push(value);
	1045	});
	1046	return '[' + results.join(', ') + ']';
	1047	}
	1048
	1049	function indexOf(item, i) {
	1050	i \|\| (i = 0);
	1051	var length = this.length;
	1052	if (i < 0) i = length + i;
	1053	for (; i < length; i++)
	1054	if (this[i] === item) return i;
	1055	return -1;
	1056	}
	1057
	1058	function lastIndexOf(item, i) {
	1059	i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
	1060	var n = this.slice(0, i).reverse().indexOf(item);
	1061	return (n < 0) ? n : i - n - 1;
	1062	}
	1063
	1064	function concat() {
	1065	var array = slice.call(this, 0), item;
	1066	for (var i = 0, length = arguments.length; i < length; i++) {
	1067	item = arguments[i];
	1068	if (Object.isArray(item) && !('callee' in item)) {
	1069	for (var j = 0, arrayLength = item.length; j < arrayLength; j++)
	1070	array.push(item[j]);
	1071	} else {
	1072	array.push(item);
	1073	}
	1074	}
	1075	return array;
	1076	}
	1077
	1078	Object.extend(arrayProto, Enumerable);
	1079
	1080	if (!arrayProto._reverse)
	1081	arrayProto._reverse = arrayProto.reverse;
	1082
	1083	Object.extend(arrayProto, {
	1084	_each: _each,
	1085	clear: clear,
	1086	first: first,
	1087	last: last,
	1088	compact: compact,
	1089	flatten: flatten,
	1090	without: without,
	1091	reverse: reverse,
	1092	uniq: uniq,
	1093	intersect: intersect,
	1094	clone: clone,
	1095	toArray: clone,
	1096	size: size,
	1097	inspect: inspect,
	1098	toJSON: toJSON
	1099	});
	1100
	1101	var CONCAT_ARGUMENTS_BUGGY = (function() {
	1102	return [].concat(arguments)[0][0] !== 1;
	1103	})(1,2)
	1104
	1105	if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat;
	1106
	1107	if (!arrayProto.indexOf) arrayProto.indexOf = indexOf;
	1108	if (!arrayProto.lastIndexOf) arrayProto.lastIndexOf = lastIndexOf;
	1109	})();
	1110	function $H(object) {
	1111	return new Hash(object);
	1112	};
	1113
	1114	var Hash = Class.create(Enumerable, (function() {
	1115	function initialize(object) {
	1116	this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
	1117	}
	1118
	1119	function _each(iterator) {
	1120	for (var key in this._object) {
	1121	var value = this._object[key], pair = [key, value];
		pair.key = key;
		pair.value = value;
		iterator(pair);
		}
453		},
	1126	}

455		~~keys: function() {~~
	1128	function set(key, value) {
	1129	return this._object[key] = value;
	1130	}
	1131
	1132	function get(key) {
	1133	if (this._object[key] !== Object.prototype[key])
	1134	return this._object[key];
	1135	}
	1136
	1137	function unset(key) {
	1138	var value = this._object[key];
	1139	delete this._object[key];
	1140	return value;
	1141	}
	1142
	1143	function toObject() {
	1144	return Object.clone(this._object);
	1145	}
	1146
	1147	function keys() {
		return this.pluck('key');
457		},
	1149	}

459		~~values: function() {~~
	1151	function values() {
		return this.pluck('value');
461		},
	1153	}

463		~~merge: function(hash) {~~
464		~~return $H(hash).inject($H(this), function(mergedHash, pair) {~~
465		~~mergedHash[pair.key] = pair.value;~~
466		~~return mergedHash;~~
	1155	function index(value) {
	1156	var match = this.detect(function(pair) {
	1157	return pair.value === value;
		});
468		},
	1159	return match && match.key;
	1160	}

470		~~toQueryString: function() {~~
471		~~return this.map(function(pair) {~~
472		~~return pair.map(encodeURIComponent).join('=');~~
	1162	function merge(object) {
	1163	return this.clone().update(object);
	1164	}
	1165
	1166	function update(object) {
	1167	return new Hash(object).inject(this, function(result, pair) {
	1168	result.set(pair.key, pair.value);
	1169	return result;
	1170	});
	1171	}
	1172
	1173	function toQueryPair(key, value) {
	1174	if (Object.isUndefined(value)) return key;
	1175	return key + '=' + encodeURIComponent(String.interpret(value));
	1176	}
	1177
	1178	function toQueryString() {
	1179	return this.inject([], function(results, pair) {
	1180	var key = encodeURIComponent(pair.key), values = pair.value;
	1181
	1182	if (values && typeof values == 'object') {
	1183	if (Object.isArray(values))
	1184	return results.concat(values.map(toQueryPair.curry(key)));
	1185	} else results.push(toQueryPair(key, values));
	1186	return results;
		}).join('&');
474		},
	1188	}

476		~~inspect: function() {~~
	1190	function inspect() {
		return '#<Hash:{' + this.map(function(pair) {
		return pair.map(Object.inspect).join(': ');
		}).join(', ') + '}>';
		}
	1195
	1196	function toJSON() {
	1197	return Object.toJSON(this.toObject());
	1198	}
	1199
	1200	function clone() {
	1201	return new Hash(this);
	1202	}
	1203
	1204	return {
	1205	initialize: initialize,
	1206	_each: _each,
	1207	set: set,
	1208	get: get,
	1209	unset: unset,
	1210	toObject: toObject,
	1211	toTemplateReplacements: toObject,
	1212	keys: keys,
	1213	values: values,
	1214	index: index,
	1215	merge: merge,
	1216	update: update,
	1217	toQueryString: toQueryString,
	1218	inspect: inspect,
	1219	toJSON: toJSON,
	1220	clone: clone
	1221	};
	1222	})());
	1223
	1224	Hash.from = $H;
	1225	Object.extend(Number.prototype, (function() {
	1226	function toColorPart() {
	1227	return this.toPaddedString(2, 16);
	1228	}
	1229
	1230	function succ() {
	1231	return this + 1;
	1232	}
	1233
	1234	function times(iterator, context) {
	1235	$R(0, this, true).each(iterator, context);
	1236	return this;
	1237	}
	1238
	1239	function toPaddedString(length, radix) {
	1240	var string = this.toString(radix \|\| 10);
	1241	return '0'.times(length - string.length) + string;
	1242	}
	1243
	1244	function toJSON() {
	1245	return isFinite(this) ? this.toString() : 'null';
	1246	}
	1247
	1248	function abs() {
	1249	return Math.abs(this);
	1250	}
	1251
	1252	function round() {
	1253	return Math.round(this);
	1254	}
	1255
	1256	function ceil() {
	1257	return Math.ceil(this);
	1258	}
	1259
	1260	function floor() {
	1261	return Math.floor(this);
	1262	}
	1263
	1264	return {
	1265	toColorPart: toColorPart,
	1266	succ: succ,
	1267	times: times,
	1268	toPaddedString: toPaddedString,
	1269	toJSON: toJSON,
	1270	abs: abs,
	1271	round: round,
	1272	ceil: ceil,
	1273	floor: floor
	1274	};
	1275	})());
	1276
	1277	function $R(start, end, exclusive) {
	1278	return new ObjectRange(start, end, exclusive);
		}

483		~~function $H(object) {~~
484		~~var hash = Object.extend({}, object \|\| {});~~
485		~~Object.extend(hash, Enumerable);~~
486		~~Object.extend(hash, Hash);~~
487		~~return hash;~~
488		}
489		~~var Range = Class.create();~~
490		~~Object.extend(Range.prototype, Enumerable);~~
491		~~Object.extend(Range.prototype, {~~
492		~~initialize: function(start, end, exclusive) {~~
	1281	var ObjectRange = Class.create(Enumerable, (function() {
	1282	function initialize(start, end, exclusive) {
		this.start = start;
		this.end = end;
		this.exclusive = exclusive;
496		},
	1286	}

498		~~_each: function(iterator) {~~
	1288	function _each(iterator) {
		var value = this.start;
500		~~do {~~
	1290	while (this.include(value)) {
		iterator(value);
		value = value.succ();
503		~~} while (this.include(value));~~
504		},
	1293	}
	1294	}

506		~~include: function(value) {~~
	1296	function include(value) {
		if (value < this.start)
		return false;
		if (this.exclusive)
		return value < this.end;
		return value <= this.end;
		}
513		~~});~~

515		~~var $R = function(start, end, exclusive) {~~
516		~~return new Range(start, end, exclusive);~~
517		}
	1304	return {
	1305	initialize: initialize,
	1306	_each: _each,
	1307	include: include
	1308	};
	1309	})());

	1311
	1312
		var Ajax = {
		getTransport: function() {
		return Try.these(
	1316	function() {return new XMLHttpRequest()},
		function() {return new ActiveXObject('Msxml2.XMLHTTP')},
523		~~function() {return new ActiveXObject('Microsoft.XMLHTTP')},~~
524		~~function() {return new XMLHttpRequest()}~~
	1318	function() {return new ActiveXObject('Microsoft.XMLHTTP')}
		) \|\| false;
		},

		activeRequestCount: 0
529		}
	1323	};

		Ajax.Responders = {
		responders: [],
...	...
		this.responders._each(iterator);
		},

538		~~register: function(responderToAdd) {~~
539		~~if (!this.include(responderToAdd))~~
540		~~this.responders.push(responderToAdd);~~
	1332	register: function(responder) {
	1333	if (!this.include(responder))
	1334	this.responders.push(responder);
		},

543		~~unregister: function(responderToRemove) {~~
544		~~this.responders = this.responders.without(responderToRemove);~~
	1337	unregister: function(responder) {
	1338	this.responders = this.responders.without(responder);
		},

		dispatch: function(callback, request, transport, json) {
		this.each(function(responder) {
549		~~if (responder[callback] && typeof responder[callback] == 'function') {~~
	1343	if (Object.isFunction(responder[callback])) {
		try {
		responder[callback].apply(responder, [request, transport, json]);
552		~~} catch (e) {~~
553		}
	1346	} catch (e) { }
		}
		});
		}
...	...
		Object.extend(Ajax.Responders, Enumerable);

		Ajax.Responders.register({
562		~~onCreate: function() {~~
563		~~Ajax.activeRequestCount++;~~
564		},
565
566		~~onComplete: function() {~~
567		~~Ajax.activeRequestCount--;~~
568		}
	1355	onCreate: function() { Ajax.activeRequestCount++ },
	1356	onComplete: function() { Ajax.activeRequestCount-- }
		});
570
571		~~Ajax.Base = function() {};~~
572		~~Ajax.Base.prototype = {~~
573		~~setOptions: function(options) {~~
	1358	Ajax.Base = Class.create({
	1359	initialize: function(options) {
		this.options = {
		method: 'post',
		asynchronous: true,
577		~~parameters: ''~~
578		}
579		~~Object.extend(this.options, options \|\| {});~~
580		},
	1363	contentType: 'application/x-www-form-urlencoded',
	1364	encoding: 'UTF-8',
	1365	parameters: '',
	1366	evalJSON: true,
	1367	evalJS: true
	1368	};
	1369	Object.extend(this.options, options \|\| { });

582		~~responseIsSuccess: function() {~~
583		~~return this.transport.status == undefined~~
584		~~\|\| this.transport.status == 0~~
585		~~\|\| (this.transport.status >= 200 && this.transport.status < 300);~~
586		},
	1371	this.options.method = this.options.method.toLowerCase();

588		~~responseIsFailure: function() {~~
589		~~return !this.responseIsSuccess();~~
	1373	if (Object.isString(this.options.parameters))
	1374	this.options.parameters = this.options.parameters.toQueryParams();
	1375	else if (Object.isHash(this.options.parameters))
	1376	this.options.parameters = this.options.parameters.toObject();
		}
591		}
	1378	});
	1379	Ajax.Request = Class.create(Ajax.Base, {
	1380	_complete: false,

593		~~Ajax.Request = Class.create();~~
594		~~Ajax.Request.Events =~~
595		~~['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];~~
596
597		~~Ajax.Request.prototype = Object.extend(new Ajax.Base(), {~~
598		~~initialize: function(url, options) {~~
	1382	initialize: function($super, url, options) {
	1383	$super(options);
		this.transport = Ajax.getTransport();
600		~~this.setOptions(options);~~
		this.request(url);
		},

		request: function(url) {
605		~~var parameters = this.options.parameters \|\| '';~~
606		~~if (parameters.length > 0) parameters += '&_=';~~
	1389	this.url = url;
	1390	this.method = this.options.method;
	1391	var params = Object.clone(this.options.parameters);

	1393	if (!['get', 'post'].include(this.method)) {
	1394	params['_method'] = this.method;
	1395	this.method = 'post';
	1396	}
	1397
	1398	this.parameters = params;
	1399
	1400	if (params = Object.toQueryString(params)) {
	1401	if (this.method == 'get')
	1402	this.url += (this.url.include('?') ? '&' : '?') + params;
	1403	else if (/Konqueror\|Safari\|KHTML/.test(navigator.userAgent))
	1404	params += '&_=';
	1405	}
	1406
		try {
609		~~this.url = url;~~
610		~~if (this.options.method == 'get')~~
611		~~this.url += '?' + parameters;~~
	1408	var response = new Ajax.Response(this);
	1409	if (this.options.onCreate) this.options.onCreate(response);
	1410	Ajax.Responders.dispatch('onCreate', this, response);

613		~~Ajax.Responders.dispatch('onCreate', this, this.transport);~~
614
615		~~this.transport.open(this.options.method, this.url,~~
	1412	this.transport.open(this.method.toUpperCase(), this.url,
		this.options.asynchronous);

618		~~if (this.options.asynchronous) {~~
619		~~this.transport.onreadystatechange = this.onStateChange.bind(this);~~
620		~~setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);~~
621		}
	1415	if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);

	1417	this.transport.onreadystatechange = this.onStateChange.bind(this);
		this.setRequestHeaders();

625		~~var body = this.options.postBody ? this.options.postBody : parameters;~~
626		~~this.transport.send(this.options.method == 'post' ? body : null);~~
	1420	this.body = this.method == 'post' ? (this.options.postBody \|\| params) : null;
	1421	this.transport.send(this.body);

628		~~} catch (e) {~~
	1423	/* Force Firefox to handle ready state 4 for synchronous requests */
	1424	if (!this.options.asynchronous && this.transport.overrideMimeType)
	1425	this.onStateChange();
	1426
		}
	1428	catch (e) {
	1429	this.dispatchException(e);
	1430	}
		},

	1433	onStateChange: function() {
	1434	var readyState = this.transport.readyState;
	1435	if (readyState > 1 && !((readyState == 4) && this._complete))
	1436	this.respondToReadyState(this.transport.readyState);
	1437	},
	1438
		setRequestHeaders: function() {
633		~~var requestHeaders =~~
634		~~['X-Requested-With', 'XMLHttpRequest',~~
635		~~'X-Prototype-Version', Prototype.Version];~~
	1440	var headers = {
	1441	'X-Requested-With': 'XMLHttpRequest',
	1442	'X-Prototype-Version': Prototype.Version,
	1443	'Accept': 'text/javascript, text/html, application/xml, text/xml, /'
	1444	};

637		~~if (this.options.method == 'post') {~~
638		~~requestHeaders.push('Content-type',~~
639		~~'application/x-www-form-urlencoded');~~
	1446	if (this.method == 'post') {
	1447	headers['Content-type'] = this.options.contentType +
	1448	(this.options.encoding ? '; charset=' + this.options.encoding : '');

641		~~/* Force "Connection: close" for Mozilla browsers to work around~~
642		* a bug where XMLHttpReqeuest sends an incorrect Content-length
643		* header. See Mozilla Bugzilla #246651.
	1450	/* Force "Connection: close" for older Mozilla browsers to work
	1451	* around a bug where XMLHttpRequest sends an incorrect
	1452	* Content-length header. See Mozilla Bugzilla #246651.
		*/
645		~~if (this.transport.overrideMimeType)~~
646		~~requestHeaders.push('Connection', 'close');~~
	1454	if (this.transport.overrideMimeType &&
	1455	(navigator.userAgent.match(/Gecko\/(\d{4})/) \|\| [0,2005])[1] < 2005)
	1456	headers['Connection'] = 'close';
		}

649		~~if (this.options.requestHeaders)~~
650		~~requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);~~
	1459	if (typeof this.options.requestHeaders == 'object') {
	1460	var extras = this.options.requestHeaders;

652		~~for (var i = 0; i < requestHeaders.length; i += 2)~~
653		~~this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);~~
	1462	if (Object.isFunction(extras.push))
	1463	for (var i = 0, length = extras.length; i < length; i += 2)
	1464	headers[extras[i]] = extras[i+1];
	1465	else
	1466	$H(extras).each(function(pair) { headers[pair.key] = pair.value });
	1467	}
	1468
	1469	for (var name in headers)
	1470	this.transport.setRequestHeader(name, headers[name]);
		},

656		~~onStateChange: function() {~~
657		~~var readyState = this.transport.readyState;~~
658		~~if (readyState != 1)~~
659		~~this.respondToReadyState(this.transport.readyState);~~
	1473	success: function() {
	1474	var status = this.getStatus();
	1475	return !status \|\| (status >= 200 && status < 300);
		},

662		~~evalJSON: function() {~~
	1478	getStatus: function() {
		try {
664		~~var json = this.transport.getResponseHeader('X-JSON'), object;~~
665		~~object = eval(json);~~
666		~~return object;~~
	1480	return this.transport.status \|\| 0;
	1481	} catch (e) { return 0 }
	1482	},
	1483
	1484	respondToReadyState: function(readyState) {
	1485	var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
	1486
	1487	if (state == 'Complete') {
	1488	try {
	1489	this._complete = true;
	1490	(this.options['on' + response.status]
	1491	\|\| this.options['on' + (this.success() ? 'Success' : 'Failure')]
	1492	\|\| Prototype.emptyFunction)(response, response.headerJSON);
	1493	} catch (e) {
	1494	this.dispatchException(e);
	1495	}
	1496
	1497	var contentType = response.getHeader('Content-type');
	1498	if (this.options.evalJS == 'force'
	1499	\|\| (this.options.evalJS && this.isSameOrigin() && contentType
	1500	&& contentType.match(/^\s(text\|application)\/(x-)?(java\|ecma)script(;.)?\s*$/i)))
	1501	this.evalResponse();
	1502	}
	1503
	1504	try {
	1505	(this.options['on' + state] \|\| Prototype.emptyFunction)(response, response.headerJSON);
	1506	Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
		} catch (e) {
	1508	this.dispatchException(e);
		}
	1510
	1511	if (state == 'Complete') {
	1512	this.transport.onreadystatechange = Prototype.emptyFunction;
	1513	}
		},

671		~~respondToReadyState: function(readyState) {~~
672		~~var event = Ajax.Request.Events[readyState];~~
673		~~var transport = this.transport, json = this.evalJSON();~~
	1516	isSameOrigin: function() {
	1517	var m = this.url.match(/^\shttps?:\/\/[^\/]/);
	1518	return !m \|\| (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
	1519	protocol: location.protocol,
	1520	domain: document.domain,
	1521	port: location.port ? ':' + location.port : ''
	1522	}));
	1523	},

675		~~if (event == 'Complete')~~
676		~~(this.options['on' + this.transport.status]~~
677		~~\|\| this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]~~
678		~~\|\| Prototype.emptyFunction)(transport, json);~~
	1525	getHeader: function(name) {
	1526	try {
	1527	return this.transport.getResponseHeader(name) \|\| null;
	1528	} catch (e) { return null; }
	1529	},

680		~~(this.options['on' + event] \|\| Prototype.emptyFunction)(transport, json);~~
681		~~Ajax.Responders.dispatch('on' + event, this, transport, json);~~
	1531	evalResponse: function() {
	1532	try {
	1533	return eval((this.transport.responseText \|\| '').unfilterJSON());
	1534	} catch (e) {
	1535	this.dispatchException(e);
	1536	}
	1537	},

683		~~/* Avoid memory leak in MSIE: clean up the oncomplete event handler */~~
684		~~if (event == 'Complete')~~
685		~~this.transport.onreadystatechange = Prototype.emptyFunction;~~
	1539	dispatchException: function(exception) {
	1540	(this.options.onException \|\| Prototype.emptyFunction)(this, exception);
	1541	Ajax.Responders.dispatch('onException', this, exception);
		}
		});

689		~~Ajax.Updater = Class.create();~~
690		~~Ajax.Updater.ScriptFragment = '(?:<script.?>)((\n\|.)?)(?:<\/script>)';~~
	1545	Ajax.Request.Events =
	1546	['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];

692		~~Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {~~
693		~~initialize: function(container, url, options) {~~
694		~~this.containers = {~~
695		~~success: container.success ? $(container.success) : $(container),~~
696		~~failure: container.failure ? $(container.failure) :~~
697		~~(container.success ? null : $(container))~~
	1548
	1549
	1550
	1551
	1552
	1553
	1554
	1555	Ajax.Response = Class.create({
	1556	initialize: function(request){
	1557	this.request = request;
	1558	var transport = this.transport = request.transport,
	1559	readyState = this.readyState = transport.readyState;
	1560
	1561	if((readyState > 2 && !Prototype.Browser.IE) \|\| readyState == 4) {
	1562	this.status = this.getStatus();
	1563	this.statusText = this.getStatusText();
	1564	this.responseText = String.interpret(transport.responseText);
	1565	this.headerJSON = this._getHeaderJSON();
		}

700		~~this.transport = Ajax.getTransport();~~
701		~~this.setOptions(options);~~
	1568	if(readyState == 4) {
	1569	var xml = transport.responseXML;
	1570	this.responseXML = Object.isUndefined(xml) ? null : xml;
	1571	this.responseJSON = this._getResponseJSON();
	1572	}
	1573	},

703		~~var onComplete = this.options.onComplete \|\| Prototype.emptyFunction;~~
704		~~this.options.onComplete = (function(transport, object) {~~
705		~~this.updateContent();~~
706		~~onComplete(transport, object);~~
707		~~}).bind(this);~~
	1575	status: 0,

709		~~this.request(url);~~
	1577	statusText: '',
	1578
	1579	getStatus: Ajax.Request.prototype.getStatus,
	1580
	1581	getStatusText: function() {
	1582	try {
	1583	return this.transport.statusText \|\| '';
	1584	} catch (e) { return '' }
		},

712		~~updateContent: function() {~~
713		~~var receiver = this.responseIsSuccess() ?~~
714		~~this.containers.success : this.containers.failure;~~
	1587	getHeader: Ajax.Request.prototype.getHeader,

716		~~var match = new RegExp(Ajax.Updater.ScriptFragment, 'img');~~
717		~~var response = this.transport.responseText.replace(match, '');~~
718		~~var scripts = this.transport.responseText.match(match);~~
	1589	getAllHeaders: function() {
	1590	try {
	1591	return this.getAllResponseHeaders();
	1592	} catch (e) { return null }
	1593	},

720		~~if (receiver) {~~
721		~~if (this.options.insertion) {~~
722		~~new this.options.insertion(receiver, response);~~
723		~~} else {~~
724		~~receiver.innerHTML = response;~~
725		}
	1595	getResponseHeader: function(name) {
	1596	return this.transport.getResponseHeader(name);
	1597	},
	1598
	1599	getAllResponseHeaders: function() {
	1600	return this.transport.getAllResponseHeaders();
	1601	},
	1602
	1603	_getHeaderJSON: function() {
	1604	var json = this.getHeader('X-JSON');
	1605	if (!json) return null;
	1606	json = decodeURIComponent(escape(json));
	1607	try {
	1608	return json.evalJSON(this.request.options.sanitizeJSON \|\|
	1609	!this.request.isSameOrigin());
	1610	} catch (e) {
	1611	this.request.dispatchException(e);
		}
	1613	},

728		~~if (this.responseIsSuccess()) {~~
729		~~if (this.onComplete)~~
730		~~setTimeout(this.onComplete.bind(this), 10);~~
	1615	_getResponseJSON: function() {
	1616	var options = this.request.options;
	1617	if (!options.evalJSON \|\| (options.evalJSON != 'force' &&
	1618	!(this.getHeader('Content-type') \|\| '').include('application/json')) \|\|
	1619	this.responseText.blank())
	1620	return null;
	1621	try {
	1622	return this.responseText.evalJSON(options.sanitizeJSON \|\|
	1623	!this.request.isSameOrigin());
	1624	} catch (e) {
	1625	this.request.dispatchException(e);
		}
	1627	}
	1628	});

733		~~if (this.options.evalScripts && scripts) {~~
734		~~match = new RegExp(Ajax.Updater.ScriptFragment, 'im');~~
735		~~setTimeout((function() {~~
736		~~for (var i = 0; i < scripts.length; i++)~~
737		~~eval(scripts[i].match(match)[1]);~~
738		~~}).bind(this), 10);~~
	1630	Ajax.Updater = Class.create(Ajax.Request, {
	1631	initialize: function($super, container, url, options) {
	1632	this.container = {
	1633	success: (container.success \|\| container),
	1634	failure: (container.failure \|\| (container.success ? null : container))
	1635	};
	1636
	1637	options = Object.clone(options);
	1638	var onComplete = options.onComplete;
	1639	options.onComplete = (function(response, json) {
	1640	this.updateContent(response.responseText);
	1641	if (Object.isFunction(onComplete)) onComplete(response, json);
	1642	}).bind(this);
	1643
	1644	$super(url, options);
	1645	},
	1646
	1647	updateContent: function(responseText) {
	1648	var receiver = this.container[this.success() ? 'success' : 'failure'],
	1649	options = this.options;
	1650
	1651	if (!options.evalScripts) responseText = responseText.stripScripts();
	1652
	1653	if (receiver = $(receiver)) {
	1654	if (options.insertion) {
	1655	if (Object.isString(options.insertion)) {
	1656	var insertion = { }; insertion[options.insertion] = responseText;
	1657	receiver.insert(insertion);
	1658	}
	1659	else options.insertion(receiver, responseText);
	1660	}
	1661	else receiver.update(responseText);
		}
		}
		});

743		~~Ajax.PeriodicalUpdater = Class.create();~~
744		~~Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {~~
745		~~initialize: function(container, url, options) {~~
746		~~this.setOptions(options);~~
	1666	Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
	1667	initialize: function($super, container, url, options) {
	1668	$super(options);
		this.onComplete = this.options.onComplete;

		this.frequency = (this.options.frequency \|\| 2);
		this.decay = (this.options.decay \|\| 1);

752		~~this.updater = {};~~
	1674	this.updater = { };
		this.container = container;
		this.url = url;

...	...
		},

		stop: function() {
765		~~this.updater.onComplete = undefined;~~
	1687	this.updater.options.onComplete = undefined;
		clearTimeout(this.timer);
		(this.onComplete \|\| Prototype.emptyFunction).apply(this, arguments);
		},

770		~~updateComplete: function(request) {~~
	1692	updateComplete: function(response) {
		if (this.options.decay) {
772		~~this.decay = (request.responseText == this.lastText ?~~
	1694	this.decay = (response.responseText == this.lastText ?
		this.decay * this.options.decay : 1);

775		~~this.lastText = request.responseText;~~
	1697	this.lastText = response.responseText;
		}
777		~~this.timer = setTimeout(this.onTimerEvent.bind(this),~~
778		~~this.decay * this.frequency * 1000);~~
	1699	this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
		},

		onTimerEvent: function() {
		this.updater = new Ajax.Updater(this.container, this.url, this.options);
		}
		});
785		~~document.getElementsByClassName = function(className, parentElement) {~~
786		~~var children = (document.body \|\| $(parentElement)).getElementsByTagName('*');~~
787		~~return $A(children).inject([], function(elements, child) {~~
788		~~if (Element.hasClassName(child, className))~~
789		~~elements.push(child);~~
	1706
	1707
	1708
	1709	function $(element) {
	1710	if (arguments.length > 1) {
	1711	for (var i = 0, elements = [], length = arguments.length; i < length; i++)
	1712	elements.push($(arguments[i]));
		return elements;
791		~~});~~
	1714	}
	1715	if (Object.isString(element))
	1716	element = document.getElementById(element);
	1717	return Element.extend(element);
		}

	1720	if (Prototype.BrowserFeatures.XPath) {
	1721	document._getElementsByXPath = function(expression, parentElement) {
	1722	var results = [];
	1723	var query = document.evaluate(expression, $(parentElement) \|\| document,
	1724	null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
	1725	for (var i = 0, length = query.snapshotLength; i < length; i++)
	1726	results.push(Element.extend(query.snapshotItem(i)));
	1727	return results;
	1728	};
	1729	}
	1730
		/--------------------------------------------------------------------------/

796		~~if (!window.Element) {~~
797		~~var Element = new Object();~~
	1733	if (!window.Node) var Node = { };
	1734
	1735	if (!Node.ELEMENT_NODE) {
	1736	Object.extend(Node, {
	1737	ELEMENT_NODE: 1,
	1738	ATTRIBUTE_NODE: 2,
	1739	TEXT_NODE: 3,
	1740	CDATA_SECTION_NODE: 4,
	1741	ENTITY_REFERENCE_NODE: 5,
	1742	ENTITY_NODE: 6,
	1743	PROCESSING_INSTRUCTION_NODE: 7,
	1744	COMMENT_NODE: 8,
	1745	DOCUMENT_NODE: 9,
	1746	DOCUMENT_TYPE_NODE: 10,
	1747	DOCUMENT_FRAGMENT_NODE: 11,
	1748	NOTATION_NODE: 12
	1749	});
		}

800		~~Object.extend(Element, {~~
	1752
	1753	(function(global) {
	1754
	1755	var SETATTRIBUTE_IGNORES_NAME = (function(){
	1756	var elForm = document.createElement("form");
	1757	var elInput = document.createElement("input");
	1758	var root = document.documentElement;
	1759	elInput.setAttribute("name", "test");
	1760	elForm.appendChild(elInput);
	1761	root.appendChild(elForm);
	1762	var isBuggy = elForm.elements
	1763	? (typeof elForm.elements.test == "undefined")
	1764	: null;
	1765	root.removeChild(elForm);
	1766	elForm = elInput = null;
	1767	return isBuggy;
	1768	})();
	1769
	1770	var element = global.Element;
	1771	global.Element = function(tagName, attributes) {
	1772	attributes = attributes \|\| { };
	1773	tagName = tagName.toLowerCase();
	1774	var cache = Element.cache;
	1775	if (SETATTRIBUTE_IGNORES_NAME && attributes.name) {
	1776	tagName = '<' + tagName + ' name="' + attributes.name + '">';
	1777	delete attributes.name;
	1778	return Element.writeAttribute(document.createElement(tagName), attributes);
	1779	}
	1780	if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
	1781	return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
	1782	};
	1783	Object.extend(global.Element, element \|\| { });
	1784	if (element) global.Element.prototype = element.prototype;
	1785	})(this);
	1786
	1787	Element.cache = { };
	1788	Element.idCounter = 1;
	1789
	1790	Element.Methods = {
		visible: function(element) {
		return $(element).style.display != 'none';
		},

805		~~toggle: function() {~~
806		~~for (var i = 0; i < arguments.length; i++) {~~
807		~~var element = $(arguments[i]);~~
808		~~Element[Element.visible(element) ? 'hide' : 'show'](element);~~
	1795	toggle: function(element) {
	1796	element = $(element);
	1797	Element[Element.visible(element) ? 'hide' : 'show'](element);
	1798	return element;
	1799	},
	1800
	1801
	1802	hide: function(element) {
	1803	element = $(element);
	1804	element.style.display = 'none';
	1805	return element;
	1806	},
	1807
	1808	show: function(element) {
	1809	element = $(element);
	1810	element.style.display = '';
	1811	return element;
	1812	},
	1813
	1814	remove: function(element) {
	1815	element = $(element);
	1816	element.parentNode.removeChild(element);
	1817	return element;
	1818	},
	1819
	1820	update: (function(){
	1821
	1822	var SELECT_ELEMENT_INNERHTML_BUGGY = (function(){
	1823	var el = document.createElement("select"),
	1824	isBuggy = true;
	1825	el.innerHTML = "<option value=\"test\">test</option>";
	1826	if (el.options && el.options[0]) {
	1827	isBuggy = el.options[0].nodeName.toUpperCase() !== "OPTION";
	1828	}
	1829	el = null;
	1830	return isBuggy;
	1831	})();
	1832
	1833	var TABLE_ELEMENT_INNERHTML_BUGGY = (function(){
	1834	try {
	1835	var el = document.createElement("table");
	1836	if (el && el.tBodies) {
	1837	el.innerHTML = "<tbody><tr><td>test</td></tr></tbody>";
	1838	var isBuggy = typeof el.tBodies[0] == "undefined";
	1839	el = null;
	1840	return isBuggy;
	1841	}
	1842	} catch (e) {
	1843	return true;
	1844	}
	1845	})();
	1846
	1847	var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING = (function () {
	1848	var s = document.createElement("script"),
	1849	isBuggy = false;
	1850	try {
	1851	s.appendChild(document.createTextNode(""));
	1852	isBuggy = !s.firstChild \|\|
	1853	s.firstChild && s.firstChild.nodeType !== 3;
	1854	} catch (e) {
	1855	isBuggy = true;
	1856	}
	1857	s = null;
	1858	return isBuggy;
	1859	})();
	1860
	1861	function update(element, content) {
	1862	element = $(element);
	1863
	1864	if (content && content.toElement)
	1865	content = content.toElement();
	1866
	1867	if (Object.isElement(content))
	1868	return element.update().insert(content);
	1869
	1870	content = Object.toHTML(content);
	1871
	1872	var tagName = element.tagName.toUpperCase();
	1873
	1874	if (tagName === 'SCRIPT' && SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING) {
	1875	element.text = content;
	1876	return element;
	1877	}
	1878
	1879	if (SELECT_ELEMENT_INNERHTML_BUGGY \|\| TABLE_ELEMENT_INNERHTML_BUGGY) {
	1880	if (tagName in Element._insertionTranslations.tags) {
	1881	while (element.firstChild) {
	1882	element.removeChild(element.firstChild);
	1883	}
	1884	Element._getContentFromAnonymousElement(tagName, content.stripScripts())
	1885	.each(function(node) {
	1886	element.appendChild(node)
	1887	});
	1888	}
	1889	else {
	1890	element.innerHTML = content.stripScripts();
	1891	}
	1892	}
	1893	else {
	1894	element.innerHTML = content.stripScripts();
	1895	}
	1896
	1897	content.evalScripts.bind(content).defer();
	1898	return element;
		}
	1900
	1901	return update;
	1902	})(),
	1903
	1904	replace: function(element, content) {
	1905	element = $(element);
	1906	if (content && content.toElement) content = content.toElement();
	1907	else if (!Object.isElement(content)) {
	1908	content = Object.toHTML(content);
	1909	var range = element.ownerDocument.createRange();
	1910	range.selectNode(element);
	1911	content.evalScripts.bind(content).defer();
	1912	content = range.createContextualFragment(content.stripScripts());
	1913	}
	1914	element.parentNode.replaceChild(content, element);
	1915	return element;
		},

812		~~hide: function() {~~
813		~~for (var i = 0; i < arguments.length; i++) {~~
814		~~var element = $(arguments[i]);~~
815		~~element.style.display = 'none';~~
	1918	insert: function(element, insertions) {
	1919	element = $(element);
	1920
	1921	if (Object.isString(insertions) \|\| Object.isNumber(insertions) \|\|
	1922	Object.isElement(insertions) \|\| (insertions && (insertions.toElement \|\| insertions.toHTML)))
	1923	insertions = {bottom:insertions};
	1924
	1925	var content, insert, tagName, childNodes;
	1926
	1927	for (var position in insertions) {
	1928	content = insertions[position];
	1929	position = position.toLowerCase();
	1930	insert = Element._insertionTranslations[position];
	1931
	1932	if (content && content.toElement) content = content.toElement();
	1933	if (Object.isElement(content)) {
	1934	insert(element, content);
	1935	continue;
	1936	}
	1937
	1938	content = Object.toHTML(content);
	1939
	1940	tagName = ((position == 'before' \|\| position == 'after')
	1941	? element.parentNode : element).tagName.toUpperCase();
	1942
	1943	childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
	1944
	1945	if (position == 'top' \|\| position == 'after') childNodes.reverse();
	1946	childNodes.each(insert.curry(element));
	1947
	1948	content.evalScripts.bind(content).defer();
		}
	1950
	1951	return element;
		},

819		~~show: function() {~~
820		~~for (var i = 0; i < arguments.length; i++) {~~
821		~~var element = $(arguments[i]);~~
822		~~element.style.display = '';~~
	1954	wrap: function(element, wrapper, attributes) {
	1955	element = $(element);
	1956	if (Object.isElement(wrapper))
	1957	$(wrapper).writeAttribute(attributes \|\| { });
	1958	else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
	1959	else wrapper = new Element('div', wrapper);
	1960	if (element.parentNode)
	1961	element.parentNode.replaceChild(wrapper, element);
	1962	wrapper.appendChild(element);
	1963	return wrapper;
	1964	},
	1965
	1966	inspect: function(element) {
	1967	element = $(element);
	1968	var result = '<' + element.tagName.toLowerCase();
	1969	$H({'id': 'id', 'className': 'class'}).each(function(pair) {
	1970	var property = pair.first(), attribute = pair.last();
	1971	var value = (element[property] \|\| '').toString();
	1972	if (value) result += ' ' + attribute + '=' + value.inspect(true);
	1973	});
	1974	return result + '>';
	1975	},
	1976
	1977	recursivelyCollect: function(element, property) {
	1978	element = $(element);
	1979	var elements = [];
	1980	while (element = element[property])
	1981	if (element.nodeType == 1)
	1982	elements.push(Element.extend(element));
	1983	return elements;
	1984	},
	1985
	1986	ancestors: function(element) {
	1987	return Element.recursivelyCollect(element, 'parentNode');
	1988	},
	1989
	1990	descendants: function(element) {
	1991	return Element.select(element, "*");
	1992	},
	1993
	1994	firstDescendant: function(element) {
	1995	element = $(element).firstChild;
	1996	while (element && element.nodeType != 1) element = element.nextSibling;
	1997	return $(element);
	1998	},
	1999
	2000	immediateDescendants: function(element) {
	2001	if (!(element = $(element).firstChild)) return [];
	2002	while (element && element.nodeType != 1) element = element.nextSibling;
	2003	if (element) return [element].concat($(element).nextSiblings());
	2004	return [];
	2005	},
	2006
	2007	previousSiblings: function(element) {
	2008	return Element.recursivelyCollect(element, 'previousSibling');
	2009	},
	2010
	2011	nextSiblings: function(element) {
	2012	return Element.recursivelyCollect(element, 'nextSibling');
	2013	},
	2014
	2015	siblings: function(element) {
	2016	element = $(element);
	2017	return Element.previousSiblings(element).reverse()
	2018	.concat(Element.nextSiblings(element));
	2019	},
	2020
	2021	match: function(element, selector) {
	2022	if (Object.isString(selector))
	2023	selector = new Selector(selector);
	2024	return selector.match($(element));
	2025	},
	2026
	2027	up: function(element, expression, index) {
	2028	element = $(element);
	2029	if (arguments.length == 1) return $(element.parentNode);
	2030	var ancestors = Element.ancestors(element);
	2031	return Object.isNumber(expression) ? ancestors[expression] :
	2032	Selector.findElement(ancestors, expression, index);
	2033	},
	2034
	2035	down: function(element, expression, index) {
	2036	element = $(element);
	2037	if (arguments.length == 1) return Element.firstDescendant(element);
	2038	return Object.isNumber(expression) ? Element.descendants(element)[expression] :
	2039	Element.select(element, expression)[index \|\| 0];
	2040	},
	2041
	2042	previous: function(element, expression, index) {
	2043	element = $(element);
	2044	if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
	2045	var previousSiblings = Element.previousSiblings(element);
	2046	return Object.isNumber(expression) ? previousSiblings[expression] :
	2047	Selector.findElement(previousSiblings, expression, index);
	2048	},
	2049
	2050	next: function(element, expression, index) {
	2051	element = $(element);
	2052	if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
	2053	var nextSiblings = Element.nextSiblings(element);
	2054	return Object.isNumber(expression) ? nextSiblings[expression] :
	2055	Selector.findElement(nextSiblings, expression, index);
	2056	},
	2057
	2058
	2059	select: function(element) {
	2060	var args = Array.prototype.slice.call(arguments, 1);
	2061	return Selector.findChildElements(element, args);
	2062	},
	2063
	2064	adjacent: function(element) {
	2065	var args = Array.prototype.slice.call(arguments, 1);
	2066	return Selector.findChildElements(element.parentNode, args).without(element);
	2067	},
	2068
	2069	identify: function(element) {
	2070	element = $(element);
	2071	var id = Element.readAttribute(element, 'id');
	2072	if (id) return id;
	2073	do { id = 'anonymous_element_' + Element.idCounter++ } while ($(id));
	2074	Element.writeAttribute(element, 'id', id);
	2075	return id;
	2076	},
	2077
	2078	readAttribute: function(element, name) {
	2079	element = $(element);
	2080	if (Prototype.Browser.IE) {
	2081	var t = Element._attributeTranslations.read;
	2082	if (t.values[name]) return t.values[name](element, name);
	2083	if (t.names[name]) name = t.names[name];
	2084	if (name.include(':')) {
	2085	return (!element.attributes \|\| !element.attributes[name]) ? null :
	2086	element.attributes[name].value;
	2087	}
		}
	2089	return element.getAttribute(name);
		},

826		~~remove: function(element) {~~
	2092	writeAttribute: function(element, name, value) {
		element = $(element);
828		~~element.parentNode.removeChild(element);~~
	2094	var attributes = { }, t = Element._attributeTranslations.write;
	2095
	2096	if (typeof name == 'object') attributes = name;
	2097	else attributes[name] = Object.isUndefined(value) ? true : value;
	2098
	2099	for (var attr in attributes) {
	2100	name = t.names[attr] \|\| attr;
	2101	value = attributes[attr];
	2102	if (t.values[attr]) name = t.values[attr](element, value);
	2103	if (value === false \|\| value === null)
	2104	element.removeAttribute(name);
	2105	else if (value === true)
	2106	element.setAttribute(name, name);
	2107	else element.setAttribute(name, value);
	2108	}
	2109	return element;
		},

		getHeight: function(element) {
832		~~element = $(element);~~
833		~~return element.offsetHeight;~~
	2113	return Element.getDimensions(element).height;
		},

	2116	getWidth: function(element) {
	2117	return Element.getDimensions(element).width;
	2118	},
	2119
		classNames: function(element) {
		return new Element.ClassNames(element);
		},

		hasClassName: function(element, className) {
		if (!(element = $(element))) return;
842		~~return Element.classNames(element).include(className);~~
	2126	var elementClassName = element.className;
	2127	return (elementClassName.length > 0 && (elementClassName == className \|\|
	2128	new RegExp("(^\|\\s)" + className + "(\\s\|$)").test(elementClassName)));
		},

		addClassName: function(element, className) {
		if (!(element = $(element))) return;
847		~~return Element.classNames(element).add(className);~~
	2133	if (!Element.hasClassName(element, className))
	2134	element.className += (element.className ? ' ' : '') + className;
	2135	return element;
		},

		removeClassName: function(element, className) {
		if (!(element = $(element))) return;
852		~~return Element.classNames(element).remove(className);~~
	2140	element.className = element.className.replace(
	2141	new RegExp("(^\|\\s+)" + className + "(\\s+\|$)"), ' ').strip();
	2142	return element;
		},

855		~~// removes whitespace-only text node children~~
	2145	toggleClassName: function(element, className) {
	2146	if (!(element = $(element))) return;
	2147	return Element[Element.hasClassName(element, className) ?
	2148	'removeClassName' : 'addClassName'](element, className);
	2149	},
	2150
		cleanWhitespace: function(element) {
		element = $(element);
858		~~for (var i = 0; i < element.childNodes.length; i++) {~~
859		~~var node = element.childNodes[i];~~
	2153	var node = element.firstChild;
	2154	while (node) {
	2155	var nextNode = node.nextSibling;
		if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
861		~~Element.remove(node);~~
	2157	element.removeChild(node);
	2158	node = nextNode;
		}
	2160	return element;
		},

		empty: function(element) {
866		~~return $(element).innerHTML.match(/^\s*$/);~~
	2164	return $(element).innerHTML.blank();
		},

	2167	descendantOf: function(element, ancestor) {
	2168	element = $(element), ancestor = $(ancestor);
	2169
	2170	if (element.compareDocumentPosition)
	2171	return (element.compareDocumentPosition(ancestor) & 8) === 8;
	2172
	2173	if (ancestor.contains)
	2174	return ancestor.contains(element) && ancestor !== element;
	2175
	2176	while (element = element.parentNode)
	2177	if (element == ancestor) return true;
	2178
	2179	return false;
	2180	},
	2181
		scrollTo: function(element) {
		element = $(element);
871		~~var x = element.x ? element.x : element.offsetLeft,~~
872		~~y = element.y ? element.y : element.offsetTop;~~
873		~~window.scrollTo(x, y);~~
	2184	var pos = Element.cumulativeOffset(element);
	2185	window.scrollTo(pos[0], pos[1]);
	2186	return element;
		},

		getStyle: function(element, style) {
		element = $(element);
878		~~var value = element.style[style.camelize()];~~
879		~~if (!value) {~~
880		~~if (document.defaultView && document.defaultView.getComputedStyle) {~~
881		~~var css = document.defaultView.getComputedStyle(element, null);~~
882		~~value = css ? css.getPropertyValue(style) : null;~~
883		~~} else if (element.currentStyle) {~~
884		~~value = element.currentStyle[style.camelize()];~~
885		}
	2191	style = style == 'float' ? 'cssFloat' : style.camelize();
	2192	var value = element.style[style];
	2193	if (!value \|\| value == 'auto') {
	2194	var css = document.defaultView.getComputedStyle(element, null);
	2195	value = css ? css[style] : null;
		}
	2197	if (style == 'opacity') return value ? parseFloat(value) : 1.0;
	2198	return value == 'auto' ? null : value;
	2199	},

888		~~if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))~~
889		~~if (Element.getStyle(element, 'position') == 'static') value = 'auto';~~
	2201	getOpacity: function(element) {
	2202	return $(element).getStyle('opacity');
	2203	},

891		~~return value == 'auto' ? null : value;~~
	2205	setStyle: function(element, styles) {
	2206	element = $(element);
	2207	var elementStyle = element.style, match;
	2208	if (Object.isString(styles)) {
	2209	element.style.cssText += ';' + styles;
	2210	return styles.include('opacity') ?
	2211	element.setOpacity(styles.match(/opacity:\s(\d?\.?\d)/)[1]) : element;
	2212	}
	2213	for (var property in styles)
	2214	if (property == 'opacity') element.setOpacity(styles[property]);
	2215	else
	2216	elementStyle[(property == 'float' \|\| property == 'cssFloat') ?
	2217	(Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
	2218	property] = styles[property];
	2219
	2220	return element;
		},

	2223	setOpacity: function(element, value) {
	2224	element = $(element);
	2225	element.style.opacity = (value == 1 \|\| value === '') ? '' :
	2226	(value < 0.00001) ? 0 : value;
	2227	return element;
	2228	},
	2229
		getDimensions: function(element) {
		element = $(element);
896		~~if (Element.getStyle(element, 'display') != 'none')~~
	2232	var display = Element.getStyle(element, 'display');
	2233	if (display != 'none' && display != null) // Safari bug
		return {width: element.offsetWidth, height: element.offsetHeight};

899		~~// All Width and Height properties give 0 on elements with display none,~~
900		~~// so enable the element temporarily~~
		var els = element.style;
		var originalVisibility = els.visibility;
		var originalPosition = els.position;
	2239	var originalDisplay = els.display;
		els.visibility = 'hidden';
905		~~els.position = 'absolute';~~
906		~~els.display = '';~~
	2241	if (originalPosition != 'fixed') // Switching fixed to absolute causes issues in Safari
	2242	els.position = 'absolute';
	2243	els.display = 'block';
		var originalWidth = element.clientWidth;
		var originalHeight = element.clientHeight;
909		~~els.display = 'none';~~
	2246	els.display = originalDisplay;
		els.position = originalPosition;
		els.visibility = originalVisibility;
		return {width: originalWidth, height: originalHeight};
...	...
		if (pos == 'static' \|\| !pos) {
		element._madePositioned = true;
		element.style.position = 'relative';
921		~~// Opera returns the offset relative to the positioning context, when an~~
922		~~// element is position relative but top and left have not been defined~~
923		~~if (window.opera) {~~
	2258	if (Prototype.Browser.Opera) {
		element.style.top = 0;
		element.style.left = 0;
		}
		}
	2263	return element;
		},

		undoPositioned: function(element) {
...	...
		element.style.bottom =
		element.style.right = '';
		}
	2276	return element;
		},

		makeClipping: function(element) {
		element = $(element);
944		~~if (element._overflow) return;~~
945		~~element._overflow = element.style.overflow;~~
946		~~if ((Element.getStyle(element, 'overflow') \|\| 'visible') != 'hidden')~~
	2281	if (element._overflow) return element;
	2282	element._overflow = Element.getStyle(element, 'overflow') \|\| 'auto';
	2283	if (element._overflow !== 'hidden')
		element.style.overflow = 'hidden';
	2285	return element;
		},

		undoClipping: function(element) {
		element = $(element);
952		~~if (element._overflow) return;~~
953		~~element.style.overflow = element._overflow;~~
954		~~element._overflow = undefined;~~
	2290	if (!element._overflow) return element;
	2291	element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
	2292	element._overflow = null;
	2293	return element;
	2294	},
	2295
	2296	cumulativeOffset: function(element) {
	2297	var valueT = 0, valueL = 0;
	2298	do {
	2299	valueT += element.offsetTop \|\| 0;
	2300	valueL += element.offsetLeft \|\| 0;
	2301	element = element.offsetParent;
	2302	} while (element);
	2303	return Element._returnOffset(valueL, valueT);
	2304	},
	2305
	2306	positionedOffset: function(element) {
	2307	var valueT = 0, valueL = 0;
	2308	do {
	2309	valueT += element.offsetTop \|\| 0;
	2310	valueL += element.offsetLeft \|\| 0;
	2311	element = element.offsetParent;
	2312	if (element) {
	2313	if (element.tagName.toUpperCase() == 'BODY') break;
	2314	var p = Element.getStyle(element, 'position');
	2315	if (p !== 'static') break;
	2316	}
	2317	} while (element);
	2318	return Element._returnOffset(valueL, valueT);
	2319	},
	2320
	2321	absolutize: function(element) {
	2322	element = $(element);
	2323	if (Element.getStyle(element, 'position') == 'absolute') return element;
	2324
	2325	var offsets = Element.positionedOffset(element);
	2326	var top = offsets[1];
	2327	var left = offsets[0];
	2328	var width = element.clientWidth;
	2329	var height = element.clientHeight;
	2330
	2331	element._originalLeft = left - parseFloat(element.style.left \|\| 0);
	2332	element._originalTop = top - parseFloat(element.style.top \|\| 0);
	2333	element._originalWidth = element.style.width;
	2334	element._originalHeight = element.style.height;
	2335
	2336	element.style.position = 'absolute';
	2337	element.style.top = top + 'px';
	2338	element.style.left = left + 'px';
	2339	element.style.width = width + 'px';
	2340	element.style.height = height + 'px';
	2341	return element;
	2342	},
	2343
	2344	relativize: function(element) {
	2345	element = $(element);
	2346	if (Element.getStyle(element, 'position') == 'relative') return element;
	2347
	2348	element.style.position = 'relative';
	2349	var top = parseFloat(element.style.top \|\| 0) - (element._originalTop \|\| 0);
	2350	var left = parseFloat(element.style.left \|\| 0) - (element._originalLeft \|\| 0);
	2351
	2352	element.style.top = top + 'px';
	2353	element.style.left = left + 'px';
	2354	element.style.height = element._originalHeight;
	2355	element.style.width = element._originalWidth;
	2356	return element;
	2357	},
	2358
	2359	cumulativeScrollOffset: function(element) {
	2360	var valueT = 0, valueL = 0;
	2361	do {
	2362	valueT += element.scrollTop \|\| 0;
	2363	valueL += element.scrollLeft \|\| 0;
	2364	element = element.parentNode;
	2365	} while (element);
	2366	return Element._returnOffset(valueL, valueT);
	2367	},
	2368
	2369	getOffsetParent: function(element) {
	2370	if (element.offsetParent) return $(element.offsetParent);
	2371	if (element == document.body) return $(element);
	2372
	2373	while ((element = element.parentNode) && element != document.body)
	2374	if (Element.getStyle(element, 'position') != 'static')
	2375	return $(element);
	2376
	2377	return $(document.body);
	2378	},
	2379
	2380	viewportOffset: function(forElement) {
	2381	var valueT = 0, valueL = 0;
	2382
	2383	var element = forElement;
	2384	do {
	2385	valueT += element.offsetTop \|\| 0;
	2386	valueL += element.offsetLeft \|\| 0;
	2387
	2388	if (element.offsetParent == document.body &&
	2389	Element.getStyle(element, 'position') == 'absolute') break;
	2390
	2391	} while (element = element.offsetParent);
	2392
	2393	element = forElement;
	2394	do {
	2395	if (!Prototype.Browser.Opera \|\| (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
	2396	valueT -= element.scrollTop \|\| 0;
	2397	valueL -= element.scrollLeft \|\| 0;
	2398	}
	2399	} while (element = element.parentNode);
	2400
	2401	return Element._returnOffset(valueL, valueT);
	2402	},
	2403
	2404	clonePosition: function(element, source) {
	2405	var options = Object.extend({
	2406	setLeft: true,
	2407	setTop: true,
	2408	setWidth: true,
	2409	setHeight: true,
	2410	offsetTop: 0,
	2411	offsetLeft: 0
	2412	}, arguments[2] \|\| { });
	2413
	2414	source = $(source);
	2415	var p = Element.viewportOffset(source);
	2416
	2417	element = $(element);
	2418	var delta = [0, 0];
	2419	var parent = null;
	2420	if (Element.getStyle(element, 'position') == 'absolute') {
	2421	parent = Element.getOffsetParent(element);
	2422	delta = Element.viewportOffset(parent);
	2423	}
	2424
	2425	if (parent == document.body) {
	2426	delta[0] -= document.body.offsetLeft;
	2427	delta[1] -= document.body.offsetTop;
	2428	}
	2429
	2430	if (options.setLeft) element.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px';
	2431	if (options.setTop) element.style.top = (p[1] - delta[1] + options.offsetTop) + 'px';
	2432	if (options.setWidth) element.style.width = source.offsetWidth + 'px';
	2433	if (options.setHeight) element.style.height = source.offsetHeight + 'px';
	2434	return element;
		}
	2436	};
	2437
	2438	Object.extend(Element.Methods, {
	2439	getElementsBySelector: Element.Methods.select,
	2440
	2441	childElements: Element.Methods.immediateDescendants
		});

958		~~var Toggle = new Object();~~
959		~~Toggle.display = Element.toggle;~~
	2444	Element._attributeTranslations = {
	2445	write: {
	2446	names: {
	2447	className: 'class',
	2448	htmlFor: 'for'
	2449	},
	2450	values: { }
	2451	}
	2452	};

961		~~/--------------------------------------------------------------------------/~~
	2454	if (Prototype.Browser.Opera) {
	2455	Element.Methods.getStyle = Element.Methods.getStyle.wrap(
	2456	function(proceed, element, style) {
	2457	switch (style) {
	2458	case 'left': case 'top': case 'right': case 'bottom':
	2459	if (proceed(element, 'position') === 'static') return null;
	2460	case 'height': case 'width':
	2461	if (!Element.visible(element)) return null;

963		~~Abstract.Insertion = function(adjacency) {~~
964		~~this.adjacency = adjacency;~~
	2463	var dim = parseInt(proceed(element, style), 10);
	2464
	2465	if (dim !== element['offset' + style.capitalize()])
	2466	return dim + 'px';
	2467
	2468	var properties;
	2469	if (style === 'height') {
	2470	properties = ['border-top-width', 'padding-top',
	2471	'padding-bottom', 'border-bottom-width'];
	2472	}
	2473	else {
	2474	properties = ['border-left-width', 'padding-left',
	2475	'padding-right', 'border-right-width'];
	2476	}
	2477	return properties.inject(dim, function(memo, property) {
	2478	var val = proceed(element, property);
	2479	return val === null ? memo : memo - parseInt(val, 10);
	2480	}) + 'px';
	2481	default: return proceed(element, style);
	2482	}
	2483	}
	2484	);
	2485
	2486	Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
	2487	function(proceed, element, attribute) {
	2488	if (attribute === 'title') return element.title;
	2489	return proceed(element, attribute);
	2490	}
	2491	);
		}

967		~~Abstract.Insertion.prototype = {~~
968		~~initialize: function(element, content) {~~
969		~~this.element = $(element);~~
970		~~this.content = content;~~
	2494	else if (Prototype.Browser.IE) {
	2495	Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
	2496	function(proceed, element) {
	2497	element = $(element);
	2498	try { element.offsetParent }
	2499	catch(e) { return $(document.body) }
	2500	var position = element.getStyle('position');
	2501	if (position !== 'static') return proceed(element);
	2502	element.setStyle({ position: 'relative' });
	2503	var value = proceed(element);
	2504	element.setStyle({ position: position });
	2505	return value;
	2506	}
	2507	);

972		~~if (this.adjacency && this.element.insertAdjacentHTML) {~~
973		~~try {~~
974		~~this.element.insertAdjacentHTML(this.adjacency, this.content);~~
975		~~} catch (e) {~~
976		~~if (this.element.tagName.toLowerCase() == 'tbody') {~~
977		~~this.insertContent(this.contentFromAnonymousTable());~~
978		~~} else {~~
979		~~throw e;~~
	2509	$w('positionedOffset viewportOffset').each(function(method) {
	2510	Element.Methods[method] = Element.Methods[method].wrap(
	2511	function(proceed, element) {
	2512	element = $(element);
	2513	try { element.offsetParent }
	2514	catch(e) { return Element._returnOffset(0,0) }
	2515	var position = element.getStyle('position');
	2516	if (position !== 'static') return proceed(element);
	2517	var offsetParent = element.getOffsetParent();
	2518	if (offsetParent && offsetParent.getStyle('position') === 'fixed')
	2519	offsetParent.setStyle({ zoom: 1 });
	2520	element.setStyle({ position: 'relative' });
	2521	var value = proceed(element);
	2522	element.setStyle({ position: position });
	2523	return value;
	2524	}
	2525	);
	2526	});
	2527
	2528	Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
	2529	function(proceed, element) {
	2530	try { element.offsetParent }
	2531	catch(e) { return Element._returnOffset(0,0) }
	2532	return proceed(element);
	2533	}
	2534	);
	2535
	2536	Element.Methods.getStyle = function(element, style) {
	2537	element = $(element);
	2538	style = (style == 'float' \|\| style == 'cssFloat') ? 'styleFloat' : style.camelize();
	2539	var value = element.style[style];
	2540	if (!value && element.currentStyle) value = element.currentStyle[style];
	2541
	2542	if (style == 'opacity') {
	2543	if (value = (element.getStyle('filter') \|\| '').match(/alpha$opacity=(.*)$/))
	2544	if (value[1]) return parseFloat(value[1]) / 100;
	2545	return 1.0;
	2546	}
	2547
	2548	if (value == 'auto') {
	2549	if ((style == 'width' \|\| style == 'height') && (element.getStyle('display') != 'none'))
	2550	return element['offset' + style.capitalize()] + 'px';
	2551	return null;
	2552	}
	2553	return value;
	2554	};
	2555
	2556	Element.Methods.setOpacity = function(element, value) {
	2557	function stripAlpha(filter){
	2558	return filter.replace(/alpha$[^$]*\)/gi,'');
	2559	}
	2560	element = $(element);
	2561	var currentStyle = element.currentStyle;
	2562	if ((currentStyle && !currentStyle.hasLayout) \|\|
	2563	(!currentStyle && element.style.zoom == 'normal'))
	2564	element.style.zoom = 1;
	2565
	2566	var filter = element.getStyle('filter'), style = element.style;
	2567	if (value == 1 \|\| value === '') {
	2568	(filter = stripAlpha(filter)) ?
	2569	style.filter = filter : style.removeAttribute('filter');
	2570	return element;
	2571	} else if (value < 0.00001) value = 0;
	2572	style.filter = stripAlpha(filter) +
	2573	'alpha(opacity=' + (value * 100) + ')';
	2574	return element;
	2575	};
	2576
	2577	Element._attributeTranslations = (function(){
	2578
	2579	var classProp = 'className';
	2580	var forProp = 'for';
	2581
	2582	var el = document.createElement('div');
	2583
	2584	el.setAttribute(classProp, 'x');
	2585
	2586	if (el.className !== 'x') {
	2587	el.setAttribute('class', 'x');
	2588	if (el.className === 'x') {
	2589	classProp = 'class';
	2590	}
	2591	}
	2592	el = null;
	2593
	2594	el = document.createElement('label');
	2595	el.setAttribute(forProp, 'x');
	2596	if (el.htmlFor !== 'x') {
	2597	el.setAttribute('htmlFor', 'x');
	2598	if (el.htmlFor === 'x') {
	2599	forProp = 'htmlFor';
	2600	}
	2601	}
	2602	el = null;
	2603
	2604	return {
	2605	read: {
	2606	names: {
	2607	'class': classProp,
	2608	'className': classProp,
	2609	'for': forProp,
	2610	'htmlFor': forProp
	2611	},
	2612	values: {
	2613	_getAttr: function(element, attribute) {
	2614	return element.getAttribute(attribute);
	2615	},
	2616	_getAttr2: function(element, attribute) {
	2617	return element.getAttribute(attribute, 2);
	2618	},
	2619	_getAttrNode: function(element, attribute) {
	2620	var node = element.getAttributeNode(attribute);
	2621	return node ? node.value : "";
	2622	},
	2623	_getEv: (function(){
	2624
	2625	var el = document.createElement('div');
	2626	el.onclick = Prototype.emptyFunction;
	2627	var value = el.getAttribute('onclick');
	2628	var f;
	2629
	2630	if (String(value).indexOf('{') > -1) {
	2631	f = function(element, attribute) {
	2632	attribute = element.getAttribute(attribute);
	2633	if (!attribute) return null;
	2634	attribute = attribute.toString();
	2635	attribute = attribute.split('{')[1];
	2636	attribute = attribute.split('}')[0];
	2637	return attribute.strip();
	2638	};
	2639	}
	2640	else if (value === '') {
	2641	f = function(element, attribute) {
	2642	attribute = element.getAttribute(attribute);
	2643	if (!attribute) return null;
	2644	return attribute.strip();
	2645	};
	2646	}
	2647	el = null;
	2648	return f;
	2649	})(),
	2650	_flag: function(element, attribute) {
	2651	return $(element).hasAttribute(attribute) ? attribute : null;
	2652	},
	2653	style: function(element) {
	2654	return element.style.cssText.toLowerCase();
	2655	},
	2656	title: function(element) {
	2657	return element.title;
	2658	}
		}
		}
982		~~} else {~~
983		~~this.range = this.element.ownerDocument.createRange();~~
984		~~if (this.initializeRange) this.initializeRange();~~
985		~~this.insertContent([this.range.createContextualFragment(this.content)]);~~
		}
987		},
	2662	})();

989		~~contentFromAnonymousTable: function() {~~
990		~~var div = document.createElement('div');~~
991		~~div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';~~
992		~~return $A(div.childNodes[0].childNodes[0].childNodes);~~
	2664	Element._attributeTranslations.write = {
	2665	names: Object.extend({
	2666	cellpadding: 'cellPadding',
	2667	cellspacing: 'cellSpacing'
	2668	}, Element._attributeTranslations.read.names),
	2669	values: {
	2670	checked: function(element, value) {
	2671	element.checked = !!value;
	2672	},
	2673
	2674	style: function(element, value) {
	2675	element.style.cssText = value ? value : '';
	2676	}
	2677	}
	2678	};
	2679
	2680	Element._attributeTranslations.has = {};
	2681
	2682	$w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
	2683	'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
	2684	Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
	2685	Element._attributeTranslations.has[attr.toLowerCase()] = attr;
	2686	});
	2687
	2688	(function(v) {
	2689	Object.extend(v, {
	2690	href: v._getAttr2,
	2691	src: v._getAttr2,
	2692	type: v._getAttr,
	2693	action: v._getAttrNode,
	2694	disabled: v._flag,
	2695	checked: v._flag,
	2696	readonly: v._flag,
	2697	multiple: v._flag,
	2698	onload: v._getEv,
	2699	onunload: v._getEv,
	2700	onclick: v._getEv,
	2701	ondblclick: v._getEv,
	2702	onmousedown: v._getEv,
	2703	onmouseup: v._getEv,
	2704	onmouseover: v._getEv,
	2705	onmousemove: v._getEv,
	2706	onmouseout: v._getEv,
	2707	onfocus: v._getEv,
	2708	onblur: v._getEv,
	2709	onkeypress: v._getEv,
	2710	onkeydown: v._getEv,
	2711	onkeyup: v._getEv,
	2712	onsubmit: v._getEv,
	2713	onreset: v._getEv,
	2714	onselect: v._getEv,
	2715	onchange: v._getEv
	2716	});
	2717	})(Element._attributeTranslations.read.values);
	2718
	2719	if (Prototype.BrowserFeatures.ElementExtensions) {
	2720	(function() {
	2721	function _descendants(element) {
	2722	var nodes = element.getElementsByTagName('*'), results = [];
	2723	for (var i = 0, node; node = nodes[i]; i++)
	2724	if (node.tagName !== "!") // Filter out comment nodes.
	2725	results.push(node);
	2726	return results;
	2727	}
	2728
	2729	Element.Methods.down = function(element, expression, index) {
	2730	element = $(element);
	2731	if (arguments.length == 1) return element.firstDescendant();
	2732	return Object.isNumber(expression) ? _descendants(element)[expression] :
	2733	Element.select(element, expression)[index \|\| 0];
	2734	}
	2735	})();
		}
	2737
		}

996		~~var Insertion = new Object();~~
	2740	else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
	2741	Element.Methods.setOpacity = function(element, value) {
	2742	element = $(element);
	2743	element.style.opacity = (value == 1) ? 0.999999 :
	2744	(value === '') ? '' : (value < 0.00001) ? 0 : value;
	2745	return element;
	2746	};
	2747	}

998		~~Insertion.Before = Class.create();~~
999		~~Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {~~
1000		~~initializeRange: function() {~~
1001		~~this.range.setStartBefore(this.element);~~
	2749	else if (Prototype.Browser.WebKit) {
	2750	Element.Methods.setOpacity = function(element, value) {
	2751	element = $(element);
	2752	element.style.opacity = (value == 1 \|\| value === '') ? '' :
	2753	(value < 0.00001) ? 0 : value;
	2754
	2755	if (value == 1)
	2756	if(element.tagName.toUpperCase() == 'IMG' && element.width) {
	2757	element.width++; element.width--;
	2758	} else try {
	2759	var n = document.createTextNode(' ');
	2760	element.appendChild(n);
	2761	element.removeChild(n);
	2762	} catch (e) { }
	2763
	2764	return element;
	2765	};
	2766
	2767	Element.Methods.cumulativeOffset = function(element) {
	2768	var valueT = 0, valueL = 0;
	2769	do {
	2770	valueT += element.offsetTop \|\| 0;
	2771	valueL += element.offsetLeft \|\| 0;
	2772	if (element.offsetParent == document.body)
	2773	if (Element.getStyle(element, 'position') == 'absolute') break;
	2774
	2775	element = element.offsetParent;
	2776	} while (element);
	2777
	2778	return Element._returnOffset(valueL, valueT);
	2779	};
	2780	}
	2781
	2782	if ('outerHTML' in document.documentElement) {
	2783	Element.Methods.replace = function(element, content) {
	2784	element = $(element);
	2785
	2786	if (content && content.toElement) content = content.toElement();
	2787	if (Object.isElement(content)) {
	2788	element.parentNode.replaceChild(content, element);
	2789	return element;
	2790	}
	2791
	2792	content = Object.toHTML(content);
	2793	var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
	2794
	2795	if (Element._insertionTranslations.tags[tagName]) {
	2796	var nextSibling = element.next();
	2797	var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
	2798	parent.removeChild(element);
	2799	if (nextSibling)
	2800	fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
	2801	else
	2802	fragments.each(function(node) { parent.appendChild(node) });
	2803	}
	2804	else element.outerHTML = content.stripScripts();
	2805
	2806	content.evalScripts.bind(content).defer();
	2807	return element;
	2808	};
	2809	}
	2810
	2811	Element._returnOffset = function(l, t) {
	2812	var result = [l, t];
	2813	result.left = l;
	2814	result.top = t;
	2815	return result;
	2816	};
	2817
	2818	Element._getContentFromAnonymousElement = function(tagName, html) {
	2819	var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
	2820	if (t) {
	2821	div.innerHTML = t[0] + html + t[1];
	2822	t[2].times(function() { div = div.firstChild });
	2823	} else div.innerHTML = html;
	2824	return $A(div.childNodes);
	2825	};
	2826
	2827	Element._insertionTranslations = {
	2828	before: function(element, node) {
	2829	element.parentNode.insertBefore(node, element);
		},
	2831	top: function(element, node) {
	2832	element.insertBefore(node, element.firstChild);
	2833	},
	2834	bottom: function(element, node) {
	2835	element.appendChild(node);
	2836	},
	2837	after: function(element, node) {
	2838	element.parentNode.insertBefore(node, element.nextSibling);
	2839	},
	2840	tags: {
	2841	TABLE: ['<table>', '</table>', 1],
	2842	TBODY: ['<table><tbody>', '</tbody></table>', 2],
	2843	TR: ['<table><tbody><tr>', '</tr></tbody></table>', 3],
	2844	TD: ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
	2845	SELECT: ['<select>', '</select>', 1]
	2846	}
	2847	};

1004		~~insertContent: function(fragments) {~~
1005		~~fragments.each((function(fragment) {~~
1006		~~this.element.parentNode.insertBefore(fragment, this.element);~~
1007		~~}).bind(this));~~
	2849	(function() {
	2850	var tags = Element._insertionTranslations.tags;
	2851	Object.extend(tags, {
	2852	THEAD: tags.TBODY,
	2853	TFOOT: tags.TBODY,
	2854	TH: tags.TD
	2855	});
	2856	})();
	2857
	2858	Element.Methods.Simulated = {
	2859	hasAttribute: function(element, attribute) {
	2860	attribute = Element._attributeTranslations.has[attribute] \|\| attribute;
	2861	var node = $(element).getAttributeNode(attribute);
	2862	return !!(node && node.specified);
		}
1009		~~});~~
	2864	};

1011		~~Insertion.Top = Class.create();~~
1012		~~Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {~~
1013		~~initializeRange: function() {~~
1014		~~this.range.selectNodeContents(this.element);~~
1015		~~this.range.collapse(true);~~
1016		},
	2866	Element.Methods.ByTag = { };

1018		~~insertContent: function(fragments) {~~
1019		~~fragments.reverse().each((function(fragment) {~~
1020		~~this.element.insertBefore(fragment, this.element.firstChild);~~
1021		~~}).bind(this));~~
	2868	Object.extend(Element, Element.Methods);
	2869
	2870	(function(div) {
	2871
	2872	if (!Prototype.BrowserFeatures.ElementExtensions && div['__proto__']) {
	2873	window.HTMLElement = { };
	2874	window.HTMLElement.prototype = div['__proto__'];
	2875	Prototype.BrowserFeatures.ElementExtensions = true;
		}
1023		~~});~~

1025		~~Insertion.Bottom = Class.create();~~
1026		~~Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {~~
1027		~~initializeRange: function() {~~
1028		~~this.range.selectNodeContents(this.element);~~
1029		~~this.range.collapse(this.element);~~
	2878	div = null;
	2879
	2880	})(document.createElement('div'))
	2881
	2882	Element.extend = (function() {
	2883
	2884	function checkDeficiency(tagName) {
	2885	if (typeof window.Element != 'undefined') {
	2886	var proto = window.Element.prototype;
	2887	if (proto) {
	2888	var id = '_' + (Math.random()+'').slice(2);
	2889	var el = document.createElement(tagName);
	2890	proto[id] = 'x';
	2891	var isBuggy = (el[id] !== 'x');
	2892	delete proto[id];
	2893	el = null;
	2894	return isBuggy;
	2895	}
	2896	}
	2897	return false;
	2898	}
	2899
	2900	function extendElementWith(element, methods) {
	2901	for (var property in methods) {
	2902	var value = methods[property];
	2903	if (Object.isFunction(value) && !(property in element))
	2904	element[property] = value.methodize();
	2905	}
	2906	}
	2907
	2908	var HTMLOBJECTELEMENT_PROTOTYPE_BUGGY = checkDeficiency('object');
	2909
	2910	if (Prototype.BrowserFeatures.SpecificElementExtensions) {
	2911	if (HTMLOBJECTELEMENT_PROTOTYPE_BUGGY) {
	2912	return function(element) {
	2913	if (element && typeof element._extendedByPrototype == 'undefined') {
	2914	var t = element.tagName;
	2915	if (t && (/^(?:object\|applet\|embed)$/i.test(t))) {
	2916	extendElementWith(element, Element.Methods);
	2917	extendElementWith(element, Element.Methods.Simulated);
	2918	extendElementWith(element, Element.Methods.ByTag[t.toUpperCase()]);
	2919	}
	2920	}
	2921	return element;
	2922	}
	2923	}
	2924	return Prototype.K;
	2925	}
	2926
	2927	var Methods = { }, ByTag = Element.Methods.ByTag;
	2928
	2929	var extend = Object.extend(function(element) {
	2930	if (!element \|\| typeof element._extendedByPrototype != 'undefined' \|\|
	2931	element.nodeType != 1 \|\| element == window) return element;
	2932
	2933	var methods = Object.clone(Methods),
	2934	tagName = element.tagName.toUpperCase();
	2935
	2936	if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
	2937
	2938	extendElementWith(element, methods);
	2939
	2940	element._extendedByPrototype = Prototype.emptyFunction;
	2941	return element;
	2942
	2943	}, {
	2944	refresh: function() {
	2945	if (!Prototype.BrowserFeatures.ElementExtensions) {
	2946	Object.extend(Methods, Element.Methods);
	2947	Object.extend(Methods, Element.Methods.Simulated);
	2948	}
	2949	}
	2950	});
	2951
	2952	extend.refresh();
	2953	return extend;
	2954	})();
	2955
	2956	Element.hasAttribute = function(element, attribute) {
	2957	if (element.hasAttribute) return element.hasAttribute(attribute);
	2958	return Element.Methods.Simulated.hasAttribute(element, attribute);
	2959	};
	2960
	2961	Element.addMethods = function(methods) {
	2962	var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
	2963
	2964	if (!methods) {
	2965	Object.extend(Form, Form.Methods);
	2966	Object.extend(Form.Element, Form.Element.Methods);
	2967	Object.extend(Element.Methods.ByTag, {
	2968	"FORM": Object.clone(Form.Methods),
	2969	"INPUT": Object.clone(Form.Element.Methods),
	2970	"SELECT": Object.clone(Form.Element.Methods),
	2971	"TEXTAREA": Object.clone(Form.Element.Methods)
	2972	});
	2973	}
	2974
	2975	if (arguments.length == 2) {
	2976	var tagName = methods;
	2977	methods = arguments[1];
	2978	}
	2979
	2980	if (!tagName) Object.extend(Element.Methods, methods \|\| { });
	2981	else {
	2982	if (Object.isArray(tagName)) tagName.each(extend);
	2983	else extend(tagName);
	2984	}
	2985
	2986	function extend(tagName) {
	2987	tagName = tagName.toUpperCase();
	2988	if (!Element.Methods.ByTag[tagName])
	2989	Element.Methods.ByTag[tagName] = { };
	2990	Object.extend(Element.Methods.ByTag[tagName], methods);
	2991	}
	2992
	2993	function copy(methods, destination, onlyIfAbsent) {
	2994	onlyIfAbsent = onlyIfAbsent \|\| false;
	2995	for (var property in methods) {
	2996	var value = methods[property];
	2997	if (!Object.isFunction(value)) continue;
	2998	if (!onlyIfAbsent \|\| !(property in destination))
	2999	destination[property] = value.methodize();
	3000	}
	3001	}
	3002
	3003	function findDOMClass(tagName) {
	3004	var klass;
	3005	var trans = {
	3006	"OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
	3007	"FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
	3008	"DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
	3009	"H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
	3010	"INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
	3011	"TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
	3012	"TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
	3013	"TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
	3014	"FrameSet", "IFRAME": "IFrame"
	3015	};
	3016	if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
	3017	if (window[klass]) return window[klass];
	3018	klass = 'HTML' + tagName + 'Element';
	3019	if (window[klass]) return window[klass];
	3020	klass = 'HTML' + tagName.capitalize() + 'Element';
	3021	if (window[klass]) return window[klass];
	3022
	3023	var element = document.createElement(tagName);
	3024	var proto = element['__proto__'] \|\| element.constructor.prototype;
	3025	element = null;
	3026	return proto;
	3027	}
	3028
	3029	var elementPrototype = window.HTMLElement ? HTMLElement.prototype :
	3030	Element.prototype;
	3031
	3032	if (F.ElementExtensions) {
	3033	copy(Element.Methods, elementPrototype);
	3034	copy(Element.Methods.Simulated, elementPrototype, true);
	3035	}
	3036
	3037	if (F.SpecificElementExtensions) {
	3038	for (var tag in Element.Methods.ByTag) {
	3039	var klass = findDOMClass(tag);
	3040	if (Object.isUndefined(klass)) continue;
	3041	copy(T[tag], klass.prototype);
	3042	}
	3043	}
	3044
	3045	Object.extend(Element, Element.Methods);
	3046	delete Element.ByTag;
	3047
	3048	if (Element.extend.refresh) Element.extend.refresh();
	3049	Element.cache = { };
	3050	};
	3051
	3052
	3053	document.viewport = {
	3054
	3055	getDimensions: function() {
	3056	return { width: this.getWidth(), height: this.getHeight() };
		},

1032		~~insertContent: function(fragments) {~~
1033		~~fragments.each((function(fragment) {~~
1034		~~this.element.appendChild(fragment);~~
1035		~~}).bind(this));~~
	3059	getScrollOffsets: function() {
	3060	return Element._returnOffset(
	3061	window.pageXOffset \|\| document.documentElement.scrollLeft \|\| document.body.scrollLeft,
	3062	window.pageYOffset \|\| document.documentElement.scrollTop \|\| document.body.scrollTop);
		}
1037		~~});~~
	3064	};

1039		~~Insertion.After = Class.create();~~
1040		~~Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {~~
1041		~~initializeRange: function() {~~
1042		~~this.range.setStartAfter(this.element);~~
	3066	(function(viewport) {
	3067	var B = Prototype.Browser, doc = document, element, property = {};
	3068
	3069	function getRootElement() {
	3070	if (B.WebKit && !doc.evaluate)
	3071	return document;
	3072
	3073	if (B.Opera && window.parseFloat(window.opera.version()) < 9.5)
	3074	return document.body;
	3075
	3076	return document.documentElement;
	3077	}
	3078
	3079	function define(D) {
	3080	if (!element) element = getRootElement();
	3081
	3082	property[D] = 'client' + D;
	3083
	3084	viewport['get' + D] = function() { return element[property[D]] };
	3085	return viewport['get' + D]();
	3086	}
	3087
	3088	viewport.getWidth = define.curry('Width');
	3089
	3090	viewport.getHeight = define.curry('Height');
	3091	})(document.viewport);
	3092
	3093
	3094	Element.Storage = {
	3095	UID: 1
	3096	};
	3097
	3098	Element.addMethods({
	3099	getStorage: function(element) {
	3100	if (!(element = $(element))) return;
	3101
	3102	var uid;
	3103	if (element === window) {
	3104	uid = 0;
	3105	} else {
	3106	if (typeof element._prototypeUID === "undefined")
	3107	element._prototypeUID = [Element.Storage.UID++];
	3108	uid = element._prototypeUID[0];
	3109	}
	3110
	3111	if (!Element.Storage[uid])
	3112	Element.Storage[uid] = $H();
	3113
	3114	return Element.Storage[uid];
		},

1045		~~insertContent: function(fragments) {~~
1046		~~fragments.each((function(fragment) {~~
1047		~~this.element.parentNode.insertBefore(fragment,~~
1048		~~this.element.nextSibling);~~
1049		~~}).bind(this));~~
	3117	store: function(element, key, value) {
	3118	if (!(element = $(element))) return;
	3119
	3120	if (arguments.length === 2) {
	3121	Element.getStorage(element).update(key);
	3122	} else {
	3123	Element.getStorage(element).set(key, value);
	3124	}
	3125
	3126	return element;
	3127	},
	3128
	3129	retrieve: function(element, key, defaultValue) {
	3130	if (!(element = $(element))) return;
	3131	var hash = Element.getStorage(element), value = hash.get(key);
	3132
	3133	if (Object.isUndefined(value)) {
	3134	hash.set(key, defaultValue);
	3135	value = defaultValue;
	3136	}
	3137
	3138	return value;
	3139	},
	3140
	3141	clone: function(element, deep) {
	3142	if (!(element = $(element))) return;
	3143	var clone = element.cloneNode(deep);
	3144	clone._prototypeUID = void 0;
	3145	if (deep) {
	3146	var descendants = Element.select(clone, '*'),
	3147	i = descendants.length;
	3148	while (i--) {
	3149	descendants[i]._prototypeUID = void 0;
	3150	}
	3151	}
	3152	return Element.extend(clone);
		}
		});
	3155	/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
	3156	* part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
	3157	* license. Please see http://www.yui-ext.com/ for more information. */

1053		~~/--------------------------------------------------------------------------/~~
	3159	var Selector = Class.create({
	3160	initialize: function(expression) {
	3161	this.expression = expression.strip();

1055		~~Element.ClassNames = Class.create();~~
1056		~~Element.ClassNames.prototype = {~~
1057		~~initialize: function(element) {~~
1058		~~this.element = $(element);~~
	3163	if (this.shouldUseSelectorsAPI()) {
	3164	this.mode = 'selectorsAPI';
	3165	} else if (this.shouldUseXPath()) {
	3166	this.mode = 'xpath';
	3167	this.compileXPathMatcher();
	3168	} else {
	3169	this.mode = "normal";
	3170	this.compileMatcher();
	3171	}
	3172
		},

1061		~~_each: function(iterator) {~~
1062		~~this.element.className.split(/\s+/).select(function(name) {~~
1063		~~return name.length > 0;~~
1064		~~})._each(iterator);~~
	3175	shouldUseXPath: (function() {
	3176
	3177	var IS_DESCENDANT_SELECTOR_BUGGY = (function(){
	3178	var isBuggy = false;
	3179	if (document.evaluate && window.XPathResult) {
	3180	var el = document.createElement('div');
	3181	el.innerHTML = '<ul><li></li></ul><div><ul><li></li></ul></div>';
	3182
	3183	var xpath = ".//*[local-name()='ul' or local-name()='UL']" +
	3184	"//*[local-name()='li' or local-name()='LI']";
	3185
	3186	var result = document.evaluate(xpath, el, null,
	3187	XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
	3188
	3189	isBuggy = (result.snapshotLength !== 2);
	3190	el = null;
	3191	}
	3192	return isBuggy;
	3193	})();
	3194
	3195	return function() {
	3196	if (!Prototype.BrowserFeatures.XPath) return false;
	3197
	3198	var e = this.expression;
	3199
	3200	if (Prototype.Browser.WebKit &&
	3201	(e.include("-of-type") \|\| e.include(":empty")))
	3202	return false;
	3203
	3204	if ((/(\[[\w-]*?:\|:checked)/).test(e))
	3205	return false;
	3206
	3207	if (IS_DESCENDANT_SELECTOR_BUGGY) return false;
	3208
	3209	return true;
	3210	}
	3211
	3212	})(),
	3213
	3214	shouldUseSelectorsAPI: function() {
	3215	if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
	3216
	3217	if (Selector.CASE_INSENSITIVE_CLASS_NAMES) return false;
	3218
	3219	if (!Selector._div) Selector._div = new Element('div');
	3220
	3221	try {
	3222	Selector._div.querySelector(this.expression);
	3223	} catch(e) {
	3224	return false;
	3225	}
	3226
	3227	return true;
		},

1067		~~set: function(className) {~~
1068		~~this.element.className = className;~~
	3230	compileMatcher: function() {
	3231	var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
	3232	c = Selector.criteria, le, p, m, len = ps.length, name;
	3233
	3234	if (Selector._cache[e]) {
	3235	this.matcher = Selector._cache[e];
	3236	return;
	3237	}
	3238
	3239	this.matcher = ["this.matcher = function(root) {",
	3240	"var r = root, h = Selector.handlers, c = false, n;"];
	3241
	3242	while (e && le != e && (/\S/).test(e)) {
	3243	le = e;
	3244	for (var i = 0; i<len; i++) {
	3245	p = ps[i].re;
	3246	name = ps[i].name;
	3247	if (m = e.match(p)) {
	3248	this.matcher.push(Object.isFunction(c[name]) ? c[name](m) :
	3249	new Template(c[name]).evaluate(m));
	3250	e = e.replace(m[0], '');
	3251	break;
	3252	}
	3253	}
	3254	}
	3255
	3256	this.matcher.push("return h.unique(n);\n}");
	3257	eval(this.matcher.join('\n'));
	3258	Selector._cache[this.expression] = this.matcher;
		},

1071		~~add: function(classNameToAdd) {~~
1072		~~if (this.include(classNameToAdd)) return;~~
1073		~~this.set(this.toArray().concat(classNameToAdd).join(' '));~~
	3261	compileXPathMatcher: function() {
	3262	var e = this.expression, ps = Selector.patterns,
	3263	x = Selector.xpath, le, m, len = ps.length, name;
	3264
	3265	if (Selector._cache[e]) {
	3266	this.xpath = Selector._cache[e]; return;
	3267	}
	3268
	3269	this.matcher = ['.//*'];
	3270	while (e && le != e && (/\S/).test(e)) {
	3271	le = e;
	3272	for (var i = 0; i<len; i++) {
	3273	name = ps[i].name;
	3274	if (m = e.match(ps[i].re)) {
	3275	this.matcher.push(Object.isFunction(x[name]) ? x[name](m) :
	3276	new Template(x[name]).evaluate(m));
	3277	e = e.replace(m[0], '');
	3278	break;
	3279	}
	3280	}
	3281	}
	3282
	3283	this.xpath = this.matcher.join('');
	3284	Selector._cache[this.expression] = this.xpath;
		},

1076		~~remove: function(classNameToRemove) {~~
1077		~~if (!this.include(classNameToRemove)) return;~~
1078		~~this.set(this.select(function(className) {~~
1079		~~return className != classNameToRemove;~~
1080		~~}));~~
	3287	findElements: function(root) {
	3288	root = root \|\| document;
	3289	var e = this.expression, results;
	3290
	3291	switch (this.mode) {
	3292	case 'selectorsAPI':
	3293	if (root !== document) {
	3294	var oldId = root.id, id = $(root).identify();
	3295	id = id.replace(/([\.:])/g, "\\$1");
	3296	e = "#" + id + " " + e;
	3297	}
	3298
	3299	results = $A(root.querySelectorAll(e)).map(Element.extend);
	3300	root.id = oldId;
	3301
	3302	return results;
	3303	case 'xpath':
	3304	return document._getElementsByXPath(this.xpath, root);
	3305	default:
	3306	return this.matcher(root);
	3307	}
		},

	3310	match: function(element) {
	3311	this.tokens = [];
	3312
	3313	var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
	3314	var le, p, m, len = ps.length, name;
	3315
	3316	while (e && le !== e && (/\S/).test(e)) {
	3317	le = e;
	3318	for (var i = 0; i<len; i++) {
	3319	p = ps[i].re;
	3320	name = ps[i].name;
	3321	if (m = e.match(p)) {
	3322	if (as[name]) {
	3323	this.tokens.push([name, Object.clone(m)]);
	3324	e = e.replace(m[0], '');
	3325	} else {
	3326	return this.findElements(document).include(element);
	3327	}
	3328	}
	3329	}
	3330	}
	3331
	3332	var match = true, name, matches;
	3333	for (var i = 0, token; token = this.tokens[i]; i++) {
	3334	name = token[0], matches = token[1];
	3335	if (!Selector.assertions[name](element, matches)) {
	3336	match = false; break;
	3337	}
	3338	}
	3339
	3340	return match;
	3341	},
	3342
		toString: function() {
1084		~~return this.toArray().join(' ');~~
	3344	return this.expression;
	3345	},
	3346
	3347	inspect: function() {
	3348	return "#<Selector:" + this.expression.inspect() + ">";
		}
	3350	});
	3351
	3352	if (Prototype.BrowserFeatures.SelectorsAPI &&
	3353	document.compatMode === 'BackCompat') {
	3354	Selector.CASE_INSENSITIVE_CLASS_NAMES = (function(){
	3355	var div = document.createElement('div'),
	3356	span = document.createElement('span');
	3357
	3358	div.id = "prototype_test_id";
	3359	span.className = 'Test';
	3360	div.appendChild(span);
	3361	var isIgnored = (div.querySelector('#prototype_test_id .test') !== null);
	3362	div = span = null;
	3363	return isIgnored;
	3364	})();
		}

1088		~~Object.extend(Element.ClassNames.prototype, Enumerable);~~
1089		~~var Field = {~~
1090		~~clear: function() {~~
1091		~~for (var i = 0; i < arguments.length; i++)~~
1092		~~$(arguments[i]).value = '';~~
	3367	Object.extend(Selector, {
	3368	_cache: { },
	3369
	3370	xpath: {
	3371	descendant: "//*",
	3372	child: "/*",
	3373	adjacent: "/following-sibling::*[1]",
	3374	laterSibling: '/following-sibling::*',
	3375	tagName: function(m) {
	3376	if (m[1] == '*') return '';
	3377	return "[local-name()='" + m[1].toLowerCase() +
	3378	"' or local-name()='" + m[1].toUpperCase() + "']";
	3379	},
	3380	className: "[contains(concat(' ', @class, ' '), ' #{1} ')]",
	3381	id: "[@id='#{1}']",
	3382	attrPresence: function(m) {
	3383	m[1] = m[1].toLowerCase();
	3384	return new Template("[@#{1}]").evaluate(m);
	3385	},
	3386	attr: function(m) {
	3387	m[1] = m[1].toLowerCase();
	3388	m[3] = m[5] \|\| m[6];
	3389	return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
	3390	},
	3391	pseudo: function(m) {
	3392	var h = Selector.xpath.pseudos[m[1]];
	3393	if (!h) return '';
	3394	if (Object.isFunction(h)) return h(m);
	3395	return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
	3396	},
	3397	operators: {
	3398	'=': "[@#{1}='#{3}']",
	3399	'!=': "[@#{1}!='#{3}']",
	3400	'^=': "[starts-with(@#{1}, '#{3}')]",
	3401	'$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
	3402	'*=': "[contains(@#{1}, '#{3}')]",
	3403	'~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
	3404	'\|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
	3405	},
	3406	pseudos: {
	3407	'first-child': '[not(preceding-sibling::*)]',
	3408	'last-child': '[not(following-sibling::*)]',
	3409	'only-child': '[not(preceding-sibling::* or following-sibling::*)]',
	3410	'empty': "[count(*) = 0 and (count(text()) = 0)]",
	3411	'checked': "[@checked]",
	3412	'disabled': "[(@disabled) and (@type!='hidden')]",
	3413	'enabled': "[not(@disabled) and (@type!='hidden')]",
	3414	'not': function(m) {
	3415	var e = m[6], p = Selector.patterns,
	3416	x = Selector.xpath, le, v, len = p.length, name;
	3417
	3418	var exclusion = [];
	3419	while (e && le != e && (/\S/).test(e)) {
	3420	le = e;
	3421	for (var i = 0; i<len; i++) {
	3422	name = p[i].name
	3423	if (m = e.match(p[i].re)) {
	3424	v = Object.isFunction(x[name]) ? x[name](m) : new Template(x[name]).evaluate(m);
	3425	exclusion.push("(" + v.substring(1, v.length - 1) + ")");
	3426	e = e.replace(m[0], '');
	3427	break;
	3428	}
	3429	}
	3430	}
	3431	return "[not(" + exclusion.join(" and ") + ")]";
	3432	},
	3433	'nth-child': function(m) {
	3434	return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
	3435	},
	3436	'nth-last-child': function(m) {
	3437	return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
	3438	},
	3439	'nth-of-type': function(m) {
	3440	return Selector.xpath.pseudos.nth("position() ", m);
	3441	},
	3442	'nth-last-of-type': function(m) {
	3443	return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
	3444	},
	3445	'first-of-type': function(m) {
	3446	m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
	3447	},
	3448	'last-of-type': function(m) {
	3449	m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
	3450	},
	3451	'only-of-type': function(m) {
	3452	var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
	3453	},
	3454	nth: function(fragment, m) {
	3455	var mm, formula = m[6], predicate;
	3456	if (formula == 'even') formula = '2n+0';
	3457	if (formula == 'odd') formula = '2n+1';
	3458	if (mm = formula.match(/^(\d+)$/)) // digit only
	3459	return '[' + fragment + "= " + mm[1] + ']';
	3460	if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
	3461	if (mm[1] == "-") mm[1] = -1;
	3462	var a = mm[1] ? Number(mm[1]) : 1;
	3463	var b = mm[2] ? Number(mm[2]) : 0;
	3464	predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
	3465	"((#{fragment} - #{b}) div #{a} >= 0)]";
	3466	return new Template(predicate).evaluate({
	3467	fragment: fragment, a: a, b: b });
	3468	}
	3469	}
	3470	}
		},

1095		~~focus: function(element) {~~
1096		~~$(element).focus();~~
	3473	criteria: {
	3474	tagName: 'n = h.tagName(n, r, "#{1}", c); c = false;',
	3475	className: 'n = h.className(n, r, "#{1}", c); c = false;',
	3476	id: 'n = h.id(n, r, "#{1}", c); c = false;',
	3477	attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
	3478	attr: function(m) {
	3479	m[3] = (m[5] \|\| m[6]);
	3480	return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
	3481	},
	3482	pseudo: function(m) {
	3483	if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
	3484	return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
	3485	},
	3486	descendant: 'c = "descendant";',
	3487	child: 'c = "child";',
	3488	adjacent: 'c = "adjacent";',
	3489	laterSibling: 'c = "laterSibling";'
		},

1099		~~present: function() {~~
1100		~~for (var i = 0; i < arguments.length; i++)~~
1101		~~if ($(arguments[i]).value == '') return false;~~
1102		~~return true;~~
	3492	patterns: [
	3493	{ name: 'laterSibling', re: /^\s~\s/ },
	3494	{ name: 'child', re: /^\s>\s/ },
	3495	{ name: 'adjacent', re: /^\s\+\s/ },
	3496	{ name: 'descendant', re: /^\s/ },
	3497
	3498	{ name: 'tagName', re: /^\s(\\|[\w\-]+)(\b\|$)?/ },
	3499	{ name: 'id', re: /^#([\w\-\*]+)(\b\|$)/ },
	3500	{ name: 'className', re: /^\.([\w\-\*]+)(\b\|$)/ },
	3501	{ name: 'pseudo', re: /^:((first\|last\|nth\|nth-last\|only)(-child\|-of-type)\|empty\|checked\|(en\|dis)abled\|not)($(.*?)$)?(\b\|$\|(?=\s\|[:+~>]))/ },
	3502	{ name: 'attrPresence', re: /^\[((?:[\w-]+:)?[\w-]+)\]/ },
	3503	{ name: 'attr', re: /\[((?:[\w-]:)?[\w-]+)\s(?:([!^$~\|]?=)\s((['"])([^\4]?)\4\|([^'"][^\]]?)))?\]/ }
	3504	],
	3505
	3506	assertions: {
	3507	tagName: function(element, matches) {
	3508	return matches[1].toUpperCase() == element.tagName.toUpperCase();
	3509	},
	3510
	3511	className: function(element, matches) {
	3512	return Element.hasClassName(element, matches[1]);
	3513	},
	3514
	3515	id: function(element, matches) {
	3516	return element.id === matches[1];
	3517	},
	3518
	3519	attrPresence: function(element, matches) {
	3520	return Element.hasAttribute(element, matches[1]);
	3521	},
	3522
	3523	attr: function(element, matches) {
	3524	var nodeValue = Element.readAttribute(element, matches[1]);
	3525	return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] \|\| matches[6]);
	3526	}
		},

1105		~~select: function(element) {~~
1106		~~$(element).select();~~
	3529	handlers: {
	3530	concat: function(a, b) {
	3531	for (var i = 0, node; node = b[i]; i++)
	3532	a.push(node);
	3533	return a;
	3534	},
	3535
	3536	mark: function(nodes) {
	3537	var _true = Prototype.emptyFunction;
	3538	for (var i = 0, node; node = nodes[i]; i++)
	3539	node._countedByPrototype = _true;
	3540	return nodes;
	3541	},
	3542
	3543	unmark: (function(){
	3544
	3545	var PROPERTIES_ATTRIBUTES_MAP = (function(){
	3546	var el = document.createElement('div'),
	3547	isBuggy = false,
	3548	propName = '_countedByPrototype',
	3549	value = 'x'
	3550	el[propName] = value;
	3551	isBuggy = (el.getAttribute(propName) === value);
	3552	el = null;
	3553	return isBuggy;
	3554	})();
	3555
	3556	return PROPERTIES_ATTRIBUTES_MAP ?
	3557	function(nodes) {
	3558	for (var i = 0, node; node = nodes[i]; i++)
	3559	node.removeAttribute('_countedByPrototype');
	3560	return nodes;
	3561	} :
	3562	function(nodes) {
	3563	for (var i = 0, node; node = nodes[i]; i++)
	3564	node._countedByPrototype = void 0;
	3565	return nodes;
	3566	}
	3567	})(),
	3568
	3569	index: function(parentNode, reverse, ofType) {
	3570	parentNode._countedByPrototype = Prototype.emptyFunction;
	3571	if (reverse) {
	3572	for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
	3573	var node = nodes[i];
	3574	if (node.nodeType == 1 && (!ofType \|\| node._countedByPrototype)) node.nodeIndex = j++;
	3575	}
	3576	} else {
	3577	for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
	3578	if (node.nodeType == 1 && (!ofType \|\| node._countedByPrototype)) node.nodeIndex = j++;
	3579	}
	3580	},
	3581
	3582	unique: function(nodes) {
	3583	if (nodes.length == 0) return nodes;
	3584	var results = [], n;
	3585	for (var i = 0, l = nodes.length; i < l; i++)
	3586	if (typeof (n = nodes[i])._countedByPrototype == 'undefined') {
	3587	n._countedByPrototype = Prototype.emptyFunction;
	3588	results.push(Element.extend(n));
	3589	}
	3590	return Selector.handlers.unmark(results);
	3591	},
	3592
	3593	descendant: function(nodes) {
	3594	var h = Selector.handlers;
	3595	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3596	h.concat(results, node.getElementsByTagName('*'));
	3597	return results;
	3598	},
	3599
	3600	child: function(nodes) {
	3601	var h = Selector.handlers;
	3602	for (var i = 0, results = [], node; node = nodes[i]; i++) {
	3603	for (var j = 0, child; child = node.childNodes[j]; j++)
	3604	if (child.nodeType == 1 && child.tagName != '!') results.push(child);
	3605	}
	3606	return results;
	3607	},
	3608
	3609	adjacent: function(nodes) {
	3610	for (var i = 0, results = [], node; node = nodes[i]; i++) {
	3611	var next = this.nextElementSibling(node);
	3612	if (next) results.push(next);
	3613	}
	3614	return results;
	3615	},
	3616
	3617	laterSibling: function(nodes) {
	3618	var h = Selector.handlers;
	3619	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3620	h.concat(results, Element.nextSiblings(node));
	3621	return results;
	3622	},
	3623
	3624	nextElementSibling: function(node) {
	3625	while (node = node.nextSibling)
	3626	if (node.nodeType == 1) return node;
	3627	return null;
	3628	},
	3629
	3630	previousElementSibling: function(node) {
	3631	while (node = node.previousSibling)
	3632	if (node.nodeType == 1) return node;
	3633	return null;
	3634	},
	3635
	3636	tagName: function(nodes, root, tagName, combinator) {
	3637	var uTagName = tagName.toUpperCase();
	3638	var results = [], h = Selector.handlers;
	3639	if (nodes) {
	3640	if (combinator) {
	3641	if (combinator == "descendant") {
	3642	for (var i = 0, node; node = nodes[i]; i++)
	3643	h.concat(results, node.getElementsByTagName(tagName));
	3644	return results;
	3645	} else nodes = this[combinator](nodes);
	3646	if (tagName == "*") return nodes;
	3647	}
	3648	for (var i = 0, node; node = nodes[i]; i++)
	3649	if (node.tagName.toUpperCase() === uTagName) results.push(node);
	3650	return results;
	3651	} else return root.getElementsByTagName(tagName);
	3652	},
	3653
	3654	id: function(nodes, root, id, combinator) {
	3655	var targetNode = $(id), h = Selector.handlers;
	3656
	3657	if (root == document) {
	3658	if (!targetNode) return [];
	3659	if (!nodes) return [targetNode];
	3660	} else {
	3661	if (!root.sourceIndex \|\| root.sourceIndex < 1) {
	3662	var nodes = root.getElementsByTagName('*');
	3663	for (var j = 0, node; node = nodes[j]; j++) {
	3664	if (node.id === id) return [node];
	3665	}
	3666	}
	3667	}
	3668
	3669	if (nodes) {
	3670	if (combinator) {
	3671	if (combinator == 'child') {
	3672	for (var i = 0, node; node = nodes[i]; i++)
	3673	if (targetNode.parentNode == node) return [targetNode];
	3674	} else if (combinator == 'descendant') {
	3675	for (var i = 0, node; node = nodes[i]; i++)
	3676	if (Element.descendantOf(targetNode, node)) return [targetNode];
	3677	} else if (combinator == 'adjacent') {
	3678	for (var i = 0, node; node = nodes[i]; i++)
	3679	if (Selector.handlers.previousElementSibling(targetNode) == node)
	3680	return [targetNode];
	3681	} else nodes = h[combinator](nodes);
	3682	}
	3683	for (var i = 0, node; node = nodes[i]; i++)
	3684	if (node == targetNode) return [targetNode];
	3685	return [];
	3686	}
	3687	return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
	3688	},
	3689
	3690	className: function(nodes, root, className, combinator) {
	3691	if (nodes && combinator) nodes = this[combinator](nodes);
	3692	return Selector.handlers.byClassName(nodes, root, className);
	3693	},
	3694
	3695	byClassName: function(nodes, root, className) {
	3696	if (!nodes) nodes = Selector.handlers.descendant([root]);
	3697	var needle = ' ' + className + ' ';
	3698	for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
	3699	nodeClassName = node.className;
	3700	if (nodeClassName.length == 0) continue;
	3701	if (nodeClassName == className \|\| (' ' + nodeClassName + ' ').include(needle))
	3702	results.push(node);
	3703	}
	3704	return results;
	3705	},
	3706
	3707	attrPresence: function(nodes, root, attr, combinator) {
	3708	if (!nodes) nodes = root.getElementsByTagName("*");
	3709	if (nodes && combinator) nodes = this[combinator](nodes);
	3710	var results = [];
	3711	for (var i = 0, node; node = nodes[i]; i++)
	3712	if (Element.hasAttribute(node, attr)) results.push(node);
	3713	return results;
	3714	},
	3715
	3716	attr: function(nodes, root, attr, value, operator, combinator) {
	3717	if (!nodes) nodes = root.getElementsByTagName("*");
	3718	if (nodes && combinator) nodes = this[combinator](nodes);
	3719	var handler = Selector.operators[operator], results = [];
	3720	for (var i = 0, node; node = nodes[i]; i++) {
	3721	var nodeValue = Element.readAttribute(node, attr);
	3722	if (nodeValue === null) continue;
	3723	if (handler(nodeValue, value)) results.push(node);
	3724	}
	3725	return results;
	3726	},
	3727
	3728	pseudo: function(nodes, name, value, root, combinator) {
	3729	if (nodes && combinator) nodes = this[combinator](nodes);
	3730	if (!nodes) nodes = root.getElementsByTagName("*");
	3731	return Selector.pseudos[name](nodes, value, root);
	3732	}
		},

1109		~~activate: function(element) {~~
1110		~~$(element).focus();~~
1111		~~$(element).select();~~
	3735	pseudos: {
	3736	'first-child': function(nodes, value, root) {
	3737	for (var i = 0, results = [], node; node = nodes[i]; i++) {
	3738	if (Selector.handlers.previousElementSibling(node)) continue;
	3739	results.push(node);
	3740	}
	3741	return results;
	3742	},
	3743	'last-child': function(nodes, value, root) {
	3744	for (var i = 0, results = [], node; node = nodes[i]; i++) {
	3745	if (Selector.handlers.nextElementSibling(node)) continue;
	3746	results.push(node);
	3747	}
	3748	return results;
	3749	},
	3750	'only-child': function(nodes, value, root) {
	3751	var h = Selector.handlers;
	3752	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3753	if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
	3754	results.push(node);
	3755	return results;
	3756	},
	3757	'nth-child': function(nodes, formula, root) {
	3758	return Selector.pseudos.nth(nodes, formula, root);
	3759	},
	3760	'nth-last-child': function(nodes, formula, root) {
	3761	return Selector.pseudos.nth(nodes, formula, root, true);
	3762	},
	3763	'nth-of-type': function(nodes, formula, root) {
	3764	return Selector.pseudos.nth(nodes, formula, root, false, true);
	3765	},
	3766	'nth-last-of-type': function(nodes, formula, root) {
	3767	return Selector.pseudos.nth(nodes, formula, root, true, true);
	3768	},
	3769	'first-of-type': function(nodes, formula, root) {
	3770	return Selector.pseudos.nth(nodes, "1", root, false, true);
	3771	},
	3772	'last-of-type': function(nodes, formula, root) {
	3773	return Selector.pseudos.nth(nodes, "1", root, true, true);
	3774	},
	3775	'only-of-type': function(nodes, formula, root) {
	3776	var p = Selector.pseudos;
	3777	return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
	3778	},
	3779
	3780	getIndices: function(a, b, total) {
	3781	if (a == 0) return b > 0 ? [b] : [];
	3782	return $R(1, total).inject([], function(memo, i) {
	3783	if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
	3784	return memo;
	3785	});
	3786	},
	3787
	3788	nth: function(nodes, formula, root, reverse, ofType) {
	3789	if (nodes.length == 0) return [];
	3790	if (formula == 'even') formula = '2n+0';
	3791	if (formula == 'odd') formula = '2n+1';
	3792	var h = Selector.handlers, results = [], indexed = [], m;
	3793	h.mark(nodes);
	3794	for (var i = 0, node; node = nodes[i]; i++) {
	3795	if (!node.parentNode._countedByPrototype) {
	3796	h.index(node.parentNode, reverse, ofType);
	3797	indexed.push(node.parentNode);
	3798	}
	3799	}
	3800	if (formula.match(/^\d+$/)) { // just a number
	3801	formula = Number(formula);
	3802	for (var i = 0, node; node = nodes[i]; i++)
	3803	if (node.nodeIndex == formula) results.push(node);
	3804	} else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
	3805	if (m[1] == "-") m[1] = -1;
	3806	var a = m[1] ? Number(m[1]) : 1;
	3807	var b = m[2] ? Number(m[2]) : 0;
	3808	var indices = Selector.pseudos.getIndices(a, b, nodes.length);
	3809	for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
	3810	for (var j = 0; j < l; j++)
	3811	if (node.nodeIndex == indices[j]) results.push(node);
	3812	}
	3813	}
	3814	h.unmark(nodes);
	3815	h.unmark(indexed);
	3816	return results;
	3817	},
	3818
	3819	'empty': function(nodes, value, root) {
	3820	for (var i = 0, results = [], node; node = nodes[i]; i++) {
	3821	if (node.tagName == '!' \|\| node.firstChild) continue;
	3822	results.push(node);
	3823	}
	3824	return results;
	3825	},
	3826
	3827	'not': function(nodes, selector, root) {
	3828	var h = Selector.handlers, selectorType, m;
	3829	var exclusions = new Selector(selector).findElements(root);
	3830	h.mark(exclusions);
	3831	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3832	if (!node._countedByPrototype) results.push(node);
	3833	h.unmark(exclusions);
	3834	return results;
	3835	},
	3836
	3837	'enabled': function(nodes, value, root) {
	3838	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3839	if (!node.disabled && (!node.type \|\| node.type !== 'hidden'))
	3840	results.push(node);
	3841	return results;
	3842	},
	3843
	3844	'disabled': function(nodes, value, root) {
	3845	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3846	if (node.disabled) results.push(node);
	3847	return results;
	3848	},
	3849
	3850	'checked': function(nodes, value, root) {
	3851	for (var i = 0, results = [], node; node = nodes[i]; i++)
	3852	if (node.checked) results.push(node);
	3853	return results;
	3854	}
	3855	},
	3856
	3857	operators: {
	3858	'=': function(nv, v) { return nv == v; },
	3859	'!=': function(nv, v) { return nv != v; },
	3860	'^=': function(nv, v) { return nv == v \|\| nv && nv.startsWith(v); },
	3861	'$=': function(nv, v) { return nv == v \|\| nv && nv.endsWith(v); },
	3862	'*=': function(nv, v) { return nv == v \|\| nv && nv.include(v); },
	3863	'~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
	3864	'\|=': function(nv, v) { return ('-' + (nv \|\| "").toUpperCase() +
	3865	'-').include('-' + (v \|\| "").toUpperCase() + '-'); }
	3866	},
	3867
	3868	split: function(expression) {
	3869	var expressions = [];
	3870	expression.scan(/(([\w#:.~>+()\s-]+\|\\|\[.?\])+)\s*(,\|$)/, function(m) {
	3871	expressions.push(m[1].strip());
	3872	});
	3873	return expressions;
	3874	},
	3875
	3876	matchElements: function(elements, expression) {
	3877	var matches = $$(expression), h = Selector.handlers;
	3878	h.mark(matches);
	3879	for (var i = 0, results = [], element; element = elements[i]; i++)
	3880	if (element._countedByPrototype) results.push(element);
	3881	h.unmark(matches);
	3882	return results;
	3883	},
	3884
	3885	findElement: function(elements, expression, index) {
	3886	if (Object.isNumber(expression)) {
	3887	index = expression; expression = false;
	3888	}
	3889	return Selector.matchElements(elements, expression \|\| '*')[index \|\| 0];
	3890	},
	3891
	3892	findChildElements: function(element, expressions) {
	3893	expressions = Selector.split(expressions.join(','));
	3894	var results = [], h = Selector.handlers;
	3895	for (var i = 0, l = expressions.length, selector; i < l; i++) {
	3896	selector = new Selector(expressions[i].strip());
	3897	h.concat(results, selector.findElements(element));
	3898	}
	3899	return (l > 1) ? h.unique(results) : results;
		}
	3901	});
	3902
	3903	if (Prototype.Browser.IE) {
	3904	Object.extend(Selector.handlers, {
	3905	concat: function(a, b) {
	3906	for (var i = 0, node; node = b[i]; i++)
	3907	if (node.tagName !== "!") a.push(node);
	3908	return a;
	3909	}
	3910	});
		}

1115		~~/--------------------------------------------------------------------------/~~
	3913	function $$() {
	3914	return Selector.findChildElements(document, $A(arguments));
	3915	}

		var Form = {
1118		~~serialize: function(form) {~~
1119		~~var elements = Form.getElements($(form));~~
1120		~~var queryComponents = new Array();~~
	3918	reset: function(form) {
	3919	form = $(form);
	3920	form.reset();
	3921	return form;
	3922	},

1122		~~for (var i = 0; i < elements.length; i++) {~~
1123		~~var queryComponent = Form.Element.serialize(elements[i]);~~
1124		~~if (queryComponent)~~
1125		~~queryComponents.push(queryComponent);~~
1126		}
	3924	serializeElements: function(elements, options) {
	3925	if (typeof options != 'object') options = { hash: !!options };
	3926	else if (Object.isUndefined(options.hash)) options.hash = true;
	3927	var key, value, submitted = false, submit = options.submit;

1128		~~return queryComponents.join('&');~~
	3929	var data = elements.inject({ }, function(result, element) {
	3930	if (!element.disabled && element.name) {
	3931	key = element.name; value = $(element).getValue();
	3932	if (value != null && element.type != 'file' && (element.type != 'submit' \|\| (!submitted &&
	3933	submit !== false && (!submit \|\| key == submit) && (submitted = true)))) {
	3934	if (key in result) {
	3935	if (!Object.isArray(result[key])) result[key] = [result[key]];
	3936	result[key].push(value);
	3937	}
	3938	else result[key] = value;
	3939	}
	3940	}
	3941	return result;
	3942	});
	3943
	3944	return options.hash ? data : Object.toQueryString(data);
	3945	}
	3946	};
	3947
	3948	Form.Methods = {
	3949	serialize: function(form, options) {
	3950	return Form.serializeElements(Form.getElements(form), options);
		},

		getElements: function(form) {
1132		~~var form = $(form);~~
1133		~~var elements = new Array();~~
1134
1135		~~for (tagName in Form.Element.Serializers) {~~
1136		~~var tagElements = form.getElementsByTagName(tagName);~~
1137		~~for (var j = 0; j < tagElements.length; j++)~~
1138		~~elements.push(tagElements[j]);~~
	3954	var elements = $(form).getElementsByTagName('*'),
	3955	element,
	3956	arr = [ ],
	3957	serializers = Form.Element.Serializers;
	3958	for (var i = 0; element = elements[i]; i++) {
	3959	arr.push(element);
		}
1140		~~return elements;~~
	3961	return arr.inject([], function(elements, child) {
	3962	if (serializers[child.tagName.toLowerCase()])
	3963	elements.push(Element.extend(child));
	3964	return elements;
	3965	})
		},

		getInputs: function(form, typeName, name) {
1144		~~var form = $(form);~~
	3969	form = $(form);
		var inputs = form.getElementsByTagName('input');

1147		~~if (!typeName && !name)~~
1148		~~return inputs;~~
	3972	if (!typeName && !name) return $A(inputs).map(Element.extend);

1150		~~var matchingInputs = new Array();~~
1151		~~for (var i = 0; i < inputs.length; i++) {~~
	3974	for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
		var input = inputs[i];
1153		~~if ((typeName && input.type != typeName) \|\|~~
1154		~~(name && input.name != name))~~
	3976	if ((typeName && input.type != typeName) \|\| (name && input.name != name))
		continue;
1156		~~matchingInputs.push(input);~~
	3978	matchingInputs.push(Element.extend(input));
		}

		return matchingInputs;
		},

		disable: function(form) {
1163		~~var elements = Form.getElements(form);~~
1164		~~for (var i = 0; i < elements.length; i++) {~~
1165		~~var element = elements[i];~~
1166		~~element.blur();~~
1167		~~element.disabled = 'true';~~
1168		}
	3985	form = $(form);
	3986	Form.getElements(form).invoke('disable');
	3987	return form;
		},

		enable: function(form) {
1172		~~var elements = Form.getElements(form);~~
1173		~~for (var i = 0; i < elements.length; i++) {~~
1174		~~var element = elements[i];~~
1175		~~element.disabled = '';~~
1176		}
	3991	form = $(form);
	3992	Form.getElements(form).invoke('enable');
	3993	return form;
		},

	3996	findFirstElement: function(form) {
	3997	var elements = $(form).getElements().findAll(function(element) {
	3998	return 'hidden' != element.type && !element.disabled;
	3999	});
	4000	var firstByIndex = elements.findAll(function(element) {
	4001	return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
	4002	}).sortBy(function(element) { return element.tabIndex }).first();
	4003
	4004	return firstByIndex ? firstByIndex : elements.find(function(element) {
	4005	return /^(?:input\|select\|textarea)$/i.test(element.tagName);
	4006	});
	4007	},
	4008
		focusFirstElement: function(form) {
1180		~~var form = $(form);~~
1181		~~var elements = Form.getElements(form);~~
1182		~~for (var i = 0; i < elements.length; i++) {~~
1183		~~var element = elements[i];~~
1184		~~if (element.type != 'hidden' && !element.disabled) {~~
1185		~~Field.activate(element);~~
1186		~~break;~~
1187		}
	4010	form = $(form);
	4011	form.findFirstElement().activate();
	4012	return form;
	4013	},
	4014
	4015	request: function(form, options) {
	4016	form = $(form), options = Object.clone(options \|\| { });
	4017
	4018	var params = options.parameters, action = form.readAttribute('action') \|\| '';
	4019	if (action.blank()) action = window.location.href;
	4020	options.parameters = form.serialize(true);
	4021
	4022	if (params) {
	4023	if (Object.isString(params)) params = params.toQueryParams();
	4024	Object.extend(options.parameters, params);
		}
	4026
	4027	if (form.hasAttribute('method') && !options.method)
	4028	options.method = form.method;
	4029
	4030	return new Ajax.Request(action, options);
	4031	}
	4032	};
	4033
	4034	/--------------------------------------------------------------------------/
	4035
	4036
	4037	Form.Element = {
	4038	focus: function(element) {
	4039	$(element).focus();
	4040	return element;
		},

1191		~~reset: function(form) {~~
1192		~~$(form).reset();~~
	4043	select: function(element) {
	4044	$(element).select();
	4045	return element;
		}
1194		}
	4047	};

1196		~~Form.Element = {~~
	4049	Form.Element.Methods = {
	4050
		serialize: function(element) {
1198		~~var element = $(element);~~
1199		~~var method = element.tagName.toLowerCase();~~
1200		~~var parameter = Form.Element.Serializers[method](element);~~
1201
1202		~~if (parameter)~~
1203		~~return encodeURIComponent(parameter[0]) + '=' +~~
1204		~~encodeURIComponent(parameter[1]);~~
	4052	element = $(element);
	4053	if (!element.disabled && element.name) {
	4054	var value = element.getValue();
	4055	if (value != undefined) {
	4056	var pair = { };
	4057	pair[element.name] = value;
	4058	return Object.toQueryString(pair);
	4059	}
	4060	}
	4061	return '';
		},

		getValue: function(element) {
1208		~~var element = $(element);~~
	4065	element = $(element);
		var method = element.tagName.toLowerCase();
1210		~~var parameter = Form.Element.Serializers[method](element);~~
	4067	return Form.Element.Serializers[method](element);
	4068	},

1212		~~if (parameter)~~
1213		~~return parameter[1];~~
	4070	setValue: function(element, value) {
	4071	element = $(element);
	4072	var method = element.tagName.toLowerCase();
	4073	Form.Element.Serializers[method](element, value);
	4074	return element;
	4075	},
	4076
	4077	clear: function(element) {
	4078	$(element).value = '';
	4079	return element;
	4080	},
	4081
	4082	present: function(element) {
	4083	return $(element).value != '';
	4084	},
	4085
	4086	activate: function(element) {
	4087	element = $(element);
	4088	try {
	4089	element.focus();
	4090	if (element.select && (element.tagName.toLowerCase() != 'input' \|\|
	4091	!(/^(?:button\|reset\|submit)$/i.test(element.type))))
	4092	element.select();
	4093	} catch (e) { }
	4094	return element;
	4095	},
	4096
	4097	disable: function(element) {
	4098	element = $(element);
	4099	element.disabled = true;
	4100	return element;
	4101	},
	4102
	4103	enable: function(element) {
	4104	element = $(element);
	4105	element.disabled = false;
	4106	return element;
		}
1215		}
	4108	};

	4110	/--------------------------------------------------------------------------/
	4111
	4112	var Field = Form.Element;
	4113
	4114	var $F = Form.Element.Methods.getValue;
	4115
	4116	/--------------------------------------------------------------------------/
	4117
		Form.Element.Serializers = {
1218		~~input: function(element) {~~
	4119	input: function(element, value) {
		switch (element.type.toLowerCase()) {
1220		~~case 'submit':~~
1221		~~case 'hidden':~~
1222		~~case 'password':~~
1223		~~case 'text':~~
1224		~~return Form.Element.Serializers.textarea(element);~~
		case 'checkbox':
		case 'radio':
1227		~~return Form.Element.Serializers.inputSelector(element);~~
	4123	return Form.Element.Serializers.inputSelector(element, value);
	4124	default:
	4125	return Form.Element.Serializers.textarea(element, value);
		}
1229		~~return false;~~
		},

1232		~~inputSelector: function(element) {~~
1233		~~if (element.checked)~~
1234		~~return [element.name, element.value];~~
	4129	inputSelector: function(element, value) {
	4130	if (Object.isUndefined(value)) return element.checked ? element.value : null;
	4131	else element.checked = !!value;
		},

1237		~~textarea: function(element) {~~
1238		~~return [element.name, element.value];~~
	4134	textarea: function(element, value) {
	4135	if (Object.isUndefined(value)) return element.value;
	4136	else element.value = value;
		},

1241		~~select: function(element) {~~
1242		~~return Form.Element.Serializers[element.type == 'select-one' ?~~
1243		~~'selectOne' : 'selectMany'](element);~~
	4139	select: function(element, value) {
	4140	if (Object.isUndefined(value))
	4141	return this[element.type == 'select-one' ?
	4142	'selectOne' : 'selectMany'](element);
	4143	else {
	4144	var opt, currentValue, single = !Object.isArray(value);
	4145	for (var i = 0, length = element.length; i < length; i++) {
	4146	opt = element.options[i];
	4147	currentValue = this.optionValue(opt);
	4148	if (single) {
	4149	if (currentValue == value) {
	4150	opt.selected = true;
	4151	return;
	4152	}
	4153	}
	4154	else opt.selected = value.include(currentValue);
	4155	}
	4156	}
		},

		selectOne: function(element) {
1247		~~var value = '', opt, index = element.selectedIndex;~~
1248		~~if (index >= 0) {~~
1249		~~opt = element.options[index];~~
1250		~~value = opt.value;~~
1251		~~if (!value && !('value' in opt))~~
1252		~~value = opt.text;~~
1253		}
1254		~~return [element.name, value];~~
	4160	var index = element.selectedIndex;
	4161	return index >= 0 ? this.optionValue(element.options[index]) : null;
		},

		selectMany: function(element) {
1258		~~var value = new Array();~~
1259		~~for (var i = 0; i < element.length; i++) {~~
	4165	var values, length = element.length;
	4166	if (!length) return null;
	4167
	4168	for (var i = 0, values = []; i < length; i++) {
		var opt = element.options[i];
1261		~~if (opt.selected) {~~
1262		~~var optValue = opt.value;~~
1263		~~if (!optValue && !('value' in opt))~~
1264		~~optValue = opt.text;~~
1265		~~value.push(optValue);~~
1266		}
	4170	if (opt.selected) values.push(this.optionValue(opt));
		}
1268		~~return [element.name, value];~~
	4172	return values;
	4173	},
	4174
	4175	optionValue: function(opt) {
	4176	return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
		}
1270		}
	4178	};

		/--------------------------------------------------------------------------/

1274		~~var $F = Form.Element.getValue;~~

1276		~~/--------------------------------------------------------------------------/~~
1277
1278		~~Abstract.TimedObserver = function() {}~~
1279		~~Abstract.TimedObserver.prototype = {~~
1280		~~initialize: function(element, frequency, callback) {~~
1281		~~this.frequency = frequency;~~
	4183	Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
	4184	initialize: function($super, element, frequency, callback) {
	4185	$super(callback, frequency);
		this.element = $(element);
1283		~~this.callback = callback;~~
1284
		this.lastValue = this.getValue();
1286		~~this.registerCallback();~~
		},

1289		~~registerCallback: function() {~~
1290		~~setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);~~
1291		},
1292
1293		~~onTimerEvent: function() {~~
	4190	execute: function() {
		var value = this.getValue();
1295		~~if (this.lastValue != value) {~~
	4192	if (Object.isString(this.lastValue) && Object.isString(value) ?
	4193	this.lastValue != value : String(this.lastValue) != String(value)) {
		this.callback(this.element, value);
		this.lastValue = value;
		}
		}
1300		}
	4198	});

1302		~~Form.Element.Observer = Class.create();~~
1303		~~Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {~~
	4200	Form.Element.Observer = Class.create(Abstract.TimedObserver, {
		getValue: function() {
		return Form.Element.getValue(this.element);
		}
		});

1309		~~Form.Observer = Class.create();~~
1310		~~Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {~~
	4206	Form.Observer = Class.create(Abstract.TimedObserver, {
		getValue: function() {
		return Form.serialize(this.element);
		}
...	...

		/--------------------------------------------------------------------------/

1318		~~Abstract.EventObserver = function() {}~~
1319		~~Abstract.EventObserver.prototype = {~~
	4214	Abstract.EventObserver = Class.create({
		initialize: function(element, callback) {
		this.element = $(element);
		this.callback = callback;
...	...
		},

		registerFormCallbacks: function() {
1340		~~var elements = Form.getElements(this.element);~~
1341		~~for (var i = 0; i < elements.length; i++)~~
1342		~~this.registerCallback(elements[i]);~~
	4235	Form.getElements(this.element).each(this.registerCallback, this);
		},

		registerCallback: function(element) {
...	...
		switch (element.type.toLowerCase()) {
		case 'checkbox':
		case 'radio':
1350		~~element.target = this;~~
1351		~~element.prev_onclick = element.onclick \|\| Prototype.emptyFunction;~~
1352		~~element.onclick = function() {~~
1353		~~this.prev_onclick();~~
1354		~~this.target.onElementEvent();~~
1355		}
	4243	Event.observe(element, 'click', this.onElementEvent.bind(this));
		break;
1357		~~case 'password':~~
1358		~~case 'text':~~
1359		~~case 'textarea':~~
1360		~~case 'select-one':~~
1361		~~case 'select-multiple':~~
1362		~~element.target = this;~~
1363		~~element.prev_onchange = element.onchange \|\| Prototype.emptyFunction;~~
1364		~~element.onchange = function() {~~
1365		~~this.prev_onchange();~~
1366		~~this.target.onElementEvent();~~
1367		}
	4245	default:
	4246	Event.observe(element, 'change', this.onElementEvent.bind(this));
		break;
		}
		}
		}
1372		}
	4251	});

1374		~~Form.Element.EventObserver = Class.create();~~
1375		~~Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {~~
	4253	Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
		getValue: function() {
		return Form.Element.getValue(this.element);
		}
		});

1381		~~Form.EventObserver = Class.create();~~
1382		~~Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {~~
	4259	Form.EventObserver = Class.create(Abstract.EventObserver, {
		getValue: function() {
		return Form.serialize(this.element);
		}
		});
1387		~~if (!window.Event) {~~
1388		~~var Event = new Object();~~
1389		}
	4264	(function() {

1391		~~Object.extend(Event, {~~
1392		~~KEY_BACKSPACE: 8,~~
1393		~~KEY_TAB: 9,~~
1394		~~KEY_RETURN: 13,~~
1395		~~KEY_ESC: 27,~~
1396		~~KEY_LEFT: 37,~~
1397		~~KEY_UP: 38,~~
1398		~~KEY_RIGHT: 39,~~
1399		~~KEY_DOWN: 40,~~
1400		~~KEY_DELETE: 46,~~
	4266	var Event = {
	4267	KEY_BACKSPACE: 8,
	4268	KEY_TAB: 9,
	4269	KEY_RETURN: 13,
	4270	KEY_ESC: 27,
	4271	KEY_LEFT: 37,
	4272	KEY_UP: 38,
	4273	KEY_RIGHT: 39,
	4274	KEY_DOWN: 40,
	4275	KEY_DELETE: 46,
	4276	KEY_HOME: 36,
	4277	KEY_END: 35,
	4278	KEY_PAGEUP: 33,
	4279	KEY_PAGEDOWN: 34,
	4280	KEY_INSERT: 45,

1402		~~element: function(event) {~~
1403		~~return event.target \|\| event.srcElement;~~
1404		},
	4282	cache: {}
	4283	};

1406		~~isLeftClick: function(event) {~~
1407		~~return (((event.which) && (event.which == 1)) \|\|~~
1408		~~((event.button) && (event.button == 1)));~~
1409		},
	4285	var docEl = document.documentElement;
	4286	var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl
	4287	&& 'onmouseleave' in docEl;

1411		~~pointerX: function(event) {~~
	4289	var _isButton;
	4290	if (Prototype.Browser.IE) {
	4291	var buttonMap = { 0: 1, 1: 4, 2: 2 };
	4292	_isButton = function(event, code) {
	4293	return event.button === buttonMap[code];
	4294	};
	4295	} else if (Prototype.Browser.WebKit) {
	4296	_isButton = function(event, code) {
	4297	switch (code) {
	4298	case 0: return event.which == 1 && !event.metaKey;
	4299	case 1: return event.which == 1 && event.metaKey;
	4300	default: return false;
	4301	}
	4302	};
	4303	} else {
	4304	_isButton = function(event, code) {
	4305	return event.which ? (event.which === code + 1) : (event.button === code);
	4306	};
	4307	}
	4308
	4309	function isLeftClick(event) { return _isButton(event, 0) }
	4310
	4311	function isMiddleClick(event) { return _isButton(event, 1) }
	4312
	4313	function isRightClick(event) { return _isButton(event, 2) }
	4314
	4315	function element(event) {
	4316	event = Event.extend(event);
	4317
	4318	var node = event.target, type = event.type,
	4319	currentTarget = event.currentTarget;
	4320
	4321	if (currentTarget && currentTarget.tagName) {
	4322	if (type === 'load' \|\| type === 'error' \|\|
	4323	(type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
	4324	&& currentTarget.type === 'radio'))
	4325	node = currentTarget;
	4326	}
	4327
	4328	if (node.nodeType == Node.TEXT_NODE)
	4329	node = node.parentNode;
	4330
	4331	return Element.extend(node);
	4332	}
	4333
	4334	function findElement(event, expression) {
	4335	var element = Event.element(event);
	4336	if (!expression) return element;
	4337	var elements = [element].concat(element.ancestors());
	4338	return Selector.findElement(elements, expression, 0);
	4339	}
	4340
	4341	function pointer(event) {
	4342	return { x: pointerX(event), y: pointerY(event) };
	4343	}
	4344
	4345	function pointerX(event) {
	4346	var docElement = document.documentElement,
	4347	body = document.body \|\| { scrollLeft: 0 };
	4348
		return event.pageX \|\| (event.clientX +
1413		~~(document.documentElement.scrollLeft \|\| document.body.scrollLeft));~~
1414		},
	4350	(docElement.scrollLeft \|\| body.scrollLeft) -
	4351	(docElement.clientLeft \|\| 0));
	4352	}

1416		~~pointerY: function(event) {~~
1417		~~return event.pageY \|\| (event.clientY +~~
1418		~~(document.documentElement.scrollTop \|\| document.body.scrollTop));~~
1419		},
	4354	function pointerY(event) {
	4355	var docElement = document.documentElement,
	4356	body = document.body \|\| { scrollTop: 0 };

1421		~~stop: function(event) {~~
1422		~~if (event.preventDefault) {~~
1423		~~event.preventDefault();~~
1424		~~event.stopPropagation();~~
	4358	return event.pageY \|\| (event.clientY +
	4359	(docElement.scrollTop \|\| body.scrollTop) -
	4360	(docElement.clientTop \|\| 0));
	4361	}
	4362
	4363
	4364	function stop(event) {
	4365	Event.extend(event);
	4366	event.preventDefault();
	4367	event.stopPropagation();
	4368
	4369	event.stopped = true;
	4370	}
	4371
	4372	Event.Methods = {
	4373	isLeftClick: isLeftClick,
	4374	isMiddleClick: isMiddleClick,
	4375	isRightClick: isRightClick,
	4376
	4377	element: element,
	4378	findElement: findElement,
	4379
	4380	pointer: pointer,
	4381	pointerX: pointerX,
	4382	pointerY: pointerY,
	4383
	4384	stop: stop
	4385	};
	4386
	4387
	4388	var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
	4389	m[name] = Event.Methods[name].methodize();
	4390	return m;
	4391	});
	4392
	4393	if (Prototype.Browser.IE) {
	4394	function _relatedTarget(event) {
	4395	var element;
	4396	switch (event.type) {
	4397	case 'mouseover': element = event.fromElement; break;
	4398	case 'mouseout': element = event.toElement; break;
	4399	default: return null;
	4400	}
	4401	return Element.extend(element);
	4402	}
	4403
	4404	Object.extend(methods, {
	4405	stopPropagation: function() { this.cancelBubble = true },
	4406	preventDefault: function() { this.returnValue = false },
	4407	inspect: function() { return '[object Event]' }
	4408	});
	4409
	4410	Event.extend = function(event, element) {
	4411	if (!event) return false;
	4412	if (event._extendedByPrototype) return event;
	4413
	4414	event._extendedByPrototype = Prototype.emptyFunction;
	4415	var pointer = Event.pointer(event);
	4416
	4417	Object.extend(event, {
	4418	target: event.srcElement \|\| element,
	4419	relatedTarget: _relatedTarget(event),
	4420	pageX: pointer.x,
	4421	pageY: pointer.y
	4422	});
	4423
	4424	return Object.extend(event, methods);
	4425	};
	4426	} else {
	4427	Event.prototype = window.Event.prototype \|\| document.createEvent('HTMLEvents').__proto__;
	4428	Object.extend(Event.prototype, methods);
	4429	Event.extend = Prototype.K;
	4430	}
	4431
	4432	function _createResponder(element, eventName, handler) {
	4433	var registry = Element.retrieve(element, 'prototype_event_registry');
	4434
	4435	if (Object.isUndefined(registry)) {
	4436	CACHE.push(element);
	4437	registry = Element.retrieve(element, 'prototype_event_registry', $H());
	4438	}
	4439
	4440	var respondersForEvent = registry.get(eventName);
	4441	if (Object.isUndefined(respondersForEvent)) {
	4442	respondersForEvent = [];
	4443	registry.set(eventName, respondersForEvent);
	4444	}
	4445
	4446	if (respondersForEvent.pluck('handler').include(handler)) return false;
	4447
	4448	var responder;
	4449	if (eventName.include(":")) {
	4450	responder = function(event) {
	4451	if (Object.isUndefined(event.eventName))
	4452	return false;
	4453
	4454	if (event.eventName !== eventName)
	4455	return false;
	4456
	4457	Event.extend(event, element);
	4458	handler.call(element, event);
	4459	};
		} else {
1426		~~event.returnValue = false;~~
1427		~~event.cancelBubble = true;~~
	4461	if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED &&
	4462	(eventName === "mouseenter" \|\| eventName === "mouseleave")) {
	4463	if (eventName === "mouseenter" \|\| eventName === "mouseleave") {
	4464	responder = function(event) {
	4465	Event.extend(event, element);
	4466
	4467	var parent = event.relatedTarget;
	4468	while (parent && parent !== element) {
	4469	try { parent = parent.parentNode; }
	4470	catch(e) { parent = element; }
	4471	}
	4472
	4473	if (parent === element) return;
	4474
	4475	handler.call(element, event);
	4476	};
	4477	}
	4478	} else {
	4479	responder = function(event) {
	4480	Event.extend(event, element);
	4481	handler.call(element, event);
	4482	};
	4483	}
		}
1429		},

1431		~~// find the first node with the given tagName, starting from the~~
1432		~~// node the event was triggered on; traverses the DOM upwards~~
1433		~~findElement: function(event, tagName) {~~
1434		~~var element = Event.element(event);~~
1435		~~while (element.parentNode && (!element.tagName \|\|~~
1436		~~(element.tagName.toUpperCase() != tagName.toUpperCase())))~~
1437		~~element = element.parentNode;~~
	4486	responder.handler = handler;
	4487	respondersForEvent.push(responder);
	4488	return responder;
	4489	}
	4490
	4491	function _destroyCache() {
	4492	for (var i = 0, length = CACHE.length; i < length; i++) {
	4493	Event.stopObserving(CACHE[i]);
	4494	CACHE[i] = null;
	4495	}
	4496	}
	4497
	4498	var CACHE = [];
	4499
	4500	if (Prototype.Browser.IE)
	4501	window.attachEvent('onunload', _destroyCache);
	4502
	4503	if (Prototype.Browser.WebKit)
	4504	window.addEventListener('unload', Prototype.emptyFunction, false);
	4505
	4506
	4507	var _getDOMEventName = Prototype.K;
	4508
	4509	if (!MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED) {
	4510	_getDOMEventName = function(eventName) {
	4511	var translations = { mouseenter: "mouseover", mouseleave: "mouseout" };
	4512	return eventName in translations ? translations[eventName] : eventName;
	4513	};
	4514	}
	4515
	4516	function observe(element, eventName, handler) {
	4517	element = $(element);
	4518
	4519	var responder = _createResponder(element, eventName, handler);
	4520
	4521	if (!responder) return element;
	4522
	4523	if (eventName.include(':')) {
	4524	if (element.addEventListener)
	4525	element.addEventListener("dataavailable", responder, false);
	4526	else {
	4527	element.attachEvent("ondataavailable", responder);
	4528	element.attachEvent("onfilterchange", responder);
	4529	}
	4530	} else {
	4531	var actualEventName = _getDOMEventName(eventName);
	4532
	4533	if (element.addEventListener)
	4534	element.addEventListener(actualEventName, responder, false);
	4535	else
	4536	element.attachEvent("on" + actualEventName, responder);
	4537	}
	4538
		return element;
1439		},
	4540	}

1441		~~observers: false,~~
	4542	function stopObserving(element, eventName, handler) {
	4543	element = $(element);

1443		~~_observeAndCache: function(element, name, observer, useCapture) {~~
1444		~~if (!this.observers) this.observers = [];~~
1445		~~if (element.addEventListener) {~~
1446		~~this.observers.push([element, name, observer, useCapture]);~~
1447		~~element.addEventListener(name, observer, useCapture);~~
1448		~~} else if (element.attachEvent) {~~
1449		~~this.observers.push([element, name, observer, useCapture]);~~
1450		~~element.attachEvent('on' + name, observer);~~
	4545	var registry = Element.retrieve(element, 'prototype_event_registry');
	4546
	4547	if (Object.isUndefined(registry)) return element;
	4548
	4549	if (eventName && !handler) {
	4550	var responders = registry.get(eventName);
	4551
	4552	if (Object.isUndefined(responders)) return element;
	4553
	4554	responders.each( function(r) {
	4555	Element.stopObserving(element, eventName, r.handler);
	4556	});
	4557	return element;
	4558	} else if (!eventName) {
	4559	registry.each( function(pair) {
	4560	var eventName = pair.key, responders = pair.value;
	4561
	4562	responders.each( function(r) {
	4563	Element.stopObserving(element, eventName, r.handler);
	4564	});
	4565	});
	4566	return element;
		}
1452		},

1454		~~unloadCache: function() {~~
1455		~~if (!Event.observers) return;~~
1456		~~for (var i = 0; i < Event.observers.length; i++) {~~
1457		~~Event.stopObserving.apply(this, Event.observers[i]);~~
1458		~~Event.observers[i][0] = null;~~
	4569	var responders = registry.get(eventName);
	4570
	4571	if (!responders) return;
	4572
	4573	var responder = responders.find( function(r) { return r.handler === handler; });
	4574	if (!responder) return element;
	4575
	4576	var actualEventName = _getDOMEventName(eventName);
	4577
	4578	if (eventName.include(':')) {
	4579	if (element.removeEventListener)
	4580	element.removeEventListener("dataavailable", responder, false);
	4581	else {
	4582	element.detachEvent("ondataavailable", responder);
	4583	element.detachEvent("onfilterchange", responder);
	4584	}
	4585	} else {
	4586	if (element.removeEventListener)
	4587	element.removeEventListener(actualEventName, responder, false);
	4588	else
	4589	element.detachEvent('on' + actualEventName, responder);
		}
1460		~~Event.observers = false;~~
1461		},

1463		~~observe: function(element, name, observer, useCapture) {~~
1464		~~var element = $(element);~~
1465		~~useCapture = useCapture \|\| false;~~
	4592	registry.set(eventName, responders.without(responder));

1467		~~if (name == 'keypress' &&~~
1468		~~(navigator.appVersion.match(/Konqueror\|Safari\|KHTML/)~~
1469		~~\|\| element.attachEvent))~~
1470		~~name = 'keydown';~~
	4594	return element;
	4595	}

1472		~~this._observeAndCache(element, name, observer, useCapture);~~
1473		},
	4597	function fire(element, eventName, memo, bubble) {
	4598	element = $(element);

1475		~~stopObserving: function(element, name, observer, useCapture) {~~
1476		~~var element = $(element);~~
1477		~~useCapture = useCapture \|\| false;~~
	4600	if (Object.isUndefined(bubble))
	4601	bubble = true;

1479		~~if (name == 'keypress' &&~~
1480		~~(navigator.appVersion.match(/Konqueror\|Safari\|KHTML/)~~
1481		~~\|\| element.detachEvent))~~
1482		~~name = 'keydown';~~
	4603	if (element == document && document.createEvent && !element.dispatchEvent)
	4604	element = document.documentElement;

1484		~~if (element.removeEventListener) {~~
1485		~~element.removeEventListener(name, observer, useCapture);~~
1486		~~} else if (element.detachEvent) {~~
1487		~~element.detachEvent('on' + name, observer);~~
	4606	var event;
	4607	if (document.createEvent) {
	4608	event = document.createEvent('HTMLEvents');
	4609	event.initEvent('dataavailable', true, true);
	4610	} else {
	4611	event = document.createEventObject();
	4612	event.eventType = bubble ? 'ondataavailable' : 'onfilterchange';
		}
	4614
	4615	event.eventName = eventName;
	4616	event.memo = memo \|\| { };
	4617
	4618	if (document.createEvent)
	4619	element.dispatchEvent(event);
	4620	else
	4621	element.fireEvent(event.eventType, event);
	4622
	4623	return Event.extend(event);
		}
1490		~~});~~

1492		~~/* prevent memory leaks in IE */~~
1493		~~Event.observe(window, 'unload', Event.unloadCache, false);~~
	4626
	4627	Object.extend(Event, Event.Methods);
	4628
	4629	Object.extend(Event, {
	4630	fire: fire,
	4631	observe: observe,
	4632	stopObserving: stopObserving
	4633	});
	4634
	4635	Element.addMethods({
	4636	fire: fire,
	4637
	4638	observe: observe,
	4639
	4640	stopObserving: stopObserving
	4641	});
	4642
	4643	Object.extend(document, {
	4644	fire: fire.methodize(),
	4645
	4646	observe: observe.methodize(),
	4647
	4648	stopObserving: stopObserving.methodize(),
	4649
	4650	loaded: false
	4651	});
	4652
	4653	if (window.Event) Object.extend(window.Event, Event);
	4654	else window.Event = Event;
	4655	})();
	4656
	4657	(function() {
	4658	/* Support for the DOMContentLoaded event is based on work by Dan Webb,
	4659	Matthias Miller, Dean Edwards, John Resig, and Diego Perini. */
	4660
	4661	var timer;
	4662
	4663	function fireContentLoadedEvent() {
	4664	if (document.loaded) return;
	4665	if (timer) window.clearTimeout(timer);
	4666	document.loaded = true;
	4667	document.fire('dom:loaded');
	4668	}
	4669
	4670	function checkReadyState() {
	4671	if (document.readyState === 'complete') {
	4672	document.stopObserving('readystatechange', checkReadyState);
	4673	fireContentLoadedEvent();
	4674	}
	4675	}
	4676
	4677	function pollDoScroll() {
	4678	try { document.documentElement.doScroll('left'); }
	4679	catch(e) {
	4680	timer = pollDoScroll.defer();
	4681	return;
	4682	}
	4683	fireContentLoadedEvent();
	4684	}
	4685
	4686	if (document.addEventListener) {
	4687	document.addEventListener('DOMContentLoaded', fireContentLoadedEvent, false);
	4688	} else {
	4689	document.observe('readystatechange', checkReadyState);
	4690	if (window == top)
	4691	timer = pollDoScroll.defer();
	4692	}
	4693
	4694	Event.observe(window, 'load', fireContentLoadedEvent);
	4695	})();
	4696
	4697	Element.addMethods();
	4698
	4699	/------------------------------- DEPRECATED -------------------------------/
	4700
	4701	Hash.toQueryString = Object.toQueryString;
	4702
	4703	var Toggle = { display: Element.toggle };
	4704
	4705	Element.Methods.childOf = Element.Methods.descendantOf;
	4706
	4707	var Insertion = {
	4708	Before: function(element, content) {
	4709	return Element.insert(element, {before:content});
	4710	},
	4711
	4712	Top: function(element, content) {
	4713	return Element.insert(element, {top:content});
	4714	},
	4715
	4716	Bottom: function(element, content) {
	4717	return Element.insert(element, {bottom:content});
	4718	},
	4719
	4720	After: function(element, content) {
	4721	return Element.insert(element, {after:content});
	4722	}
	4723	};
	4724
	4725	var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
	4726
		var Position = {
1495		~~// set to true if needed, warning: firefox performance problems~~
1496		~~// NOT neeeded for page scrolling, only if draggable contained in~~
1497		~~// scrollable elements~~
		includeScrollOffsets: false,

1500		~~// must be called before calling withinIncludingScrolloffset, every time the~~
1501		~~// page is scrolled~~
		prepare: function() {
		this.deltaX = window.pageXOffset
		\|\| document.documentElement.scrollLeft
...	...
		\|\| 0;
		},

1513		~~realOffset: function(element) {~~
1514		~~var valueT = 0, valueL = 0;~~
1515		~~do {~~
1516		~~valueT += element.scrollTop \|\| 0;~~
1517		~~valueL += element.scrollLeft \|\| 0;~~
1518		~~element = element.parentNode;~~
1519		~~} while (element);~~
1520		~~return [valueL, valueT];~~
1521		},
1522
1523		~~cumulativeOffset: function(element) {~~
1524		~~var valueT = 0, valueL = 0;~~
1525		~~do {~~
1526		~~valueT += element.offsetTop \|\| 0;~~
1527		~~valueL += element.offsetLeft \|\| 0;~~
1528		~~element = element.offsetParent;~~
1529		~~} while (element);~~
1530		~~return [valueL, valueT];~~
1531		},
1532
1533		~~positionedOffset: function(element) {~~
1534		~~var valueT = 0, valueL = 0;~~
1535		~~do {~~
1536		~~valueT += element.offsetTop \|\| 0;~~
1537		~~valueL += element.offsetLeft \|\| 0;~~
1538		~~element = element.offsetParent;~~
1539		~~if (element) {~~
1540		~~p = Element.getStyle(element, 'position');~~
1541		~~if (p == 'relative' \|\| p == 'absolute') break;~~
1542		}
1543		~~} while (element);~~
1544		~~return [valueL, valueT];~~
1545		},
1546
1547		~~offsetParent: function(element) {~~
1548		~~if (element.offsetParent) return element.offsetParent;~~
1549		~~if (element == document.body) return element;~~
1550
1551		~~while ((element = element.parentNode) && element != document.body)~~
1552		~~if (Element.getStyle(element, 'position') != 'static')~~
1553		~~return element;~~
1554
1555		~~return document.body;~~
1556		},
1557
1558		~~// caches x/y coordinate pair to use with overlap~~
		within: function(element, x, y) {
		if (this.includeScrollOffsets)
		return this.withinIncludingScrolloffsets(element, x, y);
		this.xcomp = x;
		this.ycomp = y;
1564		~~this.offset = this.cumulativeOffset(element);~~
	4746	this.offset = Element.cumulativeOffset(element);

		return (y >= this.offset[1] &&
		y < this.offset[1] + element.offsetHeight &&
...	...
		},

		withinIncludingScrolloffsets: function(element, x, y) {
1573		~~var offsetcache = this.realOffset(element);~~
	4755	var offsetcache = Element.cumulativeScrollOffset(element);

		this.xcomp = x + offsetcache[0] - this.deltaX;
		this.ycomp = y + offsetcache[1] - this.deltaY;
1577		~~this.offset = this.cumulativeOffset(element);~~
	4759	this.offset = Element.cumulativeOffset(element);

		return (this.ycomp >= this.offset[1] &&
		this.ycomp < this.offset[1] + element.offsetHeight &&
...	...
		this.xcomp < this.offset[0] + element.offsetWidth);
		},

1585		~~// within must be called directly before~~
		overlap: function(mode, element) {
		if (!mode) return 0;
		if (mode == 'vertical')
...	...
		element.offsetWidth;
		},

1596		~~clone: function(source, target) {~~
1597		~~source = $(source);~~
1598		~~target = $(target);~~
1599		~~target.style.position = 'absolute';~~
1600		~~var offsets = this.cumulativeOffset(source);~~
1601		~~target.style.top = offsets[1] + 'px';~~
1602		~~target.style.left = offsets[0] + 'px';~~
1603		~~target.style.width = source.offsetWidth + 'px';~~
1604		~~target.style.height = source.offsetHeight + 'px';~~
	4777
	4778	cumulativeOffset: Element.Methods.cumulativeOffset,
	4779
	4780	positionedOffset: Element.Methods.positionedOffset,
	4781
	4782	absolutize: function(element) {
	4783	Position.prepare();
	4784	return Element.absolutize(element);
		},

1607		~~page: function(forElement) {~~
1608		~~var valueT = 0, valueL = 0;~~
	4787	relativize: function(element) {
	4788	Position.prepare();
	4789	return Element.relativize(element);
	4790	},

1610		~~var element = forElement;~~
1611		~~do {~~
1612		~~valueT += element.offsetTop \|\| 0;~~
1613		~~valueL += element.offsetLeft \|\| 0;~~
	4792	realOffset: Element.Methods.cumulativeScrollOffset,

1615		~~// Safari fix~~
1616		~~if (element.offsetParent==document.body)~~
1617		~~if (Element.getStyle(element,'position')=='absolute') break;~~
	4794	offsetParent: Element.Methods.getOffsetParent,

1619		~~} while (element = element.offsetParent);~~
	4796	page: Element.Methods.viewportOffset,

1621		~~element = forElement;~~
1622		~~do {~~
1623		~~valueT -= element.scrollTop \|\| 0;~~
1624		~~valueL -= element.scrollLeft \|\| 0;~~
1625		~~} while (element = element.parentNode);~~
	4798	clone: function(source, target, options) {
	4799	options = options \|\| { };
	4800	return Element.clonePosition(target, source, options);
	4801	}
	4802	};

1627		~~return [valueL, valueT];~~
1628		},
	4804	/--------------------------------------------------------------------------/

1630		~~clone: function(source, target) {~~
1631		~~var options = Object.extend({~~
1632		~~setLeft: true,~~
1633		~~setTop: true,~~
1634		~~setWidth: true,~~
1635		~~setHeight: true,~~
1636		~~offsetTop: 0,~~
1637		~~offsetLeft: 0~~
1638		~~}, arguments[2] \|\| {})~~
	4806	if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
	4807	function iter(name) {
	4808	return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
	4809	}

1640		~~// find page position of source~~
1641		~~source = $(source);~~
1642		~~var p = Position.page(source);~~
	4811	instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
	4812	function(element, className) {
	4813	className = className.toString().strip();
	4814	var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
	4815	return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
	4816	} : function(element, className) {
	4817	className = className.toString().strip();
	4818	var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
	4819	if (!classNames && !className) return elements;

1644		~~// find coordinate system to use~~
1645		~~target = $(target);~~
1646		~~var delta = [0, 0];~~
1647		~~var parent = null;~~
1648		~~// delta [0,0] will do fine with position: fixed elements,~~
1649		~~// position:absolute needs offsetParent deltas~~
1650		~~if (Element.getStyle(target,'position') == 'absolute') {~~
1651		~~parent = Position.offsetParent(target);~~
1652		~~delta = Position.page(parent);~~
1653		}
	4821	var nodes = $(element).getElementsByTagName('*');
	4822	className = ' ' + className + ' ';

1655		~~// correct by body offsets (fixes Safari)~~
1656		~~if (parent == document.body) {~~
1657		~~delta[0] -= document.body.offsetLeft;~~
1658		~~delta[1] -= document.body.offsetTop;~~
	4824	for (var i = 0, child, cn; child = nodes[i]; i++) {
	4825	if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) \|\|
	4826	(classNames && classNames.all(function(name) {
	4827	return !name.toString().blank() && cn.include(' ' + name + ' ');
	4828	}))))
	4829	elements.push(Element.extend(child));
		}
	4831	return elements;
	4832	};

1661		~~// set position~~
1662		~~if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px';~~
1663		~~if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px';~~
1664		~~if(options.setWidth) target.style.width = source.offsetWidth + 'px';~~
1665		~~if(options.setHeight) target.style.height = source.offsetHeight + 'px';~~
1666		},
	4834	return function(className, parentElement) {
	4835	return $(parentElement \|\| document.body).getElementsByClassName(className);
	4836	};
	4837	}(Element.Methods);

1668		~~absolutize: function(element) {~~
1669		~~element = $(element);~~
1670		~~if (element.style.position == 'absolute') return;~~
1671		~~Position.prepare();~~
	4839	/--------------------------------------------------------------------------/

1673		~~var offsets = Position.positionedOffset(element);~~
1674		~~var top = offsets[1];~~
1675		~~var left = offsets[0];~~
1676		~~var width = element.clientWidth;~~
1677		~~var height = element.clientHeight;~~
	4841	Element.ClassNames = Class.create();
	4842	Element.ClassNames.prototype = {
	4843	initialize: function(element) {
	4844	this.element = $(element);
	4845	},

1679		~~element._originalLeft = left - parseFloat(element.style.left \|\| 0);~~
1680		~~element._originalTop = top - parseFloat(element.style.top \|\| 0);~~
1681		~~element._originalWidth = element.style.width;~~
1682		~~element._originalHeight = element.style.height;~~
	4847	_each: function(iterator) {
	4848	this.element.className.split(/\s+/).select(function(name) {
	4849	return name.length > 0;
	4850	})._each(iterator);
	4851	},

1684		~~element.style.position = 'absolute';~~
1685		~~element.style.top = top + 'px';;~~
1686		~~element.style.left = left + 'px';;~~
1687		~~element.style.width = width + 'px';;~~
1688		~~element.style.height = height + 'px';;~~
	4853	set: function(className) {
	4854	this.element.className = className;
		},

1691		~~relativize: function(element) {~~
1692		~~element = $(element);~~
1693		~~if (element.style.position == 'relative') return;~~
1694		~~Position.prepare();~~
	4857	add: function(classNameToAdd) {
	4858	if (this.include(classNameToAdd)) return;
	4859	this.set($A(this).concat(classNameToAdd).join(' '));
	4860	},

1696		~~element.style.position = 'relative';~~
1697		~~var top = parseFloat(element.style.top \|\| 0) - (element._originalTop \|\| 0);~~
1698		~~var left = parseFloat(element.style.left \|\| 0) - (element._originalLeft \|\| 0);~~
	4862	remove: function(classNameToRemove) {
	4863	if (!this.include(classNameToRemove)) return;
	4864	this.set($A(this).without(classNameToRemove).join(' '));
	4865	},

1700		~~element.style.top = top + 'px';~~
1701		~~element.style.left = left + 'px';~~
1702		~~element.style.height = element._originalHeight;~~
1703		~~element.style.width = element._originalWidth;~~
	4867	toString: function() {
	4868	return $A(this).join(' ');
		}
1705		}
	4870	};

1707		~~// Safari returns margins on body which is incorrect if the child is absolutely~~
1708		~~// positioned. For performance reasons, redefine Position.cumulativeOffset for~~
1709		~~// KHTML/WebKit only.~~
1710		~~if (/Konqueror\|Safari\|KHTML/.test(navigator.userAgent)) {~~
1711		~~Position.cumulativeOffset = function(element) {~~
1712		~~var valueT = 0, valueL = 0;~~
1713		~~do {~~
1714		~~valueT += element.offsetTop \|\| 0;~~
1715		~~valueL += element.offsetLeft \|\| 0;~~
1716		~~if (element.offsetParent == document.body)~~
1717		~~if (Element.getStyle(element, 'position') == 'absolute') break;~~
	4872	Object.extend(Element.ClassNames.prototype, Enumerable);

1719		~~element = element.offsetParent;~~
1720		~~} while (element);~~
1721
1722		~~return [valueL, valueT];~~
1723		}
1724		}

	4875	/--------------------------------------------------------------------------/

rool/rails/instiki/trunk/public/javascripts/scriptaculous.js:

prev.	current

1		~~// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)~~
2		//
	1	// script.aculo.us scriptaculous.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
	2
	3	// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
	4	//
		// Permission is hereby granted, free of charge, to any person obtaining
		// a copy of this software and associated documentation files (the
		// "Software"), to deal in the Software without restriction, including
...	...
		// distribute, sublicense, and/or sell copies of the Software, and to
		// permit persons to whom the Software is furnished to do so, subject to
		// the following conditions:
10		//
	12	//
		// The above copyright notice and this permission notice shall be
		// included in all copies or substantial portions of the Software.
		//
...	...
		// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
		// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
		// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	23	//
	24	// For details, see the script.aculo.us web site: http://script.aculo.us/

		var Scriptaculous = {
23		~~Version: '1.5_rc3',~~
	27	Version: '1.8.3',
		require: function(libraryName) {
25		~~// inserting via DOM fails in Safari 2.0, so brute force approach~~
26		~~document.write('<script type="text/javascript" src="'+libraryName+'"></script>');~~
	29	try{
	30	// inserting via DOM fails in Safari 2.0, so brute force approach
	31	document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
	32	} catch(e) {
	33	// for xhtml+xml served content, fall back to DOM methods
	34	var script = document.createElement('script');
	35	script.type = 'text/javascript';
	36	script.src = libraryName;
	37	document.getElementsByTagName('head')[0].appendChild(script);
	38	}
		},
	40	REQUIRED_PROTOTYPE: '1.6.0.3',
		load: function() {
	42	function convertVersionString(versionString) {
	43	var v = versionString.replace(/_.*\|\./g, '');
	44	v = parseInt(v + '0'.times(4-v.length));
	45	return versionString.indexOf('_') > -1 ? v-1 : v;
	46	}
	47
		if((typeof Prototype=='undefined') \|\|
30		~~parseFloat(Prototype.Version.split(".")[0] + "." +~~
31		~~Prototype.Version.split(".")[1]) < 1.4)~~
32		~~throw("script.aculo.us requires the Prototype JavaScript framework >= 1.4.0");~~
33		~~var scriptTags = document.getElementsByTagName("script");~~
34		~~for(var i=0;i<scriptTags.length;i++) {~~
35		~~if(scriptTags[i].src && scriptTags[i].src.match(/scriptaculous\.js(\?.*)?$/)) {~~
36		~~var path = scriptTags[i].src.replace(/scriptaculous\.js(\?.*)?$/,'');~~
37		~~this.require(path + 'effects.js');~~
38		~~this.require(path + 'dragdrop.js');~~
39		~~this.require(path + 'controls.js');~~
40		~~this.require(path + 'slider.js');~~
41		~~break;~~
42		}
43		}
	49	(typeof Element == 'undefined') \|\|
	50	(typeof Element.Methods=='undefined') \|\|
	51	(convertVersionString(Prototype.Version) <
	52	convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
	53	throw("script.aculo.us requires the Prototype JavaScript framework >= " +
	54	Scriptaculous.REQUIRED_PROTOTYPE);
	55
	56	var js = /scriptaculous\.js(\?.*)?$/;
	57	$$('head script[src]').findAll(function(s) {
	58	return s.src.match(js);
	59	}).each(function(s) {
	60	var path = s.src.replace(js, ''),
	61	includes = s.src.match(/\?.load=([a-z,])/);
	62	(includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
	63	function(include) { Scriptaculous.require(path+include+'.js') });
	64	});
		}
45		}
	66	};

		Scriptaculous.load();

rool/rails/instiki/trunk/public/javascripts/slider.js:

prev.	current

1		~~// Copyright (c) 2005 Marty Haught~~
2		//
3		~~// See scriptaculous.js for full license.~~
	1	// script.aculo.us slider.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009

5		~~if(!Control) var Control = {};~~
6		~~Control.Slider = Class.create();~~
	3	// Copyright (c) 2005-2009 Marty Haught, Thomas Fuchs
	4	//
	5	// script.aculo.us is freely distributable under the terms of an MIT-style license.
	6	// For details, see the script.aculo.us web site: http://script.aculo.us/

	8	if (!Control) var Control = { };
	9
		// options:
		// axis: 'vertical', or 'horizontal' (default)
10		~~// increment: (default: 1)~~
11		~~// step: (default: 1)~~
		//
		// callbacks:
		// onChange(value)
		// onSlide(value)
16		~~Control.Slider.prototype = {~~
	16	Control.Slider = Class.create({
		initialize: function(handle, track, options) {
18		~~this.handle = $(handle);~~
	18	var slider = this;
	19
	20	if (Object.isArray(handle)) {
	21	this.handles = handle.collect( function(e) { return $(e) });
	22	} else {
	23	this.handles = [$(handle)];
	24	}
	25
		this.track = $(track);
	27	this.options = options \|\| { };

21		~~this.options = options \|\| {};~~
22
		this.axis = this.options.axis \|\| 'horizontal';
		this.increment = this.options.increment \|\| 1;
25		~~this.step = parseInt(this.options.step) \|\| 1;~~
26		~~this.value = 0;~~
	31	this.step = parseInt(this.options.step \|\| '1');
	32	this.range = this.options.range \|\| $R(0,1);

28		~~var defaultMaximum = Math.round(this.track.offsetWidth / this.increment);~~
29		~~if(this.isVertical()) defaultMaximum = Math.round(this.track.offsetHeight / this.increment);~~
30
31		~~this.maximum = this.options.maximum \|\| defaultMaximum;~~
32		~~this.minimum = this.options.minimum \|\| 0;~~
	34	this.value = 0; // assure backwards compat
	35	this.values = this.handles.map( function() { return 0 });
	36	this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
	37	this.options.startSpan = $(this.options.startSpan \|\| null);
	38	this.options.endSpan = $(this.options.endSpan \|\| null);

34		~~// Will be used to align the handle onto the track, if necessary~~
35		~~this.alignX = parseInt (this.options.alignX) \|\| 0;~~
36		~~this.alignY = parseInt (this.options.alignY) \|\| 0;~~
	40	this.restricted = this.options.restricted \|\| false;

38		~~// Zero out the slider position~~
39		~~this.setCurrentLeft(Position.cumulativeOffset(this.track)[0] - Position.cumulativeOffset(this.handle)[0] + this.alignX);~~
40		~~this.setCurrentTop(this.trackTop() - Position.cumulativeOffset(this.handle)[1] + this.alignY);~~
	42	this.maximum = this.options.maximum \|\| this.range.end;
	43	this.minimum = this.options.minimum \|\| this.range.start;

42		~~this.offsetX = 0;~~
43		~~this.offsetY = 0;~~
	45	// Will be used to align the handle onto the track, if necessary
	46	this.alignX = parseInt(this.options.alignX \|\| '0');
	47	this.alignY = parseInt(this.options.alignY \|\| '0');

45		~~this.originalLeft = this.currentLeft();~~
46		~~this.originalTop = this.currentTop();~~
47		~~this.originalZ = parseInt(this.handle.style.zIndex \|\| "0");~~
	49	this.trackLength = this.maximumOffset() - this.minimumOffset();

49		~~// Prepopulate Slider value~~
50		~~this.setSliderValue(parseInt(this.options.sliderValue) \|\| 0);~~
	51	this.handleLength = this.isVertical() ?
	52	(this.handles[0].offsetHeight != 0 ?
	53	this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
	54	(this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
	55	this.handles[0].style.width.replace(/px$/,""));

		this.active = false;
		this.dragging = false;
		this.disabled = false;

56		~~// FIXME: use css~~
57		~~this.handleImage = $(this.options.handleImage) \|\| false;~~
58		~~this.handleDisabled = this.options.handleDisabled \|\| false;~~
59		~~this.handleEnabled = false;~~
60		~~if(this.handleImage)~~
61		~~this.handleEnabled = this.handleImage.src \|\| false;~~
	61	if (this.options.disabled) this.setDisabled();

63		~~if(this.options.disabled)~~
64		~~this.setDisabled();~~
	63	// Allowed values array
	64	this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
	65	if (this.allowedValues) {
	66	this.minimum = this.allowedValues.min();
	67	this.maximum = this.allowedValues.max();
	68	}

66		~~// Value Array~~
67		~~this.values = this.options.values \|\| false; // Add method to validate and sort??~~
68
69		~~Element.makePositioned(this.handle); // fix IE~~
70
		this.eventMouseDown = this.startDrag.bindAsEventListener(this);
		this.eventMouseUp = this.endDrag.bindAsEventListener(this);
		this.eventMouseMove = this.update.bindAsEventListener(this);
74		~~this.eventKeypress = this.keyPress.bindAsEventListener(this);~~

76		~~Event.observe(this.handle, "mousedown", this.eventMouseDown);~~
77		~~Event.observe(document, "mouseup", this.eventMouseUp);~~
78		~~Event.observe(document, "mousemove", this.eventMouseMove);~~
79		~~Event.observe(document, "keypress", this.eventKeypress);~~
	74	// Initialize handles in reverse (make sure first handle is active)
	75	this.handles.each( function(h,i) {
	76	i = slider.handles.length-1-i;
	77	slider.setValue(parseFloat(
	78	(Object.isArray(slider.options.sliderValue) ?
	79	slider.options.sliderValue[i] : slider.options.sliderValue) \|\|
	80	slider.range.start), i);
	81	h.makePositioned().observe("mousedown", slider.eventMouseDown);
	82	});
	83
	84	this.track.observe("mousedown", this.eventMouseDown);
	85	document.observe("mouseup", this.eventMouseUp);
	86	document.observe("mousemove", this.eventMouseMove);
	87
	88	this.initialized = true;
		},
		dispose: function() {
82		~~Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);~~
	91	var slider = this;
	92	Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
		Event.stopObserving(document, "mouseup", this.eventMouseUp);
		Event.stopObserving(document, "mousemove", this.eventMouseMove);
85		~~Event.stopObserving(document, "keypress", this.eventKeypress);~~
	95	this.handles.each( function(h) {
	96	Event.stopObserving(h, "mousedown", slider.eventMouseDown);
	97	});
		},
		setDisabled: function(){
		this.disabled = true;
89		~~if(this.handleDisabled)~~
90		~~this.handleImage.src = this.handleDisabled;~~
		},
		setEnabled: function(){
		this.disabled = false;
94		~~if(this.handleEnabled)~~
95		~~this.handleImage.src = this.handleEnabled;~~
96		},
97		~~currentLeft: function() {~~
98		~~return parseInt(this.handle.style.left \|\| '0');~~
		},
100		~~currentTop: function() {~~
101		~~return parseInt(this.handle.style.top \|\| '0');~~
102		},
103		~~setCurrentLeft: function(left) {~~
104		~~this.handle.style.left = left +"px";~~
105		},
106		~~setCurrentTop: function(top) {~~
107		~~this.handle.style.top = top +"px";~~
108		},
109		~~trackLeft: function(){~~
110		~~return Position.cumulativeOffset(this.track)[0];~~
111		},
112		~~trackTop: function(){~~
113		~~return Position.cumulativeOffset(this.track)[1];~~
114		},
		getNearestValue: function(value){
116		~~if(this.values){~~
117		~~var i = 0;~~
118		~~var offset = Math.abs(this.values[0] - value);~~
119		~~var newValue = this.values[0];~~
	106	if (this.allowedValues){
	107	if (value >= this.allowedValues.max()) return(this.allowedValues.max());
	108	if (value <= this.allowedValues.min()) return(this.allowedValues.min());

121		~~for(i=0; i < this.values.length; i++){~~
122		~~var currentOffset = Math.abs(this.values[i] - value);~~
123		~~if(currentOffset < offset){~~
124		~~newValue = this.values[i];~~
	110	var offset = Math.abs(this.allowedValues[0] - value);
	111	var newValue = this.allowedValues[0];
	112	this.allowedValues.each( function(v) {
	113	var currentOffset = Math.abs(v - value);
	114	if (currentOffset <= offset){
	115	newValue = v;
		offset = currentOffset;
		}
127		}
	118	});
		return newValue;
		}
	121	if (value > this.range.end) return this.range.end;
	122	if (value < this.range.start) return this.range.start;
		return value;
		},
132		~~setSliderValue: function(sliderValue){~~
133		~~// First check our max and minimum and nearest values~~
134		~~sliderValue = this.getNearestValue(sliderValue);~~
135		~~if(sliderValue > this.maximum) sliderValue = this.maximum;~~
136		~~if(sliderValue < this.minimum) sliderValue = this.minimum;~~
137		~~var offsetDiff = (sliderValue - (this.value\|\|this.minimum)) * this.increment;~~
138
139		~~if(this.isVertical()){~~
140		~~this.setCurrentTop(offsetDiff + this.currentTop());~~
141		~~} else {~~
142		~~this.setCurrentLeft(offsetDiff + this.currentLeft());~~
	125	setValue: function(sliderValue, handleIdx){
	126	if (!this.active) {
	127	this.activeHandleIdx = handleIdx \|\| 0;
	128	this.activeHandle = this.handles[this.activeHandleIdx];
	129	this.updateStyles();
		}
144		~~this.value = sliderValue;~~
145		~~this.updateFinished();~~
146		},
	131	handleIdx = handleIdx \|\| this.activeHandleIdx \|\| 0;
	132	if (this.initialized && this.restricted) {
	133	if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
	134	sliderValue = this.values[handleIdx-1];
	135	if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
	136	sliderValue = this.values[handleIdx+1];
	137	}
	138	sliderValue = this.getNearestValue(sliderValue);
	139	this.values[handleIdx] = sliderValue;
	140	this.value = this.values[0]; // assure backwards compat
	141
	142	this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
	143	this.translateToPx(sliderValue);
	144
	145	this.drawSpans();
	146	if (!this.dragging \|\| !this.event) this.updateFinished();
	147	},
	148	setValueBy: function(delta, handleIdx) {
	149	this.setValue(this.values[handleIdx \|\| this.activeHandleIdx \|\| 0] + delta,
	150	handleIdx \|\| this.activeHandleIdx \|\| 0);
	151	},
	152	translateToPx: function(value) {
	153	return Math.round(
	154	((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
	155	(value - this.range.start)) + "px";
	156	},
	157	translateToValue: function(offset) {
	158	return ((offset/(this.trackLength-this.handleLength) *
	159	(this.range.end-this.range.start)) + this.range.start);
	160	},
	161	getRange: function(range) {
	162	var v = this.values.sortBy(Prototype.K);
	163	range = range \|\| 0;
	164	return $R(v[range],v[range+1]);
	165	},
		minimumOffset: function(){
148		~~return(this.isVertical() ?~~
149		~~this.trackTop() + this.alignY :~~
150		~~this.trackLeft() + this.alignX);~~
	167	return(this.isVertical() ? this.alignY : this.alignX);
		},
		maximumOffset: function(){
		return(this.isVertical() ?
154		~~this.trackTop() + this.alignY + (this.maximum - this.minimum) * this.increment :~~
155		~~this.trackLeft() + this.alignX + (this.maximum - this.minimum) * this.increment);~~
156		},
	171	(this.track.offsetHeight != 0 ? this.track.offsetHeight :
	172	this.track.style.height.replace(/px$/,"")) - this.alignY :
	173	(this.track.offsetWidth != 0 ? this.track.offsetWidth :
	174	this.track.style.width.replace(/px$/,"")) - this.alignX);
	175	},
		isVertical: function(){
		return (this.axis == 'vertical');
		},
	179	drawSpans: function() {
	180	var slider = this;
	181	if (this.spans)
	182	$R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
	183	if (this.options.startSpan)
	184	this.setSpan(this.options.startSpan,
	185	$R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
	186	if (this.options.endSpan)
	187	this.setSpan(this.options.endSpan,
	188	$R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
	189	},
	190	setSpan: function(span, range) {
	191	if (this.isVertical()) {
	192	span.style.top = this.translateToPx(range.start);
	193	span.style.height = this.translateToPx(range.end - range.start + this.range.start);
	194	} else {
	195	span.style.left = this.translateToPx(range.start);
	196	span.style.width = this.translateToPx(range.end - range.start + this.range.start);
	197	}
	198	},
	199	updateStyles: function() {
	200	this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
	201	Element.addClassName(this.activeHandle, 'selected');
	202	},
		startDrag: function(event) {
161		~~if(Event.isLeftClick(event)) {~~
162		~~if(!this.disabled){~~
	204	if (Event.isLeftClick(event)) {
	205	if (!this.disabled){
		this.active = true;
164		~~var pointer = [Event.pointerX(event), Event.pointerY(event)];~~
165		~~var offsets = Position.cumulativeOffset(this.handle);~~
166		~~this.offsetX = (pointer[0] - offsets[0]);~~
167		~~this.offsetY = (pointer[1] - offsets[1]);~~
168		~~this.originalLeft = this.currentLeft();~~
169		~~this.originalTop = this.currentTop();~~
	207
	208	var handle = Event.element(event);
	209	var pointer = [Event.pointerX(event), Event.pointerY(event)];
	210	var track = handle;
	211	if (track==this.track) {
	212	var offsets = this.track.cumulativeOffset();
	213	this.event = event;
	214	this.setValue(this.translateToValue(
	215	(this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
	216	));
	217	var offsets = this.activeHandle.cumulativeOffset();
	218	this.offsetX = (pointer[0] - offsets[0]);
	219	this.offsetY = (pointer[1] - offsets[1]);
	220	} else {
	221	// find the handle (prevents issues with Safari)
	222	while((this.handles.indexOf(handle) == -1) && handle.parentNode)
	223	handle = handle.parentNode;
	224
	225	if (this.handles.indexOf(handle)!=-1) {
	226	this.activeHandle = handle;
	227	this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
	228	this.updateStyles();
	229
	230	var offsets = this.activeHandle.cumulativeOffset();
	231	this.offsetX = (pointer[0] - offsets[0]);
	232	this.offsetY = (pointer[1] - offsets[1]);
	233	}
	234	}
		}
		Event.stop(event);
		}
		},
		update: function(event) {
175		~~if(this.active) {~~
176		~~if(!this.dragging) {~~
177		~~var style = this.handle.style;~~
178		~~this.dragging = true;~~
179		~~if(style.position=="") style.position = "relative";~~
180		~~style.zIndex = this.options.zindex;~~
181		}
	240	if (this.active) {
	241	if (!this.dragging) this.dragging = true;
		this.draw(event);
183		~~// fix AppleWebKit rendering~~
184		~~if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);~~
	243	if (Prototype.Browser.WebKit) window.scrollBy(0,0);
		Event.stop(event);
		}
		},
		draw: function(event) {
		var pointer = [Event.pointerX(event), Event.pointerY(event)];
190		~~var offsets = Position.cumulativeOffset(this.handle);~~
191
192		~~offsets[0] -= this.currentLeft();~~
193		~~offsets[1] -= this.currentTop();~~
194
195		~~// Adjust for the pointer's position on the handle~~
196		~~pointer[0] -= this.offsetX;~~
197		~~pointer[1] -= this.offsetY;~~
198		~~var style = this.handle.style;~~
199
200		~~if(this.isVertical()){~~
201		~~if(pointer[1] > this.maximumOffset())~~
202		~~pointer[1] = this.maximumOffset();~~
203		~~if(pointer[1] < this.minimumOffset())~~
204		~~pointer[1] = this.minimumOffset();~~
205
206		~~// Increment by values~~
207		~~if(this.values){~~
208		~~this.value = this.getNearestValue(Math.round((pointer[1] - this.minimumOffset()) / this.increment) + this.minimum);~~
209		~~pointer[1] = this.trackTop() + this.alignY + (this.value - this.minimum) * this.increment;~~
210		~~} else {~~
211		~~this.value = Math.round((pointer[1] - this.minimumOffset()) / this.increment) + this.minimum;~~
212		}
213		~~style.top = pointer[1] - offsets[1] + "px";~~
214		~~} else {~~
215		~~if(pointer[0] > this.maximumOffset()) pointer[0] = this.maximumOffset();~~
216		~~if(pointer[0] < this.minimumOffset()) pointer[0] = this.minimumOffset();~~
217		~~// Increment by values~~
218		~~if(this.values){~~
219		~~this.value = this.getNearestValue(Math.round((pointer[0] - this.minimumOffset()) / this.increment) + this.minimum);~~
220		~~pointer[0] = this.trackLeft() + this.alignX + (this.value - this.minimum) * this.increment;~~
221		~~} else {~~
222		~~this.value = Math.round((pointer[0] - this.minimumOffset()) / this.increment) + this.minimum;~~
223		}
224		~~style.left = (pointer[0] - offsets[0]) + "px";~~
225		}
226		~~if(this.options.onSlide) this.options.onSlide(this.value);~~
	249	var offsets = this.track.cumulativeOffset();
	250	pointer[0] -= this.offsetX + offsets[0];
	251	pointer[1] -= this.offsetY + offsets[1];
	252	this.event = event;
	253	this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
	254	if (this.initialized && this.options.onSlide)
	255	this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
		},
		endDrag: function(event) {
229		~~if(this.active && this.dragging) {~~
	258	if (this.active && this.dragging) {
		this.finishDrag(event, true);
		Event.stop(event);
		}
		this.active = false;
		this.dragging = false;
235		},
	264	},
		finishDrag: function(event, success) {
		this.active = false;
		this.dragging = false;
239		~~this.handle.style.zIndex = this.originalZ;~~
240		~~this.originalLeft = this.currentLeft();~~
241		~~this.originalTop = this.currentTop();~~
		this.updateFinished();
		},
		updateFinished: function() {
245		~~if(this.options.onChange) this.options.onChange(this.value);~~
246		},
247		~~keyPress: function(event) {~~
248		~~if(this.active && !this.disabled) {~~
249		~~switch(event.keyCode) {~~
250		~~case Event.KEY_ESC:~~
251		~~this.finishDrag(event, false);~~
252		~~Event.stop(event);~~
253		~~break;~~
254		}
255		~~if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event);~~
256		}
	271	if (this.initialized && this.options.onChange)
	272	this.options.onChange(this.values.length>1 ? this.values : this.value, this);
	273	this.event = null;
		}
258		}
	275	});

rool/rails/instiki/trunk/public/stylesheets/instiki.css:

prev.	current

1		~~/* RISC OS Open Instiki stylesheet.~~
2		*
3		* Based on the Instiki default stylesheet.
4		*/
	1	body {
	2	background-color:#FFF;
	3	color:#333;
	4	font-family:Verdana, Arial, Helvetica, sans-serif;
	5	font-size:1em;
	6	line-height:1.3em;
	7	}

6		~~@import url("/css/risc_os_open.css");~~
	9	.skipNav {
	10	position:relative;
	11	left:-1000em;
	12	font-size:0em;
	13	}

8		~~/* Set the page heading spacing */~~
	15	#Container {
	16	margin:0 10px;
	17	text-align:center;
	18	}

10		~~H2#pageName~~
11		{
12		~~margin-bottom: 16px;~~
	20	#Content {
	21	border-top:none;
	22	margin:auto;
	23	padding:0.3em;
	24	text-align:left;
	25	width:100%;
	26	max-width:55em;
		}

15		~~#revision H1, #revision H2, #revision H3, #revision H4, #revision H5, #revision H6~~
16		{
17		~~font-family: Arial, Verdana, Helvetica, sans-serif;~~
18		~~font-weight: normal;~~
19		~~color: #989875;~~
20		~~padding-left: 0;~~
	29	a:visited {
	30	color:#666;
		}

23		~~#revision H1 { font-size: 140%; }~~
24		~~#revision H2 { font-size: 125%; }~~
25		~~#revision H3 { font-size: 120%; }~~
26		~~#revision H4 { font-size: 115%; }~~
27		~~#revision H5 { font-size: 110%; }~~
28		~~#revision H6 { font-size: 100%; }~~
	33	h1,h2,h3,h4,h5,h6 {
	34	color:#333;
	35	font-family:georgia, verdana, sans-serif;
	36	}

30		~~/* Put a thin green line under the byline (revision info), above the links~~
31		* to edit the page, view changes etc.
32		*/
	38	h1 {
	39	font-size:200%;
	40	}

34		~~DIV.byline~~
35		{
36		~~margin-bottom: 10px;~~
37		~~border-bottom: 1px solid #E5FFD4;~~
38		~~padding-bottom: 10px;~~
	42	h2 {
	43	font-size:173%;
		}

41		~~/* Text used in the navigation part of the sidebar for~~
42		* the currently selected page.
43		*/
	46	h3 {
	47	font-size:144%;
	48	}

45		~~.sidebar-node .navOn~~
46		{
47		~~font-size: 90%~~
	50	h4 {
	51	font-size:120%;
		}

50		/*
51		~~#Container { float: none; margin: 0 15%; text-align: center; }~~
52		~~#Content { margin: 0; padding: 0.3em; text-align: left; border-top: none; float: left; width: 100%; }~~
	54	h5,h6 {
	55	font-size:100%
	56	}

54		~~table { border: double black; border-collapse: collapse; }~~
55		~~td { border: thin solid grey; }~~
	58	h1#pageName {
	59	line-height:1em;
	60	margin:0.2em 0 0.2em 0;
	61	padding:0;
	62	}

57		~~li { margin-bottom: 0.5em; }~~
58		*/
	64	#svg_logo {
	65	float:left;
	66	margin:.5em .25em 0 -.625em;
	67	width:1.5em;
	68	height:1.625em;
	69	}

60		~~.newWikiWord { background-color: #BFBFBF; }~~
61		~~.newWikiWord a:hover { background-color: white; }~~
	71	a.nav,a:link.nav, a:visited.nav {
	72	background-color:#FFF;
	73	color:#000;
	74	}

63		~~form#navigationSearchForm { display: inline; }~~
64		~~form#navigationSearchForm input { font-size: 80%; }~~
	76	table {
	77	border:double #000;
	78	border-collapse:collapse;
	79	}

66		~~.navigation { margin-top: 0.3em; font-size : 90%; color: #999; }~~
	81	td {
	82	border:thin solid #888;
	83	}

68		~~.help { font-family: verdana, arial, helvetica, sans-serif; font-size: 70%; }~~
	85	li {
	86	margin-bottom:0.5em;
	87	}

70		~~.inputBox { font-family: verdana, arial, helvetica, sans-serif; font-size: 80%; background-color: #EEE; padding: 0.3em; margin-bottom: 1.5em; }~~
	89	.newWikiWord {
	90	background-color:#DDD;
	91	}

72		~~blockquote { display: block; font-size: 90%; margin: 0 0 1.5em 0; padding: 0 2.5em; line-height: 1.5em; font-style: italic; }~~
	93	.newWikiWord a:hover {
	94	background-color:#FFF;
	95	}

74		~~pre { font-size: 90%; padding: 1em; overflow: auto; background-color: #DDD; }~~
	97	.deleteWikiWord {
	98	background-color:#FCC;
	99	border: 3px solid blue;
	100	padding: 2px;
	101	}

76		~~ol.setup { font-size: 110%; font-family: georgia, verdana, sans-serif; padding-left: 1.5em; margin-top: 1em; }~~
	103	.deleteWikiWord:hover, .deleteWikiWord a:hover {
	104	background-color:#F88;
	105	}

78		~~.byline { padding-top: 1em; font-size: 60%; font-style: italic; margin-bottom: 1em; color: #999; }~~

80		~~.diffdel, del.diffmod { background: #fcc; }~~
81		~~.diffins, ins.diffmod { background: #cfc; }~~
	108	form#navigationSearchForm {
	109	display:inline;
	110	}

83		~~#footer { font-size: 60%; line-height: 1.2em; color: #999; font-style: italic; text-align: right; padding-top: 2em; }~~
	112	form#navigationSearchForm input {
	113	font-size:80%;
	114	}

85		~~div.inputFieldWithPrompt { margin: 0.75em 0; }~~
	116	.navigation {
	117	color:#555;
	118	font-size:90%;
	119	margin-top:0.3em;
	120	}

87		~~div.errorExplanation { color: #900; background-color: #FFA; font-style: italic; font-weight: bold; margin: 1.5em 0; padding: 1em; width: 100%; }~~
88		~~div.errorExplanation h2 { display: none; }~~
89		~~div.errorExplanation p { padding: 0; margin: 0; border: none; }~~
90		~~div.errorExplanation ul { padding: 0; margin: 0.5em 0 0 2em; border: none; }~~
91		~~div.errorExplanation li { padding: 0; margin: 0; border: none; }~~
92		~~div.fieldWithErrors input { border: 1px solid #900; }~~
93		~~div.info { color: #060; background-color: #BFBFBF; padding: 0.5em; margin-top: 0.5em; font-weight: bold; width: 100%; }~~
	122	.navigation a:hover {
	123	background-color:#000;
	124	color:#FFF;
	125	text-decoration:none;
	126	}

95		~~/* div#MarkupHelp { float: right; width: 20%; } */~~
96		~~div#MarkupHelp { margin-left: 10px; }~~
97		~~div#MarkupHelp table { margin-bottom: 0; border-top: 3px solid #999; border-left: 3px solid #999;~~
98		~~border-right: 3px solid #BBB; border-bottom: 3px solid #BBB}~~
99		~~div#MarkupHelp td { font-size: 80%; padding: 0.2em; margin: 0; border: 1px solid #999; border-width: 1px 0 1px 0;~~
100		~~vertical-align: top; white-space: nowrap; }~~
101		~~div#MarkupHelp td.arrow { padding-right: 5px; padding: 0 0.75em; color: #999; }~~
102		~~div#MarkupHelp h3 { font-size: 90%; font-weight: bold; font-weight: normal; margin: 0 0 5px 0; padding: 5px 0 0 0; }~~
103		~~div#MarkupHelp p { font-size: 70%; }~~
	128	.navigation a {
	129	color:#000;
	130	font-weight:bold;
	131	}

105		~~div.rightHandSide { float: right; width: 25%; margin-left: 0.7em; padding-left: 1.5em; border-left: 1px dotted #ccc; font-size: 80%; }~~
	133	.navigation small a {
	134	font-size:90%;
	135	font-weight:normal;
	136	}

107		~~.newsList { margin-top: 1.5em; }~~
108		~~.newsList p { margin-bottom: 2.5em; }~~
	138	.navOn {
	139	color:#444;
	140	font-weight:bold;
	141	text-decoration:none;
	142	}

110		~~/* Affects the display of "category: ..." */~~
111		~~.property { color: #999; font-size: 80%; }~~
	144	div.help {
	145	font-family:verdana, arial, helvetica, sans-serif;
	146	font-size:75%;
	147	}
	148
	149	div.inputBox {
	150	background-color:#EEE;
	151	font-family:verdana, arial, helvetica, sans-serif;
	152	font-size:80%;
	153	margin-bottom:1.5em;
	154	padding:0.3em;
	155	}
	156
	157	blockquote {
	158	display:block;
	159	font-size:90%;
	160	font-style:italic;
	161	line-height:1.5em;
	162	margin:0 0 1.5em;
	163	padding:0 2.5em;
	164	}
	165
	166	pre {
	167	background-color:#DDD;
	168	font-size:90%;
	169	overflow:auto;
	170	padding:1em;
	171	}
	172
	173	ol.setup {
	174	font-family:georgia, verdana, sans-serif;
	175	font-size:110%;
	176	margin-top:1em;
	177	padding-left:1.5em;
	178	}
	179
	180	.byline {
	181	color:#666;
	182	font-size:.8em;
	183	font-style:italic;
	184	margin-bottom:1em;
	185	padding-top:1px;
	186	}
	187
	188	p.show_diff {
	189	background: #eee;
	190	padding: 3px;
	191	border: 1px solid silver;
	192	font-size:.85em;
	193	}
	194
	195	span.webName {
	196	font-size:.5em;
	197	}
	198
	199	span.views, span.linked {
	200	font-size:.85em;
	201	}
	202	.views a, .linked a {
	203	font-weight: normal
	204	}
	205	span.revisions {
	206	font-size:.95em
	207	}
	208
	209	#allPages, #wantedPages {
	210	float: left;
	211	width: 280px;
	212	}
	213	#allPages {
	214	margin-right: 30px;
	215	}
	216	#allPages h2, #wantedPages h2 {
	217	font-size: 1.2em;
	218	}
	219	#allPages label {
	220	font-size: .8em;
	221	}
	222
	223	.pageType {
	224	font-size: .75em;
	225	font-style: italic;
	226	}
	227
	228	p.pageStats, span.unlock {
	229	font-size: .85em;
	230	}
	231
	232	.diffdel,del.diffmod, .diffdel , del.diffmod {
	233	background-color:#FAA;
	234	text-decoration:line-through;
	235	}
	236
	237	.diffins,ins.diffmod, .diffins , ins.diffmod {
	238	background-color:#AFA;
	239	text-decoration:underline;
	240	}
	241
	242	.diffmod, .diffmod * {
	243	border: 2px solid #FE0;
	244	}
	245
	246	#footer {
	247	color:#666;
	248	font-size:.75em;
	249	font-style:italic;
	250	line-height:1.2em;
	251	padding-top:2em;
	252	text-align:right;
	253	}
	254
	255	#footer a:link,#footer a:visited {
	256	color:#777;
	257	font-style:italic;
	258	}
	259	#footer a:hover {
	260	color:#FFF;
	261	}
	262
	263	div.web_normal {
	264	padding:4px;
	265	}
	266
	267	div.web_protected {
	268	padding:4px;
	269	background-color:#DDD;
	270	}
	271
	272	div.inputFieldWithPrompt {
	273	margin:0.75em 0;
	274	}
	275
	276	div.errorExplanation {
	277	background-color:#FFA;
	278	color:#900;
	279	font-style:italic;
	280	font-weight:bold;
	281	margin:1.5em 0;
	282	padding:1em;
	283	width:100%;
	284	}
	285
	286	div.errorExplanation h2 {
	287	display:none;
	288	}
	289
	290	div.errorExplanation ul {
	291	border:none;
	292	margin:0.5em 0 0 2em;
	293	padding:0;
	294	}
	295
	296	div.fieldWithErrors input {
	297	border:1px solid #900;
	298	}
	299
	300	div.info {
	301	background-color:#DDD;
	302	font-weight:bold;
	303	margin-top:0.5em;
	304	padding:0.5em;
	305	width:100%;
	306	}
	307
	308	div#editFormButtons {
	309	margin:0.5em 0 0;
	310	}
	311
	312	div#editFormButtons span {
	313	white-space:nowrap;
	314	}
	315
	316	div#editForm textarea#content {
	317	}
	318
	319	div#MarkupHelp {
	320	float:right;
	321	margin-top:0.5em;
	322	width:25%;
	323	}
	324
	325	div#MarkupHelp table {
	326	border-bottom:3px solid #BBB;
	327	border-left:3px solid #999;
	328	border-right:3px solid #BBB;
	329	border-top:3px solid #999;
	330	margin-bottom:0;
	331	}
	332
	333	div#MarkupHelp td {
	334	border:1px solid #999;
	335	border-width:1px 0;
	336	font-size:80%;
	337	margin:0;
	338	padding:0.2em;
	339	vertical-align:top;
	340	white-space:nowrap;
	341	}
	342
	343	div#MarkupHelp td.arrow {
	344	color:#666;
	345	padding:0 0.75em 0 0;
	346	}
	347
	348	div#MarkupHelp h3 {
	349	font-size:90%;
	350	font-weight:bold;
	351	margin:0 0 5px;
	352	padding:5px 0 0;
	353	}
	354
	355	div#MarkupHelp p {
	356	font-size:70%;
	357	}
	358
	359	div.rightHandSide {
	360	border-left:1px dotted #ccc;
	361	border-bottom:1px dotted #ccc;
	362	float:right;
	363	font-size:80%;
	364	margin-left:0.7em;
	365	padding-left:1.5em;
	366	width:25%;
	367	}
	368
	369	.newsList {
	370	margin-top:1.5em;
	371	}
	372
	373	.newsList p {
	374	margin-bottom:2.5em;
	375	}
	376
	377	.property {
	378	color:#666;
	379	font-size:80%;
	380	}
	381
	382	a,li span {
	383	color:#000;
	384	}
	385
	386	a.existingWikiWord[title]{
	387	//border: 1px dashed #BBB;
	388	}
	389
	390	.web_protected a.existingWikiWord[title], .web_normal a.existingWikiWord[title] {
	391	// border: none;
	392	}
	393
	394	a:hover, a.nav:hover, a:hover math {
	395	background-color:#000;
	396	color:#FFF;
	397	}
	398
	399	a:hover.existingWikiWord, a:visited:hover.existingWikiWord {
	400	background-color:#008;
	401	color:#FFF;
	402	}
	403	a:hover.existingWikiWord[title] {
	404	background-color:#707;
	405	color:#FFF;
	406	}
	407	.web_protected a:hover.existingWikiWord[title], .web_normal a:hover.existingWikiWord[title] {
	408	background-color:#000;
	409	color:#FFF;
	410	}
	411
	412	div.errorExplanation p,div.errorExplanation li {
	413	border:none;
	414	margin:0;
	415	padding:0;
	416	}
	417
	418	textarea#content {
	419	font-size: 1em;
	420	line-height: 1.125;
	421	}
	422
	423	ul#sortable_pages {
	424	list-style-type:none;
	425	padding-left:0;
	426	}
	427	ul#sortable_pages li {
	428	border: 1px solid #FFF;
	429	}
	430	ul#sortable_pages li:hover, ul#sortable_pages li:focus {
	431	border: 1px solid blue;
	432	}
	433
	434	merror {display:inline;font-size:1em;}
	435	math[display=block] {overflow:auto;}
	436	math { white-space: nowrap }
	437	.maruku-eq-number {float:right}
	438	.maruku-equation {text-align:center}
	439	.blockquotesource {margin-left:1em;}
	440	fieldset.search {display:inline; border:none;padding:0;margin:0;top:5px;position:relative;}
	441	span.keyboard {
	442	background: #CCC;
	443	color: #000;
	444	border: outset 2px;
	445	font-family:verdana, arial, sans-serif;
	446	font-size: .7em;
	447	margin-left:5px;
	448	padding:1px 2px;
	449	}
	450	.centeredfigure {
	451	position:relative;
	452	margin:auto;
	453	text-align:center;
	454	}
	455
	456	body {counter-reset: theorem lemma proposition corollary definition example remark note}
	457	.un_theorem , .num_theorem ,
	458	.un_lemma , .num_lemma ,
	459	.un_prop , .num_prop ,
	460	.un_cor , .num_cor {font-style: italic}
	461	span.theorem_label {font-style:normal; font-weight:bold;}
	462	.proof span.theorem_label {font-style:italic;}
	463	.num_theorem .theorem_label:after {
	464	content: " " counter(theorem); counter-increment: theorem;}
	465	.num_lemma .theorem_label:after {
	466	content: " " counter(lemma); counter-increment: lemma;}
	467	.num_prop .theorem_label:after {
	468	content: " " counter(proposition); counter-increment: proposition;}
	469	.num_cor .theorem_label:after {
	470	content: " " counter(corollary); counter-increment: corollary;}
	471	.num_defn .theorem_label:after {
	472	content: " " counter(definition); counter-increment: definition;}
	473	.num_example .theorem_label:after {
	474	content: " " counter(example); counter-increment: example;}
	475	.num_remark .theorem_label:after {
	476	content: " " counter(remark); counter-increment: remark;}
	477	.num_note .theorem_label:after {
	478	content: " " counter(note); counter-increment: note;}
	479
	480	/* Hack for Mozilla bug 449396 */
	481	[mathvariant="bold"] * {
	482	font-style: normal;
	483	font-variant: normal;
	484	font-weight: bold;
	485	}
	486	[mathvariant="italic"] * {
	487	font-style: italic;
	488	font-variant: normal;
	489	font-weight: normal;
	490	}
	491	[mathvariant="bold-italic"] * {
	492	font-style: italic;
	493	font-variant: normal;
	494	font-weight: bold;
	495	}
	496	[mathvariant="sans-serif"] * {
	497	font-style: normal;
	498	font-variant: normal;
	499	font-weight: normal;
	500	}
	501	[mathvariant="bold-sans-serif"] * {
	502	font-style: normal;
	503	font-variant: normal;
	504	font-weight: bold;
	505	}
	506	[mathvariant="sans-serif-italic"] * {
	507	font-style: italic;
	508	font-variant: normal;
	509	font-weight: normal;
	510	}
	511	[mathvariant="sans-serif-bold-italic"] * {
	512	font-style: italic;
	513	font-variant: normal;
	514	font-weight: bold;
	515	}
	516	[actiontype="toggle"]:hover {text-shadow: #ccc 2px 2px 5px;}

rool/rails/instiki/trunk/script/reset_references:

prev.	current

1		~~ENV['RAILS_ENV'] = ARGV.first \|\| 'development'~~
2
3		~~$stderr.puts "Loading Rails for #{ENV['RAILS_ENV']} environment..."~~
4		~~require File.dirname(__FILE__) + '/../config/environment'~~
5
6		~~class StubUrlGenerator~~
7		~~def make_link(*args)~~
8		~~'StubLink'~~
9		~~end~~
10		~~end~~
11
12		~~PageRenderer.setup_url_generator(StubUrlGenerator.new)~~
13		~~WikiReference.delete_all~~
14
15		~~Web.find_all.each do \|web\|~~
16		~~web.pages.find(:all, :order => 'name').each do \|page\|~~
17		~~$stderr.puts "Processing page '#{page.name}'"~~
18		~~begin~~
19		~~PageRenderer.new(page.current_revision).display_content(update_references = true)~~
20		~~rescue => e~~
21		~~puts e~~
22		~~puts e.backtrace~~
23		~~end~~
24		~~end~~
25		~~end~~

	2	#!/usr/bin/env ruby
	3
	4	ENV['RAILS_ENV'] = ARGV.first \|\| 'development'
	5
	6	$stderr.puts "Loading Rails for #{ENV['RAILS_ENV']} environment..."
	7	require File.dirname(__FILE__) + '/../config/environment'
	8
	9	class StubUrlGenerator
	10	def make_link(*args)
	11	'StubLink'
	12	end
	13	end
	14
	15	PageRenderer.setup_url_generator(StubUrlGenerator.new)
	16	WikiReference.delete_all
	17
	18	Web.find_all.each do \|web\|
	19	web.pages.find(:all, :order => 'name').each do \|page\|
	20	$stderr.puts "Processing page '#{page.name}'"
	21	begin
	22	PageRenderer.new(page.current_revision).display_content(update_references = true)
	23	rescue => e
	24	puts e
	25	puts e.backtrace
	26	end
	27	end
	28	end
	29

rool/rails/instiki/trunk/script/server:

prev.	current

		#!/usr/bin/env ruby
	2	require File.join(File.dirname(__FILE__), '..', 'config', 'boot')
	3	# Don't do this. Instead, put it here, where we can customize it.
	4	#require 'commands/server'

3		~~require 'webrick'~~
	6	require 'active_support'
	7	require 'action_controller'
	8
	9	require 'fileutils'
		require 'optparse'

6		~~OPTIONS = {~~
7		~~:port => 2500,~~
8		~~:ip => "0.0.0.0",~~
9		~~:environment => "production",~~
10		~~:server_root => File.expand_path(File.dirname(__FILE__) + "/../public/"),~~
11		~~:server_type => WEBrick::SimpleServer~~
	12	# TODO: Push Thin adapter upstream so we don't need worry about requiring it
	13	begin
	14	require_library_or_gem 'thin'
	15	rescue Exception
	16	# Thin not available
	17	end
	18
	19	options = {
	20	:Port => 2500,
	21	:Host => "0.0.0.0",
	22	:environment => (ENV['RAILS_ENV'] \|\| "production").dup,
	23	:config => Rails.root.join('config.ru'),
	24	:detach => false,
	25	:debugger => false
		}

14		~~ARGV.options do \|opts\|~~
15		~~script_name = File.basename($0)~~
16		~~opts.banner = "Usage: ruby #{script_name} [options]"~~
17
18		~~opts.separator ""~~
19
	28	ARGV.clone.options do \|opts\|
		opts.on("-p", "--port=port", Integer,
21		~~"Runs Instiki on the specified port.",~~
22		~~"Default: 2500") { \|OPTIONS[:port]\| }~~
	30	"Runs Instiki on the specified port.", "Default: 2500") { \|v\| options[:Port] = v }
		opts.on("-b", "--binding=ip", String,
24		~~"Binds Instiki to the specified ip.",~~
25		~~"Default: 0.0.0.0") { \|OPTIONS[:ip]\| }~~
	32	"Binds Instiki to the specified ip.", "Default: 0.0.0.0") { \|v\| options[:Host] = v }
	33	opts.on("-c", "--config=file", String,
	34	"Use custom rackup configuration file") { \|v\| options[:config] = v }
	35	opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:detach] = true }
	36	opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
		opts.on("-e", "--environment=name", String,
		"Specifies the environment to run this server under (test/development/production).",
28		~~"Default: development") { \|OPTIONS[:environment]\| }~~
29		~~opts.on("-d", "--daemon",~~
30		~~"Make Instiki run as a Daemon (only works if fork is available -- meaning on *nix)."~~
31		~~) { OPTIONS[:server_type] = WEBrick::Daemon }~~
	39	"Default: production") { \|v\| options[:environment] = v }
	40	opts.on("-P", "--path=/path", String, "Runs Instiki mounted at a specific path.", "Default: /") { \|v\| options[:path] = v }

		opts.separator ""

35		~~opts.on("-h", "--help",~~
36		~~"Show this help message.") { puts opts; exit }~~
	44	opts.on("-h", "--help", "Show this help message.") { puts opts; exit }

		opts.parse!
		end

41		~~ENV["RAILS_ENV"] = OPTIONS[:environment]~~
42		~~require File.dirname(__FILE__) + "/../config/environment"~~
43		~~require 'webrick_server'~~
	49	server = Rack::Handler.get(ARGV.first) rescue nil
	50	unless server
	51	begin
	52	server = Rack::Handler::Mongrel
	53	rescue LoadError => e
	54	server = Rack::Handler::WEBrick
	55	end
	56	end

45		~~OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)~~
	58	puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
	59	puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}"

47		~~puts "=> Instiki started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"~~
48		~~puts "=> Ctrl-C to shutdown; call with --help for options" if OPTIONS[:server_type] == WEBrick::SimpleServer~~
49		~~DispatchServlet.dispatch(OPTIONS)~~
	61	%w(cache pids sessions sockets).each do \|dir_to_make\|
	62	FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make))
	63	end
	64
	65	if options[:detach]
	66	Process.daemon
	67	pid = Rails.root.join('tmp', 'pids', 'server.pid')
	68	File.open(pid, 'w'){ \|f\| f.write(Process.pid) }
	69	at_exit { File.delete(pid) if File.exist?(pid) }
	70	end
	71
	72	ENV["RAILS_ENV"] = options[:environment]
	73	RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
	74
	75	if File.exist?(options[:config])
	76	config = options[:config]
	77	if config =~ /\.ru$/
	78	cfgfile = File.read(config)
	79	if cfgfile[/^#\\(.*)/]
	80	opts.parse!($1.split(/\s+/))
	81	end
	82	inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config)
	83	else
	84	require config
	85	inner_app = Object.const_get(File.basename(config, '.rb').capitalize)
	86	end
	87	else
	88	require Rails.root.join('config', 'environment')
	89	inner_app = ActionController::Dispatcher.new
	90	end
	91
	92	if options[:path].nil?
	93	map_path = "/"
	94	else
	95	ActionController::Base.relative_url_root = options[:path]
	96	map_path = options[:path]
	97	end
	98
	99	app = Rack::Builder.new {
	100	use Rails::Rack::LogTailer unless options[:detach]
	101	use Rails::Rack::Debugger if options[:debugger]
	102	map map_path do
	103	use Rails::Rack::Static
	104	run inner_app
	105	end
	106	}.to_app
	107
	108	puts "=> Call with -d to detach"
	109
	110	trap(:INT) { exit }
	111
	112	puts "=> Ctrl-C to shutdown server"
	113
	114	begin
	115	server.run(app, options.merge(:AccessLog => []))
	116	ensure
	117	puts 'Exiting'
	118	end

rool/rails/instiki/trunk/test/fixtures/pages.yml:

prev.	current

		created_at: <%= 10.minutes.ago.to_formatted_s(:db) %>
		updated_at: <%= 10.minutes.ago.to_formatted_s(:db) %>
		web_id: 1
55		~~name: Elephant~~

	56	name: Elephant
	57
	58	liquor:
	59	id: 9
	60	created_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
	61	updated_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
	62	web_id: 1
	63	name: liquor
	64
	65	instiki_page:
	66	id: 10
	67	created_at: <%= Time.local(2004, 4, 4, 16, 50).to_formatted_s(:db) %>
	68	updated_at: <%= Time.local(2004, 4, 4, 16, 50).to_formatted_s(:db) %>
	69	web_id: 2
	70	name: HomePage

rool/rails/instiki/trunk/test/fixtures/revisions.yml:

prev.	current

		updated_at: <%= Time.local(2004, 4, 4, 16, 50).to_formatted_s(:db) %>
		revised_at: <%= Time.local(2004, 4, 4, 16, 50).to_formatted_s(:db) %>
		page_id: 1
53		~~content: HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \OverThere -- see SmartEngine in that SmartEngineGUI~~
	53	content: HisWay would be MyWay $\sin(x)\begin{svg}<svg/>\end{svg}\includegraphics[width=3em]{foo}$ in kinda ThatWay in HisWay though MyWay \OverThere -- see SmartEngine in that SmartEngineGUI
		author: DavidHeinemeierHansson

		first_page_first_revision:
...	...
		updated_at: <%= Time.local(2004, 4, 4, 16, 55).to_formatted_s(:db) %>
		revised_at: <%= Time.local(2004, 4, 4, 16, 55).to_formatted_s(:db) %>
		page_id: 6
62		~~content: HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that SmartEngineGUI~~
	62	content: HisWay would be MyWay $\sin(x)\begin{svg}<svg/>\end{svg}\includegraphics[width=3em]{foo}$ in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that SmartEngineGUI
		author: DavidHeinemeierHansson

		oak_first_revision:
...	...
		content: "All about elephants.\ncategory: animals"
		author: Guest
		ip: 127.0.0.2
	84
	85	liquor_first_revision:
	86	id: 10
	87	created_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
	88	updated_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
	89	revised_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
	90	page_id: 9
	91	content: "[[!redirects booze]]\n Drinky-poo. [[Instiki:HomePage\|go there]]"
	92	author: Guest
	93	ip: 127.0.0.2
	94
	95	instiki_home_page_first_revision:
	96	id: 11
	97	created_at: <%= Time.local(2004, 4, 4, 15, 50).to_formatted_s(:db) %>
	98	updated_at: <%= Time.local(2004, 4, 4, 15, 50).to_formatted_s(:db) %>
	99	revised_at: <%= Time.local(2004, 4, 4, 15, 50).to_formatted_s(:db) %>
	100	page_id: 10
	101	content: First revision of the HomePage end
	102	author: AnAuthor
	103	ip: 127.0.0.1

rool/rails/instiki/trunk/test/fixtures/webs.yml:

prev.	current

		updated_at: 2005-08-01
		name: wiki1
		address: wiki1
7		~~markup: textile~~
	7	markup: markdownMML

		instiki:
		id: 2
...	...
		updated_at: 2005-08-01
		name: Instiki
		address: instiki
15		~~markup: textile~~

	16	markup: markdownMML

rool/rails/instiki/trunk/test/fixtures/wiki_references.yml:

prev.	current

		link_type: C
		created_at: <%= Time.now.to_formatted_s(:db) %>
		updated_at: <%= Time.now.to_formatted_s(:db) %>
112

	113
	114	liquor_1:
	115	id: 15
	116	page_id: 9
	117	referenced_name: booze
	118	link_type: R
	119	created_at: <%= Time.now.to_formatted_s(:db) %>
	120	updated_at: <%= Time.now.to_formatted_s(:db) %>

rool/rails/instiki/trunk/test/functional/admin_controller_test.rb:

prev.	current

		# Raise errors beyond the default web-based presentation
		class AdminController; def rescue_action(e) logger.error(e); raise e end; end

9		~~class AdminControllerTest < Test::Unit::TestCase~~
	9	class AdminControllerTest < ActionController::TestCase
		fixtures :webs, :pages, :revisions, :system, :wiki_references

		def setup
	13	require 'action_controller/test_process'
		@controller = AdminController.new
		@request = ActionController::TestRequest.new
		@response = ActionController::TestResponse.new
	17	class << @request.session
	18	attr_accessor :dbman
	19	end
	20	# simulate a cookie session store
	21	@request.session.dbman = FakeSessionDbMan
		@wiki = Wiki.new
		@oak = pages(:oak)
	24	@liquor = pages(:liquor)
		@elephant = pages(:elephant)
		@web = webs(:test_wiki)
		@home = @page = pages(:home_page)
	28	FileUtils.rm_rf("#{RAILS_ROOT}/webs/renamed_wiki1")
		end

		def test_create_system_form_displayed
...	...
		process 'create_system', 'password' => 'a_password', 'web_name' => 'My Wiki',
		'web_address' => 'my_wiki'

54		~~assert_redirected_to :web => @wiki.webs.keys.first, :action => 'show', :id => 'HomePage'~~
	62	assert_redirected_to :web => @wiki.webs.keys.first, :controller => 'wiki', :action => 'show', :id => 'HomePage'
		assert_equal wiki_before, @wiki
		# and no new web should be created either
		assert_equal old_size, @wiki.webs.size
58		~~assert_flash_has :error~~
	66	assert(@response.has_flash_object?(:error))
		end

		def test_create_system_no_form_and_wiki_already_initialized
		assert @wiki.setup?
		process('create_system')
64		~~assert_redirected_to :web => @wiki.webs.keys.first, :action => 'show', :id => 'HomePage'~~
65		~~assert_flash_has :error~~
	72	assert_redirected_to :web => @wiki.webs.keys.first, :controller => 'wiki', :action => 'show', :id => 'HomePage'
	73	assert(@response.has_flash_object?(:error))
		end


...	...

		process 'create_web', 'system_password' => 'pswd', 'name' => 'Wiki Two', 'address' => 'wiki2'

74		~~assert_redirected_to :web => 'wiki2', :action => 'new', :id => 'HomePage'~~
	82	assert_redirected_to :web => 'wiki2', :controller => 'wiki', :action => 'new', :id => 'HomePage'
		wiki2 = @wiki.webs['wiki2']
		assert wiki2
		assert_equal 'Wiki Two', wiki2.name
...	...

		process 'create_web', 'system_password' => 'instiki', 'name' => 'Wiki Two', 'address' => 'wiki2'

86		~~assert_redirected_to :web => 'wiki2', :action => 'new', :id => 'HomePage'~~
	94	assert_redirected_to :web => 'wiki2', :controller => 'wiki', :action => 'new', :id => 'HomePage'
		end

		def test_create_web_failed_authentication
...	...

		process 'create_web', 'system_password' => 'wrong', 'name' => 'Wiki Two', 'address' => 'wiki2'

94		~~assert_redirected_to :web => nil, :action => 'index'~~
	102	assert_redirected_to :controller => 'admin', :action => 'create_web'
		assert_nil @wiki.webs['wiki2']
		end

...	...
		assert_response :success
		end

104
		def test_edit_web_no_form
		process 'edit_web', 'web' => 'wiki1'
		# this action simply renders a form
...	...

		def test_edit_web_form_submitted
		@wiki.system.update_attribute(:password, 'pswd')
113
	120	@web.save
	121
		process('edit_web', 'system_password' => 'pswd',
		'web' => 'wiki1', 'address' => 'renamed_wiki1', 'name' => 'Renamed Wiki1',
		'markup' => 'markdown', 'color' => 'blue', 'additional_style' => 'whatever',
117		~~'safe_mode' => 'on', 'password' => 'new_password', 'published' => 'on',~~
	125	'safe_mode' => 'on', 'password' => 'new_password', 'password_check' => 'new_password', 'published' => 'on',
		'brackets_only' => 'on', 'count_pages' => 'on', 'allow_uploads' => 'on',
		'max_upload_size' => '300')

121		~~assert_redirected_to :web => 'renamed_wiki1', :action => 'show', :id => 'HomePage'~~
	129	assert_redirected_to :web => 'renamed_wiki1', :controller => 'wiki', :action => 'show', :id => 'HomePage'
		@web = Web.find(@web.id)
		assert_equal 'renamed_wiki1', @web.address
		assert_equal 'Renamed Wiki1', @web.name
...	...
		assert @web.count_pages?
		assert @web.allow_uploads?
		assert_equal 300, @web.max_upload_size
	142	assert File.directory? Rails.root.join("webs", "renamed_wiki1", "files")
	143	assert !File.exist?(Rails.root.join("webs", "renamed_wiki1", "wiki1"))
	144	assert !File.exist?(Rails.root.join("webs", "wiki1"))
		end

	147	def test_edit_web_web_password_mismatch
	148	@wiki.system.update_attribute(:password, 'pswd')
	149	@web.save
	150
	151	process('edit_web', 'system_password' => 'pswd',
	152	'web' => 'wiki1', 'address' => 'renamed_wiki1', 'name' => 'Renamed Wiki1',
	153	'markup' => 'markdown', 'color' => 'blue', 'additional_style' => 'whatever',
	154	'safe_mode' => 'on', 'password' => 'new_password', 'password_check' => 'old_password', 'published' => 'on',
	155	'brackets_only' => 'on', 'count_pages' => 'on', 'allow_uploads' => 'on',
	156	'max_upload_size' => '300')
	157
	158	assert_response :success
	159	assert @response.has_template_object?('error')
	160	assert File.directory? Rails.root.join("webs", "wiki1", "files")
	161	assert !File.exist?(Rails.root.join("webs", "renamed_wiki1", "wiki1"))
	162	assert !File.exist?(Rails.root.join("webs", "renamed_wiki1"))
	163	end
	164
		def test_edit_web_opposite_values
		@wiki.system.update_attribute(:password, 'pswd')
	167	@web.save

		process('edit_web', 'system_password' => 'pswd',
		'web' => 'wiki1', 'address' => 'renamed_wiki1', 'name' => 'Renamed Wiki1',
		'markup' => 'markdown', 'color' => 'blue', 'additional_style' => 'whatever',
142		~~'password' => 'new_password')~~
	172	'password' => 'new_password', 'password_check' => 'new_password')
		# safe_mode, published, brackets_only, count_pages, allow_uploads not set
		# and should become false

146		~~assert_redirected_to :web => 'renamed_wiki1', :action => 'show', :id => 'HomePage'~~
	176	assert_redirected_to :web => 'renamed_wiki1', :controller => 'wiki', :action => 'show', :id => 'HomePage'
		@web = Web.find(@web.id)
		assert !@web.safe_mode?
		assert !@web.published?
		assert !@web.brackets_only?
		assert !@web.count_pages?
		assert !@web.allow_uploads?
	183	assert File.directory? Rails.root.join("webs", "renamed_wiki1", "files")
	184	assert !File.exist?(Rails.root.join("webs", "renamed_wiki1", "wiki1"))
	185	assert !File.exist?(Rails.root.join("webs", "wiki1"))
		end

		def test_edit_web_wrong_password
...	...
		process('edit_web', 'system_password' => 'pswd',
		'web' => 'wiki1', 'address' => 'another', 'name' => 'Renamed Wiki1',
		'markup' => 'markdown', 'color' => 'blue', 'additional_style' => 'whatever',
173		~~'password' => 'new_password')~~
	206	'password' => 'new_password', 'password_check' => 'new_password')

		#returns to the same form
		assert_response :success
...	...

		def test_remove_orphaned_pages
		@wiki.system.update_attribute(:password, 'pswd')
194		~~page_order = [@home, pages(:my_way), @oak, pages(:smart_engine), pages(:that_way)]~~
195		~~orphan_page_linking_to_oak = @wiki.write_page('wiki1', 'Pine',~~
196		~~"Refers to [[Oak]].\n" +~~
	227	page_order = [@home, pages(:my_way), @oak, pages(:smart_engine), pages(:that_way), @liquor]
	228	x_test_renderer(@web.page('liquor').revisions.last).display_content(true)
	229	orphan_page_linking_to_oak_and_redirecting_to_liquor = @wiki.write_page('wiki1', 'Pine',
	230	"Refers to [[Oak]] and to [[booze]].\n" +
		"category: trees",
198		~~Time.now, Author.new('TreeHugger', '127.0.0.2'), test_renderer)~~
199
	232	Time.now, Author.new('TreeHugger', '127.0.0.2'), x_test_renderer)
	233
		r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password_orphaned' => 'pswd')

		assert_redirected_to :controller => 'wiki', :web => 'wiki1', :action => 'list'
...	...
		assert_redirected_to :controller => 'wiki', :web => 'wiki1', :action => 'list'
		@web.pages(true)
		page_order.delete(@oak)
	246	page_order.delete(@liquor)
		assert_equal page_order, @web.select.sort,
		"Pages are not as expected: #{@web.select.sort.map {\|p\| p.name}.inspect}"

		# third pass does not destroy HomePage
		r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password_orphaned' => 'pswd')
217		~~assert_redirected_to :action => 'list'~~
	252	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'list'
		@web.pages(true)
		assert_equal page_order, @web.select.sort,
		"Pages are not as expected: #{@web.select.sort.map {\|p\| p.name}.inspect}"
		end

	258	def test_remove_orphaned_pages_in_category
	259	@wiki.system.update_attribute(:password, 'pswd')
	260	page_order = [pages(:elephant), pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word),
	261	@oak, pages(:smart_engine), pages(:that_way), @liquor]
	262	orphan_page_linking_to_oak = @wiki.write_page('wiki1', 'Pine',
	263	"Refers to [[Oak]].\n" +
	264	"category: trees",
	265	Time.now, Author.new('TreeHugger', '127.0.0.2'), x_test_renderer)
	266
	267	r = process('remove_orphaned_pages_in_category', 'web' => 'wiki1', 'category' => 'trees','system_password_orphaned_in_category' => 'pswd')
	268
	269	assert_redirected_to :controller => 'wiki', :web => 'wiki1', :action => 'list'
	270	@web.pages(true)
	271	assert_equal page_order, @web.select.sort,
	272	"Pages are not as expected: #{@web.select.sort.map {\|p\| p.name}.inspect}"
	273
	274	# Oak is now orphan, but it's not in the 'animals' category,
	275	# so the second pass should not remove it
	276	r = process('remove_orphaned_pages_in_category', 'web' => 'wiki1', 'category' => 'animals', 'system_password_orphaned_in_category' => 'pswd')
	277	assert_redirected_to :controller => 'wiki', :web => 'wiki1', :action => 'list'
	278	@web.pages(true)
	279	page_order.delete(pages(:elephant))
	280	assert_equal page_order, @web.select.sort,
	281	"Pages are not as expected: #{@web.select.sort.map {\|p\| p.name}.inspect}"
	282
	283	# third pass does does nothing, since there are no pages in the
	284	# 'leaves' category.
	285	r = process('remove_orphaned_pages_in_category', 'web' => 'wiki1', 'category' => 'leaves', 'system_password_orphaned_in_category' => 'pswd')
	286	assert_redirected_to :controller => 'wiki', :web => 'wiki1', :action => 'list'
	287	@web.pages(true)
	288	assert_equal page_order, @web.select.sort,
	289	"Pages are not as expected: #{@web.select.sort.map {\|p\| p.name}.inspect}"
	290
	291	# fourth pass destroys Oak
	292	r = process('remove_orphaned_pages_in_category', 'web' => 'wiki1', 'category' => 'trees', 'system_password_orphaned_in_category' => 'pswd')
	293	assert_redirected_to :controller => 'wiki', :web => 'wiki1', :action => 'list'
	294	@web.pages(true)
	295	page_order.delete(@oak)
	296	assert_equal page_order, @web.select.sort,
	297	"Pages are not as expected: #{@web.select.sort.map {\|p\| p.name}.inspect}"
	298	end
	299
		def test_remove_orphaned_pages_empty_or_wrong_password
		@wiki.system[:password] = 'pswd'

rool/rails/instiki/trunk/test/functional/application_test.rb:

prev.	current

		# Unit tests for ApplicationController (the abstract controller class)

3		~~require File.dirname(__FILE__) + '/../test_helper'~~
	3	require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
		require 'wiki_controller'
5		~~require 'rexml/document'~~

		# Need some concrete class to test the abstract class features
		class WikiController; def rescue_action(e) logger.error(e); raise e end; end

10		~~class ApplicationTest < Test::Unit::TestCase~~
	9	class ApplicationTest < ActionController::TestCase
		fixtures :webs, :pages, :revisions, :system

	12	Mime::LOOKUP["text/html"] = HTML
	13
		def setup
		@controller = WikiController.new
		@request = ActionController::TestRequest.new
...	...

		def test_utf8_header
		get :show, :web => 'wiki1', :id => 'HomePage'
22		~~assert_equal 'text/html; charset=UTF-8', @response.headers['Content-Type']~~
	23	assert_equal 'text/html; charset=utf-8', @response.headers['Content-Type']
		end

	26	def test_mathplayer_mime_type
	27	@request.user_agent = 'MathPlayer'
	28	get :show, :web => 'wiki1', :id => 'HomePage'
	29	assert_equal 'application/xhtml+xml', @response.headers['Content-Type']
	30	end
	31
	32	def test_validator_mime_type
	33	@request.user_agent = 'Validator'
	34	get :show, :web => 'wiki1', :id => 'HomePage'
	35	assert_equal 'application/xhtml+xml; charset=utf-8', @response.headers['Content-Type']
	36	end
	37
	38	def test_accept_header_xhtml
	39	@request.user_agent = 'Mozilla/5.0'
	40	@request.env.update({'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,/;q=0.8' })
	41	get :show, :web => 'wiki1', :id => 'HomePage'
	42	assert_equal 'application/xhtml+xml; charset=utf-8', @response.headers['Content-Type']
	43	end
	44
	45	def test_accept_header_html
	46	@request.user_agent = 'Foo'
	47	@request.env.update({'HTTP_ACCEPT' => 'text/html,application/xml;q=0.9,/;q=0.8' })
	48	get :show, :web => 'wiki1', :id => 'HomePage'
	49	assert_equal 'text/html; charset=utf-8', @response.headers['Content-Type']
	50	end
	51
	52	def test_tex_mime_type
	53	get :tex, :web => 'wiki1', :id => 'HomePage'
	54	assert_equal 'text/plain; charset=utf-8', @response.headers['Content-Type']
	55	end
	56
	57	def test_atom_mime_type
	58	get :atom_with_content, :web => 'wiki1'
	59	assert_equal 'application/atom+xml; charset=utf-8', @response.headers['Content-Type']
	60	end
	61
		def test_connect_to_model_unknown_wiki
		get :show, :web => 'unknown_wiki', :id => 'HomePage'
		assert_response :missing

rool/rails/instiki/trunk/test/functional/file_controller_test.rb:

prev.	current

		#!/usr/bin/env ruby

3		~~require File.dirname(__FILE__) + '/../test_helper'~~
	3	require Rails.root.join('test', 'test_helper')
		require 'file_controller'
		require 'fileutils'
		require 'stringio'
...	...
		# Raise errors beyond the default web-based presentation
		class FileController; def rescue_action(e) logger.error(e); raise e end; end

11		~~class FileControllerTest < Test::Unit::TestCase~~
	11	class FileControllerTest < ActionController::TestCase
		fixtures :webs, :pages, :revisions, :system

		def setup
		@controller = FileController.new
		@request = ActionController::TestRequest.new
		@response = ActionController::TestResponse.new
	18	class << @request.session
	19	attr_accessor :dbman
	20	end
	21	# simulate a cookie session store
	22	@request.session.dbman = FakeSessionDbMan
		@web = webs(:test_wiki)
		@wiki = Wiki.new
		WikiFile.delete_all
		require 'fileutils'
22		~~FileUtils.rm_rf("#{RAILS_ROOT}/public/wiki1/files/*")~~
	27	FileUtils.rm_rf("#{RAILS_ROOT}/webs/wiki1")
		end

		def test_file_upload_form
		get :file, :web => 'wiki1', :id => 'new_file.txt'
27		~~assert_success~~
28		~~assert_rendered_file 'file/file'~~
	32	assert_response(:success)
	33	assert_template 'file/file'
		end

		def test_file_download_text_file
...	...

		r = get :file, :web => 'wiki1', :id => 'foo.txt'

37		~~assert_success(bypass_body_parsing = true)~~
	42	assert_response(:success, bypass_body_parsing = true)
		assert_equal "Contents of the file", r.body
		assert_equal 'text/plain', r.headers['Content-Type']
	45	assert_equal 'inline; filename="foo.txt"', r.headers['Content-Disposition']
		end

	48	def test_file_download_html_file
	49	@web.wiki_files.create(:file_name => 'foo.html', :description => 'Text file',
	50	:content => "Contents of the file")
	51
	52	r = get :file, :web => 'wiki1', :id => 'foo.html'
	53
	54	assert_response(:success, bypass_body_parsing = true)
	55	assert_equal "Contents of the file", r.body
	56	assert_equal 'application/octet-stream', r.headers['Content-Type']
	57	assert_equal 'attachment; filename="foo.html"', r.headers['Content-Disposition']
	58	end
	59
		def test_file_download_pdf_file
		@web.wiki_files.create(:file_name => 'foo.pdf', :description => 'PDF file',
		:content => "aaa\nbbb\n")

		r = get :file, :web => 'wiki1', :id => 'foo.pdf'

48		~~assert_success(bypass_body_parsing = true)~~
	66	assert_response(:success, bypass_body_parsing = true)
		assert_equal "aaa\nbbb\n", r.body
		assert_equal 'application/pdf', r.headers['Content-Type']
		end
...	...

		r = get :file, :web => 'wiki1', :id => 'rails.gif'

59		~~assert_success(bypass_body_parsing = true)~~
	77	assert_response(:success, bypass_body_parsing = true)
		assert_equal 'image/gif', r.headers['Content-Type']
		assert_equal pic.size, r.body.size
		assert_equal pic, r.body
	81	assert_equal 'inline; filename="rails.gif"', r.headers['Content-Disposition']
		end
	83
	84	def test_pic_download_gif_published_web
	85	@web.update_attribute(:published, true)
	86	@web.update_attribute(:password, 'pswd')
	87	pic = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { \|f\| f.read }
	88	@web.wiki_files.create(:file_name => 'rails.gif', :description => 'An image', :content => pic)
	89
	90	r = get :file, :web => 'wiki1', :id => 'rails.gif'
	91
	92	assert_response(:success, bypass_body_parsing = true)
	93	assert_equal 'image/gif', r.headers['Content-Type']
	94	assert_equal pic.size, r.body.size
	95	assert_equal pic, r.body
	96	assert_equal 'inline; filename="rails.gif"', r.headers['Content-Disposition']
	97	end

	99	def test_pic_download_gif_unpublished_web
	100	@web.update_attribute(:published, false)
	101	@web.update_attribute(:password, 'pswd')
	102	pic = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { \|f\| f.read }
	103	@web.wiki_files.create(:file_name => 'rails.gif', :description => 'An image', :content => pic)
	104	r = get :file, :web => 'wiki1', :id => 'rails.gif'
	105
	106	assert_response(:forbidden)
	107	end
	108
	109	def test_pic_x_sendfile
	110	pic = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { \|f\| f.read }
	111	@web.wiki_files.create(:file_name => 'rails.gif', :description => 'An image', :content => pic)
	112	@request.env.update({ 'HTTP_X_SENDFILE_TYPE' => 'foo' })
	113	@request.remote_addr = '127.0.0.1'
	114	r = get :file, :web => 'wiki1', :id => 'rails.gif'
	115
	116	assert_response(:success, bypass_body_parsing = true)
	117	# It's no longer possible to use X-Sendfile in development; ergo no way to test
	118	# assert_match '/rails.gif', r.headers['X-Sendfile']
	119	assert_equal 'image/gif', r.headers['Content-Type']
	120	assert_equal 'inline; filename="rails.gif"', r.headers['Content-Disposition']
	121	end
	122
	123	def test_pic_x_sendfile_published_web
	124	@web.update_attribute(:published, true)
	125	@web.update_attribute(:password, 'pswd')
	126	pic = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { \|f\| f.read }
	127	@web.wiki_files.create(:file_name => 'rails.gif', :description => 'An image', :content => pic)
	128	@request.env.update({ 'HTTP_X_SENDFILE_TYPE' => 'foo' })
	129	@request.remote_addr = '127.0.0.1'
	130	r = get :file, :web => 'wiki1', :id => 'rails.gif'
	131
	132	assert_response(:success, bypass_body_parsing = true)
	133	# It's no longer possible to use X-Sendfile in development; ergo no way to test
	134	# assert_match '/rails.gif', r.headers['X-Sendfile']
	135	assert_equal 'image/gif', r.headers['Content-Type']
	136	assert_equal 'inline; filename="rails.gif"', r.headers['Content-Disposition']
	137	end
	138
	139	def test_pic_x_sendfile_unpublished_web
	140	@web.update_attribute(:published, false)
	141	@web.update_attribute(:password, 'pswd')
	142	pic = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { \|f\| f.read }
	143	@web.wiki_files.create(:file_name => 'rails.gif', :description => 'An image', :content => pic)
	144	@request.env.update({ 'HTTP_X_SENDFILE_TYPE' => 'foo' })
	145	@request.remote_addr = '127.0.0.1'
	146	r = get :file, :web => 'wiki1', :id => 'rails.gif'
	147
	148	assert_response(:forbidden)
	149	end
	150
	151	def test_pic_x_sendfile_type_nonlocal
	152	pic = File.open("#{RAILS_ROOT}/test/fixtures/rails.gif", 'rb') { \|f\| f.read }
	153	@web.wiki_files.create(:file_name => 'rails.gif', :description => 'An image', :content => pic)
	154	@request.env.update({ 'HTTP_X_SENDFILE_TYPE' => 'foo' })
	155	r = get :file, :web => 'wiki1', :id => 'rails.gif'
	156
	157	assert_response(:success, bypass_body_parsing = true)
	158	assert_equal 'image/gif', r.headers['Content-Type']
	159	assert_equal pic.size, r.body.size
	160	assert_equal pic, r.body
	161	assert_equal 'inline; filename="rails.gif"', r.headers['Content-Disposition']
	162	end
	163
		def test_pic_unknown_pic
		r = get :file, :web => 'wiki1', :id => 'non-existant.gif'

68		~~assert_success~~
69		~~assert_rendered_file 'file/file'~~
	167	assert_response(:success)
	168	assert_template 'file/file'
		end

	171	def test_pic_upload_published_web
	172	@web.update_attribute(:published, true)
	173	@web.update_attribute(:password, 'pswd')
	174	@web.update_attribute(:allow_uploads, true)
	175	# edit and re-render a page so that it has an "unknown file" link to 'rails-e2e.gif'
	176	PageRenderer.setup_url_generator(StubUrlGenerator.new)
	177	renderer = PageRenderer.new
	178	@wiki.revise_page('wiki1', 'Oak', 'Oak', '[[rails-e2e.gif:pic]]',
	179	Time.now, 'AnonymousBrave', renderer)
	180	assert_equal "<p><span class='newWikiWord'>rails-e2e.gif</span></p>",
	181	renderer.display_published
	182
	183	# rails-e2e.gif is unknown to the system, so pic action goes to the file [upload] form
	184	r = get :file, :web => 'wiki1', :id => 'rails-e2e.gif'
	185	assert_response(:forbidden)
	186	end
	187
	188	def test_pic_upload_unpublished_web
	189	@web.update_attribute(:published, false)
	190	@web.update_attribute(:password, 'pswd')
	191	@web.update_attribute(:allow_uploads, true)
	192	# edit and re-render a page so that it has an "unknown file" link to 'rails-e2e.gif'
	193	PageRenderer.setup_url_generator(StubUrlGenerator.new)
	194	renderer = PageRenderer.new
	195	@wiki.revise_page('wiki1', 'Oak', 'Oak', '[[rails-e2e.gif:pic]]',
	196	Time.now, 'AnonymousBrave', renderer)
	197	assert_equal "<p><span class='newWikiWord'>rails-e2e.gif</span></p>",
	198	renderer.display_published
	199
	200	# rails-e2e.gif is unknown to the system, so pic action goes to the file [upload] form
	201	r = get :file, :web => 'wiki1', :id => 'rails-e2e.gif'
	202	assert_response(:forbidden)
	203	end
	204
		def test_pic_upload_end_to_end
73		~~# edit and re-render home page so that it has an "unknown file" link to 'rails-e2e.gif'~~
	206	# edit and re-render a page so that it has an "unknown file" link to 'rails-e2e.gif'
		PageRenderer.setup_url_generator(StubUrlGenerator.new)
		renderer = PageRenderer.new
76		~~@wiki.revise_page('wiki1', 'HomePage', '[[rails-e2e.gif:pic]]',~~
	209	@wiki.revise_page('wiki1', 'Oak', 'Oak', '[[rails-e2e.gif:pic]]',
		Time.now, 'AnonymousBrave', renderer)
78		~~assert_equal "<p><span class=\"newWikiWord\">rails-e2e.gif<a href=\"../file/rails-e2e.gif\">" +~~
	211	assert_equal "<p><span class='newWikiWord'>rails-e2e.gif<a href='../file/rails-e2e.gif'>" +
		"?</a></span></p>",
		renderer.display_content

		# rails-e2e.gif is unknown to the system, so pic action goes to the file [upload] form
		r = get :file, :web => 'wiki1', :id => 'rails-e2e.gif'
84		~~assert_success~~
85		~~assert_rendered_file 'file/file'~~
	217	assert_response(:success)
	218	assert_template 'file/file'

		# User uploads the picture
88		~~picture = File.read("#{RAILS_ROOT}/test/fixtures/rails.gif")~~
89		~~r = post :file, :web => 'wiki1',~~
90		~~:file => {:file_name => 'rails-e2e.gif', :content => StringIO.new(picture)}~~
91		~~assert_redirected_to({})~~
	221	begin # Ruby 1.9
	222	picture = File.read("#{RAILS_ROOT}/test/fixtures/rails.gif", :encoding => 'ascii-8bit')
	223	rescue #Ruby 1.8
	224	picture = File.read("#{RAILS_ROOT}/test/fixtures/rails.gif")
	225	end
	226	# updated from post to get - post fails the spam protection (no javascript)
	227	# Moron! If substituting GET for POST actually works, you
	228	# have much, much bigger problems.
	229	r = get :file, :web => 'wiki1', :referring_page => '/wiki1/show/Oak',
	230	:file => {:file_name => 'rails-e2e.gif',
	231	:content => StringIO.new(picture),
	232	:description => 'Rails, end-to-end'}
	233	assert_redirected_to '/wiki1/show/Oak'
		assert @web.has_file?('rails-e2e.gif')
		assert_equal(picture, WikiFile.find_by_file_name('rails-e2e.gif').content)
	236	PageRenderer.setup_url_generator(StubUrlGenerator.new)
	237	@wiki.revise_page('wiki1', 'Oak', 'Oak', 'Try [[rails-e2e.gif:pic]] again.',
	238	Time.now, 'AnonymousBrave', renderer)
	239	assert_equal "<p>Try <img alt='Rails, end-to-end' src='../file/rails-e2e.gif'/> again.</p>",
	240	renderer.display_content
	241	assert_equal "<p>Try <img alt='Rails, end-to-end' src='../file/rails-e2e.gif'/> again.</p>",
	242	renderer.display_published
		end

	245	def test_import
	246	# updated from post to get - post fails the spam protection (no javascript)
	247	r = get :import, :web => 'wiki1', :file => uploaded_file("#{RAILS_ROOT}/test/fixtures/exported_markup.zip")
	248	assert_response(:redirect)
	249	assert @web.has_page?('ImportedPage')
	250	end
	251
	252	def uploaded_file(path, content_type="application/octet-stream", filename=nil)
	253	filename \|\|= File.basename(path)
	254	t = Tempfile.new(filename)
	255	FileUtils.copy_file(path, t.path)
	256	(class << t; self; end;).class_eval do
	257	alias local_path path
	258	define_method(:original_filename) { filename }
	259	define_method(:content_type) { content_type }
	260	end
	261	return t
	262	end
	263
		end

rool/rails/instiki/trunk/test/functional/routes_test.rb:

prev.	current

		#!/usr/bin/env ruby

3		~~require File.dirname(__FILE__) + '/../test_helper'~~
	3	require File.expand_path(File.dirname(__FILE__) + '/../test_helper')

		require 'action_controller/routing'

7		~~class RoutesTest < Test::Unit::TestCase~~
	7	class RoutesTest < ActionController::TestCase

		def test_parse_uri
		assert_routing('', :controller => 'wiki', :action => 'index')
...	...
		assert_routing('x/y', :controller => 'wiki', :web => 'x', :action => 'y')
		assert_routing('x/y/z', :controller => 'wiki', :web => 'x', :action => 'y', :id => 'z')
		assert_recognizes({:web => 'x', :controller => 'wiki', :action => 'y'}, 'x/y/')
15		~~assert_recognizes({:web => 'x', :controller => 'wiki', :action => 'y', :id => 'z'}, 'x/y/z/')~~
	15	assert_recognizes({:web => 'x', :controller => 'wiki', :action => 'y', :id => 'z'}, 'x/y/z')
	16	assert_recognizes({:web => 'x', :controller => 'wiki', :action => 'y', :id => 'z/'}, 'x/y/z/')
	17	assert_recognizes({:web => 'x', :controller => 'wiki', :action => 'y', :id => 'z/'}, 'x/y/z%2F')
	18	assert_recognizes({:web => 'x', :controller => 'wiki', :action => 'y', :id => 'z.w'}, 'x/y/z.w')
		end

		def test_parse_uri_interestng_cases
...	...
		:controller => 'wiki',
		:action => 'an_action', :id => 'HomePage'
		)
24		~~assert_recognizes({:controller => 'wiki', :action => 'index'}, '///')~~
	27	# assert_recognizes({:controller => 'wiki', :action => 'index'}, '///')
		end

		def test_parse_uri_liberal_with_pagenames

		assert_routing('web/show/%24HOME_PAGE',
		:controller => 'wiki', :web => 'web', :action => 'show', :id => '$HOME_PAGE')
31
32		~~assert_routing('web/show/HomePage%3Farg1%3Dvalue1%26arg2%3Dvalue2',~~
33		~~:controller => 'wiki', :web => 'web', :action => 'show',~~
34		~~:id => 'HomePage?arg1=value1&arg2=value2')~~
	34
	35	# assert_routing('web/show/HomePage%3F',
	36	# :controller => 'wiki', :web => 'web', :action => 'show',
	37	# :id => 'HomePage')
	38
	39	# assert_routing('web/show/HomePage%3Farg1%3Dvalue1%26arg2%3Dvalue2',
	40	# :controller => 'wiki', :web => 'web', :action => 'show',
	41	# :id => 'HomePage?arg1=value1&arg2=value2')

		assert_routing('web/files/abc.zip',
		:web => 'web', :controller => 'file', :action => 'file', :id => 'abc.zip')
...	...
		end

		def test_cases_broken_by_routes
45		~~# assert_routing('web/show/Page+With+Spaces',~~
46		~~# :controller => 'wiki', :web => 'web', :action => 'show', :id => 'Page With Spaces')~~
	52	assert_routing('web/show/Page+With+Spaces',
	53	:controller => 'wiki', :web => 'web', :action => 'show', :id => 'Page With Spaces')
		# assert_routing('web/show/HomePage%2Fsomething_else',
		# :controller => 'wiki', :web => 'web', :action => 'show', :id => 'HomePage/something_else')
		end

rool/rails/instiki/trunk/test/functional/wiki_controller_test.rb:

prev.	current

		#!/usr/bin/env ruby
	2	#coding: utf-8

		# Uncomment the line below to enable pdflatex tests; don't forget to comment them again
		# commiting to SVN
		# $INSTIKI_TEST_PDFLATEX = true

7		~~require File.expand_path(File.dirname(__FILE__) + '/../test_helper')~~
	8	require Rails.root.join('test', 'test_helper')
		require 'wiki_controller'
		require 'rexml/document'
		require 'tempfile'
		require 'zip/zipfilesystem'
	13	require 'instiki_stringsupport'

		# Raise errors beyond the default web-based presentation
		class WikiController; def rescue_action(e) logger.error(e); raise e end; end

16		~~class WikiControllerTest < Test::Unit::TestCase~~
	18	class WikiControllerTest < ActionController::TestCase
		fixtures :webs, :pages, :revisions, :system, :wiki_references

		def setup
		@controller = WikiController.new
	23	@controller.extend ApplicationHelper
		@request = ActionController::TestRequest.new
		@response = ActionController::TestResponse.new
	26	class << @request.session
	27	attr_accessor :dbman
	28	end
	29	# simulate a cookie session store
	30	@request.session.dbman = FakeSessionDbMan
		@wiki = Wiki.new
		@web = webs(:test_wiki)
		@home = @page = pages(:home_page)
		@oak = pages(:oak)
	35	@liquor = pages(:liquor)
		@elephant = pages(:elephant)
	37	@eternity = Regexp.new('author=.*; path=/; expires=' + Time.utc(2030).strftime("%a, %d-%b-%Y %H:%M:%S GMT"))
	38	set_tex_header
		end

	41	def test_truncate_page_name
	42	wanted_page_name = 'This is a very, very, very, very, VERY long page name'
	43	evil_page_name = 'This page has plenty of fun & games'
	44	unicode_page_name = "This p\xF0\x9D\x94\xB8\xF0\x9D\x94\xBE\xF0\x9D\x94\xBC has plenty of fun & games"
	45	assert_equal 'This is a very, very, very,...', @controller.truncate(WikiWords.separate(wanted_page_name), :length => 35)
	46	assert_equal 'This page has plenty of fun...', @controller.truncate(WikiWords.separate(evil_page_name))
	47	truncated = "".respond_to?(:force_encoding) ? "This p\u{1D538}\u{1D53E}\u{1D53C} has plenty of fun\u2633\u2633" :
	48	"This p\xF0\x9D\x94\xB8\xF0\x9D\x94\xBE\xF0\x9D\x94\xBC has plenty of fun\xE2\x98\xB3\xE2\x98\xB3"
	49	assert_equal truncated, @controller.truncate(WikiWords.separate(unicode_page_name), :omission =>"\xE2\x98\xB3\xE2\x98\xB3")
	50	end
	51
		def test_authenticate
		set_web_property :password, 'pswd'

		get :authenticate, :web => 'wiki1', :password => 'pswd'
34		~~assert_redirected_to :web => 'wiki1', :action => 'show', :id => 'HomePage'~~
35		~~assert_equal ['pswd'], @response.cookies['web_address']~~
	56	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'HomePage'
	57	assert_equal 'pswd', @response.cookies['wiki1']
		end

		def test_authenticate_wrong_password
		set_web_property :password, 'pswd'

		r = process('authenticate', 'web' => 'wiki1', 'password' => 'wrong password')
42		~~assert_redirected_to :action => 'login', :web => 'wiki1'~~
	64	assert_redirected_to :action => 'login', :controller => 'wiki', :web => 'wiki1'
		assert_nil r.cookies['web_address']
		end

		def test_authors
		@wiki.write_page('wiki1', 'BreakSortingOrder',
		"This page breaks the accidentally correct sorting order of authors",
49		~~Time.now, Author.new('BreakingTheOrder', '127.0.0.2'), test_renderer)~~
	71	Time.now, Author.new('BreakingTheOrder', '127.0.0.2'), x_test_renderer)

		r = process('authors', 'web' => 'wiki1')

53		~~assert_success~~
	75	assert_response(:success)
		assert_equal %w(AnAuthor BreakingTheOrder DavidHeinemeierHansson Guest Me TreeHugger),
		r.template_objects['authors']
		page_names_by_author = r.template_objects['page_names_by_author']
...	...

		r = process('cancel_edit', 'web' => 'wiki1', 'id' => 'Oak')

67		~~assert_redirected_to :action => 'show', :id => 'Oak'~~
	89	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'Oak'
		assert !Page.find(@oak.id).locked?(Time.now)
		end

		def test_edit
		r = process 'edit', 'web' => 'wiki1', 'id' => 'HomePage'
73		~~assert_success~~
	95	assert_response(:success)
		assert_equal @wiki.read_page('wiki1', 'HomePage'), r.template_objects['page']
		end

		def test_edit_page_locked_page
		@home.lock(Time.now, 'Locky')
		process 'edit', 'web' => 'wiki1', 'id' => 'HomePage'
80		~~assert_redirected_to :action => 'locked'~~
	102	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'locked', :id => 'HomePage'
		end

		def test_edit_page_break_lock
		@home.lock(Time.now, 'Locky')
		process 'edit', 'web' => 'wiki1', 'id' => 'HomePage', 'break_lock' => 'y'
86		~~assert_success~~
	108	assert_response(:success)
		@home = Page.find(@home.id)
		assert @home.locked?(Time.now)
		end
...	...
		def test_edit_page_with_special_symbols
		@wiki.write_page('wiki1', 'With : Special /> symbols',
		'This page has special symbols in the name', Time.now, Author.new('Special', '127.0.0.3'),
100		~~test_renderer)~~
	122	x_test_renderer)

		r = process 'edit', 'web' => 'wiki1', 'id' => 'With : Special /> symbols'
103		~~assert_success~~
	125	assert_response(:success)
		xml = REXML::Document.new(r.body)
		form = REXML::XPath.first(xml, '//form')
		assert_equal '/wiki1/save/With+%3A+Special+%2F%3E+symbols', form.attributes['action']
		end

	131	def test_export_xhtml
	132	@request.accept = 'application/xhtml+xml'
	133	# rollback homepage to a version that is easier to match
	134	@home.rollback(0, Time.now, 'Rick', x_test_renderer)
	135	r = process 'export_html', 'web' => 'wiki1'
	136
	137	assert_response(:success, bypass_body_parsing = true)
	138	assert_equal 'application/zip', r.headers['Content-Type']
	139	assert_match /attachment; filename="wiki1-xhtml-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,
	140	r.headers['Content-Disposition']
	141	assert_equal 'PK', r.body[0..1], 'Content is not a zip file'
	142
	143	# Tempfile doesn't know how to open files with binary flag, hence the two-step process
	144	Tempfile.open('instiki_export_file') { \|f\| @tempfile_path = f.path }
	145	# some wacky bug in Ruby 1.9.2p0's Tempfile is fixed by
	146	@tempfile_path.to_s
	147	begin
	148	File.open(@tempfile_path, 'wb') { \|f\| f.write(r.body); @exported_file = f.path }
	149	Zip::ZipFile.open(@exported_file) do \|zip\|
	150	assert_equal %w(Elephant.xhtml FirstPage.xhtml HomePage.xhtml MyWay.xhtml NoWikiWord.xhtml Oak.xhtml SmartEngine.xhtml ThatWay.xhtml index.xhtml liquor.xhtml), zip.dir.entries('.').sort
	151	assert_match /.<html .All about elephants.*<\/html>/,
	152	zip.file.read('Elephant.xhtml').gsub(/\s+/, ' ')
	153	assert_match /.<html .All about oak.*<\/html>/,
	154	zip.file.read('Oak.xhtml').gsub(/\s+/, ' ')
	155	assert_match /.<html .First revision of the.HomePage.end.*<\/html>/,
	156	zip.file.read('HomePage.xhtml').gsub(/\s+/, ' ')
	157	assert_equal '<html xmlns=\'http://www.w3.org/1999/xhtml\'><head><meta http-equiv="Refresh" content="0;URL=HomePage.xhtml" /></head></html> ', zip.file.read('index.xhtml').gsub(/\s+/, ' ')
	158	end
	159	ensure
	160	File.delete(@tempfile_path) if File.exist?(@tempfile_path)
	161	end
	162	end
	163
		def test_export_html
	165	@request.accept = 'tex/html'
		# rollback homepage to a version that is easier to match
111		~~@home.rollback(0, Time.now, 'Rick', test_renderer)~~
	167	@home.rollback(0, Time.now, 'Rick', x_test_renderer)
		r = process 'export_html', 'web' => 'wiki1'

114		~~assert_success(bypass_body_parsing = true)~~
	170	assert_response(:success, bypass_body_parsing = true)
		assert_equal 'application/zip', r.headers['Content-Type']
		assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,
		r.headers['Content-Disposition']
...	...
		begin
		File.open(@tempfile_path, 'wb') { \|f\| f.write(r.body); @exported_file = f.path }
		Zip::ZipFile.open(@exported_file) do \|zip\|
125		~~assert_equal %w(Elephant.html FirstPage.html HomePage.html MyWay.html NoWikiWord.html Oak.html SmartEngine.html ThatWay.html index.html), zip.dir.entries('.').sort~~
	181	assert_equal %w(Elephant.html FirstPage.html HomePage.html MyWay.html NoWikiWord.html Oak.html SmartEngine.html ThatWay.html index.html liquor.html), zip.dir.entries('.').sort
		assert_match /.<html .All about elephants.*<\/html>/,
		zip.file.read('Elephant.html').gsub(/\s+/, ' ')
		assert_match /.<html .All about oak.*<\/html>/,
		zip.file.read('Oak.html').gsub(/\s+/, ' ')
		assert_match /.<html .First revision of the.HomePage.end.*<\/html>/,
		zip.file.read('HomePage.html').gsub(/\s+/, ' ')
132		~~assert_equal '<html><head><META HTTP-EQUIV="Refresh" CONTENT="0;URL=HomePage.html"></head></html> ', zip.file.read('index.html').gsub(/\s+/, ' ')~~
	188	assert_equal '<html xmlns=\'http://www.w3.org/1999/xhtml\'><head><meta http-equiv="Refresh" content="0;URL=HomePage.html" /></head></html> ', zip.file.read('index.html').gsub(/\s+/, ' ')
		end
		ensure
		File.delete(@tempfile_path) if File.exist?(@tempfile_path)
		end
		end
138
	194
		def test_export_html_no_layout
		r = process 'export_html', 'web' => 'wiki1', 'layout' => 'no'

142		~~assert_success(bypass_body_parsing = true)~~
	198	assert_response(:success, bypass_body_parsing = true)
		assert_equal 'application/zip', r.headers['Content-Type']
144		~~assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,~~
	200	assert_match /attachment; filename="wiki1-x?html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,
		r.headers['Content-Disposition']
		assert_equal 'PK', r.body[0..1], 'Content is not a zip file'
		end
...	...
		def test_export_markup
		r = process 'export_markup', 'web' => 'wiki1'

152		~~assert_success(bypass_body_parsing = true)~~
	208	assert_response(:success, bypass_body_parsing = true)
		assert_equal 'application/zip', r.headers['Content-Type']
154		~~assert_match /attachment; filename="wiki1-textile-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,~~
	210	assert_match /attachment; filename="wiki1-markdownMML-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/,
		r.headers['Content-Disposition']
		assert_equal 'PK', r.body[0..1], 'Content is not a zip file'
		end
...	...

		if ENV['INSTIKI_TEST_LATEX'] or defined? $INSTIKI_TEST_PDFLATEX

162		~~def test_export_pdf~~
163		~~r = process 'export_pdf', 'web' => 'wiki1'~~
164		~~assert_success(bypass_body_parsing = true)~~
165		~~assert_equal 'application/pdf', r.headers['Content-Type']~~
166		~~assert_match /attachment; filename="wiki1-tex-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.pdf"/,~~
167		~~r.headers['Content-Disposition']~~
168		~~assert_equal '%PDF', r.body[0..3]~~
169		~~assert_equal "EOF\n", r.body[-4..-1]~~
170		~~end~~
	218	# def test_export_pdf
	219	# r = process 'export_pdf', 'web' => 'wiki1'
	220	# assert_response(:success, bypass_body_parsing = true)
	221	# assert_equal 'application/pdf', r.headers['Content-Type']
	222	# assert_match /attachment; filename="wiki1-tex-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.pdf"/,
	223	# r.headers['Content-Disposition']
	224	# assert_equal '%PDF', r.body[0..3]
	225	# assert_equal "EOF\n", r.body[-4..-1]
	226	# end

		else
173		~~puts 'Warning: tests involving pdflatex are very slow, therefore they are disabled by default.'~~
174		~~puts ' Set environment variable INSTIKI_TEST_PDFLATEX or global Ruby variable'~~
175		~~puts ' $INSTIKI_TEST_PDFLATEX to enable them.'~~
	229	# puts 'Warning: tests involving pdflatex are very slow, therefore they are disabled by default.'
	230	# puts ' Set environment variable INSTIKI_TEST_PDFLATEX or global Ruby variable'
	231	# puts ' $INSTIKI_TEST_PDFLATEX to enable them.'
		end

178		~~def test_export_tex~~
179		~~r = process 'export_tex', 'web' => 'wiki1'~~
	234	# def test_export_tex
	235	# r = process 'export_tex', 'web' => 'wiki1'
	236	#
	237	# assert_response(:success, bypass_body_parsing = true)
	238	# assert_equal 'application/octet-stream', r.headers['Content-Type']
	239	# assert_match /attachment; filename="wiki1-tex-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.tex"/,
	240	# r.headers['Content-Disposition']
	241	# assert_equal '\documentclass', r.body[0..13], 'Content is not a TeX file'
	242	# end

181		~~assert_success(bypass_body_parsing = true)~~
182		~~assert_equal 'application/octet-stream', r.headers['Content-Type']~~
183		~~assert_match /attachment; filename="wiki1-tex-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.tex"/,~~
184		~~r.headers['Content-Disposition']~~
185		~~assert_equal '\documentclass', r.body[0..13], 'Content is not a TeX file'~~
186		~~end~~
187
		def test_feeds
		process('feeds', 'web' => 'wiki1')
		end
...	...
		# delete extra web fixture
		webs(:instiki).destroy
		process('index')
196		~~assert_redirected_to :web => 'wiki1', :action => 'show', :id => 'HomePage'~~
	252	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'HomePage'
		end

		def test_index_multiple_webs
		@wiki.create_web('Test Wiki 2', 'wiki2')
		process('index')
202		~~assert_redirected_to :action => 'web_list'~~
	258	assert_redirected_to :controller => 'wiki', :action => 'web_list'
		end

		def test_index_multiple_webs_web_explicit
		@wiki.create_web('Test Wiki 2', 'wiki2')
		process('index', 'web' => 'wiki2')
208		~~assert_redirected_to :web => 'wiki2', :action => 'show', :id => 'HomePage'~~
	264	assert_redirected_to :web => 'wiki2', :controller => 'wiki', :action => 'show', :id => 'HomePage'
		end

		def test_index_wiki_not_initialized
...	...
		assert_equal ['animals', 'trees'], r.template_objects['categories']
		assert_nil r.template_objects['category']
		assert_equal [@elephant, pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word),
224		~~@oak, pages(:smart_engine), pages(:that_way)],~~
	280	@oak, pages(:smart_engine), pages(:that_way), @liquor],
		r.template_objects['pages_in_category']
		end

...	...
		def test_locked
		@home.lock(Time.now, 'Locky')
		r = process('locked', 'web' => 'wiki1', 'id' => 'HomePage')
232		~~assert_success~~
	288	assert_response(:success)
		assert_equal @home, r.template_objects['page']
		end


		def test_login
		r = process 'login', 'web' => 'wiki1'
239		~~assert_success~~
	295	assert_response(:success)
		# this action goes straight to the templates
		end


		def test_new
		r = process('new', 'id' => 'NewPage', 'web' => 'wiki1')
246		~~assert_success~~
	302	assert_response(:success)
		assert_equal 'AnonymousCoward', r.template_objects['author']
		assert_equal 'NewPage', r.template_objects['page_name']
		end
...	...

		if ENV['INSTIKI_TEST_LATEX'] or defined? $INSTIKI_TEST_PDFLATEX

254		~~def test_pdf~~
255		~~assert RedClothForTex.available?, 'Cannot do test_pdf when pdflatex is not available'~~
256		~~r = process('pdf', 'web' => 'wiki1', 'id' => 'HomePage')~~
257		~~assert_success(bypass_body_parsing = true)~~
	310	# def test_pdf
	311	# assert RedClothForTex.available?, 'Cannot do test_pdf when pdflatex is not available'
	312	# r = process('pdf', 'web' => 'wiki1', 'id' => 'HomePage')
	313	# assert_response(:success, bypass_body_parsing = true)
	314	#
	315	# assert_equal '%PDF', r.body[0..3]
	316	# assert_equal "EOF\n", r.body[-4..-1]
	317	#
	318	# assert_equal 'application/pdf', r.headers['Content-Type']
	319	# assert_match /attachment; filename="HomePage-wiki1-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.pdf"/,
	320	# r.headers['Content-Disposition']
	321	# end

259		~~assert_equal '%PDF', r.body[0..3]~~
260		~~assert_equal "EOF\n", r.body[-4..-1]~~
261
262		~~assert_equal 'application/pdf', r.headers['Content-Type']~~
263		~~assert_match /attachment; filename="HomePage-wiki1-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.pdf"/,~~
264		~~r.headers['Content-Disposition']~~
265		~~end~~
266
		end


		def test_print
		r = process('print', 'web' => 'wiki1', 'id' => 'HomePage')

273		~~assert_success~~
	329	assert_response(:success)
		assert_equal :show, r.template_objects['link_mode']
		end


	334	def test_source
	335	r = process('source', 'web' => 'wiki1', 'id' => 'HomePage')
	336
	337	assert_response(:success)
	338	assert_match Regexp.new(Regexp.escape(%{HisWay would be MyWay $\\sin(x)\\begin{svg}&} +
	339	%{lt;svg/>\\end{svg}\\includegraphics\[width=3em\]{foo}$ in kinda} +
	340	%{ ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in t} +
	341	%{hat SmartEngineGUI})), r.body
	342	end
	343
		def test_published
		set_web_property :published, true

		r = process('published', 'web' => 'wiki1', 'id' => 'HomePage')

283		~~assert_success~~
	349	assert_response(:success)
		assert_equal @home, r.template_objects['page']
	351	assert_match /<a class='existingWikiWord' href='\/wiki1\/published\/ThatWay'>That Way<\/a>/, r.body.as_bytes
	352
	353	r = process('show', 'web' => 'wiki1', 'id' => 'HomePage')
	354
	355	assert_response(:success)
	356	assert_equal @home, r.template_objects['page']
	357	assert_match /<a class='existingWikiWord' href='\/wiki1\/show\/ThatWay'>That Way<\/a>/, r.body.as_bytes
	358
	359	r = process 'save', 'web' => 'instiki', 'id' => 'HomePage', 'content' => 'Contents of a new page',
	360	'author' => 'AuthorOfNewPage'
	361	assert_equal Web.find_by_address('instiki').has_page?('HomePage'), true
	362
	363	r = process('published', 'web' => 'wiki1', 'id' => 'liquor')
	364
	365	assert_response(:success)
	366	assert_equal @liquor, r.template_objects['page']
	367	assert_match /<a class='existingWikiWord' href='\/instiki\/show\/HomePage' title='instiki'>go there<\/a>/, r.body
	368
	369	r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
	370
	371	assert_response(:success)
	372	assert_equal @liquor, r.template_objects['page']
	373	assert_match /<a class='existingWikiWord' href='\/instiki\/show\/HomePage' title='instiki'>go there<\/a>/, r.body
	374
	375	Web.find_by_address('instiki').update_attribute(:published, true)
	376
	377	r = process('published', 'web' => 'wiki1', 'id' => 'liquor')
	378
	379	assert_response(:success)
	380	assert_equal @liquor, r.template_objects['page']
	381	assert_match /<a class='existingWikiWord' href='\/instiki\/published\/HomePage' title='instiki'>go there<\/a>/, r.body
	382
	383	r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
	384
	385	assert_response(:success)
	386	assert_equal @liquor, r.template_objects['page']
	387	assert_match /<a class='existingWikiWord' href='\/instiki\/published\/HomePage' title='instiki'>go there<\/a>/, r.body
	388
	389	set_web_property :published, false
	390
	391	r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
	392
	393	assert_response(:success)
	394	assert_equal @liquor, r.template_objects['page']
	395	assert_match /<a class='existingWikiWord' href='\/instiki\/published\/HomePage' title='instiki'>go there<\/a>/, r.body
	396
	397	Web.find_by_address('instiki').update_attribute(:published, false)
	398
	399	r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
	400
	401	assert_response(:success)
	402	assert_equal @liquor, r.template_objects['page']
	403	assert_match /<a class='existingWikiWord' href='\/instiki\/show\/HomePage' title='instiki'>go there<\/a>/, r.body
		end


...	...
		assert_response :missing
		end

	415	def test_published_should_render_homepage_if_no_page_specified
	416	set_web_property :published, true
	417
	418	r = process('published', 'web' => 'wiki1')
	419
	420	assert_response(:success)
	421	assert_equal @home, r.template_objects['page']
	422	end

	424
		def test_recently_revised
		r = process('recently_revised', 'web' => 'wiki1')
299		~~assert_success~~
	427	assert_response(:success)

		assert_equal %w(animals trees), r.template_objects['categories']
		assert_nil r.template_objects['category']
		all_pages = @elephant, pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word),
304		~~@oak, pages(:smart_engine), pages(:that_way)~~
	432	@oak, pages(:smart_engine), pages(:that_way), @liquor
		assert_equal all_pages, r.template_objects['pages_in_category']

		pages_by_day = r.template_objects['pages_by_day']
...	...
		end

		def test_recently_revised_with_categorized_page
320		~~page2 = @wiki.write_page('wiki1', 'Page2',~~
	448	page2 = @wiki.write_page('wiki1', "Pagé",
		"Page2 contents.\n" +
322		~~"category: categorized",~~
323		~~Time.now, Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)~~
	450	"category: categorizé",
	451	Time.now, Author.new("André Auteur", '127.0.0.2'), x_test_renderer)

		r = process('recently_revised', 'web' => 'wiki1')
326		~~assert_success~~
	454	assert_response(:success)

328		~~assert_equal %w(animals categorized trees), r.template_objects['categories']~~
	456	c = ''.respond_to?(:force_encoding) ? "categoriz\u00E9" : "categoriz\303\251"
	457	assert_equal ['animals', c, 'trees'], r.template_objects['categories']
		# no category is specified in params
		assert_nil r.template_objects['category']
331		~~assert_equal [@elephant, pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word), @oak, page2, pages(:smart_engine), pages(:that_way)], r.template_objects['pages_in_category'],~~
	460	assert_equal [@elephant, pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word), @oak, page2, pages(:smart_engine), pages(:that_way), @liquor], r.template_objects['pages_in_category'],
		"Pages are not as expected: " +
		r.template_objects['pages_in_category'].map {\|p\| p.name}.inspect
		assert_equal 'the web', r.template_objects['set_name']
...	...

		def test_recently_revised_with_categorized_page_multiple_categories
		r = process('recently_revised', 'web' => 'wiki1')
339		~~assert_success~~
	468	assert_response(:success)

		assert_equal ['animals', 'trees'], r.template_objects['categories']
		# no category is specified in params
		assert_nil r.template_objects['category']
344		~~assert_equal [@elephant, pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word), @oak, pages(:smart_engine), pages(:that_way)], r.template_objects['pages_in_category'],~~
	473	assert_equal [@elephant, pages(:first_page), @home, pages(:my_way), pages(:no_wiki_word), @oak, pages(:smart_engine), pages(:that_way), @liquor], r.template_objects['pages_in_category'],
		"Pages are not as expected: " +
		r.template_objects['pages_in_category'].map {\|p\| p.name}.inspect
		assert_equal 'the web', r.template_objects['set_name']
...	...

		def test_recently_revised_with_specified_category
		r = process('recently_revised', 'web' => 'wiki1', 'category' => 'animals')
352		~~assert_success~~
	481	assert_response(:success)

		assert_equal ['animals', 'trees'], r.template_objects['categories']
		# no category is specified in params
...	...
		def test_revision
		r = process 'revision', 'web' => 'wiki1', 'id' => 'HomePage', 'rev' => '1'

365		~~assert_success~~
	494	assert_response(:success)
		assert_equal @home, r.template_objects['page']
		assert_equal @home.revisions[0], r.template_objects['revision']
		end
...	...
		def test_rollback
		# rollback shows a form where a revision can be edited.
		# its assigns the same as or revision
	503	home_page = Page.find(@home.id)
	504	assert !home_page.locked?(Time.now)
		r = process 'rollback', 'web' => 'wiki1', 'id' => 'HomePage', 'rev' => '1'

376		~~assert_success~~
	507	assert_response(:success)
		assert_equal @home, r.template_objects['page']
		assert_equal @home.revisions[0], r.template_objects['revision']
	510	home_page = Page.find(@home.id)
	511	assert home_page.locked?(Time.now)
		end

381		~~def test_rss_with_content~~
382		~~r = process 'rss_with_content', 'web' => 'wiki1'~~
	514	def test_atom_with_content
	515	r = process 'atom_with_content', 'web' => 'wiki1'

384		~~assert_success~~
	517	assert_response(:success)
		pages = r.template_objects['pages_by_revision']
386		~~assert_equal [@elephant, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home], pages,~~
	519	assert_equal [@elephant, @liquor, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine),
	520	pages(:my_way), pages(:first_page), @home], pages,
		"Pages are not as expected: #{pages.map {\|p\| p.name}.inspect}"
		assert !r.template_objects['hide_description']
		end

391		~~def test_rss_with_content_when_blocked~~
	525	def test_atom_with_content_when_blocked
		@web.update_attributes(:password => 'aaa', :published => false)
		@web = Web.find(@web.id)

395		~~r = process 'rss_with_content', 'web' => 'wiki1'~~
	529	r = process 'atom_with_content', 'web' => 'wiki1'

		assert_equal 403, r.response_code
		end


401		~~def test_rss_with_headlines~~
	535	def test_atom_with_headlines
		@title_with_spaces = @wiki.write_page('wiki1', 'Title With Spaces',
403		~~'About spaces', 1.hour.ago, Author.new('TreeHugger', '127.0.0.2'), test_renderer)~~
	537	'About spaces', 1.hour.ago, Author.new('TreeHugger', '127.0.0.2'), x_test_renderer)

		@request.host = 'localhost'
		@request.port = 8080

408		~~r = process 'rss_with_headlines', 'web' => 'wiki1'~~
	542	r = process 'atom_with_headlines', 'web' => 'wiki1'

410		~~assert_success~~
	544	assert_response(:success)
		pages = r.template_objects['pages_by_revision']
412		assert_equal [@elephant, @title_with_spaces, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home], pages, "Pages are not as expected: #{pages.map {\|p\| p.name}.inspect}"
	546	assert_equal [@elephant, @liquor, @title_with_spaces, @oak, pages(:no_wiki_word), pages(:that_way), pages(:smart_engine), pages(:my_way), pages(:first_page), @home], pages, "Pages are not as expected: #{pages.map {\|p\| p.name}.inspect}"
		assert r.template_objects['hide_description']

		xml = REXML::Document.new(r.body)
...	...
		'http://localhost:8080/wiki1/show/HomePage',
		]

429		~~assert_template_xpath_match '/rss/channel/link',~~
430		~~'http://localhost:8080/wiki1/show/HomePage'~~
431		~~assert_template_xpath_match '/rss/channel/item/guid', expected_page_links~~
432		~~assert_template_xpath_match '/rss/channel/item/link', expected_page_links~~
	563	assert_tag :tag => 'link',
	564	:parent => {:tag => 'feed'},
	565	:attributes => { :rel => 'alternate',
	566	:href => 'http://localhost:8080/wiki1/show/HomePage'}
	567	expected_page_links.each do \|link\|
	568	assert_tag :tag => 'link',
	569	:parent => {:tag => 'entry'},
	570	:attributes => {:href => link }
	571	end
		end

435		~~def test_rss_switch_links_to_published~~
	574	def test_atom_switch_links_to_published
		@web.update_attributes(:password => 'aaa', :published => true)
		@web = Web.find(@web.id)

		@request.host = 'foo.bar.info'
		@request.port = 80

442		~~r = process 'rss_with_headlines', 'web' => 'wiki1'~~
	581	r = process 'atom_with_headlines', 'web' => 'wiki1'

444		~~assert_success~~
	583	assert_response(:success)
		xml = REXML::Document.new(r.body)

		expected_page_links =
...	...
		'http://foo.bar.info/wiki1/published/FirstPage',
		'http://foo.bar.info/wiki1/published/HomePage']

457		~~assert_template_xpath_match '/rss/channel/link',~~
458		~~'http://foo.bar.info/wiki1/published/HomePage'~~
459		~~assert_template_xpath_match '/rss/channel/item/guid', expected_page_links~~
460		~~assert_template_xpath_match '/rss/channel/item/link', expected_page_links~~
	596	assert_tag :tag => 'link',
	597	:parent =>{:tag =>'feed'},
	598	:attributes => {:rel => 'alternate',
	599	:href => 'http://foo.bar.info/wiki1/published/HomePage'}
	600	expected_page_links.each do \|link\|
	601	assert_tag :tag => 'link',
	602	:parent => {:tag => 'entry'},
	603	:attributes => {:href => link}
	604	end
		end

463		~~def test_rss_with_params~~
464		~~setup_wiki_with_30_pages~~
	607	# def test_atom_with_params
	608	# setup_wiki_with_30_pages
	609	#
	610	# r = process 'atom_with_headlines', 'web' => 'wiki1'
	611	# assert_response(:success)
	612	# pages = r.template_objects['pages_by_revision']
	613	# assert_equal 15, pages.size, 15
	614	#
	615	# r = process 'atom_with_headlines', 'web' => 'wiki1', 'limit' => '5'
	616	# assert_response(:success)
	617	# pages = r.template_objects['pages_by_revision']
	618	# assert_equal 5, pages.size
	619	#
	620	# r = process 'atom_with_headlines', 'web' => 'wiki1', 'limit' => '25'
	621	# assert_response(:success)
	622	# pages = r.template_objects['pages_by_revision']
	623	# assert_equal 25, pages.size
	624	#
	625	# r = process 'atom_with_headlines', 'web' => 'wiki1', 'limit' => 'all'
	626	# assert_response(:success)
	627	# pages = r.template_objects['pages_by_revision']
	628	# assert_equal 38, pages.size
	629	#
	630	# r = process 'atom_with_headlines', 'web' => 'wiki1', 'start' => '1976-10-16'
	631	# assert_response(:success)
	632	# pages = r.template_objects['pages_by_revision']
	633	# assert_equal 23, pages.size
	634	#
	635	# r = process 'atom_with_headlines', 'web' => 'wiki1', 'end' => '1976-10-16'
	636	# assert_response(:success)
	637	# pages = r.template_objects['pages_by_revision']
	638	# assert_equal 15, pages.size
	639	#
	640	# r = process 'atom_with_headlines', 'web' => 'wiki1', 'start' => '1976-10-01', 'end' => '1976-10-06'
	641	# assert_response(:success)
	642	# pages = r.template_objects['pages_by_revision']
	643	# assert_equal 5, pages.size
	644	# end

466		~~r = process 'rss_with_headlines', 'web' => 'wiki1'~~
467		~~assert_success~~
468		~~pages = r.template_objects['pages_by_revision']~~
469		~~assert_equal 15, pages.size, 15~~
470
471		~~r = process 'rss_with_headlines', 'web' => 'wiki1', 'limit' => '5'~~
472		~~assert_success~~
473		~~pages = r.template_objects['pages_by_revision']~~
474		~~assert_equal 5, pages.size~~
475
476		~~r = process 'rss_with_headlines', 'web' => 'wiki1', 'limit' => '25'~~
477		~~assert_success~~
478		~~pages = r.template_objects['pages_by_revision']~~
479		~~assert_equal 25, pages.size~~
480
481		~~r = process 'rss_with_headlines', 'web' => 'wiki1', 'limit' => 'all'~~
482		~~assert_success~~
483		~~pages = r.template_objects['pages_by_revision']~~
484		~~assert_equal 38, pages.size~~
485
486		~~r = process 'rss_with_headlines', 'web' => 'wiki1', 'start' => '1976-10-16'~~
487		~~assert_success~~
488		~~pages = r.template_objects['pages_by_revision']~~
489		~~assert_equal 23, pages.size~~
490
491		~~r = process 'rss_with_headlines', 'web' => 'wiki1', 'end' => '1976-10-16'~~
492		~~assert_success~~
493		~~pages = r.template_objects['pages_by_revision']~~
494		~~assert_equal 15, pages.size~~
495
496		~~r = process 'rss_with_headlines', 'web' => 'wiki1', 'start' => '1976-10-01', 'end' => '1976-10-06'~~
497		~~assert_success~~
498		~~pages = r.template_objects['pages_by_revision']~~
499		~~assert_equal 5, pages.size~~
500		~~end~~
501
502		~~def test_rss_title_with_ampersand~~
	646	def test_atom_title_with_ampersand
		# was ticket:143
	648	# Since we're declaring <title> to be of type="html", the content is unescaped once before interpreting.
	649	# Evidently, the desired behaviour is that the final result be HTML-encoded. Hence the double-encoding here.
		@wiki.write_page('wiki1', 'Title&With&Ampersands',
505		~~'About spaces', 1.hour.ago, Author.new('NitPicker', '127.0.0.3'), test_renderer)~~
	651	'About spaces', 1.hour.ago, Author.new('NitPicker', '127.0.0.3'), x_test_renderer)

507		~~r = process 'rss_with_headlines', 'web' => 'wiki1'~~
	653	r = process 'atom_with_headlines', 'web' => 'wiki1'

509		~~assert r.body.include?('<title>Home Page</title>')~~
510		~~assert r.body.include?('<title>Title&With&Ampersands</title>')~~
	655	assert r.body.include?('<title type="html">Home Page</title>')
	656	assert r.body.include?('<title type="html">Title&amp;With&amp;Ampersands</title>')
		end

513		~~def test_rss_timestamp~~
	659	def test_atom_timestamp
		new_page = @wiki.write_page('wiki1', 'PageCreatedAtTheBeginningOfCtime',
		'Created on 1 Jan 1970 at 0:00:00 Z', Time.at(0), Author.new('NitPicker', '127.0.0.3'),
516		~~test_renderer)~~
	662	x_test_renderer)

518		~~r = process 'rss_with_headlines', 'web' => 'wiki1'~~
519		~~assert_template_xpath_match '/rss/channel/item/pubDate[9]', "Thu, 01 Jan 1970 00:00:00 Z"~~
	664	r = process 'atom_with_headlines', 'web' => 'wiki1'
	665	assert_tag :tag =>'published',
	666	:parent => {:tag => 'entry'},
	667	:content => Time.now.getgm.strftime("%Y-%m-%dT%H:%M:%SZ")
		end

		def test_save
		r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => 'Contents of a new page',
		'author' => 'AuthorOfNewPage'

526		~~assert_redirected_to :web => 'wiki1', :action => 'show', :id => 'NewPage'~~
527		~~assert_equal ['AuthorOfNewPage'], r.cookies['author'].value~~
528		~~assert_equal Time.utc(2030), r.cookies['author'].expires~~
	674	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'NewPage'
	675	assert_equal 'AuthorOfNewPage', r.cookies['author']
	676	assert_match @eternity, r.headers["Set-Cookie"][0]
		new_page = @wiki.read_page('wiki1', 'NewPage')
		assert_equal 'Contents of a new page', new_page.content
		assert_equal 'AuthorOfNewPage', new_page.author
		end

	682	def test_save_astral_plane_characters
	683	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => "Double-struck A: \360\235\224\270",
	684	'author' => "\xF0\x9D\x94\xB8\xC3\xBCthorOfNewPage"
	685
	686	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'NewPage'
	687	assert_match @eternity, r.headers["Set-Cookie"][0]
	688	new_page = @wiki.read_page('wiki1', 'NewPage')
	689	assert_equal "Double-struck A: \360\235\224\270", new_page.content
	690	a = ''.respond_to?(:force_encoding) ? "\u{1D538}\u00FCthorOfNewPage" :
	691	"\360\235\224\270\303\274thorOfNewPage"
	692	assert_equal a, new_page.author
	693	assert_equal "\xF0\x9D\x94\xB8\xC3\xBCthorOfNewPage".as_bytes, r.cookies['author']
	694	end
	695
	696	def test_save_not_utf8
	697	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => "Cont\000ents of a new page\r\n\000",
	698	'author' => 'AuthorOfNewPage'
	699
	700	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'NewPage'
	701	assert_equal 'AuthorOfNewPage', r.cookies['author']
	702	assert_match @eternity, r.headers["Set-Cookie"][0]
	703	new_page = @wiki.read_page('wiki1', 'NewPage')
	704	assert_equal "Contents of a new page\r\n", new_page.content
	705	assert_equal 'AuthorOfNewPage', new_page.author
	706	end
	707
	708	def test_save_not_utf8_ncr
	709	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => "Contents of a new page\r\n",
	710	'author' => 'AuthorOfNewPage'
	711
	712	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'NewPage'
	713	assert_equal 'AuthorOfNewPage', r.cookies['author']
	714	assert_match @eternity, r.headers["Set-Cookie"][0]
	715	new_page = @wiki.read_page('wiki1', 'NewPage')
	716	assert_equal "Contents of a new page\r\n", new_page.content
	717	assert_equal 'AuthorOfNewPage', new_page.author
	718	end
	719
	720	def test_save_not_utf8_dec_ncr
	721	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => "Contents of a new page\r\n",
	722	'author' => 'AuthorOfNewPage'
	723
	724	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'NewPage'
	725	assert_equal 'AuthorOfNewPage', r.cookies['author']
	726	assert_match @eternity, r.headers["Set-Cookie"][0]
	727	new_page = @wiki.read_page('wiki1', 'NewPage')
	728	assert_equal "Contents of a new page\r\n", new_page.content
	729	assert_equal 'AuthorOfNewPage', new_page.author
	730	end
	731
		def test_save_new_revision_of_existing_page
		@home.lock(Time.now, 'Batman')
		current_revisions = @home.revisions.size
...	...
		r = process 'save', 'web' => 'wiki1', 'id' => 'HomePage', 'content' => 'Revised HomePage',
		'author' => 'Batman'

541		~~assert_redirected_to :web => 'wiki1', :action => 'show', :id => 'HomePage'~~
542		~~assert_equal ['Batman'], r.cookies['author'].value~~
	739	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'HomePage'
	740	assert_equal 'Batman', r.cookies['author']
		home_page = @wiki.read_page('wiki1', 'HomePage')
		assert_equal current_revisions+1, home_page.revisions.size
		assert_equal 'Revised HomePage', home_page.content
...	...
		assert !home_page.locked?(Time.now)
		end

	748	def test_save_new_revision_of_existing_page_invalid_utf8
	749	@home.lock(Time.now, 'Batman')
	750	current_revisions = @home.revisions.size
	751
	752	r = process 'save', 'web' => 'wiki1', 'id' => 'HomePage', 'content' => "Newly rev\000ised HomePage",
	753	'author' => 'Batman'
	754
	755	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'show', :id => 'HomePage'
	756	assert_equal 'Batman', r.cookies['author']
	757	home_page = @wiki.read_page('wiki1', 'HomePage')
	758	assert_equal current_revisions+1, home_page.revisions.size
	759	assert_equal 'Newly revised HomePage', home_page.content
	760	assert_equal 'Batman', home_page.author
	761	assert !home_page.locked?(Time.now)
	762	end
	763
	764	def test_dnsbl_filter_deny_action
	765	@request.remote_addr = "127.0.0.2"
	766	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => "Contents of a new page\r\n",
	767	'author' => 'AuthorOfNewPage'
	768
	769	assert_equal 403, r.response_code
	770	resp = %{<p>Access denied. Your IP address, 127.0.0.2, was found on one or more DNSBL blocking } +
	771	%{list(s).</p>\n<p>See <a href='http://www.spamcop.net/w3m?action=checkblock&ip=127.0.0.2} +
	772	%{'>here</a> for more information.</p>\n<p>See <a href='http://www.spamhaus.org/query/bl?ip=1} +
	773	%{27.0.0.2'>here</a> for more information.</p>\n}
	774	assert_match Regexp.new(Regexp.escape(resp)), r.body
	775	end
	776
	777	def test_dnsbl_filter_allow_action
	778	@request.remote_addr = "127.0.0.2"
	779	r = process 'show', 'id' => 'Oak', 'web' => 'wiki1'
	780	assert_response :success
	781	assert_tag :content => /All about oak/
	782	end
	783
	784	def test_spam_filters
	785	revisions_before = @home.revisions.size
	786	@home.lock(Time.now, 'AnAuthor')
	787	r = process 'save', {'web' => 'wiki1', 'id' => 'HomePage',
	788	'content' => @home.revisions.last.content.dup + "\n Try viagra.\n",
	789	'author' => 'SomeOtherAuthor'}, {:return_to => '/wiki1/show/HomePage'}
	790	assert_redirected_to :action => 'edit', :controller => 'wiki', :web => 'wiki1', :id => 'HomePage',
	791	:content => 'HisWay would be MyWay $\sin(x)\begin{svg}<svg/>\end{svg}\includegraphics[width=3e'+
	792	'm]{foo}$ in kinda ThatWay in HisWay though MyWay \OverThere -- see SmartEngine in'+
	793	" that SmartEngineGUI\n Try viagra.\n"
	794	assert r.flash[:error].to_s == "Your edit was blocked by spam filtering"
	795	end
	796
		def test_save_new_revision_identical_to_last
		revisions_before = @home.revisions.size
		@home.lock(Time.now, 'AnAuthor')
...	...
		'content' => @home.revisions.last.content.dup,
		'author' => 'SomeOtherAuthor'}, {:return_to => '/wiki1/show/HomePage'}

558		~~assert_redirected_to :action => 'edit', :web => 'wiki1', :id => 'HomePage'~~
559		~~assert_flash_has :error~~
560		~~assert r.flash[:error].kind_of?(Instiki::ValidationError)~~
	805	assert_redirected_to :action => 'edit', :controller => 'wiki', :web => 'wiki1', :id => 'HomePage'
	806	assert r.flash[:error].to_s == "You have tried to save page 'HomePage' without changing its content"

		revisions_after = @home.revisions.size
		assert_equal revisions_before, revisions_after
...	...
		assert !@home.locked?(Time.now), 'HomePage should be unlocked if an edit was unsuccessful'
		end

	814	def test_save_new_revision_identical_to_last_but_new_name
	815	revisions_before = @liquor.revisions.size
	816	@liquor.lock(Time.now, 'AnAuthor')
	817
	818	r = process 'save', {'web' => 'wiki1', 'id' => 'liquor',
	819	'content' => @liquor.revisions.last.content.dup, 'new_name' => 'booze',
	820	'author' => 'SomeOtherAuthor'}, {:return_to => '/wiki1/show/booze'}
	821
	822	assert_redirected_to :action => 'show', :controller => 'wiki', :web => 'wiki1', :id => 'booze'
	823
	824	revisions_after = @liquor.revisions.size
	825	assert_equal revisions_before + 1, revisions_after
	826	@booze = Page.find(@liquor.id)
	827	assert !@booze.locked?(Time.now), 'booze should be unlocked if an edit was unsuccessful'
	828	end
	829
		def test_save_blank_author
		r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => 'Contents of a new page',
		'author' => ''
...	...
		another_page = @wiki.read_page('wiki1', 'AnotherPage')
		assert_equal 'AnonymousCoward', another_page.author
		end
	842
	843	def test_save_revised_content_author_name_with_period
	844	r = process 'save', 'web' => 'wiki1', 'id' => 'HomePage', 'content' => 'Contents of a very new page',
	845	'author' => 'foo.bar'
	846	assert_redirected_to :action => 'show', :controller => 'wiki', :web => 'wiki1', :id => 'HomePage'
	847	assert_equal 'foo.bar', @wiki.read_page('wiki1', 'HomePage').author

	849	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => 'a'*10184,
	850	'author' => 'foo.bar'
	851	assert_redirected_to :action => 'show', :controller => 'wiki', :web => 'wiki1', :id => 'NewPage'
	852	assert_equal 'foo.bar', @wiki.read_page('wiki1', 'NewPage').author
	853	end

	855	def test_save_invalid_author_name
	856	r = process 'save', 'web' => 'wiki1', 'id' => 'NewPage', 'content' => 'Contents of a new page',
	857	'author' => "Fu\000Manchu"
	858
	859	assert_redirected_to :action => 'show', :controller => 'wiki', :web => 'wiki1', :id => 'NewPage'
	860	new_page = @wiki.read_page('wiki1', 'NewPage')
	861	assert_equal 'FuManchu', new_page.author
	862
	863	r = process 'save', 'web' => 'wiki1', 'id' => 'AnotherPage', 'content' => 'Contents of a new page',
	864	'author' => "\000"
	865
	866	assert_redirected_to :action => 'show', :controller => 'wiki', :web => 'wiki1', :id => 'AnotherPage'
	867	new_page = @wiki.read_page('wiki1', 'AnotherPage')
	868	assert_equal 'AnonymousCoward', new_page.author
	869
	870	r = process 'save', 'web' => 'wiki1', 'id' => 'AnotherPage', 'content' => 'Revised contents of a new page',
	871	'author' => "Geo&#2147483647;rge & June"
	872
	873	assert_redirected_to :action => 'show', :controller => 'wiki', :web => 'wiki1', :id => 'AnotherPage'
	874	new_page = @wiki.read_page('wiki1', 'AnotherPage')
	875	assert_equal 'George & June', new_page.author
	876	end
	877
		def test_search
		r = process 'search', 'web' => 'wiki1', 'query' => '\s[A-Z]ak'

585		~~assert_redirected_to :action => 'show', :id => 'Oak'~~
	881	assert_redirected_to :web => 'wiki1', :action => 'show', :controller => 'wiki', :id => 'Oak'
		end

		def test_search_multiple_results
		r = process 'search', 'web' => 'wiki1', 'query' => 'All about'

591		~~assert_success~~
	887	assert_response(:success)
		assert_equal 'All about', r.template_objects['query']
		assert_equal [@elephant, @oak], r.template_objects['results']
		assert_equal [], r.template_objects['title_results']
...	...
		def test_search_by_content_and_title
		r = process 'search', 'web' => 'wiki1', 'query' => '(Oak\|Elephant)'

600		~~assert_success~~
	896	assert_response(:success)
		assert_equal '(Oak\|Elephant)', r.template_objects['query']
		assert_equal [@elephant, @oak], r.template_objects['results']
		assert_equal [@elephant, @oak], r.template_objects['title_results']
		end

		def test_search_zero_results
607		~~r = process 'search', 'web' => 'wiki1', 'query' => 'non-existant text'~~
	903	r = process 'search', 'web' => 'wiki1', 'query' => 'non-existant < text'

609		~~assert_success~~
	905	assert_response(:success)
		assert_equal [], r.template_objects['results']
		assert_equal [], r.template_objects['title_results']
	908	create_pattern = Regexp.new(Regexp.escape(%{<b>Create a new page, named:</b> \"}+
	909	%{<span class='newWikiWord'><a href=\"/wiki1/new/non-existant+%3C+t}+
	910	%{ext\">non-existant < text</a></span>}))
	911	assert_match create_pattern, r.body
		end

	914	def test_search_null_in_query
	915	r = process 'search', 'web' => 'wiki1', 'query' => "non-existant\x00"
	916
	917	assert_response(:success)
	918	assert_match /No pages contain \"non-existant\"/, r.body
	919	end
	920
	921	def test_search_FFFF_in_query
	922	r = process 'search', 'web' => 'wiki1', 'query' => "\xEF\xBF\xBF"
	923
	924	assert_response(:success)
	925	assert_match /9 page$s$ containing search string in the page name:/, r.body
	926
	927	r = process 'search', 'web' => 'wiki1', 'query' => "Al\357\277\277l about"
	928
	929	assert_response(:success)
	930	assert_equal 'All about', r.template_objects['query']
	931	assert_equal [@elephant, @oak], r.template_objects['results']
	932	assert_equal [], r.template_objects['title_results']
	933	end
	934
	935	def test_search_FFFD_in_query
	936	r = process 'search', 'web' => 'wiki1', 'query' => "\xEF\xBF\xBD"
	937
	938	assert_response(:success)
	939	assert_equal [], r.template_objects['results']
	940	assert_equal [], r.template_objects['title_results']
	941	end
	942
		def test_show_page
615		~~r = process('show', 'id' => 'Oak', 'web' => 'wiki1')~~
616		~~assert_success~~
	944	r = process 'show', 'id' => 'Oak', 'web' => 'wiki1'
	945	assert_response :success
		assert_tag :content => /All about oak/
		end

		def test_show_page_with_multiple_revisions
		@wiki.write_page('wiki1', 'HomePage', 'Second revision of the HomePage end', Time.now,
622		~~Author.new('AnotherAuthor', '127.0.0.2'), test_renderer)~~
	951	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)

		r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')

626		~~assert_success~~
	955	assert_response :success
		assert_match /Second revision of the <a.HomePage.<\/a> end/, r.body
		end

	959	def test_recursive_include
	960	@wiki.write_page('wiki1', 'HomePage', "Self-include:\n\n [[!include HomePage]] ", Time.now,
	961	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	962
	963	r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
	964
	965	assert_response :success
	966	assert_match /<em>Recursive include detected: HomePage \342\206\222 HomePage<\/em>/, r.body.as_utf8
	967	end
	968
	969	def test_recursive_include_II
	970	@wiki.write_page('wiki1', 'Foo', "extra fun [[!include HomePage]]", Time.now,
	971	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	972	@wiki.write_page('wiki1', 'HomePage', "Recursive-include:\n\n[[!include Foo]]", Time.now,
	973	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	974
	975	r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
	976
	977	assert_response :success
	978	assert_match /<p>Recursive-include:<\/p>\n\n<p>extra fun <em>Recursive include detected: Foo \342\206\222 Foo<\/em><\/p>/, r.body.as_utf8
	979	end
	980
	981	def test_recursive_include_III
	982	@wiki.write_page('wiki1', 'Bar', "extra fun\n\n[[!include HomePage]]", Time.now,
	983	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	984	@wiki.write_page('wiki1', 'Foo', "[[!include Bar]]\n\n[[!include Bar]]", Time.now,
	985	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	986	@wiki.write_page('wiki1', 'HomePage', "Recursive-include:\n\n[[!include Foo]]", Time.now,
	987	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	988
	989	r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
	990
	991	assert_response :success
	992	assert_match /<p>Recursive-include:<\/p>\n\n<p>extra fun<\/p>\n<em>Recursive include detected: Bar \342\206\222 Bar<\/em>/, r.body.as_utf8
	993	end
	994
	995	def test_nonrecursive_include
	996	@wiki.write_page('wiki1', 'Bar', "extra fun\n\n[[HomePage]]", Time.now,
	997	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	998	@wiki.write_page('wiki1', 'Foo', "[[!include Bar]]\n\n[[!include Bar]]", Time.now,
	999	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	1000	@wiki.write_page('wiki1', 'HomePage', "Nonrecursive-include:\n\n[[!include Foo]]", Time.now,
	1001	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	1002
	1003	r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')
	1004
	1005	assert_response :success
	1006	assert_match /<p>Nonrecursive-include:<\/p>\n\n<p>extra fun<\/p>\n\n<p><a class='existingWikiWord' href='\/wiki1\/show\/HomePage'>HomePage<\/a><\/p>/, r.body
	1007	end
	1008
	1009	def test_divref
	1010	@wiki.write_page('wiki1', 'Bar', "+-- \{: .num_lemma #Leftcosetsdisjoint\}\n###### Lem" +
	1011	"ma\nLet $H$ be a subgroup of a group $G$, and let $x$ and $y$ be elements\n of $G$" +
	1012	". Suppose that $x H \\cap y H$ is non-empty. Then $x H = y H$.\n=--\n\n See Lemma \\" +
	1013	"ref\{Leftcosetsdisjoint\}.", Time.now,
	1014	Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	1015
	1016	r = process('show', 'id' => 'Bar', 'web' => 'wiki1')
	1017
	1018	assert_response :success
	1019	resp = %{<div class='num_lemma' id='Leftcosetsdisjoint'>\n<h6 id='lemma_1'>Lemma</h6>\n\n} +
	1020	%{<p>Let <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Mat} +
	1021	%{h/MathML'><mi>H</mi></math> be a subgroup of a group <math class='maruku-mathml' displ} +
	1022	%{ay='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math>, and let <ma} +
	1023	%{th class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	1024	%{<mi>x</mi></math> and <math class='maruku-mathml' display='inline' xmlns='http://www.} +
	1025	%{w3.org/1998/Math/MathML'><mi>y</mi></math> be elements of <math class='maruku-mathml'} +
	1026	%{ display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math>. Suppo} +
	1027	%{se that <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Ma} +
	1028	%{th/MathML'><mi>x</mi><mi>H</mi><mo>\342\210\251</mo><mi>y</mi><mi>H</mi></math> is no} +
	1029	%{n-empty. Then <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1} +
	1030	%{998/Math/MathML'><mi>x</mi><mi>H</mi><mo>=</mo><mi>y</mi><mi>H</mi></math>.</p>\n</di} +
	1031	%{v>\n\n<p>See Lemma <a class='maruku-ref' href='#Leftcosetsdisjoint'>1</a>.</p>}
	1032	assert_match Regexp.new(resp), r.body
	1033	end
	1034
		def test_show_page_nonexistant_page
		process('show', 'id' => 'UnknownPage', 'web' => 'wiki1')
632		~~assert_redirected_to :web => 'wiki1', :action => 'new', :id => 'UnknownPage'~~
	1037	assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'new', :id => 'UnknownPage'
		end

		def test_show_no_page
...	...
		assert_response :missing
		end

	1048	def set_tex_header
	1049	@tex_header1 = %q!\documentclass[12pt,titlepage]{article}
	1050
	1051	\usepackage{amsmath}
	1052	\usepackage{amsfonts}
	1053	\usepackage{amssymb}
	1054	\usepackage{amsthm}
	1055	\usepackage{mathtools}
	1056	!
	1057	@tex_header2 = %q!\usepackage{graphicx}
	1058	\usepackage{color}
	1059	\usepackage{ucs}
	1060	\usepackage[utf8x]{inputenc}
	1061	\usepackage{hyperref}
	1062
	1063	%----Macros----------
	1064	%
	1065	% Unresolved issues:
	1066	%
	1067	% \righttoleftarrow
	1068	% \lefttorightarrow
	1069	%
	1070	% \color{} with HTML colorspec
	1071	% \bgcolor
	1072	% \array with options (without options, it's equivalent to the matrix environment)
	1073
	1074	% Of the standard HTML named colors, white, black, red, green, blue and yellow
	1075	% are predefined in the color package. Here are the rest.
	1076	\definecolor{aqua}{rgb}{0, 1.0, 1.0}
	1077	\definecolor{fuschia}{rgb}{1.0, 0, 1.0}
	1078	\definecolor{gray}{rgb}{0.502, 0.502, 0.502}
	1079	\definecolor{lime}{rgb}{0, 1.0, 0}
	1080	\definecolor{maroon}{rgb}{0.502, 0, 0}
	1081	\definecolor{navy}{rgb}{0, 0, 0.502}
	1082	\definecolor{olive}{rgb}{0.502, 0.502, 0}
	1083	\definecolor{purple}{rgb}{0.502, 0, 0.502}
	1084	\definecolor{silver}{rgb}{0.753, 0.753, 0.753}
	1085	\definecolor{teal}{rgb}{0, 0.502, 0.502}
	1086
	1087	% Because of conflicts, \space and \mathop are converted to
	1088	% \itexspace and \operatorname during preprocessing.
	1089
	1090	% itex: \space{ht}{dp}{wd}
	1091	%
	1092	% Height and baseline depth measurements are in units of tenths of an ex while
	1093	% the width is measured in tenths of an em.
	1094	\makeatletter
	1095	\newdimen\itex@wd%
	1096	\newdimen\itex@dp%
	1097	\newdimen\itex@thd%
	1098	\def\itexspace#1#2#3{\itex@wd=#3em%
	1099	\itex@wd=0.1\itex@wd%
	1100	\itex@dp=#2ex%
	1101	\itex@dp=0.1\itex@dp%
	1102	\itex@thd=#1ex%
	1103	\itex@thd=0.1\itex@thd%
	1104	\advance\itex@thd\the\itex@dp%
	1105	\makebox[\the\itex@wd]{\rule[-\the\itex@dp]{0cm}{\the\itex@thd}}}
	1106	\makeatother
	1107
	1108	% \tensor and \multiscript
	1109	\makeatletter
	1110	\newif\if@sup
	1111	\newtoks\@sups
	1112	\def\append@sup#1{\edef\act{\noexpand\@sups={\the\@sups #1}}\act}%
	1113	\def\reset@sup{\@supfalse\@sups={}}%
	1114	\def\mk@scripts#1#2{\if #2/ \if@sup ^{\the\@sups}\fi \else%
	1115	\ifx #1_ \if@sup ^{\the\@sups}\reset@sup \fi {}_{#2}%
	1116	\else \append@sup#2 \@suptrue \fi%
	1117	\expandafter\mk@scripts\fi}
	1118	\def\tensor#1#2{\reset@sup#1\mk@scripts#2_/}
	1119	\def\multiscripts#1#2#3{\reset@sup{}\mk@scripts#1_/#2%
	1120	\reset@sup\mk@scripts#3_/}
	1121	\makeatother
	1122
	1123	% \slash
	1124	\makeatletter
	1125	\newbox\slashbox \setbox\slashbox=\hbox{$/$}
	1126	\def\itex@pslash#1{\setbox\@tempboxa=\hbox{$#1$}
	1127	\@tempdima=0.5\wd\slashbox \advance\@tempdima 0.5\wd\@tempboxa
	1128	\copy\slashbox \kern-\@tempdima \box\@tempboxa}
	1129	\def\slash{\protect\itex@pslash}
	1130	\makeatother
	1131
	1132	% math-mode versions of \rlap, etc
	1133	% from Alexander Perlis, "A complement to \smash, \llap, and lap"
	1134	% http://math.arizona.edu/~aprl/publications/mathclap/
	1135	\def\clap#1{\hbox to 0pt{\hss#1\hss}}
	1136	\def\mathllap{\mathpalette\mathllapinternal}
	1137	\def\mathrlap{\mathpalette\mathrlapinternal}
	1138	\def\mathclap{\mathpalette\mathclapinternal}
	1139	\def\mathllapinternal#1#2{\llap{$\mathsurround=0pt#1{#2}$}}
	1140	\def\mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}}
	1141	\def\mathclapinternal#1#2{\clap{$\mathsurround=0pt#1{#2}$}}
	1142
	1143	% Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2}
	1144	\let\oldroot\root
	1145	\def\root#1#2{\oldroot #1 \of{#2}}
	1146	\renewcommand{\sqrt}[2][]{\oldroot #1 \of{#2}}
	1147
	1148	% Manually declare the txfonts symbolsC font
	1149	\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n}
	1150	\SetSymbolFont{symbolsC}{bold}{U}{txsyc}{bx}{n}
	1151	\DeclareFontSubstitution{U}{txsyc}{m}{n}
	1152
	1153	% Manually declare the stmaryrd font
	1154	\DeclareSymbolFont{stmry}{U}{stmry}{m}{n}
	1155	\SetSymbolFont{stmry}{bold}{U}{stmry}{b}{n}
	1156
	1157	% Declare specific arrows from txfonts without loading the full package
	1158	\makeatletter
	1159	\def\re@DeclareMathSymbol#1#2#3#4{%
	1160	\let#1=\undefined
	1161	\DeclareMathSymbol{#1}{#2}{#3}{#4}}
	1162	\re@DeclareMathSymbol{\neArrow}{\mathrel}{symbolsC}{116}
	1163	\re@DeclareMathSymbol{\neArr}{\mathrel}{symbolsC}{116}
	1164	\re@DeclareMathSymbol{\seArrow}{\mathrel}{symbolsC}{117}
	1165	\re@DeclareMathSymbol{\seArr}{\mathrel}{symbolsC}{117}
	1166	\re@DeclareMathSymbol{\nwArrow}{\mathrel}{symbolsC}{118}
	1167	\re@DeclareMathSymbol{\nwArr}{\mathrel}{symbolsC}{118}
	1168	\re@DeclareMathSymbol{\swArrow}{\mathrel}{symbolsC}{119}
	1169	\re@DeclareMathSymbol{\swArr}{\mathrel}{symbolsC}{119}
	1170	\re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46}
	1171	\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
	1172	\re@DeclareMathSymbol{\Vbar}{\mathrel}{symbolsC}{121}
	1173	\re@DeclareMathSymbol{\sslash}{\mathrel}{stmry}{12}
	1174	\re@DeclareMathSymbol{\invamp}{\mathrel}{symbolsC}{77}
	1175	\re@DeclareMathSymbol{\parr}{\mathrel}{symbolsC}{77}
	1176	\makeatother
	1177
	1178	% Widecheck
	1179	\makeatletter
	1180	\DeclareRobustCommand\widecheck[1]{{\mathpalette\@widecheck{#1}}}
	1181	\def\@widecheck#1#2{%
	1182	\setbox\z@\hbox{\m@th$#1#2$}%
	1183	\setbox\tw@\hbox{\m@th$#1%
	1184	\widehat{%
	1185	\vrule\@width\z@\@height\ht\z@
	1186	\vrule\@height\z@\@width\wd\z@}$}%
	1187	\dp\tw@-\ht\z@
	1188	\@tempdima\ht\z@ \advance\@tempdima2\ht\tw@ \divide\@tempdima\thr@@
	1189	\setbox\tw@\hbox{%
	1190	\raise\@tempdima\hbox{\scalebox{1}[-1]{\lower\@tempdima\box
	1191	\tw@}}}%
	1192	{\ooalign{\box\tw@ \cr \box\z@}}}
	1193	\makeatother
	1194
	1195	% udots (taken from yhmath)
	1196	\makeatletter
	1197	\def\udots{\mathinner{\mkern2mu\raise\p@\hbox{.}
	1198	\mkern2mu\raise4\p@\hbox{.}\mkern1mu
	1199	\raise7\p@\vbox{\kern7\p@\hbox{.}}\mkern1mu}}
	1200	\makeatother
	1201
	1202	%% Fix array
	1203	\newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}}
	1204
	1205	%% Renaming existing commands
	1206	\newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}}
	1207	\newcommand{\widevec}{\overrightarrow}
	1208	\newcommand{\darr}{\downarrow}
	1209	\newcommand{\nearr}{\nearrow}
	1210	\newcommand{\nwarr}{\nwarrow}
	1211	\newcommand{\searr}{\searrow}
	1212	\newcommand{\swarr}{\swarrow}
	1213	\newcommand{\curvearrowbotright}{\curvearrowright}
	1214	\newcommand{\uparr}{\uparrow}
	1215	\newcommand{\downuparrow}{\updownarrow}
	1216	\newcommand{\duparr}{\updownarrow}
	1217	\newcommand{\updarr}{\updownarrow}
	1218	\newcommand{\gt}{>}
	1219	\newcommand{\lt}{<}
	1220	\newcommand{\map}{\mapsto}
	1221	\newcommand{\embedsin}{\hookrightarrow}
	1222	\newcommand{\Alpha}{A}
	1223	\newcommand{\Beta}{B}
	1224	\newcommand{\Zeta}{Z}
	1225	\newcommand{\Eta}{H}
	1226	\newcommand{\Iota}{I}
	1227	\newcommand{\Kappa}{K}
	1228	\newcommand{\Mu}{M}
	1229	\newcommand{\Nu}{N}
	1230	\newcommand{\Rho}{P}
	1231	\newcommand{\Tau}{T}
	1232	\newcommand{\Upsi}{\Upsilon}
	1233	\newcommand{\omicron}{o}
	1234	\newcommand{\lang}{\langle}
	1235	\newcommand{\rang}{\rangle}
	1236	\newcommand{\Union}{\bigcup}
	1237	\newcommand{\Intersection}{\bigcap}
	1238	\newcommand{\Oplus}{\bigoplus}
	1239	\newcommand{\Otimes}{\bigotimes}
	1240	\newcommand{\Wedge}{\bigwedge}
	1241	\newcommand{\Vee}{\bigvee}
	1242	\newcommand{\coproduct}{\coprod}
	1243	\newcommand{\product}{\prod}
	1244	\newcommand{\closure}{\overline}
	1245	\newcommand{\integral}{\int}
	1246	\newcommand{\doubleintegral}{\iint}
	1247	\newcommand{\tripleintegral}{\iiint}
	1248	\newcommand{\quadrupleintegral}{\iiiint}
	1249	\newcommand{\conint}{\oint}
	1250	\newcommand{\contourintegral}{\oint}
	1251	\newcommand{\infinity}{\infty}
	1252	\newcommand{\bottom}{\bot}
	1253	\newcommand{\minusb}{\boxminus}
	1254	\newcommand{\plusb}{\boxplus}
	1255	\newcommand{\timesb}{\boxtimes}
	1256	\newcommand{\intersection}{\cap}
	1257	\newcommand{\union}{\cup}
	1258	\newcommand{\Del}{\nabla}
	1259	\newcommand{\odash}{\circleddash}
	1260	\newcommand{\negspace}{\\\!}
	1261	\newcommand{\widebar}{\overline}
	1262	\newcommand{\textsize}{\normalsize}
	1263	\renewcommand{\scriptsize}{\scriptstyle}
	1264	\newcommand{\scriptscriptsize}{\scriptscriptstyle}
	1265	\newcommand{\mathfr}{\mathfrak}
	1266	\newcommand{\statusline}[2]{#2}
	1267	\newcommand{\tooltip}[2]{#2}
	1268	\newcommand{\toggle}[2]{#2}
	1269
	1270	% Theorem Environments
	1271	\theoremstyle{plain}
	1272	\newtheorem{theorem}{Theorem}
	1273	\newtheorem{lemma}{Lemma}
	1274	\newtheorem{prop}{Proposition}
	1275	\newtheorem{cor}{Corollary}
	1276	\newtheorem*{utheorem}{Theorem}
	1277	\newtheorem*{ulemma}{Lemma}
	1278	\newtheorem*{uprop}{Proposition}
	1279	\newtheorem*{ucor}{Corollary}
	1280	\theoremstyle{definition}
	1281	\newtheorem{defn}{Definition}
	1282	\newtheorem{example}{Example}
	1283	\newtheorem*{udefn}{Definition}
	1284	\newtheorem*{uexample}{Example}
	1285	\theoremstyle{remark}
	1286	\newtheorem{remark}{Remark}
	1287	\newtheorem{note}{Note}
	1288	\newtheorem*{uremark}{Remark}
	1289	\newtheorem*{unote}{Note}
	1290
	1291	%-------------------------------------------------------------------
	1292
	1293	\begin{document}
	1294
	1295	%-------------------------------------------------------------------
	1296
	1297	!
	1298	end
	1299
		def test_tex
		r = process('tex', 'web' => 'wiki1', 'id' => 'HomePage')
645		~~assert_success~~
	1302	assert_response(:success)

647		~~assert_equal "\\documentclass[12pt,titlepage]{article}\n\n\\usepackage[danish]{babel} " +~~
648		~~"%danske tekster\n\\usepackage[OT1]{fontenc} %rigtige danske bogstaver...\n" +~~
649		~~"\\usepackage{a4}\n\\usepackage{graphicx}\n\\usepackage{ucs}\n\\usepackage[utf8x]" +~~
650		~~"{inputenc}\n\\input epsf \n\n%----------------------------------------------------" +~~
651		~~"---------------\n\n\\begin{document}\n\n\\sloppy\n\n%-----------------------------" +~~
652		~~"--------------------------------------\n\n\\section*{HomePage}\n\nHisWay would be " +~~
653		~~"MyWay in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that " +~~
654		~~"SmartEngineGUI\n\n\\end{document}", r.body~~
	1304	assert_equal @tex_header1 + @tex_header2 + %q!\section*{HomePage}
	1305
	1306	HisWay would be MyWay $\sin(x) \includegraphics[width=3em]{foo}$ in kinda ThatWay in HisWay though MyWay $\backslash$OverThere --{} see SmartEngine in that SmartEngineGUI
	1307
	1308
	1309
	1310	\end{document}
	1311	!, r.body
		end

	1314	def test_tex_character_conversions
	1315	@wiki.write_page('wiki1', 'Page2',
	1316	"Page2 contents { & ^ <.\n",
	1317	Time.now, Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	1318	r = process('tex', 'web' => 'wiki1', 'id' => 'Page2')
	1319	assert_response(:success)
	1320
	1321	assert_equal @tex_header1 + @tex_header2 + %q!\section*{Page2}

	1323	Page2 contents \{ \& {\tt \symbol{94}} {\tt \symbol{60}}.
	1324
	1325
	1326
	1327	\end{document}
	1328	!, r.body
	1329	end
	1330
	1331	def test_tex_with_blackboard_digits
	1332	@wiki.write_page('wiki1', 'Page2',
	1333	"Page2 contents $\\mathbb{01234}$.\n",
	1334	Time.now, Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	1335	r = process('tex', 'web' => 'wiki1', 'id' => 'Page2')
	1336	assert_response(:success)
	1337
	1338	assert_equal @tex_header1 + "\\usepackage{mathbbol}\n" + @tex_header2 + %q!\section*{Page2}
	1339
	1340	Page2 contents $\mathbb{01234}$.
	1341
	1342
	1343
	1344	\end{document}
	1345	!, r.body
	1346	end
	1347
	1348	def test_tex_list
	1349	@wiki.write_page('wiki1', "Ch\303\242timent & Page",
	1350	"Page2 contents $\\mathbb{01234}$.\n",
	1351	Time.now, Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
	1352	@request.env['RAW_POST_DATA'] = "_form_key=353106ff8c8466727ee5338baaa0640c87c9b0d6&Ch%C3%A2timent+%26+Page=tex&BogusPage=tex&HomePage=tex&commit=Export"
	1353	r = process('tex_list', 'web' => 'wiki1', 'Page2' => 'tex', 'BogusPage'=> 'tex', 'HomePage' => 'tex')
	1354	assert_response(:success)
	1355	assert_equal @tex_header1 + "\\usepackage{mathbbol}\n" + @tex_header2 + %q!\section*{Châtiment \\& Page}
	1356
	1357	Page2 contents $\mathbb{01234}$.
	1358
	1359	\section*{HomePage}
	1360
	1361	HisWay would be MyWay $\sin(x) \includegraphics[width=3em]{foo}$ in kinda ThatWay in HisWay though MyWay $\backslash$OverThere --{} see SmartEngine in that SmartEngineGUI
	1362
	1363
	1364
	1365
	1366	\end{document}
	1367	!, r.body
	1368	end
	1369
		def test_web_list
		another_wiki = @wiki.create_web('Another Wiki', 'another_wiki')

		r = process('web_list')

663		~~assert_success~~
	1375	assert_response(:success)
		assert_equal [another_wiki, webs(:instiki), @web], r.template_objects['webs']
		end

rool/rails/instiki/trunk/test/test_helper.rb:

prev.	current


		# Expand the path to environment so that Ruby does not load it multiple times
		# File.expand_path can be removed if Ruby 1.9 is in use.
5		~~require File.expand_path(File.dirname(__FILE__) + '/../config/environment')~~
6		~~require 'application'~~
	5	require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))

8		~~require 'test/unit'~~
9		~~require 'active_record/fixtures'~~
10		~~require 'action_controller/test_process'~~
11		~~require 'action_web_service/test_invoke'~~
12		~~require 'breakpoint'~~
	7	require 'test_help'
		require 'wiki_content'
		require 'url_generator'
	10	require 'digest/sha1'

16		~~# Uncomment these and hang on, because the tests will be FAST~~
17		~~#Test::Unit::TestCase.pre_loaded_fixtures = false~~
18		~~#Test::Unit::TestCase.use_transactional_fixtures = true~~
	12	# simulates cookie session store
	13	class FakeSessionDbMan
	14	def self.generate_digest(data)
	15	Digest::SHA1.hexdigest("secure")
	16	end
	17	end

20		~~Test::Unit::TestCase.use_instantiated_fixtures = false~~
21		~~Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"~~
	19	class ActiveSupport::TestCase
	20	self.pre_loaded_fixtures = false
	21	self.use_transactional_fixtures = true
	22	self.use_instantiated_fixtures = false
	23	self.fixture_path = Rails.root.join('test', 'fixtures', '')
	24	end

		# activate PageObserver
		PageObserver.instance

		class Test::Unit::TestCase
		def create_fixtures(*table_names)
28		~~Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures", table_names)~~
	31	Fixtures.create_fixtures(Rails.root.join('test', 'fixtures'), table_names)
		end

		# Add more helper methods to be used by all tests here...
...	...
		(1..30).each do \|i\|
		@wiki.write_page('wiki1', "page#{i}", "Test page #{i}\ncategory: test",
		Time.local(1976, 10, i, 12, 00, 00), Author.new('Dema', '127.0.0.2'),
43		~~test_renderer)~~
	46	x_test_renderer)
		end
		end
		@web = Web.find(@web.id)
		end

49		~~def test_renderer(revision = nil)~~
	52	def x_test_renderer(revision = nil)
		PageRenderer.setup_url_generator(StubUrlGenerator.new)
		PageRenderer.new(revision)
		end
...	...
		# It provides a easy way to test whether a chunk matches a particular string
		# and any the values of any fields that should be set after a match.
		class ContentStub < String
	68
	69	attr_reader :web
	70
		include ChunkManager
		def initialize(str)
		super
		init_chunk_manager
	75	@web = Object.new
	76	class << @web
	77	def address
	78	'wiki1'
	79	end
	80	end
		end
	82
	83	def url_generator
	84	StubUrlGenerator.new
	85	end
	86
		def page_link(*); end
		end

...	...
		super(:doesnt_need_controller)
		end

107		~~def file_link(mode, name, text, web_name, known_file)~~
	124	def url_for(hash = {})
	125	if(hash[:action] == 'list')
	126	"/#{hash[:web]}/list"
	127	else
	128	'../files/pngs'
	129	end
	130	end
	131
	132	def file_link(mode, name, text, web_name, known_file, description)
		link = CGI.escape(name)
		case mode
		when :export
111		~~if known_file then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>}~~
	136	if known_file then %{<a class="existingWikiWord" title="#{description}" href="#{link}.html">#{text}</a>}
		else %{<span class="newWikiWord">#{text}</span>} end
		when :publish
114		~~if known_file then %{<a class="existingWikiWord" href="../published/#{link}">#{text}</a>}~~
	139	if known_file then %{<a class="existingWikiWord" title="#{description}" href="../published/#{link}">#{text}</a>}
		else %{<span class=\"newWikiWord\">#{text}</span>} end
		else
		if known_file
118		~~%{<a class=\"existingWikiWord\" href=\"../file/#{link}\">#{text}</a>}~~
	143	%{<a class=\"existingWikiWord\" title="#{description}" href=\"../file/#{link}\">#{text}</a>}
		else
		%{<span class=\"newWikiWord\">#{text}<a href=\"../file/#{link}\">?</a></span>}
		end
...	...

		def page_link(mode, name, text, web_address, known_page)
		link = CGI.escape(name)
127		~~case mode.to_sym~~
	152	title = web_address == 'wiki1' ? '' : " title='#{web_address}'"
	153	case mode
		when :export
		if known_page then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>}
		else %{<span class="newWikiWord">#{text}</span>} end
		when :publish
132		~~if known_page then %{<a class="existingWikiWord" href="../published/#{link}">#{text}</a>}~~
	158	if known_page then %{<a class="existingWikiWord" href="../published/#{link}"#{title}>#{text}</a>}
		else %{<span class="newWikiWord">#{text}</span>} end
		else
		if known_page
136		~~%{<a class="existingWikiWord" href="../show/#{link}">#{text}</a>}~~
	162	if web_address == 'instiki'
	163	%{<a class="existingWikiWord" href="../../#{web_address}/show/#{link}"#{title}>#{text}</a>}
	164	else
	165	%{<a class="existingWikiWord" href="../show/#{link}"#{title}>#{text}</a>}
	166	end
		else
138		~~%{<span class="newWikiWord">#{text}<a href="../show/#{link}">?</a></span>}~~
	168	if web_address == 'instiki'
	169	%{<span class="newWikiWord">#{text}<a href="../../#{web_address}/show/#{link}">?</a></span>}
	170	else
	171	%{<span class="newWikiWord">#{text}<a href="../show/#{link}">?</a></span>}
	172	end
		end
		end
		end

		def pic_link(mode, name, text, web_name, known_pic)
		link = CGI.escape(name)
	179	text = CGI.escapeHTML(CGI.unescapeHTML(text \|\| :description))
		case mode.to_sym
		when :export
		if known_pic then %{<img alt="#{text}" src="#{link}" />}
		else %{<img alt="#{text}" src="no image" />} end
		when :publish
150		~~if known_pic then %{<img alt="#{text}" src="#{link}" />}~~
	185	if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}
		else %{<span class="newWikiWord">#{text}</span>} end
		else
		if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}
...	...
		end
		end

	194	def media_link(mode, name, text, web_address, known_media, media_type)
	195	link = CGI.escape(name)
	196	text = CGI.escapeHTML(CGI.unescapeHTML(text \|\| :description))
	197	case mode.to_sym
	198	when :export
	199	if known_media
	200	%{<#{media_type} src="#{CGI.escape(name)}" controls="controls">#{text}</#{media_type}>}
	201	else
	202	text
	203	end
	204	when :publish
	205	if known_media
	206	%{<#{media_type} src="../file/#{link}" controls="controls">#{text}</#{media_type}>}
	207	else
	208	%{<span class="newWikiWord">#{text}</span>}
	209	end
	210	else
	211	if known_media
	212	%{<#{media_type} src="../file/#{link}" controls="controls">#{text}</#{media_type}>}
	213	else
	214	%{<span class="newWikiWord">#{text}<a href="../file/#{link}">?</a></span>}
	215	end
	216	end
	217	end
	218
		module Test
		module Unit
		module Assertions

rool/rails/instiki/trunk/test/unit/chunks/category_test.rb:

prev.	current

		#!/usr/bin/env ruby

3		~~require File.dirname(__FILE__) + '/../../test_helper'~~
	3	require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
		require 'chunks/category'

		class CategoryTest < Test::Unit::TestCase
		include ChunkMatch

		def test_single_category
10		~~match(Category, 'category: test', :list => ['test'], :hidden => nil)~~
11		~~match(Category, 'category : chunk test ', :list => ['chunk test'], :hidden => nil)~~
	10	match(Category, 'category: test', :list => ['test'], :hidden => nil, :unmask_text =>
	11	"<div class=\"property\"> category: <a class=\"category_link\" href=\"/wiki1/list/test\">test</a></div>")
	12	match(Category, 'category : chunk test ', :list => ['chunk test'], :hidden => nil, :unmask_text =>
	13	"<div class=\"property\"> category: <a class=\"category_link\" href=\"/wiki1/list/chunk+test\">chunk test</a></div>")
		match(Category, ':category: test', :list => ['test'], :hidden => ':')
		end

	17	def test_no_category
	18	match(Category, 'category: ', :list => [], :hidden => nil)
	19	match(Category, 'category : chunk test , ', :list => ['chunk test'], :hidden => nil)
	20	match(Category, ':category:', :list => [], :hidden => ':')
	21	end
	22
		def test_multiple_categories
		match(Category, 'category: test, multiple', :list => ['test', 'multiple'], :hidden => nil)
		match(Category, 'category : chunk test , multi category,regression test case ',
...	...
		)
		end

	30	def test_multiple_categories_sanitized
	31	match(Category, 'category: test, multiple,<span>a & b</span> <script>alert("XSS!");</script>', :list => ['test', 'multiple', '<span>a & b</span> <script>alert("XSS!");</script>'], :hidden => nil)
	32	match(Category, 'category : chunk test , multi category,<span>a & b</span> <script>alert("XSS!");</script>',
	33	:list => ['chunk test','multi category','<span>a & b</span> <script>alert("XSS!");</script>'], :hidden => nil
	34	)
	35	end
	36
	37	def test_multiple_categories_invalid_utf8
	38	match(Category, "category: test, multiple,\000egg", :list => ['test', 'multiple', 'egg'], :hidden => nil)
	39	match(Category, "category : chunk test , multi category,,e\000gg", :list => ['chunk test', 'multi category', 'egg'], :hidden => nil)
	40	end
	41
		end

rool/rails/instiki/trunk/test/unit/chunks/nowiki_test.rb:

prev.	current

		#!/usr/bin/env ruby

3		~~require File.dirname(__FILE__) + '/../../test_helper'~~
	3	require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
		require 'chunks/nowiki'

		class NoWikiTest < Test::Unit::TestCase
...	...
		)
		end

	15	def test_include_nowiki
	16	match(NoWiki, 'This sentence contains <nowiki>[[!include foo]]</nowiki>. Do not touch!',
	17	:plain_text => '[[!include foo]]'
	18	)
	19	end
	20
	21	def test_markdown_nowiki
	22	match(NoWiki, 'This sentence contains <nowiki>raw text</nowiki>. Do not touch!',
	23	:plain_text => 'raw text'
	24	)
	25	end
	26
	27	def test_sanitize_nowiki
	28	match(NoWiki, 'This sentence contains <nowiki>[[test]]&<a href="a&b">shebang</a> <script>alert("xss!");</script> foo</nowiki>. Do not touch!',
	29	:plain_text => "[[test]]&<a href='a&b'>shebang</a> <script>alert("xss!");</script> foo"
	30	)
	31	end
	32
	33	def test_sanitize_nowiki_ill_formed
	34	match(NoWiki, "<nowiki><animateColor xlink:href='#foo'/></nowiki>",
	35	:plain_text => "<animateColor xlink:href='#foo'/>"
	36	)
	37	end
	38
	39	def test_sanitize_nowiki_ill_formed_II
	40	match(NoWiki, "<nowiki><animateColor xlink:href='#foo'/>\000</nowiki>",
	41	:plain_text => %(<animateColor xlink:href='#foo'/>)
	42	)
	43	end
	44
	45	def test_sanitize_nowiki_bad_utf8
	46	match(NoWiki, "<nowiki>\357elephant &AMP; \302ivory</nowiki>",
	47	:plain_text => "".respond_to?(:force_encoding) ? "elephant &AMP; ivory" : "ephant &AMP; vory"
	48	)
	49	end
	50
		end

rool/rails/instiki/trunk/test/unit/chunks/wiki_test.rb:

prev.	current

		#!/usr/bin/env ruby
	2	#coding: UTF-8

3		~~require File.dirname(__FILE__) + '/../../test_helper'~~
	4	require Rails.root.join('test', 'test_helper')
		require 'chunks/wiki'

		class WikiTest < Test::Unit::TestCase
...	...
		match(WikiChunk::Word, 'This is a WikiWord okay?', :page_name => 'WikiWord')
		end

	15	def test_cyrillic
	16	match(WikiChunk::Word, 'This is a НовойСтраницы okay?', :page_name => 'НовойСтраницы')
	17	end
	18
	19	def test_cyrillic_lowercase
	20	no_match(WikiChunk::Word, 'This is a Новойстраницы?')
	21	end
	22
	23	def test_lowercase_accented
	24	no_match(WikiChunk::Word, "This is a Refer\303\252ncia?")
	25	end
	26
		def test_escaped
		# escape is only implemented in WikiChunk::Word
		match(WikiChunk::Word, 'Do not link to an \EscapedWord',
...	...
		match(WikiChunk::Link, 'This is a [[bracketted link]]', :page_name => 'bracketted link')
		end

	38	def test_single_letter_brackets
	39	match(WikiChunk::Link, 'This is a [[x]]', :page_name => 'x')
	40	end
	41
		def test_void_brackets
		# double brackets woith only spaces inside are not a WikiLink
		no_match(WikiChunk::Link, "This [[ ]] are [[]] no [[ \t ]] links")
...	...
		:page_name => 'Sperberg-McQueen')
		end

	67	def test_interweb_links
	68	match(WikiChunk::Link, 'This is a tricky link [[Froogle:Sperberg-McQueen]]',
	69	{:page_name => 'Sperberg-McQueen', :web_name => 'Froogle'})
	70	end
	71
	72	def test_void_include
	73	# double brackets with only spaces inside are not a WikiInclude
	74	no_match(Include, "This [[!include ]] are [[!include]] no [[!include \t ]] links")
	75	end
	76
	77	def test_include_strip_spaces
	78	content = "This is a [[!include Sperberg-McQueen \t ]] link with trailing spaces to strip. " +
	79	"This is a [[!include \t Gross-Mende]] link with leading spaces to strip." +
	80	"This is a [[!include Milo Miles ]] link with spaces around it to strip"
	81	recognized_includes = content.scan(Include.pattern).collect { \|m\| m[0] }
	82	assert_equal ['Sperberg-McQueen', 'Gross-Mende', 'Milo Miles'], recognized_includes
	83	end
	84
		def test_include_chunk_pattern
51		~~content = 'This is a [[!include pagename]] and [[!include WikiWord]] but [[blah]]'~~
	86	content = 'This is a [[!include pagename]] and [[!include WikiWord]] and [[!include x]]but [[blah]]'
		recognized_includes = content.scan(Include.pattern).collect { \|m\| m[0] }
53		~~assert_equal %w(pagename WikiWord), recognized_includes~~
	88	assert_equal %w(pagename WikiWord x), recognized_includes
		end

	91	def test_redirects_chunk_pattern
	92	content = 'This is a [[!redirects pagename]] and [[!redirects WikiWord]] and' +
	93	' [[!redirects x]] and [[!redirects page name]] but [[blah]]'
	94	recognized_redirects = content.scan(Redirect.pattern).collect { \|m\| m[0] }
	95	assert_equal %w(pagename WikiWord x page\ name), recognized_redirects
	96	end
	97
		def test_textile_link
		textile_link = ContentStub.new('"Here is a special link":SpecialLink')
		WikiChunk::Word.apply_to(textile_link)
...	...
		# empty link type
		assert_link_parsed_as 'page name', 'link?:', :show, '[[page name\|link?:]]'
		# unknown link type
84		~~assert_link_parsed_as 'page name:create_system', 'page name:create_system', :show,~~
	126	assert_link_parsed_as 'create_system', 'create_system', :show,
		'[[page name:create_system]]'
		end

rool/rails/instiki/trunk/test/unit/diff_test.rb:

prev.	current

		#!/usr/bin/env ruby

		require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
4		~~require 'diff'~~
	4	require 'xhtmldiff'

		class DiffTest < Test::Unit::TestCase

8		~~include HTMLDiff~~
9
		def setup
11		~~@builder = DiffBuilder.new('old', 'new')~~
12		~~end~~

14		~~def test_start_of_tag~~
15		~~assert @builder.start_of_tag?('<')~~
16		~~assert(!@builder.start_of_tag?('>'))~~
17		~~assert(!@builder.start_of_tag?('a'))~~
		end

20		~~def test_end_of_tag~~
21		~~assert @builder.end_of_tag?('>')~~
22		~~assert(!@builder.end_of_tag?('<'))~~
23		~~assert(!@builder.end_of_tag?('a'))~~
	12	def diff(a,b)
	13	diff_doc = REXML::Document.new
	14	div = REXML::Element.new('div', nil, {:respect_whitespace =>:all})
	15	div.attributes['class'] = 'xhtmldiff_wrapper'
	16	diff_doc << div
	17	hd = XHTMLDiff.new(div)
	18	parsed_a = REXML::HashableElementDelegator.new(
	19	REXML::XPath.first(REXML::Document.new("<div>"+a+"</div>"), '/div'))
	20	parsed_b = REXML::HashableElementDelegator.new(
	21	REXML::XPath.first(REXML::Document.new("<div>"+b+"</div>"), '/div'))
	22	Diff::LCS.traverse_balanced(parsed_a, parsed_b, hd)
	23	diffs = ''
	24	diff_doc.write(diffs, -1, true, true)
	25	diffs.gsub(/\A<div class='xhtmldiff_wrapper'>(.*)<\/div>\Z/m, '\1')
		end

26		~~def test_whitespace~~
27		~~assert @builder.whitespace?(" ")~~
28		~~assert @builder.whitespace?("\n")~~
29		~~assert @builder.whitespace?("\r")~~
30		~~assert(!@builder.whitespace?("a"))~~
	28	def test_html_diff_simple
	29	a = 'this was the original string'
	30	b = 'this is the new string'
	31	assert_equal("<span> this<del class='diffmod'> was</del><ins class='diffmod'> is</ins> the" +
	32	"<del class='diffmod'> original</del><ins class='diffmod'> new</ins> string</span>",
	33	diff(a, b))
		end

33		~~def test_convert_html_to_list_of_words_simple~~
	36	def test_html_diff_with_multiple_paragraphs
	37	a = "<p>this was the original string</p>"
	38	b = "<p>this is</p>\n<p> the new string</p>\n<p>around the world</p>"
		assert_equal(
35		~~['the', ' ', 'original', ' ', 'text'],~~
36		~~@builder.convert_html_to_list_of_words('the original text'))~~
	40	"<p><span> this<del class='diffmod'> was</del><ins class='diffmod'> is</ins>" +
	41	"<del class='diffdel'> the</del><del class='diffdel'> original</del><del class='diffdel'> string</del></span></p>" +
	42	"<ins class='diffins'>\n</ins><ins class='diffins'><p> the new string</p></ins>" +
	43	"<ins class='diffins'>\n</ins><ins class='diffins'><p>around the world</p></ins>",
	44	diff(a, b))
		end

39		~~def test_convert_html_to_list_of_words_should_separate_endlines~~
	47	def test_html_diff_deleting_a_paragraph
	48	a = "<p>this is a paragraph</p>\n<p>this is a second paragraph</p>\n<p>this is a third paragraph</p>"
	49	b = "<p>this is a paragraph</p>\n<p>this is a third paragraph</p>"
		assert_equal(
41		~~['a', "\n", 'b', "\r", 'c'],~~
42		~~@builder.convert_html_to_list_of_words("a\nb\rc"))~~
	51	"<p>this is a paragraph</p>\n<del class='diffdel'><p>this is a second paragraph</p></del>" +
	52	"<del class='diffdel'>\n</del><p>this is a third paragraph</p>",
	53	diff(a, b))
		end

45		~~def test_convert_html_to_list_of_words_should_not_compress_whitespace~~
46		~~assert_equal(~~
47		~~['a', ' ', 'b', ' ', 'c', "\r \n ", 'd'],~~
48		~~@builder.convert_html_to_list_of_words("a b c\r \n d"))~~
	56	def test_split_paragraph_into_two
	57	a = "<p>foo bar</p>"
	58	b = "<p>foo</p><p>bar</p>"
	59	assert_equal(
	60	"<p><span> foo<del class='diffdel'> bar</del></span></p>" +
	61	"<ins class='diffins'><p>bar</p></ins>",
	62	diff(a,b))
		end

51		~~def test_convert_html_to_list_of_words_should_handle_tags_well~~
52		~~assert_equal(~~
53		~~['<p>', 'foo', ' ', 'bar', '</p>'],~~
54		~~@builder.convert_html_to_list_of_words("<p>foo bar</p>"))~~
	65	def test_join_two_paragraphs_into_one
	66	a = "<p>foo</p><p>bar</p>"
	67	b = "<p>foo bar</p>"
	68	assert_equal(
	69	"<p><span> foo<ins class='diffins'> bar</ins></span></p>" +
	70	"<del class='diffdel'><p>bar</p></del>",
	71	diff(a,b))
		end
56
57		~~def test_convert_html_to_list_of_words_interesting~~
58		~~assert_equal(~~
59		~~['<p>', 'this', ' ', 'is', '</p>', "\r\n", '<p>', 'the', ' ', 'new', ' ', 'string',~~
60		~~'</p>', "\r\n", '<p>', 'around', ' ', 'the', ' ', 'world', '</p>'],~~
61		~~@builder.convert_html_to_list_of_words(~~
62		~~"<p>this is</p>\r\n<p>the new string</p>\r\n<p>around the world</p>"))~~
63		~~end~~

65		~~def test_html_diff_simple~~
66		~~a = 'this was the original string'~~
67		~~b = 'this is the new string'~~
68		~~assert_equal('this <del class="diffmod">was</del><ins class="diffmod">is</ins> the ' +~~
69		~~'<del class="diffmod">original</del><ins class="diffmod">new</ins> string',~~
70		~~diff(a, b))~~
	74	def test_add_inline_element
	75	a = "<p>foo bar</p>"
	76	b = "<p>foo <b>bar</b></p>"
	77	assert_equal(
	78	"<p><span> foo<del class='diffdel'> bar</del></span>" +
	79	"<ins class='diffins'><b>bar</b></ins></p>",
	80	diff(a,b))
		end

73		~~def test_html_diff_with_multiple_paragraphs~~
74		~~a = "<p>this was the original string</p>"~~
75		~~b = "<p>this is</p>\r\n<p> the new string</p>\r\n<p>around the world</p>"~~
76
77		~~# Some of this expected result is accidental to implementation.~~
78		~~# At least it's well-formed and more or less correct.~~
79		~~assert_equal(~~
80		~~"<p>this <del class=\"diffmod\">was</del><ins class=\"diffmod\">is</ins></p>"+~~
81		~~"<ins class=\"diffmod\">\r\n</ins><p> the " +~~
82		~~"<del class=\"diffmod\">original</del><ins class=\"diffmod\">new</ins>" +~~
83		~~" string</p><ins class=\"diffins\">\r\n</ins>" +~~
84		~~"<p><ins class=\"diffins\">around the world</ins></p>",~~
85		~~diff(a, b))~~
86		~~end~~
87
88		~~# FIXME this test fails (ticket #67, http://dev.instiki.org/ticket/67)~~
89		~~def test_html_diff_preserves_endlines_in_pre~~
90		~~a = "<pre>\na\nb\nc\n</pre>"~~
91		~~b = "<pre>\n</pre>"~~
92		~~assert_equal(~~
93		~~"<pre>\n<del class=\"diffdel\">a\nb\nc\n</del></pre>",~~
94		~~diff(a, b))~~
95		~~end~~
96
		def test_html_diff_with_tags
		a = ""
		b = "<div>foo</div>"
100		~~assert_equal '<div><ins class="diffins">foo</ins></div>', diff(a, b)~~
	86	assert_equal "<ins class='diffins'><div>foo</div></ins>", diff(a, b)
		end

		def test_diff_for_tag_change
		a = "<a>x</a>"
		b = "<b>x</b>"
106		~~# FIXME sad, but true - this case produces an invalid XML. If handle this you can, strong your foo is.~~
107		~~assert_equal '<a><b>x</a></b>', diff(a, b)~~
	92	assert_equal "<del class='diffmod'><a>x</a></del><ins class='diffmod'><b>x</b></ins>", diff(a, b)
		end

	95	def test_diff_for_tag_change_II
	96	a = "<ul>\n<li>x</li>\n<li>y</li>\n</ul>"
	97	b = "<ol>\n<li>x</li>\n<li>y</li>\n</ol>"
	98	assert_equal "<del class='diffmod'><ul>\n<li>x</li>\n<li>y</li>\n</ul>" +
	99	"</del><ins class='diffmod'><ol>\n<li>x</li>\n<li>y</li>\n</ol></ins>", diff(a, b)
	100	end
	101
	102	# FIXME this test fails (ticket #67, http://dev.instiki.org/ticket/67)
	103	def test_html_diff_preserves_endlines_in_pre
	104	a = "<pre>a\nb\nc\n</pre>"
	105	b = "<pre>a\n</pre>"
	106	assert_equal(
	107	"<pre><span> a\n<del class='diffdel'>b\nc\n</del></span></pre>",
	108	diff(a, b))
	109	end
	110
		end

rool/rails/instiki/trunk/test/unit/page_renderer_test.rb:

prev.	current

1		~~require File.expand_path(File.dirname(__FILE__) + '/../test_helper')~~
	1	#!/usr/bin/env ruby
	2	# encoding: UTF-8

3		~~class PageRendererTest < Test::Unit::TestCase~~
	4	require Rails.root.join('test', 'test_helper')
	5
	6	class PageRendererTest < ActiveSupport::TestCase
		fixtures :webs, :pages, :revisions, :system, :wiki_references

		def setup
...	...

		def test_wiki_word_linking
		@web.add_page('SecondPage', 'Yo, yo. Have you EverBeenHated',
15		~~Time.now, 'DavidHeinemeierHansson', test_renderer)~~
	18	Time.now, 'DavidHeinemeierHansson', x_test_renderer)

17		~~assert_equal('<p>Yo, yo. Have you <span class="newWikiWord">Ever Been Hated' +~~
18		~~'<a href="../show/EverBeenHated">?</a></span></p>',~~
	20	assert_equal("<p>Yo, yo. Have you <span class='newWikiWord'>Ever Been Hated" +
	21	"<a href='../show/EverBeenHated'>?</a></span></p>",
		rendered_content(@web.page("SecondPage")))

		@web.add_page('EverBeenHated', 'Yo, yo. Have you EverBeenHated', Time.now,
22		~~'DavidHeinemeierHansson', test_renderer)~~
23		~~assert_equal('<p>Yo, yo. Have you <a class="existingWikiWord" ' +~~
24		~~'href="../show/EverBeenHated">Ever Been Hated</a></p>',~~
	25	'DavidHeinemeierHansson', x_test_renderer)
	26	assert_equal("<p>Yo, yo. Have you <a class='existingWikiWord' " +
	27	"href='../show/EverBeenHated'>Ever Been Hated</a></p>",
		rendered_content(@web.page("SecondPage")))
		end

		def test_wiki_words
		assert_equal %w( HisWay MyWay SmartEngine SmartEngineGUI ThatWay ),
30		~~test_renderer(@revision).wiki_words.sort~~
	33	x_test_renderer(@revision).wiki_words.sort

32		~~@wiki.write_page('wiki1', 'NoWikiWord', 'hey you!', Time.now, 'Me', test_renderer)~~
33		~~assert_equal [], test_renderer(@wiki.read_page('wiki1', 'NoWikiWord').revisions.last).wiki_words~~
	35	@wiki.write_page('wiki1', 'NoWikiWord', 'hey you!', Time.now, 'Me', x_test_renderer)
	36	assert_equal [], x_test_renderer(@wiki.read_page('wiki1', 'NoWikiWord').revisions.last).wiki_words
		end

		def test_existing_pages
37		~~assert_equal %w( MyWay SmartEngine ThatWay ), test_renderer(@revision).existing_pages.sort~~
	40	assert_equal %w( MyWay SmartEngine ThatWay ), x_test_renderer(@revision).existing_pages.sort
		end

		def test_unexisting_pages
41		~~assert_equal %w( HisWay SmartEngineGUI ), test_renderer(@revision).unexisting_pages.sort~~
	44	assert_equal %w( HisWay SmartEngineGUI ), x_test_renderer(@revision).unexisting_pages.sort
		end

		def test_content_with_wiki_links
45		~~assert_equal '<p><span class="newWikiWord">His Way<a href="../show/HisWay">?</a></span> ' +~~
46		~~'would be <a class="existingWikiWord" href="../show/MyWay">My Way</a> in kinda ' +~~
47		~~'<a class="existingWikiWord" href="../show/ThatWay">That Way</a> in ' +~~
48		~~'<span class="newWikiWord">His Way<a href="../show/HisWay">?</a></span> ' +~~
49		~~'though <a class="existingWikiWord" href="../show/MyWay">My Way</a> OverThere—see ' +~~
50		~~'<a class="existingWikiWord" href="../show/SmartEngine">Smart Engine</a> in that ' +~~
51		~~'<span class="newWikiWord">Smart Engine GUI' +~~
52		~~'<a href="../show/SmartEngineGUI">?</a></span></p>',~~
53		~~test_renderer(@revision).display_content~~
	48	assert_equal "<p><span class='newWikiWord'>His Way<a href='../show/HisWay'>?</a></span> " +
	49	"would be <a class='existingWikiWord' href='../show/MyWay'>My Way</a> " +
	50	"<math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>" +
	51	"<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo><semantics>" +
	52	"<annotation-xml encoding='SVG1.1'><svg/></annotation-xml></semantics></math> in kinda " +
	53	"<a class='existingWikiWord' href='../show/ThatWay'>That Way</a> in " +
	54	"<span class='newWikiWord'>His Way<a href='../show/HisWay'>?</a></span> " +
	55	%{though <a class='existingWikiWord' href='../show/MyWay'>My Way</a> OverThere \342\200\223 see } +
	56	"<a class='existingWikiWord' href='../show/SmartEngine'>Smart Engine</a> in that " +
	57	"<span class='newWikiWord'>Smart Engine GUI" +
	58	"<a href='../show/SmartEngineGUI'>?</a></span></p>",
	59	x_test_renderer(@revision).display_content
		end

		def test_markdown
57		~~set_web_property :markup, :markdown~~
	63	set_web_property :markup, :markdownMML

		assert_markup_parsed_as(
60		~~%{<h1>My Headline</h1>\n\n<p>that <span class="newWikiWord">} +~~
61		~~%{Smart Engine GUI<a href="../show/SmartEngineGUI">?</a></span></p>},~~
62		~~"My Headline\n===========\n\nthat SmartEngineGUI")~~
	66	%{<p>equation <math class='maruku-mathml' } +
	67	%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	68	%{<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math></p>},
	69	"equation $\\sin(x)$")

	71	re = Regexp.new('\\A<h1 id=\'my_headline_\\d{1,4}\'>My Headline</h1>\n\n<p>that <span class=\'newWikiWord\'>Smart Engine GUI<a href=\'../show/SmartEngineGUI\'>\?</a></span></p>\\Z')
	72
	73	assert_match_markup_parsed_as(re, "My Headline\n===========\n\nthat SmartEngineGUI")
	74
	75	assert_match_markup_parsed_as(re, "#My Headline#\n\nthat SmartEngineGUI")
	76
	77	str1 = %{<div class='un_defn'>\n<h6 id='definition_\\d\{1,4\}'>Definition</h6>\n\n<p>Let <math} +
	78	%{ class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>H</mi>} +
	79	%{</math> be a subgroup of a group <math class='maruku-mathml' display='inline' xmlns='http://w} +
	80	%{ww.w3.org/1998/Math/MathML'><mi>G</mi></math>. A <em>left coset</em> of <math class='maruku-m} +
	81	%{athml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>H</mi></math> in <math} +
	82	%{ class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>G</mi>} +
	83	%{</math> is a subset of <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/} +
	84	%{1998/Math/MathML'><mi>G</mi></math> that is of the form <math class='maruku-mathml' display='} +
	85	%{inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>x</mi><mi>H</mi></math>, where <math} +
	86	%{ class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>x</mi>} +
	87	%{<mo>\342\210\210</mo><mi>G</mi></math> and <math class='maruku-mathml' display='inline' xmlns} +
	88	%{='http://www.w3.org/1998/Math/MathML'><mi>x</mi><mi>H</mi><mo>=</mo><mo stretchy='false'>\\\{<} +
	89	%{/mo><mi>x</mi><mi>h</mi><mo>:</mo><mi>h</mi><mo>\342\210\210</mo><mi>H</mi><mo stretchy='fals} +
	90	%{e'>\\\}</mo></math>.</p>\n\n<p>Similarly a <em>right coset</em> of <math class='maruku-mathml'} +
	91	%{ display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>H</mi></math> in <math class} +
	92	%{='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math} +
	93	%{> is a subset of <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/M} +
	94	%{ath/MathML'><mi>G</mi></math> that is of the form <math class='maruku-mathml' display='inline} +
	95	%{' xmlns='http://www.w3.org/1998/Math/MathML'><mi>H</mi><mi>x</mi></math>, where <math class='} +
	96	%{maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>H</mi><mi>x</m} +
	97	%{i><mo>=</mo><mo stretchy='false'>\\\{</mo><mi>h</mi><mi>x</mi><mo>:</mo><mi>h</mi><mo>\342\210\210} +
	98	%{</mo><mi>H</mi><mo stretchy='false'>\\\}</mo></math>.</p>\n</div>\n\n} +
	99	%{<div class='num_lemma' id='LeftCosetsDisjoint'>\n<h6 id='lemma_\\d\{1,4\}'>Lemma</h6>\n\n<p>} +
	100	%{Let <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	101	%{<mi>H</mi></math> be a subgroup of a group <math class='maruku-mathml' display='inline' xmlns} +
	102	%{='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math>, and let <math class='maruku-mathml'} +
	103	%{ display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>x</mi></math> and <math cla} +
	104	%{ss='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>y</mi></ma} +
	105	%{th> be elements of <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/} +
	106	%{Math/MathML'><mi>G</mi></math>. Suppose that <math class='maruku-mathml' display='inline' xmln} +
	107	%{s='http://www.w3.org/1998/Math/MathML'><mi>x</mi><mi>H</mi><mo>\342\210\251</mo><mi>y</mi><mi>} +
	108	%{H</mi></math> is non-empty. Then <math class='maruku-mathml' display='inline' xmlns='http://ww} +
	109	%{w.w3.org/1998/Math/MathML'><mi>x</mi><mi>H</mi><mo>=</mo><mi>y</mi><mi>H</mi></math>.</p>\n</d} +
	110	%{iv>\n\n<div class='proof'>\n<h6 id='proof_\\d\{1,4\}'>Proof</h6>\n\n<p>Let <math class='maruku-m} +
	111	%{athml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>z</mi></math> be some e} +
	112	%{lement of <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/Math} +
	113	%{ML'><mi>x</mi><mi>H</mi><mo>\342\210\251</mo><mi>y</mi><mi>H</mi></math>.</p>\n</div>\n\n} +
	114	%{<div class='num_lemma' id='SizeOfLeftCoset'>\n<h6 id='lemma_\\d\{1,4\}'>Lemma</h6>\n\n<p>} +
	115	%{Let <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	116	%{<mi>H</mi></math> be a finite subgroup of a group <math class='maruku-mathml' display='inline' xmlns} +
	117	%{='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math>.</p>\n</div>\n\n} +
	118	%{<div class='num_theorem' id='Lagrange'>\n<h6 id='theorem_\\d\{1,4\}'>Theorem</h6>\n\n<p><strong>\$Lagrange\342\200\231s Theorem\$.</strong> Let <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math> be a finite group, and let <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>H</mi></math> be a subgroup of <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>G</mi></math>.</p>\n</div>}
	119
	120	str2 = <<END_THM
	121	+-- {: .un_defn}
	122	###### Definition
	123	Let $H$ be a subgroup of a group $G$. A left coset of $H$ in $G$ is a subset of $G$ that is of the form $x H$, where $x \\in G$ and $x H = \\{ x h : h \\in H \\}$.
	124
	125	Similarly a right coset of $H$ in $G$ is a subset of $G$ that is of the form $H x$, where $H x = \\{ h x : h \\in H \\}$.
	126	=--
	127
	128	+-- {: .num_lemma #LeftCosetsDisjoint}
	129	###### Lemma
	130	Let $H$ be a subgroup of a group $G$, and let $x$ and $y$ be
	131	elements of $G$. Suppose that $x H \\cap y H$ is non-empty. Then $x H = y H$.
	132	=--
	133
	134	+-- {: .proof}
	135	###### Proof
	136	Let $z$ be some element of $x H \\cap y H$.
	137	=--
	138
	139	+-- {: .num_lemma #SizeOfLeftCoset}
	140	###### Lemma
	141	Let $H$ be a finite subgroup of a group $G$.
	142	=--
	143
	144	+-- {: .num_theorem #Lagrange}
	145	###### Theorem
	146	(Lagrange's Theorem). Let $G$ be a finite group, and let $H$ be a subgroup of $G$.
	147	=--
	148	END_THM
	149
	150	assert_match_markup_parsed_as(Regexp.new(str1), str2)
	151
	152	assert_markup_parsed_as(
	153	%{<p>SVG <animateColor title='MathML'><span class='newWikiWord'>} +
	154	%{Math ML<a href='../show/MathML'>?</a></span></animateColor></p>},
	155	"SVG <animateColor title='MathML'>MathML</animateColor>")
	156
	157	assert_markup_parsed_as(
	158	%{<div class='maruku-equation'><math class='maruku-mathml' display='block' } +
	159	%{xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi><mo stretchy='false'>} +
	160	%{(</mo><mi>x</mi><mo stretchy='false'>)</mo><semantics><annotation-xml encoding='SVG1.1'>} +
	161	%{<svg/></annotation-xml></semantics></math><span class='maruku-eq-tex'><code style='display: none;'>} +
	162	%{\\sin(x) \\begin{svg}<svg/>\\end{svg}</code></span></div>},
	163	"$$\\sin(x) \\begin{svg}<svg/>\\end{svg}$$")
	164
		code_block = [
		'This is a code block:',
		'',
...	...

		assert_markup_parsed_as(
		%{<p>This is a code block:</p>\n\n<pre><code>def a_method(arg)\n} +
75		~~%{return ThatWay\n</code></pre>\n\n<p>Nice!</p>},~~
	176	%{return ThatWay</code></pre>\n\n<p>Nice!</p>},
		code_block)
	178
	179	assert_markup_parsed_as(%{<p>You then needed to edit (or create) a user.js file in} +
	180	%{ your Mozilla profile, which read either (<span class='newWikiWord'>Mac OSX<a h} +
	181	%{ref='../show/MacOSX'>?</a></span>)</p>\n\n<pre><code> user_pref("font.mat} +
	182	%{hfont-family", "Math1,Math2,Math4,Symbol");</code></pre>},
	183	%{You then needed to edit (or create) a user.js file in your Mozilla profile, whic} +
	184	%{h read either (MacOSX)\n\n user_pref("font.mathfont-family", "Math1,Math2,Math4,Symbol");})
	185
	186	assert_markup_parsed_as(
	187	%{<p><math class='maruku-mathml' } +
	188	%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	189	%{<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math> ecuasi\303\263n</p>},
	190	"$\\sin(x)$ ecuasi\303\263n")
	191
	192	assert_markup_parsed_as(
	193	%{<p>ecuasi\303\263n</p>\n<div class='maruku-equation'><math class='maruku-mathml' } +
	194	%{display='block' xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi>} +
	195	%{<mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math>} +
	196	%{<span class='maruku-eq-tex'><code style='display: none;'>\\sin(x)</code></span></div>},
	197	"ecuasi\303\263n\n$$\\sin(x)$$")
	198
	199	assert_markup_parsed_as(
	200	%{<p>ecuasi\303\263n</p>\n\n<p><math class='maruku-mathml' } +
	201	%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	202	%{<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math></p>},
	203	"ecuasi\303\263n \n\n$\\sin(x)$")
	204
	205	assert_markup_parsed_as(
	206	%{<p>ecuasi\303\263n <math class='maruku-mathml' } +
	207	%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	208	%{<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math></p>},
	209	"ecuasi\303\263n $\\sin(x)$")
	210
		end
	212
	213	def test_ial_in_lists
	214
	215	assert_markup_parsed_as(
	216	"<ul>\n<li>item 1</li>\n\n<li style='color: red;'>" +
	217	"item 2</li>\n\n<li>item 3 continues here</li>\n</ul>",
	218	"* item 1\n* {: style=\"color:red\"} item 2\n* item 3\n continues here\n")
	219
	220	assert_markup_parsed_as(
	221	"<ol start='4'>\n<li>item 1</li>\n\n<li value='10'>" +
	222	"item 2</li>\n\n<li>item 3 continues here</li>\n</ol>",
	223	"1. item 1\n2. {: value=\"10\"} item 2\n13. item 3\n continues here\n{: start=\"4\"}")
	224
	225	end

	227	def test_have_latest_itex2mml
	228
	229	assert_markup_parsed_as(
	230	%{<p>equation <math class='maruku-mathml' displa} +
	231	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	232	%{MathML'><mi>A</mi><mi>\342\200\246</mi><mo>\342\253\275</mo><mi>B</} +
	233	%{mi></math></p>},
	234	"equation $A\\dots\\sslash B$")
	235
	236	assert_markup_parsed_as(
	237	%{<p>boxed equation <math class='maruku-mathml' } +
	238	%{display='inline' xmlns='http://www.w3.org/1998} +
	239	%{/Math/MathML'><menclose notation='box'><mrow><} +
	240	%{menclose notation='updiagonalstrike'><mi>D</mi} +
	241	%{></menclose><mi>\317\210</mi><mo>=</mo><mn>0</} +
	242	%{mn></mrow></menclose></math></p>},
	243	"boxed equation $\\boxed{\\slash{D}\\psi=0}$")
	244
	245	assert_markup_parsed_as(
	246	%{<p>equation <math class='maruku-mathml' displa} +
	247	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	248	%{MathML'><mi>\316\265</mi><mo>\342\211\240</mo>} +
	249	%{<mi>\317\265</mi></math></p>},
	250	"equation $\\varepsilon\\neq\\epsilon$")
	251
	252	assert_markup_parsed_as(
	253	%{<p>equation <math class='maruku-mathml' displa} +
	254	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	255	%{MathML'><mi>A</mi><mo>=</mo><maction actiontyp} +
	256	%{e='tooltip'><mi>B</mi><mtext>Spoons!</mtext></} +
	257	%{maction></math></p>},
	258	"equation $A=\\tooltip{Spoons!}{B}$")
	259
	260	assert_markup_parsed_as(
	261	%{<p>equation <math class='maruku-mathml' displa} +
	262	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	263	%{MathML'><mi>A</mi><mpadded lspace='-100%width'} +
	264	%{ width='0'><mi>B</mi></mpadded></math></p>},
	265	"equation $A \\mathllap{B}$")
	266
	267	assert_markup_parsed_as(
	268	%{<p>equation <math class='maruku-mathml' displa} +
	269	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	270	%{MathML'><mi>A</mi><mo>\342\211\224</mo><mi>B</} +
	271	%{mi></math></p>},
	272	"equation $A \\coloneqq B$")
	273
	274	assert_markup_parsed_as(
	275	%{<p>equation <math class='maruku-mathml' displa} +
	276	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	277	%{MathML'><mi>A</mi><mo>\342\206\255</mo><mi>B</} +
	278	%{mi></math></p>},
	279	"equation $A \\leftrightsquigarrow B$")
	280
	281	assert_markup_parsed_as(
	282	%{<p>equation <math class='maruku-mathml' displa} +
	283	%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
	284	%{MathML'><munder><mi>A</mi><mo>\314\262</mo></m} +
	285	%{under></math></p>},
	286	"equation $\\underline{A}$")
	287
	288	assert_markup_parsed_as(
	289	%{<p>equation <math class='maruku-mathml' } +
	290	%{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	291	%{<mi>A</mi><mo>\342\205\213</mo><mi>B</mi></math></p>},
	292	"equation $A \\invamp B$")
	293
	294	assert_markup_parsed_as(
	295	%{<p>blackboard digits: <math class='maruku-mathml' display='} +
	296	%{inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>math} +
	297	%{bb</mi><mn>123</mn></math></p>},
	298	"blackboard digits: $\mathbb{123}$")
	299
	300	assert_markup_parsed_as(
	301	%{<p>\\rlap: <math class='maruku-mathml' display='} +
	302	%{inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
	303	%{<mn>123</mn></math></p>},
	304	'\rlap: $\rlap{123}$')
	305	end
	306
	307	def test_blahtex
	308	if Kernel::system('blahtex --help > /dev/null 2>&1')
	309	set_web_property :markup, :markdownPNG
	310
	311	re = Regexp.new(
	312	%{<p>equation <span class='maruku-inline'><img alt='\\$a\\\\sin\$\\\\theta\$\\$' } +
	313	%{class='maruku-png' src='\.\./files/pngs/\\w+\.png' style='vertical-align: -0\.5} +
	314	%{(5)+6ex; height: 2\.3(3)+ex;'/></span></p>})
	315	assert_match_markup_parsed_as(re, 'equation $a\sin(\theta)$')
	316
	317	re = Regexp.new(
	318	%{<div class='maruku-equation'><img alt='\\$a\\\\sin\$\\\\theta\$\\$' } +
	319	%{class='maruku-png' src='\.\./files/pngs/\\w+\.png' style='height: 2\.3(3)+} +
	320	%{33333ex;'/><span class='maruku-eq-tex'><code style='display: none;'>a\\\\sin} +
	321	%{\$\\\\theta\$<\/code><\/span><\/div>})
	322	assert_match_markup_parsed_as(re, '$$a\sin(\theta)$$')
	323
	324	else
	325	print "\nBlahTeX not found ... skipping.\n"
	326	end
	327	end
	328
		def test_markdown_hyperlink_with_slash
		# in response to a bug, see http://dev.instiki.org/attachment/ticket/177
		set_web_property :markup, :markdown

		assert_markup_parsed_as(
84		~~'<p><a href="http://example/with/slash">text</a></p>',~~
	334	"<p><a href='http://example/with/slash'>text</a></p>",
		'[text](http://example/with/slash)')
		end

...	...
		'* list 2'
		].join("\n")

101		~~set_web_property :markup, :markdown~~
102		~~assert_markup_parsed_as(~~
103		~~"<h1>Markdown heading</h1>\n\n" +~~
	351	set_web_property :markup, :markdownMML
	352	re = Regexp.new(
	353	'<h1 id=\'markdown_heading_\d{1,4}\'>Markdown heading</h1>\n\n' +
		"<p>h2. Textile heading</p>\n\n" +
		"<p><em>some</em> <strong>text</strong> <em>with</em> -styles-</p>\n\n" +
106		~~"<ul>\n<li>list 1</li>\n<li>list 2</li>\n</ul>",~~
107		~~textile_and_markdown)~~
	356	"<ul>\n<li>list 1</li>\n\n<li>list 2</li>\n</ul>")

	358	assert_match_markup_parsed_as(re, textile_and_markdown)
		set_web_property :markup, :textile
		assert_markup_parsed_as(
111		~~"<p>Markdown heading<br />================</p>\n\n\n\t<h2>Textile heading</h2>" +~~
	361	"<p>Markdown heading<br/>================</p>\n\n\n\t<h2>Textile heading</h2>" +
		"\n\n\n\t<p><strong>some</strong> <b>text</b> <em>with</em> <del>styles</del></p>" +
		"\n\n\n\t<ul>\n\t<li>list 1</li>\n\t\t<li>list 2</li>\n\t</ul>",
		textile_and_markdown)
...	...
		@revision = Revision.new(:page => @page, :content => '+hello+ that SmartEngineGUI',
		:author => Author.new('DavidHeinemeierHansson'))

130		~~assert_equal "<tt>hello</tt> that <span class=\"newWikiWord\">Smart Engine GUI" +~~
131		~~"<a href=\"../show/SmartEngineGUI\">?</a></span>\n\n",~~
132		~~test_renderer(@revision).display_content~~
	380	assert_equal "<tt>hello</tt> that <span class='newWikiWord'>Smart Engine GUI" +
	381	"<a href='../show/SmartEngineGUI'>?</a></span>\n\n",
	382	x_test_renderer(@revision).display_content
		end

135		~~def test_content_with_auto_links~~
136		~~assert_markup_parsed_as(~~
137		~~'<p><a href="http://www.loudthinking.com/">http://www.loudthinking.com/</a> ' +~~
138		~~'points to <a class="existingWikiWord" href="../show/ThatWay">That Way</a> from ' +~~
139		~~'<a href="mailto:david@loudthinking.com">david@loudthinking.com</a></p>',~~
140		~~'http://www.loudthinking.com/ points to ThatWay from david@loudthinking.com')~~
	385	# def test_content_with_auto_links
	386	# assert_markup_parsed_as(
	387	# '<p><a href="http://www.loudthinking.com/">http://www.loudthinking.com/</a> ' +
	388	# 'points to <a class="existingWikiWord" href="../show/ThatWay">That Way</a> from ' +
	389	# '<a href="mailto:david@loudthinking.com">david@loudthinking.com</a></p>',
	390	# 'http://www.loudthinking.com/ points to ThatWay from david@loudthinking.com')
	391	#
	392	# end

142		~~end~~
143
		def test_content_with_aliased_links
		assert_markup_parsed_as(
146		~~'<p>Would a <a class="existingWikiWord" href="../show/SmartEngine">clever motor' +~~
	396	"<p>Would a <a class='existingWikiWord' href='../show/SmartEngine'>clever motor" +
		'</a> go by any other name?</p>',
		'Would a [[SmartEngine\|clever motor]] go by any other name?')
		end

		def test_content_with_wikiword_in_em
		assert_markup_parsed_as(
153		~~'<p><em>should we go <a class="existingWikiWord" href="../show/ThatWay">' +~~
154		~~'That Way</a> or <span class="newWikiWord">This Way<a href="../show/ThisWay">?</a>' +~~
155		~~'</span> </em></p>',~~
	403	"<p><em>should we go <a class='existingWikiWord' href='../show/ThatWay'>" +
	404	"That Way</a> or <span class='newWikiWord'>This Way<a href='../show/ThisWay'>?</a>" +
	405	'</span></em></p>',
		'_should we go ThatWay or ThisWay _')
		end

159		~~def test_content_with_wikiword_in_tag~~
	409	def test_content_with_redirected_link
		assert_markup_parsed_as(
161		~~'<p>That is some <em style="WikiWord">Stylish Emphasis</em></p>',~~
162		~~'That is some <em style="WikiWord">Stylish Emphasis</em>')~~
	411	"<p>This is a redirected link: <a class='existingWikiWord' href='../show/liquor'>" +
	412	"booze</a>. This is not: <span class='newWikiWord'>hooch<a href='../show/hooch'>?</a>" +
	413	'</span></p>',
	414	'This is a redirected link: [[booze]]. This is not: [[hooch]]')
		end
	416
	417	def test_content_with_wikiword_in_equations
	418	assert_markup_parsed_as(
	419	"<p>should we go <a class='existingWikiWord' href='../show/ThatWay'>" +
	420	"That Way</a> or</p>\n<div class='maruku-equation' id='eq:eq1'>" +
	421	"<span class='maruku-eq-number'>(1)</span><math class='maruku-mathml' display='block' " +
	422	"xmlns='http://www.w3.org/1998/Math/MathML'><mi>ThisWay</mi></math>" +
	423	"<span class='maruku-eq-tex'><code style='display: none;'>ThisWay</code>" +
	424	"</span></div>",
	425	"should we go ThatWay or \n\\[ThisWay\\]\n")
	426
	427	assert_markup_parsed_as(
	428	"<p>should we go <a class='existingWikiWord' href='../show/ThatWay'>" +
	429	"That Way</a> or</p>\n<div class='maruku-equation'>" +
	430	"<math class='maruku-mathml' display='block' " +
	431	"xmlns='http://www.w3.org/1998/Math/MathML'><mi>ThisWay</mi></math>" +
	432	"<span class='maruku-eq-tex'><code style='display: none;'>ThisWay</code>" +
	433	"</span></div>",
	434	"should we go ThatWay or \n$$ThisWay$$\n")
	435
	436	assert_markup_parsed_as(
	437	"<p>should we go <a class='existingWikiWord' href='../show/ThatWay'>" +
	438	"That Way</a> or</p>\n<div class='maruku-equation'>" +
	439	"<math class='maruku-mathml' display='block' " +
	440	"xmlns='http://www.w3.org/1998/Math/MathML'><mi>ThisWay</mi><mi>$</mi>" +
	441	"<mn>100</mn><mi>ThatWay</mi></math>" +
	442	"<span class='maruku-eq-tex'><code style='display: none;'>ThisWay \\$100 " +
	443	"ThatWay</code></span></div>",
	444	"should we go ThatWay or \n$$ThisWay \\$100 ThatWay $$\n")
	445
	446	assert_markup_parsed_as(
	447	"<p>should we go <a class='existingWikiWord' href='../show/ThatWay'>" +
	448	"That Way</a> or <math class='maruku-mathml' display='inline' " +
	449	"xmlns='http://www.w3.org/1998/Math/MathML'><mi>ThisWay</mi></math> today.</p>",
	450	"should we go ThatWay or <math class='maruku-mathml' display='inline' " +
	451	"xmlns='http://www.w3.org/1998/Math/MathML'><mi>ThisWay</mi></math> today.")
	452
	453	assert_markup_parsed_as(
	454	"<p>should we go <a class='existingWikiWord' href='../show/ThatWay'>" +
	455	"That Way</a> or <math class='maruku-mathml' display='inline' " +
	456	"xmlns='http://www.w3.org/1998/Math/MathML'><mi>ThisWay</mi></math>.</p>",
	457	"should we go ThatWay or $ThisWay$.")
	458	end

	460	def test_content_with_wikiword_in_equations_textile
	461	set_web_property :markup, :textile
	462	assert_markup_parsed_as(
	463	"<p>$$<span class='newWikiWord'>foo<a href='../show/foo'>?" +
	464	"</a></span>$$<br/>$<span class='newWikiWord'>foo<a " +
	465	"href='../show/foo'>?</a></span>$</p>",
	466	"$$[[foo]]$$\n$[[foo]]$")
	467	end
	468
	469	# wikiwords are invalid as styles, must be in "name: value" form
	470	def test_content_with_wikiword_in_style_tag
	471	assert_markup_parsed_as(
	472	"<p>That is some <em style=''>Stylish Emphasis</em></p>",
	473	"That is some <em style='WikiWord'>Stylish Emphasis</em>")
	474	end
	475
	476	# validates format of style..
	477	def test_content_with_valid_style_in_style_tag
	478	assert_markup_parsed_as(
	479	"<p>That is some <em style='text-align: right;'>Stylish Emphasis</em></p>",
	480	"That is some <em style='text-align: right'>Stylish Emphasis</em>")
	481	end
	482
		def test_content_with_escaped_wikiword
		# there should be no wiki link
		assert_markup_parsed_as('<p>WikiWord</p>', '\WikiWord')
		end

		def test_content_with_pre_blocks
	489	set_web_property :markup, :markdownMML
		assert_markup_parsed_as(
172		~~'<p>A <code>class SmartEngine end</code> would not mark up <pre>CodeBlocks</pre></p>',~~
173		~~'A <code>class SmartEngine end</code> would not mark up <pre>CodeBlocks</pre>')~~
174		~~end~~
175
176		~~def test_content_with_autolink_in_parentheses~~
	491	"<p>A <code>class SmartEngine</code> would not mark up</p>\n\n<pre><code>CodeBlocks</code></pre>\n\n<p>would it?</p>",
	492	"A `class SmartEngine` would not mark up\n\n CodeBlocks\n\nwould it?")
		assert_markup_parsed_as(
178		~~'<p>The <span class="caps">W3C</span> body (<a href="http://www.w3c.org">' +~~
179		~~'http://www.w3c.org</a>) sets web standards</p>',~~
180		~~'The W3C body (http://www.w3c.org) sets web standards')~~
	494	"<p>A <code>class SmartEngine</code> would not mark up</p>\n<pre>CodeBlocks</pre>\n<p>would it?</p>",
	495	"A <code>class SmartEngine</code> would not mark up\n\n<pre>CodeBlocks</pre>\n\nwould it?")
		end

	498	# def test_content_with_autolink_in_parentheses
	499	# assert_markup_parsed_as(
	500	# '<p>The W3C body (<a href="http://www.w3c.org">' +
	501	# 'http://www.w3c.org</a>) sets web standards</p>',
	502	# 'The W3C body (http://www.w3c.org) sets web standards')
	503	# end
	504
		def test_content_with_link_in_parentheses
		assert_markup_parsed_as(
185		~~'<p>(<a href="http://wiki.org/wiki.cgi?WhatIsWiki">What is a wiki?</a>)</p>',~~
186		~~'("What is a wiki?":http://wiki.org/wiki.cgi?WhatIsWiki)')~~
	507	"<p>(<a href='http://wiki.org/wiki.cgi?WhatIsWiki'>What is a wiki?</a>)</p>",
	508	'([What is a wiki?](http://wiki.org/wiki.cgi?WhatIsWiki))')
		end

		def test_content_with_image_link
		assert_markup_parsed_as(
191		~~'<p>This <img src="http://hobix.com/sample.jpg" alt="" /> is a Textile image link.</p>',~~
192		~~'This !http://hobix.com/sample.jpg! is a Textile image link.')~~
	513	"<p>This <img alt='' src='http://hobix.com/sample.jpg'/> is a Markdown image link.</p>",
	514	'This ![](http://hobix.com/sample.jpg) is a Markdown image link.')
		end

		def test_content_with_inlined_img_tag
		assert_markup_parsed_as(
197		~~'<p>This <img src="http://hobix.com/sample.jpg" alt="" /> is an inline image link.</p>',~~
	519	"<p>This <img alt='' src='http://hobix.com/sample.jpg'/> is an inline image link.</p>",
		'This <img src="http://hobix.com/sample.jpg" alt="" /> is an inline image link.')
199
	521
	522	# currently, upper case HTML elements are not allowed
		assert_markup_parsed_as(
201		~~'<p>This <IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.</p>',~~
202		~~'This <IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.')~~
	524	"<p>This <IMG SRC='http://hobix.com/sample.jpg' alt=''/> is an inline image link.</p>",
	525	'This <IMG SRC="http://hobix.com/sample.jpg" alt="" /> is an inline image link.')
		end

		def test_nowiki_tag
...	...
		'or <nowiki>http://www.thislink.com</nowiki>.')
		end

	535	def test_malformed_nowiki
	536	assert_markup_parsed_as(
	537	'<p><i><b></i></b></p>',
	538	'<nowiki><i><b></i></b></nowiki> ')
	539	end
	540
	541
		def test_multiline_nowiki_tag
		assert_markup_parsed_as(
		"<p>Do not mark \n up [[this text]] \nand http://this.url.com but markup " +
215		~~'<span class="newWikiWord">this<a href="../show/this">?</a></span></p>',~~
	545	"<span class='newWikiWord'>this<a href='../show/this'>?</a></span></p>",
		"Do not <nowiki>mark \n up [[this text]] \n" +
		"and http://this.url.com </nowiki> but markup [[this]]")
		end
	549
	550	def test_markdown_nowiki_tag
	551	assert_markup_parsed_as(
	552	'<p>Do not mark up this text or http://www.thislink.com.</p>',
	553	'Do not mark up <nowiki>this text</nowiki> ' +
	554	'or <nowiki>http://www.thislink.com</nowiki>.')
	555	end

	557	def test_sanitize_nowiki_tag
	558	assert_markup_parsed_as(
	559	'<p>[[test]]&<a href=\'a&b\'>shebang</a> <script>alert("xss!");</script> foo</p>',
	560	'<nowiki>[[test]]&<a href="a&b">shebang</a> <script>alert("xss!");</script> foo</nowiki>')
	561	end
	562
	563	def test_entities
	564	assert_markup_parsed_as(
	565	"<p>Known: \342\210\256. Pass-through: &. Unknown: &foo;.</p>",
	566	"Known: &conint;. Pass-through: &. Unknown: &foo;.")
	567	end
	568
		def test_content_with_bracketted_wiki_word
		set_web_property :brackets_only, true
		assert_markup_parsed_as(
223		~~'<p>This is a WikiWord and a tricky name <span class="newWikiWord">' +~~
224		~~'Sperberg-McQueen<a href="../show/Sperberg-McQueen">?</a></span>.</p>',~~
	572	"<p>This is a WikiWord and a tricky name <span class='newWikiWord'>" +
	573	"Sperberg-McQueen<a href='../show/Sperberg-McQueen'>?</a></span>.</p>",
		'This is a WikiWord and a tricky name [[Sperberg-McQueen]].')
		end

		def test_content_for_export
229		~~assert_equal '<p><span class="newWikiWord">His Way</span> would be ' +~~
230		~~'<a class="existingWikiWord" href="MyWay.html">My Way</a> in kinda ' +~~
231		~~'<a class="existingWikiWord" href="ThatWay.html">That Way</a> in ' +~~
232		~~'<span class="newWikiWord">His Way</span> though ' +~~
233		~~'<a class="existingWikiWord" href="MyWay.html">My Way</a> OverThere—see ' +~~
234		~~'<a class="existingWikiWord" href="SmartEngine.html">Smart Engine</a> in that ' +~~
235		~~'<span class="newWikiWord">Smart Engine GUI</span></p>',~~
236		~~test_renderer(@revision).display_content_for_export~~
	578	assert_equal "<p><span class='newWikiWord'>His Way</span> would be " +
	579	"<a class='existingWikiWord' href='MyWay.html'>My Way</a> " +
	580	"<math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>" +
	581	"<mi>sin</mi><mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo><semantics>" +
	582	"<annotation-xml encoding='SVG1.1'><svg/></annotation-xml></semantics></math> in kinda " +
	583	"<a class='existingWikiWord' href='ThatWay.html'>That Way</a> in " +
	584	"<span class='newWikiWord'>His Way</span> though " +
	585	%{<a class='existingWikiWord' href='MyWay.html'>My Way</a> OverThere \342\200\223 see } +
	586	"<a class='existingWikiWord' href='SmartEngine.html'>Smart Engine</a> in that " +
	587	"<span class='newWikiWord'>Smart Engine GUI</span></p>",
	588	x_test_renderer(@revision).display_content_for_export
		end

		def test_double_replacing
		@revision.content = "VersionHistory\r\n\r\ncry VersionHistory"
241		~~assert_equal '<p><span class="newWikiWord">Version History' +~~
242		~~"<a href=\"../show/VersionHistory\">?</a></span></p>\n\n\n\t<p>cry " +~~
243		~~'<span class="newWikiWord">Version History<a href="../show/VersionHistory">?</a>' +~~
	593	assert_equal "<p><span class='newWikiWord'>Version History" +
	594	"<a href='../show/VersionHistory'>?</a></span></p>\n\n<p>cry " +
	595	"<span class='newWikiWord'>Version History<a href='../show/VersionHistory'>?</a>" +
		'</span></p>',
245		~~test_renderer(@revision).display_content~~
	597	x_test_renderer(@revision).display_content

		@revision.content = "f\r\nVersionHistory\r\n\r\ncry VersionHistory"
248		~~assert_equal "<p>f<br /><span class=\"newWikiWord\">Version History" +~~
249		~~"<a href=\"../show/VersionHistory\">?</a></span></p>\n\n\n\t<p>cry " +~~
250		~~"<span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a>" +~~
	600	assert_equal "<p>f <span class='newWikiWord'>Version History" +
	601	"<a href='../show/VersionHistory'>?</a></span></p>\n\n<p>cry " +
	602	"<span class='newWikiWord'>Version History<a href='../show/VersionHistory'>?</a>" +
		"</span></p>",
252		~~test_renderer(@revision).display_content~~
	604	x_test_renderer(@revision).display_content
		end

		def test_difficult_wiki_words
		@revision.content = "[[It's just awesome GUI!]]"
257		~~assert_equal "<p><span class=\"newWikiWord\">It's just awesome GUI!" +~~
258		~~"<a href=\"../show/It%27s+just+awesome+GUI%21\">?</a></span></p>",~~
259		~~test_renderer(@revision).display_content~~
	609	assert_equal "<p><span class='newWikiWord'>It's just awesome GUI!" +
	610	"<a href='../show/It%27s+just+awesome+GUI%21'>?</a></span></p>",
	611	x_test_renderer(@revision).display_content
		end

		def test_revisions_diff
...	...
		Revision.create(:page => @page, :content => 'What a red and lovely morning today',
		:author => Author.new('DavidHeinemeierHansson'), :revised_at => Time.now)

268		~~assert_equal "<p>What a <del class=\"diffmod\">blue</del><ins class=\"diffmod\">red" +~~
269		~~"</ins> and lovely morning<ins class=\"diffins\"> today</ins></p>", test_renderer(@page.revisions.last).display_diff~~
	620	@page.reload
	621	assert_equal "<p><span> What a<del class='diffmod'> blue</del><ins class='diffmod'> red" +
	622	"</ins> and lovely morning<ins class='diffins'> today</ins></span></p>", x_test_renderer(@page.revisions.last).display_diff
		end

	625	def test_nowiki_sanitization
	626	assert_markup_parsed_as('<p>This sentence contains <span>a & b</span> ' +
	627	'<script>alert("XSS!");</script>. Do not touch!</p>',
	628	'This sentence contains <nowiki><span>a & b</span> <script>alert("XSS!");' +
	629	'</script></nowiki>. Do not touch!')
	630	end
	631
		def test_link_to_file
		assert_markup_parsed_as(
274		~~'<p><span class="newWikiWord">doc.pdf<a href="../file/doc.pdf">?</a></span></p>',~~
	634	"<p><span class='newWikiWord'>doc.pdf<a href='../file/doc.pdf'>?</a></span></p>",
		'[[doc.pdf:file]]')
		end

278		~~def test_link_to_pic~~
	638	def test_link_to_pic_and_file
		WikiFile.delete_all
		require 'fileutils'
281		~~FileUtils.rm_rf("#{RAILS_ROOT}/public/wiki1/files/*")~~
	641	FileUtils.rm_rf("#{RAILS_ROOT}/webs/wiki1/files/*")
		@web.wiki_files.create(:file_name => 'square.jpg', :description => 'Square', :content => 'never mind')
		assert_markup_parsed_as(
284		~~'<p><img alt="Square" src="../file/square.jpg" /></p>',~~
285		~~'[[square.jpg\|Square:pic]]')~~
	644	"<p><img alt='Blue Square' src='../file/square.jpg'/></p>",
	645	'[[square.jpg\|Blue Square:pic]]')
		assert_markup_parsed_as(
287		~~'<p><img alt="square.jpg" src="../file/square.jpg" /></p>',~~
	647	"<p><img alt='Square' src='../file/square.jpg'/></p>",
		'[[square.jpg:pic]]')
	649	assert_markup_parsed_as(
	650	"<p><a class='existingWikiWord' href='../file/square.jpg' title='Square'>Blue Square</a></p>",
	651	'[[square.jpg\|Blue Square:file]]')
	652	assert_markup_parsed_as(
	653	"<p><video controls='controls' src='../file/square.jpg'>Blue Square</video></p>",
	654	'[[square.jpg\|Blue Square:video]]')
	655	assert_markup_parsed_as(
	656	"<p><audio controls='controls' src='../file/square.jpg'>Blue Square</audio></p>",
	657	'[[square.jpg\|Blue Square:audio]]')
	658	assert_markup_parsed_as(
	659	"<p><a class='existingWikiWord' href='../file/square.jpg' title='Square'>Square</a></p>",
	660	'[[square.jpg:file]]')
		end

	663	def test_link_to_pic_and_file_null_desc
	664	WikiFile.delete_all
	665	require 'fileutils'
	666	FileUtils.rm_rf("#{RAILS_ROOT}/webs/wiki1/files/*")
	667	@web.wiki_files.create(:file_name => 'square.jpg', :description => '', :content => 'never mind')
	668	assert_markup_parsed_as(
	669	"<p><img alt='Blue Square' src='../file/square.jpg'/></p>",
	670	'[[square.jpg\|Blue Square:pic]]')
	671	assert_markup_parsed_as(
	672	"<p><img alt='' src='../file/square.jpg'/></p>",
	673	'[[square.jpg:pic]]')
	674	assert_markup_parsed_as(
	675	"<p><a class='existingWikiWord' href='../file/square.jpg' title=''>Blue Square</a></p>",
	676	'[[square.jpg\|Blue Square:file]]')
	677	assert_markup_parsed_as(
	678	"<p><a class='existingWikiWord' href='../file/square.jpg' title=''></a></p>",
	679	'[[square.jpg:file]]')
	680	end
	681
		def test_link_to_non_existant_pic
		assert_markup_parsed_as(
293		~~'<p><span class="newWikiWord">NonExistant<a href="../file/NonExistant.jpg">?</a>' +~~
	684	"<p><span class='newWikiWord'>NonExistant<a href='../file/NonExistant.jpg'>?</a>" +
		'</span></p>',
		'[[NonExistant.jpg\|NonExistant:pic]]')
		assert_markup_parsed_as(
297		~~'<p><span class="newWikiWord">NonExistant.jpg<a href="../file/NonExistant.jpg">?</a>' +~~
	688	"<p><span class='newWikiWord'>NonExistant.jpg<a href='../file/NonExistant.jpg'>?</a>" +
		'</span></p>',
		'[[NonExistant.jpg:pic]]')
		end

		def test_wiki_link_with_colon
		assert_markup_parsed_as(
304		~~'<p><span class="newWikiWord">With:Colon<a href="../show/With%3AColon">?</a></span></p>',~~
305		~~'[[With:Colon]]')~~
	695	"<p><a class='existingWikiWord' href='../show/HomePage'>HomePage</a></p>",
	696	'[[wiki1:HomePage]]')
		end

	699	def test_wiki_link_with_colon_interwiki
	700	assert_markup_parsed_as(
	701	"<p><a class='existingWikiWord' href='../../instiki/show/HomePage' title='instiki'>HomePage</a></p>",
	702	'[[instiki:HomePage]]')
	703	end
	704
		def test_list_with_tildas
		list_with_tildas = <<-EOL
310		* "a":~b
311		* c~ d
	707	* [a](~b)
	708	* c~ d
		EOL

		assert_markup_parsed_as(
315		~~"<ul>\n\t<li><a href=\"~b\">a</a></li>\n\t\t<li>c~ d</li>\n\t</ul>",~~
	712	"<ul>\n<li><a href='~b'>a</a></li>\n\n<li>c~ d</li>\n</ul>",
		list_with_tildas)
		end

		def test_textile_image_in_mixed_wiki
		set_web_property :markup, :mixed
		assert_markup_parsed_as(
322		~~"<p><img src=\"http://google.com\" alt=\"\" />\nss</p>",~~
	719	"<p><img alt='' src='http://google.com'/>\nss</p>",
		"!http://google.com!\r\nss")
		end


		def test_references_creation_links
		new_page = @web.add_page('NewPage', 'HomePage NewPage',
329		~~Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)~~
	726	Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)

		references = new_page.wiki_references(true)
		assert_equal 2, references.size
...	...

		def test_references_creation_includes
		new_page = @web.add_page('NewPage', '[[!include IncludedPage]]',
341		~~Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)~~
	738	Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)

		references = new_page.wiki_references(true)
		assert_equal 1, references.size
...	...

		def test_references_creation_categories
		new_page = @web.add_page('NewPage', "Foo\ncategory: NewPageCategory",
351		~~Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)~~
	748	Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)

		references = new_page.wiki_references(true)
		assert_equal 1, references.size
...	...
		assert_equal WikiReference::CATEGORY, references[0].link_type
		end

	756	def test_references_creation_sanitized_categories
	757	new_page = @web.add_page('NewPage', "Foo\ncategory: <script>alert('XSS');</script>",
	758	Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
	759
	760	references = new_page.wiki_references(true)
	761	assert_equal 1, references.size
	762	assert_equal "<script>alert('XSS');</script>", references[0].referenced_name
	763	assert_equal WikiReference::CATEGORY, references[0].link_type
	764	end
	765
	766	def test_rendering_included_page_under_different_modes
	767	included = @web.add_page('Included', 'link to HomePage', Time.now, 'AnAuthor', x_test_renderer)
	768	main = @web.add_page('Main', '[[!include Included]]', Time.now, 'AnAuthor', x_test_renderer)
	769
	770	assert_equal "<p>link to <a class='existingWikiWord' href='../show/HomePage'>Home Page</a></p>",
	771	x_test_renderer(main).display_content
	772	assert_equal "<p>link to <a class='existingWikiWord' href='../published/HomePage'>Home Page</a></p>",
	773	x_test_renderer(main).display_published
	774	assert_equal "<p>link to <a class='existingWikiWord' href='HomePage.html'>Home Page</a></p>",
	775	x_test_renderer(main).display_content_for_export
	776	end
	777
	778	def test_rendering_included_page_backslashes_in_equations
	779	included = @web.add_page('Included', '\\\\ $\begin{matrix} a \\\\ b\end{matrix}$', Time.now, 'AnAuthor', x_test_renderer)
	780	main = @web.add_page('Main', '[[!include Included]]', Time.now, 'AnAuthor', x_test_renderer)
	781
	782	assert_equal "<p>\\ <math class='maruku-mathml' display='inline' " +
	783	"xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mtable rowspacing='0.5ex'>" +
	784	"<mtr><mtd><mi>a</mi></mtd></mtr> <mtr><mtd><mi>b</mi></mtd></mtr></mtable>" +
	785	"</mrow></math></p>",
	786	x_test_renderer(main).display_content
	787	end
	788
		private

		def add_sample_pages
		@in_love = @web.add_page('EverBeenInLove', 'Who am I me',
363		~~Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', test_renderer)~~
	793	Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', x_test_renderer)
		@hated = @web.add_page('EverBeenHated', 'I am me EverBeenHated',
365		~~Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', test_renderer)~~
	795	Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', x_test_renderer)
		end

		def assert_markup_parsed_as(expected_output, input)
		revision = Revision.new(:page => @page, :content => input, :author => Author.new('AnAuthor'))
370		~~assert_equal expected_output, test_renderer(revision).display_content, 'Rendering output not as expected'~~
	800	assert_equal expected_output, x_test_renderer(revision).display_content(true), 'Rendering output not as expected'
		end

	803	def assert_match_markup_parsed_as(expected_output, input)
	804	revision = Revision.new(:page => @page, :content => input, :author => Author.new('AnAuthor'))
	805	assert_match expected_output, x_test_renderer(revision).display_content, 'Rendering output not as expected'
	806	end
	807
		def rendered_content(page)
374		~~test_renderer(page.revisions.last).display_content~~
	809	x_test_renderer(page.revisions.last).display_content
		end

377		~~end~~

	813	end

rool/rails/instiki/trunk/test/unit/page_test.rb:

prev.	current

		require File.expand_path(File.dirname(__FILE__) + '/../test_helper')

3		~~class PageTest < Test::Unit::TestCase~~
	3	class PageTest < ActiveSupport::TestCase
		fixtures :webs, :pages, :revisions, :system

		def setup
...	...
		end

		def test_revise
35		~~@page.revise('HisWay would be MyWay in kinda lame', Time.local(2004, 4, 4, 16, 55),~~
36		~~'MarianneSyhler', test_renderer)~~
	35	@page.revise('HisWay would be MyWay in kinda lame', @page.name, Time.local(2004, 4, 4, 16, 52),
	36	'MarianneSyhler', x_test_renderer)
		@page.reload

		assert_equal 2, @page.revisions.length, 'Should have two revisions'
...	...
		end

		def test_revise_continous_revision
47		~~@page.revise('HisWay would be MyWay in kinda lame', Time.local(2004, 4, 4, 16, 55),~~
48		~~'MarianneSyhler', test_renderer)~~
	47	@page.revise('HisWay would be MyWay in kinda lame', @page.name, Time.local(2004, 4, 4, 16, 55),
	48	'MarianneSyhler', x_test_renderer)
		@page.reload
		assert_equal 2, @page.revisions.length
		assert_equal 'HisWay would be MyWay in kinda lame', @page.content

		# consecutive revision by the same author within 30 minutes doesn't create a new revision
54		~~@page.revise('HisWay would be MyWay in kinda update', Time.local(2004, 4, 4, 16, 57),~~
55		~~'MarianneSyhler', test_renderer)~~
	54	@page.revise('HisWay would be MyWay in kinda update', @page.name, Time.local(2004, 4, 4, 16, 57),
	55	'MarianneSyhler', x_test_renderer)
		@page.reload
		assert_equal 2, @page.revisions.length
		assert_equal 'HisWay would be MyWay in kinda update', @page.content
		assert_equal Time.local(2004, 4, 4, 16, 57), @page.revised_at

		# but consecutive revision by another author results in a new revision
62		~~@page.revise('HisWay would be MyWay in the house', Time.local(2004, 4, 4, 16, 58),~~
63		~~'DavidHeinemeierHansson', test_renderer)~~
	62	@page.revise('HisWay would be MyWay in the house', @page.name, Time.local(2004, 4, 4, 16, 58),
	63	'DavidHeinemeierHansson', x_test_renderer)
		@page.reload
		assert_equal 3, @page.revisions.length
		assert_equal 'HisWay would be MyWay in the house', @page.content

		# consecutive update after 30 minutes since the last one also creates a new revision,
		# even when it is by the same author
70		~~@page.revise('HisWay would be MyWay in my way', Time.local(2004, 4, 4, 17, 30),~~
71		~~'DavidHeinemeierHansson', test_renderer)~~
	70	@page.revise('HisWay would be MyWay in my way', @page.name, Time.local(2004, 4, 4, 17, 30),
	71	'DavidHeinemeierHansson', x_test_renderer)
		@page.reload
		assert_equal 4, @page.revisions.length
		end
	75
	76	def test_change_name
	77	@page.revise('HisWay would be MyWay in my way', 'SecondPage', Time.local(2004, 4, 5, 17, 56),
	78	'MarianneSyhler', x_test_renderer)
	79	@page.reload

	81	assert_equal "Second Page", @page.plain_name
	82	assert_equal 2, @page.revisions.length, 'Should have two revisions'
	83	assert_equal 'MarianneSyhler', @page.current_revision.author.to_s,
	84	'Marianne should be the author now'
	85	assert_equal 'DavidHeinemeierHansson', @page.revisions.first.author.to_s,
	86	'David was the first author'
	87	end
	88
		def test_revise_content_unchanged
		last_revision_before = @page.current_revision
		revisions_number_before = @page.revisions.size

		assert_raises(Instiki::ValidationError) {
81		~~@page.revise(@page.current_revision.content, Time.now, 'AlexeyVerkhovsky', test_renderer)~~
	94	@page.revise(@page.current_revision.content, @page.name, Time.now, 'AlexeyVerkhovsky', x_test_renderer)
		}

		assert_equal last_revision_before, @page.current_revision(true)
...	...
		def test_revise_changes_references_from_wanted_to_linked_for_new_pages
		web = Web.find(1)
		new_page = Page.new(:web => web, :name => 'NewPage')
91		~~new_page.revise('Reference to WantedPage, and to WantedPage2', Time.now, 'AlexeyVerkhovsky',~~
92		~~test_renderer)~~
	104	new_page.revise('Reference to WantedPage, and to WantedPage2', 'NewPage', Time.now, 'AlexeyVerkhovsky',
	105	x_test_renderer)

		references = new_page.wiki_references(true)
		assert_equal 2, references.size
...	...
		assert_equal WikiReference::WANTED_PAGE, references[1].link_type

		wanted_page = Page.new(:web => web, :name => 'WantedPage')
102		~~wanted_page.revise('And here it is!', Time.now, 'AlexeyVerkhovsky', test_renderer)~~
	115	wanted_page.revise('And here it is!', 'WantedPage', Time.now, 'AlexeyVerkhovsky', x_test_renderer)

		# link type stored for NewPage -> WantedPage reference should change from WANTED to LINKED
		# reference NewPage -> WantedPage2 should remain the same
...	...
		assert_equal WikiReference::WANTED_PAGE, references[1].link_type
		end

	127	def test_revise_changes_references_from_wanted_to_linked_for_redirected_pages
	128	web = Web.find(1)
	129	new_page = Page.new(:web => web, :name => 'NewPage')
	130	new_page.revise("Reference to H\xC3\xA1ppyPage, and to WantedPage2", 'NewPage', Time.local(2004, 4, 5, 17, 56), 'AlexeyVerkhovsky',
	131	x_test_renderer)
	132
	133	references = new_page.wiki_references(true)
	134	assert_equal 2, references.size
	135	p = ''.respond_to?(:force_encoding) ? "H\u00E1ppyPage" : "H\303\241ppyPage"
	136	assert_equal p, references[0].referenced_name
	137	assert_equal WikiReference::WANTED_PAGE, references[0].link_type
	138	assert_equal 'WantedPage2', references[1].referenced_name
	139	assert_equal WikiReference::WANTED_PAGE, references[1].link_type
	140	wanted_pages = web.select.wanted_pages
	141	assert_equal ["HisWay", p, "OverThere", "WantedPage2"], wanted_pages
	142
	143	my_page = Page.new(:web => web, :name => 'MyPage')
	144	my_page.revise("[[!redirects H\xC3\xA1ppyPage]]\nAnd here it is!", 'MyPage', Time.now, 'AlexeyVerkhovsky', x_test_renderer)
	145	my_references = my_page.wiki_references(true)
	146	assert_equal 1, my_references.size
	147	assert_equal p, my_references[0].referenced_name
	148	assert_equal WikiReference::REDIRECTED_PAGE, my_references[0].link_type
	149	wanted_pages = web.select.wanted_pages
	150	assert_equal ["HisWay", "OverThere", "WantedPage2"], wanted_pages
	151
	152	# link type stored for NewPage -> HappyPage reference should change from WANTED to LINKED
	153	# reference NewPage -> WantedPage2 should remain the same
	154	references = new_page.wiki_references #(true)
	155	s = ''.respond_to?(:force_encoding) ? "Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>H\u00E1ppy Page</a>" :
	156	"Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>H\303\241ppy Page</a>"
	157	assert_match( s,
	158	x_test_renderer(new_page.revisions.last).display_content(true) )
	159	assert_equal 2, references.size
	160	assert_equal p, references[0].referenced_name
	161	# Doesn't work, since picking up the change in wiki_references requires a database query.
	162	# assert_equal WikiReference::LINKED_PAGE, references[0].link_type
	163	assert_equal 'WantedPage2', references[1].referenced_name
	164	assert_equal WikiReference::WANTED_PAGE, references[1].link_type
	165	wanted_pages = web.select.wanted_pages
	166	assert_equal ["HisWay", "OverThere", "WantedPage2"], wanted_pages
	167
	168	new_page.revise("Reference to H\xC3\xA1ppyPage and to WantedPage2.pdf and [[foo.pdf]]", 'NewPage', Time.now, 'AlexeyVerkhovsky',
	169	x_test_renderer)
	170	references = new_page.wiki_references(true)
	171	s = ''.respond_to?(:force_encoding) ? "<p>Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>H\u00E1ppy Page</a>" :
	172	"<p>Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>H\303\241ppy Page</a>"
	173	assert_equal( s +
	174	" and to <span class='newWikiWord'>Wanted Page2<a href='../show/WantedPage2'>?</a></span>.pdf " +
	175	"and <span class='newWikiWord'>foo.pdf<a href='../show/foo.pdf'>?</a></span></p>",
	176	x_test_renderer(new_page.revisions.last).display_content(true) )
	177	assert_equal 3, references.size
	178	# now it works.
	179	assert_equal p, references[0].referenced_name
	180	assert_equal WikiReference::LINKED_PAGE, references[0].link_type
	181	assert_equal 'WantedPage2', references[1].referenced_name
	182	assert_equal WikiReference::WANTED_PAGE, references[1].link_type
	183	assert_equal 'foo.pdf', references[2].referenced_name
	184	assert_equal WikiReference::WANTED_PAGE, references[1].link_type
	185	wanted_pages = web.select.wanted_pages
	186	assert_equal ["HisWay", "OverThere", "WantedPage2"], wanted_pages
	187	end
	188
		def test_rollback
115		~~@page.revise("spot two", Time.now, "David", test_renderer)~~
116		~~@page.revise("spot three", Time.now + 2000, "David", test_renderer)~~
	190	@page.revise("spot two", @page.name, Time.now, "David", x_test_renderer)
	191	@page.revise("spot three", @page.name, Time.now + 2000, "David", x_test_renderer)
		assert_equal 3, @page.revisions(true).length, "Should have three revisions"
		@page.current_revision(true)
119		~~@page.rollback(0, Time.now, '127.0.0.1', test_renderer)~~
120		~~assert_equal "HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \\\\OverThere -- see SmartEngine in that SmartEngineGUI", @page.current_revision(true).content~~
	194	@page.rollback(0, Time.now, '127.0.0.1', x_test_renderer)
	195	assert_equal "HisWay would be MyWay $\\sin(x)\\begin{svg}<svg/>\\end{svg}\\includegraphics[width=3em]{foo}$ in kinda ThatWay in HisWay though MyWay \\\\OverThere -- see SmartEngine in that SmartEngineGUI", @page.current_revision(true).content
		end
		end

rool/rails/instiki/trunk/test/unit/uri_test.rb:

prev.	current

		#!/usr/bin/env ruby

3		~~require File.dirname(__FILE__) + '/../test_helper'~~
	3	require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
		require 'chunks/uri'

		class URITest < Test::Unit::TestCase

rool/rails/instiki/trunk/test/unit/web_test.rb:

prev.	current

		require File.expand_path(File.dirname(__FILE__) + '/../test_helper')

3		~~class WebTest < Test::Unit::TestCase~~
4		~~fixtures :webs, :pages, :revisions, :system, :wiki_references~~
	3	class WebTest < ActiveSupport::TestCase
	4	fixtures :system, :webs, :pages, :revisions, :wiki_references

		def setup
		@web = webs(:instiki)
...	...

		def test_pages_by_match
		add_sample_pages
17		~~assert_equal 2, @web.select { \|page\| page.content =~ /me/i }.length~~
	17	assert_equal 3, @web.select { \|page\| page.content =~ /me/i }.length
		assert_equal 1, @web.select { \|page\| page.content =~ /Who/i }.length
		assert_equal 0, @web.select { \|page\| page.content =~ /none/i }.length
		end

22		~~def test_references~~
	22	def test_002_references
		add_sample_pages
		assert_equal 1, @web.select.pages_that_reference('EverBeenHated').length
		assert_equal 0, @web.select.pages_that_reference('EverBeenInLove').length
...	...

		def test_delete
		add_sample_pages
30		~~assert_equal 2, @web.pages.length~~
	30	assert_equal 3, @web.pages.length
		@web.remove_pages([ @web.page('EverBeenInLove') ])
32		~~assert_equal 1, @web.pages(true).length~~
	32	assert_equal 2, @web.pages(true).length
		end

		def test_initialize
...	...
		assert_equal '123', web.password

		# new web should be set for maximum features enabled
43		~~assert_equal :textile, web.markup~~
	43	assert_equal :markdownMML, web.markup
		assert_equal '008B26', web.color
		assert !web.safe_mode?
		assert_equal([], web.pages)
...	...
		def test_new_page_linked_from_mother_page
		# this was a bug in revision 204
		home = @web.add_page('HomePage', 'This page refers to AnotherPage',
64		~~Time.local(2004, 4, 4, 16, 50), 'Alexey Verkhovsky', test_renderer)~~
	64	Time.local(2004, 4, 4, 16, 50), 'Alexey Verkhovsky', x_test_renderer)
		@web.add_page('AnotherPage', 'This is \AnotherPage',
66		~~Time.local(2004, 4, 4, 16, 51), 'Alexey Verkhovsky', test_renderer)~~
	66	Time.local(2004, 4, 4, 16, 51), 'Alexey Verkhovsky', x_test_renderer)

		@web.pages(true)
		assert_equal [home], @web.select.pages_that_link_to('AnotherPage')
		end

72		~~def test_orphaned_pages~~
	72	def test_001_orphaned_pages
		add_sample_pages
		home = @web.add_page('HomePage',
		'This is a home page, it should not be an orphan',
76		~~Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)~~
	76	Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
		author = @web.add_page('AlexeyVerkhovsky',
		'This is an author page, it should not be an orphan',
79		~~Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', test_renderer)~~
	79	Time.local(2004, 4, 4, 16, 50), 'AlexeyVerkhovsky', x_test_renderer)
		self_linked = @web.add_page('SelfLinked',
81		~~'I am SelfLinked and link to EverBeenInLove',~~
82		~~Time.local(2004, 4, 4, 16, 50), 'AnonymousCoward', test_renderer)~~
	81	"I am SelfLinked and link to EverBeenInLove\ncategory: fubar",
	82	Time.local(2004, 4, 4, 16, 50), 'AnonymousCoward', x_test_renderer)

		# page that links to itself, and nobody else links to it must be an orphan
		assert_equal ['EverBeenHated', 'SelfLinked'],
		@web.select.orphaned_pages.collect{ \|page\| page.name }.sort
	87	pages_in_category = @web.select.pages_in_category('fubar')
	88	orphaned_pages = @web.select.orphaned_pages
	89	assert_equal ['SelfLinked'],
	90	(pages_in_category & orphaned_pages).collect{ \|page\| page.name }.sort
		end

		def test_page_names_by_author
...	...
		private

		def add_sample_pages
100		~~@in_love = @web.add_page('EverBeenInLove', 'Who am I me',~~
101		~~Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', test_renderer)~~
	104	@in_love = @web.add_page('EverBeenInLove', "Who am I me\ncategory: fubar",
	105	Time.local(2004, 4, 4, 16, 50), 'DavidHeinemeierHansson', x_test_renderer)
		@hated = @web.add_page('EverBeenHated', 'I am me EverBeenHated',
103		~~Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', test_renderer)~~
	107	Time.local(2004, 4, 4, 16, 51), 'DavidHeinemeierHansson', x_test_renderer)
		end
		end

rool/rails/instiki/trunk/test/unit/wiki_file_test.rb:

prev.	current

1		~~require File.dirname(__FILE__) + '/../test_helper'~~
	1	require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
		require 'fileutils'

4		~~class WikiFileTest < Test::Unit::TestCase~~
	4	class WikiFileTest < ActiveSupport::TestCase
		include FileUtils
		fixtures :webs, :pages, :revisions, :system, :wiki_references

		def setup
		@web = webs(:test_wiki)
10		~~mkdir_p("#{RAILS_ROOT}/public/wiki1/files/")~~
11		~~rm_rf("#{RAILS_ROOT}/public/wiki1/files/*")~~
	10	mkdir_p("#{RAILS_ROOT}/webs/wiki1/files/")
	11	rm_rf("#{RAILS_ROOT}/webs/wiki1/files/*")
		WikiFile.delete_all
		end

rool/rails/instiki/trunk/test/unit/wiki_words_test.rb:

prev.	current

		#!/usr/bin/env ruby
	2	#coding: utf-8

		require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
4		~~require 'wiki_words'~~

		class WikiWordsTest < Test::Unit::TestCase

...	...
		assert_equal "Æe ÅØle Øen", WikiWords.separate("ÆeÅØleØen")
		assert_equal "Legetøj", WikiWords.separate("Legetøj")
		end
	14
	15	def test_multiple_leading_capital_letters
	16	assert_equal "CMy App", WikiWords.separate("CMyApp")
	17	end
		end