Soks 0.0.5 → 0.0.6

data/templates/default/start.rb

@@ -3,18 +3,26 @@
 # This file was created automatically on <%= Time.now %>
 # Uncomment different sections to enable features of this wiki.
 
-#Add the required libraries to the search path:
-$:.push( "<%= settings[:soks_libraries].join('","') %>" )
-
-require 'soks'
+#Add the required libraries to the search path
+begin
+	require 'rubygems'
+	require_gem 'Soks', '= <%= settings[:version] %>'
+	$stderr.puts 'Loaded Soks <%= settings[:version] %> from gem'
+rescue LoadError
+	$stderr.puts "Soks Gem version <%= settings[:version] %> could not be found"
+	$:.push( "<%= settings[:soks_libraries].join('","') %>" )
+	require 'soks'
+	$stderr.puts 'Loaded from fixed path'
+end
 
 module StartSoks
-	
+
+	# EDIT THIS TO CHANGE THE AUTHENTICATION	
 =begin
 	# If you uncomment this, don't forget to uncomment the authenticators line in the CUSTOMSETTINGS hash below!
 	# You can choose what level of authentication to apply based on regular expressions matched
 	# against the page title.  These regexps are tried in order.Defaults are here:
-	authenticators = [ [ %r{/(view|rss|print|find|meta)/.*}, WEBrick::HTTPAuth::NoAuthenticationRequired.new ],
+	authenticators = [ [ %r{/(view|rss|print|find|meta|attachment)/.*}, WEBrick::HTTPAuth::NoAuthenticationRequired.new ],
 							 # [ %r{/upload/.*}, WEBrick::HTTPAuth::NotPermitted.new ],
 							 # [ %r{/(edit|save)/home page}, WEBrick::HTTPAuth::SiteWidePassword.new('password','You need to enter the site wide password to edit the home page') ],
 							# [ %r{/(view|edit|save)/private.*},WEBrick::HTTPAuth::BasicAuth.new( :UserDB => htpasswd, :Realm => realm ) ], # See webrick documentation
@@ -22,19 +30,23 @@ module StartSoks
 							] 
 =end
 
+	# EDIT THIS TO CHANGE THE BASIC SETTINGS, DEFAULTS ARE IN /LIB/SOKS.rb
 	CUSTOMSETTINGS = {
-		:root_directory => '<%= settings[:root_directory] %>', 
+		:root_directory => File.expand_path( File.dirname( __FILE__) ), 
 		# :name => 'test',
 		# :description => 'A Soks Wiki',
+		# :server_type =>  WEBrick::Daemon, # Uncomment if you wish to fork, only works on some OSs
+		# :home_page => 'Home Page',  
 		:url => '<%= settings[:url] %>',
 		:port => <%= settings[:port] %>,
 	    # :authenticators => authenticators
 	}
 	
 	def self.start
+	
+		# EDIT THIS TO CHANGE THE HELPERS (Index, Recent changes etc)
 		start_wiki( CUSTOMSETTINGS ) do |wiki, view|
 
-
 			# Examples of automatically generated summary pages:
 			AutomaticSummary.new( wiki, 
 				:regexp_for_title => /^How to /i,
@@ -77,13 +89,24 @@ module StartSoks
 			 #  :summarise_revisions => false, # If true, then can contain several revisions for same page
 			 #  :remove_deleted_pages => true, # If false will keep references to deleted pages
 			
-# These are beta...
+			# These are beta and off by default...
 =begin
-require 'helpers/rss2wiki-helper'
-RSS2WikiHelper.new( wiki, :url => 'http://rubyforge.org/export/rss_sfnews.php' )	
-
-require 'helpers/mail2wiki-helper'
-Mail2WikiHelper.new( wiki )
+			require 'helpers/rss2wiki-helper'
+			RSS2WikiHelper.new( wiki, :url => 'http://rubyforge.org/export/rss_sfnews.php' )	
+			
+			require 'helpers/mail2wiki-helper'
+			Mail2WikiHelper.new( wiki, :server => 'imap.hermes.cam.ac.uk', 
+					:username => 'tamc2', 
+					:password => 'PASSWORD',	
+					:mailbox => 'mcr notices',
+					:check_period => 600, # Seconds
+					:subject_regexp => /.*/ )
+					
+			require 'helpers/wiki2html'
+			Wiki2Html.new( wiki, view, 	:views_to_copy => ['view','meta','rss'],
+										:extension => '.html',
+										:destination_dir => '/Users/tamc2/Sites',
+										:destination_url => 'http://localhost/~tamc2')
 =end
 			
 			# Putting these towards the end speeds things up.
@@ -97,7 +120,7 @@ Mail2WikiHelper.new( wiki )
 			# This is an array of titles that will NOT be automatically linked.
 			# Default is the 30 most common words in the english language
 			# Note that pages can still be created with these titles, and they can still be manually linked to.
-			banned_titles = IO.readlines('<%= settings[:root_directory] %>/banned_titles.txt').map { |title| title.strip }
+			banned_titles = IO.readlines("#{CUSTOMSETTINGS[:root_directory]}/banned_titles.txt").map { |title| title.strip }
 			
 			# This takes a while, so do it last. Note that the banned_titles argument is optional.
 			AutomaticUpdateCrossLinks.new( wiki, view, banned_titles ) 

data/templates/default/version.txt

@@ -1 +1 @@
-0.0.5
+0.0.6

data/templates/default/views/Page_edit.rhtml

@@ -1,62 +1,76 @@
-<span class='pagename'><a href='<%= url pagename, "meta" %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
-
-<form method=post action='<%= url pagename, "save" %>' >
-	<table>
-	<tr>
-		<td>Title:</td>
-		<td><input name='newtitle' size = '60' value='<%= pagename %>' onClick="this.value == 'Type a title here' ? this.value = '' : true"/></td>
-	</tr>
+<span class='pagename'>
+	<a href='<%= url pagename, "meta" %>'><%= pagename %></a> 
+	<%= page.deleted? ? "(Deleted)" : '' %>
+</span>
+
+<a class='help' onclick='document.getElementById("tips").style.display = (document.getElementById("tips").style.display == "block") ? "none" : "block";' >Click me for help</a>
 	
-	<tr>
-		<td valign='top'>Content:</td>
-		<td>
-			<textarea name='content' rows=30 cols=60  onClick="this.value == 'Type what you want here and click save' ? this.value = '' : true" ><%= page.content %></textarea>
-		</td>
-		<td valign='top'>
-			<div class='tips'>
-			<ul>
-				<li>h1. big heading</li>
-				<li>h2. little heading</li>
-				<li>*bold text* = <b>bold text</b></li>
-				<li>_italic text_ = <i>italic text</i></li>
-				<li>* bullet one = &#8226; bullet one<br />
-					 * bullet two = &#8226; bullet two</li>
-				<li># list one  = 1. list one<br />
-					 # list two  = 2. list two</li>
-				<li>Most links are automatic</li>
-				<li>[[insert picture of title of picture]]</li>
-				<li><a href='http://hobix.com/textile/quick.html' target='textile_ref'>More</a></li>
-			</ul>
-			</div>
-		<td>
-	</tr>
-	<tr>
-		<td>Author:</td>
-		<td><a href='<%= url person %>'><%= person %></a> Quit browser to log out.</td>
-	</tr>
-	<tr>
-		<td></td>
-		<td><input name=action value='Save' type=submit accesskey="S"> <a href='<%= url pagename %>' accesskey="C" >(Do not Save)</a> or <a href='<%= url  pagename, 'delete' %>' accesskey='D'>(Delete)</a> this page.</td>
-	</tr>
-	</table>
-</form>
-<hr />
+<div id='tips' style='display: none;'>
+	<ul>
+		<li>h1. big heading (make sure it is followed with a blank line)</li>
+		<li>h2. little heading (make sure it is followed with a blank line)</li>
+		<li>*bold text* = <b>bold text</b></li>
+		<li>_italic text_ = <i>italic text</i></li>
+		<li>* bullet one = &#8226; bullet one<br />
+			 * bullet two = &#8226; bullet two</li>
+		<li># list one  = 1. list one<br />
+			 # list two  = 2. list two</li>
+		<li>Most links are automatic</li>
+		<li>[[insert picture of title of picture]]</li>
+		<li>[[insert attached word document]]</li>
+		<li><a href='http://hobix.com/textile/quick.html' target='textile_ref'>Full Instructions</a></li>
+	</ul>
+</div>
+	
+<form class='editpage' method='post' action='<%= url pagename, "save" %>' >	
+	<div id='edittitle'>
+		Title: 
+		<input 	name='newtitle' 
+					size = '60' 
+					value='<%= pagename %>' 
+					onblur="validateTitle( this.value );" 
+					onClick="this.value=this.value.replace('Type a title here' ,'')"
+		/>
+	</div>
+	
+	<div id='editcontent'>
+		<textarea 	name='content' 
+						rows=30 
+						cols=65   
+						onclick="this.value=this.value.replace('Type what you want here and click save','')" 
+			><%= page.content %></textarea>
+	</div>
+	
+	Hello <a href='<%= url person %>'><%= person %></a> (Quit browser to log out). Would you like to 
+	<input name='action' value='Save Changes' type='submit' accesskey="S" /></form>,  
+	<form class='editpage' method='post' action='<%= url pagename %>' >
+		<input name='action' value='Cancel Changes' type=submit accesskey="C" />
+	</form> or
+	<form class='editpage' method='post' action='<%= url pagename, 'delete' %>' >
+		<input name='action' value='Delete this Page' type='submit' accesskey="D" />
+	</form>?
+
 <% unless page.empty? %>
-	<p>The most recent change was made by <a href='<%= url 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 />
-		<%		
+	<div class='change'>
+		<h2>The most recent change was made by <a href='<%= url page.author %>'><%= page.author %></a> who changed:</h2>
+			<% 
+			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
-		end
-		%>
-		<p>
-		<a href='<%= url pagename, "rollback" %>?revision=<%= page.number-1  %>' accesskey="U" >(Undo this change)</a> or <a href='<%= url pagename, "revisions" %>' accesskey="A" >(Show All changes)</a>
-		</p>
+			%>
+	</div>
+	<p>
+		<form class='editpage' method=post action='<%= url pagename, "rollback" %>' >
+			<input name='revision' value='<%= page.number-1  %>' type='hidden' />
+			<input name='action' value='Undo this change' type='submit' accesskey="U" />
+		</form> or <a href='<%= url pagename, "revisions" %>' accesskey="A" >Show <b>A</b>ll changes</a>.
+	</p>
 <% end %>

data/templates/default/views/Page_meta.rhtml

@@ -2,9 +2,13 @@
 
 <h1><%= pagename %></h1>
 
+<% seconds_per_change = (page.revised_on-page.created_on)/page.revisions.size.to_i %>
+
 <p>This page was created on <%= page.created_on %> by <%= page.revisions.first.author %>.</p>
-<p>It was last updated on <%= page.revised_on %> by <%= page.author %>.</p>
-<p> 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>
+<% if page.revisions.size > 1 %>
+	<p>It was last updated on <%= page.revised_on %> by <%= page.author %>.</p>
+	<p>It has been changed <%= page.revisions.size %> times (roughly once every <%= seconds_per_change.to_time_units %>).</p>
+<% end %>
 
 <div class='metacolumn' >
 <h2>Wiki links from this page</h2>

data/templates/default/views/Page_revisions.rhtml

@@ -1,20 +1,28 @@
 <span class='pagename'><a href='<%= url pagename, "meta" %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
 
-<div class="undochange">
-	<% page.revisions.reverse_each do |revision| %>
-		<p><%= revision.created_on %> by <a href='<%= url revision.author %>'><%= revision.author %></a> <a href='<%= url pagename, "rollback" %>?revision=<%= revision.number-1 %>' >(undo)</a>:</p>
-		<p>	
+
+<% page.revisions.reverse_each do |revision| %>
+	<div class="undochange">
+		<p><%= revision.created_on %> by <a href='<%= url revision.author %>'><%= revision.author %></a></p>
+		<ol>	
 		<% revision.changes.each do |change_group| %>
 				<%	change_group.each do |change|
 					case change[0]
 					when "-" %>
-						<del><%= change[1] %>. <%= change[2] %></del><br />
+						<li><del><%= change[1] %>. <%= change[2].gsub('<','&lt;').gsub('>','&gt;') %></del></li>
 					<% 	when "+" %>
-						<%= change[1] %>. <%= change[2] %><br />
+						<li><%= change[1] %>. <%= change[2].gsub('<','&lt;').gsub('>','&gt;') %></li>
 					<%	end %>
 				<%	end %>
 		<% end %>			
-		</p>		
-	<% end %>
-	<br />(<a href='<%= url pagename, "edit" %>' accesskey="R" >Return to editing</a>)
+		</ol>
+		<form method=post action='<%= url pagename, "rollback" %>' >
+			<input name='revision' value='<%= revision.number-1 %>' type='hidden' />
+			<input name='action' value='Undo the changes above' type='submit' />
+		</form>
+	</div>		
+<% end %>
+
+<div class='command'>
+	<a href='<%= url pagename, "edit" %>' accesskey="R" >Return to editing</a>
 </div>

data/templates/default/views/Page_rss.rhtml

@@ -2,7 +2,9 @@
 require "rss/maker"
 
 RSS::Maker.make("2.0") do |maker|
-  
+  	
+  	maker.encoding = 'iso-8859-1'
+  	
   	maker.channel.title = "#{$SETTINGS[:name]} #{pagename}"
 	maker.channel.description = $SETTINGS[:description]
 	maker.channel.link = $SETTINGS[:url]

data/templates/default/views/Page_search_results.rhtml

@@ -1,5 +1,7 @@
 <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>
@@ -7,7 +9,10 @@
 		<li><a href='<%= url name %>' ><%= name %></a></li>
 	<% end %>
 	</ul>
+<% else %>
+	<p>No matches in the titles of pages</p>
 <% end %>
+
 <% unless text_results.empty? %>
 	<h2>Matches in the text of pages</h2>
 	<ul>
@@ -15,5 +20,10 @@
 		<li><a href='<%= url name %>' ><%= name %></a></li>
 	<% end %>
 	</ul>
+<% else %>
+	<p>No matches in the text of pages</p>
 <% end %>
-<div class='command'>(<a href='<%= url pagename, "edit" %>' accesskey="E" >Create a page titled &#8220;<%= pagename %>&#8221;</a>)</div>
+
+<div class='command'>
+	<a href='<%= url pagename, "edit" %>' accesskey="E" >Create a page titled &#8220;<%= pagename %>&#8221;</a>
+</div>

data/templates/default/views/Page_view.rhtml

@@ -1,4 +1,8 @@
 <span class='pagename'><a href='<%= url pagename, "meta" %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
 
-<%= renderedview %>
-<div class='command'><a href='<%= url pagename, "edit" %>' accesskey="E" >(Edit this page)</a></div>
+<%= renderedview %>
+
+<div class='command'>
+	<a href='<%= url pagename, "edit" %>' accesskey="E" >Edit this page</a> or
+	watch for changes using <a href='<%= url pagename, 'rss' %>'>RSS</a>.
+</div>

data/templates/default/views/UploadPage_edit.rhtml

@@ -1,38 +1,63 @@
-<span class='pagename'><a href='<%= url pagename, "meta" %>'><%= pagename %></a> <%= page.deleted? ? "(Deleted)" : '' %></span>
+<span class='pagename'>
+	<a href='<%= url pagename, "meta" %>'><%= pagename %></a> 
+	<%= page.deleted? ? "(Deleted)" : '' %>
+</span>
+
+<a class='help' onclick='document.getElementById("tips").style.display = (document.getElementById("tips").style.display == "block") ? "none" : "block";' >Click me for help</a>
+	
+<div id='tips' style='display: none;'>
+	<p>To add a file or picture, click on the 'choose file' or 'browse...' button below, select the file you wish to add, then give it a meaningful title in the title box.  Note that the title can be a sentence, e.g. "claim form" or "a beautiful balloon", and does not need to have an extension.</p>
+	<p>You can put add a link to the file from another page in the wiki by typing its title (e.g. "attached claim form").  To make a picture appear as part of another page write [[ insert picture name ]] (e.g. [[insert picture of a beautiful balloon]]).</p>
+</div>
+
+<form  class='editpage' action='<%= url pagename, "upload" %>' method='post' enctype='multipart/form-data' >
+	<div id='fileedittitle'>
+		Title: 
+		<% 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 %>
+		onBlur="validateTitle( this.value );"  onClick="this.value=this.value.replace('Type a title here','')" />
+	</div>
+	
+	<div id='fileeditfile'>		
+		<input name='file' type=file  /></td></tr>
+	</div>
+	
+	Hello <a href='<%= url person %>'><%= person %></a> (Quit browser to log out). Would you like to 
+	<input name='action' value='Save Changes' type='submit' accesskey="S" /></form>,  
+	<form class='editpage' method='post' action='<%= url pagename %>' >
+		<input name='action' value='Cancel Changes' type=submit accesskey="C" />
+	</form> or
+	<form class='editpage' method='post' action='<%= url pagename, 'delete' %>' >
+		<input name='action' value='Delete this Page' type='submit' accesskey="D" />
+	</form>?
+
 
-<form action='<%= url pagename, "upload" %>' 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='<%= url person %>'><%= person %></a> Quit browser to log out.</td>
-	<tr><td></td><td><input name=action value='Save' type=submit accesskey="S"> <a href='<%= url pagename %>' accesskey="C" >(Cancel)</a> or <a href='<%= url pagename, 'delete' %>' accesskey='D'>(Delete)</a> this page.</td></tr>
-	</table>
-</form>
-<hr />
 <% unless page.empty? %>
-<p>The most recent change was made by <a href='<%= url 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 />
-		<%		
+	<div class='change'>
+		<h2>The most recent change was made by <a href='<%= url page.author %>'><%= page.author %></a> who changed:</h2>
+			<% 
+			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
-		end
-		%>
-		<p>
-		<a href='<%= url pagename, "rollback" %>?revision=<%= page.number - 1  %>' accesskey="U" >(Undo this change)</a> or <a href='<%= url pagename, "revisions" %>' accesskey="A" >(Show All changes)</a> 
-		</p>
+			%>
+	</div>
+	<p>
+		<form class='editpage' method=post action='<%= url pagename, "rollback" %>' >
+			<input name='revision' value='<%= page.number-1  %>' type='hidden' />
+			<input name='action' value='Undo this change' type='submit' accesskey="U" />
+		</form> or <a href='<%= url pagename, "revisions" %>' accesskey="A" >Show <b>A</b>ll changes</a>.
+	</p>
 <% end %>

data/templates/default/views/frame.rhtml

@@ -5,39 +5,58 @@
 	<meta name='description' content='<%= $SETTINGS[:description] %>' />
 	<meta name='keywords' content='Soks, <%= $SETTINGS[:name] %>' />
 	<link href='<%= file 'stylesheet.css' %>' rel='stylesheet' type='text/css' media='screen' />
-	<link href='<%= file 'print_stylesheet.css' %>' rel='stylesheet' type='text/css' media='print' />	
+	<link href='<%= file 'print_stylesheet.css' %>' rel='stylesheet' type='text/css' media='print' />	
 	<link rel='alternate' type='application/rss+xml' title='RSS' href='<%= url pagename, 'rss' %>' />
-	<script src='<%= file 'newpage.js' %>' type='text/javascript'></script>
-	<link rel="SHORTCUT ICON" href='<%= file 'favicon.ico' %>' />
+	<script src='<%= file 'newpage.js' %>' type='text/javascript'></script>
 </head>
 <body onkeypress='hotkey(event);'>
+	
 	<div id='content'>
 		<%= content_of_page %>
-	</div>
-	<div id='menu'>
-		<a href='<%= url 'Home Page' %>' accesskey='H' ><img width='149' src='<%= file 'logo.png' %>' alt='<%= @wikiname %>' /></a> 
+	</div>
+	
+	<div id='menu'>
+	
+		<h1><%= @wikiname %></h1>
+		<a href='<%= url $SETTINGS[:home_page] %>' accesskey='H' >
+			<img width='149' src='<%= file 'logo.jpg' %>' alt='<%= @wikiname %>' />
+		</a> 
+	
+		<h2>Search</h2>	
 		<form method='get' action='<%= url pagename, 'find' %>' >
-			<input class='search' name='regex' value='' size='18' />
-			<input name='action' value='search' type='submit' />
+			<input 	class='search' 
+					name='regex' 
+					value='Enter word & press return'
+			 		onClick="this.value=this.value.replace('Enter word & press return','')" 
+			 		size='17' />
 		</form>
-		<a href='<%= url 'site index' %>' accesskey='I' >Site Index</a> 
-		<a href='<%= url 'recent changes to this site' %>' accesskey='R' >Recent Changes</a>
+		
+		<h2><a href='<%= url "Sidebar Page" %>' >Important Pages</a></h2>
+		<% sidebarpage = @wiki.page( "Sidebar Page") %>
+		<div class='linklist'>
+			<%= redcloth( sidebarpage) %>
+		</div>
+		
 		<% if page %>
-			<br />
-			<% page.links_to.each do |linkedpage| %>
-				<a href='<%= url linkedpage.name %>'><%= linkedpage.name %></a>
-			<% end %>
-		<% end %>
-		<br />
-		<a href='<%= url 'Type a title here', 'edit' %>'>Add a new page</a>
-		<a href='<%= url 'Picture of Type a title here', 'edit' %>'>Upload a new picture</a>
-		<a href='<%= url 'Attached Type a title here', 'edit' %>'>Upload a new file</a>
-		<br />
-		<span class='disclaimer'>
-			Powered by <a style='display:inline;' href='http://soks.rubyforge.org'>Soks</a>
-		</span>
-		<br />
-		<a style='display:inline;' href='<%= url pagename, 'rss' %>'><img src='<%= file 'rss.png'%>' alt='rss feed' /></a>
-	</div>
+			<% dynamic_links  = page.links_to - sidebarpage.links_from - [ sidebarpage ] %>
+			<% unless dynamic_links.empty? %>
+				<h2>Pages that link here</h2>
+				<div class='linklist'>
+					<% dynamic_links.each do |linkedpage| %>
+						<a href='<%= url linkedpage.name %>'><%= linkedpage.name %></a>
+					<% end %>
+				</div>
+			<% end %>
+		<% end %>
+		
+		<h2>Add a page</h2>
+		<div class='linklist'>
+			<a href='<%= url 'Type a title here', 'edit' %>'>Add a new page</a>
+			<a href='<%= url 'Picture of Type a title here', 'edit' %>'>Upload a new picture</a>
+			<a href='<%= url 'Attached Type a title here', 'edit' %>'>Upload a new file</a>
+		</div>
+		
+		<h2>Powered by <a href='http://www.soks.org'>Soks</a></h2>
+	</div> <!-- menu --!>
 </body>
-</html>
+</html>

data/test/test_soks-utils.rb

@@ -0,0 +1,37 @@
+require 'test/unit'
+require 'soks-utils'
+
+class ToTimeUnitsMT < Test::Unit::TestCase
+
+	def test_seconds
+		assert_equal( 'fraction of a second', 0.4.to_time_units )
+		assert_equal( 'second', 0.8.to_time_units )
+		assert_equal( 'second', 1.3.to_time_units )
+		assert_equal( '5 seconds', 5.to_time_units )
+	end
+
+	def test_minutes
+		assert_equal( 'minute',     46.to_time_units )
+		assert_equal( '10 minutes', (60*10.4).to_time_units )
+	end
+
+	def test_hours
+		assert_equal( 'hour',    (60*60*1.2).to_time_units )
+		assert_equal( '2 hours', (60*60*1.8).to_time_units )
+	end
+
+	def test_days
+		assert_equal( 'day',     (60*60*24*0.95).to_time_units )
+		assert_equal( '20 days', (60*60*24*20).to_time_units )
+	end
+
+	def test_months
+		assert_equal( 'month',     (60*60*24*30*1.1).to_time_units )
+		assert_equal( '10 months', (60*60*24*30*10).to_time_units )
+	end
+
+	def test_years
+		assert_equal( 'year',     (60*60*24*30*14).to_time_units )
+		assert_equal( '11 years', (60*60*24*365*11).to_time_units )
+	end
+end