Pimki 1.6.092 → 1.7.092

data/app/views/wiki/export.rhtml

@@ -1,7 +1,13 @@
 <% @title = "Export" %><%= sub_template "top" %>
 
+<div class='content-box'>
+
 <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> 
 
+<p>If tex and pdflatex tools are installed on your system, you can also export this web in TeX/PDF formats.</p>
+
+<p>Please note that only the latest revision of each page is exported.</p>
+
 <ul id="feedsList">
   <li><a href="../export_html">HTML</a>
   <li><a href="../export_markup">Markup (<%= @web.markup %>)</a>
@@ -11,4 +17,5 @@
 <% end %>
 </ul>
 
+</div>
 <%= sub_template "bottom" %>

data/app/views/wiki/feeds.rhtml

@@ -1,10 +1,14 @@
 <% @title = "Feeds" %><%= sub_template "top" %>
-
+<div class='content-box'>
 <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> 
 
 <ul id="feedsList">
-  <li><a href="../rss_with_content<%= "?password=#{web.password}" if web.password %>">Full content (RSS 2.0)</a>
-  <li><a href="../rss_with_headlines<%= "?password=#{web.password}" if web.password %>">Headlines (RSS 2.0)</a>
+  <li><a href="../rss_with_content<%= "?password=#{web.password}" if web.password %>">Full content</a>
+  <li><a href="../rss_with_headlines<%= "?password=#{web.password}" if web.password %>">Headlines</a>
+  <li><a href="../rss_bliki_only<%= "?password=#{web.password}" if web.password %>">Bliki entries only</a>
+  <li><a href="../rss_todo_items<%= "?password=#{web.password}" if web.password %>">Todo items only (experimental!)</a>
 </ul>
 
+<p>All feeds are RSS in 2.0 format.</p>
+</div>
 <%= sub_template "bottom" %>

data/app/views/wiki/glossary.rhtml

@@ -0,0 +1,27 @@
+<%
+   @title = "#{web.name} Glossary"
+%>
+<%= sub_template "top" %>
+
+<h3><%= @results.length > 0 ? @results.length : 'no' %> acronym<%= 's' unless @results.length == 1 %> found.</h3>
+
+<p>
+<table vorder="0"> 
+     <tr>
+       <td style="border-bottom: thin solid grey; font-weight:bold; font-variant:italic; padding-right:10px;">Acronym</td>
+       <td style="border-bottom: thin solid grey; font-weight:bold; font-variant:italic; padding-right:10px;">Definition</td>
+       <td style="border-bottom: thin solid grey; font-weight:bold; font-variant:italic; padding-right:10px;">Appears on</td>
+     </tr>
+<% @results.each do |(acronym, definition), *pages| %>
+     <tr>
+       <td width="10%" valign="top"><b><%= acronym %></b></td>
+       <td width="40%" valign="top"><%= definition %></td>
+       <td width="50%"><%= pages.join(', ') %><br/>
+           <small><%= (@undefined_on[acronym] - pages[0]).join(', ') if @undefined_on[acronym] %></small>
+       </td>
+     </tr>
+<% end %>
+</table>
+</div>
+<%= sub_template "bottom" %>
+

data/app/views/wiki/list.rhtml

@@ -1,6 +1,7 @@
 <% @title = "All Pages" %>
 <%= sub_template "top" %>
 
+<!-- Categories Menu -->
 <% unless @categories.empty? %>
 <div id="categories">
   <p><strong>Categories</strong>:
@@ -22,6 +23,7 @@
 </div>
 <% end %>
 
+<!-- Main Page List -->
 <div id="listsContainer" style="float: left; width: 300px;">
   <% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>
     <h2>
@@ -38,6 +40,7 @@
   <% end %>
 
 
+<!-- Missing Pages -->
   <% unless @page_names_that_are_wanted.empty? %>
     <h2>
       Wanted Pages
@@ -55,6 +58,7 @@
     </ul>
   <% end %>
   
+<!-- Orphaned Pages -->
   <% unless @pages_that_are_orphaned.empty? %>
     <h2>
       Orphaned Pages
@@ -66,7 +70,7 @@
     </ul>
   <% end %>
 </div>
