Pimki 1.7.092 → 1.8.092

data/app/views/wiki/rollback.rhtml

@@ -1,35 +1,36 @@
-<% 
-  @title = "Rollback to #{@page.plain_name} Rev ##{@revision.number}"
-  @content_width = 720
-  @hide_navigation = true
-  @hide_menu = true
-%><%= sub_template "top" %>
-
-<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
-
-<form id="editForm" action="../save/<%= @page.name %>" method="post" onSubmit="cleanAuthorName();">
-<p>
-  <textarea name="content" style="font-size: 12px; width: 450px; height: 500px"><%= @revision.content %></textarea>
-</p>
-<p>
-    <% if @web.check_pass_on_edit %>
-      <p>Please enter edit password: <input type="password" name="password" id="password"></p>
-    <% end %>
-    <input type="submit" value="Update"> as 
-    <input type="text" name="author" id="authorName" value="<%= @author %>" 
-        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
-    | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
-</p>
-</form>
-
-<%= render_markup_help %>
-
-<script language="JavaScript1.2">
-function cleanAuthorName() {
-  if (document.getElementById('authorName').value == "") {
-    document.getElementById('authorName').value = 'AnonymousCoward';
-  }
-}
-</script>
-
-<%= sub_template "bottom" %>
+<% 
+  @title = "Rollback to #{@page.plain_name} Rev ##{@revision.number}"
+  @content_width = 810
+  @hide_navigation = true
+  @hide_menu = true
+  @style_additions = "#Content, #Container {width = 820px; padding-left:100px;}"
+%><%= sub_template "top" %>
+
+<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>
+
+<form id="editForm" action="../save/<%= @page.name %>" method="post" onSubmit="cleanAuthorName();">
+<p>
+  <textarea name="content" style="font-size: 12px; width: 450px; height: 75%"><%= @revision.content %></textarea>
+</p>
+<p>
+    <% if @web.check_pass_on_edit %>
+      <p>Please enter edit password: <input type="password" name="password" id="password"></p>
+    <% end %>
+    <input type="submit" value="Update"> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" 
+        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true">
+    | <a href="../cancel_edit/<%= @page.name %>">Cancel</a> <small>(unlocks page)</small>
+</p>
+</form>
+
+<%= render_markup_help %>
+
+<script language="JavaScript1.2">
+function cleanAuthorName() {
+  if (document.getElementById('authorName').value == "") {
+    document.getElementById('authorName').value = 'AnonymousCoward';
+  }
+}
+</script>
+
+<%= sub_template "bottom" %>

data/app/views/wiki/todo.rhtml

@@ -51,8 +51,8 @@
         <% 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 />"
+              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>
             <span class="<%= get_todo_display_style item.due_date %>"><%= item.text.strip %></span>
           </li>

data/app/views/wiki_words_help.rhtml

@@ -1,8 +1,8 @@
-<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 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/>
-  Not wiki words: <i>IBM, School</i>
-</p>
+<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 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/>
+  Not wiki words: <i>IBM, School</i>
+</p>

data/libraries/action_controller_servlet.rb

