[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. 4ec2f9acb859017b63ee4df59d993a4cdd8b03f4

[Stefan Hornburg]

       via  4ec2f9acb859017b63ee4df59d993a4cdd8b03f4 (commit)
       via  8b060de36b352446b98ff8cc94b17829094ce730 (commit)
       via  03c5d5e73ddfd315654e310a85d028e8a5bde1ad (commit)
       via  47e4081a992098e3168db48b48458e0886276541 (commit)
      from  cc928ff37d6b99a84ae18e06cbffa2f7115f4eb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ec2f9acb859017b63ee4df59d993a4cdd8b03f4
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Fri Feb 19 17:47:57 2010 +0100

    provide support for various actions, automatically set Wiki attributes (name and page)

commit 8b060de36b352446b98ff8cc94b17829094ce730
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Fri Feb 19 17:43:29 2010 +0100

    added component to display recent changes

commit 03c5d5e73ddfd315654e310a85d028e8a5bde1ad
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Fri Feb 19 17:41:15 2010 +0100

    add menu configuration

commit 47e4081a992098e3168db48b48458e0886276541
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Fri Feb 19 17:37:53 2010 +0100

    added menu, removed debug texts

-----------------------------------------------------------------------

Summary of changes and diff:
 plugins/wiki/components/wiki                |   17 ++-----------
 plugins/wiki/components/wiki_recent_changes |   33 +++++++++++++++++++++++++++
 plugins/wiki/pages/wiki.itl                 |   24 +++++++++++++++----
 plugins/wiki/plugin.cfg                     |    4 ++-
 4 files changed, 58 insertions(+), 20 deletions(-)
 create mode 100644 plugins/wiki/components/wiki_recent_changes
 mode change 100644 => 100755 plugins/wiki/plugin.cfg

diff --git a/plugins/wiki/components/wiki b/plugins/wiki/components/wiki
index 57f2b0e..99cb79b 100644
--- a/plugins/wiki/components/wiki
+++ b/plugins/wiki/components/wiki
@@ -1,11 +1,5 @@
-<p>
-ACTION [cgi action]
-<br>
-PAGE [either][cgi page][or]__PAGE__[/either]
-</p>
 [if cgi action eq create]
 [if cgi content]
-CREATING
 [wiki name="__NAME__" function="create_page" page="[cgi page]" content=`$CGI->{content}`/]
 [/if]
 <form action="[area href="wiki" nosession=1]" method="POST">
@@ -29,6 +23,7 @@ CREATING
 [elsif cgi action eq edit]
 [if cgi checksum]
 [wiki name="__NAME__" function="modify" page="__PAGE__" content=`$CGI->{content}` checksum="[cgi checksum]"/]
+[wiki name="__NAME__" function="display" page="__PAGE__"]
 [else]
 [wiki name="__NAME__" function="display" page="__PAGE__"]
 <form action="[area href="wiki/__PAGE__" nosession=1]" method="POST">
@@ -72,14 +67,8 @@ CREATING
 </p>
 <p>
 [wiki name="__NAME__" function="display" page="__PAGE__"/]
-</p>
-<p>
-<a href="[area href="wiki/__PAGE__" form=action=edit]">Edit page</a>
-</p>
-<p>
-[wiki name="__NAME__" function="list"]
-<a href="[area href="wiki/{PAGE}"]">{PAGE}</a><br>
-[/wiki]
+<hr>
+[wiki name="__NAME__" function="menu" menu_name="footer" page="__PAGE__"/]
 </p>
 [/else]
 [/if]
diff --git a/plugins/wiki/components/wiki_recent_changes b/plugins/wiki/components/wiki_recent_changes
new file mode 100644
index 0000000..367e4a0
--- /dev/null
+++ b/plugins/wiki/components/wiki_recent_changes
@@ -0,0 +1,33 @@
+<h2>[L]Recent Changes[/L]</h2>
+
+[wiki name="__NAME__" function="recent_changes"]
+[on-match]
+<table>
+[/on-match]
+[list]
+[item-change date][condition][item-param date][/condition]
+<tr class="rcdaybreak"><td colspan="6">[item-param date]</td></tr>
+[/item-change date]
+<tr>
+<td class="rcicon1">
+<a href="[area href="wiki" form="action=diff
+page=[item-param name]
+version=[item-param version]"]"><img src="style/wiki/wiki-diff.png"></a>
+</td>
+<td class="rcpagelink">
+<a href="[area href="wiki" form="page=[item-param name]"]">[item-param name]</a>
+</td>
+<td class="rctime">[item-param time]</td>
+<td class="rcicon2">
+</td>
+<td class="rceditor">
+[item-param uid]
+</td>
+<td class="rccomment">
+</td>
+</tr>
+[/list]
+[on-match]
+</table>
+[/on-match]
+[/wiki]
\ No newline at end of file
diff --git a/plugins/wiki/pages/wiki.itl b/plugins/wiki/pages/wiki.itl
index dac13d4..d624c9a 100644
--- a/plugins/wiki/pages/wiki.itl
+++ b/plugins/wiki/pages/wiki.itl
@@ -1,6 +1,20 @@
-[compose
-	components.body="wiki"
+[if cgi action eq recent_changes]
+[tmpn main]wiki_recentchanges[/tmpn]
+[elsif cgi action eq create]
+[tmpn main]wiki[/tmpn]
+[/elsif]
+[elsif cgi action eq edit]
+[tmpn main]wiki[/tmpn]
+[/elsif]
+[else]
+[tmpn main]wiki[/tmpn]
+[/else]
+[/if]
+
+[attribute function="set" component="[scratch main]" name="name" value="[cgi name]" hide=1]
+[attribute function="set" component="[scratch main]" name="page" value="[cgi page]" hide=1]
 
-	attributes.wiki.name="[cgi name]"
-	attributes.wiki.page="[cgi page]"
-]
\ No newline at end of file
+[compose
+	components.body="[scratch main]"
+	components.right="[scratch extra]"
+]
diff --git a/plugins/wiki/plugin.cfg b/plugins/wiki/plugin.cfg
old mode 100644
new mode 100755
index b312815..c770b05
--- a/plugins/wiki/plugin.cfg
+++ b/plugins/wiki/plugin.cfg
@@ -6,4 +6,6 @@ include plugins/default.cfg
 Wiki wiki backend sqlite
 Wiki wiki dbname  database/wiki.db
 
-ActionMap wiki wiki
\ No newline at end of file
+Wiki wiki menu footer home,edit_page,recent_changes
+
+ActionMap wiki wiki


hooks/post-receive
-- 
Interchange wellwell catalog