add default sandbox page; get Kwiki::PagePrivacy finally working and finalize some texts

kwiki/kwiki-plugins.txt

@@ -30,6 +30,7 @@ Kwiki::PreformattedBlocks
 Kwiki::HtmlBlocks
 Kwiki::ShortcutLinks
 Kwiki::ForeignLinkGlyphs
+Kwiki::Cache
 
 #   Additional Wiki Interface Extensions
 #Kwiki::BreadCrumbs
@@ -47,6 +48,8 @@ Kwiki::ForeignLinkGlyphs
 #Kwiki::Infobox
 
 #   Additional Text Block Formatters
+#   (Kwiki::MindMap requires Kwiki::ConfigBlocks and GraphViz)
+#   (Kwiki::VimMode requires Vim)
 #Kwiki::ShellBlocks
 #Kwiki::PodBlocks
 #Kwiki::Formatter::Pod
@@ -77,5 +80,4 @@ Kwiki::ForeignLinkGlyphs
 #Kwiki::Notify::Mail
 #Kwiki::Archive::Cvs
 #Kwiki::LiveSearch
-#Kwiki::Cache
 

kwiki/kwiki-rules.wiki

@@ -1,4 +1,8 @@
-This page describes the Wiki markup language used by Kwiki. 
+
+= Kwiki Formatting Rules
+
+This page describes the particular [http://en.wikipedia.org/wiki/Wiki Wiki] markup language used by [http://www.kwiki.org/ Kwiki]. 
+You can try it out on the dedicated KwikiSandbox page.
 
 ----
 
@@ -32,9 +36,9 @@ Like this. Another paragraph.
 
 ----
 
-*Bold text*, /italic text/, _underscore text_, and -striked through text-.
+*Bold text*, /italic text/, _underlined text_, and -striked through text-.
 
-  *Bold text*, /italic text/, _underscore text_, and -striked through text-.
+  *Bold text*, /italic text/, _underlined text_, and -striked through text-.
 
 /*Combination of bold and italics*/
 

kwiki/kwiki-sandbox.wiki

@@ -0,0 +1,38 @@
+
+= Kwiki Sandbox
+
+Feel free to use this sandbox page to try out the KwikiFormattingRules...
+
+= Level 1 Heading
+== Level 2 Heading
+==== Level 4 Heading
+===== Level 5 Heading
+====== Level 6 Heading
+
+* *Bold text*
+* /italic text/
+* _underlined text_
+* -striked-through text-
+* [=teletype text]
+* !EscapedCamelCaseText
+
+* /camel case/ link: KwikiSandbox
+* titled link: [http:?KwikiSandbox Kwiki Sandbox]
+* plain HTTP hyperlinks: http://www.openpkg.org/
+* plain Email addresses: openpkg@openpkg.org 
+
+.html
+HTML text block:<br>
+<b>bold</b> <i>italic</i> <u>underline</u>
+.html
+
+.p
+preformatted
+  regular
+text block
+.p
+
+  preformatted
+    teletype
+  text block
+

kwiki/kwiki.patch

@@ -1,6 +1,6 @@
 Index: Kwiki-0.37/lib/Kwiki/Command.pm
 --- Kwiki-0.37/lib/Kwiki/Command.pm.orig	2005-01-11 11:16:11 +0100
-+++ Kwiki-0.37/lib/Kwiki/Command.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-0.37/lib/Kwiki/Command.pm	2005-01-14 14:42:23 +0100
 @@ -114,7 +114,7 @@
          next unless $self->is_kwiki_dir($dir);
          $self->msg('Updating ', $dir->absolute->pathname, "\n");
@@ -12,7 +12,7 @@ Index: Kwiki-0.37/lib/Kwiki/Command.pm
  
 Index: Kwiki-0.37/lib/Kwiki/Config.pm
 --- Kwiki-0.37/lib/Kwiki/Config.pm.orig	2005-01-11 16:51:34 +0100
-+++ Kwiki-0.37/lib/Kwiki/Config.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-0.37/lib/Kwiki/Config.pm	2005-01-14 14:42:23 +0100
 @@ -174,11 +174,11 @@
  # Put overrides in the top level config.yaml
  # See: http://www.kwiki.org/?ChangingConfigDotYaml
@@ -29,7 +29,7 @@ Index: Kwiki-0.37/lib/Kwiki/Config.pm
  # file. Do not modify any of the files under the config/ directory as
 Index: Kwiki-0.37/lib/Kwiki/Display.pm
 --- Kwiki-0.37/lib/Kwiki/Display.pm.orig	2005-01-11 11:16:46 +0100
-+++ Kwiki-0.37/lib/Kwiki/Display.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-0.37/lib/Kwiki/Display.pm	2005-01-14 14:42:23 +0100
 @@ -84,7 +84,7 @@
  __template/tt2/display_changed_by.html__
  [% IF self.preferences.display_changed_by.value %]
@@ -39,37 +39,61 @@ Index: Kwiki-0.37/lib/Kwiki/Display.pm
  <em>
  Last changed by [% page.edit_by_link %] at [% page.edit_time %]
  </em>
+Index: Kwiki-0.37/lib/Kwiki/Formatter.pm
+--- Kwiki-0.37/lib/Kwiki/Formatter.pm.orig	2005-01-11 11:16:46 +0100
++++ Kwiki-0.37/lib/Kwiki/Formatter.pm	2005-01-14 14:53:20 +0100
+@@ -322,7 +322,7 @@
+ package Kwiki::Formatter::HyperLink;
+ use base 'Spoon::Formatter::Unit';
+ const formatter_id => 'hyper';
+-our $pattern = qr{\w+:(?://|\?)\S+?(?=[),.:;]?\s|$)};
++our $pattern = qr{(?:\w+:(?://|\?)|http:)\S+?(?=[),.:;]?\s|$)};
+ const pattern_start => qr/$pattern|!$pattern/;
+ 
+ sub html {
+@@ -338,7 +338,7 @@
+ use base 'Spoon::Formatter::Unit';
+ const formatter_id => 'titlehyper';
+ const pattern_start => 
+-  qr{\[(?:\s*([^\]]+)\s+)?(\w+:(?://|\?)[^\]\s]+)(?:\s+([^\]]+)\s*)?\]};
++  qr{\[(?:\s*([^\]]+)\s+)?((?:\w+:(?://|\?)|http:)[^\]\s]+)(?:\s+([^\]]+)\s*)?\]};
+ 
+ sub html {
+     my $text = $self->escape_html($self->matched);
 Index: Kwiki-0.37/lib/Kwiki/Pages.pm
 --- Kwiki-0.37/lib/Kwiki/Pages.pm.orig	2004-12-28 21:54:51 +0100
-+++ Kwiki-0.37/lib/Kwiki/Pages.pm	2005-01-13 23:06:17 +0100
-@@ -287,17 +287,13 @@
++++ Kwiki-0.37/lib/Kwiki/Pages.pm	2005-01-14 14:51:46 +0100
+@@ -287,17 +287,17 @@
  __!database/HomePage__
  === Welcome to Your New Kwiki!
  
 -You have successfully installed a new Kwiki. Now you should /edit this page/ and start adding NewPages. For help on Kwiki syntax and other Kwiki issues, visit http://www.kwiki.org/?KwikiHelpIndex.
-+You have successfully installed a new Kwiki.
-+Now you should /edit this page/ and start adding NewPages.
-+For help on Kwiki syntax see KwikiFormattingRules.
-+For help on other Kwiki issues, visit http://www.kwiki.org/?KwikiHelpIndex.
++You have successfully installed a new [http://en.wikipedia.org/wiki/Wiki Wiki] with [http://www.openpkg.org/ OpenPKG] [http://www.kwiki.org/ Kwiki].
++Now you should [http:?action=edit&page_name=HomePage edit this page]
++and start [http:?action=new_page adding new pages] to this Kwiki.
++Use the [http:admin/ administrator view] for setting the privacy level of your Kwiki pages.
  
 -If this installation looks more mundane than you had expected after visiting Kwiki sites like http://www.kwiki.org, you need to install some *Kwiki plugins*. Some of the basic plugins you might want are:
--
++For help on Kwiki syntax see *KwikiFormattingRules* and try it out in the *KwikiSandbox*.
++For help on /other/ Kwiki issues, visit [http://www.kwiki.org/?KwikiHelpIndex KwikiHelpIndex].
+ 
 -* Kwiki::!RecentChanges
 -* Kwiki::Search
 -* Kwiki::!UserPreferences
 -* Kwiki::!UserName
 -* Kwiki::Archive::Rcs
 -* Kwiki::Revisions
--
--These plugin modules are available on [CPAN http://search.cpan.org/search?query=kwiki&mode=dist]. Visit http://www.kwiki.org/?KwikiPluginInstallation to learn more about installing plugins.
 +If this installation looks more mundane than you had expected after visiting Kwiki
-+sites like http://www.kwiki.org/, you need to active more *Kwiki plugins* in
-+the Kwiki [=plugins] file.
++sites like http://www.kwiki.org/, you need to activate more *Kwiki plugins* in
++the Kwiki "[=plugins]" file.
+ 
+-These plugin modules are available on [CPAN http://search.cpan.org/search?query=kwiki&mode=dist]. Visit http://www.kwiki.org/?KwikiPluginInstallation to learn more about installing plugins.
++--[http://www.kwiki.org/?BrianIngerson Brian Ingerson] (Kwiki author) and the [http://www.openpkg.org/ OpenPKG] team (Kwiki packaging).
  
- --[http://www.kwiki.org/?BrianIngerson Brian Ingerson]
+---[http://www.kwiki.org/?BrianIngerson Brian Ingerson]
 Index: Kwiki-0.37/lib/Kwiki/Theme/Basic.pm
 --- Kwiki-0.37/lib/Kwiki/Theme/Basic.pm.orig	2004-12-02 03:15:06 +0100
-+++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm	2005-01-14 14:42:23 +0100
 @@ -42,6 +42,8 @@
  </h1>
  </div>
@@ -112,7 +136,7 @@ Index: Kwiki-0.37/lib/Kwiki/Theme/Basic.pm
  h1, h2, h3, h4, h5, h6 {
 Index: Kwiki-Diff-0.01/lib/Kwiki/Diff.pm
 --- Kwiki-Diff-0.01/lib/Kwiki/Diff.pm.orig	2004-08-25 18:01:20 +0200
-+++ Kwiki-Diff-0.01/lib/Kwiki/Diff.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-Diff-0.01/lib/Kwiki/Diff.pm	2005-01-14 14:42:23 +0100
 @@ -166,6 +166,11 @@
  <img src="icons/gnome/image/diff.png" alt="Differences" />
  <!-- END diff_button_icon.html -->
@@ -127,7 +151,7 @@ Index: Kwiki-Diff-0.01/lib/Kwiki/Diff.pm
  <a href="[% script_name %]?action=revisions&page_id=[% page_id %]&revision_id=[% revision_id %]" accesskey="r" title="Revision [% revision_id %]">
 Index: Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm
 --- Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm.orig	2005-01-11 17:03:22 +0100
-+++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm	2005-01-14 14:42:23 +0100
 @@ -111,7 +111,7 @@
  }
  </script>
@@ -139,7 +163,7 @@ Index: Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm
  </form>
 Index: Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm
 --- Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm.orig	2004-09-01 02:11:53 +0200
-+++ Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm	2005-01-14 14:42:23 +0100
 @@ -58,7 +58,7 @@
  	$msg->print(\*TEMPFILE);
  	close TEMPFILE;
@@ -151,7 +175,7 @@ Index: Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm
  
 Index: Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
 --- Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm.orig	2004-12-11 22:50:42 +0100
-+++ Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm	2005-01-14 14:42:23 +0100
 @@ -312,6 +312,7 @@
  rss_skipHours:
  rss_skipDays:
@@ -171,7 +195,7 @@ Index: Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
  eNpjdDdgQAX/Gd9+QBP6w8SAAYBC/1YzcBdYr2eYvYG7ACTEAhQ98JVb9vRvBoG/DD+gqhga2Jmd
 Index: Kwiki-Search-0.12/lib/Kwiki/Search.pm
 --- Kwiki-Search-0.12/lib/Kwiki/Search.pm.orig	2004-12-16 00:38:12 +0100
-+++ Kwiki-Search-0.12/lib/Kwiki/Search.pm	2005-01-13 23:01:53 +0100
++++ Kwiki-Search-0.12/lib/Kwiki/Search.pm	2005-01-14 14:42:23 +0100
 @@ -72,7 +72,7 @@
  
  =cut

kwiki/kwiki.spec

@@ -90,7 +90,7 @@ Class:        EVAL
 Group:        Web
 License:      GPL/Artistic
 Version:      %{V_kwiki}
-Release:      20050113
+Release:      20050114
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{V_spoon}.tar.gz
@@ -150,6 +150,7 @@ Source53:     http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ForeignLinkGlyph
 Source100:    kwiki-apache.conf
 Source101:    kwiki-plugins.txt
 Source102:    kwiki-rules.wiki
+Source103:    kwiki-sandbox.wiki
 Patch0:       kwiki.patch
 
 #   build information
@@ -580,7 +581,7 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/share/kwiki
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
-        %{SOURCE kwiki-plugins.txt} %{SOURCE kwiki-rules.wiki} \
+        %{SOURCE kwiki-plugins.txt} %{SOURCE kwiki-rules.wiki} %{SOURCE kwiki-sandbox.wiki} \
         $RPM_BUILD_ROOT%{l_prefix}/share/kwiki/
 
     #   install Kwiki state directory
@@ -617,10 +618,14 @@ AutoReqProv:  no
              $RPM_INSTALL_PREFIX/var/kwiki/plugins
           cp $RPM_INSTALL_PREFIX/share/kwiki/kwiki-rules.wiki \
              $RPM_INSTALL_PREFIX/var/kwiki/database/KwikiFormattingRules
+          cp $RPM_INSTALL_PREFIX/share/kwiki/kwiki-sandbox.wiki \
+             $RPM_INSTALL_PREFIX/var/kwiki/database/KwikiSandbox
           echo "++ Generating administrator view of Kwiki in $RPM_INSTALL_PREFIX/var/kwiki/admin/"
           $RPM_INSTALL_PREFIX/bin/kwiki -quiet -new_view admin
           ( echo "+Kwiki::PagePrivacy"
           ) >>admin/plugins
+          ( echo "privacy_group: admin"
+          ) >admin/config2.yaml
           $RPM_INSTALL_PREFIX/bin/htpasswd -b -c admin/passwd admin admin
           echo "++ Finalizing Kwiki in $RPM_INSTALL_PREFIX/var/kwiki/"
           $RPM_INSTALL_PREFIX/bin/kwiki-update