-
+<!-- Page Administration -->
 <div id="pageAdmin"style="float: right; width: 280px; vertical-align: top;">
   <script language="JavaScript1.2">
     function validateSelection(fieldID) {

data/app/views/wiki/login.rhtml

@@ -1,6 +1,7 @@
 <% @title = "#{@web_name} Login" 
    @hide_navigation = true
    @hide_menu = true
+   @style_additions = "#Content, #Container {padding-left:100px;}"
 %>
 <%= sub_template "top" %>
 

data/app/views/wiki/mind.rhtml

@@ -1,5 +1,6 @@
 <% @title = "Mind Map"
-   #@style_additions = "img { width: 8in; }"
+   #@hide_menu = true
+   #@style_additions = "#Container { width: 100%; } #Content { float: left; }"
 %>
 <%= sub_template "top" %>
 
@@ -47,12 +48,23 @@
     </td>
    </tr>
    <tr>
-     <td colspan='4' align='center'><input type="submit" value="Redraw" name="Go"></td>
+     <td>Size: <input type="text" name="mind_map_size" id="mind_map_size" value="<%= @req.query['mind_map_size'] || web.mind_map_size %>"></td>
+     <td colspan='3' align='center'><input type="submit" value="Redraw" name="Go" onClick='return validateMMSize();'></td>
    </tr>
 </form>
 </table>
 
 <p>Graphs generated with <a href='http://www.research.att.com/sw/tools/graphviz/'>GraphViz</a>. 
 
+<script>
+function validateMMSize() {
+  if (document.getElementById('mind_map_size').value != "" &&
+      !(/^\d+,\d+$/.test(document.getElementById('mind_map_size').value))) {
+    alert("The Mind Map size must be in the format of 'digit(s),digit(s)'!");
+    return false;
+  }
+  return true;
+}
+</script>
 <%= sub_template "bottom" %>
 

data/app/views/wiki/new_system.rhtml

@@ -1,8 +1,8 @@
-<% @title = "Instiki Setup"; @content_width = 500 %><%= sub_template "top" %>
+<% @title = "Pimki Setup"; @content_width = 500 %><%= sub_template "top" %>
 
 <p>
-  Congratulations on succesfully installing and starting Instiki. 
-  Since this is the first time Instiki has been run on this port, you'll need to do a brief one-time setup.
+  Congratulations on succesfully installing and starting Pimki. 
+  Since this is the first time Pimki has been run on this port, you'll need to do a brief one-time setup.
 </p>
 
 <form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">

data/app/views/wiki/new_web.rhtml

@@ -1,4 +1,8 @@
-<% @title = "New Wiki Web"; @content_width = 500 %><%= sub_template "top" %>
+<% 
+  @title = "New Wiki Web"
+  @hide_menu = true
+  @inline_style = true
+%><%= sub_template "top" %>
 
 <p>
   Each web serves as an isolated name space for wiki pages, so different subjects or projects can write about different <i>MuppetShows</i>.

data/app/views/wiki/page.rhtml

@@ -26,7 +26,7 @@
   <% end %>
 </div>
 
-<div class="navigation">
+<div class="navigation" id='bottom-section'>
   <a href="../edit/<%= @page.name %>" class="navlink" accesskey="E">Edit Page</a>
 
   <% if @page.revisions.length > 1 %>
@@ -61,13 +61,6 @@
       <br />| Bliki Linked from: <%= @page.bliki_references.collect { |ref| link_to_bliki(ref) }.join(", ") %>
     </small>
   <% end %>
-
-  <% if @page.name == "HomePage" %>
-    <br /><a href="../edit_web/" class="navlink">Edit Web</a>
-    | <%= list_item "Authors", "../authors/", "Who wrote what" %> 
-    | <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> 
-    | <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %>
-  <% end %>
 </div>
 
 <script language="Javascript">

data/app/views/wiki/published.rhtml

@@ -7,6 +7,44 @@
 %>
 <%= sub_template "top" %>
 
+<div id="revision">
 <%= @page.display_published %>
+</div>
+
+<div class="byline">
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
+  by
+  <%= @page.author_link({ :mode => :export }) %>
+</div>
+
+<div class="navigation">
+  <small>
+    | Views: <a href="../print/<%= @page.name %>">Print</a>
+  <% if OPTIONS[:pdflatex] && @web.markup == :textile %>
+    | <a href="../tex/<%= @page.name %>">TeX</a> | <a href="../pdf/<%= @page.name %>">PDF</a>
+  <% end %>
+  </small>
+
+  <% if @page.references.length > 0 %>
+    <small>
+      <br />| Linked from: <%= @page.references.collect { |ref| ref.link }.join(", ").gsub('/show/', '/published/') %>
+    </small>
+  <% end %>
+
+  <!-- TODO: fix this one the Bliki has a published interface
+  <% if @page.bliki_references.length > 0 %>
+    <small>
+      <br />| Bliki Linked from: <%= @page.bliki_references.collect { |ref| link_to_bliki(ref) }.join(", ") %>
+    </small>
+  <% end %>
+  -->
+
+  <br />
+  <!-- TODO: fix this one the published interface is better for all special templates.
+    <%= list_item "Authors", "../authors/", "Who wrote what" %> 
+  | <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %>
+  | <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %>
+  -->
+</div>
 
 <%= sub_template "bottom" %>

data/app/views/wiki/recently_revised.rhtml

@@ -1,6 +1,8 @@
 <% @title = "Recently Revised" %>
 <%= sub_template "top" %>
 
+<div class='content-box'>
+
 <% unless @categories.empty? %>
 <div id="categories">
   <strong>Categories</strong>: 
@@ -9,6 +11,9 @@
 </div>
 <% end %>
 
+</div>
+<div class='content-box'>
+
 <% revision_date = Date.new(2100) %>
 <ul>
 <% for page in @pages_by_revision %>
@@ -28,4 +33,5 @@
   <% revision_date = page.revised_on %>
 <% end %>
 
+</div>
 <%= sub_template "bottom" %>

data/app/views/wiki/rss_feed.rhtml

@@ -6,6 +6,51 @@
 		<description>Pimki - a PIM based on Instiki's wiki technology</description>
 		<language>en-us</language>
 		<ttl>40</ttl>
+<% if @display_todo
+     FAR_FUTURE = Date.new(4000,1,1)
+%>
+  <% @todo_items.each do |page, items| %>
+    <item>
+      <title><%= page.plain_name %></title>
+      <description>
+        <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 }]"
+              x unless x == "[]"
+            %></small><br />
+            <span class="<%= get_todo_display_style item.due_date %>"><%= item.text.strip.gsub(/<.*?>/, '') %></span>
+          </li>
+        <% end %>
+        </ul>
+      </description>
+      <guid><%= "#{@web_url}/show/#{page.name}" %></guid>
+      <link><%= "#{@web_url}/show/#{page.name}" %></link>
+      <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
+    </item>
+  <% end %>
+  <% @bliki_todo_items.each do |page, items| %>
+    <item>
+      <title><%= page.plain_name %></title>
+      <description>
+        <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.gsub(/<.*?>/, '') %></span>
+          <% end %>
+        </ul>
+      </description>
+      <pubDate><%= ctime = entry.created_at; ctime.strftime "%a, %e %b %Y %H:%M:%S #{ctime.gmt_offset/3600}" %></pubDate>
+      <guid><%= "#{@web_url}/bliki_revision/#{entry.name}?rev=#{entry.revisions.length-1}" %></guid>
+      <link><%= "#{@web_url}/bliki_revision/#{entry.name}?rev=#{entry.revisions.length-1}" %></link>
+      <dc:creator><%= WikiWords.separate(entry.author) %></dc:creator>
+    </item>
+  <% end %>
+<% else %>
   <% for entry in @bliki_entries %>
     <item>
       <title>Bliki: <%= entry.plain_name %></title>
