RubyGems - Soks - Versions diffs - 0.0.2 → 0.0.3 - Mend

Soks 0.0.2 → 0.0.3

Files changed (132) hide show

data/templates/rails/views/Page_meta.rhtml ADDED Viewed

@@ -0,0 +1,38 @@
+<span class='pagename'><a href='/<%= pagename %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
+<h1><%= pagename %></h1>
+<p>This page was created on <%= page.created_on %> by <%= page.revisions.first.author %>.  It was last updated on <%= page.revised_on %> by <%= page.author %>. It has been changed <%= page.revisions.size %> time(s) (roughly once every <%= (((Time.now-page.created_on)/page.revisions.size)/(60*60*24)).to_i %> days).</p>
+<div class='metacolumn' >
+<h2>Wiki links from this page</h2>
+<ul>
+<% page.links_from.each do |linkedpage| %>
+	<li><a href='/<%= linkedpage.name %>'><%= linkedpage.name %></a></li>
+<% end %>
+</ul>
+</div>
+<div class='metacolumn' >
+<h2>Wiki links to this page</h2>
+<ul>
+<% page.links_to.each do |linkedpage| %>
+	<li><a href='/<%= linkedpage.name %>'><%= linkedpage.name %></a></li>
+<% end %>
+</ul>
+</div>
+<div class='metacolumn' >
+<h2>Authors</h2>
+<ol>
+<% page.revisions.each do |revision| %>
+	<li><a href='/<%= revision.author %>'><%= revision.author %></a></li>
+<% end %>
+</ol>
+</div>

data/templates/rails/views/Page_print.rhtml ADDED Viewed

@@ -0,0 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<body>
+<%= renderedview %>
+</body>
+</html>

data/templates/rails/views/Page_revisions.rhtml ADDED Viewed

@@ -0,0 +1,19 @@
+<span class='pagename'><%= pagename %></span>
+<div class="undochange">
+	<% page.revisions.reverse_each do |revision| %>
+		<p><%= revision.created_on %> by <a href='/<%= revision.author %>'><%= revision.author %></a> <a href='/rollback/<%= pagename %>?revision=<%= revision.number-1 %>' >(undo)</a>:</p>
+		<p>
+		<% revision.changes.each do |change_group| %>
+				<%	change_group.each do |change|
+					case change[0]
+					when "-" %>
+						<del><%= change[1] %>. <%= change[2] %></del><br />
+					<% 	when "+" %>
+						<%= change[1] %>. <%= change[2] %><br />
+					<%	end %>
+				<%	end %>
+		<% end %>
+		</p>
+	<% end %>
+	<br />(<a href='/edit/<%= pagename %>' accesskey="R" >Return to editing</a>)
+</div>

data/templates/rails/views/Page_rss.rhtml ADDED Viewed

@@ -0,0 +1,55 @@
+<%=
+require "rss/maker"
+RSS::Maker.make("2.0") do |maker|
+  	maker.channel.title = "#{$SETTINGS[:name]} #{pagename}"
+	maker.channel.description = $SETTINGS[:description]
+	maker.channel.link = $SETTINGS[:url]
+	maker.image.title = "#{$SETTINGS[:name]}"
+	maker.image.url = "#{$SETTINGS[:url]}/attachment/logo.png"
+	maker.textinput.title = "Search"
+	maker.textinput.description = "Search #{$SETTINGS[:name]}'s text"
+	maker.textinput.name = "regex"
+	maker.textinput.link = "#{$SETTINGS[:url]}/find/searchpage"
+	maker.items.do_sort = true
+	count = 0
+	for revision in page.revisions
+		break if (count +=1) == 15
+		item = maker.items.new_item
+		item.link = "#{$SETTINGS[:url]}/#{pagename}"
+		# Get the first change that makes an addition and use as the title
+		title = nil
+		revision.changes.each do |group|
+			group.each do |type,line,text|
+				if type == '+' && text != ''
+					title = text.gsub(/<.*?>/,'')
+				end
+				break if title
+			end
+			break if title
+		end
+		# If change found, take just the changed text and remove tags.
+		# If no change found, then must be because only deleted stuff so give that message
+		item.title = title || $MESSAGES[:some_content_has_been_deleted] # Default
+		item.date = revision.created_on
+		item.author = revision.author
+		item.description = ""
+		content_deleted = false
+		revision.changes.each do |change_group|
+			change_group.each do |change|
+				case change[0]
+				when "-"; content_deleted = true
+				when "+"; item.description << "#{change[2]}<br />"
+				end
+			end
+			item.description << "&#8230;<br />"
+		end
+		item.description << "Content was also deleted" if content_deleted
+	end
+end
+%>

