Pimki 1.3.092 → 1.4.092

data/app/views/wiki/rss_feed.rhtml

@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<channel>
-		<title><%= @web.name %></title>
-		<link><%= "#{@web_url}/show/HomePage" %></link>
-		<description>An Instiki wiki</description>
-		<language>en-us</language>
-		<ttl>40</ttl>
-  <% for page in @pages_by_revision %>
-		<item>
-      <title><%= page.plain_name %></title>
-    <% unless @hide_description %>
-      <description><%= CGI.escapeHTML(page.display_content) %></description>
-    <% end %>
-      <pubDate><%= page.created_at.strftime "%a, %e %b %Y %H:%M:%S %Z" %></pubDate>
-      <guid><%= "#{@web_url}/show/#{page.name}" %></guid>
-      <link><%= "#{@web_url}/show/#{page.name}" %></link>
-      <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
-    </item>
-  <% end %>
-  </channel>
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+	<channel>
+		<title><%= @web.name %></title>
+		<link><%= "#{@web_url}/show/HomePage" %></link>
+		<description>An Instiki wiki</description>
+		<language>en-us</language>
+		<ttl>40</ttl>
+  <% for page in @pages_by_revision %>
+		<item>
+      <title><%= page.plain_name %></title>
+    <% unless @hide_description %>
+      <description><%= CGI.escapeHTML(page.display_content) %></description>
+    <% end %>
+      <pubDate><%= page.created_at.strftime "%a, %e %b %Y %H:%M:%S %Z" %></pubDate>
+      <guid><%= "#{@web_url}/show/#{page.name}" %></guid>
+      <link><%= "#{@web_url}/show/#{page.name}" %></link>
+      <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
+    </item>
+  <% end %>
+  </channel>
 </rss>

data/app/views/wiki/search.rhtml