@@ -30,5 +75,6 @@
       <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
     </item>
   <% end %>
+<% end %>
   </channel>
 </rss>

data/app/views/wiki/test.rhtml

@@ -0,0 +1,25 @@
+
+
+<script>
+function getPageName(elem) {
+  if (document.getElementById(elem).value) {
+    document.getElementById(elem).style.color = 'red;' ;
+  } else {
+    document.getElementById(elem).style.color = 'blue;' ;
+  };
+  var xmlhttp=false;
+  xmlhttp = new XMLHttpRequest();
+  
+  xmlhttp.open("GET", "/pimki/show/HomePage", true);
+  xmlhttp.onreadystatechange=function() {
+    for(i=0; i< 100000;i++);
+    if (xmlhttp.readyState==4) {
+      document.getElementById(elem).style.color = 'green;' ;
+    }
+  }
+  xmlhttp.send(null);
+}
+</script>
+
+<input type="checkbox" id="todo" name="todo" onClick='getPageName("green");' /><span id='green'>Super green!</span>
+

data/app/views/wiki/todo.rhtml

@@ -4,10 +4,11 @@
    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>
 
+<%= '<div class="content-box">' unless @context_links.empty? and num_items == 0 %>
+
 <% unless @context_links.empty? %>
 <div id="todo_contexts">
   <strong>ToDo Contexts</strong>:
@@ -41,9 +42,11 @@
 </div>
 <% end %>
 
+<%= '</div>' unless @context_links.empty? and num_items == 0 %>
+
 <ul>
 <% @todo_items.each do |page, items| %>
-  <li><%= page.link %> <%# items.length %>
+  <li class='content-box'><%= page.link %> <%# items.length %>
       <ul>
         <% items.each do |item| %>
           <li>

data/app/views/wiki/web_list.rhtml