@@ -1,203 +1,203 @@
-require 'erb'
-require 'cgi'
-require 'webrick'
-include WEBrick
-
-require 'view_helper'
-
-class FavIconHandler < HTTPServlet::AbstractServlet
-  LOCAL_PATH = File.join(File.dirname(__FILE__), '../favicon.png')
-  ICO_FILE = File.open(LOCAL_PATH, "rb") { |f| f.read }
-  def do_GET(req, res)
-    res['content-type'] = 'image/png'
-    res.body = ICO_FILE
-  end
-end
-
-class ActionControllerServlet < HTTPServlet::AbstractServlet
-  @@template_root = "./views"
-  def self.template_root() @@template_root end
-  def self.template_root=(template_root) @@template_root = template_root end
-
-  include ViewHelper
-  
-  def do_POST(req, res) do_GET(req, res) end 
-  
-  def do_GET(req, res)
-    @req, @res = req, res
-
-    @res['Content-Type']  = "text/html; charset=utf-8"
-    @res['Pragma']        = "no-cache"
-    @res['Cache-Control'] = "no-cache"
-
-    @params = @req.query
-    @assigns = {}
-    @performed_render = @performed_redirect = false
-
-    @logger.info "Performing #{action_name} (#{request_path.join('/')})"
-    @logger.info "  Parameters: #{@params.inspect}"
-    @logger.info "  Cookies: #{@req.cookies.collect { |c| "#{c.name} => #{c.value}" }.join(", ") }"
-
-    perform_action
-    @res
-  end
-  
-  protected
-    def template_root() self.class.template_root end
-
-    # Issues a HTTP 302 (location) redirect to the specified <tt>path</tt>. Query string
-    # parameters can be specified in the <tt>params</tt> hash and are automatically URL escaped.
-    # An <tt>anchor</tt> can also be specified (as a string).
-    def redirect_path(path, params = nil, anchor = nil)
-      path << build_query_string(params) unless params.nil?
-      path << "\##{anchor}" unless anchor.nil?
-      @res.set_redirect WEBrick::HTTPStatus::MovedPermanently, path
-      @performed_redirect = true
-    end
-
-    # Redirects the browser to another action within the current controller, so redirect_path "pages"
-    # within a controller called WikiController would take the user to "http://www.example.com/wiki/pages"
-    def redirect_action(action, params = nil, anchor = nil)
-      redirect_path "/#{controller_name}/#{action}", params, anchor
-    end
-
-    
-    # Compiles the template response and adds it to the response. If no template_name has been
-    # supplied, the action parameter parsed to the controller is used. So invoking
-    # render on a object initialized with myController.new("show_person") will compile the template
-    # located at "../views/show_person.rhtml". Notice that the ".rhtml" extension is postfixed
-    # to the template_name regardless of one was passed or that the action parameter was used.
-    def render(template_name = "#{controller_name}/#{action_name}")
-      @performed_render = true
-      @logger.info "Rendering: #{template_name}"
-      add_instance_variables_to_assigns
-      @res.body = template_result "#{template_root}/#{template_name}.rhtml"
-    end
-
-    def render_text(text)
-      @performed_render = true
-      @logger.info "Rendering in text"
-      @res.body = text
-    end
-
-    # Wrapper around render that presumes the current controller is used as a base for the action, 
-    # so render_action("page") in WikiController will be equal to render("wiki/page")
-    def render_action(action_name)
-      render "#{controller_name}/#{action_name}"
-    end
-
-    def sub_template(template_name)
-      template_result "#{template_root}/#{template_name}.rhtml"
-    end
-
-    # Returns the value of the cookie matching +name+ (or nil if none is found).
-    def read_cookie(key)
-      cookies = @req.cookies.select { |cookie| cookie.name == key }
-      cookies.empty? ? nil : cookies.first.value
-    end
-
-    def write_cookie(key, value, permanent = false)
-      @logger.info "Writing cookie: #{key} => #{value}"
-
-      cookie = WEBrick::Cookie.new(key, value)
-      cookie.path = "/"
-      cookie.expires = Time.local(2030) if permanent
-      @res.cookies << cookie
-    end
-
-
-    # Returns the last part of the uri path ("page" in "/wiki/page") by default, but
-    # can be overwritten to implement mod_rewrite-like behaviour, such as "page" in "/wiki/page/home"
-    def action_name
-      @req.path.to_s.split(/\//).last
-    end
-
-    # Returns an array with each of the parts in the request as an element. So /something/cool/dude
-    # returns ["something", "cool", "dude"]
-    def request_path
-      request_path_parts = @req.path.to_s.split(/\//)
-      request_path_parts.length > 1 ? request_path_parts[1..-1] : []
-    end
-
-    # Can be overwritten by a controller class to implement shared behaviour for all the actions in
-    # the class, such as security measures
-    def before_action() end
-
-
-  private
-    # Wraps around all action calls to ensure the session is properly updated and closed.
-    # Figures out whether an action, such as "list", is implemented as show_list or do_list.
-    # The show_* type has precedence and automatically calls render after execution.
-    def perform_action
-      if before_action == false then return end
-        
-      if action_methods.include?(action_name)
-        send(action_name)
-        render unless @performed_render || @performed_redirect || !@res.body.empty?
-      elsif template_exists_for_action
-        render
-      else
-        raise RuntimeError, "No action responded to #{action_name}", caller
-      end
-      
-      rescue Exception => details
-        raise if ['WEBrick', 'Net'].include? details.class.name.split('::')[0]
-        @error_details = details
-        render 'error'
-
-    end
-
-    def add_instance_variables_to_assigns
-      instance_variables.each { |var|
-        next if protected_instance_variables.include?(var)
-        @assigns[var[1..-1]] = instance_variable_get(var)
-      }
-    end
-
-    def protected_instance_variables
-      [ "@assigns", "@performed_redirect", "@performed_render" ]
-    end
-
-    def action_methods
-      methods - Object.instance_methods
-    end
-  
-    # Returns true if a template exists in the controller directory for the specified <tt>action_name</tt>,
-    # which would mean true if called for WikiController#changes and "/views/wiki/changes.rhtml" existed.
-    def template_exists_for_action
-      File.exist? action_template_path
-    end
-  
-    def action_template_path(action = action_name)
-      "#{template_root}/#{controller_name}/#{action}.rhtml"
-    end
-  
-    def template_result(template_path)
-      @assigns.each { |key, value| instance_variable_set "@#{key}", value }
-      begin
-        ERB.new(IO.readlines(template_path).join).result(binding)
-      rescue Exception => detail
-        @logger.error "Error processing #{template_path}"
-        line = /:(\d+):/.match(detail.backtrace[0]).captures[0].to_i - 172
-        @logger.error "On Line: #{line}"
-        @logger.error detail
-        src = ERB.new(IO.readlines(template_path).join).src
-        lines = src.split("\n")[(line-1)..(line+1)]
-        @logger.error "\n\n" + lines.join("\n\n") + "\n\n"
-        raise
-      end
-    end
-  
-    # Converts the class name from something like "OneModule::TwoModule::NeatController"
-    # to "neat".
-    def controller_name
-      self.class.to_s.split("::").last.sub(/Controller/, "").downcase
-    end
-
-    # Returns a query string with escaped keys and values from the passed hash.
-    def build_query_string(hash)
-      elements = []
-      hash.each { |key, value| elements << "#{CGI.escape(key)}=#{CGI.escape(value.to_s)}" }
-      "?" + elements.join("&")
-    end
+require 'erb'
+require 'cgi'
+require 'webrick'
+include WEBrick
+
+require 'view_helper'
+
+class FavIconHandler < HTTPServlet::AbstractServlet
+  LOCAL_PATH = File.join(File.dirname(__FILE__), '../favicon.png')
+  ICO_FILE = File.open(LOCAL_PATH, "rb") { |f| f.read }
+  def do_GET(req, res)
+    res['content-type'] = 'image/png'
+    res.body = ICO_FILE
+  end
+end
+
+class ActionControllerServlet < HTTPServlet::AbstractServlet
+  @@template_root = "./views"
+  def self.template_root() @@template_root end
+  def self.template_root=(template_root) @@template_root = template_root end
+
+  include ViewHelper
+  
+  def do_POST(req, res) do_GET(req, res) end 
+  
+  def do_GET(req, res)
+    @req, @res = req, res
+
+    @res['Content-Type']  = "text/html; charset=utf-8"
+    @res['Pragma']        = "no-cache"
+    @res['Cache-Control'] = "no-cache"
+
+    @params = @req.query
+    @assigns = {}
+    @performed_render = @performed_redirect = false
+
+    @logger.info "Performing #{action_name} (#{request_path.join('/')})"
+    @logger.info "  Parameters: #{@params.inspect}"
+    @logger.info "  Cookies: #{@req.cookies.collect { |c| "#{c.name} => #{c.value}" }.join(", ") }"
+
+    perform_action
+    @res
+  end
+  
+  protected
+    def template_root() self.class.template_root end
+
+    # Issues a HTTP 302 (location) redirect to the specified <tt>path</tt>. Query string
+    # parameters can be specified in the <tt>params</tt> hash and are automatically URL escaped.
+    # An <tt>anchor</tt> can also be specified (as a string).
+    def redirect_path(path, params = nil, anchor = nil)
+      path << build_query_string(params) unless params.nil?
+      path << "\##{anchor}" unless anchor.nil?
+      @res.set_redirect WEBrick::HTTPStatus::MovedPermanently, path
+      @performed_redirect = true
+    end
+
+    # Redirects the browser to another action within the current controller, so redirect_path "pages"
+    # within a controller called WikiController would take the user to "http://www.example.com/wiki/pages"
+    def redirect_action(action, params = nil, anchor = nil)
+      redirect_path "/#{controller_name}/#{action}", params, anchor
+    end
+
+    
+    # Compiles the template response and adds it to the response. If no template_name has been
+    # supplied, the action parameter parsed to the controller is used. So invoking
+    # render on a object initialized with myController.new("show_person") will compile the template
+    # located at "../views/show_person.rhtml". Notice that the ".rhtml" extension is postfixed
+    # to the template_name regardless of one was passed or that the action parameter was used.
+    def render(template_name = "#{controller_name}/#{action_name}")
+      @performed_render = true
+      @logger.info "Rendering: #{template_name}"
+      add_instance_variables_to_assigns
+      @res.body = template_result "#{template_root}/#{template_name}.rhtml"
+    end
+
+    def render_text(text)
+      @performed_render = true
+      @logger.info "Rendering in text"
+      @res.body = text
+    end
+
+    # Wrapper around render that presumes the current controller is used as a base for the action, 
+    # so render_action("page") in WikiController will be equal to render("wiki/page")
+    def render_action(action_name)
+      render "#{controller_name}/#{action_name}"
+    end
+
+    def sub_template(template_name)
+      template_result "#{template_root}/#{template_name}.rhtml"
+    end
+
+    # Returns the value of the cookie matching +name+ (or nil if none is found).
+    def read_cookie(key)
+      cookies = @req.cookies.select { |cookie| cookie.name == key }
+      cookies.empty? ? nil : cookies.first.value
+    end
+
+    def write_cookie(key, value, permanent = false)
+      @logger.info "Writing cookie: #{key} => #{value}"
+
+      cookie = WEBrick::Cookie.new(key, value)
+      cookie.path = "/"
+      cookie.expires = Time.local(2030) if permanent
+      @res.cookies << cookie
+    end
+
+
+    # Returns the last part of the uri path ("page" in "/wiki/page") by default, but
+    # can be overwritten to implement mod_rewrite-like behaviour, such as "page" in "/wiki/page/home"
+    def action_name
+      @req.path.to_s.split(/\//).last
+    end
+
+    # Returns an array with each of the parts in the request as an element. So /something/cool/dude
+    # returns ["something", "cool", "dude"]
+    def request_path
+      request_path_parts = @req.path.to_s.split(/\//)
+      request_path_parts.length > 1 ? request_path_parts[1..-1] : []
+    end
+
+    # Can be overwritten by a controller class to implement shared behaviour for all the actions in
+    # the class, such as security measures
+    def before_action() end
+
+
+  private
+    # Wraps around all action calls to ensure the session is properly updated and closed.
+    # Figures out whether an action, such as "list", is implemented as show_list or do_list.
+    # The show_* type has precedence and automatically calls render after execution.
+    def perform_action
+      if before_action == false then return end
+        
+      if action_methods.include?(action_name)
+        send(action_name)
+        render unless @performed_render || @performed_redirect || !@res.body.empty?
+      elsif template_exists_for_action
+        render
+      else
+        raise RuntimeError, "No action responded to #{action_name}", caller
+      end
+      
+      rescue Exception => details
+        raise if ['WEBrick', 'Net'].include? details.class.name.split('::')[0]
+        @error_details = details
+        render 'error'
+
+    end
+
+    def add_instance_variables_to_assigns
+      instance_variables.each { |var|
+        next if protected_instance_variables.include?(var)
+        @assigns[var[1..-1]] = instance_variable_get(var)
+      }
+    end
+
+    def protected_instance_variables
+      [ "@assigns", "@performed_redirect", "@performed_render" ]
+    end
+
+    def action_methods
+      methods - Object.instance_methods
+    end
+  
+    # Returns true if a template exists in the controller directory for the specified <tt>action_name</tt>,
+    # which would mean true if called for WikiController#changes and "/views/wiki/changes.rhtml" existed.
+    def template_exists_for_action
+      File.exist? action_template_path
+    end
+  
+    def action_template_path(action = action_name)
+      "#{template_root}/#{controller_name}/#{action}.rhtml"
+    end
+  
+    def template_result(template_path)
+      @assigns.each { |key, value| instance_variable_set "@#{key}", value }
+      begin
+        ERB.new(IO.readlines(template_path).join).result(binding)
+      rescue Exception => detail
+        @logger.error "Error processing #{template_path}"
+        line = /:(\d+):/.match(detail.backtrace[0]).captures[0].to_i - 172
+        @logger.error "On Line: #{line}"
+        @logger.error detail
+        src = ERB.new(IO.readlines(template_path).join).src
+        lines = src.split("\n")[(line-1)..(line+1)]
+        @logger.error "\n\n" + lines.join("\n\n") + "\n\n"
+        raise
+      end
+    end
+  
+    # Converts the class name from something like "OneModule::TwoModule::NeatController"
+    # to "neat".
+    def controller_name
+      self.class.to_s.split("::").last.sub(/Controller/, "").downcase
+    end
+
+    # Returns a query string with escaped keys and values from the passed hash.
+    def build_query_string(hash)
+      elements = []
+      hash.each { |key, value| elements << "#{CGI.escape(key)}=#{CGI.escape(value.to_s)}" }
+      "?" + elements.join("&")
+    end
 end