data/templates/rails/views/Page_search_results.rhtml ADDED Viewed

@@ -0,0 +1,19 @@
+<span class='pagename'><%= pagename %></span>
+<h1>Results of Search for &#8220;<%= pagename %>&#8221;</h1>
+<% unless title_results.empty? %>
+	<h2>Matches in the titles of pages</h2>
+	<ul>
+	<% title_results.each do |name, page| %>
+		<li><a href='/<%= name %>' ><%= name %></a></li>
+	<% end %>
+	</ul>
+<% end %>
+<% unless text_results.empty? %>
+	<h2>Matches in the text of pages</h2>
+	<ul>
+	<% text_results.each do |name, page| %>
+		<li><a href='/<%= name %>' ><%= name %></a></li>
+	<% end %>
+	</ul>
+<% end %>
+<div class='command'>(<a href='/edit/<%= pagename %>' accesskey="E" >Create a page titled &#8220;<%= pagename %>&#8221;</a>)</div>

data/templates/rails/views/Page_view.rhtml ADDED Viewed

@@ -0,0 +1,3 @@
+<span class='pagename'><a href='/meta/<%= pagename %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
+<%= renderedview %>

data/templates/rails/views/UploadPage_edit.rhtml ADDED Viewed

@@ -0,0 +1,38 @@
+<span class='pagename'><%= pagename %><%= page.deleted? ? "(Deleted)" : '' %></span>
+<form action='/upload/<%= pagename %>' method=post enctype=multipart/form-data >
+<table>
+	<tr><td>Title:</td><td>
+	<% if page.is_a? ImagePage %>
+		<input type=hidden name='titleprefix' value='Picture of ' />
+		Picture of <input name='newtitle' size = '51' value='<%= pagename[ 10..-1].strip %>'
+	<% else %>
+		<input type=hidden name='titleprefix' value='Attached ' />
+		Attached <input name='newtitle' size = '52' value='<%= pagename[ 9..-1].strip %>'
+	<% end %>
+	onClick="this.value == 'Type a title here' ? this.value = '' : true"/></td></tr>
+	<tr><td valign='top'>File:</td><td><input name='file' type=file  /></td></tr>
+	<tr><td>Author:</td><td><a href='/<%= person %>'><%= person %></a> Quit browser to log out.</td>
+	<tr><td></td><td><input name=action value='Save' type=submit accesskey="S"> <a href='/<%= pagename %>' accesskey="C" >(Cancel)</a> or <a href='/delete/<%= pagename %>' accesskey='D'>(Delete)</a> this page.</td></tr>
+	</table>
+</form>
+<hr />
+<% unless page.empty? %>
+<p>The most recent change was made by <a href='/<%= page.author %>'><%= page.author %></a> who changed:</p>
+		<%
+		page.changes.each do |change_group|
+			change_group.each do |change|
+				case change[0]
+				when "-" %>
+					<del><%= change[1] %>. <%= change[2] %></del><br />
+		<% 	when "+" %>
+					<%= change[1] %>. <%= change[2] %><br />
+		<%
+				end
+			end
+		end
+		%>
+		<p>
+		<a href='/rollback/<%= pagename %>?revision=<%= page.number - 1  %>' accesskey="U" >(Undo this change)</a> or <a href='/revisions/<%= pagename %>' accesskey="A" >(Show All changes)</a>
+		</p>
+<% end %>

data/templates/rails/views/frame.rhtml ADDED Viewed

@@ -0,0 +1,60 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+	<title><%= pagename %></title>
+	<meta name="description" content="<%= $SETTINGS[:description] %>" />
+	<meta name="keywords" content="Soks, <%= $SETTINGS[:name] %>" />
+	<link href="/attachment/basics.css" rel="stylesheet" type="text/css" />
+	<link href="/attachment/2colheader.css" rel="stylesheet" type="text/css" />
+	<script src="/attachment/newpage.js" language="JavaScript" type="text/javascript" />
+<body onkeypress="hotkey(event);">
+	<div id="header">
+	<div id="logo"><a href='/Home Page' ><img height='140' src='/attachment/logo.tiff' alt='<%= @wikiname %>' border='0' /></a></div>
+	<h1>Soks</h1>
+	<p id="navMain">
+		<a href='/view/home page' accesskey="H" >Home Page</a>
+		<a href='/view/site index' accesskey="I" >Index</a>
+		<a href='/view/upcoming events' accesskey="U" >Events</a>
+		<a href='/view/recent blog entries' accesskey="B" >Blog</a>
+		<a href='/view/recent changes to this site' accesskey="R" >Recent Changes</a>
+		<a href=''>&nbsp;</a>
+	<p>
+</div> <!-- #header -->
+<div id="content">
+ 	<%= content_of_page %>
+</div>
+<div id="sidebar">
+		<h2>Search <%= $SETTINGS[:name] %></h2>
+		<form method=GET action='/find/<%= pagename %>' >
+			<input name='regex' value='Search' size=15 onClick="this.value == 'Search' ? this.value = '' : true" />
+			<input name='action' value='search' type=submit>
+		</form>
+		<h2>Links to this page</h2>
+		<% if page %>
+			<% page.links_to.each do |linkedpage| %>
+				<a href='/<%= linkedpage.name %>'><%= linkedpage.name %></a>
+			<% end %>
+		<% end %>
+		<br />
+		<h2>Create a new page</h2>
+		<a href='/edit/Type a title here'>Add a new page</a>
+		<a href='/edit/Picture of Type a title here'>Upload a new picture</a>
+		<a href='/edit/Attached Type a title here'>Upload a new file</a>
+		<br />
+		<h2>Edit this page</h2>
+		<a href='/edit/<%= pagename %>' accesskey='E'>Edit this page</a>
+		<br />
+		<a style='display:inline;align:right;' href='/rss/<%= pagename %>'><img src='/attachment/rss.png' alt='rss feed' /></a>
+		<br />
+		<i>Powered by <a style='display:inline;' href='http://soks.rubyforge.org'>Soks</a></i>
+</div>
+</body>
+</html>

data/templates/rails/views/messages.yaml ADDED Viewed

@@ -0,0 +1,6 @@
+:some_content_has_been_deleted : "Some content has been deleted"
+:Type_what_you_want_here_and_click_save : "Type what you want here and click save"
+:Create : "Create"
+:page_deleted : "page deleted"
+:content_moved_to : "content moved to"
+:content_moved_from : "content moved from"

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: Soks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-date: 2005-01-11
+  version: 0.0.3
+date: 2005-01-25
 summary: Yet another wiki.
 require_paths:
   - lib
@@ -31,6 +31,8 @@ files:
   - bin/soks-create-wiki.rb
   - contrib/diff
   - contrib/diff_licence.txt
+  - contrib/easyprompt.rb
+  - contrib/easyprompt_licence.txt
   - contrib/redcloth-2.0.11.rb
   - contrib/redcloth-3.0.1.rb
   - contrib/redcloth_license.txt
@@ -47,35 +49,127 @@ files:
   - lib/soks-helpers.rb
   - lib/soks-model.rb
   - lib/soks-servlet.rb
+  - lib/soks-storage.rb
+  - lib/soks-upgrade-0.0.2.rb
   - lib/soks-utils.rb
   - lib/soks-view.rb
   - lib/soks.rb
-  - template/attachment
-  - template/content
-  - template/start.rb
-  - template/views
-  - template/attachment/logo.png
-  - template/attachment/stylesheet.css
-  - template/content/home%20page.textile
-  - template/content/How%20to%20export%20a%20site%20from%20this%20wiki.textile
-  - template/content/How%20to%20hack%20soks.textile
-  - template/content/How%20to%20import%20a%20site%20from%20instiki.textile
-  - template/content/Improving%20the%20style%20of%20this%20wiki.textile
-  - template/content/Picture%20of%20a%20pair%20of%20soks.textile
-  - template/content/Pointers%20on%20adjusting%20the%20settings.textile
-  - template/content/Pointers%20on%20how%20to%20use%20this%20wiki.textile
-  - template/content/Recent%20Changes%20to%20This%20Site.textile
-  - template/content/Soks%20Licence.textile
-  - template/views/AttachmentPage_edit.rhtml
-  - template/views/frame.rhtml
-  - template/views/ImagePage_edit.rhtml
-  - template/views/Page_content.rhtml
-  - template/views/Page_edit.rhtml
-  - template/views/Page_print.rhtml
-  - template/views/Page_revisions.rhtml
-  - template/views/Page_rss.rhtml
-  - template/views/Page_search_results.rhtml
-  - template/views/Page_view.rhtml
+  - templates/default
+  - templates/instiki
+  - templates/rails
+  - templates/default/attachment
+  - templates/default/banned_titles.txt
+  - templates/default/content
+  - templates/default/start.rb
+  - templates/default/version.txt
+  - templates/default/views
+  - templates/default/attachment/logo.png
+  - templates/default/attachment/logo.tiff
+  - templates/default/attachment/newpage.js
+  - templates/default/attachment/print_stylesheet.css
+  - templates/default/attachment/rss.png
+  - templates/default/attachment/stylesheet.css
+  - templates/default/content/Bug%3A%20In%20a%20list%20of%20links%2C%20the%20last%20link%20is%20sometimes%20not%20linked.textile
+  - templates/default/content/Bug%3A%20Symbols%20are%20not%20always%20correctly%20rendered%20in%20html.textile
+  - templates/default/content/Bug%3A%20Uploads%20are%20not%20password%20protected.textile
+  - templates/default/content/home%20page.textile
+  - templates/default/content/How%20to%20administrate%20this%20wiki.textile
+  - templates/default/content/How%20to%20change%20the%20way%20this%20wiki%20looks.textile
+  - templates/default/content/How%20to%20export%20a%20site%20from%20this%20wiki.textile
+  - templates/default/content/How%20to%20hack%20soks.textile
+  - templates/default/content/How%20to%20import%20a%20site%20from%20instiki.textile
+  - templates/default/content/How%20to%20use%20this%20wiki.textile
+  - templates/default/content/List%20of%20changes.textile
+  - templates/default/content/Picture%20of%20a%20pair%20of%20soks.textile
+  - templates/default/content/Soks%20Licence.textile
+  - templates/default/views/frame.rhtml
+  - templates/default/views/messages.yaml
+  - templates/default/views/Page_content.rhtml
+  - templates/default/views/Page_edit.rhtml
+  - templates/default/views/Page_meta.rhtml
+  - templates/default/views/Page_print.rhtml
+  - templates/default/views/Page_revisions.rhtml
+  - templates/default/views/Page_rss.rhtml
+  - templates/default/views/Page_search_results.rhtml
+  - templates/default/views/Page_view.rhtml
+  - templates/default/views/UploadPage_edit.rhtml
+  - templates/instiki/attachment
+  - templates/instiki/banned_titles.txt
+  - templates/instiki/content
+  - templates/instiki/start.rb
+  - templates/instiki/version.txt
+  - templates/instiki/views
+  - templates/instiki/attachment/header_backdrop.png
+  - templates/instiki/attachment/instiki_style_sheet.css
+  - templates/instiki/attachment/logo.tiff
+  - templates/instiki/attachment/logotext.png
+  - templates/instiki/attachment/newpage.js
+  - templates/instiki/attachment/rss.png
+  - templates/instiki/content/AutomaticSummary.textile
+  - templates/instiki/content/home%20page.textile
+  - templates/instiki/content/How%20to%20export%20a%20site%20from%20this%20wiki.textile
+  - templates/instiki/content/How%20to%20hack%20soks.textile
+  - templates/instiki/content/How%20to%20import%20a%20site%20from%20instiki.textile
+  - templates/instiki/content/Improving%20the%20style%20of%20this%20wiki.textile
+  - templates/instiki/content/Known%20bugs.textile
+  - templates/instiki/content/List%20of%20changes.textile
+  - templates/instiki/content/Picture%20of%20a%20pair%20of%20soks.textile
+  - templates/instiki/content/Pointers%20on%20adjusting%20the%20settings.textile
+  - templates/instiki/content/Pointers%20on%20how%20to%20use%20this%20wiki.textile
+  - templates/instiki/content/Recent%20Blog%20Entries.textile
+  - templates/instiki/content/Recent%20Changes%20to%20This%20Site.textile
+  - templates/instiki/content/Site%20Index.textile
+  - templates/instiki/content/Soks%20Licence.textile
+  - templates/instiki/views/frame.rhtml
+  - templates/instiki/views/messages.yaml
+  - templates/instiki/views/Page_content.rhtml
+  - templates/instiki/views/Page_edit.rhtml
+  - templates/instiki/views/Page_meta.rhtml
+  - templates/instiki/views/Page_print.rhtml
+  - templates/instiki/views/Page_revisions.rhtml
+  - templates/instiki/views/Page_rss.rhtml
+  - templates/instiki/views/Page_search_results.rhtml
+  - templates/instiki/views/Page_view.rhtml
+  - templates/instiki/views/UploadPage_edit.rhtml
+  - templates/rails/attachment
+  - templates/rails/banned_titles.txt
+  - templates/rails/content
+  - templates/rails/start.rb
+  - templates/rails/version.txt
+  - templates/rails/views
+  - templates/rails/attachment/2colheader.css
+  - templates/rails/attachment/basics.css
+  - templates/rails/attachment/header_backdrop.png
+  - templates/rails/attachment/logo.tiff
+  - templates/rails/attachment/logotext.png
+  - templates/rails/attachment/newpage.js
+  - templates/rails/attachment/rss.png
+  - templates/rails/content/AutomaticSummary.textile
+  - templates/rails/content/home%20page.textile
+  - templates/rails/content/How%20to%20export%20a%20site%20from%20this%20wiki.textile
+  - templates/rails/content/How%20to%20hack%20soks.textile
+  - templates/rails/content/How%20to%20import%20a%20site%20from%20instiki.textile
+  - templates/rails/content/Improving%20the%20style%20of%20this%20wiki.textile
+  - templates/rails/content/Known%20bugs.textile
+  - templates/rails/content/List%20of%20changes.textile
+  - templates/rails/content/Picture%20of%20a%20pair%20of%20soks.textile
+  - templates/rails/content/Pointers%20on%20adjusting%20the%20settings.textile
+  - templates/rails/content/Pointers%20on%20how%20to%20use%20this%20wiki.textile
+  - templates/rails/content/Recent%20Blog%20Entries.textile
+  - templates/rails/content/Recent%20Changes%20to%20This%20Site.textile
+  - templates/rails/content/Site%20Index.textile
+  - templates/rails/content/Soks%20Licence.textile
+  - templates/rails/views/frame.rhtml
+  - templates/rails/views/messages.yaml
+  - templates/rails/views/Page_content.rhtml
+  - templates/rails/views/Page_edit.rhtml
+  - templates/rails/views/Page_meta.rhtml
+  - templates/rails/views/Page_print.rhtml
+  - templates/rails/views/Page_revisions.rhtml
+  - templates/rails/views/Page_rss.rhtml
+  - templates/rails/views/Page_search_results.rhtml
+  - templates/rails/views/Page_view.rhtml
+  - templates/rails/views/UploadPage_edit.rhtml
   - LICENSE.txt
   - README.txt
 test_files: []

data/template/content/How%20to%20export%20a%20site%20from%20this%20wiki.textile DELETED Viewed

@@ -1,5 +0,0 @@
-h1. How to export a site from this wiki
-The contents of this site are stored in flat files in the 'contents' folder of this wiki (soks-wiki/contents by default).  They are the ones with the .textile ending.  Should be pretty easy to transfer them to wherever you need.
-The authors, and change history of each page are stored in the same folder with a .marshal extension. These are marshalled arrays of Revision objects.  These are harder to export, but the general approach would be to go to the contents folder, launch irb, require 'soks-model', Marshal.load each page and do whatever conversion you need.

data/template/content/Pointers%20on%20adjusting%20the%20settings.textile DELETED Viewed

@@ -1,39 +0,0 @@
-h1. Adjusting the settings
-Take a look at the start.rb file in your wiki folder.  This can be used to change the settings such as port and url of this site, and to enable more advanced features such as calendars and automatic summaries.
-h2. To restart your wiki
-The soks-create-wiki.rb script will have created a folder in the directory in which you ran it (by default the folder is 'soks-wiki'). In that folder is a script 'start.rb' run it.
-<code>
-cd soks-wiki
-ruby start.rb
-</code>
-h2. To make your site accessible beyond localhost
-Open start.rb in your directory. Un-comment the lines
-<code>
-# :url => 'http://localhost:8000',
-# :port => 8000,
-</code>
-and replace them with the url and port you wish the wiki to run on.
-h2. To password protect your site.
-Open start.rb in your wiki directory. Un-comment one of:
-<code>
-# :authenticator => WEBrick::HTTPAuth::NotAuthentication.new( 'No password, just enter a name'), # Doesn't require a passwrod
-# :authenticator => WEBrick::HTTPAuth::OnePasswordAuthentication.new( 'password', 'Enter the site wide password (password by default!)' ), # One group wide password
-# :authenticator => WEBrick::HTTPAuth::BasicAuth.new( :UserDB => htpasswd, :Realm => realm ) # See webrick documentation
-# :authenticator => WEBrick::HTTPAuth::DigestAuth.new( :UserDB => htpdigest, :Realm => realm )
-</code>
-You may also wish to uncomment
-<code># :dont_authenticate => [],  # Require authentication for reading as well as editing</code>
-Note a big bug is that viewing attached images and files is NOT password protected.  If someone knows how to make WEBrick::HTTPServlet::FileHandler use an authenticator, please let me know.
-h2. To edit the default site settings used by soks-create-wiki.rb
-Edit template/start.rb in the directory where soks was installed.