@@ -1,4 +1,8 @@
-<% @title = "Wiki webs" %><%= sub_template "top" %>
+<% 
+  @title = "Wiki webs"
+  @hide_menu = true
+  @inline_style = true
+%><%= sub_template "top" %>
 
 <ul>
 <% for web in @webs %>

data/libraries/secure_web_controller_server.rb

@@ -0,0 +1,106 @@
+require 'webrick'
+require 'webrick/https'
+include WEBrick
+
+# Terminology:
+# * Static controller: Is a controller that has all it's show_* and do_* methods mounted by the server
+# at server start, so the server will handle request rejection of invalid requests
+# * Dynamic controller: Is a controller that's mounted with a responsibility to handle all the request mapping
+# itself. Hence, the server will never reject a request that's below the controller in the path.
+class WebControllerServer
+  STATIC_MOUNTING  = 1
+  DYNAMIC_MOUNTING = 2
+
+  MOUNT_TYPE = DYNAMIC_MOUNTING
+
+  SERVER_TYPE = (RUBY_PLATFORM =~ /mswin/ ? SimpleServer : Daemon)
+  
+  def WebControllerServer.the_active_server
+    @the_active_server
+  end
+  def WebControllerServer.the_active_server= server
+    @the_active_server = server
+  end
+
+  def initialize(port, server_type, controller_path)
+    # Note: This requires Ruby/OpenSSL.
+    @server = WEBrick::HTTPServer.new(
+      :Port            => port,
+      :ServerType      => server_type || SERVER_TYPE,
+      :SSLEnable       => true,
+      :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE,
+      :SSLCertName => [ ["C","JP"], ["O","pimki.rubyforge.org"], ["CN", "A Pimki certificate. Only trust web-sites you know!"] ]
+    )
+
+    WebControllerServer::the_active_server = @server
+    @server.logger.info "Your WEBrick server is now running on http://localhost:#{port}"
+    @controller_path = controller_path
+    mount_controllers
+    start_server
+  end
+  
+  private
+    # Mounts all the controllers in the controller_path according to the mount type
+    def mount_controllers
+      require_controller_files
+
+      case MOUNT_TYPE
+        when STATIC_MOUNTING  then controller_names.each { |name| mount_static_controller(name)  }
+        when DYNAMIC_MOUNTING then controller_names.each { |name| mount_dynamic_controller(name) }
+      end
+      
+      @server.mount('/favicon.ico', FavIconHandler)
+    end
+
+    # Mounts the controller specified by <tt>controller_name</tt> to accept all requests below it's path.
+    # If more than one controller is mounted by this WebControllerServer, the controller is mounted by name,
+    # such that fx WikiController would get the requests of "/wiki/something" and "/wiki/some/thing/else".
+    # If only one controller is mounted, all requests to this WebControllerServer is handled by that controller
+    def mount_dynamic_controller(controller_name)
+      mount_path = mounting_multiple_controllers? ? "/#{controller_name}" : "/"
+      @server.mount(mount_path, controller_class(controller_name))
+    end
+
+    # Mount all public show_* and do_* methods as actions tied to the controller specified by <tt>controller_name</tt>.
+    # If more than one controller is mounted by this WebControllerServer, the actions are mounted below the controller
+    # in the path, such as "/wiki/page" or "/wiki/list". If only one controller is mounted, they're mounted directly on 
+    # the root, such as "/page" or "/list"
+    def mount_static_controller(controller_name)
+      controller_class(controller_name).public_instance_methods(false).each { |method|
+        mount_path = (mounting_multiple_controllers? ? "/#{controller_name}" : "") + "/#{method}"
+        @server.mount(mount_path, controller_class(controller_name))
+      }
+    end
+
+    # Requires all the controller files that are present in the controller_path
+    def require_controller_files
+      controller_names.each { |controller| require @controller_path + controller }
+    end
+
+    # Returns true if more than one controller exists in the controller_path
+    def mounting_multiple_controllers?
+      controller_names.length > 1
+    end
+
+    # Returns a list of controller names in lower-case from the controller path
+    def controller_names
+      Dir.entries(@controller_path).delete_if { |file| file !~ /rb$/ }.collect{ |c| c[0..-4] }
+    end
+
+    # Returns the class of the controller specified by the <tt>controller_name</tt>
+    def controller_class(controller_name)
+      eval(controller_name.capitalize + "Controller")
+    end
+
+  public
+  
+    # Start accepting requests to the defined mount points
+    def start_server
+      @server.start
+    end
+    
+    # Stops accepting requests to the defined mount points
+    def shutdown
+      @server.shutdown
+    end
+end