instiki 0.9.2 → 0.10.0

data/app/models/wiki_words.rb

@@ -1,25 +1,23 @@
-# Contains all the methods for finding and replacing wiki words
-module WikiWords
-  # In order of appearance: Latin, greek, cyrillian, armenian
-  I18N_HIGHER_CASE_LETTERS =
-    "ÀÁÂÃÄÅĀĄĂÆÇĆČĈĊĎĐÈÉÊËĒĘĚĔĖĜĞĠĢĤĦÌÍÎÏĪĨĬĮİIJĴĶŁĽĹĻĿÑŃŇŅŊÒÓÔÕÖØŌŐŎŒŔŘŖŚŠŞŜȘŤŢŦȚÙÚÛÜŪŮŰŬŨŲŴÝŶŸŹŽŻ" + 
-    "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ" + 
-    "ΆΈΉΊΌΎΏѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎҐҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾӁӃӅӇӉӋӍӐӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӸЖ" +
-    "ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՏՐՑՒՓՔՕՖ"
-
-  I18N_LOWER_CASE_LETTERS =
-    "àáâãäåāąăæçćčĉċďđèéêëēęěĕėƒĝğġģĥħìíîïīĩĭįıijĵķĸłľĺļŀñńňņʼnŋòóôõöøōőŏœŕřŗśšşŝșťţŧțùúûüūůűŭũųŵýÿŷžżźÞþßſÐð" +
-    "άέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώΐ" +
-    "абвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљћќѝўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿҁҋҍҏґғҕҗҙқҝҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛӝӟӡӣӥӧөӫӭӯӱӳӵӹ" +
-    "աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև"
-
-  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + '][a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + ']\w+'
-
-  def self.separate(wiki_word, ignore_separation = false)
-    if ignore_separation
-      wiki_word
-    else
-      wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}])/u, '\1 \2')
-    end
-  end
-end
+# Contains all the methods for finding and replacing wiki words
+module WikiWords
+  # In order of appearance: Latin, greek, cyrillian, armenian
+  I18N_HIGHER_CASE_LETTERS =
+    "À�?ÂÃÄÅĀĄĂÆÇĆČĈĊĎ�?ÈÉÊËĒĘĚĔĖĜĞĠĢĤĦÌ�?Î�?ĪĨĬĮİIJĴĶ�?ĽĹĻĿÑŃŇŅŊÒÓÔÕÖØŌ�?ŎŒŔŘŖŚŠŞŜȘŤŢŦȚÙÚÛÜŪŮŰŬŨŲŴ�?ŶŸŹŽŻ" + 
+    "ΑΒΓΔΕΖΗΘΙΚΛΜ�?ΞΟΠΡΣΤΥΦΧΨΩ" + 
+    "ΆΈΉΊΌΎ�?ѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎ�?ҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾ�?ӃӅӇӉӋ�?�?ӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӸЖ" +
+    "ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�?ՂՃՄՅՆՇՈՉՊՋՌ�?�?�?ՑՒՓՔՕՖ"
+
+  I18N_LOWER_CASE_LETTERS =
+    "àáâãäå�?ąăæçć�?ĉċ�?đèéêëēęěĕėƒ�?ğġģĥħìíîïīĩĭįıijĵķĸłľĺļŀñńňņʼnŋòóôõöø�?ő�?œŕřŗśšş�?șťţŧțùúûüūůűŭũųŵýÿŷžżźÞþßſ�?ð" +
+    "άέήίΰαβγδεζηθικλμνξοπ�?ςστυφχψωϊϋό�?ώ�?" +
+    "абвгдежзийклмнопр�?туфхцчшщъыь�?ю�?�?ёђѓєѕіїјљћќ�?ўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿ�?ҋ�?�?ґғҕҗҙқ�?ҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛ�?ӟӡӣӥӧөӫӭӯӱӳӵӹ" +
+    "աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտր�?ւփքօֆև"
+
+  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + '][a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + ']\w+'
+  CAMEL_CASED_WORD_BORDER = /([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}])/u
+
+  def self.separate(wiki_word)
+    wiki_word.gsub(CAMEL_CASED_WORD_BORDER, '\1 \2')
+  end
+
+end

data/app/views/{wiki/new_system.rhtml → admin/create_system.rhtml}

