[Fusionforge-commits] r13372 - in branches/Branch_5_1/src/plugins/wiki/www: locale locale/de/pgsrc locale/it/pgsrc locale/sv/pgsrc themes/fusionforge/templates

Marc-Etienne VARGENAU vargenau at fusionforge.org
Thu May 19 08:48:48 CEST 2011


Author: vargenau
Date: 2011-05-19 08:48:42 +0200 (Thu, 19 May 2011)
New Revision: 13372

Removed:
   branches/Branch_5_1/src/plugins/wiki/www/locale/cvt-utf8.sh
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FWikiPlugin
   branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/UserPreferences
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/BraStil
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/WabiSabi
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl
Log:
Merge from trunk

Deleted: branches/Branch_5_1/src/plugins/wiki/www/locale/cvt-utf8.sh
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/cvt-utf8.sh	2011-05-19 06:45:41 UTC (rev 13371)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/cvt-utf8.sh	2011-05-19 06:48:42 UTC (rev 13372)
@@ -1,46 +0,0 @@
-#! /bin/sh
-
-# convert all locales to utf-8
-for po in po/??.po; do
-  to="`echo $po|sed -e's/\.po/.utf8.po/'`"
-  from=iso-8859-1
-  if [ "$po" = "po/ja.po" ]; then from=utf-8; fi
-  if [ "$po" = "po/zh.po" ]
-  then 
-    from=utf-8
-  else
-    iconv -f $from -t utf-8 $po > $to
-    mv $po $po.$from
-    perl -pi -e"s/charset=$from/charset=utf-8/" $to
-    mv $to $po
-  fi
-done
-
-for po in ??; do
-  to="$po.utf8"
-  from=iso-8859-1
-  if [ "$po" = "ja" ]; then from=utf-8; fi
-  if [ "$po" = "zh" ]
-  then 
-    from=utf-8
-  else
-    if [ "$po" != "po" ]; then
-	cp -Ru $po $to
-	for pgsrc in $to/pgsrc/*; do
-	    case "$pgsrc" in
-	    $to/pgsrc/CVS) ;;
-	    $to/pgsrc/*.bak) ;;
-	    *)  iconv -f $from -t utf-8 $pgsrc > .tmp && mv .tmp $pgsrc
-		perl -pi.bak -e"s/charset=$from/charset=utf-8/" $pgsrc
-		;;
-	    esac
-	done
-	iconv -f $from -t utf-8 $to/LC_MESSAGES/phpwiki.php > .tmp && mv .tmp $to/LC_MESSAGES/phpwiki.php
-	mv $po "$po.$from"
-	mv $to $po
-    fi
-  fi
-done
-
-make depend
-make

Deleted: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FWikiPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FWikiPlugin	2011-05-19 06:45:41 UTC (rev 13371)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FWikiPlugin	2011-05-19 06:48:42 UTC (rev 13372)
@@ -1,182 +0,0 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Hilfe%2FWikiPlugin 7682 2010-09-10 12:03:36Z vargenau $
-Content-Type: application/x-phpwiki;
-  pagename=Hilfe%2FWikiPlugin;
-  flags="";
-  markup=2;
-  charset=utf-8
-Content-Transfer-Encoding: binary
-Since PhpWiki-1.3.3 support for ~WikiPlugins is included.
-
-A plugin is some PHP code that
-
-* lives in =phpwiki/lib/plugin/<pluginname>.php=
-* implements the ~WikiPlugin interface by extending that class.
-
-There are many plugins already distributed with PhpWiki. Simply look in the =lib/plugin=
-directory or see the PluginManager list.
-
-To write your own, look at the HelloWorldPlugin (~HelloWorld.php in that directory), 
-which is a minimal example of a plugin.
-Publish your self-written plugin at a new PhpWiki page with ~PluginName + *Plugin* appended 
-and add a link to [CategoryContributedPlugin | PhpWiki:CategoryContributedPlugin].
-
-A Help:WikiPlugin allows one to easily add new types of dynamic content 
-(as well as other functionality) to wiki pages within PhpWiki.
-In this very wiki all actions which are not entirely lowercased
-are implemented using plugins, and some lowercased convenience actions also. (rename, revert, setacl, diff, ...)
-
-(The old-style  Help:MagicPhpWikiURLs have been replaced by plugins entirely.)
-
-== Example
-
-Currently, one invokes a plugin by putting something like:
-
-{{{
-<<AllPages limit=5>>
-}}}
-
-into a regular wiki-page.  That particular example produces a list of
-the first 5 existing pages (via the ~PageList library).
-
-<<AllPages limit=5 >>
-
-== Details
-
-Plugins can take certain named arguments (most do).  The values of
-these arguments can be determined four different ways.  In order of
-precedence:
-
-# The plugin invocation can specify the value for an argument, like so:
-  {{{
-  <<BackLinks page=OtherPage >>
-  }}}
-
-# The argument can be specified via an HTTP query argument.  This
-  doesn't happen (is not allowed) unless the argument is mentioned in
-  the plugin invocation:
-
-  {{{
-  <<BackLinks page >>
-  }}}
-
-# Default values specified in the plugin invocation:
-
-  {{{
-  <<BackLinks page||=OtherPage >>
-  }}}
-
-# The plugin must supply default values for each argument it uses.
-  Such default args may be overriden by URL arguments like so: 
-  {{{
-    BackLinks?page=ThisPage&sortby=-mtime
-  }}}
-  (The BackLinks plugin uses the current page as the default value for
-  the ''page'' argument.)
-
-  Most plugins using the ~PageListLibrary inherit their default arguments 
-  from the PhpWiki:PageListLibrary.
-
-=== Standard Arguments
-
-Most plugins display a list of pages, via the ~PageListLibrary.
-~PageList provides automatic support for those arguments.
-
-  info, exclude, author, owner, creator, sortby, limit, paging, cols, azhead,
-  comma, commasep, ordered
-
-  For details see the PhpWiki:PageListLibrary documentation.
-
-*exclude* and *pages* accept a list of pages. Either as comma-seperated list,
-supporting glob-style wildcards, or via the <tt><!plugin-list pluginname ~[args~] !></tt>
-invocation syntax, where pluginname might be any plugin returning a pagelist.
-See PhpWiki:PluginList.
-
-=== Basic Plugin Types
-
-All these plugins derive from the Help:WikiPlugin class extending the run method,
-which returns a object tree of HTML objects, and may react on any
-provided arguments from the ~WikiPage (see the args below) or
-optionally overridden by arguments from the url (GET or POST args), 
-if defined via '||='.
-
-A basic plugin just needs the run() method, and optionally getName, 
-getDescription, getDefaultArguments. See the Help:HelloWorldPlugin for a short introduction.
-
-  *plugin* reacts on its arguments and the request and displays arbitrary HTML.
-
-  *plugin-form* is used to display a input type=text box for the default argument *s*.
-
-  *plugin-list* is used as argument to provide a dynamic list of pagenames.
-
-  {{{
-    <<PluginName  Help:s ...] >>
-  }}}
-
-  {{{
-    <?plugin-form PluginName  Help:s ...] ?>
-  }}}
-
-  {{{
-    <<PluginName args=<!plugin-list pluginname  Help:s ] !> >>
-  }}}
-
-==== The box Method
-
-Themes based on the "sidebar" theme may use the box method of any plugin, which displays a *title* 
-and a condensed *content* in a box.
-
-==== ~WikiPluginCached
-
-Plugins deriving from the class ~WikiPluginCached must also define the methods getPluginType(), 
-optionally getExpire(), managesValidators(), and dependent of the getPluginType the methods 
-to display the *possibly cached* result.
-
-  getImage(), getMap() or getHtml(), 
-
-optionally also
-
-  getAlt(), getImageType(), embedMap(), embedImg(), embedObject()
-
-See the config.ini PLUGIN_CACHED_* settings and PhpWiki:WikiPluginCached
-
-=== Aktions Seiten
-
-The term *~ActionPage* refers to a page containing a plugin invocation.
-An *action* is together with the *pagename* argument the a basic PhpWiki argument. 
-It can both be GET or POST actions. Actions are untranslated, always english. 
-Basic (and old) actions are all lowercase, like edit, browse, remove, ...
-Newer actions in PhpWiki:CamelCase are invoked via plugins on their specific action page.
-
-We decoupled actions from plugins via action pages for the following reasons:
-
-# support translated action buttons and customizable action descriptions. 
-# customize standard actions by tuning the plugin invocation arguments. override or add plugin defaults.
-# split simple plugins into multiple actions, like RecentChanges/RecentEdits, MostPopular/LeastPopular, 
-  AllPages/AllPagesCreatedByMe/AllPagesLastEditedByMe/AllPagesOwnedByMe which differ only in one argument.
-
-* Those actions which have buttons or links in the theme or are referenced in the standard pgsrc 
-  pageset require their (possibly localized) actionpages, otherwise the actions will not work.
-* If the localized actionpage is not found the english version is used.
-* If no actionpage is found, it is recommended to do action=upgrade, which imports all missing 
-  and required action pages into the database.
-
-So for a hypothetical new ~MyActionPage plugin ~MyActionPage will invoke the plugin and 
-~MyActionPagePlugin is the the description.
-
-== Existing Plugins
-
-See PluginManager for a detailed list. Most plugins should have their own description page with the name 
-*Plugin* appended.
-
-<<BackLinks noheader=1 >>
-
-== Contributed Plugins 
-
-See PhpWiki:CategoryContributedPlugin.
-
-<<Backlinks page=CategoryContributedPlugin >>
-
------
-[[PhpWikiDokumentation]]

Deleted: branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/UserPreferences
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/UserPreferences	2011-05-19 06:45:41 UTC (rev 13371)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/UserPreferences	2011-05-19 06:48:42 UTC (rev 13372)
@@ -1,12 +0,0 @@
-Date: Fri, 10 Sep 2010 13:48:47 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: UserPreferences 7682 2010-09-10 12:03:36Z vargenau $
-Content-Type: application/x-phpwiki;
-  pagename=UserPreferences;
-  flags=PAGE_LOCKED;
-  charset=utf-8
-Content-Transfer-Encoding: binary
-
-You can now set some user preferences. The values of these preferences are currently stored in a cookie (so you must have cookies enabled to use this feature.)
-
-<<UserPreferences>>

Deleted: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/BraStil
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/BraStil	2011-05-19 06:45:41 UTC (rev 13371)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/BraStil	2011-05-19 06:48:42 UTC (rev 13372)
@@ -1,22 +0,0 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: BraStil 7682 2010-09-10 12:03:36Z vargenau $
-Content-Type: application/x-phpwiki;
-  pagename=BraStil;
-  flags="";
-  charset=utf-8
-Content-Transfer-Encoding: binary
-
-"Young writers often suppose that style is a garnish for the meat of 
-prose, a sauce by which a dull dish is made palatable. Style has no such 
-separate entity; it is nondetachable, unfilterable. The beginner should 
-approach style warily, realizing that it is himself he is approaching, no 
-other; and he should begin by turning resolutely away from all devices 
-that are popularly believed to indicate style--all mannerisms, tricks, 
-adornments. The approach to style is by way of plainness, simplicity, 
-orderliness, sincerity." 
-
---Strunk och White, "The Elements of Style"
-
-''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
---scummings

Deleted: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/WabiSabi
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/WabiSabi	2011-05-19 06:45:41 UTC (rev 13371)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/WabiSabi	2011-05-19 06:48:42 UTC (rev 13372)
@@ -1,35 +0,0 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: WabiSabi 7682 2010-09-10 12:03:36Z vargenau $
-Content-Type: application/x-phpwiki;
-  pagename=WabiSabi;
-  flags="";
-  charset=utf-8
-Content-Transfer-Encoding: binary
-
-Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it ''"occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."''
-
-Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
-
-It is the beauty of things modest and humble.
-
-It is the beauty of things unconventional.
-
-The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes ''"direct, intuitive insight into transcendental truth beyond all intellectual conception."'' At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
-
-* All things are impermanent
-* All things are imperfect
-* All things are incomplete 
-
-Material characteristics of wabi-sabi:
-
-* suggestion of natural process
-* irregular
-* intimate
-* unpretentious
-* earthy
-* simple
-
-For more about wabi-sabi, see
-http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm
-

Deleted: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl	2011-05-19 06:45:41 UTC (rev 13371)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl	2011-05-19 06:48:42 UTC (rev 13372)
@@ -1,32 +0,0 @@
-<?php // -*-php-*-
-// $Id: pagelink.tmpl 7720 2010-10-22 18:38:33Z vargenau $
-
-/**
- * Themable paging "|<< <<   - i/sum - >> >>|" links
- *
- * Variables: PREV, NEXT, PREV_LINK, NEXT_LINK,
- * COUNT, OFFSET, SIZE
- * More ideas: FIRST, LAST, ...
- */
-if ($WikiTheme->DUMP_MODE) {
-  $PREV = false;
-  $NEXT = false;
-}
-?>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"> </td></tr>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"><table style="border-width: 1px; border-style: solid; border-color: black; font-weight: bold;" width="100%"><tr class="wikipaging">
-  <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
-      <?php echo $PREV ?  HTML::a(array('href'=>$FIRST_LINK),_("|<<")) : _("|<<") ?>
-       
-      <?php echo $PREV ?  HTML::a(array('href'=>$PREV_LINK),_("<< Prev")) : _("<<") ?>
-  </td>
-  <td class="wikipaging-enabled" align="center">
-      <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
-  </td>
-  <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
-      <?php echo $NEXT ?  HTML::a(array('href'=>$NEXT_LINK),_("Next >>"))  : _(">>") ?>
-       
-      <?php echo $NEXT ?  HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
-  </td>
-</tr></table></td></tr>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"> </td></tr>




More information about the Fusionforge-commits mailing list