From 71ea2622d4115039d8f121a6595d6a005866f4c3 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Fri, 7 Oct 2005 07:49:29 +0000 Subject: [PATCH] should have wiki ready ... but does not work atm git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@76 839d8a87-29fc-0310-9880-83ba4fa771e5 --- Makefile | 11 +++++++--- install.d/wiki/wiki.d/Site.EditForm | 12 +++++++++++ install.d/wiki/wiki.d/Site.GroupAttributes | 9 ++++++++ install.d/wiki/wiki.d/Site.PageActions | 33 ++++++++++++++++++++++++++++++ install.d/wiki/wiki.d/Site.Preferences | 12 +++++++++++ plugins/pmwiki.config.php | 4 ++-- 6 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 install.d/wiki/wiki.d/Site.EditForm create mode 100644 install.d/wiki/wiki.d/Site.GroupAttributes create mode 100644 install.d/wiki/wiki.d/Site.PageActions create mode 100644 install.d/wiki/wiki.d/Site.Preferences diff --git a/Makefile b/Makefile index 527e6e5..1fa5447 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ clean: ################################################################################ # targets -templates_c uploads: +templates_c uploads wiki.d:: mkdir -p $@ chmod o+w $@ @@ -52,10 +52,15 @@ wiki/local/pmwiki.config.php: wiki/pub/skins/empty: cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty -wiki: uploads htdocs/uploads htdocs/wikipub wiki/local/pmwiki.config.php wiki/pub/skins/empty +wiki: build-wiki uploads htdocs/uploads htdocs/wikipub @test -d wiki || wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz +wiki.d:: + cd $@ && ln -s ../install.d/wiki/wiki.d/* . + +build-wiki: wiki/local/pmwiki.config.php wiki/pub/skins/empty wiki.d + ################################################################################ -.PHONY: build dist clean wiki +.PHONY: build dist clean wiki build-wiki diff --git a/install.d/wiki/wiki.d/Site.EditForm b/install.d/wiki/wiki.d/Site.EditForm new file mode 100644 index 0000000..a2fa0cf --- /dev/null +++ b/install.d/wiki/wiki.d/Site.EditForm @@ -0,0 +1,12 @@ +version=pmwiki-2.0.6 ordered=1 urlencoded=1 +agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; fr-FR; rv:1.7.10) Gecko/20050717 Firefox/1.0.6 +author=pascal.corpet.2001|Pascal CORPET +host=69.109.203.119 +name=Site.EditForm +rev=47 +targets=PmWiki.BasicEditing,PmWiki.TextFormattingRules,PmWiki.DocumentationIndex,PmWiki.SimpleTables,PmWiki.AdvancedTables +text=!!$[Editing `{$FullName}] %25block class=wikiaction%25%0a(:messages:)%0a(:div id='wikiedit':)%0a(:input e_form:)[[#top]](:e_guibuttons:)\\%0a(:input e_textarea:)\\%0a$[Summary]: (:input e_changesummary:)\\%0a(:input e_minorcheckbox:) $[This is a minor edit]\\%0a(:input e_savebutton:) (:input e_saveeditbutton:) (:input e_previewbutton:) (:input e_cancelbutton:)%0a(:input end:)%0a(:divend:)%0a(:include $[{$SiteGroup}/EditQuickReference]:)%0a(:if e_preview:)%0a!!$[Preview `{$FullName}]%0a'''$[Page is unsaved]'''%0a(:e_preview:)%0a----%0a'''$[End of preview -- remember to save]'''\\%0a[[#top | $[Top] ]]%0a(:if:)%0a +time=1127791699 +author:1127791699=pascal.corpet.2001|Pascal CORPET +diff:1127791699:1123765861:=7c7%0a%3c (:input e_minorcheckbox:) $[This is a minor edit]\\%0a---%0a> $[Author]: (:input e_author:) (:input e_minorcheckbox:) $[This is a minor edit]\\%0a +host:1127791699=69.109.203.119 diff --git a/install.d/wiki/wiki.d/Site.GroupAttributes b/install.d/wiki/wiki.d/Site.GroupAttributes new file mode 100644 index 0000000..7dcda00 --- /dev/null +++ b/install.d/wiki/wiki.d/Site.GroupAttributes @@ -0,0 +1,9 @@ +version=pmwiki-2.0.6 ordered=1 urlencoded=1 +agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; fr-FR; rv:1.7.12) Gecko/20050919 Firefox/1.0.7 +host=69.109.203.119 +name=Site.GroupAttributes +passwdattr=* +passwdedit=* +passwdread=true: +rev=1 +time=1127979477 diff --git a/install.d/wiki/wiki.d/Site.PageActions b/install.d/wiki/wiki.d/Site.PageActions new file mode 100644 index 0000000..358baa2 --- /dev/null +++ b/install.d/wiki/wiki.d/Site.PageActions @@ -0,0 +1,33 @@ +version=pmwiki-2.0.6 ordered=1 urlencoded=1 +agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; fr-FR; rv:1.7.12) Gecko/20050919 Firefox/1.0.7 +author=pascal.corpet.2001|Pascal CORPET +host=69.109.203.119 +name=Site.PageActions +rev=27 +targets=Site.PageActions,Site.GroupAttributes +text=(:if canedit:)%0a>>frame float=right padding=10px margin=5px%3c%3c%0a[[{$FullName} | Voir la page ]]\\%0a[[{$FullName}?action=edit | Éditer ]]\\%0a[[{$FullName}?action=diff | Historique ]]\\%0a[[{$FullName}?action=upload | Upload ]]\\%0a(:if canattr:)%0a[[{$FullName}?action=attr | Droits ]]\\%0a[[{$Group}/GroupAttributes?action=attr | Droits du groupe]]\\%0a(:if canedit:)%0a>>%3c%3c%0a(:if:)%0a +time=1127980549 +author:1127980549=pascal.corpet.2001|Pascal CORPET +diff:1127980549:1127980528:=6c6%0a%3c [[{$FullName}?action=upload | Upload ]]\\%0a---%0a> [[{$FullName}?action=upload | Upload ]]%0a9c9%0a%3c [[{$Group}/GroupAttributes?action=attr | Droits du groupe]]\\%0a---%0a> [[{$Group}/GroupAttributes?action=attr | Droits du groupe]]%0a +host:1127980549=69.109.203.119 +author:1127980528=pascal.corpet.2001|Pascal CORPET +diff:1127980528:1127980420:=6a7%0a> >>%3c%3c%0a7a9%0a> >>frame float=right padding=10px margin=5px%3c%3c%0a10d11%0a%3c (:if canedit:)%0a +host:1127980528=69.109.203.119 +author:1127980420=pascal.corpet.2001|Pascal CORPET +diff:1127980420:1127788982:=8,12d7%0a%3c (:if canattr:)%0a%3c >>frame float=right padding=10px margin=5px%3c%3c%0a%3c [[{$FullName}?action=attr | Droits ]]\\%0a%3c [[{$Group}/GroupAttributes?action=attr | Droits du groupe]]%0a%3c >>%3c%3c%0a +host:1127980420=69.109.203.119 +author:1127788982=pascal.corpet.2001|Pascal CORPET +diff:1127788982:1127788477:=1c1%0a%3c (:if canedit:)%0a---%0a> (:if has_perms:)%0a +host:1127788982=69.109.203.119 +author:1127788477=pascal.corpet.2001|Pascal CORPET +diff:1127788477:1127788337:=2,6c2,6%0a%3c >>frame float=right padding=10px margin=5px%3c%3c%0a%3c [[{$FullName} | Voir la page ]]\\%0a%3c [[{$FullName}?action=edit | Éditer ]]\\%0a%3c [[{$FullName}?action=diff | Historique ]]\\%0a%3c [[{$FullName}?action=upload | Upload ]]%0a---%0a> >>frame float=right padding=10px%3c%3c%0a> [[{$FullName} | Voir la page ]]%0a> [[{$FullName}?action=edit | Éditer ]]%0a> [[{$FullName}?action=diff | Historique ]]%0a> [[{$FullName}?action=upload | Upload ]]%0a +host:1127788477=69.109.203.119 +author:1127788337=pascal.corpet.2001|Pascal CORPET +diff:1127788337:1127787859:=2,6c2,6%0a%3c >>frame float=right padding=10px%3c%3c%0a%3c [[{$FullName} | Voir la page ]]%0a%3c [[{$FullName}?action=edit | Éditer ]]%0a%3c [[{$FullName}?action=diff | Historique ]]%0a%3c [[{$FullName}?action=upload | Upload ]]%0a---%0a> >>rfloat%3c%3c%0a> *[[{$FullName}?action=edit | Voir la page ]]%0a> *[[{$FullName}?action=edit | Éditer ]]%0a> *[[{$FullName}?action=diff | Historique ]]%0a> *[[{$FullName}?action=upload | Upload ]]%0a +host:1127788337=69.109.203.119 +author:1127787859=pascal.corpet.2001|Pascal CORPET +diff:1127787859:1127787249:=1,7c1,4%0a%3c (:if has_perms:)%0a%3c >>rfloat%3c%3c%0a%3c *[[{$FullName}?action=edit | Voir la page ]]%0a%3c *[[{$FullName}?action=edit | Éditer ]]%0a%3c *[[{$FullName}?action=diff | Historique ]]%0a%3c *[[{$FullName}?action=upload | Upload ]]%0a%3c >>%3c%3c%0a---%0a> [[{$FullName}?action=edit | Éditer ]]%0a> [[{$FullName}?action=diff | Historique ]]%0a> (:if auth upload:)%0a> [[{$FullName}?action=upload | Upload ]]%0a +host:1127787859=69.109.203.119 +author:1127787249=pascal.corpet.2001|Pascal CORPET +diff:1127787249:1125680670:=1,2c1,3%0a%3c [[{$FullName}?action=edit | Éditer ]]%0a%3c [[{$FullName}?action=diff | Historique ]]%0a---%0a> * %25item class=browse accesskey=$[ak_view]%25[[{$FullName} | $[View] ]]%0a> * %25item class=edit accesskey=$[ak_edit]%25[[{$FullName}?action=edit | $[Edit] ]]%0a> * %25item class=diff accesskey=$[ak_history]%25[[{$FullName}?action=diff | $[History] ]]%0a4c5%0a%3c [[{$FullName}?action=upload | Upload ]]%0a---%0a> * %25item class=upload accesskey=$[ak_attach]%25[[{$FullName}?action=upload | $[Attach] ]]%0a5a7%0a> * %25item class=print accesskey=$[ak_print]%25[[{$FullName}?action=print | $[Print] ]]%0a\ No newline at end of file%0a +host:1127787249=69.109.203.119 diff --git a/install.d/wiki/wiki.d/Site.Preferences b/install.d/wiki/wiki.d/Site.Preferences new file mode 100644 index 0000000..b4835f2 --- /dev/null +++ b/install.d/wiki/wiki.d/Site.Preferences @@ -0,0 +1,12 @@ +version=pmwiki-2.0.6 ordered=1 urlencoded=1 +agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; fr-FR; rv:1.7.12) Gecko/20050919 Firefox/1.0.7 +author=pascal.corpet.2001|Pascal CORPET +host=69.109.203.119 +name=Site.Preferences +rev=22 +targets=PmWiki.AccessKeys,Site.Preferences,PmWiki.PmWiki +text=These define various default site preferences, including [[PmWiki/access keys]] and component sizes.%0a%0a [=%0a # Access keys - hold Alt (Windows) or Control (Mac) and %0a # tap the indicated key on your keyboard to trigger the %0a # corresponding action.%0a 'ak_edit' => 'e', # edit page%0a 'ak_history' => 'h', # page history%0a 'ak_recentchanges' => 'c', # Recent Changes%0a 'ak_save' => 's', # save page%0a 'ak_saveedit' => 'u', # save and keep editing%0a 'ak_preview' => 'p', # preview page%0a 'ak_em' => 'i', # emphasized text (italic)%0a 'ak_strong' => 'b', # strong text (bold)%0a%0a # Editing components%0a 'e_rows' => '20', # rows in edit textarea%0a 'e_cols' => '90', # columns in edit textarea%0a 'Site.EditForm' => 'Site.EditForm' # location of EditForm%0a =]%0a%0aIf you'd like to customize these preferences, to create personal user (browser) preferences, make a copy of this page somewhere, preferably as @@Profiles.''%25green%25insert your name here%25%25''-Preferences@@, edit that page with your new preferred settings,%0aand then select [[{$FullName}?setprefs={$FullName} | Set Preferences of this Page]] on the page containing your newly created settings. %0aThis sets a cookie on your browser which tells PmWiki where to find your personal preference settings.%0a%0aTo unset this cookie and revert to PmWiki's default preferences,%0aselect [[{$Name}?setprefs=| Revert to PmWiki Default Preferences]].%0a%0aSee also [[Cookbook:UserConfigurations]] about how to customise the edit form for personal use.%0a%0a +time=1127888649 +author:1127888649=pascal.corpet.2001|Pascal CORPET +diff:1127888649:1125513250:minor=18c18%0a%3c 'e_cols' => '90', # columns in edit textarea%0a---%0a> 'e_cols' => '70', # columns in edit textarea%0a +host:1127888649=69.109.203.119 diff --git a/plugins/pmwiki.config.php b/plugins/pmwiki.config.php index 9a2d5c8..eaa630e 100644 --- a/plugins/pmwiki.config.php +++ b/plugins/pmwiki.config.php @@ -13,8 +13,8 @@ ## $PubDirUrl is the URL for the pub directory. $ScriptUrl = $globals->baseurl; $UploadUrlFmt = $ScriptUrl."/uploads"; -$WorkDir = '../wiki/wiki.d'; -$WikiDir = new PageStore('$FarmD/wiki.d/$FullName'); +$WorkDir = '../wiki.d'; +$WikiDir = new PageStore('$FarmD/../wiki.d/$FullName'); $PubDirUrl = $globals->baseurl.'/pubwiki'; $InterMapFiles[] = $globals->spoolroot.'plugins/pmwiki.intermap.txt'; -- 2.1.4