@@ -1,78 +1,83 @@
-<% @title = "Instiki 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.
-</p>
-
-<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
-<ol class="setup">
-  <li>
-
-    <h2 style="margin-bottom: 3px">Name and address for your first web</h2>
-    <div class="help">
-      The name of the web is included in the title on all pages. The address is the base path that all pages within the web live beneath. Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. The address can only consist of letters & digits.
-    </div>
-    <div class="inputBox">
-      Name: <input type="text" id="web_name" name="web_name" value="Wiki" onChange="proposeAddress();" 
-          onClick="this.value == 'Wiki' ? this.value = '' : true"> &nbsp;&nbsp;
-      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="wiki">
-    </div>
-  </li>
-
-  <li>
-    <h2 style="margin-bottom: 3px">Password for creating and changing webs</h2>
-    <div class="help">
-      Administrative access allows you to make new webs and change existing ones.<br/>
-      Everyone with this password will be able to do this, so pick it carefully.
-    </div>
-    <div class="inputBox">
-      Password: <input type="password" id="password" name="password"> &nbsp;&nbsp;
-      Verify: <input type="password" id="password_check" name="password_check">
-    </div>
-  </li>
-</ol>
-
-<p align="right">
-    <input type="submit" value="Setup" style="margin-left: 40px">
-</p>
-</form>
-
-<script>
-function proposeAddress() {
-  document.getElementById('web_address').value =
-    document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-
-function cleanAddress() {
-  document.getElementById('web_address').value =
-    document.getElementById('web_address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-
-function validateSetup() {
-  if (document.getElementById('web_name').value == "") {
-    alert("You must pick a name for the first web");
-    return false;
-  }
-  
-  if (document.getElementById('web_address').value == "") {
-    alert("You must pick an address for the first web");
-    return false;
-  }
-  
-  if (document.getElementById('password').value == "") {
-    alert("You must pick a system password");
-    return false;
-  }
-
-  if (document.getElementById('password_check').value == "" ||
-      document.getElementById('password').value != document.getElementById('password_check').value) {
-    alert("The password and its verification doesn't match");
-    return false;
-  }
-  
-  return true;
-}
-</script>
-
-<%= sub_template "bottom" %>
+<% @title = "Instiki Setup"; @content_width = 500 %>
+
+<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.
+</p>
+
+<form action="../create_system" id="setup" method="post" onSubmit="return validateSetup()">
+<ol class="setup">
+  <li>
+
+    <h2 style="margin-bottom: 3px">Name and address for your first web</h2>
+    <div class="help">
+      The name of the web is included in the title on all pages. 
+      The address is the base path that all pages within the web live beneath. 
+      Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. 
+      The address can only consist of letters and digits.
+    </div>
+    <div class="inputBox">
+      Name: <input type="text" id="web_name" name="web_name" value="Wiki" 
+            onChange="proposeAddress();" onClick="this.value == 'Wiki' ? this.value = '' : true" /> 
+      &nbsp;&nbsp;
+      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();"
+               value="wiki" />
+    </div>
+  </li>
+
+  <li>
+    <h2 style="margin-bottom: 3px">Password for creating and changing webs</h2>
+    <div class="help">
+      Administrative access allows you to make new webs and change existing ones.<br/>
+      Everyone with this password will be able to do this, so pick it carefully.
+    </div>
+    <div class="inputBox">
+      Password: <input type="password" id="password" name="password" />
+      &nbsp;&nbsp;
+      Verify: <input type="password" id="password_check" name="password_check" />
+    </div>
+  </li>
+</ol>
+
+<p align="right">
+    <input type="submit" value="Setup" style="margin-left: 40px" />
+</p>
+</form>
+
+<script>
+function proposeAddress() {
+  document.getElementById('web_address').value =
+    document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+}
+
+function cleanAddress() {
+  document.getElementById('web_address').value =
+    document.getElementById('web_address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+}
+
+function validateSetup() {
+  if (document.getElementById('web_name').value == "") {
+    alert("You must pick a name for the first web");
+    return false;
+  }
+  
+  if (document.getElementById('web_address').value == "") {
+    alert("You must pick an address for the first web");
+    return false;
+  }
+  
+  if (document.getElementById('password').value == "") {
+    alert("You must pick a system password");
+    return false;
+  }
+
+  if (document.getElementById('password_check').value == "" ||
+      document.getElementById('password').value != document.getElementById('password_check').value) {
+    alert("The password and its verification doesn't match");
+    return false;
+  }
+  
+  return true;
+}
+</script>

data/app/views/{wiki/new_web.rhtml → admin/create_web.rhtml}

@@ -1,64 +1,69 @@
-<% @title = "New Wiki Web"; @content_width = 500 %><%= 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>.
-</p>
-
-<form action="../create_web" id="setup" method="post" onSubmit="cleanAddress(); return validateSetup()">
-<ol class="setup">
-  <li>
-    <h2 style="margin-bottom: 3px">Name and address for your new web</h2>
-    <div class="help">
-      The name of the web is included in the title on all pages. The address is the base path that all pages within the web live beneath. Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. The address can only consist of letters & digits.
-    </div>
-    <div class="inputBox">
-      Name: <input type="text" id="web_name" name="name" onChange="proposeAddress();" /> &nbsp;&nbsp;
-      Address: <input type="text" id="web_address" name="address" onChange="cleanAddress();" />
-    </div>
-  </li>
-</ol>
-
-
-<p align="right">
-  <small>
-    Enter system password
-    <input type="password" id="system_password" name="system_password">
-    and
-    <input type="submit" value="Create Web">
-  </small>
-</p>
-
-</form>
-
-<script>
-function proposeAddress() {
-  document.getElementById('web_address').value =
-    document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-
-function cleanAddress() {
-  document.getElementById('web_address').value =
-    document.getElementById('web_address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-
-function validateSetup() {
-  if (document.getElementById('web_name').value == "") {
-    alert("You must pick a name for the new web");
-    return false;
-  }
-  
-  if (document.getElementById('web_address').value == "") {
-    alert("You must pick an address for the new web");
-    return false;
-  }
-  
-  if (document.getElementById('system_password').value == "") {
-    alert("You must enter the system password");
-    return false;
-  }
-  
-  return true;
-}
-</script>
-
-<%= sub_template "bottom" %>
+<% @title = "New Wiki Web"; @content_width = 500 %>
+
+<p>
+  Each web serves as an isolated name space for wiki pages, 
+  so different subjects or projects can write about different <i>MuppetShows</i>.
+</p>
+
+<form action="../create_web" id="setup" method="post" onSubmit="cleanAddress(); 
+      return validateSetup()">
+
+<ol class="setup">
+  <li>
+    <h2 style="margin-bottom: 3px">Name and address for your new web</h2>
+    <div class="help">
+      The name of the web is included in the title on all pages. 
+      The address is the base path that all pages within the web live beneath. 
+      Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>. 
+      The address can only consist of letters and digits.
+    </div>
+    <div class="inputBox">
+      Name: <input type="text" id="web_name" name="name" onChange="proposeAddress();" />
+      &nbsp;&nbsp;
+      Address: <input type="text" id="web_address" name="address" onChange="cleanAddress();" />
+    </div>
+  </li>
+</ol>
+
+
+<p align="right">
+  <small>
+    Enter system password
+    <input type="password" id="system_password" name="system_password" />
+    and
+    <input type="submit" value="Create Web" />
+  </small>
+</p>
+
+</form>
+
+<script>
+function proposeAddress() {
+  document.getElementById('web_address').value =
+    document.getElementById('web_name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+}
+
+function cleanAddress() {
+  document.getElementById('web_address').value =
+    document.getElementById('web_address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+}
+
+function validateSetup() {
+  if (document.getElementById('web_name').value == "") {
+    alert("You must pick a name for the new web");
+    return false;
+  }
+  
+  if (document.getElementById('web_address').value == "") {
+    alert("You must pick an address for the new web");
+    return false;
+  }
+  
+  if (document.getElementById('system_password').value == "") {
+    alert("You must enter the system password");
+    return false;
+  }
+  
+  return true;
+}
+</script>

data/app/views/admin/edit_web.rhtml

@@ -0,0 +1,136 @@
+<% @title = "Edit Web" %>
+
+<form action="edit_web" id="setup" method="post" 
+      onSubmit="cleanAddress(); return validateEditWebForm()">
+  <h2 style="margin-bottom: 3px">Name and address</h2>
+  <div class="help">
+    The name of the web is included in the title on all pages. 
+    The address is the base path that all pages within the web live beneath. 
+    Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>.
+  </div>
+
+  <div class="inputBox, disableAutoComplete">
+    Name: <input type="text" id="name" name="name" value="<%= @web.name %>" 
+                 onChange="proposeAddress();" /> &nbsp;&nbsp;
+    Address: <input type="text" id="address" name="address" value="<%= @web.address %>" 
+                    onChange="cleanAddress();" />
+    <i>(Letters and digits only)</i>
+  </div>
+
+  <h2 style="margin-bottom: 3px">Specialize</h2>
+  <div class="inputBox, disableAutoComplete">
+    Markup:
+    <select name="markup">
+      <%= html_options({'Textile' => :textile, 'Markdown' => :markdown, 'Mixed' => :mixed, 
+              'RDoc' => :rdoc }, @web.markup) %>
+    </select>
+
+    &nbsp;&nbsp;
+
+    Color:
+    <select name="color">
+      <%= html_options({ 'Green' => '008B26', 'Purple' => '504685', 'Red' => 'DA0006', 
+                         'Orange' => 'FA6F00', 'Grey' => '8BA2B0' }, @web.color) %>
+    </select>
+    <br/>
+    <p>
+    <small>
+      <input type="checkbox" name="safe_mode" <%= 'checked="on"' if @web.safe_mode %> /> 
+      Safe mode
+      <em>- strip HTML tags and stylesheet options from the content of all pages</em>
+      <br/>
+      <input type="checkbox" name="brackets_only" <%= 'checked="on"' if @web.brackets_only %> /> 
+      Brackets only 
+      <em>- require all wiki words to be as [[wiki word]], WikiWord links won't be created</em>
+      <br/>
+      <input type="checkbox" name="count_pages" <%= 'checked="on"' if @web.count_pages %> /> 
+      Count pages
+      <br/>
+<!-- 
+File uploads are not ready for gfeneral use, and therefore are disabled in release 0.10
+TODO Enable these input elements again after release 0.10
+
+      <input type="checkbox" name="allow_uploads" <%= 'checked="on"' if @web.allow_uploads %> /> 
+      Allow uploads of no more than 
+      <input type="text" name="max_upload_size" value="<%= @web.max_upload_size %>" 
+             width="20" /> 
+      kbytes
+      <em>- 
+        allow users to upload pictures and other files and include them on wiki pages
+      </em>
+      <br/>
+-->
+    </small>
+    </p>
+
+    <a href="#" 
+       onClick="document.getElementById('additionalStyle').style.display='block';return false;">
+    Stylesheet tweaks &gt;&gt;</a>
+    <small><em>
+    - add or change styles used by this web; styles defined here take precedence over 
+    instiki.css. Hint: View HTML source of a page you want to style to find ID names on individual 
+    tags.</em></small>
+    <br/>
+    <textarea id="additionalStyle" 
+      style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px" 
+      name="additional_style"><%= @web.additional_style %>
+    </textarea>
+  </div>
+
+  <h2 style="margin-bottom: 3px">Password protection for this web (<%= @web.name %>)</h2>
+  <div class="help">
+    This is the password that visitors need to view and edit this web. 
+    Setting the password to nothing will remove the password protection.
+  </div>
+  <div class="inputBox">
+    Password: <input class="disableAutoComplete" type="password" id="password" 
+                     name="password" value="<%= @web.password %>" /> 
+    &nbsp;&nbsp;
+    Verify: <input class="disableAutoComplete" type="password" id="password_check" 
+                          value="<%= @web.password %>" name="password_check" />
+  </div>
+
+  <h2 style="margin-bottom: 3px">Publish read-only version of this web (<%= @web.name %>)</h2>
+  <div class="help">
+    You can turn on a read-only version of this web that's accessible even when the regular web 
+    is password protected.
+    The published version is accessible through URLs like /wiki/published/HomePage.
+  </div>
+  <div class="inputBox">
+    <input type="checkbox" name="published" <%= 'checked="on"' if @web.published %> /> 
+    Publish this web
+  </div>
+
+<p align="right">
+  <small>
+    Enter system password
+    <input type="password" class="disableAutoComplete" id="system_password" 
+           name="system_password" />
+    and
+    <input type="submit" value="Update Web" />
+    <br/><br/>
+    ...or forget changes and <%= link_to 'create a new web', :action => 'create_web' %>
+  </small>
+</p>
+
+</form>
+
+<br/>
+<h1>Other administrative tasks</h1>
+
+<%= form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},
+        {:id => 'remove_orphaned_pages'})
+%>
+      onSubmit="return checkSystemPassword(document.getElementById('system_password_orphaned').value)">
+  <p align="right">
+    <small>
+      Clean up by entering system password
+      <input type="password" id="system_password_orphaned" name="system_password_orphaned" />
+      and
+      <input type="submit" value="Delete Orphan Pages" />
+    </small>
+  </p>
+<%= end_form_tag %>
+
+<script type="text/javascript" src="/javascripts/edit_web.js" />
+<script type="text/javascript">overrideAutocomplete()</script>