deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

big update to the web_list - statistics: last update, last document, created or revised; plus css updates to make small fonts look better in firefox

Browse source
This commit is contained in:
Matthias Tarasiewicz 2007-01-18 17:57:16 +00:00
parent 2e558d5222
commit 1877f66f17
4 changed files with 263 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

431
CHANGELOG
View file

@ -1,203 +1,270 @@
* TRUNK: * TRUNK:
Rails 1.2 tested
Stylesheet tweaks
Linux packaging
Fixed bug that failed to expire cached diff view of a page
Fixed rendering of WikiLinks in included pages in published or export mode
- ANTISPAM:
- updated and included spam_patterns.txt
- included dnsbl_check - DNS Blackhole Lists check
[thanks to joost from http://www.spacebabies.nl ]
- BUGFIXES:
- fix PDF output not to contain garbage chars [Jesse Newland]
- fixed the pages and authors display for single webs
- web list does not show a link to a published version if it has none
[Jesse Newland]
- Fixed bug that failed to expire cached diff view of a page
- Fixed rendering of WikiLinks in included pages in published or export
mode
- lots of small bugfixes and changes
- UPDATES:
- Rails 1.2 tested and packaged with instiki
- updated RubyZip to 0.9.1
- updated RedCloth to 3.0.4
- updated packaged sqlite3-ruby to 1.2.0
- FEATURES:
- Stylesheet tweaks
- visual display if webs are pass-protected (div background)
- Linux packaging
------------------------------------------------------------------------------
* 0.11.0: * 0.11.0:
SQL-based backend (ActiveRecord) - SQL-based backend (ActiveRecord)
File uploads (finally) - File uploads (finally)
Upgraded to Rails 1.0.0 - Upgraded to Rails 1.0.0
Replaced internal link generator with routing - Replaced internal link generator with routing
Fixed --daemon option - Fixed --daemon option
Removed Rubygem and native OS X distributions - Removed Rubygem and native OS X distributions
Improved HTML diff - Improved HTML diff
More accurate "See Changes" - More accurate "See Changes"
------------------------------------------------------------------------------
* 0.10.2: * 0.10.2:
Upgraded to Rails 0.13.1 - Upgraded to Rails 0.13.1
Fixed HTML export - Fixed HTML export
Added layout=no option to the export_html action (it exports page contents processed - Added layout=no option to the export_html action (it exports page
by the markup engine, but without the default layout - so that they can be wrapped in contents processed by the markup engine, but without the default layout -
some other layout) so that they can be wrapped in some other layout)
<nowiki> tag can span several lines (before it was applied when both opening and closing - <nowiki> tag can span several lines (before it was applied when both
tags were on the same line only) opening and closing tags were on the same line only)
Resolved the "endless redirection loop" condition and otherwise improved handling of - Resolved the "endless redirection loop" condition and otherwise improved
errors in the rendering engines handling of errors in the rendering engines
Fixed rendering of Markdown hyperlinks such as [Text](http://something.com/foo) - Fixed rendering of Markdown hyperlinks such as
[Text](http://something.com/foo)
------------------------------------------------------------------------------
* 0.10.1: * 0.10.1:
Upgraded Rails to 0.12.0 - Upgraded Rails to 0.12.0
Upgraded rubyzip to version 0.5.8 - Upgraded rubyzip to version 0.5.8
BlueCloth is back (RedCloth didn't do pure Markdown well enough) - BlueCloth is back (RedCloth didn't do pure Markdown well enough)
Handling of line breaks in Textile is as in 0.9 (inserts <br/> tag) - Handling of line breaks in Textile is as in 0.9 (inserts <br/> tag)
Fixed HTML export (to enclose the output in <html> tags, include the stylesheet etc) - Fixed HTML export (to enclose the output in <html> tags, include the
Corrected some compatibility issues with storages from earlier Instiki versions stylesheet etc)
Some other bug fixes - Corrected some compatibility issues with storages from earlier Instiki
versions
- Some other bug fixes
------------------------------------------------------------------------------
* 0.10.0: * 0.10.0:
Ported to ActionPack - Ported to ActionPack
RedCloth 3.0.3 - RedCloth 3.0.3
BlueCloth is phased out, Markdown is rendered by RedCloth - BlueCloth is phased out, Markdown is rendered by RedCloth
Mix markup option understands both Textile and Markdown on the same page - Mix markup option understands both Textile and Markdown on the same page
Instiki can serve static content (such as HTML or plain-text files) from ./public - Instiki can serve static content (such as HTML or plain-text files) from
directory ./public directory
Much friendlier admin interface - Much friendlier admin interface
Wiki link syntax doesn't conflict with Textile hyperlink syntax. Therefore - Wiki link syntax doesn't conflict with Textile hyperlink syntax.
"textile link":LinkToSomePlace will not look insane. Therefore "textile link":LinkToSomePlace will not look insane.
RSS feeds accept query parameters, sush as - RSS feeds accept query parameters, such as
http://localhost:2500/wiki/rss_with_headlines?start=2005-02-18&end=2005-02-19&limit=10 http://localhost:2500/wiki/rss_with_headlines?start=2005-02-18&end=2005-02-19&limit=10
RSS feed with page contents for a password-protected web behaves as follows: - RSS feed with page contents for a password-protected web behaves as
if the web is published, RSS feed links to the published version of the web follows: if the web is published, RSS feed links to the published version
otherwise, the feed is not available of the web. otherwise, the feed is not available
Madeleine will check every hour if there are new commands in the log or 24 hours have Madeleine will check every hour if there are new commands in the log or
passed since last snapshot, and take snapshot if either of these conditions is true 24 hours have passed since last snapshot, and take snapshot if either of
Madeleine will also not log read-only operations, resulting in a better performance these conditions is true. Madeleine will also not log read-only
Wiki extracts (to HTML and plain text) will leave only the last extract file in ./storage operations, resulting in a better performance
Wiki search handles multibyte (UTF-8) characters correctly - Wiki extracts (to HTML and plain text) will leave only the last extract
Local hyperlinks in published pages point to published pages [Michael DeHaan] file in ./storage
Fixed a bug that sometimes caused all past revisions of a page to be "forgotten" on - Wiki search handles multibyte (UTF-8) characters correctly
restart - Local hyperlinks in published pages point to published pages [Michael
Fixed parsing of URIs with a port number (http://someplace.org:8080) DeHaan]
Instiki will not fork itself on a *nix, unless explicitly asked to - Fixed a bug that sometimes caused all past revisions of a page to be
Instiki can bind to IPs other than 127.0.0.1 (command-line option) "forgotten" on restart
Revisions that do not change anything on the page are rejected - Fixed parsing of URIs with a port number (http://someplace.org:8080)
Automated tests for all controller actions - Instiki will not fork itself on a *nix, unless explicitly asked to
category: lines are presented as links to "All Pages" for relevant categories - Instiki can bind to IPs other than 127.0.0.1 (command-line option)
Search looks at page titles, as well as content - Revisions that do not change anything on the page are rejected
Multiple other usability enhancements and bug fixes - Automated tests for all controller actions
- category: lines are presented as links to "All Pages" for relevant
categories
- Search looks at page titles, as well as content
- Multiple other usability enhancements and bug fixes
------------------------------------------------------------------------------
* 0.9.2: * 0.9.2:
Rollback takes the user to an edit form. The form has to be submitted for the change to - Rollback takes the user to an edit form. The form has to be submitted for
take place. the change to take place.
Changed to use inline style on published pages - Changed to use inline style on published pages
Fixed "forward in time" on the last revision before current page - Fixed "forward in time" on the last revision before current page
Instiki won't log bogus error messages when creating a new Wiki - Instiki won't log bogus error messages when creating a new Wiki
Fixed deprecation warning for Object.id (introduced in Ruby 1.8.2) - Fixed deprecation warning for Object.id (introduced in Ruby 1.8.2)
Madeleine upgraded to 0.7.1 - Madeleine upgraded to 0.7.1
Madeleine snapshots are compressed - Madeleine snapshots are compressed
Packaged as a gem - Packaged as a gem
------------------------------------------------------------------------------
* 0.9.1: * 0.9.1:
Added performance improvements for updating existing pages - Added performance improvements for updating existing pages
Fixed IP logging and RSS feeds behind proxies [With help from Guan Yang] - Fixed IP logging and RSS feeds behind proxies [With help from Guan Yang]
Fixed default storage directory (borked running on Windows) [Spotted by Curt Hibbs] - Fixed default storage directory (borked running on Windows)
[Spotted by Curt Hibbs]
------------------------------------------------------------------------------
* 0.9.0: * 0.9.0:
Added aliased links such as [[HomePage|that nice home page]] [Mark Reid] - Added aliased links such as [[HomePage|that nice home page]] [Mark Reid]
Added include other page content with [[!include TableOfContents]] [Mark Reid] - Added include other page content with [[!include TableOfContents]]
Added delete orphan pages from the Edit Web screen [by inspiration from Simon Arnaud] [Mark Reid]
Added logging of IP address for authors (who's behind the rollback wars) - Added delete orphan pages from the Edit Web screen [by inspiration from
Added Categories pages through backlinks (use "categories: news, instiki" on start of line) [Mark Reid] Simon Arnaud]
Added option to use bracket-style wiki links only (and hence ban WikiWords) - Added logging of IP address for authors (who's behind the rollback wars)
Added command-line option to specify different storage path - Added Categories pages through backlinks (use "categories: news, instiki"
Added print view without navigation on start of line) [Mark Reid]
Added character and page (2275 characters including spaces) counter (important for student papers) - Added option to use bracket-style wiki links only (and hence ban
Off by default, activate it on the Edit Web screen WikiWords)
Added LaTeX/PDF integration on Textile installations with pdflatex installed on system (EXPERIMENTAL) - Added command-line option to specify different storage path
Use the home page as a table of contents with a unordered list to control sections - Added print view without navigation
Added limit of 15 to the number of pages included in RSS feed - Added character and page (2275 characters including spaces) counter
Moved static parts of stylesheet to separate file [Lau T?rnskov] (important for student papers)
Fixed better semantics for revision movement [Ryan Singer] - Off by default, activate it on the Edit Web screen
Fixed color diffs to work much better [Xen/Mertz/Atkins] - Added LaTeX/PDF integration on Textile installations with pdflatex
Fixed performance problems for All Pages list [Dennis Mertz] installed on system (EXPERIMENTAL)
Fixed lots of rendering bugs [Mark Reid] - Use the home page as a table of contents with a unordered list to control
Upgraded to RedCloth 2.0.11 [integrating the fine work of Dennis Mertz] sections
- Added limit of 15 to the number of pages included in RSS feed
- Moved static parts of stylesheet to separate file [Lau T?rnskov]
- Fixed better semantics for revision movement [Ryan Singer]
- Fixed color diffs to work much better [Xen/Mertz/Atkins]
- Fixed performance problems for All Pages list [Dennis Mertz]
- Fixed lots of rendering bugs [Mark Reid]
- Upgraded to RedCloth 2.0.11 [integrating the fine work of Dennis Mertz]
------------------------------------------------------------------------------
* 0.8.9: * 0.8.9:
Added color diffs to see changes between revisions [Bill Atkins] - Added color diffs to see changes between revisions [Bill Atkins]
They're aren't quite perfect yet as new paragraphs split the <ins> tags (hence 0.8.9, not 0.9.0) They're aren't quite perfect yet as new paragraphs split the <ins> tags
Added redirect to edit if content of page generates an error (hence 0.8.9, not 0.9.0)
- Added redirect to edit if content of page generates an error
(so the page doesn't become unusable on bugs in the markup engines) (so the page doesn't become unusable on bugs in the markup engines)
Fixed update Web with different address bug [Denis Metz] - Fixed update Web with different address bug [Denis Metz]
Fixed a bunch of wiki word rendering issues by doing wiki word detection and replacment at once - Fixed a bunch of wiki word rendering issues by doing wiki word detection
Upgraded to BlueCloth 0.0.3b (should fix loads of problems on Markdown wikis) and replacment at once
- Upgraded to BlueCloth 0.0.3b (should fix loads of problems on Markdown
wikis)
------------------------------------------------------------------------------
* 0.8.5: * 0.8.5:
Instiki can now serve as a CMS by running a password-protected web with a published front - Instiki can now serve as a CMS by running a password-protected web with a
Added version check at startup (Instiki needs Ruby 1.8.1) published front
- Added version check at startup (Instiki needs Ruby 1.8.1)
------------------------------------------------------------------------------
* 0.8.1: * 0.8.1:
Actually included RedCloth 2.0.7 in the release - Actually included RedCloth 2.0.7 in the release
------------------------------------------------------------------------------
* 0.8.0: * 0.8.0:
NOTE: Single-web wikis created in versions prior to 0.8.0 have "instiki" as their system password - NOTE: Single-web wikis created in versions prior to 0.8.0 have "instiki"
Accepts wiki words in bracket style. Ex: [[wiki word]], [[c]], [[We could'nt have done it!]] as their system password
Accepts camel-case wiki words in all latin, greek, cyrillian, and armenian unicode characters - Accepts wiki words in bracket style.
Many thanks to Guan Yang for building the higher- and lower-case lookup tables Examples: [[wiki word]], [[c]], [[We could'nt have done it!]]
And thanks to Simon Arnaud for the initial patch that got the work started - Accepts camel-case wiki words in all latin, greek, cyrillian, and
Changed charset to UTF-8 armenian unicode characters
Cut down on command-line options and replaced them with an per-web config screen - Many thanks to Guan Yang for building the higher- and lower-case lookup
Added option to extend the stylesheet on a per-web basis to tweak the look in details tables. And thanks to Simon Arnaud for the initial patch that got the
Added simple color options for variety work started
Added option to add/remove password protection on each web - Changed charset to UTF-8
Added the wiki name of the author locking a given page (instead of just "someone") - Cut down on command-line options and replaced them with an per-web config
Removed single/multi-web distinction -- all Instikis are now multi-web screen
Load libraries from an unshifted load path, so that old installed libraries doesn't clash [Emiel van de Laar] - Added option to extend the stylesheet on a per-web basis to tweak the
Keeps the author cookie forever, so you don't have to enter your name again and again look in details
Fixed XHTML so it validates [Bruce D'Arcus] - Added simple color options for variety
Authors are no longer listed under orphan pages - Added option to add/remove password protection on each web
Added export to markup (great for backups, potentially for switching wiki engine) - Added the wiki name of the author locking a given page (instead of just
Don't link wiki words that proceeds from either /, = or ? "someone")
(http://c2.com/cgi/wiki?WikiWikiClones, /show/HomePage, cgi.pl?show=WikiWord without escaping) - Removed single/multi-web distinction -- all Instikis are now multi-web
Accessing an unexisting page redirects to a different url (/new/PageName) - Load libraries from an unshifted load path, so that old installed
Increased snapshot time to just once a day (cuts down on disk storage requirements) libraries doesn't clash [Emiel van de Laar]
Made RDoc support work better with 1.8.1 [Mauricio Fern?ndez] - Keeps the author cookie forever, so you don't have to enter your name
Added convinient redirect from /wiki/ to /wiki/show/HomePage again and again
Fixed BlueCloth bug with backticks at start of line - Fixed XHTML so it validates [Bruce D'Arcus]
Updated to RedCloth 2.0.7 (and linked to the new Textile reference) - Authors are no longer listed under orphan pages
- Added export to markup (great for backups, potentially for switching wiki
engine)
- Don't link wiki words that proceeds from either /, = or ?
(http://c2.com/cgi/wiki?WikiWikiClones,
/show/HomePage, cgi.pl?show=WikiWord without escaping)
- Accessing an unexisting page redirects to a different url (/new/PageName)
- Increased snapshot time to just once a day (cuts down on disk storage
requirements)
- Made RDoc support work better with 1.8.1 [Mauricio Fern?ndez]
- Added convinient redirect from /wiki/ to /wiki/show/HomePage
- Fixed BlueCloth bug with backticks at start of line
- Updated to RedCloth 2.0.7 (and linked to the new Textile reference)
------------------------------------------------------------------------------
* 0.7.0: * 0.7.0:
Added Markdown (BlueCloth) and RDoc [Mauricio Fern?ndez] as command-line markup choices - Added Markdown (BlueCloth) and RDoc [Mauricio Fern?ndez] as command-line
Added wanted and orphan page lists to All pages (only show up if there's actually orphan or wanted pages) markup choices
Added ISO-8859-1 as XML encoding in RSS feeds (makes FeedReader among others happy for special entities) - Added wanted and orphan page lists to All pages (only show up if there's
Added proper links in the RSS feed (but the body links are still relative, which NNW and others doesn't grok) actually orphan or wanted pages)
Added access keys: E => Edit, H => HomePage, A => All Pages, U => Recently Revised, X => Export - Added ISO-8859-1 as XML encoding in RSS feeds (makes FeedReader among
Added password-login through URL (so you can subscribe to feed on a protected web) others happy for special entities)
Added web passwords to the feed links for protected webs, so they work without manual login - Added proper links in the RSS feed (but the body links are still
Added the web name in small letters above all pages within a web relative, which NNW and others doesn't grok)
Polished authors and recently revised - Added access keys: E => Edit, H => HomePage, A => All Pages,
Updated to RedCloth 2.0.6 U => Recently Revised, X => Export
Changed content type for RSS feeds to text/xml (makes Mozilla Aggreg8 happy) - Added password-login through URL (so you can subscribe to feed on a
Changed searching to be case insensitive protected web)
Changed HomePage to display the name of the web instead - Added web passwords to the feed links for protected webs, so they work
Changed exported HTML pages to be valid XHTML (which can be preprocessed by XSLT) without manual login
Fixed broken recently revised - Added the web name in small letters above all pages within a web
- Polished authors and recently revised
- Updated to RedCloth 2.0.6
- Changed content type for RSS feeds to text/xml (makes Mozilla Aggreg8
happy)
- Changed searching to be case insensitive
- Changed HomePage to display the name of the web instead
- Changed exported HTML pages to be valid XHTML (which can be preprocessed
by XSLT)
- Fixed broken recently revised
------------------------------------------------------------------------------
* 0.6.0: * 0.6.0:
Fixed Windows compatibility [Florian] - Fixed Windows compatibility [Florian]
Fixed bug that would prevent Madeleine from taking snapshots in Daemon mode - Fixed bug that would prevent Madeleine from taking snapshots in Daemon
Added export entire web as HTML in a zip file mode
Added RSS feeds - Added export entire web as HTML in a zip file
Added proper getops support for the growing number of options [Florian] - Added RSS feeds
Added safe mode that forbids style options in RedCloth [Florian] - Added proper getops support for the growing number of options [Florian]
Updated RedCloth to 2.0.5 - Added safe mode that forbids style options in RedCloth [Florian]
- Updated RedCloth to 2.0.5
------------------------------------------------------------------------------
* 0.5.0: * 0.5.0:
NOTE: 0.5.0 is NOT compatible with databases from earlier versions - NOTE: 0.5.0 is NOT compatible with databases from earlier versions
Added revisions - Added revisions
Added multiple webs - Added multiple webs
Added password protection for webs on multi-web setups - Added password protection for webs on multi-web setups
Added the notion of authors (that are saved in a cookie) - Added the notion of authors (that are saved in a cookie)
Added command-line option for not running as a Daemon on Unix - Added command-line option for not running as a Daemon on Unix
------------------------------------------------------------------------------
* 0.3.1: * 0.3.1:
Added option to escape wiki words with \ - Added option to escape wiki words with \
------------------------------------------------------------------------------
* 0.3.0: * 0.3.0:
Brought all files into common style (including Textile help on the edit page) - Brought all files into common style (including Textile help on the edit
Added page locking (if someone already is editing a page there's a warning) page)
Added daemon abilities on Unix (keep Instiki running after you close the terminal) - Added page locking (if someone already is editing a page there's a
Made port 2500 the default port, so Instiki can be launched by dobbelt-click warning)
Added Textile cache to speed-up rendering of large pages - Added daemon abilities on Unix (keep Instiki running after you close the
Made WikiWords look like "Wiki Words" terminal)
Updated RedCloth to 2.0.4 - Made port 2500 the default port, so Instiki can be launched by
dobbelt-click
- Added Textile cache to speed-up rendering of large pages
- Made WikiWords look like "Wiki Words"
- Updated RedCloth to 2.0.4
------------------------------------------------------------------------------
* 0.2.5: * 0.2.5:
Upgraded to RedCloth 2.0.2 and Madeleine 0.6.1, which means the - Upgraded to RedCloth 2.0.2 and Madeleine 0.6.1, which means the
Windows problems are gone. Also fixed a problem with wikiwords - Windows problems are gone. Also fixed a problem with wikiwords
that used part of other wikiwords. - that used part of other wikiwords.
------------------------------------------------------------------------------
* 0.2.0: * 0.2.0:
First public release - First public release

4
app/models/web.rb
View file

@ -35,6 +35,10 @@ class Web < ActiveRecord::Base
pages.find(:first, :conditions => ['name = ?', name]) pages.find(:first, :conditions => ['name = ?', name])
end end
def last_page
return Page.find(:first, :order => 'id desc', :conditions => ['web_id = ?', self.id])
end
def has_page?(name) def has_page?(name)
Page.count(['web_id = ? AND name = ?', id, name]) > 0 Page.count(['web_id = ? AND name = ?', id, name]) > 0
end end

5
app/views/wiki/web_list.rhtml
View file

@ -13,6 +13,11 @@
<div class="byline" style="margin-bottom: 0px"> <div class="byline" style="margin-bottom: 0px">
<%= web.pages.length %> page<% if web.pages.length != 1 %>s<% end %> by <%= web.authors.length %> author<% if web.authors.length != 1 %>s<% end %> <%= web.pages.length %> page<% if web.pages.length != 1 %>s<% end %> by <%= web.authors.length %> author<% if web.authors.length != 1 %>s<% end %>
- Last Update: <%= web.last_page.nil? ? format_date(web.created_at) : format_date(web.last_page.revised_at) %><br/>
<% if ! web.last_page.nil? %>
Last Document: <%= link_to_page(web.last_page.name,web) %>
<%= web.last_page.revisions? ? "Revised" : "Created" %> by <%= author_link(web.last_page) %> (<%= web.last_page.current_revision.ip %>)
<% end %>
</div> </div>
</span> </span>
</div><br> </div><br>

4
public/stylesheets/instiki.css
View file

@ -155,10 +155,10 @@ padding-left:1.5em;
.byline { .byline {
color:#999; color:#999;
font-size:60%; font-size:65%;
font-style:italic; font-style:italic;
margin-bottom:1em; margin-bottom:1em;
padding-top:1em; padding-top:1px;
} }
.diffdel,del.diffmod { .diffdel,del.diffmod {