@@ -1,48 +1,48 @@
-<% @title = @results.length > 0 ? "#{@results.length} pages contains \"#{@params["query"]}\"" : "No pages contains \"#{@query}\"" %><%= sub_template "top" %>
-
-<% if @results.length > 0 %>
-  <h3>Matching Pages:</h3>
-  <ul>
-    <% for page in @results %>
-      <li><a href="../show/<%= page.name %>"><%= page.plain_name %></a><br />
-      <% 
-        idxs = page.content.scan(/.{0,30}#{@params["query"]}.{0,30}/im)
-        idxs.each do |i|
-          begin %>
-            ...<%= i.to_s %>...<br /><%
-          rescue Exception => e
-            %><%= e.message %><%
-          end
-        end
-      %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-<% if @bliki_results.length > 0 %>
-  <h3>Matching Bliki Entries:</h3>
-  <ul>
-    <% for entry in @bliki_results %>
-      <li><a href="../bliki_revision/<%= entry.name %>?rev=<%= entry.revisions.size-1 %>"><%= entry.name %></a><br />
-      <% 
-        idxs = entry.content.scan(/.{0,30}#{@params["query"]}.{0,30}/im)
-        idxs.each do |i|
-          begin %>
-            ...<%= i.to_s %>...<br /><%
-          rescue Exception => e
-            %><%= e.message %><%
-          end
-        end
-      %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
-<% if @results.length == 0 && @bliki_results.length == 0 %>
-  <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 words in separation&mdash;only as a sentence fragment.</p>
-
-  <p>If you're a high-tech computer wizard, you might even want try constructing a regular expression. That's actually what Instiki uses, so go right ahead and flex your "[a-z]*Leet?RegExpSkill(s|z)"</p>
-<% end %>
-
-<%= sub_template "bottom" %>
+<% @title = @results.length > 0 ? "#{@results.length} pages contains \"#{@params["query"]}\"" : "No pages contains \"#{@query}\"" %><%= sub_template "top" %>
+
+<% if @results.length > 0 %>
+  <h3>Matching Pages:</h3>
+  <ul>
+    <% for page in @results %>
+      <li><a href="../show/<%= page.name %>"><%= page.plain_name %></a><br />
+      <% 
+        idxs = page.content.scan(/.{0,30}#{@params["query"]}.{0,30}/im)
+        idxs.each do |i|
+          begin %>
+            ...<%= i.to_s %>...<br /><%
+          rescue Exception => e
+            %><%= e.message %><%
+          end
+        end
+      %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+<% if @bliki_results.length > 0 %>
+  <h3>Matching Bliki Entries:</h3>
+  <ul>
+    <% for entry in @bliki_results %>
+      <li><a href="../bliki_revision/<%= entry.name %>?rev=<%= entry.revisions.size-1 %>"><%= entry.name %></a><br />
+      <% 
+        idxs = entry.content.scan(/.{0,30}#{@params["query"]}.{0,30}/im)
+        idxs.each do |i|
+          begin %>
+            ...<%= i.to_s %>...<br /><%
+          rescue Exception => e
+            %><%= e.message %><%
+          end
+        end
+      %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
+<% if @results.length == 0 && @bliki_results.length == 0 %>
+  <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 words in separation&mdash;only as a sentence fragment.</p>
+
+  <p>If you're a high-tech computer wizard, you might even want try constructing a regular expression. That's actually what Instiki uses, so go right ahead and flex your "[a-z]*Leet?RegExpSkill(s|z)"</p>
+<% end %>
+
+<%= sub_template "bottom" %>

data/app/views/wiki/tex.rhtml

@@ -1,23 +1,23 @@
-\documentclass[12pt,titlepage]{article}
-
-\usepackage[danish]{babel}      %danske tekster
-\usepackage[OT1]{fontenc}       %rigtige danske bogstaver...
-\usepackage{a4}
-\usepackage{graphicx}
-\usepackage{ucs}
-\usepackage[utf8]{inputenc}
-\input epsf 
-
-%-------------------------------------------------------------------
-
-\begin{document}
-
-\sloppy
-
-%-------------------------------------------------------------------
-
-\section*{<%= @page.name %>}
-
-<%= @tex_content %>
-
+\documentclass[12pt,titlepage]{article}
+
+\usepackage[danish]{babel}      %danske tekster
+\usepackage[OT1]{fontenc}       %rigtige danske bogstaver...
+\usepackage{a4}
+\usepackage{graphicx}
+\usepackage{ucs}
+\usepackage[utf8]{inputenc}
+\input epsf 
+
+%-------------------------------------------------------------------
+
+\begin{document}
+
+\sloppy
+
+%-------------------------------------------------------------------
+
+\section*{<%= @page.name %>}
+
+<%= @tex_content %>
+
 \end{document}

data/app/views/wiki/tex_web.rhtml

@@ -1,35 +1,35 @@
-\documentclass[12pt,titlepage]{article}
-
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-
-\fancyhead[LE,RO]{}
-\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}
-\fancyfoot[C]{\thepage}
-
-\usepackage[danish]{babel}      %danske tekster
-\usepackage{a4}
-\usepackage{graphicx}
-\usepackage{ucs}
-\usepackage[utf8]{inputenc}
-\input epsf 
-
-
-%-------------------------------------------------------------------
-
-\title{<%= @web_name %>}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-\pagebreak
-
-\sloppy
-
-%-------------------------------------------------------------------
-
-<%= @tex_content %>
-
+\documentclass[12pt,titlepage]{article}
+
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+
+\fancyhead[LE,RO]{}
+\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}
+\fancyfoot[C]{\thepage}
+
+\usepackage[danish]{babel}      %danske tekster
+\usepackage{a4}
+\usepackage{graphicx}
+\usepackage{ucs}
+\usepackage[utf8]{inputenc}
+\input epsf 
+
+
+%-------------------------------------------------------------------
+
+\title{<%= @web_name %>}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+\pagebreak
+
+\sloppy
+
+%-------------------------------------------------------------------
+
+<%= @tex_content %>
+
 \end{document}

data/app/views/wiki/todo.rhtml

@@ -1,67 +1,90 @@
-<% @title = "ToDo" %>
-<%= sub_template "top" %>
-<% num_items = @todo_items.inject(0) { |n, (p,i)| n += i.size }
-   num_items += @bliki_todo_items.inject(0) { |n, (p,i)| n += i.size }
-%>
-<h3>There <%= num_items == 1 ? 'is' : 'are' %> <%= num_items.zero? ? "no" : num_items %> ToDo item<%= num_items != 1 ? 's' : '' %>.
-</h3>
-
-<ul>
-<% today = Date.today
-  @todo_items.each do |page, items| %>
-  <li><%= page.link %>
-      <ul>
-        <% items.each do |item|
-             # default is the muted 'darkred', to prevent to many bright red
-             # items on one page: (See also chunks/todo.rb)
-             tclass = "todoFuture"
-             # next check is the item is dated:
-             d = ParseDate.parsedate(item[0]) rescue nil
-             if not d.nil? and not d.all? { |x| x.nil? }
-               # there's a date in the todo. display it accordingly
-               d[0] ||= today.year    # make sure there's a 'year' component
-               d = Date.new(*d[0..2])  rescue nil
-               tclass = 'todo' if (not d.nil?) and ((today <=> d) > -1)
-             end %>
-             <li class="<%= tclass %>"><%= item %></li>
-        <% end %>
-      </ul>
-  </li>
-<% end %>
-</ul>
-
-<% if @bliki_todo_items.size > 0 %>
-  <h4>ToDo items from Bliki:</h4>
-  <ul>
-  <% @bliki_todo_items.each do |page, items| %>
-    <li><%= link_to_bliki(page) %>
-        <ul>
-          <% items.each do |item|
-               # default is the muted 'darkred', to prevent to many bright red
-               # items on one page: (See also chunks/todo.rb)
-               tclass = "todoFuture"
-               # next check is the item is dated:
-               d = ParseDate.parsedate(item[0]) rescue nil
-               if not d.nil? and not d.all? { |x| x.nil? }
-                 # there's a date in the todo. display it accordingly
-                 d[0] ||= today.year    # make sure there's a 'year' component
-                 d = Date.new(*d[0..2])  rescue nil
-                 tclass = 'todo' if (not d.nil?) and ((today <=> d) > -1)
-               end %>
-               <li class="<%= tclass %>"><%= item %></li>
-          <% end %>
-        </ul>
-    </li>
-  <% end %>
-  </ul>
-<% end %>
-
-
-<% if num_items == 0  %>
-  <p>To make ToDo items appear here insert a 'todo' item in any page. Simply write at the start of any line 'todo' followed by a colon (':'), followed by a space and some text. For example:
-  <pre>todo: some text</pre></p>
-  <p> This text will be rendered in red on the page itself, and will also appear here in a list of todo items from all the pages.</p>
-  <p>This module also uses <a href='http://www.ruby-docs.org/stdlib/'>ParseDate</a>, which is a fairly smart module. If you write a date anywhere in the todo item's text, it will be picked up. If that date is today or in the past, the item will be colored bright red!<p>
-<% end %>
-
-<%= sub_template "bottom" %>
+<% @title = "ToDo" %>
+<%= sub_template "top" %>
+<% FAR_FUTURE = Date.new(4000,1,1)
+   num_items = @todo_items.inject(0) { |n, (p,i)| n += i.size }
+   num_items += @bliki_todo_items.inject(0) { |n, (p,i)| n += i.size }
+%>
+
+<h3>There <%= num_items == 1 ? 'is' : 'are' %> <%= num_items.zero? ? "no" : num_items %> ToDo item<%= num_items != 1 ? 's' : '' %>.
+</h3>
+
+<% unless @context_links.empty? %>
+<div id="todo_contexts">
+  <strong>ToDo Contexts</strong>:
+  
+  <% if @params["context"].nil? %>
+    [<span class='selected'>All</span>]
+  <% else %>
+    <a href="<%= @params["sort_order"].nil? ? "." : "?sort_order=#{@params["sort_order"]}" %>">All</a>
+  <% end %>
+
+  <%= @context_links.join(', ') %>
+
+</div>
+<% end %>
+
+<% unless num_items == 0 %>
+<div id="todo_sort">
+    <strong>ToDo items sorted by</strong>:
+    
+    <% if @params["sort_order"].nil? || @params["sort_order"] == 'page_name' %>
+      [<span class='selected'>Page Name</span>]
+    <% else %>
+      <a href="<%= @params["context"].nil? ? "." : "?context=#{@params["context"]}" %>">Page Name</a>
+    <% end %>
+  
+    <% if @params["sort_order"] == 'due_date' %>
+      [<span class='selected'>Due date</span>]
+    <% else %>
+      <a href="?sort_order=due_date<%= "&context=#{@params["context"]}" unless @params["context"].nil? %>">Due date</a>
+    <% end %>
+</div>
+<% end %>
+
+<ul>
+<% @todo_items.each do |page, items| %>
+  <li><%= page.link %> <%# items.length %>
+      <ul>
+        <% items.each do |item| %>
+          <li>
+            <small><%= 
+              x = "[#{item.context.join(', ') unless item.context.empty?}#{ " - " unless item.context.empty? or item.due_date == FAR_FUTURE}#{item.due_date unless item.due_date == FAR_FUTURE }]<br />"
+              x unless x == "[]<br />"
+            %></small>
+            <span class="<%= get_todo_display_style item.due_date %>"><%= item.text.strip %></span>
+          </li>
+        <% end %>
+      </ul>
+  </li>
+<% end %>
+</ul>
+
+<% if @bliki_todo_items.size > 0 %>
+  <h4>ToDo items from Bliki:</h4>
+  <ul>
+  <% @bliki_todo_items.each do |page, items| %>
+    <li><%= link_to_bliki(page) %>
+        <ul>
+          <% items.each do |item| %>
+            <small><%= 
+              x = "[#{item.context.join(', ') unless item.context.empty?}#{ " - " if not item.context.empty? or item.due_date == FAR_FUTURE}#{item.due_date unless item.due_date == FAR_FUTURE }]<br />"
+              x unless x == "[]<br />"
+            %></small>
+            <span class="<%= get_todo_display_style item.due_date %>"><%= item.text.strip %></span>
+          <% end %>
+        </ul>
+    </li>
+  <% end %>
+  </ul>
+<% end %>
+
+
+<% if num_items == 0  %>
+  <p>To make ToDo items appear here insert a 'todo' item in any page. Simply write at the start of any line 'todo' followed by a colon (':'), followed by a space and some text. This text will be rendered in red on the page itself, and will also appear here in a list of todo items from all the pages. For example:
+  <pre>todo: some text</pre></p>
+  <p>Todo items can also have a bit of metadata: contexts and dates. Context is simply a '@' followed by a comma separated list of contexts. You can then filter the display to just those specific contexts.<br />For dates this module also uses <a href='http://www.ruby-doc.org/stdlib/'>ParseDate</a>, which is a fairly smart module. If you write a date anywhere in the todo item's text, it will be picked up. If that date is today or in the past, the item will be colored bright red!<br />You can sort this display by due-date or by enclosing Page name. For example:<p>
+  <pre>todo@home,ruby: do me by 31 Dec 2005.</pre></p>
+
+<% end %>
+
+<%= sub_template "bottom" %>

data/app/views/wiki/web_list.rhtml

@@ -1,13 +1,13 @@
-<% @title = "Wiki webs" %><%= sub_template "top" %>
-
-<ul>
-<% for web in @webs %>
-  <li>
-    <a href="/<%= web.address %>/show/HomePage"><%= web.name %></a>
-    (<%= web.pages.length %> pages by <%= web.authors.length %> authors)
-    <% if web.published then %>(<a href="/<%= web.address %>/published/HomePage">published</a>)<% end %>
-  </li>
-<% end %>
-</ul>
-
+<% @title = "Wiki webs" %><%= sub_template "top" %>
+
+<ul>
+<% for web in @webs %>
+  <li>
+    <a href="/<%= web.address %>/show/HomePage"><%= web.name %></a>
+    (<%= web.pages.length %> pages by <%= web.authors.length %> authors)
+    <% if web.published then %>(<a href="/<%= web.address %>/published/HomePage">published</a>)<% end %>
+  </li>
+<% end %>
+</ul>
+
 <%= sub_template "bottom" %>

data/app/views/wiki_words_help.rhtml

@@ -1,6 +1,6 @@
 <h3>Wiki words</h3>
 <p style="border-top: 1px dotted #ccc; margin-top: 0px">
-  Two or more uppercase words stuck together (camel case) or any phrase surrounded by doubble brackets is a wiki word. A camel-case wiki word can be escaped by putting \ in front of it.
+  Two or more uppercase words stuck together (camel case) or any phrase surrounded by double 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/>