Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2013-06-13 15:41:59
|
Revision: 8801
http://sourceforge.net/p/phpwiki/code/8801
Author: vargenau
Date: 2013-06-13 15:41:56 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
No %s in plugin description
Modified Paths:
--------------
trunk/lib/plugin/IncludeSiteMap.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.php
Modified: trunk/lib/plugin/IncludeSiteMap.php
===================================================================
--- trunk/lib/plugin/IncludeSiteMap.php 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/lib/plugin/IncludeSiteMap.php 2013-06-13 15:41:56 UTC (rev 8801)
@@ -50,8 +50,7 @@
{
function getDescription()
{
- return sprintf(_("Include recursively all linked pages starting at %s."),
- $this->_pagename);
+ return _("Include recursively all linked pages starting at [pagename].");
}
function getDefaultArguments()
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-13 15:41:56 UTC (rev 8801)
@@ -494,7 +494,7 @@
$locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Insgesamt sind %d Benutzersessions online. :: %d verschiedene Registrierte und %d Gäste";
$locale["Include an external web page within the body of a wiki page."] = "Einbetten einer externen Webseite im Body dieser Wiki Seite.";
$locale["Include multiple pages."] = "Füge mehrere Seiten ein.";
-$locale["Include recursively all linked pages starting at %s."] = "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s.";
+$locale["Include recursively all linked pages starting at [pagename]."] = "Bette rekursiv alle verlinkten Seiten ein, angefangen mit [pagename].";
$locale["Include text from another wiki page."] = "Text von einer andere Seite einfügen.";
$locale["Include the content of all SubPages of the current page."] = "Enthält den Inhalt alle UnterSeiten der aktuellen Seite.";
$locale["IncludePage"] = "SeiteEinfügen";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-13 15:41:56 UTC (rev 8801)
@@ -524,7 +524,7 @@
$locale["In the time since you started editing this page, another user has saved a new version of it."] = "Depuis que vous avez commencé à modifier cette page, un autre utilisateur en a enregistré une nouvelle version.";
$locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)";
$locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la page wiki.";
-$locale["Include recursively all linked pages starting at %s."] = "Créer une carte du site commençant à %s.";
+$locale["Include recursively all linked pages starting at [pagename]."] = "Créer une carte du site commençant à [pagename].";
$locale["Include text from another wiki page."] = "Inclure le texte d'une autre page wiki.";
$locale["Include the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous-pages de la page actuelle.";
$locale["IncludePage"] = "InclureUnePage";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/de.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1833,9 +1833,8 @@
msgid "Include multiple pages."
msgstr "Füge mehrere Seiten ein."
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
-msgstr "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s."
+msgid "Include recursively all linked pages starting at [pagename]."
+msgstr "Bette rekursiv alle verlinkten Seiten ein, angefangen mit [pagename]."
msgid "Display Dynamic Category Tree."
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/es.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1801,8 +1801,7 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
+msgid "Include recursively all linked pages starting at [pagename]."
msgstr ""
msgid "Display Dynamic Category Tree."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/fr.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1802,9 +1802,8 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
-msgstr "Créer une carte du site commençant à %s."
+msgid "Include recursively all linked pages starting at [pagename]."
+msgstr "Créer une carte du site commençant à [pagename]."
msgid "Display Dynamic Category Tree."
msgstr ""
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/it.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -1781,8 +1781,7 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
+msgid "Include recursively all linked pages starting at [pagename]."
msgstr ""
msgid "Display Dynamic Category Tree."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/ja.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1802,8 +1802,7 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
+msgid "Include recursively all linked pages starting at [pagename]."
msgstr ""
msgid "Display Dynamic Category Tree."
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/nl.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -1773,8 +1773,7 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
+msgid "Include recursively all linked pages starting at [pagename]."
msgstr ""
msgid "Display Dynamic Category Tree."
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/phpwiki.pot 2013-06-13 15:41:56 UTC (rev 8801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1764,8 +1764,7 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
+msgid "Include recursively all linked pages starting at [pagename]."
msgstr ""
msgid "Display Dynamic Category Tree."
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/sv.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1767,8 +1767,7 @@
msgid "Include multiple pages."
msgstr ""
-#, php-format
-msgid "Include recursively all linked pages starting at %s."
+msgid "Include recursively all linked pages starting at [pagename]."
msgstr ""
msgid "Display Dynamic Category Tree."
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/po/zh.po 2013-06-13 15:41:56 UTC (rev 8801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-13 17:17+0200\n"
+"POT-Creation-Date: 2013-06-13 17:23+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1852,9 +1852,8 @@
msgid "Include multiple pages."
msgstr ""
-#, fuzzy, php-format
-msgid "Include recursively all linked pages starting at %s."
-msgstr "遞迴地含括所有從 %s 開始有連結到的網頁."
+msgid "Include recursively all linked pages starting at [pagename]."
+msgstr "遞迴地含括所有從 [pagename] 開始有連結到的網頁."
msgid "Display Dynamic Category Tree."
msgstr ""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-13 15:19:05 UTC (rev 8800)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-13 15:41:56 UTC (rev 8801)
@@ -231,6 +231,7 @@
$locale["Image saved to cache file: %s"] = "影像存於快取檔案: %s";
$locale["In the time since you started editing this page, another user has saved a new version of it."] = "從你上次修改這個頁面到現在的這段時間,已經有使用者儲存了較新的版本.";
$locale["Include an external web page within the body of a wiki page."] = "含括外部網頁到 wiki 頁面的內容中.";
+$locale["Include recursively all linked pages starting at [pagename]."] = "遞迴地含括所有從 [pagename] 開始有連結到的網頁.";
$locale["Include text from another wiki page."] = "從其他 wiki 頁面含括文字.";
$locale["Include the content of all SubPages of the current page."] = "含括目前頁面所有子頁面的內容.";
$locale["IncludePage"] = "含括頁面";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-06-14 08:54:07
|
Revision: 8802
http://sourceforge.net/p/phpwiki/code/8802
Author: vargenau
Date: 2013-06-14 08:54:02 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Remove chmod; split subpages before translation
Modified Paths:
--------------
trunk/TODO
trunk/lib/IniConfig.php
trunk/lib/plugin/SemanticRelations.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/_WikiTranslation.php
trunk/locale/de/pgsrc/PhpWikiSystemverwalten
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
trunk/locale/nl/pgsrc/PhpWikiBeheer
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/editpage.tmpl
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/TODO 2013-06-14 08:54:02 UTC (rev 8802)
@@ -83,7 +83,6 @@
to statically define predicates used by PhpWiki:SemanticWeb
(semantically enriched links, like interwiki links).
* SqlResult paging (finished?)
-* plugin\WikiAdminSetAclSimple, Chmod
* plugin\NewUserWelcomePage.php (some better template solution)
* plugin\SearchHighlight
* logfile stuff:
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/IniConfig.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -728,7 +728,6 @@
$AllAllowedPlugins[] = 'TexToPng';
$AllAllowedPlugins[] = 'VisualWiki';
$AllAllowedPlugins[] = 'WantedPagesOld';
- $AllAllowedPlugins[] = 'WikiAdminChmod';
$AllAllowedPlugins[] = 'WikiAdminMarkup';
$AllAllowedPlugins[] = 'WikiForum';
$AllAllowedPlugins[] = '_WikiTranslation';
@@ -767,10 +766,6 @@
// The FUSIONFORGE theme omits them
if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
- // Add some some action pages depending on configuration
- if (DEBUG) {
- $AllActionPages[] = 'PhpWikiAdministration/Chmod';
- }
$AllActionPages[] = 'PhpWikiAdministration/Markup';
}
Modified: trunk/lib/plugin/SemanticRelations.php
===================================================================
--- trunk/lib/plugin/SemanticRelations.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/SemanticRelations.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -131,8 +131,8 @@
if ($nohelp) return $relhtml;
return HTML($relhtml,
HTML::hr(),
- WikiLink(_("Help/SemanticRelations"), false,
- HTML::em(_("Help/SemanticRelations"))),
+ WikiLink(__("Help").":".__("SemanticRelations"), false,
+ HTML::em(_("Help")."/"._("SemanticRelations"))),
" - ",
HTML::em(_("Find out how to add relations and attributes to pages.")));
}
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/SemanticSearch.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -284,7 +284,7 @@
_("Warning:"), HTML::br(),
_("No relations nor attributes in the whole wikidb defined!")
, "\n"
- , fmt("See %s", WikiLink(_("Help:SemanticRelations")))));
+ , fmt("See %s", WikiLink(_("Help").":"._("SemanticRelations")))));
extract($args);
// for convenience and harmony we allow GET requests also.
if (!$request->isPost()) {
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -131,7 +131,7 @@
$posted = $request->getArg('semsearch');
$request->setArg('semsearch', false);
if ($request->isPost() and isset($posted['help'])) {
- $request->redirect(WikiURL(_("Help/SemanticSearchAdvancedPlugin"),
+ $request->redirect(WikiURL(__("Help")."/".__("SemanticSearchAdvancedPlugin"),
array('redirectfrom' => $basepage), true));
}
$allrelations = $dbi->listRelations();
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminChown.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -104,7 +104,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if (!$request->getArg('action') == _("PhpWikiAdministration/Chown")) {
+ if (!$request->getArg('action') == __("PhpWikiAdministration")."/".__("Chown")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -22,7 +22,7 @@
*/
/**
- * Set simple individual PagePermissions
+ * Delete individual PagePermissions
*
* Usage: <<WikiAdminAclDelete >> or called via WikiAdminSelect
* Author: Marc-Etienne Vargenau, Alcatel-Lucent
@@ -80,7 +80,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if ($request->getArg('action') != _("PhpWikiAdministration/AdminAclDelete")) {
+ if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("AdminDeleteAcl")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminMarkup.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -106,7 +106,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if (!$request->getArg('action') == _("PhpWikiAdministration/Markup")) {
+ if (!$request->getArg('action') == __("PhpWikiAdministration")."/".__("Markup")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminPurge.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -90,7 +90,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if ($request->getArg('action') != _("PhpWikiAdministration/Purge")) {
+ if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("Purge")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminRemove.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -134,7 +134,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if ($request->getArg('action') != _("PhpWikiAdministration/Remove")) {
+ if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("Remove")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminRename.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -65,7 +65,7 @@
{
$action = $request->getArg('action');
if ($action != 'browse' and $action != 'rename'
- and $action != _("PhpWikiAdministration") . "/" . _("Rename")
+ and $action != __("PhpWikiAdministration"). "/". __("Rename")
) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminSelect.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -23,7 +23,7 @@
/**
* Allows selection of multiple pages which get passed to other
- * WikiAdmin plugins then. Then do Rename, Remove, Chmod, Chown, ...
+ * WikiAdmin plugins then. Then do Rename, Remove, Chown, ...
*
* Usage: <<WikiAdminSelect>>
* Author: Reini Urban <ru...@x-...>
@@ -208,7 +208,7 @@
$args["p[$page]"] = 1;
}
header("Location: " .
- WikiURL(_("PhpWikiAdministration") . "/" . _($plugin_action), $args, 1));
+ WikiURL(__("PhpWikiAdministration")."/".__($plugin_action), $args, 1));
exit();
}
} elseif (empty($args['s'])) {
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -138,7 +138,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl")) {
+ if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("SetAcl")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -42,7 +42,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple")) {
+ if ($request->getArg('action') != __("PhpWikiAdministration")."/".__("SetAclSimple")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -91,7 +91,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
if ($request->getArg('action') != 'browse') {
- if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal")) {
+ if (!$request->getArg('action') == __("PhpWikiAdministration")."/".__("SetExternal")) {
return $this->disabled(_("Plugin not run: not in browse mode"));
}
}
Modified: trunk/lib/plugin/_WikiTranslation.php
===================================================================
--- trunk/lib/plugin/_WikiTranslation.php 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/lib/plugin/_WikiTranslation.php 2013-06-14 08:54:02 UTC (rev 8802)
@@ -45,6 +45,8 @@
/* Container for untranslated pagenames. Needed to show up in locale/po/phpwiki.pot */
$pgsrc_container =
_("AddComment") . ',' .
+ _("AddCommentPlugin") . ',' .
+ _("AddingPages") . ',' .
_("AllPages") . ',' .
_("AllPagesCreatedByMe") . ',' .
_("AllPagesLastEditedByMe") . ',' .
@@ -57,6 +59,7 @@
_("AtomFeed") . ',' .
_("_AuthInfo") . ',' .
_("AuthorHistory") . ',' .
+ _("AuthorHistoryPlugin") . ',' .
_("_BackendInfo") . ',' .
_("BackLinks") . ',' .
_("BlogArchives") . ',' .
@@ -65,26 +68,35 @@
_("CacheTest") . ',' .
_("Calendar") . ',' .
_("CalendarList") . ',' .
+ _("CalendarListPlugin") . ',' .
+ _("CalendarPlugin") . ',' .
_("CategoryCategory") . ',' .
_("CategoryHomePages") . ',' .
_("CategoryPage") . ',' .
_("Chart") . ',' .
+ _("Chown") . ',' .
_("Comment") . ',' .
+ _("CommentPlugin") . ',' .
_("CreateBib") . ',' .
_("CreatePage") . ',' .
_("CreateToc") . ',' .
+ _("CreateTocPlugin") . ',' .
_("CurrentTime") . ',' .
_("DeadEndPages") . ',' .
_("DebugInfo") . ',' .
_("Diff") . ',' .
_("DynamicIncludePage") . ',' .
_("EditMetaData") . ',' .
+ _("EditMetaDataPlugin") . ',' .
_("ExternalSearch") . ',' .
+ _("ExternalSearchPlugin") . ',' .
_("FacebookLike") . ',' .
_("FileInfo") . ',' .
_("FindPage") . ',' .
_("FoafViewer") . ',' .
+ _("FoafViewerPlugin") . ',' .
_("FrameInclude") . ',' .
+ _("FrameIncludePlugin") . ',' .
_("FullRecentChanges") . ',' .
_("FullTextSearch") . ',' .
_("FuzzyPages") . ',' .
@@ -94,43 +106,12 @@
_("GraphViz") . ',' .
_("_GroupInfo") . ',' .
_("HelloWorld") . ',' .
- _("Help/AddCommentPlugin") . ',' .
- _("Help/AddingPages") . ',' .
- _("Help/AuthorHistoryPlugin") . ',' .
- _("Help/CalendarListPlugin") . ',' .
- _("Help/CalendarPlugin") . ',' .
- _("Help/CommentPlugin") . ',' .
- _("Help/CreateTocPlugin") . ',' .
- _("Help/EditMetaDataPlugin") . ',' .
- _("Help/ExternalSearchPlugin") . ',' .
- _("Help/FoafViewerPlugin") . ',' .
- _("Help/FrameIncludePlugin") . ',' .
- _("Help/HelloWorldPlugin") . ',' .
- _("Help/IncludePagePlugin") . ',' .
- _("Help/LinkIcons") . ',' .
- _("Help/MagicPhpWikiURLs") . ',' .
- _("Help/MoreAboutMechanics") . ',' .
- _("Help/OldStyleTablePlugin") . ',' .
- _("Help/PhotoAlbumPlugin") . ',' .
- _("Help/PhpHighlightPlugin") . ',' .
- _("Help/PhpWeatherPlugin") . ',' .
- _("Help/PhpWiki") . ',' .
- _("Help/PloticusPlugin") . ',' .
- _("Help/RawHtmlPlugin") . ',' .
- _("Help/RedirectToPlugin") . ',' .
- _("Help/RichTablePlugin") . ',' .
- _("Help/SystemInfoPlugin") . ',' .
- _("Help/TranscludePlugin") . ',' .
- _("Help/UnfoldSubpagesPlugin") . ',' .
- _("Help/UpLoadPlugin") . ',' .
- _("Help/WabiSabi") . ',' .
- _("Help/WikiBlogPlugin") . ',' .
- _("Help/WikiPlugin") . ',' .
- _("Help/WikiWikiWeb") . ',' .
+ _("HelloWorldPlugin") . ',' .
_("HomePageAlias") . ',' .
_("HtmlConverter") . ',' .
_("Imdb") . ',' .
_("IncludePage") . ',' .
+ _("IncludePagePlugin") . ',' .
_("IncludePages") . ',' .
_("IncludeSiteMap") . ',' .
_("IncludeTree") . ',' .
@@ -140,16 +121,20 @@
_("LdapSearch") . ',' .
_("LikePages") . ',' .
_("LinkDatabase") . ',' .
+ _("LinkIcons") . ',' .
_("LinkSearch") . ',' .
_("ListPages") . ',' .
_("ListRelations") . ',' .
_("ListSubpages") . ',' .
+ _("MagicPhpWikiURLs") . ',' .
_("MediawikiTable") . ',' .
_("ModeratedPage") . ',' .
+ _("MoreAboutMechanics") . ',' .
_("MostPopular") . ',' .
_("NewPagesPerUser") . ',' .
_("NoCache") . ',' .
_("OldStyleTable") . ',' .
+ _("OldStyleTablePlugin") . ',' .
_("OrphanedPages") . ',' .
_("PageDump") . ',' .
_("PageGroup") . ',' .
@@ -158,17 +143,17 @@
_("PageTrail") . ',' .
_("PasswordReset") . ',' .
_("PhotoAlbum") . ',' .
+ _("PhotoAlbumPlugin") . ',' .
_("PhpHighlight") . ',' .
+ _("PhpHighlightPlugin") . ',' .
_("PhpWeather") . ',' .
- _("PhpWikiAdministration/Chmod") . ',' .
- _("PhpWikiAdministration/Chown") . ',' .
- _("PhpWikiAdministration/Remove") . ',' .
- _("PhpWikiAdministration/Rename") . ',' .
- _("PhpWikiAdministration/Replace") . ',' .
- _("PhpWikiAdministration/SetAcl") . ',' .
+ _("PhpWeatherPlugin") . ',' .
+ _("PhpWiki") . ',' .
+ _("PhpWikiAdministration") . ',' .
_("PhpWikiDocumentation") . ',' .
_("PhpWikiPoll") . ',' .
_("Ploticus") . ',' .
+ _("PloticusPlugin") . ',' .
_("PluginManager") . ',' .
_("PopularNearby") . ',' .
_("PopularTags") . ',' .
@@ -180,6 +165,7 @@
_("RandomPage") . ',' .
_("RateIt") . ',' .
_("RawHtml") . ',' .
+ _("RawHtmlPlugin") . ',' .
_("RecentChanges") . ',' .
_("RecentChangesCached") . ',' .
_("RecentComments") . ',' .
@@ -187,21 +173,29 @@
_("RecentReferrers") . ',' .
_("RecentVisitors") . ',' .
_("RedirectTo") . ',' .
+ _("RedirectToPlugin") . ',' .
_("RelatedChanges") . ',' .
_("ReleaseNotes") . ',' .
+ _("Remove") . ',' .
+ _("Rename") . ',' .
+ _("Replace") . ',' .
_("_Retransform") . ',' .
_("RichTable") . ',' .
+ _("RichTablePlugin") . ',' .
_("RssFeed") . ',' .
_("SearchHighlight") . ',' .
_("SemanticRelations") . ',' .
_("SemanticSearch") . ',' .
_("SemanticSearchAdvanced") . ',' .
+ _("SetAcl") . ',' .
_("SiteMap") . ',' .
_("SpellCheck") . ',' .
+ _("SpecialPages") . ',' .
_("SqlResult") . ',' .
_("SyncWiki") . ',' .
_("SyntaxHighlighter") . ',' .
_("SystemInfo") . ',' .
+ _("SystemInfoPlugin") . ',' .
_("Template") . ',' .
_("TeX2png") . ',' .
_("text2png") . ',' .
@@ -209,19 +203,22 @@
_("TexToPng") . ',' .
_("TitleSearch") . ',' .
_("Transclude") . ',' .
+ _("TranscludePlugin") . ',' .
_("TranslateText") . ',' .
_("UnfoldSubpages") . ',' .
+ _("UnfoldSubpagesPlugin") . ',' .
_("UpLoad") . ',' .
+ _("UpLoadPlugin") . ',' .
_("UriResolver") . ',' .
_("UserPreferences") . ',' .
_("UserRatings") . ',' .
_("Video") . ',' .
_("VisualWiki") . ',' .
+ _("WabiSabi") . ',' .
_("WantedPages") . ',' .
_("WantedPagesOld") . ',' .
_("WatchPage") . ',' .
_("WhoIsOnline") . ',' .
- _("WikiAdminChmod") . ',' .
_("WikiAdminChown") . ',' .
_("WikiAdminDeleteAcl") . ',' .
_("WikiAdminMarkup") . ',' .
@@ -235,12 +232,15 @@
_("WikiAdminSetExternal") . ',' .
_("WikiAdminUtils") . ',' .
_("WikiBlog") . ',' .
+ _("WikiBlogPlugin") . ',' .
_("WikicreoleTable") . ',' .
_("WikiForm") . ',' .
_("WikiFormRich") . ',' .
_("WikiForum") . ',' .
+ _("WikiPlugin") . ',' .
_("WikiPoll") . ',' .
_("_WikiTranslation") . ',' .
+ _("WikiWikiWeb") . ',' .
_("YouTube");
require_once 'lib/PageList.php';
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-06-14 08:54:02 UTC (rev 8802)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:14:25 +0000
+Date: Thu, 13 Jun 2013 17:02:10 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten;
@@ -21,7 +21,7 @@
oder rufe die möglichen ~WikiAdmin Aktionen direkt auf:
-| [[/Löschen]] | [[/Umbenennen]] | [[/SuchenErsetzen]] | [[/AclSetzen]] | [[/Chown]] | [[/Chmod]]
+| [[/Löschen]] | [[/Umbenennen]] | [[/SuchenErsetzen]] | [[/AclSetzen]] | [[/Chown]]
== Benutzerverwaltung ==
Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki 2013-06-14 08:54:02 UTC (rev 8802)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:14:15 +0000
+Date: Thu, 13 Jun 2013 17:01:53 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=AmministrazioneDiPhpWiki;
@@ -21,7 +21,7 @@
or call the available ~WikiAdmin actions directly:
-| [[/Rimuovi]] | [[/Rename]] | [[/Replace]] | [[/SetAcl]] | [[/Chmod]] | [[/Chown]]
+| [[/Rimuovi]] | [[/Rename]] | [[/Replace]] | [[/SetAcl]] | [[/Chown]]
== User Management
Modified: trunk/locale/nl/pgsrc/PhpWikiBeheer
===================================================================
--- trunk/locale/nl/pgsrc/PhpWikiBeheer 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/locale/nl/pgsrc/PhpWikiBeheer 2013-06-14 08:54:02 UTC (rev 8802)
@@ -1,4 +1,4 @@
-Date: Fri, 4 Feb 2011 16:36:35 +0000
+Date: Thu, 13 Jun 2013 17:01:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiBeheer;
@@ -21,7 +21,7 @@
or call the available ~WikiAdmin actions directly:
-| [[/Verwijder]] | [[/Rename]] | [[/Vervangt]] | [[/SetAcl]] | [[/Chmod]] | [[/Chown]]
+| [[/Verwijder]] | [[/Rename]] | [[/Vervangt]] | [[/SetAcl]] | [[/Chown]]
== User Management
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/themes/Crao/templates/editpage.tmpl 2013-06-14 08:54:02 UTC (rev 8802)
@@ -87,13 +87,13 @@
</script>
<div id="oldMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/OldTextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<div id="newMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/themes/Portland/templates/editpage.tmpl 2013-06-14 08:54:02 UTC (rev 8802)
@@ -72,13 +72,13 @@
<div id="oldMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/OldTextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<div id="newMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2013-06-14 08:54:02 UTC (rev 8802)
@@ -87,13 +87,13 @@
<div id="oldMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/OldTextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<div id="newMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/themes/blog/templates/blogform.tmpl 2013-06-14 08:54:02 UTC (rev 8802)
@@ -18,8 +18,8 @@
<hr noshade="noshade" />
<div id="newMarkup" class="wiki-edithelp">
- <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
- <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+ <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+ <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/themes/default/templates/blogform.tmpl 2013-06-14 08:54:02 UTC (rev 8802)
@@ -18,8 +18,8 @@
<hr />
<div id="newMarkup" class="wiki-edithelp">
- <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
- <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+ <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+ <?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2013-06-13 15:41:56 UTC (rev 8801)
+++ trunk/themes/default/templates/editpage.tmpl 2013-06-14 08:54:02 UTC (rev 8802)
@@ -111,13 +111,13 @@
<div id="oldMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/OldTextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<div id="newMarkup" class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
+<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<script type="text/javascript">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-06-14 14:44:10
|
Revision: 8808
http://sourceforge.net/p/phpwiki/code/8808
Author: vargenau
Date: 2013-06-14 14:44:05 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Update WikiAdminSearchReplace plugin
Modified Paths:
--------------
trunk/lib/PageList.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.php
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.php
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/sv/LC_MESSAGES/phpwiki.php
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.php
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/lib/PageList.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -57,17 +57,14 @@
$this->_heading = $default_heading;
if ($align) {
- $this->_tdattr['align'] = $align;
+ $this->_tdattr['class'] = "align-".$align;
}
}
function format($pagelist, $page_handle, &$revision_handle)
{
- $nbsp = HTML::raw(' ');
return HTML::td($this->_tdattr,
- $nbsp,
- $this->_getValue($page_handle, $revision_handle),
- $nbsp);
+ $this->_getValue($page_handle, $revision_handle));
}
function getHeading()
@@ -84,7 +81,6 @@
function heading()
{
global $request;
- $nbsp = HTML::raw(' ');
// allow sorting?
if (1 /* or in_array($this->_field, PageList::sortable_columns())*/) {
// multiple comma-delimited sortby args: "+hits,+pagename"
@@ -96,11 +92,11 @@
$request->GetURLtoSelf(array('sortby' => $sortby)),
'class' => 'pagetitle',
'title' => sprintf(_("Sort by %s"), $this->_field)),
- $nbsp, HTML::u($this->_heading), $nbsp);
+ HTML::u($this->_heading));
} else {
- $s = HTML($nbsp, HTML::u($this->_heading), $nbsp);
+ $s = HTML::u($this->_heading);
}
- return HTML::th(array('align' => 'center'), $s);
+ return HTML::th($s);
}
// new grid-style sortable heading
@@ -109,7 +105,6 @@
{
global $WikiTheme, $request;
// allow sorting?
- $nbsp = HTML::raw(' ');
if (!$WikiTheme->DUMP_MODE /* or in_array($this->_field, PageList::sortable_columns()) */) {
// TODO: add to multiple comma-delimited sortby args: "+hits,+pagename"
$src = false;
@@ -118,7 +113,7 @@
$noimg = HTML::img(array('src' => $noimg_src,
'alt' => '.'));
else
- $noimg = $nbsp;
+ $noimg = HTML::raw('');
if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg
$sortby = $pagelist->sortby($colNum, 'flip_order');
$desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename
@@ -142,14 +137,12 @@
'id' => $pagelist->id)),
'class' => 'gridbutton',
'title' => sprintf(_("Click to sort by %s"), $reverse . $this->_field)),
- $nbsp, $this->_heading,
- $nbsp, $img,
- $nbsp);
+ $this->_heading,
+ $img);
} else {
- $s = HTML($nbsp, $this->_heading, $nbsp);
+ $s = HTML($this->_heading);
}
- return HTML::th(array('align' => 'center', 'valign' => 'middle',
- 'class' => 'gridbutton'), $s);
+ return HTML::th(array('class' => 'gridbutton'), $s);
}
/**
@@ -233,9 +226,7 @@
function format($pagelist, $page_handle, &$revision_handle)
{
return HTML::td($this->_tdattr,
- HTML::raw(' '),
- $this->_getValuePageList($pagelist, $page_handle, $revision_handle),
- HTML::raw(' '));
+ $this->_getValuePageList($pagelist, $page_handle, $revision_handle));
}
function _getValuePageList($pagelist, $page_handle, &$revision_handle)
@@ -321,17 +312,14 @@
function format($pagelist, $page_handle, &$revision_handle)
{
return HTML::td($this->_tdattr,
- HTML::raw(' '),
- $this->_getValuePageList($pagelist, $page_handle, $revision_handle),
- HTML::raw(' '));
+ $this->_getValuePageList($pagelist, $page_handle, $revision_handle));
}
// don't sort this javascript button
function button_heading($pagelist, $colNum)
{
- $s = HTML(HTML::raw(' '), $this->_heading, HTML::raw(' '));
- return HTML::th(array('align' => 'center', 'valign' => 'middle',
- 'class' => 'gridbutton'), $s);
+ $s = HTML($this->_heading);
+ return HTML::th(array('class' => 'gridbutton'), $s);
}
}
@@ -439,11 +427,8 @@
. "..." . " "
. ($score ? sprintf("[%0.1f]", $score) : ""))));
} else {
- if (strpos($c, " ") !== false)
- $c = "";
- else
- $c = sprintf(_("%s not found"), '»' . $search . '«');
- return HTML::div(array('style' => 'font-size:x-small', 'align' => 'center'),
+ $c = sprintf(_("“%s” not found"), $search);
+ return HTML::div(array('class' => 'align-center'),
$c . " " . ($score ? sprintf("[%0.1f]", $score) : ""));
}
} elseif (($len = strlen($c)) > $this->bytes) {
@@ -1270,7 +1255,6 @@
=> new _PageList_Column('hits', _("Hits"), 'right'),
'size'
=> new _PageList_Column_size('rev:size', _("Size"), 'right'),
- /*array('align' => 'char', 'char' => ' ')*/
'summary'
=> new _PageList_Column('rev:summary', _("Last Summary")),
'version'
@@ -1570,17 +1554,12 @@
$one_row = $this->_renderPageRow($page, $i++);
$rows[] = $one_row;
}
- $table = HTML::table(array('cellpadding' => 0,
- 'cellspacing' => 1,
- 'border' => 0,
- 'width' => '100%',
- 'class' => 'pagelist'));
+ $table = HTML::table(array('class' => 'fullwidth pagelist'));
if ($caption) {
$table->pushContent(HTML::caption(array('align' => 'top'), $caption));
}
$row = HTML::tr();
- $table_summary = array();
$i = 1; // start with 1!
foreach ($this->_columns as $col) {
$heading = $col->button_heading($this, $i);
@@ -1591,13 +1570,8 @@
) {
}
$row->pushContent($heading);
- if (is_string($col->getHeading()))
- $table_summary[] = $col->getHeading();
$i++;
}
- // Table summary for non-visual browsers.
- $table->setAttr('summary', sprintf(_("Columns: %s."),
- join(", ", $table_summary)));
$table->pushContent(HTML::colgroup(array('span' => count($this->_columns))));
if ($do_paging) {
if ($tokens === false) {
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/lib/plugin/AppendText.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -51,7 +51,7 @@
private function fallback($addtext, $oldtext, $notfound, &$message)
{
- $message->pushContent(sprintf(_("%s not found"), $notfound) . ". " .
+ $message->pushContent(sprintf(_("“%s” not found"), $notfound) . ". " .
_("Appending at the end.") . "\n");
return $oldtext . "\n" . $addtext;
}
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -48,68 +48,6 @@
));
}
- private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
- {
- $page = $dbi->getPage($pagename);
- if ($page->exists()) { // don't replace default contents
- $current = $page->getCurrentRevision();
- $version = $current->getVersion();
- $text = $current->getPackedContent();
- if ($regex) {
- $newtext = preg_replace("/" . $from . "/" . ($case_exact ? '' : 'i'), $to, $text);
- } else {
- if ($case_exact) {
- $newtext = str_replace($from, $to, $text);
- } else {
- $newtext = str_ireplace($from, $to, $text);
- }
- }
- if ($text != $newtext) {
- $meta = $current->_data;
- $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to);
- $meta['is_minor_edit'] = 0;
- $meta['author'] = $request->_user->UserName();
- unset($meta['mtime']); // force new date
- return $page->save($newtext, $version + 1, $meta);
- }
- }
- return false;
- }
-
- private function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
- {
- if (empty($from)) return HTML::p(HTML::strong(fmt("Error: Empty search string.")));
- $result = HTML::div();
- $ul = HTML::ul();
- $count = 0;
- $post_args = $request->getArg('admin_replace');
- $case_exact = !empty($post_args['case_exact']);
- $regex = !empty($post_args['regex']);
- foreach ($pages as $pagename) {
- if (!mayAccessPage('edit', $pagename)) {
- $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename)));
- } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
- $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.",
- $from, $to, WikiLink($pagename))));
- $count++;
- }
- }
- if ($count) {
- $dbi->touch();
- $result->setAttr('class', 'feedback');
- if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been changed:")));
- } else {
- $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
- }
- $result->pushContent($ul);
- } else {
- $result->setAttr('class', 'error');
- $result->pushContent(HTML::p(_("No pages changed.")));
- }
- return $result;
- }
-
function run($dbi, $argstr, &$request, $basepage)
{
// no action=replace support yet
@@ -124,19 +62,20 @@
$this->preSelectS($args, $request);
$p = $request->getArg('p');
- if (!$p) $p = $this->_list;
+ if (!$p) {
+ $p = $this->_list;
+ }
$post_args = $request->getArg('admin_replace');
$next_action = 'select';
$pages = array();
- if ($p && !$request->isPost())
+ if ($p && !$request->isPost()) {
$pages = $p;
- if ($p && $request->isPost() &&
- empty($post_args['cancel'])
- ) {
+ }
+ if ($p && $request->isPost() && empty($post_args['cancel'])) {
// without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if ($post_args['action'] == 'verify' and !empty($post_args['from'])) {
@@ -152,6 +91,11 @@
}
}
}
+ $result = HTML::div();
+ if ($request->isPost() and empty($post_args['from'])) {
+ $result->pushContent(HTML::p(array('class' => 'warning'),
+ _("Warning: The search string cannot be empty!")));
+ }
if ($next_action == 'select' and empty($pages)) {
// List all pages to select from.
//TODO: check for permissions and list only the allowed
@@ -159,46 +103,36 @@
$args['limit'], $args['exclude']);
}
- if ($next_action == 'verify') {
- $args['info'] = "checkbox,pagename";
+ $args['info'] = "checkbox,pagename,mtime,author";
+ if ($next_action == 'select') {
+ $columns = $args;
} else {
- // Avoid warning about "hi_content"
- // $args['info'] = "checkbox,pagename,hi_content,mtime,author";
- $args['info'] = "checkbox,pagename,mtime,author";
+ $columns = array_merge($args,
+ // with highlighted search for SearchReplace
+ array('types' => array('hi_content'
+ => new _PageList_Column_content('rev:hi_content', _("Content")))));
}
- $pagelist = new PageList_Selectable
- ($args['info'], $args['exclude'],
- array_merge
- (
- $args,
- array('types' => array
- (
- 'hi_content' // with highlighted search for SearchReplace
- => new _PageList_Column_content('rev:hi_content', _("Content"))))));
-
+ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $columns);
$pagelist->addPageList($pages);
$header = HTML::fieldset();
- if (empty($post_args['from']))
- $header->pushContent(
- HTML::p(HTML::em(_("Warning: The search string cannot be empty!"))));
+ $header->pushContent(HTML::legend(_("Select the pages to search and replace")));
if ($next_action == 'verify') {
- $button_label = _("Yes");
+ $button_label = _("Replace");
$header->pushContent(
HTML::p(HTML::strong(
_("Are you sure you want to replace text in the selected files?"))));
$this->replaceForm($header, $post_args);
} else {
- $button_label = _("Search & Replace");
+ $button_label = _("Search");
$this->replaceForm($header, $post_args);
- $header->pushContent(HTML::legend(_("Select the pages to search and replace")));
}
$buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'),
Button('submit:admin_replace[cancel]', _("Cancel"), 'button'));
$header->pushContent($buttons);
- return HTML::form(array('action' => $request->getPostURL(),
+ $result->pushContent(HTML::form(array('action' => $request->getPostURL(),
'method' => 'post'),
$header,
$pagelist->getContent(),
@@ -208,9 +142,71 @@
HiddenInputs(array('admin_replace[action]' => $next_action)),
ENABLE_PAGEPERM
? ''
- : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
+ : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN))));
+ return $result;
}
+ private function replaceHelper(&$dbi, &$request, $pagename, $from, $to, $case_exact = true, $regex = false)
+ {
+ $page = $dbi->getPage($pagename);
+ if ($page->exists()) { // don't replace default contents
+ $current = $page->getCurrentRevision();
+ $version = $current->getVersion();
+ $text = $current->getPackedContent();
+ if ($regex) {
+ $newtext = preg_replace("/" . $from . "/" . ($case_exact ? '' : 'i'), $to, $text);
+ } else {
+ if ($case_exact) {
+ $newtext = str_replace($from, $to, $text);
+ } else {
+ $newtext = str_ireplace($from, $to, $text);
+ }
+ }
+ if ($text != $newtext) {
+ $meta = $current->_data;
+ $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to);
+ $meta['is_minor_edit'] = 0;
+ $meta['author'] = $request->_user->UserName();
+ unset($meta['mtime']); // force new date
+ return $page->save($newtext, $version + 1, $meta);
+ }
+ }
+ return false;
+ }
+
+ private function searchReplacePages(&$dbi, &$request, $pages, $from, $to)
+ {
+ $result = HTML::div();
+ $ul = HTML::ul();
+ $count = 0;
+ $post_args = $request->getArg('admin_replace');
+ $case_exact = !empty($post_args['case_exact']);
+ $regex = !empty($post_args['regex']);
+ foreach ($pages as $pagename) {
+ if (!mayAccessPage('edit', $pagename)) {
+ $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename)));
+ } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
+ $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.",
+ $from, $to, WikiLink($pagename))));
+ $count++;
+ }
+ }
+ if ($count) {
+ $dbi->touch();
+ $result->setAttr('class', 'feedback');
+ if ($count == 1) {
+ $result->pushContent(HTML::p(_("One page has been changed:")));
+ } else {
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
+ }
+ $result->pushContent($ul);
+ } else {
+ $result->setAttr('class', 'error');
+ $result->pushContent(HTML::p(_("No pages changed.")));
+ }
+ return $result;
+ }
+
private function checkBox(&$post_args, $name, $msg)
{
$id = 'admin_replace-' . $name;
@@ -218,16 +214,16 @@
'name' => 'admin_replace[' . $name . ']',
'id' => $id,
'value' => 1));
- if (!empty($post_args[$name]))
+ if (!empty($post_args[$name])) {
$checkbox->setAttr('checked', 'checked');
+ }
return HTML::div($checkbox, ' ', HTML::label(array('for' => $id), $msg));
}
private function replaceForm(&$header, $post_args)
{
- $header->pushContent(HTML::div(array('class' => 'hint'),
- _("Replace all occurences of the given string in the content of all pages.")),
- HTML::br());
+ $header->pushContent(HTML::p(array('class' => 'hint'),
+ _("Replace all occurences of the given string in the content of all selected pages.")));
$table = HTML::table();
$this->tablePush($table, _("Replace") . _(": "),
HTML::input(array('name' => 'admin_replace[from]',
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -3,7 +3,7 @@
$locale[" %d%% (%d/%d)"] = " %d%% (%d/%d)";
$locale[" %s AUTH ignored."] = "%s AUTH ignoriert.";
$locale[" (to pages linked from \"%s\")"] = "(auf Seiten verlinkt von \"%s\")";
-$locale[" ... around %s"] = "... cirka %s";
+$locale[" ... around “%s”"] = "... cirka “%s”";
$locale[" ... first %d bytes"] = " ... erste %d Bytes";
$locale[" ... first %d lines"] = " ... erste %d Zeilen";
$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %d einzelne Autoren Revisionen.";
@@ -51,7 +51,6 @@
$locale["%s is not writable."] = "%s is nicht änderbar.";
$locale["%s is only allowed in locked pages."] = "%s wird/werden nur in gesperrten Seiten erlaubt.";
$locale["%s not defined"] = "%s nicht definiert";
-$locale["%s not found"] = "%s nicht gefunden";
$locale["%s not found in %s"] = "%s nicht gefunden in %s";
$locale["%s of this page"] = "%s von dieser Seite";
$locale["%s on %s:"] = "%s um %s:";
@@ -394,7 +393,6 @@
$locale["Enumeration"] = "Num. Liste";
$locale["Error sending e-mail with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
$locale["Error: Couldn't send %s to %s"] = "Fehler: Konnte nicht %s an %s senden";
-$locale["Error: Empty search string."] = "Fehler: Leeres Suchwort.";
$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
$locale["Every"] = "Jeder";
$locale["Exit toolbar"] = "Beende Werkzeugleiste";
@@ -1319,6 +1317,7 @@
$locale["weeks"] = "Wochen";
$locale["yesterday"] = "gestern";
$locale["“%s” is no ModeratedPage anymore."] = "»%s« ist keine ModeratierteSeite mehr.";
+$locale["“%s” not found"] = "“%s” nicht gefunden";
$locale["“%s”: Bad page name"] = "»%s«: Ungültiger Seitenname";
$locale["“%s”: Bad page name: %s"] = "»%s«: Ungültiger Seitenname: %s";
$locale["“%s”: corrupt file"] =
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -1,6 +1,6 @@
<?php
-$locale[" ... around %s"] = " ... alrededor de %s";
+$locale[" ... around “%s”"] = " ... alrededor de “%s”";
$locale[" ... first %d bytes"] = " ... primeros octetos de %d";
$locale[" Sorry, cannot merge."] = " Apesadumbrado, no puede combinarse.";
$locale[" and "] = " y ";
@@ -27,7 +27,6 @@
$locale["%s is not locked!"] = "¡%s no está bloqueado!";
$locale["%s is not writable."] = "%s no es escribible.";
$locale["%s not defined"] = "%s no definido";
-$locale["%s not found"] = "%s: fichero no encontrado";
$locale["%s: %s"] = "%s: %s";
$locale["%s: Bad action"] = "%s: Mala acción";
$locale["%s: Can't open dba database"] = "%s: No puede abrir la base de datos del DBA";
@@ -583,6 +582,7 @@
$locale["view this page"] = "para visión esta página";
$locale["weeks"] = "semanas";
$locale["yesterday"] = "ayer";
+$locale["“%s” not found"] = "“%s” no encontrado";
$locale["“%s”: Bad page name"] = "“%s”: Mal nombre de la página";
$locale["“%s”: corrupt file"] =
"“%s”: archivo corrupto";
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -4,7 +4,7 @@
$locale[" (syntax error for latex) "] = " (erreur de syntaxe pour latex) ";
$locale[" (to pages linked from \"%s\")"] = " (aux pages liées à \"%s\")";
$locale[" - %d / %d - "] = " - %d / %d - ";
-$locale[" ... around %s"] = "... autour de %s";
+$locale[" ... around “%s”"] = "... autour de « %s »";
$locale[" ... first %d bytes"] = "... %d premiers octets";
$locale[" ... first %d lines"] = "... %d premières lignes";
$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d versions par auteur.";
@@ -57,7 +57,6 @@
$locale["%s is not writable."] = "%s n'est pas modifiable.";
$locale["%s is only allowed in locked pages."] = "%s n'est autorisé que dans les pages verrouillées.";
$locale["%s not defined"] = "%s non défini";
-$locale["%s not found"] = "%s non trouvé";
$locale["%s not found in %s"] = "%s non trouvé dans %s";
$locale["%s of this page"] = "%s de cette page";
$locale["%s on %s:"] = "%s on %s :";
@@ -415,7 +414,6 @@
$locale["Error"] = "Erreur";
$locale["Error:"] = "Erreur :";
$locale["Error: Couldn't send %s to %s"] = "Erreur : impossible d'envoyer %s à %s";
-$locale["Error: Empty search string."] = "Erreur : la chaîne à rechercher est vide.";
$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées.";
$locale["Every"] = "Toutes";
$locale["Expiry parameters"] = "Expiration des paramètres";
@@ -913,6 +911,7 @@
$locale["Renamed page from “%s” to “%s”."] = "Page renommée de « %s » à « %s ».";
$locale["Renaming created redirect page from “%s” to “%s”"] = "Le renommage a créé une redirection de « %s » à « %s »";
$locale["Replace"] = "Remplacer";
+$locale["Replace all occurences of the given string in the content of all selected pages."] = "Remplacer tous les occurences de la chaîne dans toutes les pages sélectionnées.";
$locale["Replace with"] = "Remplacer par";
$locale["Replace “%s” by “%s”"] = "Remplacer « %s » par « %s »";
$locale["Replaced “%s” with “%s” in page “%s”."] = "« %s » a bien été remplacé par « %s » dans la page « %s ».";
@@ -1389,6 +1388,7 @@
$locale["view this page"] = "voir cette page";
$locale["weeks"] = "semaines";
$locale["yesterday"] = "hier";
+$locale["“%s” not found"] = "« %s » non trouvé";
$locale["“%s”: Bad page name"] = "« %s » : nom de page non valide";
$locale["“%s”: corrupt file"] =
"« %s » : ce fichier est abîmé";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -12,7 +12,6 @@
$locale["%s bytes"] = "%s byte";
$locale["%s days"] = "%s giorni";
$locale["%s not defined"] = "%s: non definito";
-$locale["%s not found"] = "%s non trovato";
$locale["%s not found in %s"] = "%s non trovato in %s";
$locale["%s of this page"] = "%s di questa pagina";
$locale["%s on %s:"] = "%s a %s:";
@@ -285,5 +284,6 @@
$locale["version %s"] = "versione %s";
$locale["version <em>%s</em>"] = "versione <em>%s</em>";
$locale["yesterday"] = "ieri";
+$locale["“%s” not found"] = "“%s” non trovato";
$locale["“%s”: corrupt file"] =
"“%s”: file corrotto";
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/de.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1034,12 +1034,12 @@
msgstr " ... erste %d Bytes"
#, php-format
-msgid " ... around %s"
-msgstr "... cirka %s"
+msgid " ... around “%s”"
+msgstr "... cirka “%s”"
#, php-format
-msgid "%s not found"
-msgstr "%s nicht gefunden"
+msgid "“%s” not found"
+msgstr "“%s” nicht gefunden"
#, php-format
msgid "page permission inherited from %s"
@@ -1114,10 +1114,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr "Spalten: %s."
-
msgid "Rename"
msgstr "Umbenennen"
@@ -3367,6 +3363,10 @@
msgid "Count"
msgstr "Anzahl"
+#, php-format
+msgid "Columns: %s."
+msgstr "Spalten: %s."
+
msgid "Wanted From"
msgstr "Benötigt von"
@@ -3679,36 +3679,37 @@
msgid "Search and replace text in selected wiki pages."
msgstr "Suche und ersetze Text in den gewählten Seiten."
-#, php-format
-msgid "Replace “%s” by “%s”"
+msgid "You must be an administrator to use this plugin."
msgstr ""
+"Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen."
-msgid "Error: Empty search string."
-msgstr "Fehler: Leeres Suchwort."
-
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
-msgstr "»%s« mit »%s« in Seite »%s« ersetzt."
-
msgid "Warning: The search string cannot be empty!"
msgstr "Achtung! Das Suchwort darf nicht leer sein!"
+msgid "Select the pages to search and replace"
+msgstr "Seiten auswählen:"
+
+msgid "Replace"
+msgstr "Ersetze"
+
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
"Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen "
"wollen?"
-msgid "Select the pages to search and replace"
-msgstr "Seiten auswählen:"
+#, php-format
+msgid "Replace “%s” by “%s”"
+msgstr ""
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr "»%s« mit »%s« in Seite »%s« ersetzt."
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr "Ersetze alle Wörter in den angegebenen Seiten."
-msgid "Replace"
-msgstr "Ersetze"
-
msgid "by"
msgstr "mit"
@@ -3810,10 +3811,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-"Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen."
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr "WikiAdminUtils %s gibt zurück:"
@@ -6159,6 +6156,13 @@
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "%s nicht gefunden"
+
+#~ msgid "Error: Empty search string."
+#~ msgstr "Fehler: Leeres Suchwort."
+
#~ msgid "chmod page “%s” to “%s”."
#~ msgstr "Berechtigung der Seite »%s« auf »%s« geändert."
@@ -6246,9 +6250,6 @@
#~ msgid "argument “%s” not declared by plugin"
#~ msgstr "Argument »%s« nicht im Zusatzprogramm deklariert"
-#~ msgid "file %s not found"
-#~ msgstr "%s nicht gefunden"
-
#~ msgid "Who Is Online"
#~ msgstr "Wer ist Online"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/es.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1014,12 +1014,12 @@
msgstr " ... primeros octetos de %d"
#, php-format
-msgid " ... around %s"
-msgstr " ... alrededor de %s"
+msgid " ... around “%s”"
+msgstr " ... alrededor de “%s”"
#, php-format
-msgid "%s not found"
-msgstr "%s: fichero no encontrado"
+msgid "“%s” not found"
+msgstr "“%s” no encontrado"
#, php-format
msgid "page permission inherited from %s"
@@ -1094,10 +1094,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr "Columnas: %s."
-
msgid "Rename"
msgstr "Retitule"
@@ -3263,6 +3259,10 @@
msgid "Count"
msgstr ""
+#, php-format
+msgid "Columns: %s."
+msgstr "Columnas: %s."
+
msgid "Wanted From"
msgstr ""
@@ -3573,34 +3573,34 @@
msgid "Search and replace text in selected wiki pages."
msgstr ""
-#, php-format
-msgid "Replace “%s” by “%s”"
+msgid "You must be an administrator to use this plugin."
msgstr ""
-msgid "Error: Empty search string."
+msgid "Warning: The search string cannot be empty!"
msgstr ""
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
+msgid "Select the pages to search and replace"
msgstr ""
-msgid "Warning: The search string cannot be empty!"
-msgstr ""
+msgid "Replace"
+msgstr "Substituya"
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
-msgid "Select the pages to search and replace"
+#, php-format
+msgid "Replace “%s” by “%s”"
msgstr ""
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr ""
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-msgid "Replace"
-msgstr "Substituya"
-
msgid "by"
msgstr "por"
@@ -3697,9 +3697,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
@@ -5966,6 +5963,10 @@
msgstr "Corrija esta página"
#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "fichero %s no encontrado"
+
+#, fuzzy
#~ msgid "period"
#~ msgstr "versión %d"
@@ -5993,9 +5994,6 @@
#~ msgid "Included from %s:"
#~ msgstr "Inserción de “%s”:"
-#~ msgid "file %s not found"
-#~ msgstr "fichero %s no encontrado"
-
#~ msgid "View the current version"
#~ msgstr "Vea la versión actual"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/fr.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1012,12 +1012,12 @@
msgstr "... %d premiers octets"
#, php-format
-msgid " ... around %s"
-msgstr "... autour de %s"
+msgid " ... around “%s”"
+msgstr "... autour de « %s »"
#, php-format
-msgid "%s not found"
-msgstr "%s non trouvé"
+msgid "“%s” not found"
+msgstr "« %s » non trouvé"
#, php-format
msgid "page permission inherited from %s"
@@ -1092,10 +1092,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr "Colonnes : %s."
-
msgid "Rename"
msgstr "Renommer"
@@ -3302,6 +3298,10 @@
msgid "Count"
msgstr "Nombre"
+#, php-format
+msgid "Columns: %s."
+msgstr "Colonnes : %s."
+
msgid "Wanted From"
msgstr "Recherchées par"
@@ -3611,38 +3611,40 @@
msgid "Search and replace text in selected wiki pages."
msgstr "Recherche puis remplace le texte dans les pages sélectionnées."
-#, php-format
-msgid "Replace “%s” by “%s”"
-msgstr "Remplacer « %s » par « %s »"
+msgid "You must be an administrator to use this plugin."
+msgstr "Vous devez être un administrateur pour utiliser ce greffon."
-msgid "Error: Empty search string."
-msgstr "Erreur : la chaîne à rechercher est vide."
-
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
-msgstr "« %s » a bien été remplacé par « %s » dans la page « %s »."
-
msgid "Warning: The search string cannot be empty!"
msgstr "Attention : vous devez entrez au moins une lettre pour la recherche!"
+msgid "Select the pages to search and replace"
+msgstr ""
+"Sélectionner ci-dessous les pages dans lesquelles la recherche sera "
+"effectuée :"
+
+msgid "Replace"
+msgstr "Remplacer"
+
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
"Êtes-vous sur de vouloir rechercher et remplacer dans les fichiers "
"sélectionnés ?"
-msgid "Select the pages to search and replace"
-msgstr ""
-"Sélectionner ci-dessous les pages dans lesquelles la recherche sera "
-"effectuée :"
+#, php-format
+msgid "Replace “%s” by “%s”"
+msgstr "Remplacer « %s » par « %s »"
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr "« %s » a bien été remplacé par « %s » dans la page « %s »."
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
+"Remplacer tous les occurences de la chaîne dans toutes les pages "
+"sélectionnées."
-msgid "Replace"
-msgstr "Remplacer"
-
msgid "by"
msgstr "par"
@@ -3744,9 +3746,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr "Vous devez être un administrateur pour utiliser ce greffon."
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
@@ -6044,6 +6043,13 @@
msgid "Edit this page"
msgstr "Modifier cette page"
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "%s non trouvé dans %s"
+
+#~ msgid "Error: Empty search string."
+#~ msgstr "Erreur : la chaîne à rechercher est vide."
+
#~ msgid "chmod page “%s” to “%s”."
#~ msgstr "Changement de mode %s à %s."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/it.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -998,12 +998,12 @@
msgstr " ... i primi %d byte"
#, php-format
-msgid " ... around %s"
+msgid " ... around “%s”"
msgstr ""
#, php-format
-msgid "%s not found"
-msgstr "%s non trovato"
+msgid "“%s” not found"
+msgstr "“%s” non trovato"
#, php-format
msgid "page permission inherited from %s"
@@ -1078,10 +1078,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr "Caratteri: %s."
-
msgid "Rename"
msgstr ""
@@ -3236,6 +3232,10 @@
msgid "Count"
msgstr ""
+#, php-format
+msgid "Columns: %s."
+msgstr "Caratteri: %s."
+
msgid "Wanted From"
msgstr ""
@@ -3542,34 +3542,34 @@
msgid "Search and replace text in selected wiki pages."
msgstr ""
-#, php-format
-msgid "Replace “%s” by “%s”"
+msgid "You must be an administrator to use this plugin."
msgstr ""
-msgid "Error: Empty search string."
+msgid "Warning: The search string cannot be empty!"
msgstr ""
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
+msgid "Select the pages to search and replace"
msgstr ""
-msgid "Warning: The search string cannot be empty!"
+msgid "Replace"
msgstr ""
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
-msgid "Select the pages to search and replace"
+#, php-format
+msgid "Replace “%s” by “%s”"
msgstr ""
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr ""
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-msgid "Replace"
-msgstr ""
-
msgid "by"
msgstr ""
@@ -3666,9 +3666,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
@@ -5901,6 +5898,10 @@
msgstr ""
#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "file %s non trovato"
+
+#, fuzzy
#~ msgid "period"
#~ msgstr "versione %d"
@@ -5917,9 +5918,6 @@
#~ msgid "Included from %s:"
#~ msgstr "Inserire dalla %s:"
-#~ msgid "file %s not found"
-#~ msgstr "file %s non trovato"
-
#~ msgid "View the current version"
#~ msgstr "Mostra il versione corrente"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/ja.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -998,12 +998,12 @@
msgstr ""
#, php-format
-msgid " ... around %s"
+msgid " ... around “%s”"
msgstr ""
-#, php-format
-msgid "%s not found"
-msgstr ""
+#, fuzzy, php-format
+msgid "“%s” not found"
+msgstr "%s: ファイルが見つかりません。"
#, php-format
msgid "page permission inherited from %s"
@@ -1080,10 +1080,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
#, fuzzy
msgid "Rename"
msgstr "名称"
@@ -3292,6 +3288,10 @@
msgid "Count"
msgstr "カウント"
+#, php-format
+msgid "Columns: %s."
+msgstr ""
+
#, fuzzy
msgid "Wanted From"
msgstr "データフォーマット"
@@ -3631,35 +3631,35 @@
msgid "Search and replace text in selected wiki pages."
msgstr ""
-#, fuzzy, php-format
-msgid "Replace “%s” by “%s”"
-msgstr "“%s” の削除に成功しました。"
-
-msgid "Error: Empty search string."
+msgid "You must be an administrator to use this plugin."
msgstr ""
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
+msgid "Warning: The search string cannot be empty!"
msgstr ""
-msgid "Warning: The search string cannot be empty!"
+#, fuzzy
+msgid "Select the pages to search and replace"
+msgstr "貴方個人の言語を選択"
+
+msgid "Replace"
msgstr ""
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
-#, fuzzy
-msgid "Select the pages to search and replace"
-msgstr "貴方個人の言語を選択"
+#, fuzzy, php-format
+msgid "Replace “%s” by “%s”"
+msgstr "“%s” の削除に成功しました。"
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr ""
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-msgid "Replace"
-msgstr ""
-
msgid "by"
msgstr ""
@@ -3758,9 +3758,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
@@ -6153,6 +6150,10 @@
msgstr "ページを編集しています。"
#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "%s: ファイルが見つかりません。"
+
+#, fuzzy
#~ msgid "Select the pages to change:"
#~ msgstr "貴方個人の言語を選択"
@@ -6194,9 +6195,6 @@
#~ msgid "%s is empty"
#~ msgstr "%s が空です。"
-#~ msgid "file %s not found"
-#~ msgstr "%s: ファイルが見つかりません。"
-
#~ msgid "View the current version"
#~ msgstr "現在のバージョンを表示する"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/nl.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -989,12 +989,12 @@
msgid " ... first %d bytes"
msgstr ""
-#, php-format
-msgid " ... around %s"
-msgstr ""
+#, fuzzy, php-format
+msgid " ... around “%s”"
+msgstr "van %s"
#, php-format
-msgid "%s not found"
+msgid "“%s” not found"
msgstr ""
#, php-format
@@ -1070,10 +1070,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
msgid "Rename"
msgstr ""
@@ -3228,6 +3224,10 @@
msgid "Count"
msgstr ""
+#, php-format
+msgid "Columns: %s."
+msgstr ""
+
msgid "Wanted From"
msgstr ""
@@ -3534,34 +3534,34 @@
msgid "Search and replace text in selected wiki pages."
msgstr ""
-#, php-format
-msgid "Replace “%s” by “%s”"
+msgid "You must be an administrator to use this plugin."
msgstr ""
-msgid "Error: Empty search string."
+msgid "Warning: The search string cannot be empty!"
msgstr ""
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
+msgid "Select the pages to search and replace"
msgstr ""
-msgid "Warning: The search string cannot be empty!"
-msgstr ""
+msgid "Replace"
+msgstr "Vervangt"
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
-msgid "Select the pages to search and replace"
+#, php-format
+msgid "Replace “%s” by “%s”"
msgstr ""
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr ""
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-msgid "Replace"
-msgstr "Vervangt"
-
msgid "by"
msgstr ""
@@ -3658,9 +3658,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/phpwiki.pot 2013-06-14 14:44:05 UTC (rev 8808)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -982,11 +982,11 @@
msgstr ""
#, php-format
-msgid " ... around %s"
+msgid " ... around “%s”"
msgstr ""
#, php-format
-msgid "%s not found"
+msgid "“%s” not found"
msgstr ""
#, php-format
@@ -1062,10 +1062,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
msgid "Rename"
msgstr ""
@@ -3220,6 +3216,10 @@
msgid "Count"
msgstr ""
+#, php-format
+msgid "Columns: %s."
+msgstr ""
+
msgid "Wanted From"
msgstr ""
@@ -3526,34 +3526,34 @@
msgid "Search and replace text in selected wiki pages."
msgstr ""
-#, php-format
-msgid "Replace “%s” by “%s”"
+msgid "You must be an administrator to use this plugin."
msgstr ""
-msgid "Error: Empty search string."
+msgid "Warning: The search string cannot be empty!"
msgstr ""
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
+msgid "Select the pages to search and replace"
msgstr ""
-msgid "Warning: The search string cannot be empty!"
+msgid "Replace"
msgstr ""
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
-msgid "Select the pages to search and replace"
+#, php-format
+msgid "Replace “%s” by “%s”"
msgstr ""
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr ""
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-msgid "Replace"
-msgstr ""
-
msgid "by"
msgstr ""
@@ -3650,9 +3650,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/sv.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -985,12 +985,12 @@
msgstr ""
#, php-format
-msgid " ... around %s"
+msgid " ... around “%s”"
msgstr ""
#, php-format
-msgid "%s not found"
-msgstr "%s ingen funna"
+msgid "“%s” not found"
+msgstr "“%s” ingen funna"
#, php-format
msgid "page permission inherited from %s"
@@ -1065,10 +1065,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr ""
-
msgid "Rename"
msgstr ""
@@ -3223,6 +3219,10 @@
msgid "Count"
msgstr ""
+#, php-format
+msgid "Columns: %s."
+msgstr ""
+
msgid "Wanted From"
msgstr ""
@@ -3529,34 +3529,34 @@
msgid "Search and replace text in selected wiki pages."
msgstr ""
-#, php-format
-msgid "Replace “%s” by “%s”"
+msgid "You must be an administrator to use this plugin."
msgstr ""
-msgid "Error: Empty search string."
+msgid "Warning: The search string cannot be empty!"
msgstr ""
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
+msgid "Select the pages to search and replace"
msgstr ""
-msgid "Warning: The search string cannot be empty!"
+msgid "Replace"
msgstr ""
msgid "Are you sure you want to replace text in the selected files?"
msgstr ""
-msgid "Select the pages to search and replace"
+#, php-format
+msgid "Replace “%s” by “%s”"
msgstr ""
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr ""
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-msgid "Replace"
-msgstr ""
-
msgid "by"
msgstr ""
@@ -3653,9 +3653,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr ""
-
#, php-format
msgid "WikiAdminUtils %s returned:"
msgstr ""
@@ -5886,5 +5883,9 @@
msgstr ""
#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "%s: fila ingen funna"
+
+#, fuzzy
#~ msgid "period"
#~ msgstr "version %d"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/po/zh.po 2013-06-14 14:44:05 UTC (rev 8808)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 11:53+0200\n"
+"POT-Creation-Date: 2013-06-14 16:42+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -338,13 +338,11 @@
msgid "Search & Replace"
msgstr "搜尋與取代"
-#, fuzzy
msgid "Search for"
msgstr "搜尋"
-#, fuzzy
msgid "Replace with"
-msgstr "取代:"
+msgstr "取代"
msgid "OK"
msgstr ""
@@ -1034,12 +1032,12 @@
msgstr " ... 頭 %d bytes"
#, php-format
-msgid " ... around %s"
-msgstr "... 包圍 %s"
+msgid " ... around “%s”"
+msgstr "... 包圍 “%s”"
#, php-format
-msgid "%s not found"
-msgstr "%s 找不到."
+msgid "“%s” not found"
+msgstr "“%s” 找不到"
#, php-format
msgid "page permission inherited from %s"
@@ -1117,10 +1115,6 @@
msgid "Illegal 'limit' argument: must be numeric"
msgstr ""
-#, php-format
-msgid "Columns: %s."
-msgstr "行: %s."
-
msgid "Rename"
msgstr "更名"
@@ -3390,6 +3384,10 @@
msgid "Count"
msgstr "計數"
+#, php-format
+msgid "Columns: %s."
+msgstr "行: %s."
+
#, fuzzy
msgid "Wanted From"
msgstr "日期格式"
@@ -3732,37 +3730,36 @@
msgid "Search and replace text in selected wiki pages."
msgstr "在選定的頁面中搜尋並更換文字."
-#, fuzzy, php-format
-msgid "Replace “%s” by “%s”"
-msgstr "更名頁面 “%s” 為 “%s”."
+msgid "You must be an administrator to use this plugin."
+msgstr "你必須是管理者才能使用此 plugin."
-msgid "Error: Empty search string."
-msgstr "錯誤: 空白的搜尋字串."
-
-#, php-format
-msgid "Replaced “%s” with “%s” in page “%s”."
-msgstr "取代 “%s” 以 “%s” 在頁面 “%s”."
-
msgid "Warning: The search string cannot be empty!"
msgstr "警告: 搜尋字串不能是空白!"
#, fuzzy
+msgid "Select the pages to search and replace"
+msgstr "選擇頁面以進行搜尋:"
+
+msgid "Replace"
+msgstr "取代"
+
+#, fuzzy
msgid "Are you sure you want to replace text in the selected files?"
msgstr "你確定你想要永久新增並取代選定檔案中的文字?"
-#, fuzzy
-msgid "Select the pages to search and replace"
-msgstr "選擇頁面以進行搜尋:"
+#, fuzzy, php-format
+msgid "Replace “%s” by “%s”"
+msgstr "更名頁面 “%s” 為 “%s”."
+#, php-format
+msgid "Replaced “%s” with “%s” in page “%s”."
+msgstr "取代 “%s” 以 “%s” 在頁面 “%s”."
+
msgid ""
"Replace all occurences of the given string in the content of all selected "
"pages."
msgstr ""
-#, fuzzy
-msgid "Replace"
-msgstr "取代:"
-
msgid "by"
msgstr "被"
@@ -3868,9 +3865,6 @@
msgid "Bad action requested: %s"
msgstr ""
-msgid "You must be an administrator to use this plugin."
-msgstr "你必須是管理者才能使用此 plugin."
-
#, fuzzy, php-format
msgid "WikiAdminUtils %s returned:"
msgstr "WikiAdminUtils 說:"
@@ -6271,6 +6265,13 @@
msgid "Edit this page"
msgstr "編輯此頁面"
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "%s 找不到."
+
+#~ msgid "Error: Empty search string."
+#~ msgstr "錯誤: 空白的搜尋字串."
+
#~ msgid "chmod page “%s” to “%s”."
#~ msgstr "改變頁面 “%s” 權限為 “%s”."
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/sv/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/sv/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -8,7 +8,6 @@
$locale["%d most popular nearby: "] = "De %d mest populära grannarna: ";
$locale["%s at %s"] = "%s i %s";
$locale["%s days"] = "%s dar";
-$locale["%s not found"] = "%s ingen funna";
$locale["%s of this page"] = "%s för den här sidan";
$locale["%s: %s"] = "%s: %s";
$locale["%s: file not found"] = "%s: fila ingen funna";
@@ -144,5 +143,6 @@
$locale["today"] = "i dag";
$locale["version %d"] = "version %d";
$locale["version %s"] = "version %s";
-$locale["yesterday"] =
- "i går";
+$locale["yesterday"] = "i går";
+$locale["“%s” not found"] =
+ "“%s” ingen funna";
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-14 10:20:50 UTC (rev 8807)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-14 14:44:05 UTC (rev 8808)
@@ -1,7 +1,7 @@
<?php
$locale[" %d%% (%d/%d)"] = " %d%% (%d/%d)";
-$locale[" ... around %s"] = "... 包圍 %s";
+$locale[" ... around “%s”"] = "... 包圍 “%s”";
$locale[" ... first %d bytes"] = " ... 頭 %d bytes";
$locale[" ... first %d lines"] = " ... 頭 %d 列";
$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = " 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) 但是沒保存超過 %d 份單一作者修訂.";
@@ -28,7 +28,6 @@
$locale["%s is empty."] = "%s 是空白的.";
$locale["%s is not writable."] = "%s 無法寫入.";
$locale["%s is only allowed in locked pages."] = "%s 只允許在鎖定的頁面中.";
-$locale["%s not found"] = "%s 找不到.";
$locale["%s of this page"] = "此頁面的 %s";
$locale["%s or %s parameter missing"] = "%s 或 %s 參數遺漏";
$locale["%s pages link to %s:"] = "%s 個頁面連結到 %s:";
@@ -194,7 +193,6 @@
$locale["Empty pagename!"] = "空白的頁面名稱!";
$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing).";
$locale["Enter your UserId to sign in"] = "輸入你的帳號進行簽入";
-$locale["Error: Empty search string."] = "錯誤: 空白的搜尋字串.";
$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存.";
$locale["Every"] = "每";
$locale["Expiry parameters"] = "過期參數";
@@ -383,6 +381,8 @@
$locale["Rename"] = "更名";
$locale["Rename selected pages"] = "更名已選定的頁面";
$locale["Rename to"] = "更名為";
+$locale["Replace"] = "取代";
+$locale["Replace with"] = "取代";
$locale["Replaced “%s” with “%s” in page “%s”."] = "取代 “%s” 以 “%s” 在頁面 “%s”.";
$locale["Requires WikiAdmin privileges to edit."] = "需要 WikiAdmin 權限方能編輯.";
$locale["Reset"] = "重設";
@@ -396,6 +396,7 @@
$locale["Search"] = "搜尋";
$locale["Search & Replace"] = "搜尋與取代";
$locale["Search and replace text in selected wiki pages."] = "在選定的頁面中搜尋並更換文字.";
+$locale["Search for"] = "搜尋";
$locale["Search for page titles similar to %s."] = "搜尋與 %s 相似的頁面標題";
$locale["Search the content of all pages in this wiki."] = "在此 wiki 所有頁面中搜尋內容.";
$locale["Search the titles of all pages in this wiki."] = "在此 wiki 的所有頁面搜尋標題.";
@@ -630,6 +631,7 @@
$locale["view the source of this page"] = "查看此頁面源碼";
$locale["view this page"] = "查看此頁面";
$locale["yesterday"] = "昨天";
+$locale["“%s” not found"] = "“%s” 找不到";
$locale["“%s”: Bad page name"] = "“%s”: 錯誤的頁面名稱";
$locale["“%s”: Bad page name: %s"] =
"“%s”: 錯誤頁面名稱: %s";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-06-18 12:55:32
|
Revision: 8814
http://sourceforge.net/p/phpwiki/code/8814
Author: vargenau
Date: 2013-06-18 12:55:27 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Remove LC_MESSAGES/phpwiki.php
Modified Paths:
--------------
trunk/lib/config.php
trunk/locale/Makefile
trunk/locale/README
trunk/locale/README.de.txt
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/pgsrc/DebugInfo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/update-makefile.sh
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/pgsrc/DebugInfo
Added Paths:
-----------
trunk/lib/plugin/WikiTranslation.php
Removed Paths:
-------------
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.php
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.php
trunk/locale/ja/LC_MESSAGES/phpwiki.php
trunk/locale/nl/LC_MESSAGES/phpwiki.php
trunk/locale/sv/LC_MESSAGES/phpwiki.php
trunk/locale/zh/LC_MESSAGES/phpwiki.php
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php 2013-06-18 12:34:10 UTC (rev 8813)
+++ trunk/lib/config.php 2013-06-18 12:55:27 UTC (rev 8814)
@@ -252,15 +252,7 @@
}
// Try to put new locale into environment (so any
// programs we run will get the right locale.)
- if (!function_exists('bindtextdomain')) {
- // Reinitialize translation array.
- global $locale;
- $locale = array();
- // do reinit to purge PHP's static cache [43ms]
- if (($lcfile = FindLocalizedFile("LC_MESSAGES/phpwiki.php", 'missing_ok', 'reinit'))) {
- include($lcfile);
- }
- } else {
+ if (function_exists('bindtextdomain')) {
// If PHP is in safe mode, this is not allowed,
// so hide errors...
@putenv("LC_ALL=$setlocale");
Copied: trunk/lib/plugin/WikiTranslation.php (from rev 8810, trunk/lib/plugin/_WikiTranslation.php)
===================================================================
--- trunk/lib/plugin/WikiTranslation.php (rev 0)
+++ trunk/lib/plugin/WikiTranslation.php 2013-06-18 12:55:27 UTC (rev 8814)
@@ -0,0 +1,557 @@
+<?php
+
+/*
+ * Copyright 2004,2005 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * _WikiTranslation: Display pagenames and other strings in various languages.
+ * Can also be used to let a favorite translation service translate a whole page.
+ * Current favorite: translate.google.com if from_lang = en or fr
+ *
+ * Examples:
+ * <<WikiTranslation page=HomePage languages=fr >>
+ * Translation service for HomePage into french (redirect to translate.google.com)
+ * <<WikiTranslation what=pages >>
+ * Translation matrix of all pages with proper translations (all in pgsrc)
+ * <<WikiTranslation what=wikiwords match="W*" limit=20 >>
+ * Translation matrix of the first 20 wikiwords matching "W*"
+ * <<WikiTranslation string=HomePage languages=fr,de,sv >>
+ * Translation matrix for all given languages
+ * <<WikiTranslation string=HomePage >>
+ * Translation matrix for all supported languages
+ * <<WikiTranslation string=HomePage languages=fr >>
+ * Just return the translated string for this language.
+ *
+ * @author: Reini Urban
+ */
+
+/* Container for untranslated pagenames. Needed to show up in locale/po/phpwiki.pot */
+$pgsrc_container =
+ _("AddComment") . ',' .
+ _("AddCommentPlugin") . ',' .
+ _("AddingPages") . ',' .
+ _("AllPages") . ',' .
+ _("AllPagesCreatedByMe") . ',' .
+ _("AllPagesLastEditedByMe") . ',' .
+ _("AllPagesOwnedByMe") . ',' .
+ _("AllUsers") . ',' .
+ _("AnalyseAccessLogSql") . ',' .
+ _("AppendText") . ',' .
+ _("AsciiMath") . ',' .
+ _("AsciiSVG") . ',' .
+ _("AtomFeed") . ',' .
+ _("DebugAuthInfo") . ',' .
+ _("AuthorHistory") . ',' .
+ _("AuthorHistoryPlugin") . ',' .
+ _("DebugBackendInfo") . ',' .
+ _("BackLinks") . ',' .
+ _("BlogArchives") . ',' .
+ _("BlogJournal") . ',' .
+ _("BoxRight") . ',' .
+ _("CacheTest") . ',' .
+ _("Calendar") . ',' .
+ _("CalendarList") . ',' .
+ _("CalendarListPlugin") . ',' .
+ _("CalendarPlugin") . ',' .
+ _("CategoryCategory") . ',' .
+ _("CategoryHomePages") . ',' .
+ _("CategoryPage") . ',' .
+ _("Chart") . ',' .
+ _("Chown") . ',' .
+ _("Comment") . ',' .
+ _("CommentPlugin") . ',' .
+ _("CreateBib") . ',' .
+ _("CreatePage") . ',' .
+ _("CreateToc") . ',' .
+ _("CreateTocPlugin") . ',' .
+ _("CurrentTime") . ',' .
+ _("DeadEndPages") . ',' .
+ _("DebugInfo") . ',' .
+ _("Diff") . ',' .
+ _("DynamicIncludePage") . ',' .
+ _("EditMetaData") . ',' .
+ _("EditMetaDataPlugin") . ',' .
+ _("ExternalSearch") . ',' .
+ _("ExternalSearchPlugin") . ',' .
+ _("FacebookLike") . ',' .
+ _("FileInfo") . ',' .
+ _("FindPage") . ',' .
+ _("FoafViewer") . ',' .
+ _("FoafViewerPlugin") . ',' .
+ _("FrameInclude") . ',' .
+ _("FrameIncludePlugin") . ',' .
+ _("FullRecentChanges") . ',' .
+ _("FullTextSearch") . ',' .
+ _("FuzzyPages") . ',' .
+ _("GoogleMaps") . ',' .
+ _("GooglePlugin") . ',' .
+ _("GoTo") . ',' .
+ _("GraphViz") . ',' .
+ _("DebugGroupInfo") . ',' .
+ _("HelloWorld") . ',' .
+ _("HelloWorldPlugin") . ',' .
+ _("HomePageAlias") . ',' .
+ _("HtmlConverter") . ',' .
+ _("Imdb") . ',' .
+ _("IncludePage") . ',' .
+ _("IncludePagePlugin") . ',' .
+ _("IncludePages") . ',' .
+ _("IncludeSiteMap") . ',' .
+ _("IncludeTree") . ',' .
+ _("InterWiki") . ',' .
+ _("InterWikiSearch") . ',' .
+ _("JabberPresence") . ',' .
+ _("LdapSearch") . ',' .
+ _("LikePages") . ',' .
+ _("LinkDatabase") . ',' .
+ _("LinkIcons") . ',' .
+ _("LinkSearch") . ',' .
+ _("ListPages") . ',' .
+ _("ListRelations") . ',' .
+ _("ListSubpages") . ',' .
+ _("MagicPhpWikiURLs") . ',' .
+ _("MediawikiTable") . ',' .
+ _("ModeratedPage") . ',' .
+ _("MoreAboutMechanics") . ',' .
+ _("MostPopular") . ',' .
+ _("NewPagesPerUser") . ',' .
+ _("NoCache") . ',' .
+ _("OldStyleTable") . ',' .
+ _("OldStyleTablePlugin") . ',' .
+ _("OrphanedPages") . ',' .
+ _("PageDump") . ',' .
+ _("PageGroup") . ',' .
+ _("PageHistory") . ',' .
+ _("PageInfo") . ',' .
+ _("PageTrail") . ',' .
+ _("PasswordReset") . ',' .
+ _("PhotoAlbum") . ',' .
+ _("PhotoAlbumPlugin") . ',' .
+ _("PhpHighlight") . ',' .
+ _("PhpHighlightPlugin") . ',' .
+ _("PhpWeather") . ',' .
+ _("PhpWeatherPlugin") . ',' .
+ _("PhpWiki") . ',' .
+ _("PhpWikiAdministration") . ',' .
+ _("PhpWikiDocumentation") . ',' .
+ _("PhpWikiPoll") . ',' .
+ _("Ploticus") . ',' .
+ _("PloticusPlugin") . ',' .
+ _("PluginManager") . ',' .
+ _("PopularNearby") . ',' .
+ _("PopularTags") . ',' .
+ _("PopUp") . ',' .
+ _("PreferenceApp") . ',' .
+ _("PreferencesInfo") . ',' .
+ _("PrevNext") . ',' .
+ _("Processing") . ',' .
+ _("RandomPage") . ',' .
+ _("RateIt") . ',' .
+ _("RawHtml") . ',' .
+ _("RawHtmlPlugin") . ',' .
+ _("RecentChanges") . ',' .
+ _("RecentChangesCached") . ',' .
+ _("RecentComments") . ',' .
+ _("RecentEdits") . ',' .
+ _("RecentReferrers") . ',' .
+ _("RecentVisitors") . ',' .
+ _("RedirectTo") . ',' .
+ _("RedirectToPlugin") . ',' .
+ _("RelatedChanges") . ',' .
+ _("ReleaseNotes") . ',' .
+ _("Remove") . ',' .
+ _("Rename") . ',' .
+ _("Replace") . ',' .
+ _("DebugRetransform") . ',' .
+ _("RichTable") . ',' .
+ _("RichTablePlugin") . ',' .
+ _("RssFeed") . ',' .
+ _("SearchHighlight") . ',' .
+ _("SemanticRelations") . ',' .
+ _("SemanticSearch") . ',' .
+ _("SemanticSearchAdvanced") . ',' .
+ _("SetAcl") . ',' .
+ _("SiteMap") . ',' .
+ _("SpellCheck") . ',' .
+ _("SpecialPages") . ',' .
+ _("SqlResult") . ',' .
+ _("SyncWiki") . ',' .
+ _("SyntaxHighlighter") . ',' .
+ _("SystemInfo") . ',' .
+ _("SystemInfoPlugin") . ',' .
+ _("Template") . ',' .
+ _("TeX2png") . ',' .
+ _("text2png") . ',' .
+ _("TextFormattingRules") . ',' .
+ _("TexToPng") . ',' .
+ _("TitleSearch") . ',' .
+ _("Transclude") . ',' .
+ _("TranscludePlugin") . ',' .
+ _("TranslateText") . ',' .
+ _("UnfoldSubpages") . ',' .
+ _("UnfoldSubpagesPlugin") . ',' .
+ _("UpLoad") . ',' .
+ _("UpLoadPlugin") . ',' .
+ _("UriResolver") . ',' .
+ _("UserPreferences") . ',' .
+ _("UserRatings") . ',' .
+ _("Video") . ',' .
+ _("VisualWiki") . ',' .
+ _("WabiSabi") . ',' .
+ _("WantedPages") . ',' .
+ _("WantedPagesOld") . ',' .
+ _("WatchPage") . ',' .
+ _("WhoIsOnline") . ',' .
+ _("WikiAdminChown") . ',' .
+ _("WikiAdminDeleteAcl") . ',' .
+ _("WikiAdminPurge") . ',' .
+ _("WikiAdminRemove") . ',' .
+ _("WikiAdminRename") . ',' .
+ _("WikiAdminSearchReplace") . ',' .
+ _("WikiAdminSelect") . ',' .
+ _("WikiAdminSetAcl") . ',' .
+ _("WikiAdminSetAclSimple") . ',' .
+ _("WikiAdminSetExternal") . ',' .
+ _("WikiAdminUtils") . ',' .
+ _("WikiBlog") . ',' .
+ _("WikiBlogPlugin") . ',' .
+ _("WikicreoleTable") . ',' .
+ _("WikiForm") . ',' .
+ _("WikiFormRich") . ',' .
+ _("WikiForum") . ',' .
+ _("WikiPlugin") . ',' .
+ _("WikiPoll") . ',' .
+ _("WikiTranslation") . ',' .
+ _("WikiWikiWeb") . ',' .
+ _("YouTube");
+
+require_once 'lib/PageList.php';
+
+class WikiPlugin_WikiTranslation
+ extends WikiPlugin
+{
+
+ function getDescription()
+ {
+ return _("Show translations of various words or pages.");
+ }
+
+ function getDefaultArguments()
+ {
+ return array_merge
+ (
+ PageList::supportedArgs(),
+ array('languages' => '', // comma delimited string of de,en,sv,...
+ 'string' => '',
+ 'page' => '', // use a translation service
+ 'what' => 'pages', // or 'buttons', 'plugins' or 'wikiwords'
+
+ 'match' => '*',
+ 'from_lang' => false,
+ 'include_empty' => false,
+ //'exclude' => '',
+ //'sortby' => '',
+ //'limit' => 0,
+ 'nolinks' => false, // don't display any links
+ // (for development only)
+ 'noT' => false // don't display the T link
+ // (for development only)
+ ));
+ }
+
+ function init_locale($lang)
+ {
+ if ($lang != $this->lang)
+ update_locale($lang);
+ $this->_locales[$lang] = $locale;
+ }
+
+ // reverse translation:
+ function translate_to_en($text, $lang = false)
+ {
+ if (!$lang) $lang = $this->lang; // current locale
+ if ($lang == 'en') return $text;
+
+ $this->_locales = array();
+ $this->_reverse_locales = array();
+
+ if (!isset($this->_locales[$lang])) {
+ $this->init_locale($lang);
+ }
+ assert(!empty($this->_locales[$lang]));
+ if (!isset($this->_reverse_locales[$lang])) {
+ // and now do a reverse lookup in the $locale hash
+ $this->_reverse_locales[$lang] = array_flip($this->_locales[$lang]);
+ }
+ if (!empty($this->_reverse_locales[$lang][$text])) {
+ return $this->_reverse_locales[$lang][$text];
+ } else {
+ return $text;
+ }
+ }
+
+ /**
+ * setlocale() switching with the gettext extension is by far too slow.
+ * So use the hash regardless if gettext is loaded or not.
+ */
+ function fast_translate($text, $to_lang, $from_lang = false)
+ {
+ if (!$from_lang) $from_lang = $this->lang; // current locale
+ if ($from_lang == $to_lang) return $text;
+ // setup hash from en => to_lang
+ if (!isset($this->_locales[$to_lang]))
+ $this->init_locale($to_lang);
+ if ($from_lang != 'en') {
+ // get reverse gettext: translate to english
+ $text = $this->translate_to_en($text, $from_lang);
+ }
+ return !empty($this->_locales[$to_lang][$text])
+ ? $this->_locales[$to_lang][$text]
+ : $text;
+ }
+
+ //FIXME! There's something wrong.
+ function translate($text, $to_lang, $from_lang = false)
+ {
+ if (!$from_lang) $from_lang = $this->lang; // current locale
+ if ($from_lang == $to_lang) return $text;
+ // Speed up hash lookup. Not needed for gettext module
+ if (!isset($this->_locales[$from_lang]) and !function_exists('bindtextdomain')) {
+ $this->init_locale($from_lang);
+ }
+ if ($from_lang != 'en') {
+ // get reverse gettext: translate to english
+ $en = $this->translate_to_en($text, $from_lang);
+ // and then to target
+ update_locale($to_lang);
+ $result = gettext($en);
+ update_locale($from_lang);
+ } else {
+ // locale switching is very slow with the gettext extension.
+ // better use fast_translate
+ if ($from_lang != $to_lang) {
+ update_locale($to_lang);
+ }
+ $result = gettext($text);
+ if ($from_lang != $to_lang) {
+ update_locale($from_lang);
+ }
+ }
+ return $result;
+ }
+
+ function run($dbi, $argstr, &$request, $basepage)
+ {
+ $this->args = $this->getArgs($argstr, $request);
+ extract($this->args);
+ $this->request = &$request;
+ if (!$from_lang) $from_lang = $request->getPref('lang');
+ if (!$from_lang) $from_lang = $GLOBALS['LANG'];
+ $this->lang = $from_lang;
+
+ if (empty($languages)) {
+ $available_languages = listAvailableLanguages();
+ if ($from_lang == 'en') {
+ // "en" is always the first.
+ array_shift($available_languages);
+ }
+ // put from_lang to the very end.
+ if (in_array($from_lang, $available_languages))
+ $languages = $available_languages;
+ else
+ $languages = array_merge($available_languages, array($from_lang));
+ } elseif (strstr($languages, ',')) {
+ $languages = explode(',', $languages);
+ } else {
+ $languages = array($languages);
+ }
+ $to_lang = $languages[0];
+ if (!empty($string) and count($languages) == 1) {
+ return $this->translate($string, $to_lang, $from_lang);
+ }
+ if (!empty($page)) {
+ $pagename = $page;
+ if ($dbi->isWikiPage($pagename)) {
+ $url = '';
+ // google can only translate from english and french
+ if (in_array($from_lang, array('en', 'fr'))) {
+ $url = "http://translate.google.com/translate";
+ $url .= "?langpair=" . urlencode($from_lang . "|" . $to_lang);
+ $url .= "&u=" . urlencode(WikiURL($pagename, false, true));
+ }
+ // redirect or transclude?
+ if ($url) {
+ return $request->redirect($url);
+ }
+ return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
+ WikiURL($pagename, false, true),
+ $to_lang));
+ } else {
+ return $this->error(fmt("%s is empty.", $pagename));
+ }
+ }
+
+ $pagelist = new PageList('', $exclude, $this->args);
+ $pagelist->_columns[0]->_heading = "$from_lang";
+ foreach ($languages as $lang) {
+ if ($lang == $from_lang) continue;
+ $field = "custom:$lang";
+ $pagelist->addColumnObject(
+ new _PageList_Column_customlang($field, $from_lang, $this));
+ }
+ if (!empty($string)) {
+ $pagelist->addPage($string);
+ return $pagelist;
+ }
+ switch ($what) {
+ case 'allpages':
+ $pagelist->addPages($dbi->getAllPages($include_empty, $sortby,
+ $limit, $exclude));
+ break;
+ case 'pages':
+ // not all pages, only the pgsrc pages
+ if (!is_array($exclude))
+ $exclude = $pagelist->explodePageList($exclude, false, $sortby,
+ $limit, $exclude);
+ $path = FindLocalizedFile(WIKI_PGSRC);
+ $pgsrc = new fileSet($path);
+ foreach ($pgsrc->getFiles($exclude, $sortby, $limit) as $pagename) {
+ $pagename = urldecode($pagename);
+ if (substr($pagename, -1, 1) == '~') continue;
+ if (in_array($pagename, $exclude))
+ continue; // exclude page.
+ if ($match != '*' and !glob_match($match, $pagename))
+ continue;
+ $page_handle = $dbi->getPage($pagename);
+ $pagelist->addPage($page_handle);
+ }
+ break;
+ case 'wikiwords':
+ if (!isset($this->_locales[$from_lang])) {
+ $this->init_locale($from_lang);
+ }
+ $locale = & $this->_locales[$from_lang];
+ if (is_array($locale)) {
+ $count = 0;
+ foreach ($locale as $from => $to) {
+ if ($match != '*' and !glob_match($match, $from))
+ continue;
+ if (isWikiWord($from)) {
+ $count++;
+ $pagelist->addPage($from);
+ if ($limit and $count > $limit) break;
+ }
+ }
+ }
+ break;
+ // all Button texts, which need a localized .png
+ // where to get them from? templates/*.tmpl: Button()
+ // and WikiLink(?,'button')
+ // navbar links, actionpages, and admin requests
+ case 'buttons':
+ $buttons = $GLOBALS['AllActionPages'];
+ $fileset = new FileSet(FindFile("themes/MacOSX/buttons/en"),
+ "*.png");
+ foreach ($fileset->getFiles() as $file) {
+ $b = urldecode(substr($file, 0, -4));
+ if (!in_array($b, $buttons))
+ $buttons[] = $b;
+ }
+ $count = 0;
+ foreach ($buttons as $button) {
+ $pagelist->addPage($button);
+ if ($limit and ++$count > $limit) break;
+ }
+ break;
+ }
+ return $pagelist;
+ }
+}
+
+class _PageList_Column_customlang extends _PageList_Column
+{
+ function _PageList_Column_customlang($field, $from_lang, $plugin)
+ {
+ $this->_field = $field;
+ $this->_from_lang = $from_lang;
+ $this->_plugin =& $plugin;
+ $this->_what = $plugin->args['what'];
+ $this->_noT = $plugin->args['noT'];
+ $this->_nolinks = $plugin->args['nolinks'];
+ $this->_iscustom = substr($field, 0, 7) == 'custom:';
+ if ($this->_iscustom)
+ $this->_field = substr($field, 7);
+ //$heading = $field;
+ $this->dbi = &$GLOBALS['request']->getDbh();
+ $this->_PageList_Column_base($this->_field);
+ }
+
+ function _getValue($page, &$revision_handle)
+ {
+ if (is_object($page)) $text = $page->getName();
+ else $text = $page;
+ $trans = $this->_plugin->fast_translate($text, $this->_field,
+ $this->_from_lang);
+ // how to markup untranslated words and not existing pages?
+ // untranslated: (TODO) link to translation editor
+ if ($trans == $text or // untranslated
+ (($this->_from_lang != 'en') and
+ ($this->_field != 'en') and
+ ($trans == $this->_plugin->fast_translate($text, 'en',
+ $this->_from_lang))
+ )
+ ) {
+ global $WikiTheme;
+ $link = $WikiTheme->linkUnknownWikiWord($trans);
+ if (!($this->_noT or $this->_nolinks)
+ and $this->dbi->isWikiPage($trans)
+ ) {
+ $url = WikiURL($trans, array('action' => 'TranslateText',
+ 'lang' => $this->_field));
+ $button = $WikiTheme->makeButton('T', $url);
+ $button->addTooltip(sprintf(_("Define the translation for %s in %s"),
+ $trans, $this->_field));
+ $link = HTML::span($button);
+ $link->setAttr('class', 'wikiunknown');
+ $text = HTML::span($WikiTheme->maybeSplitWikiWord($trans));
+ $text->setAttr('style', 'text-decoration:line-through');
+ $link->pushContent($text);
+ return $link;
+ } elseif (is_object($page))
+ return ''; else // not existing: empty
+ return '';
+ } elseif (is_object($page)) {
+ if (!$this->_nolinks)
+ return WikiLink($trans, 'auto');
+ else
+ return $trans;
+ } else {
+ return $trans;
+ }
+ }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile 2013-06-18 12:34:10 UTC (rev 8813)
+++ trunk/locale/Makefile 2013-06-18 12:55:27 UTC (rev 8814)
@@ -30,13 +30,8 @@
mkdir -p $*/LC_MESSAGES
msgfmt -o $@ $<
-# Generate .php from .mo rather than .po to maximize
-# the probability of agreement between .mo and .php files.
-%/LC_MESSAGES/phpwiki.php : %/LC_MESSAGES/phpwiki.mo
- msgunfmt $< | awk -f make-php-trans.awk > $@
-
clean :
- rm -f ./*/LC_MESSAGES/phpwiki.mo ./*/LC_MESSAGES/phpwiki.php
+ rm -f ./*/LC_MESSAGES/phpwiki.mo
depend :
$(SHELL) update-makefile.sh
@@ -58,21 +53,21 @@
# (Run 'make depend' regenerate this section.)
#
po: po/de.po
-mo: de/LC_MESSAGES/phpwiki.mo de/LC_MESSAGES/phpwiki.php
+mo: de/LC_MESSAGES/phpwiki.mo
po: po/es.po
-mo: es/LC_MESSAGES/phpwiki.mo es/LC_MESSAGES/phpwiki.php
+mo: es/LC_MESSAGES/phpwiki.mo
po: po/fr.po
-mo: fr/LC_MESSAGES/phpwiki.mo fr/LC_MESSAGES/phpwiki.php
+mo: fr/LC_MESSAGES/phpwiki.mo
po: po/it.po
-mo: it/LC_MESSAGES/phpwiki.mo it/LC_MESSAGES/phpwiki.php
+mo: it/LC_MESSAGES/phpwiki.mo
po: po/ja.po
-mo: ja/LC_MESSAGES/phpwiki.mo ja/LC_MESSAGES/phpwiki.php
+mo: ja/LC_MESSAGES/phpwiki.mo
po: po/nl.po
-mo: nl/LC_MESSAGES/phpwiki.mo nl/LC_MESSAGES/phpwiki.php
+mo: nl/LC_MESSAGES/phpwiki.mo
po: po/sv.po
-mo: sv/LC_MESSAGES/phpwiki.mo sv/LC_MESSAGES/phpwiki.php
+mo: sv/LC_MESSAGES/phpwiki.mo
po: po/zh.po
-mo: zh/LC_MESSAGES/phpwiki.mo zh/LC_MESSAGES/phpwiki.php
+mo: zh/LC_MESSAGES/phpwiki.mo
#
${POT_FILE}: ../lib/ArchiveCleaner.php
${POT_FILE}: ../lib/AtomParser.php
@@ -140,7 +135,6 @@
${POT_FILE}: ../lib/plugin/AsciiSVG.php
${POT_FILE}: ../lib/plugin/AtomFeed.php
${POT_FILE}: ../lib/plugin/AuthorHistory.php
-${POT_FILE}: ../lib/plugin/_BackendInfo.php
${POT_FILE}: ../lib/plugin/BackLinks.php
${POT_FILE}: ../lib/plugin/BlogArchives.php
${POT_FILE}: ../lib/plugin/BlogJournal.php
@@ -157,7 +151,9 @@
${POT_FILE}: ../lib/plugin/CurrentTime.php
${POT_FILE}: ../lib/plugin/DeadEndPages.php
${POT_FILE}: ../lib/plugin/DebugAuthInfo.php
+${POT_FILE}: ../lib/plugin/DebugBackendInfo.php
${POT_FILE}: ../lib/plugin/DebugGroupInfo.php
+${POT_FILE}: ../lib/plugin/DebugRetransform.php
${POT_FILE}: ../lib/plugin/Diff.php
${POT_FILE}: ../lib/plugin/DynamicIncludePage.php
${POT_FILE}: ../lib/plugin/EditMetaData.php
@@ -210,7 +206,7 @@
${POT_FILE}: ../lib/plugin/PopularTags.php
${POT_FILE}: ../lib/plugin/PopUp.php
${POT_FILE}: ../lib/plugin/PreferenceApp.php
-${POT_FILE}: ../lib/plugin/_PreferencesInfo.php
+${POT_FILE}: ../lib/plugin/PreferencesInfo.php
${POT_FILE}: ../lib/plugin/PrevNext.php
${POT_FILE}: ../lib/plugin/Processing.php
${POT_FILE}: ../lib/plugin/RandomPage.php
@@ -223,7 +219,6 @@
${POT_FILE}: ../lib/plugin/RecentReferrers.php
${POT_FILE}: ../lib/plugin/RedirectTo.php
${POT_FILE}: ../lib/plugin/RelatedChanges.php
-${POT_FILE}: ../lib/plugin/_Retransform.php
${POT_FILE}: ../lib/plugin/RichTable.php
${POT_FILE}: ../lib/plugin/RssFeed.php
${POT_FILE}: ../lib/plugin/SearchHighlight.php
@@ -270,7 +265,7 @@
${POT_FILE}: ../lib/plugin/WikiFormRich.php
${POT_FILE}: ../lib/plugin/WikiForum.php
${POT_FILE}: ../lib/plugin/WikiPoll.php
-${POT_FILE}: ../lib/plugin/_WikiTranslation.php
+${POT_FILE}: ../lib/plugin/WikiTranslation.php
${POT_FILE}: ../lib/plugin/YouTube.php
${POT_FILE}: ../lib/prepend.php
${POT_FILE}: ../lib/purgepage.php
Modified: trunk/locale/README
===================================================================
--- trunk/locale/README 2013-06-18 12:34:10 UTC (rev 8813)
+++ trunk/locale/README 2013-06-18 12:55:27 UTC (rev 8814)
@@ -73,7 +73,7 @@
Empty strings will be kept in english.
3. Run 'make' to automatically create or update any additional files
- ('.po' => '.mo' => 'phpwiki.php' files).
+ ('.po' => '.mo' files).
4. Create translations of the content for the default pages ('pgsrc'
files).
@@ -167,11 +167,7 @@
just ask one of the PhpWiki programmers on the mailing list to help
out.
-The 'phpwiki.php' files do not need to be created or edited because
-the Makefile will create and update these files automatically. See the
-'Makefile' section below.
-
Default Pages
-------------
Most of the work will be in the translation of the default pgsrc
@@ -242,7 +238,7 @@
changed. This makes it easy for translators to spot which items need
to be updated. (Emacs' po mode also uses this information).
- * The necessary '.mo' files and 'phpwiki.php' text files are
+ * The necessary '.mo' files are
synchronized and sorted according to the translated contents of the
'.po' files, for each of the locale subdirectories.
@@ -287,8 +283,7 @@
msgid "%s: %s"
msgstr "%s : %s"
- 6. To update the compiled translation files (phpwiki.mo and
- phpwiki.php):
+ 6. To update the compiled translation files (phpwiki.mo):
make
@@ -298,8 +293,8 @@
developers who will run Makefile for you.
-NOTE: "Fuzzy" translations will NOT be included in the final '.mo' and
-'phpwiki.php' files. If you are not using the emacs editor, make sure
+NOTE: "Fuzzy" translations will NOT be included in the final '.mo'
+files. If you are not using the emacs editor, make sure
to remove the fuzzy marks from any *completed translations* before you
run the makefile, like this:
Modified: trunk/locale/README.de.txt
===================================================================
--- trunk/locale/README.de.txt 2013-06-18 12:34:10 UTC (rev 8813)
+++ trunk/locale/README.de.txt 2013-06-18 12:55:27 UTC (rev 8814)
@@ -14,15 +14,12 @@
Nightly CVS snapshot:
http://phpwiki.sf.net/nightly/phpwiki.nightly.tar.gz
-Beachten Sie bei der weiteren Bearbeitung bitte, dass Sie die Datei:
-phpwiki/locale/de/LC_MESSAGES/phpwiki.php direkt nicht editieren
-sollten, sondern vielmehr folgende: phpwiki/locale/po/de.po. Achten
-Sie auch darauf, diese Datei mit UTF-8 abzuspeichern (nicht mit ISO-8859-1,
+Achten Sie auch darauf, diese Datei mit UTF-8 abzuspeichern (nicht mit ISO-8859-1,
Macintosh-Charset oder Windows-1252), sonst fehlen die Umlaute und das
nach älterer Schreibweise noch gebräuchliche scharfe S bzw. Sz "ß".
Zunächst wurden die Dateien in LC_MESSAGES automatisch erstellt:
-phpwiki.mo u. phpwiki.php. Das braucht aber GNUmake: (Seite auf
+phpwiki.mo. Das braucht aber GNUmake: (Seite auf
Englisch) http://www.gnu.org/software/make/make.html
cd phpwiki/locale
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Deleted: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-18 12:34:10 UTC (rev 8813)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-18 12:55:27 UTC (rev 8814)
@@ -1,1312 +0,0 @@
-<?php
-
-$locale[" %d%% (%d/%d)"] = " %d%% (%d/%d)";
-$locale[" %s AUTH ignored."] = "%s AUTH ignoriert.";
-$locale[" (to pages linked from \"%s\")"] = "(auf Seiten verlinkt von \"%s\")";
-$locale[" ... around “%s”"] = "... cirka “%s”";
-$locale[" ... first %d bytes"] = " ... erste %d Bytes";
-$locale[" ... first %d lines"] = " ... erste %d Zeilen";
-$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %d einzelne Autoren Revisionen.";
-$locale[" Keep the latest contributions of the last %d authors up to %d days."] = "Aufbewahrung der neueren Beiträge der letzten %d Autoren für %d Tage.";
-$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "Aufbewahrung kleinerer Änderungen für %d, aber nicht länger als %d Tage.";
-$locale[" Sorry, cannot merge."] = " Konnte leider nicht automatisch einpflegen.";
-$locale[" and "] = " und ";
-$locale[" is identical."] = " sind identisch.";
-$locale[" skipped"] = " ausgelassen";
-$locale[" to "] = " nach ";
-$locale["%4d %s\n"] = "%4d %s\n";
-$locale["%d UserPreferences fields successfully updated."] = "%d BenutzerEinstellungen erfolgreich auf neuesten Stand gebracht.";
-$locale["%d best incoming links: "] = "Die %d besten hereinkommenden Links: ";
-$locale["%d best outgoing links: "] = "Die %d besten hinausgehenden Links: ";
-$locale["%d homepages"] = "%d Homepages";
-$locale["%d minutes"] = "%d Minuten";
-$locale["%d most popular nearby: "] = "Die %d meistbesuchten Seiten in der Nähe: ";
-$locale["%d not-empty pages"] = "%d nicht leere Seiten";
-$locale["%d online users"] = "%d Benutzer Online";
-$locale["%d page(s) with more than %d hits (>%d%%)."] = "%d Seite(n) die mehr als %d aufgerufen haben (>%d%%).";
-$locale["%d pages"] = "%d Seiten";
-$locale["%d pages have been changed."] = "%d Seiten wurden geändert.";
-$locale["%d pages have been changed:"] = "%d Seiten wurden geändert:";
-$locale["%d pages have been permanently purged:"] = "%d Seiten wurden unwiderruflich gelöscht:";
-$locale["%d pages have been removed:"] = "%d Seiten wurden geändert:";
-$locale["%d pages have been renamed:"] = "%d Seiten wurden geändert:";
-$locale["%d pages with less than %d hits (<%d%%)."] = "%d Seiten die weniger als %d aufgerufen haben (<%d%%).";
-$locale["%s %s %s is disallowed on this wiki for %s user “%s” (level: %s)."] = "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht zugelassen.";
-$locale["%s KiB (%s bytes)"] = "%s KiB (%s Bytes)";
-$locale["%s already exists"] = "%s existiert bereits";
-$locale["%s at %s"] = "%s um %s";
-$locale["%s by %s"] = "%s von %s";
-$locale["%s bytes"] = "%s Bytes";
-$locale["%s bytes written"] = "%s Bytes geschrieben";
-$locale["%s days"] = "%s Tagen";
-$locale["%s does not appear to be a WikiPlugin."] = "%s scheint kein Zusatzprogramm zu sein.";
-$locale["%s does not exist"] = "%s existiert nicht";
-$locale["%s does not know about the language “%s”, using “en” instead."] = "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
-$locale["%s has no subpages defined."] = "%s hat keine zugewiesenen Unterseiten.";
-$locale["%s is disallowed on this wiki."] = "»%s« ist auf diesem Wiki nicht zugelassen.";
-$locale["%s is empty."] = "%s ist leer.";
-$locale["%s is listed at %s with %s"] = "%s ist gelistet auf %s mit %s";
-$locale["%s is missing"] = "%s Argument fehlt";
-$locale["%s is not locked!"] = "%s ist nicht gesperrt!";
-$locale["%s is not writable."] = "%s is nicht änderbar.";
-$locale["%s is only allowed in locked pages."] = "%s wird/werden nur in gesperrten Seiten erlaubt.";
-$locale["%s not defined"] = "%s nicht definiert";
-$locale["%s not found in %s"] = "%s nicht gefunden in %s";
-$locale["%s of this page"] = "%s von dieser Seite";
-$locale["%s on %s:"] = "%s um %s:";
-$locale["%s or %s parameter missing"] = "%s oder %s Argument fehlt";
-$locale["%s pages link to %s:"] = "%s Seiten sind mit %s verlinkt:";
-$locale["%s pages would link to %s:"] = "%s Seiten würden mit %s verlinkt sein:";
-$locale["%s parameter missing"] = "%s Argument fehlt";
-$locale["%s words"] = "%s Wörter";
-$locale["%s: %s"] = "%s: %s";
-$locale["%s: Bad action"] = "%s: Ungültige Aktion";
-$locale["%s: Can't open dba database"] = "%s: Konnte DBA Datenbank nicht öffnen";
-$locale["%s: Date of new revision is %s"] = "%s: Datum dieser aktuellen Neubearbeitung ist %s";
-$locale["%s: argument index out of range"] = "%s: Ungültiger Index in Array";
-$locale["%s: error while handling error:"] = "%s: Fehler während der Fehlerbehandlung von:";
-$locale["%s: file not found"] = "»%s«: Datei nicht gefunden";
-$locale["%s: no such class"] = "Unbekannte Klasse: »%s«";
-$locale["%s: no such revision %d."] = "%s(%d): keine solche Version.";
-$locale["%s: not a subclass of WikiPlugin."] = "%s scheint kein WikiPlugin zu sein.";
-$locale["%s: not defined"] = "%s: nicht definiert";
-$locale["&version=-1 might help."] = "&version=-1 wird empfohlen.";
-$locale["'s %d page ratings:"] = "s %d Seiten Bewertungen:";
-$locale["(%d Links)"] = "(%d Verweise)";
-$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)";
-$locale["(Currently not working)"] = "(Funktioniert momentan nicht)";
-$locale["(Redirected from %s)"] = "(Weitergeleitet von %s)";
-$locale["(Your preferences are stored as hidden data within this page.)"] = "(Ihre Einstellungen sind als versteckte Daten in dieser Seite hintergelegt.)";
-$locale["(diff)"] = "(diff)";
-$locale["(disable individual page permissions, enable inheritance)?"] = "(deaktiviere individuelle Zugriffsrechte, aktiviere Vererbung)";
-$locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] = "(formatiert für die PhpWiki Entwickler als pgsrc Vorlage, nicht zum Backup)";
-$locale["(formatted for backing up: all revisions)"] = "(formatiert zum Backup: Alle Versionen)";
-$locale["(max. recursion level: %d)"] = "(max. Rekursionstiefe: %d)";
-$locale["(normal formatting: latest revision only)"] = "(Normales Format: Nur aktuelle Version)";
-$locale[", Memory: %s"] = ", RAM: %s";
-$locale["- saved to database as version %d"] = "- in der Datenbank gespeichert als Version %d.";
-$locale["- version %d saved to database as version %d"] = "- version %d in der Datenbank gespeichert als Version %d";
-$locale["... (first %s words)"] = "... (erste %s Wörter)";
-$locale["... copied to %s"] = "... kopiert nach %s";
-$locale["... not copied to %s"] = "... nicht kopiert nach %s";
-$locale["... not found"] = "... nicht gefunden";
-$locale["1 day"] = "1 Tag";
-$locale["1 word"] = "1 Wort";
-$locale[":"] = ":";
-$locale[": "] = ": ";
-$locale["<%s: no such section>"] = "<%s: unbekannte Sektion>";
-$locale["<<ModeratedPage ... >> not found in first line of %s"] = "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden";
-$locale["<empty>"] = "<leer>";
-$locale["<no matches>"] = "<nichts gefunden>";
-$locale["<not displayed>"] = "<nicht angezeigt>";
-$locale["<system language>"] = "<Sprache des Servers>";
-$locale["<system theme>"] = "<Darstellung des Systems>";
-$locale["<unknown>"] = "<unbekannt>";
-$locale["A required argument “%s” is missing."] = "Erforderliches Argument »%s« fehlt.";
-$locale["ACCESS DENIED: You must log in to upload files."] = "ZUGRIFF VERWEIGERT: Bitte melden Sie sich erst an, um Dateien hochzuladen.";
-$locale["ACL"] = "ACL";
-$locale["ACL changed for page “%s”"] = "ACL für Seite »%s« geändert.";
-$locale["ACL changed for page “%s” from “%s” to “%s”."] = "ACL für Seite »%s« geändert von »%s« zu »%s«.";
-$locale["ACL deleted for page “%s”"] = "ACL für Seite »%s« gelöscht";
-$locale["ACL not changed for page “%s”."] = "ACL für Seite »%s« nicht geändert.";
-$locale["ADDING"] = "HINZU";
-$locale["ADMIN"] = "ADMIN";
-$locale["ANON"] = "ANON";
-$locale["About"] = "Über";
-$locale["Access"] = "Zugriff";
-$locale["Access denied to change page “%s”."] = "Zugang verweigert um Seite »%s« zu ändern.";
-$locale["Access denied to rename page “%s”."] = "Zugang verweigert um Seite “%s” zu ändern.";
-$locale["Action Page"] = "Aktion Seite";
-$locale["ActionPage"] = "Aktion Seite";
-$locale["Add %s"] = "%s Hinzufügen";
-$locale["Add %s hours to the server's local time when reporting times."] = "Addieren Sie %s Stunden zur lokalen Serverzeit, bei jeder Zeitanzeige (z.B. NeuesteÄnderungen).";
-$locale["Add Comment"] = "Neuer Kommentar";
-$locale["Add Message"] = "Neue Nachricht";
-$locale["Add this ACL"] = "Füge diese ACL hinzu";
-$locale["AddComment"] = "NeuerKommentar";
-$locale["AddCommentPlugin"] = "NeuerKommentarPlugin";
-$locale["AddingPages"] = "SeitenErzeugen";
-$locale["Adjust"] = "Justieren";
-$locale["Admin"] = "Admin";
-$locale["Admin is also online."] = "Administrator ist auch online.";
-$locale["Administrators"] = "Administratoren";
-$locale["All %s are listed below."] = "Alle %s sind unten aufgelistet.";
-$locale["All pages"] = "Alle Seiten";
-$locale["All pages in this wiki (%d total):"] = "Alle Seiten in diesem Wiki (%d insgesamt):";
-$locale["All pages with all links in this wiki (%d total):"] = "Alle Seiten mit allen Links in diesem Wiki (%d insgesamt):";
-$locale["All users"] = "Alle Benutzer";
-$locale["AllPages"] = "AlleSeiten";
-$locale["AllPagesCreatedByMe"] = "AlleSeitenErzeugtVonMir";
-$locale["AllPagesLastEditedByMe"] = "AlleSeitenEditiertVonMir";
-$locale["AllPagesOwnedByMe"] = "AlleSeitenImBesitzVonMir";
-$locale["AllUsers"] = "AlleBenutzer";
-$locale["Allow / Deny"] = "Erlaube / Sperre";
-$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] = "Erlaubt die Auswahl mehrerer Seiten, die dann mit weiteren WikiAdmin Zusatzprogrammen bearbeitet werden.";
-$locale["Already logged in"] = "Bereits eingeloggt";
-$locale["Also pages which have been deleted at least %s days."] = "Auch Seiten, die in den letzten %s Tagen gelöscht wurden.";
-$locale["An unnamed PhpWiki"] = "Unbenanntes PhpWiki";
-$locale["Analyze preferences based on voting budget and ratings."] = "Analysiere Empfehlungen auf Grund von Bewertungen.";
-$locale["Anonymous Users"] = "Anonyme Benutzer";
-$locale["Appearance"] = "Darstellung";
-$locale["Append text to any page in this wiki."] = "Füge Text zu einer Seite in diesem Wiki hinzu.";
-$locale["AppendText"] = "TextHinzufügen";
-$locale["AppendText to %s"] = "TextHinzufügen zu %s";
-$locale["Appending at the end."] = "Füge am Ende hinzu.";
-$locale["Application name"] = "Anwendungsname";
-$locale["Application size: %d KiB"] = "Anwendungsplatzbedarf: %d KiB";
-$locale["Apply changes"] = "Änderungen anwenden";
-$locale["Approve"] = "Akzeptieren";
-$locale["Are you sure you want to change the owner of the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
-$locale["Are you sure you want to permanently change access rights to the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
-$locale["Are you sure you want to permanently purge the following files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
-$locale["Are you sure you want to remove the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
-$locale["Are you sure you want to rename the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?";
-$locale["Are you sure you want to replace text in the selected files?"] = "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen wollen?";
-$locale["Argument “%s” not declared by plugin."] = "Argument »%s« nicht im Zusatzprogramm deklariert.";
-$locale["Arguments"] = "Parameter";
-$locale["Attempting to use the directory “%s” instead."] = "Versuche stattdessen das Verzeichnis »%s« zu verwenden.";
-$locale["Attribute"] = "Attribut";
-$locale["Attribute %s, base value: %s"] = "Attribut %s, Basis: %s";
-$locale["Attribute %s, value: %s"] = "Attribut %s, Wert: %s";
-$locale["Attributes"] = "Attribute";
-$locale["Attributes of %s"] = "Attribute für %s";
-$locale["Auth Level"] = "Auth. Ebene";
-$locale["Auth Method"] = "Auth. Methode";
-$locale["Authenticated Users"] = "Authentifizierte Benutzer";
-$locale["Authenticated as %s"] = "Authentifiziert als %s";
-$locale["Authenticated users on this wiki (%d total):"] = "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):";
-$locale["Author"] = "Autor";
-$locale["Author will be logged as %s."] = "%s wird als Autor aufgenommen.";
-$locale["AuthorHistory"] = "AutorenProtokoll";
-$locale["AuthorHistoryPlugin"] = "AutorenProtokollPlugin";
-$locale["Available plugins"] = "Verfügbare Einschubprogramme";
-$locale["Avg. Rating"] = "Durchschnittsbewertung";
-$locale["BAD phpwiki: URL"] = "phpwiki: URL Formfehler";
-$locale["BOGO"] = "BOGO";
-$locale["Back"] = "Zurück";
-$locale["Back Links"] = "Back Links";
-$locale["BackLinks"] = "BackLinks";
-$locale["BackLinks for %s"] = "BackLinks für %s";
-$locale["Backend type: "] = "Backend Typ: ";
-$locale["Bad URL -- remove all of <, >, \""] = "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \"";
-$locale["Bad URL for image -- remove all of <, >, \""] = "URL Formfehler für Bild - Entfernen Sie alle Zeichen mit <, >, \"";
-$locale["Bad Version"] = "Ungültige Version";
-$locale["Bad file type: %s"] = "Ungültiger Dateityp: %s";
-$locale["Bad url in src: remove all of <, >, \""] = "URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \"";
-$locale["Blog"] = "Blog";
-$locale["Blog Archives:"] = "Blog-Archive:";
-$locale["Blog Entries for %s:"] = "Blog-Einträge für %s:";
-$locale["Blog page"] = "Blog Seite";
-$locale["BlogArchives"] = "BlogArchiv";
-$locale["Bogo Users"] = "Bogo Benutzer";
-$locale["Bold text"] = "Fetter Text";
-$locale["Bold text [alt-b]"] = "Fetter Text [alt-f]";
-$locale["Browsing pages"] = "Das Durchblättern der Seiten dieses Wikis";
-$locale["CONVERTING"] = "KONVERTIERE";
-$locale["CREATED"] = "ERZEUGT";
-$locale["Cache statistics"] = "Cache Statistiken";
-$locale["CacheTest"] = "CacheTest";
-$locale["Calendar"] = "Kalender";
-$locale["CalendarList"] = "KalenderListe";
-$locale["CalendarListPlugin"] = "KalenderListePlugin";
-$locale["CalendarPlugin"] = "KalenderPlugin";
-$locale["Can't inflate data: zlib support not enabled in this PHP"] = "Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht installiert/aktiviert.";
-$locale["Can't mix “%s” with “%s” type format strings"] = "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen.";
-$locale["Can't open the upload logfile."] = "Die Upload-Logdatei konnte nicht geöffnet worden.";
-$locale["Can't open zip file “%s” for reading"] = "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen";
-$locale["Cancel"] = "Abbrechen";
-$locale["Cancel your rating"] = "Bewertung löschen";
-$locale["Cannot create directory “%s”"] = "Das Verzeichnis »%s« kann nicht erzeugt werden";
-$locale["Cannot create page with empty name!"] = "Kann Seite mit leerem Namen nicht erzeugen";
-$locale["Cannot open AUTH_GROUP_FILE %s"] = "Kann AUTH_GROUP_FILE %s nicht öffnen";
-$locale["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang.";
-$locale["Case exact?"] = "Groß-/Kleinschreibung beachten";
-$locale["Case insensitive?"] = "Groß-/Kleinschreibung beachten?";
-$locale["Category"] = "Kategorie";
-$locale["CategoryCategory"] = "KategorieKategorie";
-$locale["CategoryGroup"] = "KategorieGruppen";
-$locale["CategoryHomePages"] = "KategorieHomepage";
-$locale["CategoryHomepage"] = "KategorieHomepage";
-$locale["CategoryPage"] = "KategorieSeite";
-$locale["Change Password"] = "Ändere Passwort";
-$locale["Change Verification Status"] = "Ändere Bestätigungs-Status";
-$locale["Change country"] = "Land ändern";
-$locale["Change owner of page “%s” to “%s”."] = "Besitzer der Seite »%s« auf »%s« geändert.";
-$locale["Change owner of selected pages."] = "Den Besitzer ausgewählte Seiten ändern.";
-$locale["Change owner to: "] = "Besitzer ändern zu: ";
-$locale["Change page attributes"] = "Ändern von Eigenschaften";
-$locale["Change your rating from "] = "Ändern Sie Ihre Bewertung ab ";
-$locale["Changes"] = "Änderungen";
-$locale["Check any two boxes then %s."] = "Wählen Sie zwei Versionen aus, dann %s.";
-$locale["Check any two boxes to compare revisions."] = "Wählen Sie zwei Versionen zum Vergleich aus.";
-$locale["Check for %s"] = "Prüfe %s";
-$locale["Check for ACCESS_LOG_SQL passwords in POST requests"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
-$locale["Check for ACCESS_LOG_SQL remote_host varchar(50)"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
-$locale["Check for mysql 4.1.x/5.0.0 binary search on Windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)";
-$locale["Check for mysql LOCK TABLE privilege"] = "Prüfe mysql LOCK TABLE Rechte";
-$locale["Check for mysql page.id auto_increment flag"] = "Prüfe auf mysql page.id auto_increment Flag";
-$locale["Check for mysql session.sess_id sanity"] = "Prüfe auf mysql session.sess_id Korrektheit";
-$locale["Check for new session.sess_ip column"] = "Prüfe auf neue Spalte session.sess_ip column";
-$locale["Check for table %s"] = "Prüfe Tabelle %s";
-$locale["Check menu items to display."] = "Klicken um anzuzeigen.";
-$locale["Check to add this ACL"] = "Anklicken um diese ACL hinzuzufügen";
-$locale["Check you are logged in."] = "Sie sollten jetzt angemeldet sein.";
-$locale["Chown"] = "Chown";
-$locale["Click to authenticate as %s"] = "Hier klicken um sich anzumelden als %s";
-$locale["Click to de-/select all pages"] = "Klicken Sie um alle/keine Seiten auszuwählen";
-$locale["Click to display"] = "Klicken um anzuzeigen";
-$locale["Click to display all comments"] = "Klicken um Kommentare anzuzeigen";
-$locale["Click to display to TOC"] = "Klicken um TOC anzuzeigen";
-$locale["Click to hide the comments"] = "Klicken um Kommentare zu verstecken";
-$locale["Click to hide/show"] = "Hier klicken um zu verstecken";
-$locale["Click to reverse sort order"] = "Klicken Sie um die Reihenfolge umzudrehen";
-$locale["Click to sort by %s"] = "Sortiere nach %s";
-$locale["Close"] = "Schließen";
-$locale["Color"] = "Farbe";
-$locale["Color text"] = "Farbiger Text";
-$locale["Columns: %s."] = "Spalten: %s.";
-$locale["Comment"] = "Kommentar";
-$locale["Comment modified on %s by %s"] = "Kommentare am %s geändert von %s";
-$locale["CommentPlugin"] = "KommentarPlugin";
-$locale["Comments"] = "Kommentare";
-$locale["Comments on %s by %s."] = "Kommentar zu %s von %s.";
-$locale["Complete."] = "Fertig.";
-$locale["Conflicting Edits!"] = "Widersprechende Änderungen!";
-$locale["Content"] = "Inhalt";
-$locale["Contents"] = "Inhalt";
-$locale["ContributedTranslations"] = "MeineÜbersetzungen";
-$locale["Control characters not allowed"] = "Steuerzeichen nicht erlaubt";
-$locale["Convert"] = "Konvertieren";
-$locale["Convert text into a PNG image using GD."] = "Text mit der GD Bibliothek in ein PNG Bild konvertieren.";
-$locale["Converted successfully %d pages"] = "%d Seiten erfolgreich konvertiert";
-$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden.";
-$locale["Copyrights"] = "Urheberrechte";
-$locale["Could not change owner of page “%s” to “%s”."] = "Konnte den Besitzer der Seite »%s« nicht in »%s« ändern.";
-$locale["Could not connect to LDAP host %s"] = "Kann nicht zu LDAP host »%s« verbinden";
-$locale["Couldn't connect to %s"] = "Kann nicht zu »%s« verbinden";
-$locale["Couldn't rename page “%s” to “%s”."] = "Konnte Seite »%s« nicht in »%s« umbenennen.";
-$locale["Couldn't start commandline “%s”"] = "Konnte Programm »%s« nicht starten";
-$locale["Count"] = "Anzahl";
-$locale["Create Page"] = "Neue Seite";
-$locale["Create a Wiki Category Page."] = "Erzeuge eine neue Wiki-Seite.";
-$locale["Create a new (sub)page"] = "Erzeuge eine neue (Unter)Seite";
-$locale["Create a wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
-$locale["Create: %s"] = "Erzeugen: %s";
-$locale["CreatePage"] = "NeueSeite";
-$locale["CreateToc"] = "InhaltsVerzeichnis";
-$locale["CreateTocPlugin"] = "InhaltsVerzeichnisPlugin";
-$locale["Created by CreatePage"] = "Erzeugt von NeueSeite";
-$locale["Created by: %s"] = "Erzeugt von: %s";
-$locale["Created directory “%s” for the page dump..."] = "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
-$locale["Creating pages"] = "Neue Seiten erzeugen";
-$locale["Creator"] = "Erzeuger";
-$locale["Current language"] = "Ausgewählte Sprache";
-$locale["Current theme"] = "Ausgewählte Darstellung";
-$locale["CurrentTime"] = "AktuelleZeit";
-$locale["DB admin password:"] = "DB Admin passwort:";
-$locale["DB admin user:"] = "DB Admin Benutzername:";
-$locale["Database"] = "Datenbank";
-$locale["Date Format"] = "Datumsformat";
-$locale["DeadEndPages"] = "VerwaisteSeiten";
-$locale["DebugGroupInfo"] = "DebugGruppenInfo";
-$locale["DebugInfo"] = "DebugInfo";
-$locale["Default InterWiki map file not loaded."] = "Standard-Datei der InterWikiListe nicht geladen.";
-$locale["Default language: “%s”"] = "Standardsprache für dieses Wiki: »%s«";
-$locale["Default preferences will be used."] = "Die Vorgabe Benutzereinstellungen werden verwendent.";
-$locale["Default theme: “%s”"] = "Darstellung des Systems: »%s«";
-$locale["Define a translation for a specified text."] = "Definiere die Übersetzung für einen gegebenen Text.";
-$locale["Define the translation for %s in %s"] = "Definiere die Übersetzung für %s nach %s";
-$locale["Del/+"] = "Lö/+";
-$locale["Delete ACL"] = "Lösche diese ACL";
-$locale["Delete page permissions."] = "Seite Berechtigungen löschen.";
-$locale["Delete this ACL"] = "Lösche diese ACL";
-$locale["Deleted"] = "Gelöscht";
-$locale["Deleted %d pages with invalid names:"] = "%d Seiten mit ungültigen Namen gelöscht:";
-$locale["Deleted %d unreferenced pages:"] = "%d unverlinkte Seiten entfernt:";
-$locale["Describe %s here."] = "Beschreiben Sie %s hier.";
-$locale["Description"] = "Beschreibung";
-$locale["Dialog"] = "Dialog";
-$locale["Didn't purge page “%s”. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
-$locale["Didn't remove page “%s”. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
-$locale["Diff"] = "Diff";
-$locale["Diff previous Author"] = "Diff zu vorigem Autor";
-$locale["Diff previous Revision"] = "Diff zu voriger Version";
-$locale["Diff: %s"] = "Vergleich von: %s";
-$locale["Differences between %s and %s of %s."] = "Zeilenweiser Vergleich von %3\$s, von %1\$s mit %2\$s.";
-$locale["Diffing pages"] = "Die Inhalts-Differenz-Seiten dieses Wikis";
-$locale["Discussion"] = "Diskussion";
-$locale["Display a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten.";
-$locale["Display a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen.";
-$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt.";
-$locale["Display arbitrary SQL result tables."] = "Zeige Tabelle von SQL Abfragen an.";
-$locale["Display differences between revisions."] = "Zeilenweiser Vergleich der Versionen.";
-$locale["Don't cache this page."] = "Cache diese Seite nicht.";
-$locale["Double redirect not allowed."] = "Rekursive Redirektion verboten.";
-$locale["Download all revisions for backup"] = "Alle Versionen für Backup herunterladen";
-$locale["Download for Subversion"] = "Für Subversion herunterladen";
-$locale["Download for backup"] = "Für Backup herunterladen";
-$locale["Download page contents"] = "Runterladen der Seite";
-$locale["Downloading html zip dumps"] = "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei";
-$locale["Downloading zip dumps"] = "Das Herunterladen aller Wiki-Seiten als gezippte Datei";
-$locale["Dump Pages"] = "Seiten Schreiben";
-$locale["Dump Pages as XHTML"] = "Seiten als XHTML schreiben";
-$locale["Dump to directory"] = "Wiki Seiten als Dateien in lokales Verzeichnis speichern";
-$locale["Dumping Pages"] = "Die Seiten werden geschrieben";
-$locale["Dumping html pages"] = "Die Speicherung von Wiki Seiten als HTML-Dateien";
-$locale["Dumping serial pages"] = "Die Speicherung von Wiki Seiten als Dateien";
-$locale["DynamicIncludePage"] = "DynamischeSeiteEinfügen";
-$locale["Dynamically include the content from another wiki page."] = "Text von einer andere Seite einfügen.";
-$locale["E-mail"] = "E-Mail";
-$locale["E-mail Notification"] = "E-Mail Bestätigung";
-$locale["E-mail address confirmation"] = "E-Mail Bestätigung";
-$locale["ERROR uploading “%s”"] = "FEHLER beim Hochladen von »%s«";
-$locale["Easy navigation buttons for %s."] = "Einfache Navgiationsknöpfe für %s.";
-$locale["Edit"] = "Bearbeiten";
-$locale["Edit %s"] = "Bearbeite %s";
-$locale["Edit Area Size"] = "Texteingabe Fenstergröße";
-$locale["Edit Old Revision"] = "Alte Version Bearbeiten";
-$locale["Edit aborted."] = "Bearbeiten abgebrochen.";
-$locale["Edit metadata for %s."] = "Meta-Daten für %s bearbeiten.";
-$locale["Edit this page"] = "Diese Seite bearbeiten";
-$locale["Edit this page and all subpages"] = "Bearbeiten aller Seiten und Unterseiten";
-$locale["Edit: %s"] = "Bearbeite: %s";
-$locale["EditMetaData"] = "MetaDatenBearbeiten";
-$locale["EditMetaDataPlugin"] = "MetaDatenBearbeitenPlugin";
-$locale["EditText"] = "TextBearbeiten";
-$locale["Edited by: %s"] = "Bearbeitet von: %s";
-$locale["Editing pages"] = "Ändern in diesem Wiki";
-$locale["Elapsed time: %s s"] = "Dauer: %s s";
-$locale["Embed hidden comments in WikiPages."] = "Kommentar in WikiText verstecken.";
-$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt.";
-$locale["Empty link to: %s"] = "Leerer Link zu: %s";
-$locale["Empty pagename!"] = "Leerer Seitenname!";
-$locale["Enable configurable polls."] = "Erlaubt konfigurierbare Umfragen.";
-$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt.";
-$locale["Enter your UserId to sign in"] = "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
-$locale["Entry on %s by %s."] = "Kommentar zu %s von %s.";
-$locale["Enumeration"] = "Num. Liste";
-$locale["Error sending e-mail with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
-$locale["Error: Couldn't send %s to %s"] = "Fehler: Konnte nicht %s an %s senden";
-$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
-$locale["Every"] = "Jeder";
-$locale["Exit toolbar"] = "Beende Werkzeugleiste";
-$locale["External"] = "Externe";
-$locale["External Links"] = "Externe Links";
-$locale["External link (remember http:// prefix)"] = "Externer Link (http:// prefix)";
-$locale["ExternalSearch"] = "FremdSuche";
-$locale["ExternalSearchPlugin"] = "FremdSuchePlugin";
-$locale["FAILED"] = "FEHLER";
-$locale["FIXED"] = "AUSGEBESSERT";
-$locale["FORBIDDEN"] = "VERBOTEN";
-$locale["Failed to bind LDAP host"] = "Konnte nicht mit LDAP Host verbinden";
-$locale["Failed to connect to LDAP host"] = "LDAP Server nicht gefunden";
-$locale["Fatal PhpWiki Error"] = "Fataler PhpWiki-Fehler";
-$locale["File successfully uploaded."] = "Datei erfolgreich hochgeladen.";
-$locale["File “%s” not found."] = "Datei »%s« nicht gefunden.";
-$locale["FileInfo"] = "DateiInfo";
-$locale["Files with extension %s are not allowed."] = "Dateien mit der Endung %s sind nicht erlaubt.";
-$locale["Find page"] = "Seite finden";
-$locale["FindPage"] = "SeiteFinden";
-$locale["First"] = "Erste";
-$locale["FoafViewer"] = "FoafBetrachter";
-$locale["FoafViewerPlugin"] = "FoafViewerPlugin";
-$locale["Found by "] = "Gefunden von ";
-$locale["FrameInclude"] = "FrameEinbetten";
-$locale["FrameIncludePlugin"] = "FrameEinbettenPlugin";
-$locale["From english to %s: "] = "Von Englisch nach %s: ";
-$locale["Full text search results for “%s”"] = "Volltext-Suchresultate nach »%s«";
-$locale["FullDump"] = "VollSicherung";
-$locale["FullRecentChanges"] = "AlleNeuesteÄnderungen";
-$locale["FullTextSearch"] = "VolltextSuche";
-$locale["FuzzyPages"] = "FuzzySuche";
-$locale["General Auth Settings"] = "Allgemeine Authentifizierungs-Einstellungen";
-$locale["Get an e-mail notification at changes of the following pages:"] = "E-Mail Nachricht bei Änderung folgender Seiten:";
-$locale["Get debugging information for %s."] = "Debug-Informationen von %s.";
-$locale["Get preferences information for current user %s."] = "Zeige Benutzereinstellungen für den aktuellen Benutzer %s.";
-$locale["Given password ignored."] = "Passwort ignoriert.";
-$locale["Global user preferences (for all projects)"] = "Globale Benutzereinstellungen (für alle Projekte)";
-$locale["Go"] = "Los";
-$locale["Go to %s."] = "Gehe zu %s.";
-$locale["Go to or create page."] = "Gehe zu oder erzeuge diese Seite.";
-$locale["Go?"] = "Los?";
-$locale["GoTo"] = "GeheZu";
-$locale["GoodStyle"] = "GuterStil";
-$locale["GooglePlugin"] = "GoogleZusatzprogramm";
-$locale["Grant"] = "Erlaube";
-$locale["Group %s does not exist"] = "Gruppe %s existiert nicht";
-$locale["Group page “%s” does not exist"] = "Gruppenseite »%s« existiert nicht";
-$locale["Group/User"] = "Gruppe/Benutzer";
-$locale["Guest"] = "Gast";
-$locale["Guests"] = "Gäste";
-$locale["H"] = "H.";
-$locale["Headline text"] = "Überschrift";
-$locale["Height"] = "Höhe";
-$locale["HelloWorld"] = "HalloWelt";
-$locale["HelloWorldPlugin"] = "HalloWeltPlugin";
-$locale["Help"] = "Hilfe";
-$locale["Here you can override site-specific default values."] = "Hier können Sie einige Voreinstellungen ändern.";...
[truncated message content] |
|
From: <var...@us...> - 2013-06-18 13:39:33
|
Revision: 8815
http://sourceforge.net/p/phpwiki/code/8815
Author: vargenau
Date: 2013-06-18 13:39:29 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Merge OldTextFormattingRules into TextFormattingRules; rename underscore plugins
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/PageList.php
trunk/lib/PageType.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlRpcServer.php
trunk/lib/diff.php
trunk/lib/editpage.php
trunk/lib/main.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikicreoleTable.php
trunk/lib/stdlib.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/Utils.php
trunk/lib/ziplib.php
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/default/templates/info.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/userprefs.tmpl
Added Paths:
-----------
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/DebugGroupInfo.php
trunk/lib/plugin/DebugRetransform.php
trunk/lib/plugin/PreferencesInfo.php
Removed Paths:
-------------
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_GroupInfo.php
trunk/lib/plugin/_PreferencesInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/_WikiTranslation.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/BlockParser.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -1401,17 +1401,12 @@
/**
* Transform the text of a page, and return a parse tree.
*/
-function TransformTextPre($text, $markup = 2.0, $basepage = false)
+function TransformTextPre($text, $basepage = false)
{
if (isa($text, 'WikiDB_PageRevision')) {
$rev = $text;
$text = $rev->getPackedContent();
- $markup = $rev->get('markup');
}
- // NEW: default markup is new, to increase stability
- if (!empty($markup) && $markup < 2.0) {
- $text = ConvertOldMarkup($text);
- }
// Expand leading tabs.
$text = expand_tabs($text);
$output = new WikiText($text);
@@ -1423,9 +1418,9 @@
* Transform the text of a page, and return an XmlContent,
* suitable for printXml()-ing.
*/
-function TransformText($text, $markup = 2.0, $basepage = false)
+function TransformText($text, $basepage = false)
{
- $output = TransformTextPre($text, $markup, $basepage);
+ $output = TransformTextPre($text, $basepage);
if ($basepage) {
// This is for immediate consumption.
// We must bind the contents to a base pagename so that
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/CachedMarkup.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -87,7 +87,7 @@
}
if (preg_match("/^\w+$/", $packed))
return $packed;
- // happened with _BackendInfo problem also.
+ // happened with DebugBackendInfo problem also.
trigger_error("Can't unpack bad cached markup. Probably php_zlib extension not loaded.",
E_USER_WARNING);
return false;
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/IniConfig.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -704,14 +704,14 @@
// The FUSIONFORGE theme omits them
if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
$AllAllowedPlugins[] = 'AnalyseAccessLogSql';
- $AllAllowedPlugins[] = '_AuthInfo';
- $AllAllowedPlugins[] = '_BackendInfo';
+ $AllAllowedPlugins[] = 'DebugAuthInfo';
+ $AllAllowedPlugins[] = 'DebugBackendInfo';
$AllAllowedPlugins[] = 'CacheTest';
$AllAllowedPlugins[] = 'CategoryPage';
$AllAllowedPlugins[] = 'FoafViewer';
$AllAllowedPlugins[] = 'FrameInclude';
$AllAllowedPlugins[] = 'GraphViz';
- $AllAllowedPlugins[] = '_GroupInfo';
+ $AllAllowedPlugins[] = 'DebugGroupInfo';
$AllAllowedPlugins[] = 'HtmlConverter';
$AllAllowedPlugins[] = 'Imdb';
$AllAllowedPlugins[] = 'JabberPresence';
@@ -720,7 +720,7 @@
$AllAllowedPlugins[] = 'Ploticus';
$AllAllowedPlugins[] = 'PopularNearby';
$AllAllowedPlugins[] = 'PreferenceApp';
- $AllAllowedPlugins[] = '_PreferencesInfo';
+ $AllAllowedPlugins[] = 'PreferencesInfo';
$AllAllowedPlugins[] = '_Retransform';
$AllAllowedPlugins[] = 'SqlResult';
$AllAllowedPlugins[] = 'TeX2png';
@@ -728,13 +728,12 @@
$AllAllowedPlugins[] = 'TexToPng';
$AllAllowedPlugins[] = 'VisualWiki';
$AllAllowedPlugins[] = 'WantedPagesOld';
- $AllAllowedPlugins[] = 'WikiAdminMarkup';
$AllAllowedPlugins[] = 'WikiForum';
- $AllAllowedPlugins[] = '_WikiTranslation';
+ $AllAllowedPlugins[] = 'WikiTranslation';
}
// Used by SetupWiki to pull in required pages, if not translated, then in English.
- // Also used by _WikiTranslation. Really important are only those which return pagelists
+ // Also used by WikiTranslation. Really important are only those which return pagelists
// or contain basic functionality.
$AllActionPages = $ActionPages;
$AllActionPages[] = 'AllPagesCreatedByMe';
@@ -764,11 +763,6 @@
$AllActionPages[] = 'SetGlobalAccessRightsSimple';
$AllActionPages[] = 'UserContribs';
- // The FUSIONFORGE theme omits them
- if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
- $AllActionPages[] = 'PhpWikiAdministration/Markup';
- }
-
if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
if (ENABLE_EXTERNAL_PAGES) {
$AllAllowedPlugins[] = 'WikiAdminSetExternal';
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/InlineParser.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
- * This is the code which deals with the inline part of the (new-style)
+ * This is the code which deals with the inline part of the
* wiki-markup.
*
* @package Markup
@@ -1435,7 +1435,7 @@
}
}
-function TransformInline($text, $markup = 2.0, $basepage = false)
+function TransformInline($text, $basepage = false)
{
static $trfm;
$action = $GLOBALS['request']->getArg('action');
@@ -1443,17 +1443,13 @@
$trfm = new InlineTransformer;
}
- if ($markup < 2.0) {
- $text = ConvertOldMarkup($text, 'inline');
- }
-
if ($basepage) {
return new CacheableMarkup($trfm->parse($text), $basepage);
}
return $trfm->parse($text);
}
-function TransformLinks($text, $markup = 2.0, $basepage = false)
+function TransformLinks($text, $basepage = false)
{
static $trfm;
@@ -1461,10 +1457,6 @@
$trfm = new LinkTransformer;
}
- if ($markup < 2.0) {
- $text = ConvertOldMarkup($text, 'links');
- }
-
if ($basepage) {
return new CacheableMarkup($trfm->parse($text), $basepage);
}
@@ -1474,7 +1466,7 @@
/**
* Transform only html markup and entities.
*/
-function TransformInlineNowiki($text, $markup = 2.0, $basepage = false)
+function TransformInlineNowiki($text, $basepage = false)
{
static $trfm;
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/PageList.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -436,7 +436,7 @@
}
include_once 'lib/BlockParser.php';
// false --> don't bother processing hrefs for embedded WikiLinks
- $ct = TransformText($c, $revision_handle->get('markup'), false);
+ $ct = TransformText($c, false);
if (empty($pagelist->_sortby[$this->_field]))
unset($revision_handle->_data['%pagedata']['_cached_html']);
return HTML::div(array('style' => 'font-size:x-small'),
@@ -752,7 +752,6 @@
'hits' => null,
'size' => null,
'version' => null,
- 'markup' => null,
'external' => null,
);
}
@@ -1279,8 +1278,6 @@
'minor'
=> new _PageList_Column_bool('rev:is_minor_edit',
_("Minor Edit"), _("minor")),
- 'markup'
- => new _PageList_Column('rev:markup', _("Markup")),
// 'rating' initialised by the wikilens theme hook: addPageListColumn
/*
'rating'
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/PageType.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -365,18 +365,12 @@
{
$this->_page = $page;
$this->_meta = $meta;
- if (!empty($meta['markup']))
- $this->_markup = $meta['markup'];
- else
- $this->_markup = 2; // dump used old-markup as empty.
- // FIXME: To be able to restore old plain-backups we should keep markup 1 as default.
- // New policy: default = new markup (old crashes quite often)
}
function _transform($text)
{
include_once 'lib/BlockParser.php';
- return TransformText($text, $this->_markup);
+ return TransformText($text);
}
/** Transform the page text.
@@ -535,7 +529,7 @@
function _transform($text)
{
include_once 'lib/BlockParser.php';
- return TransformText($text, $this->_markup);
+ return TransformText($text);
}
// one page or set of pages?
Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -156,7 +156,7 @@
function convert()
{
require_once 'lib/BlockParser.php';
- $xmlcontent = TransformText($this->_wikitext, 2.0, $this->_request->getArg('pagename'));
+ $xmlcontent = TransformText($this->_wikitext, $this->_request->getArg('pagename'));
$this->_html = $xmlcontent->AsXML();
$this->replace_inside_html();
@@ -298,7 +298,7 @@
$plugin = "<?plugin RichTable " . $plugin . " ?>";
require_once 'lib/BlockParser.php';
- $xmlcontent = TransformText($plugin, 2.0, $GLOBALS['request']->getArg('pagename'));
+ $xmlcontent = TransformText($plugin, $GLOBALS['request']->getArg('pagename'));
return $xmlcontent->AsXML();
}
}
Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/WysiwygEdit.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -50,7 +50,7 @@
function ConvertBefore($text)
{
require_once 'lib/BlockParser.php';
- $xml = TransformText($text, 2.0, $GLOBALS['request']->getArg('pagename'));
+ $xml = TransformText($text, $GLOBALS['request']->getArg('pagename'));
return $xml->AsXML();
}
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/XmlRpcServer.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -501,7 +501,6 @@
);
$version_meta = array('author' => $userid,
'author_id' => $userid,
- 'markup' => 2.0,
'summary' => isset($summary) ? $summary : _("xml-rpc change"),
'mtime' => $now,
'pagetype' => 'wikitext',
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/diff.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -353,7 +353,7 @@
$html->pushContent(HTML::hr(), HTML::h2($new_version));
require_once 'lib/BlockParser.php';
- $html->pushContent(TransformText($new, $new->get('markup'), $pagename));
+ $html->pushContent(TransformText($new, $pagename));
}
require_once 'lib/Template.php';
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/editpage.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -390,10 +390,6 @@
function isUnchanged()
{
$current = &$this->current;
-
- if ($this->meta['markup'] != $current->get('markup'))
- return false;
-
return $this->_content == $current->getPackedContent();
}
@@ -511,8 +507,6 @@
{
require_once 'lib/PageType.php';
$this->_content = $this->getContent();
- $this->meta['markup'] = 2.0;
- $this->_content = ConvertOldMarkup($this->_content);
return new TransformedText($this->page, $this->_content, $this->meta);
}
@@ -664,15 +658,6 @@
'name' => 'edit[minor_edit]',
'id' => 'edit-minor_edit',
'checked' => (bool)$this->meta['is_minor_edit']));
- $el['OLD_MARKUP_CB']
- = HTML::input(array('type' => 'checkbox',
- 'name' => 'edit[markup]',
- 'value' => 'old',
- 'checked' => $this->meta['markup'] < 2.0,
- 'id' => 'useOldMarkup',
- 'onclick' => 'showOldMarkupRules(this.checked)'));
- $el['OLD_MARKUP_CONVERT'] = ($this->meta['markup'] < 2.0)
- ? Button('submit:edit[edit_convert]', _("Convert"), 'wikiaction') : '';
$el['LOCKED_CB']
= HTML::input(array('type' => 'checkbox',
'name' => 'edit[locked]',
@@ -779,8 +764,6 @@
if ($this->_currentVersion > $this->current->getVersion())
return false; // FIXME: some kind of warning?
- $is_old_markup = !empty($posted['markup']) && $posted['markup'] == 'old';
- $meta['markup'] = $is_old_markup ? false : 2.0;
$meta['summary'] = trim(substr($posted['summary'], 0, 256));
$meta['is_minor_edit'] = !empty($posted['minor_edit']);
$meta['pagetype'] = !empty($posted['pagetype']) ? $posted['pagetype'] : false;
@@ -827,13 +810,6 @@
&& $current->get('author') == $user->getId()
);
- // Default for new pages is new-style markup.
- if ($selected->hasDefaultContents())
- $is_new_markup = true;
- else
- $is_new_markup = $selected->get('markup') >= 2.0;
-
- $this->meta['markup'] = $is_new_markup ? 2.0 : false;
$this->meta['pagetype'] = $selected->get('pagetype');
if ($this->meta['pagetype'] == 'wikiblog')
$this->meta['summary'] = $selected->get('summary'); // keep blog title
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/main.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -966,8 +966,8 @@
// Handle untranslated actionpages in non-english
// (people playing with switching languages)
if (0 and $GLOBALS['LANG'] != 'en') {
- require_once 'lib/plugin/_WikiTranslation.php';
- $trans = new WikiPlugin__WikiTranslation();
+ require_once 'lib/plugin/WikiTranslation.php';
+ $trans = new WikiPlugin_WikiTranslation();
$en_action = $trans->translate($action, 'en', $GLOBALS['LANG']);
if (isActionPage($en_action))
return $en_action;
@@ -1063,8 +1063,8 @@
global $LANG;
if ($LANG != "en") {
require_once 'lib/WikiPlugin.php';
- require_once 'lib/plugin/_WikiTranslation.php';
- $trans = new WikiPlugin__WikiTranslation();
+ require_once 'lib/plugin/WikiTranslation.php';
+ $trans = new WikiPlugin_WikiTranslation();
$trans->lang = $LANG;
$default = $trans->translate_to_en($action, $LANG);
if ($default and isActionPage($default))
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/CalendarList.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -128,7 +128,7 @@
$r = $p->getCurrentRevision();
$c = $r->getContent();
include_once 'lib/BlockParser.php';
- $content = TransformText(implode("\n", $c), $r->get('markup'));
+ $content = TransformText(implode("\n", $c));
$link = HTML::a(array('class' => 'cal-hide',
'href' => WikiURL($page_for_date,
array('action' => 'edit')),
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/CreatePage.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -115,13 +115,11 @@
return $this->error(fmt("%s already exists", WikiLink($s)));
} else {
$user = $request->getUser();
- $meta = array('markup' => 2.0,
- 'author' => $user->getId());
+ $meta = array('author' => $user->getId());
if (!empty($param['template']) and !$initial_content) {
$tmplpage = $dbi->getPage($template);
$currenttmpl = $tmplpage->getCurrentRevision();
$initial_content = $currenttmpl->getPackedContent();
- $meta['markup'] = $currenttmpl->_data['markup'];
if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) {
$initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "",
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/CreateToc.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -29,7 +29,6 @@
* @author: Reini Urban, Marc-Etienne Vargenau
*
* Known problems:
- * - it will crash with old markup and Apache2 (?)
* - Certain corner-edges will not work with TOC_FULL_SYNTAX.
* I believe I fixed all of them now, but who knows?
* - bug #969495 "existing labels not honored" seems to be fixed.
@@ -430,13 +429,6 @@
}
$current = $page->getCurrentRevision();
- //FIXME: I suspect this only to crash with Apache2
- if (!$current->get('markup') or $current->get('markup') < 2) {
- if (in_array(php_sapi_name(), array('apache2handler', 'apache2filter'))) {
- return $this->error(_("CreateToc disabled for old markup."));
- }
- }
-
$content = $r->getContent();
$html = HTML::div(array('class' => 'toc', 'id' => GenerateId("toc")));
Copied: trunk/lib/plugin/DebugAuthInfo.php (from rev 8810, trunk/lib/plugin/_AuthInfo.php)
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php (rev 0)
+++ trunk/lib/plugin/DebugAuthInfo.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * Copyright 2004 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+require_once 'lib/Template.php';
+/**
+ * Used to debug auth problems and settings.
+ * This plugin is only testing purposes.
+ * if DEBUG is false, only admin can call it, which is of no real use.
+ *
+ * Warning! This may display db and user passwords in cleartext.
+ */
+class WikiPlugin_DebugAuthInfo
+ extends WikiPlugin
+{
+ function getDescription()
+ {
+ return _("Display general and user specific auth information.");
+ }
+
+ function getDefaultArguments()
+ {
+ return array('userid' => '');
+ }
+
+ function run($dbi, $argstr, &$request, $basepage)
+ {
+ $args = $this->getArgs($argstr, $request);
+ extract($args);
+ if (empty($userid) or $userid == $request->_user->UserName()) {
+ $user = $request->_user;
+ $userid = $user->UserName();
+ } else {
+ $user = WikiUser($userid);
+ }
+ if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
+ $request->_notAuthorized(WIKIAUTH_ADMIN);
+ $this->disabled("! user->isAdmin");
+ }
+
+ $html = HTML(HTML::h3(fmt("General Auth Settings")));
+ $table = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0));
+ $table->pushContent($this->show_hash("AUTH DEFINES",
+ $this->buildConstHash(
+ array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
+ "ALLOW_ANON_EDIT", "ALLOW_BOGO_LOGIN",
+ "REQUIRE_SIGNIN_BEFORE_EDIT", "ALLOW_USER_PASSWORDS",
+ "PASSWORD_LENGTH_MINIMUM", "USE_DB_SESSION"))));
+ if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
+ $table->pushContent($this->show_hash("LDAP DEFINES",
+ $this->buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
+ if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
+ $table->pushContent($this->show_hash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
+ if (defined('AUTH_USER_FILE') or in_array("File", $GLOBALS['USER_AUTH_ORDER']))
+ $table->pushContent($this->show_hash("AUTH_USER_FILE",
+ $this->buildConstHash(array("AUTH_USER_FILE",
+ "AUTH_USER_FILE_STORABLE"))));
+ if (defined('GROUP_METHOD'))
+ $table->pushContent($this->show_hash("GROUP_METHOD",
+ $this->buildConstHash(array("GROUP_METHOD", "AUTH_GROUP_FILE", "GROUP_LDAP_QUERY"))));
+ $table->pushContent($this->show_hash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER']));
+ $table->pushContent($this->show_hash("USER_AUTH_POLICY", array("USER_AUTH_POLICY" => USER_AUTH_POLICY)));
+ $DBParams = $GLOBALS['DBParams'];
+ $DBParams['dsn'] = class_exists('WikiDB_SQL') ? WikiDB_SQL::view_dsn($DBParams['dsn']) : '';
+ $table->pushContent($this->show_hash("\$DBParams[]", $DBParams));
+ $DBAuthParams = $GLOBALS['DBAuthParams'];
+ if (isset($DBAuthParams['auth_dsn']) and class_exists('WikiDB_SQL'))
+ $DBAuthParams['auth_dsn'] = WikiDB_SQL::view_dsn($DBAuthParams['auth_dsn']);
+ else
+ $DBAuthParams['auth_dsn'] = '';
+ unset($DBAuthParams['dummy']);
+ $table->pushContent($this->show_hash("\$DBAuthParams[]", $DBAuthParams));
+ $html->pushContent($table);
+ $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid))));
+ if (!$user) {
+ $html->pushContent(HTML::p(fmt("No userid")));
+ } else {
+ $table = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0));
+ //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+ $userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
+ if (isa($user, "_FilePassUser")) {
+ foreach ($userdata['_file']->users as $u => $p) {
+ $userdata['_file']->users[$u] = "<hidden>";
+ }
+ }
+ $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata));
+ if (ENABLE_USER_NEW) {
+ $group = &$request->getGroup();
+ $groups = $group->getAllGroupsIn();
+ $groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd'));
+ unset($groupdata['request']);
+ $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata));
+ $groups = $group->getAllGroupsIn();
+ $groupdata = array('getAllGroupsIn' => $groups);
+ foreach ($groups as $g) {
+ $groupdata["getMembersOf($g)"] = $group->getMembersOf($g);
+ $groupdata["isMember($g)"] = $group->isMember($g);
+ }
+ $table->pushContent($this->show_hash("Group Methods: ", $groupdata));
+ }
+ $html->pushContent($table);
+ }
+ return $html;
+ }
+
+ private function show_hash($heading, $hash, $depth = 0)
+ {
+ static $seen = array();
+ static $max_depth = 0;
+ $rows = array();
+ $max_depth++;
+ if ($max_depth > 35) return $heading;
+
+ if ($heading)
+ $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
+ 'style' => 'color:#000000'),
+ HTML::td(array('colspan' => 2,
+ 'style' => 'color:#000000'),
+ $heading));
+ if (is_object($hash))
+ $hash = obj2hash($hash);
+ if (!empty($hash)) {
+ ksort($hash);
+ foreach ($hash as $key => $val) {
+ if (is_object($val)) {
+ $heading = "Object of " . get_class($val);
+ if ($depth > 3) $val = $heading;
+ elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
+ //if (empty($seen[$heading])) $seen[$heading] = 1;
+ $val = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0),
+ $this->show_hash($heading, obj2hash($val), $depth + 1));
+ } else {
+ $val = $heading;
+ }
+ } elseif (is_array($val)) {
+ $heading = $key . "[]";
+ if ($depth > 3) $val = $heading;
+ elseif (!isset($seen[$heading])) {
+ //if (empty($seen[$heading])) $seen[$heading] = 1;
+ $val = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0),
+ $this->show_hash($heading, $val, $depth + 1));
+ } else {
+ $val = $heading;
+ }
+ }
+ $rows[] = HTML::tr(HTML::td(array('align' => 'right',
+ 'bgcolor' => '#cccccc',
+ 'style' => 'color:#000000'),
+ HTML(HTML::raw(' '), $key,
+ HTML::raw(' '))),
+ HTML::td(array('bgcolor' => '#ffffff',
+ 'style' => 'color:#000000'),
+ $val ? $val : HTML::raw(' '))
+ );
+ //if (empty($seen[$key])) $seen[$key] = 1;
+ }
+ }
+ return $rows;
+ }
+
+ private function buildConstHash($constants)
+ {
+ $hash = array();
+ foreach ($constants as $c) {
+ $hash[$c] = defined($c) ? constant($c) : '<empty>';
+ if ($hash[$c] === false) $hash[$c] = 'false';
+ elseif ($hash[$c] === true) $hash[$c] = 'true';
+ }
+ return $hash;
+ }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
Copied: trunk/lib/plugin/DebugBackendInfo.php (from rev 8810, trunk/lib/plugin/_BackendInfo.php)
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php (rev 0)
+++ trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,205 @@
+<?php
+
+/**
+ * Copyright 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+require_once 'lib/Template.php';
+/**
+ */
+class WikiPlugin_DebugBackendInfo
+ extends WikiPlugin
+{
+ function getDescription()
+ {
+ return sprintf(_("Get debugging information for %s."), '[pagename]');
+ }
+
+ function getDefaultArguments()
+ {
+ return array('page' => '[pagename]',
+ 'notallversions' => 0);
+ }
+
+ function run($dbi, $argstr, &$request, $basepage)
+ {
+ $args = $this->getArgs($argstr, $request);
+ extract($args);
+ if (empty($page))
+ return $this->error("page missing");
+
+ $backend = &$dbi->_backend;
+ $this->chunk_split = true;
+ $this->readonly_pagemeta = array();
+ $this->hidden_pagemeta = array('_cached_html');
+
+ $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
+ $page)));
+
+ $table = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0));
+ $pagedata = $backend->get_pagedata($page);
+ if (!$pagedata) {
+ // FIXME: invalid HTML
+ $html->pushContent(HTML::p(fmt("No pagedata for %s", $page)));
+ } else {
+ $this->_fixupData($pagedata);
+ $table->pushContent($this->_showhash("get_pagedata('$page')", $pagedata));
+ }
+ if (!$notallversions) {
+ $version = $backend->get_latest_version($page);
+ $vdata = $backend->get_versiondata($page, $version, true);
+ $this->_fixupData($vdata);
+ $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+ $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
+ $vdata));
+ } else {
+ for ($version = $backend->get_latest_version($page);
+ $version;
+ $version = $backend->get_previous_version($page, $version)) {
+ $vdata = $backend->get_versiondata($page, $version, true);
+ $this->_fixupData($vdata);
+ $table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
+ $table->pushContent($this->_showhash("get_versiondata('$page',$version)",
+ $vdata));
+ }
+ }
+
+ $linkdata = $backend->get_links($page, false);
+ if ($linkdata->count())
+ $table->pushContent($this->_showhash("get_links('$page')", $linkdata->asArray()));
+ $relations = $backend->get_links($page, false, false, false, false, false, true);
+ if ($relations->count()) {
+ $table->pushContent($this->_showhash("get_relations('$page')", array()));
+ while ($rel = $relations->next())
+ $table->pushContent($this->_showhash(false, $rel));
+ }
+ $linkdata = $backend->get_links($page, true);
+ if ($linkdata->count())
+ $table->pushContent($this->_showhash("get_backlinks('$page')", $linkdata->asArray()));
+
+ $html->pushContent($table);
+ return $html;
+ }
+
+ /**
+ * Really should have a _fixupPagedata and _fixupVersiondata, but this works.
+ * also used in plugin/EditMetaData
+ */
+ private function _fixupData(&$data, $prefix = '')
+ {
+ if (!is_array($data)) return;
+
+ global $request;
+ $user = $request->getUser();
+ foreach ($data as $key => $val) {
+ $fullkey = $prefix . '[' . $key . ']';
+ if (is_integer($key)) {
+ ;
+ } elseif ($key == 'passwd' and !$user->isAdmin()) {
+ $data[$key] = $val ? _("<not displayed>") : _("<empty>");
+ } elseif ($key and $key == '_cached_html') {
+ $val = TransformedText::unpack($val);
+ ob_start();
+ print_r($val);
+ $data[$key] = HTML::pre(ob_get_contents());
+ ob_end_clean();
+ } elseif (is_bool($val)) {
+ $data[$key] = $this->_showvalue($key, $val ? "true" : "false", $prefix);
+ } elseif (is_string($val) && ((substr($val, 0, 2) == 'a:'
+ or (substr($val, 0, 2) == 'O:')))
+ ) {
+ // how to indent this table?
+ $val = unserialize($val);
+ $this->_fixupData($val, $fullkey);
+ $data[$key] = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0),
+ $this->_showhash(false, $val, $fullkey));
+ } elseif (is_array($val)) {
+ // how to indent this table?
+ $this->_fixupData($val, $fullkey);
+ $data[$key] = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0),
+ $this->_showhash(false, $val, $fullkey));
+ } elseif (is_object($val)) {
+ // how to indent this table?
+ ob_start();
+ print_r($val);
+ $val = HTML::pre(ob_get_contents());
+ ob_end_clean();
+ $data[$key] = HTML::table(array('border' => 1,
+ 'cellpadding' => 2,
+ 'cellspacing' => 0),
+ $this->_showhash(false, $val, $fullkey));
+ } elseif ($key and $key == '%content') {
+ if ($val === true)
+ $val = '<true>';
+ elseif (strlen($val) > 40)
+ $val = substr($val, 0, 40) . " ...";
+ $data[$key] = $val;
+ }
+ }
+ unset($data['%pagedata']); // problem in backend
+ }
+
+ /* also used in plugin/EditMetaData */
+ private function _showhash($heading, $hash, $prefix = '')
+ {
+ $rows = array();
+ if ($heading)
+ $rows[] = HTML::tr(array('bgcolor' => '#ffcccc',
+ 'style' => 'color:#000000'),
+ HTML::td(array('colspan' => 2,
+ 'style' => 'color:#000000'),
+ $heading));
+ if (!is_array($hash)) return array();
+ ksort($hash);
+ foreach ($hash as $key => $val) {
+ if ($this->chunk_split and is_string($val)) $val = chunk_split($val);
+ $rows[] = HTML::tr(HTML::td(array('align' => 'right',
+ 'bgcolor' => '#cccccc',
+ 'style' => 'color:#000000'),
+ HTML(HTML::raw(' '), $key,
+ HTML::raw(' '))),
+ HTML::td(array('bgcolor' => '#ffffff',
+ 'style' => 'color:#000000'),
+ $this->_showvalue($key, $val, $prefix))
+ );
+ }
+ return $rows;
+ }
+
+ /* also used in plugin/EditMetaData */
+ private function _showvalue($key, $val, $prefix = '')
+ {
+ return $val ? $val : HTML::raw(' ');
+ }
+
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
Copied: trunk/lib/plugin/DebugGroupInfo.php (from rev 8810, trunk/lib/plugin/_GroupInfo.php)
===================================================================
--- trunk/lib/plugin/DebugGroupInfo.php (rev 0)
+++ trunk/lib/plugin/DebugGroupInfo.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * Copyright 2004 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * @author: Charles Corrigan
+ */
+class WikiPlugin_DebugGroupInfo
+ extends WikiPlugin
+{
+ function getDescription()
+ {
+ return sprintf(_("Show Group Information."));
+ }
+
+ function getDefaultArguments()
+ {
+ return array();
+ }
+
+ function run($dbi, $argstr, &$request, $basepage)
+ {
+ $args = $this->getArgs($argstr, $request);
+ extract($args);
+
+ $output = HTML(HTML::h1("Group Info"));
+
+ $group = WikiGroup::getGroup();
+ $allGroups = $group->getAllGroupsIn();
+
+ foreach ($allGroups as $g) {
+ $members = $group->getMembersOf($g);
+ $output->pushContent(HTML::h3($g . " - members: " .
+ sizeof($members) . " - isMember: " . ($group->isMember($g) ? "yes" : "no")
+ ));
+ foreach ($members as $m) {
+ $output->pushContent($m);
+ $output->pushContent(HTML::br());
+ }
+ }
+ $output->pushContent(HTML::p("--- the end ---"));
+
+ return $output;
+ }
+}
Copied: trunk/lib/plugin/DebugRetransform.php (from rev 8810, trunk/lib/plugin/_Retransform.php)
===================================================================
--- trunk/lib/plugin/DebugRetransform.php (rev 0)
+++ trunk/lib/plugin/DebugRetransform.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * Copyright 2007 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * Only useful for link and parser debugging purposes.
+ */
+class WikiPlugin__Retransform
+ extends WikiPlugin
+{
+ function getDescription()
+ {
+ return sprintf(_("Show a markup retransformation of page %s."), '[pagename]');
+ }
+
+ function getDefaultArguments()
+ {
+ return array('page' => '[pagename]');
+ }
+
+ function run($dbi, $argstr, &$request, $basepage)
+ {
+ $args = $this->getArgs($argstr, $request);
+ extract($args);
+ if (empty($page))
+ return '';
+
+ $html = HTML(HTML::h3(fmt("Retransform page “%s”", $page)));
+
+ // bypass WikiDB and cache, go directly through the backend.
+ $backend = &$dbi->_backend;
+ //$pagedata = $backend->get_pagedata($page);
+ $version = $backend->get_latest_version($page);
+ $vdata = $backend->get_versiondata($page, $version, true);
+
+ include_once 'lib/PageType.php';
+ $formatted = new TransformedText($dbi->getPage($page), $vdata['%content'], $vdata);
+ $content =& $formatted->_content;
+ $html->pushContent($this->DebugPrintArray($content));
+ $links = $formatted->getWikiPageLinks();
+ if (count($links) > 0) {
+ $html->pushContent(HTML::h3("Links"));
+ $html->pushContent($this->DebugPrintArray($links));
+ }
+ return $html;
+ }
+
+ private function DebugPrintArray(&$array)
+ {
+ $html = HTML();
+ foreach ($array as $line) {
+ ob_start();
+ print_r($line);
+ $s = HTML::pre(ob_get_contents());
+ ob_end_clean();
+ $html->pushContent($s);
+ }
+ return $html;
+ }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/EditMetaData.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -39,10 +39,10 @@
* Rewritten for recursive array support by Reini Urban.
*/
-require_once 'lib/plugin/_BackendInfo.php';
+require_once 'lib/plugin/DebugBackendInfo.php';
class WikiPlugin_EditMetaData
- extends WikiPlugin__BackendInfo
+ extends WikiPlugin_DebugBackendInfo
{
function getDescription()
{
Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/FileInfo.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -167,7 +167,7 @@
$result = call_user_func_array("sprintf", $s);
if (in_array('link', $modes)) {
require_once 'lib/InlineParser.php';
- return TransformInline($result, 2, $basepage);
+ return TransformInline($result, $basepage);
} else {
return HTML::raw($result);
}
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/GoogleMaps.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -117,8 +117,7 @@
include_once 'lib/BlockParser.php';
$page = $dbi->getPage($request->getArg('pagename'));
$rev = $page->getCurrentRevision(false);
- $markup = $rev->get('markup');
- $markertext = TransformText($InfoText, $markup, $basepage);
+ $markertext = TransformText($InfoText, $basepage);
}
$markerjs = JavaScript("
function createMarker(point, text) {
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/IncludePage.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -154,7 +154,7 @@
array_push($included_pages, $page);
include_once 'lib/BlockParser.php';
- $content = TransformText($ct, $r->get('markup'), $page);
+ $content = TransformText($ct, $page);
array_pop($included_pages);
Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/InterWikiSearch.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -48,12 +48,11 @@
return $this->disabled("Sorry, this plugin is currently out of order.");
$page = $dbi->getPage($request->getArg('pagename'));
- return new TransformedText($page, __('InterWikiMap'), array('markup' => 2),
+ return new TransformedText($page, __('InterWikiMap'), array(),
'searchableInterWikiMap');
/*
return new PageType($pagerevisionhandle,
$pagename = __('InterWikiMap'),
- $markup = 2,
$overridePageType = 'PageType_searchableInterWikiMap');
*/
}
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/MediawikiTable.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -65,8 +65,6 @@
function run($dbi, $argstr, &$request, $basepage)
{
include_once 'lib/BlockParser.php';
- // MediawikiTablePlugin markup is new.
- $markup = 2.0;
// We allow the compact Mediawiki syntax with:
// - multiple cells on the same line (separated by "||"),
@@ -127,7 +125,7 @@
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ $cell->pushContent(TransformText(trim($content), $basepage));
}
unset($content);
}
@@ -188,7 +186,7 @@
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ $cell->pushContent(TransformText(trim($content), $basepage));
}
unset($content);
}
@@ -237,7 +235,7 @@
if (is_numeric(trim($line))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($line)));
} else {
- $cell->pushContent(TransformText(trim($line), $markup, $basepage));
+ $cell->pushContent(TransformText(trim($line), $basepage));
}
continue;
}
@@ -255,7 +253,7 @@
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
- $cell->pushContent(TransformText(trim($content), $markup, $basepage));
+ $cell->pushContent(TransformText(trim($content), $basepage));
}
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/ModeratedPage.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -373,7 +373,7 @@
$header = HTML::h3(_("Please approve or reject this request:"));
$loader = new WikiPluginLoader();
- $BackendInfo = $loader->getPlugin("_BackendInfo");
+ $BackendInfo = $loader->getPlugin("DebugBackendInfo");
$table = HTML::table(array('border' => 1,
'cellpadding' => 2,
'cellspacing' => 0));
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/OldStyleTable.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -138,8 +138,7 @@
else
$attr['align'] = 'left';
- // Assume new-style inline markup.
- $content = TransformInline($m[4], 2.0, $basepage);
+ $content = TransformInline($m[4], $basepage);
$row->pushContent(HTML::td($attr, HTML::raw(' '),
$content, HTML::raw(' ')));
Copied: trunk/lib/plugin/PreferencesInfo.php (from rev 8810, trunk/lib/plugin/_PreferencesInfo.php)
===================================================================
--- trunk/lib/plugin/PreferencesInfo.php (rev 0)
+++ trunk/lib/plugin/PreferencesInfo.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * Plugin to display the current preferences without auth check.
+ */
+class WikiPlugin_PreferencesInfo
+ extends WikiPlugin
+{
+ function getDescription()
+ {
+ return sprintf(_("Get preferences information for current user %s."),
+ '[userid]');
+ }
+
+ function getDefaultArguments()
+ {
+ return array('page' => '[pagename]',
+ 'userid' => '[userid]');
+ }
+
+ function run($dbi, $argstr, &$request, $basepage)
+ {
+ $args = $this->getArgs($argstr, $request);
+ // $user = &$request->getUser();
+ return Template('userprefs', $args);
+ }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/RecentChanges.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -248,7 +248,7 @@
return '';
return HTML::span(array('class' => 'wiki-summary'),
"(",
- // TransformLinks($summary, $rev->get('markup'), $rev->getPageName()),
+ // TransformLinks($summary, $rev->getPageName()),
// We do parse the summary:
// 1) if the summary contains {{foo}}, the template must no be
// expanded
@@ -721,7 +721,7 @@
return HTML::span(array('class' => 'wiki-summary'),
"[",
/*TransformLinks(*/
- $summary, /* $rev->get('markup')),*/
+ $summary,
"]");
}
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/RichTable.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -43,8 +43,6 @@
function run($dbi, $argstr, &$request, $basepage)
{
include_once 'lib/BlockParser.php';
- // RichTablePlugin markup is new.
- $markup = 2.0;
$lines = preg_split('/\n/', $argstr);
$table = HTML::table();
@@ -71,7 +69,7 @@
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
- $cell->pushContent(TransformText($content, $markup, $basepage));
+ $cell->pushContent(TransformText($content, $basepage));
}
unset($content);
}
@@ -97,7 +95,7 @@
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
- $cell->pushContent(TransformText($content, $markup, $basepage));
+ $cell->pushContent(TransformText($content, $basepage));
}
unset($content);
}
@@ -131,7 +129,7 @@
if (is_numeric(trim($content))) {
$cell->pushContent(HTML::p(array('style' => "text-align:right"), trim($content)));
} else {
- $cell->pushContent(TransformText($content, $markup, $basepage));
+ $cell->pushContent(TransformText($content, $basepage));
}
}
$row->pushContent($cell);
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/SiteMap.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -165,7 +165,7 @@
if (!$noheader) {
$out = $this->getDescription() . " " . sprintf(_("(max. recursion level: %d)"),
$reclimit) . ":\n\n";
- $html->pushContent(TransformText($out, 1.0, $page));
+ $html->pushContent(TransformText($out, $page));
}
$pagelist = new PageList($info, $exclude);
$p = $dbi->getPage($page);
@@ -202,14 +202,12 @@
$plugin_args = 'page=\'' . $link->getName() . '\' ' . $includepages;
$pagehtml = $plugin->run($dbi, $plugin_args, $request, $basepage);
$html->pushContent($pagehtml);
- //$html->pushContent( HTML(TransformText($indenter, 1.0, $page), $pagehtml));
- //$out .= $indenter . $pagehtml . "\n";
} else {
$out .= $key . "\n";
}
}
if (empty($includepages)) {
- return TransformText($out, 2.0, $page);
+ return TransformText($out, $page);
} else {
return $html;
}
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/SpellCheck.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -163,7 +163,7 @@
}
$GLOBALS['request']->setArg('suggestions', $sugg);
include_once 'lib/BlockParser.php';
- $ori_html = TransformText($revision, $revision->get('markup'), $page);
+ $ori_html = TransformText($revision, $page);
$GLOBALS['request']->setArg('suggestions', false);
$html->pushContent($ori_html, HTML::hr(), HTML::h1(_("SpellCheck result")));
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/Template.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -197,10 +197,10 @@
$initial_content = trim($initial_content, "\n");
if (preg_match("/\n/", $initial_content)) {
include_once 'lib/BlockParser.php';
- $content = TransformText($initial_content, $r->get('markup'), $page);
+ $content = TransformText($initial_content, $page);
} else {
include_once 'lib/InlineParser.php';
- $content = TransformInline($initial_content, $r->get('markup'), $page);
+ $content = TransformInline($initial_content, $page);
}
array_pop($included_pages);
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/TranslateText.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -26,7 +26,7 @@
* One required argument: lang
* Requires that an action page with the <<TranslateText >> line exists.
*
- * Usually called from <<_WikiTranslation >>
+ * Usually called from <<WikiTranslation >>
* Contributed translation are stored in UsersPage/ContributedTranslations
*
* Examples:
@@ -35,10 +35,10 @@
* @author: Reini Urban
*/
-require_once 'lib/plugin/_WikiTranslation.php';
+require_once 'lib/plugin/WikiTranslation.php';
class WikiPlugin_TranslateText
- extends WikiPlugin__WikiTranslation
+ extends WikiPlugin_WikiTranslation
{
function getDescription()
{
@@ -60,7 +60,7 @@
if (!$lang)
return $this->error(
_("This internal action page cannot viewed.") . "\n" .
- _("You can only use it via the _WikiTranslation plugin."));
+ _("You can only use it via the WikiTranslation plugin."));
$this->lang = $lang;
//action=save
@@ -83,8 +83,7 @@
$meta = $current->_data;
} else {
$text = '';
- $meta = array('markup' => 2.0,
- 'author' => $user->getId());
+ $meta = array('author' => $user->getId());
}
$text .= $user->getId() . " " . Iso8601DateTime() . "\n" .
"* " . sprintf(_("Translate “%s” to “%s” in *%s*"),
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php 2013-06-18 12:55:27 UTC (rev 8814)
+++ trunk/lib/plugin/UnfoldSubpages.php 2013-06-18 13:39:29 UTC (rev 8815)
@@ -151,11 +151,10 @@
if ($smalltitle) {
$pname = array_pop(explode(SUBPAGE_SEPARATOR, $cpagename)); // get last subpage name
// Use _("%s: %s") instead of .": ". for French punctuation
- $ct = T...
[truncated message content] |
|
From: <var...@us...> - 2013-06-18 15:39:35
|
Revision: 8817
http://sourceforge.net/p/phpwiki/code/8817
Author: vargenau
Date: 2013-06-18 15:39:31 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/configurator.php
trunk/lib/AccessLog.php
trunk/lib/BlockParser.php
trunk/lib/HtmlParser.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/WantedPagesOld.php
trunk/themes/Crao/crao.css
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Crao/templates/top.tmpl
trunk/themes/Hawaiian/Hawaiian.css
trunk/themes/MacOSX/MacOSX.css
trunk/themes/MacOSX/images/index.php
trunk/themes/MonoBook/main.css
trunk/themes/Portland/portland.css
trunk/themes/Portland/templates/body.tmpl
trunk/themes/Portland/templates/debug.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Portland/templates/navbar.tmpl
trunk/themes/Sidebar/sidebar.css
trunk/themes/Sidebar/templates/debug.tmpl
trunk/themes/SpaceWiki/SpaceWiki.css
trunk/themes/Wordpress/Wordpress.css
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/Kubrick.css
trunk/themes/blog/templates/actionbar.tmpl
trunk/themes/default/phpwiki.css
trunk/themes/default/templates/actionbar.tmpl
trunk/themes/default/templates/addcomment.tmpl
trunk/themes/default/templates/debug.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/default/templates/forumadd.tmpl
trunk/themes/default/templates/login.tmpl
trunk/themes/default/templates/online.tmpl
trunk/themes/default/templates/pagelink.tmpl
trunk/themes/fusionforge/templates/editpage.tmpl
trunk/themes/shamino_com/shamino_com.css
trunk/themes/smaller/templates/actionbar.tmpl
trunk/themes/wikilens/templates/body.tmpl
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/configurator.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -1866,7 +1866,7 @@
global $tdwidth;
$i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n";
// $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>";
- return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">' . "\n" . $i . "</td></tr>\n"
+ return '<tr><td style="width:100%" class="unchangeable-variable-top" colspan="2">' . "\n" . $i . "</td></tr>\n"
. '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="' . $tdwidth . '"> </td>';
}
}
@@ -2495,7 +2495,8 @@
{
$id = preg_replace("/\W/", "", $this->config_item_name);
$group_name = preg_replace("/\W/", "", $title);
- $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
+ $i = '<tr class="header" id="'.$id.'">'."\n";
+ $i .= '<td class="part" style="width:100%;background-color:#eee" colspan="2">'."\n";
$i .= "<h2>" . $title . "</h2>\n " . nl2p($this->_get_description()) . "\n";
$i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
return $i . "</td>\n";
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/AccessLog.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -656,10 +656,8 @@
// otherwise the headers will not be ready
$tbody = $this->_getQueryResults($query, $dbi);
- return HTML::table(array('border' => 1,
- 'cellspacing' => 1,
- 'cellpadding' => 1),
- HTML::caption(HTML::h1(HTML::br(), $this->_getCaption($args))),
+ return HTML::table(array('border' => 1),
+ HTML::caption($this->_getCaption($args)),
HTML::thead($this->_theadrow),
$tbody);
}
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/BlockParser.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -851,9 +851,7 @@
$defs[$key]->setWidth($ncols);
return HTML::table(array('class' => 'wiki-dl-table',
- 'border' => 1,
- 'cellspacing' => 0,
- 'cellpadding' => 6),
+ 'border' => 1),
$defs);
}
}
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/HtmlParser.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -379,7 +379,7 @@
if (!$alignment and preg_match("/float(right|left)/i", $css_class, $m)) ;
$alignment = $m[1];
if ($alignment) {
- $attrs[] = "align=$alignment";
+ $attrs[] = "class=align-$alignment";
$this->log(" Image is contained within a DIV that specifies $alignment alignment");
$this->log(" Adding '$alignment' to [Image] markup attributes");
} else {
@@ -389,7 +389,7 @@
$this->log(" Image is not contained within a DIV");
}
if ($alignment)
- $attrs[] = "align=$alignment";
+ $attrs[] = "class=align-$alignment";
//
// Check if we need to request a thumbnail of this
// image; it's needed if the specified width attribute
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/PageList.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -1650,7 +1650,7 @@
$this->_options['limit']);
if ($tokens) {
$paging = Template("pagelink", $tokens);
- $out->pushContent(HTML::table(array('width' => '100%'), $paging));
+ $out->pushContent(HTML::table(array('class' => 'fullwidth'), $paging));
}
}
@@ -1669,7 +1669,7 @@
$length += 1;
}
$width = sprintf("%d", 100 / $this->_options['cols']) . '%';
- $cols = HTML::tr(array('valign' => 'top'));
+ $cols = HTML::tr(array('class' => 'top'));
for ($i = $offset; $i < $offset + $count; $i += $length) {
$this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
$this->_pages = array_slice($this->_pages, $i, $length);
@@ -1761,7 +1761,7 @@
}
$out->pushContent($list);
if ($do_paging and $tokens) {
- $out->pushContent(HTML::table(array('width' => '100%'), $paging));
+ $out->pushContent(HTML::table(array('class' => 'fullwidth'), $paging));
}
return $out;
}
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/PagePerm.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -578,7 +578,7 @@
$td->pushContent(HTML::tr(HTML::td(array('align' => 'right'), $group),
HTML::td($bool ? '[X]' : '[ ]')));
}
- $table->pushContent(HTML::tr(array('valign' => 'top'),
+ $table->pushContent(HTML::tr(array('class' => 'top'),
HTML::td($access), HTML::td($td)));
}
if ($type == 'default')
@@ -639,7 +639,7 @@
$addbutton->setAttr('checked', 'checked');
$newperm->setAttr('checked', 'checked');
$table->pushContent(
- HTML::tr(array('valign' => 'top'),
+ HTML::tr(array('class' => 'top'),
HTML::td(HTML::strong($access . ":")),
HTML::td($newgroup),
HTML::td($nbsp, $newperm),
@@ -686,7 +686,7 @@
}
if (!empty($groups))
$table->pushContent(
- HTML::tr(array('valign' => 'top'),
+ HTML::tr(array('class' => 'top'),
HTML::td(array('align' => 'right'), _("add ")),
HTML::td($newgroup),
HTML::td(array('align' => 'center'), $nbsp, $newperm),
Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -291,10 +291,8 @@
// otherwise the headers will not be ready
$tbody = $this->getQueryResults($query, $dbi);
- return HTML::table(array('border' => 1,
- 'cellspacing' => 1,
- 'cellpadding' => 1),
- HTML::caption(HTML::h1(HTML::br(), $this->getCaption($args))),
+ return HTML::table(array('border' => 1),
+ HTML::caption($this->getCaption($args)),
HTML::thead($this->_theadrow),
$tbody);
}
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/Calendar.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -101,9 +101,7 @@
return HTML::tr(HTML::td(array('colspan' => $args['display_weeknum'] ? 8 : 7,
'align' => 'center'),
- HTML::table(array('width' => '100%',
- 'class' => 'cal-header'),
- $row)));
+ HTML::table(array('class' => 'cal-header fullwidth'), $row)));
}
private function __daynames($start_wday)
@@ -189,9 +187,7 @@
1, // mday (1-31)
$args['year']);
- $cal = HTML::table(array('cellspacing' => 0,
- 'cellpadding' => 2,
- 'class' => 'cal'),
+ $cal = HTML::table(array('class' => 'cal'),
HTML::thead(
$this->__header($request->getArg('pagename'),
$time),
Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/DebugAuthInfo.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -57,9 +57,7 @@
}
$html = HTML(HTML::h3(fmt("General Auth Settings")));
- $table = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0));
+ $table = HTML::table(array('border' => 1));
$table->pushContent($this->show_hash("AUTH DEFINES",
$this->buildConstHash(
array("ENABLE_USER_NEW", "ALLOW_ANON_USER",
@@ -95,9 +93,7 @@
if (!$user) {
$html->pushContent(HTML::p(fmt("No userid")));
} else {
- $table = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0));
+ $table = HTML::table(array('border' => 1));
//$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
$userdata = obj2hash($user, array('_dbi', '_request', 'password', 'passwd'));
if (isa($user, "_FilePassUser")) {
@@ -149,9 +145,7 @@
if ($depth > 3) $val = $heading;
elseif ($heading == "Object of wikidb_sql") $val = $heading; elseif (substr($heading, 0, 13) == "Object of db_") $val = $heading; elseif (!isset($seen[$heading])) {
//if (empty($seen[$heading])) $seen[$heading] = 1;
- $val = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0),
+ $val = HTML::table(array('border' => 1),
$this->show_hash($heading, obj2hash($val), $depth + 1));
} else {
$val = $heading;
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/DebugBackendInfo.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -52,9 +52,7 @@
$html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
$page)));
- $table = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0));
+ $table = HTML::table(array('border' => 1));
$pagedata = $backend->get_pagedata($page);
if (!$pagedata) {
// FIXME: invalid HTML
@@ -129,16 +127,12 @@
// how to indent this table?
$val = unserialize($val);
$this->_fixupData($val, $fullkey);
- $data[$key] = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0),
+ $data[$key] = HTML::table(array('border' => 1),
$this->_showhash(false, $val, $fullkey));
} elseif (is_array($val)) {
// how to indent this table?
$this->_fixupData($val, $fullkey);
- $data[$key] = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0),
+ $data[$key] = HTML::table(array('border' => 1),
$this->_showhash(false, $val, $fullkey));
} elseif (is_object($val)) {
// how to indent this table?
@@ -146,9 +140,7 @@
print_r($val);
$val = HTML::pre(ob_get_contents());
ob_end_clean();
- $data[$key] = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0),
+ $data[$key] = HTML::table(array('border' => 1),
$this->_showhash(false, $val, $fullkey));
} elseif ($key and $key == '%content') {
if ($val === true)
Modified: trunk/lib/plugin/EditMetaData.php
===================================================================
--- trunk/lib/plugin/EditMetaData.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/EditMetaData.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -125,9 +125,7 @@
$html->pushContent(HTML::p(fmt("No metadata for %s", $page)));
$table = HTML();
} else {
- $table = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0));
+ $table = HTML::table(array('border' => 1));
$this->_fixupData($pagemeta);
$table->pushContent($this->_showhash("MetaData('$page')", $pagemeta));
}
Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/LdapSearch.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -196,7 +196,7 @@
}
$html->pushContent($row);
}
- return HTML::table(array('cellpadding' => 1, 'cellspacing' => 1, 'border' => 1), $html);
+ return HTML::table(array('border' => 1), $html);
}
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/ModeratedPage.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -374,9 +374,7 @@
$loader = new WikiPluginLoader();
$BackendInfo = $loader->getPlugin("DebugBackendInfo");
- $table = HTML::table(array('border' => 1,
- 'cellpadding' => 2,
- 'cellspacing' => 0));
+ $table = HTML::table(array('border' => 1));
$content = $table;
$diff = '';
if ($moderation['args']['action'] == 'edit') {
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/PhotoAlbum.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -303,9 +303,8 @@
}
// cell operations
- $cell = array('align' => "center",
- 'valign' => "top",
- 'class' => 'photoalbum cell',
+ $cell = array(
+ 'class' => 'photoalbum cell align-center top',
'bgcolor' => "$color");
if ($cellwidth != 'auto') {
if ($cellwidth == 'equal') {
@@ -366,8 +365,8 @@
if ($mode == 'tiles') {
$row->pushContent(
HTML::td($cell,
- HTML::div(array('valign' => 'top'), $url_image),
- HTML::div(array('valign' => 'bottom'),
+ HTML::div(array('class' => 'top'), $url_image),
+ HTML::div(array('class' => 'bottom'),
HTML::div(array('class' => 'boldsmall'),
($url_text)),
HTML::br(),
@@ -380,12 +379,12 @@
} elseif ($mode == 'list') {
$desc = ($showdesc != 'none') ? $value["desc"] : '';
$row->pushContent(
- HTML::td(array("valign" => "top",
+ HTML::td(array("class" => "top",
"nowrap" => 0,
"bgcolor" => $color),
HTML::div(array('class' => 'boldsmall'), ($url_text))));
$row->pushContent(
- HTML::td(array("valign" => "top",
+ HTML::td(array("class" => "top",
"nowrap" => 0,
"bgcolor" => $color),
HTML::div(array('class' => 'gensmall'),
@@ -396,7 +395,7 @@
if ($desc != '')
$row->pushContent(
- HTML::td(array("valign" => "top",
+ HTML::td(array("class" => "top",
"nowrap" => 0,
"bgcolor" => $color),
HTML::div(array('class' => 'gensmall'), $desc)));
@@ -493,9 +492,7 @@
}
//create main table
- $table_attributes = array("border" => 0,
- "cellpadding" => 5,
- "cellspacing" => 2,
+ $table_attributes = array(
"class" => "photoalbum",
"width" => $tablewidth ? $tablewidth : "100%");
Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/PreferenceApp.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -177,7 +177,7 @@
}
}
- $table = HTML::table(array('cellpadding' => '5', 'cellspacing' => '1', 'border' => '0'));
+ $table = HTML::table();
$tr = HTML::tr();
$td = HTML::td(array('bgcolor' => '#FFFFFF'));
$td->pushContent(" ");
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/PrevNext.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -77,10 +77,10 @@
$sep = $WikiTheme->getButtonSeparator();
if ($align == 'center') {
$tr = HTML::tr();
- $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), $tr);
+ $links = HTML::table(array('class' => 'fullwidth'), $tr);
} elseif ($align == 'right') {
$td = HTML::td(array('align' => $align));
- $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), HTML::tr($td));
+ $links = HTML::table(array('class' => 'fullwidth'), HTML::tr($td));
} else {
$links = HTML();
}
Modified: trunk/lib/plugin/RecentReferrers.php
===================================================================
--- trunk/lib/plugin/RecentReferrers.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/RecentReferrers.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -51,10 +51,7 @@
return HTML::div(array('class' => "error"), "Error: no ACCESS_LOG");
}
$args = $this->getArgs($argstr, $request);
- $table = HTML::table(array('cellpadding' => 1,
- 'cellspacing' => 2,
- 'border' => 0,
- 'class' => 'pagelist'));
+ $table = HTML::table(array('class' => 'pagelist'));
if (!$args['noheader'] and !empty($args['caption']))
$table->pushContent(HTML::caption(array('align' => 'top'), $args['caption']));
$limit = $args['limit'];
Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -113,7 +113,7 @@
$reldef,
$hiddenfield, HiddenInputs(array('attribute' => '')),
$instructions, HTML::br(),
- HTML::table(array('border' => '0', 'width' => '100%'),
+ HTML::table(array('class' => 'fullwidth'),
HTML::tr(HTML::td(_("Page Name")._(': '), $pagefilter),
HTML::td(array('align' => 'right'),
$help)),
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/UpLoad.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -290,7 +290,7 @@
fwrite($log_handle,
"\n"
. "<tr><td><a href=\"$userfile_name\">$userfile_name</a></td>"
- . "<td align=\"right\">$file_size kB</td>"
+ . "<td class=\"align-right\">$file_size kB</td>"
. "<td> " . $WikiTheme->formatDate(time()) . "</td>"
. "<td> <em>" . $user->getId() . "</em></td></tr>");
fclose($log_handle);
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/lib/plugin/WantedPagesOld.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -151,10 +151,7 @@
{
if (count($this->pagelist) > 0) {
- $table = HTML::table(array('cellpadding' => 0,
- 'cellspacing' => 1,
- 'border' => 0,
- 'class' => 'pagelist'));
+ $table = HTML::table(array('class' => 'pagelist'));
if ($caption)
$table->pushContent(HTML::caption(array('align' => 'top'),
$caption));
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Crao/crao.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -100,6 +100,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Crao/templates/navbar.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -6,8 +6,8 @@
<input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />
<?php } ?>
<div id="navbuttons">
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="middle"><td align="left">
+<table width="fullwidth">
+<tr class="middle"><td align="left">
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php if (!empty($revision)) { ?>
<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>
Modified: trunk/themes/Crao/templates/top.tmpl
===================================================================
--- trunk/themes/Crao/templates/top.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Crao/templates/top.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -3,8 +3,8 @@
if (!$HIDE_TOOLBARS) {
?>
<!-- The logo -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tr valign="middle">
+<table class="fullwidth">
+ <tr class="middle">
<td><div id="logo"><a href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME?></a></div></td>
<td><div id="signin"><?php echo Template('signin') ?></div></td>
</tr>
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Hawaiian/Hawaiian.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -67,6 +67,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/MacOSX/MacOSX.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -98,6 +98,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/MacOSX/images/index.php
===================================================================
--- trunk/themes/MacOSX/images/index.php 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/MacOSX/images/index.php 2013-06-18 15:39:31 UTC (rev 8817)
@@ -15,7 +15,7 @@
}
//--></script>
</head>
-<body bgcolor="#8888aa">
+<body style="background-color:"#8888aa">
<?php
$dir = opendir(".");
while ($fileName = readdir($dir))
Modified: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/MonoBook/main.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -288,6 +288,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/portland.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -51,6 +51,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/body.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -3,8 +3,8 @@
<h1><a class="wikilink"
href="<?php echo WikiURL(HOME_PAGE)?>"
><img src="<?php echo $WikiTheme->getImageURL('logo')?>"
- border="0" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
- align="bottom" /></a> <?php echo $HEADER?></h1>
+ alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
+ class="bottom" /></a> <?php echo $HEADER?></h1>
<?php echo $CONTENT ?>
<?php echo Template('navbar') ?>
<!-- RELATEDPAGES were here. -->
Modified: trunk/themes/Portland/templates/debug.tmpl
===================================================================
--- trunk/themes/Portland/templates/debug.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/debug.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
<?php global $RUNTIMER; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="fullwidth">
<tr><td>
<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a>
<a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/editpage.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -10,9 +10,8 @@
<form method="post" name="editpage"
action="<?php echo $request->getPostURL() ?>"
accept-charset="UTF-8">
-<table class="toolbar" width="100%"
- cellpadding="0" cellspacing="0" border="0">
-<tr align="bottom">
+<table class="toolbar fullwidth">
+<tr class="bottom">
<td>
<?php echo $PAGE_LOCKED_MESSAGE ?>
<?php echo $CONCURRENT_UPDATE_MESSAGE ?>
@@ -21,7 +20,7 @@
<?php echo _("Saving this page will overwrite the current version.")?></strong></p>
<?php } ?>
</td>
- <td align="right">
+ <td class="align-right">
<?php echo $PREVIEW_B ?>
<?php if ($SAVE_B) { ?>
<?php echo $SEP?> <?php echo $SAVE_B ?>
Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Portland/templates/navbar.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -14,10 +14,8 @@
CSSs float:left; and float:right;. However float:right; seems
to cause MSIE4.01/NT to hang.
So, we use tables... -->
-<table class="toolbar" width="100%"
- cellpadding="0" cellspacing="0" border="0"
- id="actionbar">
-<tr valign="baseline">
+<table class="toolbar fullwidth" id="actionbar">
+<tr class="baseline">
<td>
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php if ($user->isAdmin()) { ?>
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Sidebar/sidebar.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -287,6 +287,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Sidebar/templates/debug.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
<?php global $RUNTIMER; ?>
-<table width="%100" border="0" cellpadding="0" cellspacing="0">
+<table width="%100">
<tr><td>
<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img
id="xhtml"
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/SpaceWiki/SpaceWiki.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -98,6 +98,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Wordpress/Wordpress.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -39,6 +39,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -12,9 +12,8 @@
<form method="post" name="editpage" id="editpage"
action="<?php echo $request->getPostURL() ?>"
accept-charset="UTF-8">
- <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
-<table class="toolbar" width="100%"
- cellpadding="0" cellspacing="0" border="0">
+ <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?>
+<table class="toolbar fullwidth">
<tr align="bottom">
<td>
<?php echo $PAGE_LOCKED_MESSAGE ?>
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/blog/Kubrick.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -250,6 +250,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/blog/templates/actionbar.tmpl
===================================================================
--- trunk/themes/blog/templates/actionbar.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/blog/templates/actionbar.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="baseline">
+<table class="fullwidth">
+<tr class="baseline">
<td>
<div class="actionbuttons">
<?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?>
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/phpwiki.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -59,6 +59,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================
--- trunk/themes/default/templates/actionbar.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/actionbar.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -4,8 +4,8 @@
* CSSs float:left; and float:right;. However float:right; seems
* to cause MSIE4.01/NT to hang.
* So, we use tables... */ ?>
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="baseline">
+<table class="fullwidth">
+<tr class="baseline">
<td>
<div id="actionbuttons">
<?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
@@ -51,10 +51,10 @@
</td>
<?php if (empty($NOSIGNIN)) { ?>
<?php
-/* valign="top" is not ideal here but required to get reasonable alignment
+/* class="top" is not ideal here but required to get reasonable alignment
with the other action buttons in some browsers, like OmniWeb and Safari
(therefore probably Konquorer too) */ ?>
- <td align="right" valign="top">
+ <td class="align-right top">
<div id="signin"><?php echo Template('signin') ?></div>
</td>
<?php } ?>
Modified: trunk/themes/default/templates/addcomment.tmpl
===================================================================
--- trunk/themes/default/templates/addcomment.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/addcomment.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -8,7 +8,7 @@
<input type="hidden" name="comment[pagename]" value="<?php echo $PAGENAME?>" />
<?php echo HiddenInputs($request->getArgs()) ?>
<table class="wikicomment-form">
- <tr><td width="100%"><textarea class="commentedit" rows="3" cols="55"
+ <tr><td><textarea class="commentedit" rows="3" cols="55"
name="comment[content]"></textarea></td>
<td class="submit-button"><input type="submit" value="<?php echo
_("Add Comment")
Modified: trunk/themes/default/templates/debug.tmpl
===================================================================
--- trunk/themes/default/templates/debug.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/debug.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -1,5 +1,5 @@
<?php global $RUNTIMER; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="fullwidth">
<tr><td>
<?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?>
<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/editpage.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -33,7 +33,7 @@
<br class="clear-floats" />
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
- <td align="right"><div id="editarea-size">
+ <td class="align-right"><div id="editarea-size">
<?php echo _("Size").':'?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
@@ -53,14 +53,13 @@
<?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?>
</div>
<?php } ?>
-<table class="toolbar" width="100%"
- cellpadding="0" cellspacing="0" border="0">
-<tr valign="middle">
+<table class="toolbar fullwidth">
+<tr class="middle">
<td>
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
<?php echo $OLD_MARKUP_CB ?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
</td>
- <td align="center">
+ <td class="align-center">
<?php if (!empty($WYSIWYG_B)){ ?>
<?php echo $WYSIWYG_B?><?php echo $SEP?>
<?php } ?>
@@ -80,7 +79,7 @@
<?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
<?php }} ?>
</td>
- <td colspan="2" align="right">
+ <td colspan="2" class="align-right">
<?php if (!$user->isAuthenticated()) { ?>
<?php echo Template('signin', array('FORMNAME' => 'editpage')) ?>
<?php } ?>
Modified: trunk/themes/default/templates/forumadd.tmpl
===================================================================
--- trunk/themes/default/templates/forumadd.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/forumadd.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -9,15 +9,15 @@
<table class="wikiforum-reply">
<caption><?php echo _("Post new")?></caption>
<col class="label" width="1*" /><col class="input" width="100*" />
- <tr><th align="right"><?php echo _("Title:")?></th>
+ <tr><th class="align-right"><?php echo _("Title:")?></th>
<td><input class="wikitext" type="text" size="60"
maxlength="256" name="forum[summary]" value="<?php echo isset($forum['summary']) ? $forum['summary'] : '' ?>" /></td>
</tr>
- <tr><th align="right"><?php echo _("Reply")?>:</th>
+ <tr><th class="align-right"><?php echo _("Reply")?>:</th>
<td><textarea class="forumedit" rows="5" cols="60"
name="forum[body]"><?php echo isset($forum['body']) ? $forum['body'] : ''?></textarea></td>
</tr>
- <tr><td colspan="2" align="center" class="submit-button"
+ <tr><td colspan="2" class="align-center" class="submit-button"
><input type="submit" value="<?php echo _("Add Message")?>"
name="forum[add]" class="wikiaction" /></td>
</tr>
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/login.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -66,9 +66,9 @@
<td>
<fieldset>
<legend><?php echo _("Sign In") ?></legend>
-<table cellspacing="4">
+<table>
<tr>
- <td align="right"><?php echo _("UserId:") ?></td>
+ <td class="align-right"><?php echo _("UserId:") ?></td>
<td><input type="text" name="auth[userid]" size="12" maxlength="256" value="<?php echo $userid?>" tabindex="1" />
<?php if (ENABLE_AUTH_OPENID) { ?>
<?php echo _("or")?> <a href="http://openid.net/"><?php echo _("OpenID") ?></a>: <input type="text" id="inp-openid" name="openid_url" size="32" maxlength="256" value="" tabindex="3" />
@@ -76,10 +76,10 @@
</td>
</tr>
<tr>
- <td align="right"><?php echo _("Password:") ?></td>
+ <td class="align-right"><?php echo _("Password:") ?></td>
<td><input type="password" name="auth[passwd]" size="12" maxlength="256" tabindex="2" /></td>
</tr>
-<tr><td></td><td align="left">
+<tr><td></td><td class="align-left">
<?php echo Button("submit:", _("Sign In"), 'wikiaction')?>
<?php if (!$require_level) { ?>
<?php echo Button("submit:auth[cancel]", _("Cancel"), 'button')?>
Modified: trunk/themes/default/templates/online.tmpl
===================================================================
--- trunk/themes/default/templates/online.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/online.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -14,7 +14,7 @@
$header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online"));
}
?>
-<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
+<table class="forumline fullwidth">
<tr><td class="cat" colspan="2"><?php echo $header ?></td></tr>
<tr><td class="row1" rowspan="3"><?php echo $ONLINE_ICON ?></td>
<td class="row1 gensmall"><?php echo fmt("Our users created a total of %d pages.",$NUM_PAGES) ?><br />
@@ -56,7 +56,7 @@
$url = WikiUrl($pagename,array("mode"=>"summary"));
$header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online"));
?>
-<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
+<table class="forumline fullwidth">
<tr><td class="cat" colspan="3"><?php echo $header ?></td></tr>
<tr><td class="cat" colspan="3"><?php echo _("Registered Users") ?></td></tr>
<?php if (!empty($ADMINS) and $dispose_admin) { ?>
Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/default/templates/pagelink.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -11,7 +11,7 @@
$NEXT = false;
}
?>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%" class="wikipaging"><tr class="wikipaging">
+<tr><td style="width:100%" colspan="<?php echo $COLS ?>"><table class="fullwidth wikipaging"><tr class="wikipaging">
<td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
<?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/fusionforge/templates/editpage.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -66,7 +66,7 @@
<br class="clear-floats" />
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
- <td align="right"><div id="editarea-size">
+ <td class="align-right"><div id="editarea-size">
<?php echo _("Size").':'?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
@@ -77,11 +77,11 @@
<label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
</div>
<table class="fullwidth">
-<tr valign="middle">
+<tr class="middle">
<td>
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
</td>
- <td align="center">
+ <td class="align-center">
<?php echo $PREVIEW_B ?>
<?php if ($SAVE_B) { ?>
<?php echo $SEP?><?php echo $SAVE_B ?>
Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/shamino_com/shamino_com.css 2013-06-18 15:39:31 UTC (rev 8817)
@@ -175,6 +175,18 @@
vertical-align: top;
}
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
.nowrap {
white-space: nowrap;
}
Modified: trunk/themes/smaller/templates/actionbar.tmpl
===================================================================
--- trunk/themes/smaller/templates/actionbar.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/smaller/templates/actionbar.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -8,8 +8,8 @@
* CSSs float:left; and float:right;. However float:right; seems
* to cause MSIE4.01/NT to hang.
* So, we use tables... */ ?>
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr valign="baseline">
+<table class="fullwidth">
+<tr class="baseline">
<td>
<div id="actionbuttons">
<?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
@@ -45,7 +45,7 @@
</div>
</td>
<?php if (empty($NOSIGNIN)) { ?>
- <td align="right">
+ <td class="align-right">
<div id="signin"><?php echo Template('signin') ?></div>
</td>
<?php } ?>
Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl 2013-06-18 13:42:44 UTC (rev 8816)
+++ trunk/themes/wikilens/templates/body.tmpl 2013-06-18 15:39:31 UTC (rev 8817)
@@ -5,7 +5,7 @@
<?php echo Template('top') ?>
</div>
</td></tr>
-<tr valign="top"><td class="leftnav" width="120">
+<tr class="top"><td class="leftnav" width="120">
<div class="toolbar">
<?php echo Template('navbar') ?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-07-04 14:49:35
|
Revision: 8826
http://sourceforge.net/p/phpwiki/code/8826
Author: vargenau
Date: 2013-07-04 14:49:32 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Clean up old markup
Modified Paths:
--------------
trunk/pgsrc/Help%2FPageList
trunk/pgsrc/PhpWikiAdministration
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Portland/templates/editpage.tmpl
trunk/themes/Wordpress/templates/editpage.tmpl
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/default/templates/editpage.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/pgsrc/Help%2FPageList 2013-07-04 14:49:32 UTC (rev 8826)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Jan 2013 11:16:51 +0000
+Date: Fri, 28 Jun 2013 15:51:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FPageList;
@@ -103,7 +103,6 @@
|= locked | Locked
|= external | External
|= minor | Minor Edit
-|= markup | Markup
|= size | Size
|= creator | Creator
|= owner | Owner
Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/pgsrc/PhpWikiAdministration 2013-07-04 14:49:32 UTC (rev 8826)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:13:59 +0000
+Date: Fri, 28 Jun 2013 15:51:27 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiAdministration;
@@ -19,7 +19,7 @@
or call the available ~WikiAdmin actions directly:
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
== Global Access Rights ==
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Crao/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -54,7 +54,6 @@
<?php } ?>
<fieldset class="toolbar">
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label>
- <?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
<?php if ($user->isAdmin()) { ?>
<?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
<?php } ?>
@@ -70,37 +69,10 @@
<label><?php echo Template('signin', array('FORMNAME' => 'editpage')) ?></label>
</fieldset>
<hr noshade="noshade" />
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Portland/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -42,8 +42,6 @@
<?php echo _("Edit Area Size")?>: <b><?php echo _("H")?></b> <?php echo $HEIGHT_PREF?>
<b><?php echo _("W")?></b> <?php echo $WIDTH_PREF?>
<?php echo Button("submit:", _("Adjust"), 'wikiaction')?>
- <br />
- <?php echo $OLD_MARKUP_CB?> <?php echo _("Use old markup")?>
</p>
<?php if (isset($PREVIEW_CONTENT)) { ?>
@@ -53,41 +51,12 @@
<hr />
<?php } ?>
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
<hr />
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/Wordpress/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -55,7 +55,6 @@
<?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
WikiLink(_("RecentEdits"))) ?></label>
<br />
-<?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?> </label> <?php echo $OLD_MARKUP_CONVERT?>
<?php if ($user->isAdmin()) { ?>
<?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
<?php } ?>
@@ -68,42 +67,13 @@
<hr />
<?php } ?>
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
</div>
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
-
<hr />
Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/blog/templates/blogform.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
</div>
<hr noshade="noshade" />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/default/templates/blogform.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
</div>
<hr />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/default/templates/editpage.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -57,7 +57,6 @@
<tr class="middle">
<td>
<?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
- <?php echo $OLD_MARKUP_CB ?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?>
</td>
<td class="align-center">
<?php if (!empty($WYSIWYG_B)){ ?>
@@ -92,37 +91,8 @@
<hr />
-<script type="text/javascript">
-<!--
-function showOldMarkupRules(show) {
- if (document.getElementById) {
- if (!show) {
- document.getElementById('newMarkup').style.display="block";
- document.getElementById('oldMarkup').style.display="none";
- } else {
- document.getElementById('newMarkup').style.display="none";
- document.getElementById('oldMarkup').style.display="block";
- }
- }
-}
-// -->
-</script>
-
-<div id="oldMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help")."/"._("OldTextFormattingRules") section=_("Synopsis") quiet=1?>
-</div>
-<div id="newMarkup" class="wiki-edithelp">
-<!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules -->
-<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
<?plugin IncludePage page=_("Help")."/"._("TextFormattingRules") section=_("Synopsis") quiet=1?>
</div>
-
-<script type="text/javascript">
-<!--
-if (document.getElementById) {
- showOldMarkupRules(document.getElementById('useOldMarkup').checked);
-}
-// -->
-</script>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2013-07-04 14:45:29 UTC (rev 8825)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2013-07-04 14:49:32 UTC (rev 8826)
@@ -17,7 +17,7 @@
</div>
<hr noshade="noshade" />
-<div id="newMarkup" class="wiki-edithelp">
+<div class="wiki-edithelp">
<?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-07-09 08:02:08
|
Revision: 8831
http://sourceforge.net/p/phpwiki/code/8831
Author: vargenau
Date: 2013-07-09 08:02:04 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
trunk/lib/loadsave.php
trunk/lib/upgrade.php
trunk/locale/de/pgsrc/AlleBenutzer
trunk/locale/de/pgsrc/G%C3%A4steBuch
trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/locale/de/pgsrc/HochLaden
trunk/locale/de/pgsrc/LeereSeiten
trunk/locale/de/pgsrc/ListeSeiten
trunk/locale/de/pgsrc/ModerierteSeite
trunk/locale/de/pgsrc/NeuesteSeiten
trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten
trunk/locale/de/pgsrc/SeiteFinden
trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
trunk/locale/de/pgsrc/Vorlage%2FBeispiel
trunk/locale/de/pgsrc/WunschZettelSeiten
trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
trunk/locale/es/pgsrc/Ayuda%2FKBrown
trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
trunk/locale/fr/pgsrc/AdministrationDePhpWiki
trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
trunk/locale/fr/pgsrc/Aide%2FInterWiki
trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires
trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau
trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp
trunk/locale/fr/pgsrc/Aide%2FPluginCommenter
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
trunk/locale/fr/pgsrc/Aide%2FPluginRedirection
trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache
trunk/locale/fr/pgsrc/Aide%2FPluginWiki
trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog
trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
trunk/locale/fr/pgsrc/ChercherUnePage
trunk/locale/fr/pgsrc/Derni%C3%A8resModifs
trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
trunk/locale/fr/pgsrc/ListeDePages
trunk/locale/fr/pgsrc/PagesFloues
trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es
trunk/locale/fr/pgsrc/PagesSemblables
trunk/locale/fr/pgsrc/PierrickMeignen
trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
trunk/locale/fr/pgsrc/R%C3%A9troLiens
trunk/locale/fr/pgsrc/RechercheInterWiki
trunk/locale/fr/pgsrc/TousLesUtilisateurs
trunk/locale/fr/pgsrc/ToutesLesPages
trunk/locale/fr/pgsrc/TraduireUnTexte
trunk/locale/it/pgsrc/Aiuto%2FBuonStile
trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/locale/it/pgsrc/PaginaDiProva
trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen
trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
trunk/locale/nl/pgsrc/PhpWikiBeheer
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin
trunk/locale/zh/pgsrc/Help%2FInterWiki
trunk/locale/zh/pgsrc/Help%2FLinkIcons
trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin
trunk/locale/zh/pgsrc/PhpWikiAdministration
trunk/pgsrc/Help%2FFacebookLikePlugin
trunk/pgsrc/Help%2FJabberPresencePlugin
trunk/pgsrc/Help%2FPageDumpPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin
trunk/pgsrc/Help%2FTextFormattingRules
trunk/pgsrc/Help%2FVisualWikiPlugin
trunk/pgsrc/Help%2FWikiBlogPlugin
trunk/pgsrc/The%20PhpWiki%20programming%20team
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/lib/loadsave.php 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1508,17 +1508,18 @@
// Ensure that all mandatory pages are loaded
$finder = new FileFinder;
- $mandatory = array('SandBox',
+ $mandatory = array('SandBox',
'Template/Category',
'Template/Talk',
'SpecialPages',
'CategoryCategory',
'CategoryActionPage',
- 'Help/TextFormattingRules',
'PhpWikiAdministration');
if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
$mandatory[] = 'Template/UserPage';
+ } else {
+ $mandatory[] = 'Help/TextFormattingRules';
}
$mandatory = array_merge($mandatory, $GLOBALS['AllActionPages']);
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/lib/upgrade.php 2013-07-09 08:02:04 UTC (rev 8831)
@@ -100,7 +100,7 @@
LoadAny($this->request, $path . "/" . $filename);
echo "<br />\n";
} else {
- echo "$path/$pagename" . _(": ") . _("older than the existing page.")
+ echo "$path/$pagename" . _(": ") . _("older than the existing page.")
. " " . _("Skipped."), "<br />\n";
}
} else {
Modified: trunk/locale/de/pgsrc/AlleBenutzer
===================================================================
--- trunk/locale/de/pgsrc/AlleBenutzer 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/AlleBenutzer 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 4 Feb 2011 17:33:12 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=AlleBenutzer;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Liste aller eingetragenen Benutzer, die ihre
+Liste aller eingetragenen Benutzer, die ihre
BenutzerEinstellungen schon einmal gespeichert haben,
entweder in ihrer Homepage oder - wenn so konfiguriert -
in einer Datenbank.
Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch
===================================================================
--- trunk/locale/de/pgsrc/G%C3%A4steBuch 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=G%C3%A4steBuch;
@@ -8,6 +8,6 @@
Tragen Sie sich einfach mit Namen und Datum auf dieser Seite ein!
-Jeff Dairiki, Arno Hollosi, Steve Wainstead, Reini Urban, und alle weiteren
+Jeff Dairiki, Arno Hollosi, Steve Wainstead, Reini Urban, und alle weiteren
[PhpWiki Autoren|PhpWiki:ThePhpWikiProgrammingTeam].
----
Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 4 Jan 2011 11:59:41 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAutorenProtokollPlugin;
@@ -35,7 +35,7 @@
**author** |
Benutzername. Vorgabe: aktueller Benutzername
**page** |
- Seitenname. Vorgabe: aktuelle Seite.
+ Seitenname. Vorgabe: aktuelle Seite.
Besondere Werte: page=username: page=author, page=all: Liste aller Seiten mit Änderungen dieses Benutzers.
**info**|
Liste der Spaltentypen. Vorgabe: version,minor,author,summary,mtime
Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHalloWeltPlugin;
@@ -17,16 +17,16 @@
}}}
-----
-PhpWiki's Plugin Architektur erlaubt dir benutzerdefinierte HTML Elemente deinem Wiki hinzuzufügen. Du mußt nur eine neue Klasse (Unterklasse) von der ~WikiPlugin Klasse ableiten, wie mit dem Namen unterhalb, und mit der run() Methode ja nach Wiki- oder Request Argumenten die HTML Ausgabe zu erzeugen.
+PhpWiki's Plugin Architektur erlaubt dir benutzerdefinierte HTML Elemente deinem Wiki hinzuzufügen. Du mußt nur eine neue Klasse (Unterklasse) von der ~WikiPlugin Klasse ableiten, wie mit dem Namen unterhalb, und mit der run() Methode ja nach Wiki- oder Request Argumenten die HTML Ausgabe zu erzeugen.
-* Entweder man erzeugt sie über die HTML Klassen,
-* oder über ein theme Template (Vorlage). Templates sind unübersichtlicher, und Verleiten zum
+* Entweder man erzeugt sie über die HTML Klassen,
+* oder über ein theme Template (Vorlage). Templates sind unübersichtlicher, und Verleiten zum
Erzeugen von ungültigem XHTML code, sind aber leichter anpassbar.
<<PhpHighlight
/**
- * Ein einfaches Beispiels-WikiPlugin.
+ * Ein einfaches Beispiels-WikiPlugin.
* Name, Argumente und Texte bitte auf englisch, und erst in locale/po/de.po
* auf Deutsch übersetzen.
*
Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 4 Jan 2011 11:59:41 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHochLadenPlugin;
@@ -6,13 +6,13 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Das HochLaden [[Hilfe:WikiPlugin|WikiPlugin]] zeigt eine Eingabebox und zwei Knöpfe.
-Mit dem ersten Knopf "Durchsuchen..." kann man eine Datei aus dem
-lokalem Dateisystem auswählen, die man hochladen möchte.
-Der Textwert dieses Knopfes ("Durchsuchen...") hängt von Ihrem Browser ab.
-Der zweite "HochLaden" Knopf lädt die Datei dann in das upload Verzeichnis auf dem
+Das HochLaden [[Hilfe:WikiPlugin|WikiPlugin]] zeigt eine Eingabebox und zwei Knöpfe.
+Mit dem ersten Knopf "Durchsuchen..." kann man eine Datei aus dem
+lokalem Dateisystem auswählen, die man hochladen möchte.
+Der Textwert dieses Knopfes ("Durchsuchen...") hängt von Ihrem Browser ab.
+Der zweite "HochLaden" Knopf lädt die Datei dann in das upload Verzeichnis auf dem
Server hoch.
-Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem "Upload~:"
+Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem "Upload~:"
[InterWikiKarte]n Prefix zum Dateinamen verwendet werden.
So können Sie z.B. leicht hochgeladene Bilder anzeigen. Siehe PhpWiki:InlineUploadedImages
@@ -24,14 +24,14 @@
=== Argumente:
**logfile**:
Lokaler Pfad. Vorgabe: "phpwiki-upload.log"
- Das Format ist momentan HTML - eine neue <tr> Zeile per Datei - und nicht die sonst übliche
+ Das Format ist momentan HTML - eine neue <tr> Zeile per Datei - und nicht die sonst übliche
Log Datei Syntax.
**autolink**:
Füge den hochgeladene Dateinamen zur Liste der hochgeladenen Dateien auf der Seite 'page' dazu.
Vorgabe: true
**page**:
- Die Seite auf der hochgeladene Dateien aufgelistet werden, wenn 'autolink'
- auf true gesetzt ist.
+ Die Seite auf der hochgeladene Dateien aufgelistet werden, wenn 'autolink'
+ auf true gesetzt ist.
Vorgabe: current page.
==== Probleme:
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 4 Jan 2011 11:59:41 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeueSeitePlugin;
@@ -8,10 +8,10 @@
WikiPlugin um leicht neue Seiten zu erzeugen, optional mit vorgegebenem Inhalt. Seit v1.3.8
-Sie können den neuen Seitennamen von einer Eingabebox bekommen, optional mit
+Sie können den neuen Seitennamen von einer Eingabebox bekommen, optional mit
neuem Inhalt von einer bestehenden Vorgabe oder Kategorieseite.
-Schreibe "<~?plugin-form ~CreatePage ?~>" in eine Seite, zeige diese Seite an,
+Schreibe "<~?plugin-form ~CreatePage ?~>" in eine Seite, zeige diese Seite an,
gebe den Namen der neuen Seite an und klicke auf den NeueSeite Knopf.
=== Benutzung
@@ -34,7 +34,7 @@
=== Pläne
-The content might hold some variables, which will be expanded on creation.
+The content might hold some variables, which will be expanded on creation.
The syntax is not clear yet.
=== Autor
@@ -45,7 +45,7 @@
<?plugin-form CreatePage s=MyHomePage ?>
-Siehe auch PhpWiki:EasilyCreateNewPages
+Siehe auch PhpWiki:EasilyCreateNewPages
----
[[PhpWikiDokumentation]] [[KategorieWikiPlugin]]
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin;
@@ -7,9 +7,9 @@
Content-Transfer-Encoding: binary
== Zusammenfassung
-Zeigt eine Liste von Bilder aus einer Definitionsdatei mit optionaler Beschreibung als Album an.
+Zeigt eine Liste von Bilder aus einer Definitionsdatei mit optionaler Beschreibung als Album an.
-== Benutzung
+== Benutzung
{{{
<<PhotoAlbum
src=http://server/textfile
@@ -27,14 +27,14 @@
_Nur der ='src'= Parameter ist verpflichtend._
*src*:
- Url or local path to a CSV textfile which separates filename and
+ Url or local path to a CSV textfile which separates filename and
description of each photo. Photos listed in the text file have to be in same
directory as the file. Descriptions are optional.
- If the the local path points to a directory, is relative from PHPWIKI_DIR,
- and the main script is in PHPWIKI_DIR, weblocation must not be given, and
+ If the the local path points to a directory, is relative from PHPWIKI_DIR,
+ and the main script is in PHPWIKI_DIR, weblocation must not be given, and
all pictures from this directory are displayed.
-*url*:
+*url*:
defines the the webpath to the srcdir directory (formerly called weblocation)
*mode*:
@@ -52,9 +52,9 @@
"desc" - Only description (from textfile) shown %%%
"both" - If no description found, then filename will be used %%%
-*link*:
+*link*:
true or false
- If true, each image will be hyperlinked to a page where the single
+ If true, each image will be hyperlinked to a page where the single
photo will be shown full-size. Only works when mode != 'normal'
*align*:
@@ -75,7 +75,7 @@
*height*, *width*:
Height and width are calculated compared to original metrics
- retrieved by [php-function:getimagesize] and can be absolute (50px)
+ retrieved by [php-function:getimagesize] and can be absolute (50px)
or a percentage (e.g. "50%").
*attrib*:
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Mon, 17 Jun 2013 13:19:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextFormatierungsRegeln;
@@ -106,24 +106,24 @@
== Querverweise (Links) ==
-* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern
+* Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern
einschließt [das ist ein Link] oder besser WikiWörterVerwendet.
* Hyperlinks zu externen Seiten werden so erstellt: [http://www.wcsb.org/]
-* Du kannst Links zu externen Seiten einen Namen geben, indem du in der eckigen Klammer erst
+* Du kannst Links zu externen Seiten einen Namen geben, indem du in der eckigen Klammer erst
den Namen und dann, getrennt durch einen senkrechten Strich (|), die Adresse angibst:
[PhpWiki Homepage | http://phpwiki.sourceforge.net/] ---
[Die Start Seite | StartSeite]
-* Du kannst das Erstellen eines Links verhindern, indem du vor das Wort eine
+* Du kannst das Erstellen eines Links verhindern, indem du vor das Wort eine
Tilde '<tt>~~</tt>' setzt, zum Beispiel ~DasIstKeinLink.
~http://not.linked.to/
* You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt
-_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is
+_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is
in the first column, it is a footnote <em>definition</em> rather than a footnote
<em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.)
-* Wenn du im Text Adressen eingibst, die mit **http:**, **ftp:** oder **mailto:** beginnen,
+* Wenn du im Text Adressen eingibst, die mit **http:**, **ftp:** oder **mailto:** beginnen,
werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/
-* Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite
+* Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite
eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png]
== Tabellen ==
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FVorlagePlugin;
@@ -13,7 +13,7 @@
Include text from a wiki page and replace certain placeholders by parameters.
Similiar to CreatePage with the template argument, but at run-time.
-Similiar to the mediawiki templates but not with the "|" parameter seperator.
+Similiar to the mediawiki templates but not with the "|" parameter seperator.
Note: The mediawiki syntax is also supported.
=== Usage
@@ -41,7 +41,7 @@
==== Parameter expansion:
vars="var1=value1&var2=value2"
-We only support named parameters, not numbered ones as in mediawiki, and
+We only support named parameters, not numbered ones as in mediawiki, and
the placeholder is %%var%% and not {{~{var~}}} as in mediawiki.
The following predefined variables are automatically expanded if existing:
@@ -50,7 +50,7 @@
mtime - last modified date + time
ctime - creation date + time
author - last author
- owner
+ owner
creator - first author
SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
}}}
@@ -58,11 +58,11 @@
<noinclude> .. </noinclude> is stripped
==== In work:
- Support a mediawiki-style syntax extension which maps
+ Support a mediawiki-style syntax extension which maps
{{{
{{Template/Film|title=Some Good Film|year=1999}}
}}}
- to
+ to
{{{
<<Template page=Template/Film vars="title=Some Good Film&year=1999" >>
}}}
Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/HochLaden 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=HochLaden;
@@ -6,4 +6,4 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<UpLoad >>
+<<UpLoad>>
Modified: trunk/locale/de/pgsrc/LeereSeiten
===================================================================
--- trunk/locale/de/pgsrc/LeereSeiten 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/LeereSeiten 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Nicht alle diese Seiten werden wirklich benötigt. Der Linkextraktor ist immer noch viel zu optimistisch, bei Interlinks, usw. D.h. viele dieser Links sind gar keine internen Seiten.
+Nicht alle diese Seiten werden wirklich benötigt. Der Linkextraktor ist immer noch viel zu optimistisch, bei Interlinks, usw. D.h. viele dieser Links sind gar keine internen Seiten.
Einige Web-Robots erzeugen manchmal auch leere Seiten.
-<<WantedPages limit=20 with_count=0 as_tree=0 maxlinks=5 sort='pagename' >>
+<<WantedPages limit=20 with_count=0 as_tree=0 maxlinks=5 sort='pagename'>>
Modified: trunk/locale/de/pgsrc/ListeSeiten
===================================================================
--- trunk/locale/de/pgsrc/ListeSeiten 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/ListeSeiten 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=ListeSeiten;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Ein einfaches Beispiel für das ListPagesPlugin. Hauptsächlich für ein wikilens Thema benutzt,
+Ein einfaches Beispiel für das ListPagesPlugin. Hauptsächlich für ein wikilens Thema benutzt,
um Ratings Info anzuzeigen.
<<ListPages pages=HomePage,FindPage,WikiWikiWeb >>
Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/ModerierteSeite 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Jan 2013 11:17:06 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=ModerierteSeite;
@@ -12,15 +12,15 @@
== Was ist eine ModerierteSeite?
-Eine ModerierteSeite ist ein seitenspezifische Einstellung, die gewisse Aktionen auf moderierten
-Seiten einschränkt.
+Eine ModerierteSeite ist ein seitenspezifische Einstellung, die gewisse Aktionen auf moderierten
+Seiten einschränkt.
The requested action and page is stored internally and an email is sent to the moderators
-described in the linked and locked ModeratedPage action page.
-Any moderator may approve or reject the action by simply clicking an url.
-When approving the action, the requested action (edit, rename, ...) is performed.
+described in the linked and locked ModeratedPage action page.
+Any moderator may approve or reject the action by simply clicking an url.
+When approving the action, the requested action (edit, rename, ...) is performed.
In both cases the author is notified, so it's recommended for the
-moderator to click on either the approve or reject links in the moderation email.
+moderator to click on either the approve or reject links in the moderation email.
In case of multiple moderators: first comes, first serves.
== How to enable ModerierteSeite on a single page?
@@ -41,7 +41,7 @@
== Plugin Arguments
* moderators: comma separated list of registered usernames or groups.
- Each user should have his email defined in his prefs. Default: "Administrators" or
+ Each user should have his email defined in his prefs. Default: "Administrators" or
<<SystemInfo ADMIN_USER >>
* requirelevel: one of 0, 1, 2 or 10 on which moderation is used. Default: false (use requireaccess instead)
* requireaccess: comma separated list of access perms, on which the moderation is used
@@ -50,25 +50,25 @@
== How does it work internally?
-You need to lock the page additionally, so that the link parser performs
-some magic whether the ModerierteSeite link is present or not, for efficiency
-reasons. It can be unlocked again, and even the ModeratedPage link may be removed.
-The status will only be changed on the *lock* action, whether the ModeratedPage
+You need to lock the page additionally, so that the link parser performs
+some magic whether the ModerierteSeite link is present or not, for efficiency
+reasons. It can be unlocked again, and even the ModeratedPage link may be removed.
+The status will only be changed on the *lock* action, whether the ModeratedPage
link is present or not.
-The moderation status is stored in each page in question.
+The moderation status is stored in each page in question.
Each moderated action is stored in the page also, together with a randomly
-created permission key to allow Grant by a simple external unauthorized request.
-There's no timeout on moderated actions, so the actions may stack up.
-The delayed actions may be performed in any order, there's no strict ordering to
+created permission key to allow Grant by a simple external unauthorized request.
+There's no timeout on moderated actions, so the actions may stack up.
+The delayed actions may be performed in any order, there's no strict ordering to
follow for the moderator.
== How to enable ModerierteSeite on multiple/all pages?
-If you enable the config option ENABLE_MODERATEDPAGE_ALL, the page moderation status on
+If you enable the config option ENABLE_MODERATEDPAGE_ALL, the page moderation status on
every page is automatically set to check this action page ModeratedPage.
-There may come another administrative plugin to change the moderation
+There may come another administrative plugin to change the moderation
status on selected pages.
----
Modified: trunk/locale/de/pgsrc/NeuesteSeiten
===================================================================
--- trunk/locale/de/pgsrc/NeuesteSeiten 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/NeuesteSeiten 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=NeuesteSeiten;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Hier ist eine Liste von zuletzt erzeugten neuen Seiten in diesem Wiki.
+Hier ist eine Liste von zuletzt erzeugten neuen Seiten in diesem Wiki.
<em>(Siehe <strong>NeuesteÄnderungen</strong> für alle neuen Änderungen).</em>
--------
Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
===================================================================
--- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PasswortZur%C3%BCcksetzen;
@@ -6,12 +6,12 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Jeder Administrator darf jedes Passwort jedes Benutzers zurücksetzen oder löschen. Der Benutzer darf sich dann
+Jeder Administrator darf jedes Passwort jedes Benutzers zurücksetzen oder löschen. Der Benutzer darf sich dann
z.B. mit einem leerem Passwort anmelden oder ein neues beim Anmelden vergeben.
-Ein normaler Benutzer darf nur sein eigenes Passwort zurücksetzen, wenn er seine E-Mail Addresse in den
-BenutzerEinstellungen definiert hat.
-Für Benutzer mit undefinierter oder ungeprüfter E-Mail Addresse müssen sie einen Administrator
+Ein normaler Benutzer darf nur sein eigenes Passwort zurücksetzen, wenn er seine E-Mail Addresse in den
+BenutzerEinstellungen definiert hat.
+Für Benutzer mit undefinierter oder ungeprüfter E-Mail Addresse müssen sie einen Administrator
benachrichtigen, um das Passwort zurücksetzen zu lassen.
Authenticated users should change their passwords at their UserPreferences page.
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Jun 2013 17:02:10 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten;
@@ -30,11 +30,11 @@
Email Verification:
- Die PhpWiki:EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der
- automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder
+ Die PhpWiki:EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der
+ automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder
Email server können nicht automatisch überprüft werden.
- Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die
+ Dieser Link zeigt eine Liste aller mit E-Mail registrierten Benutzer, und Checkboxes um die
Verifizierung manuell zu ändern.
<<WikiAdminUtils
@@ -45,7 +45,7 @@
== Aufräumen ==
Räume die Wiki SandKiste auf. Hiermit kann man die Seite mit der
-Version von locale/de/pgsrc/SandKiste erneut initialisieren:
+Version von locale/de/pgsrc/SandKiste erneut initialisieren:
[ SandKiste löschen | phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste ].
@@ -147,7 +147,7 @@
<<WikiForm action=dumphtml>>
-Erzeugt ein Verzeichnis aller Wiki Dateien als statische XHTML Dateien, die
+Erzeugt ein Verzeichnis aller Wiki Dateien als statische XHTML Dateien, die
auch ohne Webserver und Datenbank betrachtbar sind.
Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine
@@ -187,7 +187,7 @@
<<WikiAdminUtils
action=purge-bad-pagenames
label="WikiDB Bereinigen"
- >>
+ >>
=== Clean WikiDB of empty and unreferenced pages
@@ -202,8 +202,8 @@
=== Convert cached_html to new SQL column
- This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
- new page.cached_html field separately, and now you want to move this data from
+ This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
+ new page.cached_html field separately, and now you want to move this data from
page.pagedata over to page.cached_html.
<<WikiAdminUtils
@@ -223,7 +223,7 @@
=== Rebuild WikiDB
- This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
+ This will retransform all pages and rebuild the Wiki database on consistency errors or parser updates.
This can last several minutes, eat a lot of memory and possibly times out===
<<WikiAdminUtils
Modified: trunk/locale/de/pgsrc/SeiteFinden
===================================================================
--- trunk/locale/de/pgsrc/SeiteFinden 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/SeiteFinden 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 4 Jan 2011 11:59:41 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=SeiteFinden;
@@ -11,7 +11,7 @@
* WieManWikiBenutzt sagt wie die Sache hier in einem Wiki
funktioniert.
-* NeuesteÄnderungen ist eine automatisch erstellte Liste der zuletzt
+* NeuesteÄnderungen ist eine automatisch erstellte Liste der zuletzt
geänderten Seiten.
* WikiTechnik erklärt die Technik, mit der PhpWiki arbeitet.
Modified: trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Verlinkte%C3%84nderungen;
@@ -6,4 +6,4 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 >>
+<<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 >>
Modified: trunk/locale/de/pgsrc/Vorlage%2FBeispiel
===================================================================
--- trunk/locale/de/pgsrc/Vorlage%2FBeispiel 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/Vorlage%2FBeispiel 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Vorlage%2FBeispiel;
@@ -7,13 +7,13 @@
Content-Transfer-Encoding: binary
<noinclude>
-Die folgenden vordefinierten Variablen werden zwischen zwei %% gesetzt automatisch expandiert,
+Die folgenden vordefinierten Variablen werden zwischen zwei %% gesetzt automatisch expandiert,
auf ihren Wert gesetzt:
pagename
mtime - last modified date + time
ctime - creation date + time
author - last author
- owner
+ owner
creator - first author
SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
</noinclude>
Modified: trunk/locale/de/pgsrc/WunschZettelSeiten
===================================================================
--- trunk/locale/de/pgsrc/WunschZettelSeiten 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/de/pgsrc/WunschZettelSeiten 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=WunschZettelSeiten;
@@ -7,8 +7,8 @@
Content-Transfer-Encoding: binary
Das ist eine Liste von Seiten, die in diesem Wiki zitiert werden, aber
-nicht noch nicht erzeugt wurden. Obwohl sie anscheinend benötigt werden,
-kann es auch sein, dass sie falsch geschriebene existierende Seiten sind,
+nicht noch nicht erzeugt wurden. Obwohl sie anscheinend benötigt werden,
+kann es auch sein, dass sie falsch geschriebene existierende Seiten sind,
oder einfach zu triviale Seiten, um erzeugt zu werden.
Am besten wäre es natürlich, dass solche Seiten nicht erzeugt werden,
Modified: trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FBuenEstilo;
@@ -6,14 +6,14 @@
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."
+"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 y White, "Los elementos del estilo"
Modified: trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FComoUsarWiki;
@@ -35,7 +35,7 @@
* Se pueden poner lineas horizontales con cuatro o más guiones como estos:
----
-* Para crear hipervínculos solamente hay que poner las palabras juntas y capitalizarlas. Imaginemonos que quiere crear una página sobre como Steve Wainstead come gusanos. Todo lo que tiene que hacer es algo parecido a: SteveWainsteadComeGusanos. Si la página no existe, entonces aparecerá un simbolo ? después del vínculo, invitandole a crear la página: EstaPaginaNoDeberiaExistir. (Y por favor no arruine este ejemplo creando una aquí)
+* Para crear hipervínculos solamente hay que poner las palabras juntas y capitalizarlas. Imaginemonos que quiere crear una página sobre como Steve Wainstead come gusanos. Todo lo que tiene que hacer es algo parecido a: SteveWainsteadComeGusanos. Si la página no existe, entonces aparecerá un simbolo ? después del vínculo, invitandole a crear la página: EstaPaginaNoDeberiaExistir. (Y por favor no arruine este ejemplo creando una aquí)
* Para vincular páginas fuera del Wiki, simplementa hay que poner la URL y Wiki lo vinculará por usted: http://www.nytimes.com/
* Para poner imágenes, simplemente ponga el hipervínculo entre corchetes, por ejemplo: [[http://www.yourhost.yourdomain/images/picture.png]. Las URL de imagenes que no esten entre corchetes aparecerán como vínculos a la imagen.
* Ahora está listo para comenzar a AgregarPaginas.
Modified: trunk/locale/es/pgsrc/Ayuda%2FKBrown
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FKBrown 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FKBrown 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FKBrown;
@@ -7,7 +7,7 @@
markup=1
Content-Transfer-Encoding: binary
-Puse mi mejor esfuerzo para traducir esta página al español.
+Puse mi mejor esfuerzo para traducir esta página al español.
Me pueden encontrar en http://sandino.net y mailto:kb...@sa....
Por favor envíen reportes de bugs a mailto:php...@li...
Modified: trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 4 Jan 2011 11:59:17 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FReglasDeFormatoDeTexto;
@@ -12,7 +12,7 @@
**Énfasis:** '****' para ''itálicas'', _''''_ para **bold**, '****'_''''_ para ''**ambos**''.%%%
**Listas:** * para listas de balazos, # para listas numeradas, ''**;** term **:** definición'' para listas de definiciones.%%%
**Referencias:** !UnirPalabrasEnMayúsculas o usar corchetes para una [[enlace hacia una página] o URL [[!http://cool.wiki.int/].%%%
-**Anotaciones:** Use [[1],[[2],[[3],... %%%
+**Anotaciones:** Use [[1],[[2],[[3],... %%%
**Preveción enlazar:** Evite hacer enlaces con "!": !!NoHiperEnlaces. Enlaces con nombres como [[[[text | URL] (doble "["). %%%
**Varios:** "!", "!!", "!!!" para hacer títulos, "%''''%%" hace un salto de línea, "-''''---" Hace una linea horizontal.
@@ -67,7 +67,7 @@
* Los enlaces a otras páginas dentro de Wiki son realizadas poniendo el nombre entre corchetes: [esto es un vinculo de página] o UsandoPalabarasWiki (preferido)
* Los enlaces a páginas externas son realizados como este: [http://www.wcsb.org/]
-* Puede nombrar los enlaces a páginas externas poniendo un nombre, una barra (|) y el enlace: [página web de Steve | http://wcsb.org/~swain/]
+* Puede nombrar los enlaces a páginas externas poniendo un nombre, una barra (|) y el enlace: [página web de Steve | http://wcsb.org/~swain/]
* Puede suprimir enlace a viejas referencias, precediendo la palabra con un '!', e.j. !NotLinkedAsWikiName
* You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart. (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
* También, el sistema antiguo de enlazar los URL's sigue siendo soportado: preceda los URLs con "http:", "ftp:" o "mailto:" para crear enlaces automáticamante como en: http://c2.com/
Modified: trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FWabiSabi 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/es/pgsrc/Ayuda%2FWabiSabi 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:44 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FWabiSabi;
@@ -17,7 +17,7 @@
Los conceptos de wabi-sabi están relacionados con los conceptos del budismo Zen, asi los primeros japoneses que practicaron wabi-sabi eran maestros de té, curas y monjes que practicaban el Zen. El budismo Zen es originario de la India, pasó a China en el siglo 6, y fué introducido por primera vez en Japón sobre el siglo 12. El Zen enfatiza la "penetración intuitiva en la verdad transcendental más allá de todo concepto intelectual." El corazón del wabi-sabi es la importancia de caminos transcendentales sobre la observación y el pensamiento sobre las cosas y la existencia.
* Todas las cosas son no permamentes
* Todas las cosas son imperfectas
-* Todas las cosas son incompletas
+* Todas las cosas son incompletas
Características materiales de wabi-sabi:
Modified: trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
===================================================================
--- trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 25 Jan 2011 21:26:14 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=%C3%89ditionsR%C3%A9centes;
@@ -6,9 +6,9 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les
-modifications **mineures** sont montrées, et pas uniquement les plus
-récentes (voir DernièresModifs pour les modifications non-mineures les
+Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les
+modifications **mineures** sont montrées, et pas uniquement les plus
+récentes (voir DernièresModifs pour les modifications non-mineures les
plus récentes).
--------
Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Apr 2013 17:14:34 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=AdministrationDePhpWiki;
@@ -6,9 +6,9 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-_*Note :*_ _La plupart des actions sur cette page nécessitent des privilèges
-d'administrateur. Elles ne fonctionneront pas à moins que vous ayez défini un
-nom d'administrateur et un mot de passe dans le fichier de configuration de
+_*Note :*_ _La plupart des actions sur cette page nécessitent des privilèges
+d'administrateur. Elles ne fonctionneront pas à moins que vous ayez défini un
+nom d'administrateur et un mot de passe dans le fichier de configuration de
PhpWiki_
<<CreateToc jshide||=1 with_toclink||=1>>
@@ -36,7 +36,7 @@
== Nettoyage
-Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer
+Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer
dans un état virginal en chargeant sa version par défaut depuis pgsrc:
[ Râtisser le BacÀSable | phpwiki:?action=loadfile&source=pgsrc/SandBox ]
@@ -79,7 +79,7 @@
=== Mise à jour
-Fait quelques vérifications et mises à jours automatiquement après avoir installé un nouveau moteur phpwiki de mise à jour
+Fait quelques vérifications et mises à jours automatiquement après avoir installé un nouveau moteur phpwiki de mise à jour
* Met à jour les nouvelles pages ou les pages révisées depuis pgsrc
* Met à jour la base de données (mysql _page.id auto_increment_, ADD _session.sess_ip_),
@@ -113,7 +113,7 @@
Tout ceci surtout pour des débogages (au moins c'est ce que j'espère).
-En utilisation normale, vous ne devriez par les utiliser mais ça ne devrait
+En utilisation normale, vous ne devriez par les utiliser mais ça ne devrait
pas vous faire de mal.
=== Purger le cache
@@ -131,7 +131,7 @@
*Attention!* en appuyant sur ce bouton toutes les pages vides et non référencées seront supprimées sans aucune possiblité de les restaurer.
Ceci supprimera toute possibilité de retrouver les page ainsi supprimées.
-
+
<<WikiAdminUtils
action=purge-empty-pages
label="Purge all empty unreferenced pages"
Modified: trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 10:22:55 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2F%C3%89diterLeContenu;
@@ -6,7 +6,7 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Toute les pages (sauf les résultats de recherche) ont un lien //Modifier//.
+Toute les pages (sauf les résultats de recherche) ont un lien //Modifier//.
Vous pouvez modifier la page que vous lisez en cliquant sur ce lien.
<noinclude>
Modified: trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 10:22:55 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FAjouterDesPages;
@@ -6,25 +6,25 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Pour ajouter une nouvelle page à Wiki, vous n'avez qu'à trouver un titre
-parlant, mettre en majuscules toutes les initiales des mots (au moins deux) et les
-CollerEnsembleCommeCeci. Wiki le reconnaîtra automagiquement comme étant
+Pour ajouter une nouvelle page à Wiki, vous n'avez qu'à trouver un titre
+parlant, mettre en majuscules toutes les initiales des mots (au moins deux) et les
+CollerEnsembleCommeCeci. Wiki le reconnaîtra automagiquement comme étant
un hyperlien. Éventullement, vous pouvez mettre n'importe quoi entre [crochets]
mais c'est conseillé d'utiliser les majuscules.
-Vous pouvez alors y aller et CliquerSurLePointdInterrogation au bout de votre
+Vous pouvez alors y aller et CliquerSurLePointdInterrogation au bout de votre
nouvel hyperlien, et le Wiki vous donnera une fenêtre pour créer la nouvelle page.
-Si vous désirez ajouter au Wiki un document complexe, vous vous en sortirez
-probablement mieux en fournissant l'URL pointant vers lui plutôt qu'en essayant
-d'ajouter ici le texte du document. Voici par exemple un lien vers la page
+Si vous désirez ajouter au Wiki un document complexe, vous vous en sortirez
+probablement mieux en fournissant l'URL pointant vers lui plutôt qu'en essayant
+d'ajouter ici le texte du document. Voici par exemple un lien vers la page
d'accueil du projet PhpWiki : http://phpwiki.sourceforge.net/
-Le Wiki ne gère pas les balises HTML (voir RèglesDeFormatageDesTextes). <tags>Ils
-sortiront juste sous forme de texte.</tags> Wiki est conçu pour être aussi simple
+Le Wiki ne gère pas les balises HTML (voir RèglesDeFormatageDesTextes). <tags>Ils
+sortiront juste sous forme de texte.</tags> Wiki est conçu pour être aussi simple
que possible pour encourager son utilisation.
-Notez qu'il existe une fonctionnalité que votre administrateur système peut valider
+Notez qu'il existe une fonctionnalité que votre administrateur système peut valider
pour autoriser le HTML incorporé, mais cela implique des risques de sécurité.
<noinclude>
Modified: trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 18:00:26 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FD%C3%A9tailsTechniques;
@@ -6,22 +6,22 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-~PhpWiki est écrit en PHP, langage de scripting côté serveur, disponible
-sur http://www.php.net/. PHP ressemble au C et à Perl dans sa syntaxe, et
+~PhpWiki est écrit en PHP, langage de scripting côté serveur, disponible
+sur http://www.php.net/. PHP ressemble au C et à Perl dans sa syntaxe, et
fonctionne comme ASP, ~EmbPerl ou JSP.
-~PhpWiki est constitué d'une douzaine de fichiers environ de PHP mélangé à du HTML.
-Les pages web qui forment un [[Aide:WikiWikiWeb|WikiWikiWeb]] basé sur PHP sont stockées dans un fichier
-DBM avec des copies de sauvegarde des versions précédentes stockées dans un second
+~PhpWiki est constitué d'une douzaine de fichiers environ de PHP mélangé à du HTML.
+Les pages web qui forment un [[Aide:WikiWikiWeb|WikiWikiWeb]] basé sur PHP sont stockées dans un fichier
+DBM avec des copies de sauvegarde des versions précédentes stockées dans un second
fichier DBM.
-Chaque fois qu'un utilisateur utilise le site, la page demandée est extraite de la DBM
-et rendue à la volée. L'utilisateur ne demande jamais que le fichier index.php, qui
+Chaque fois qu'un utilisateur utilise le site, la page demandée est extraite de la DBM
+et rendue à la volée. L'utilisateur ne demande jamais que le fichier index.php, qui
décide alors quels sont les fichiers php à inclure.
-Les liens vers des pages au sein du wiki sont ajoutés automatiquement.
-Ceci peut être l'aspect le plus intéressant d'un wiki, la capacité à ajouter des
-pages simplement en créant des liens vers elles. L'autre caractéristique la plus
+Les liens vers des pages au sein du wiki sont ajoutés automatiquement.
+Ceci peut être l'aspect le plus intéressant d'un wiki, la capacité à ajouter des
+pages simplement en créant des liens vers elles. L'autre caractéristique la plus
intéressante est la facilité avec laquelle on peut créer des URL externes tels que :
# http://www.wcsb.org/
@@ -30,10 +30,10 @@
# http://www.slashdot.com/
# http://theregister.co.uk/
-Combiné avec un seul espace de noms et un système de marquage simple, un Wiki exhibe
+Combiné avec un seul espace de noms et un système de marquage simple, un Wiki exhibe
nombre des caractéristiques du [[Aide:WabiSabi|WabiSabi]].
-PhpWiki est publié sous Licence Publique Générale GNU (GNU GPL), que vous devriez
+PhpWiki est publié sous Licence Publique Générale GNU (GNU GPL), que vous devriez
pouvoir lire ici : [[http://www.gnu.org/copyleft/gpl.txt]].
<noinclude>
Modified: trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 18:00:26 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FIc%C3%B4nesDeLien;
@@ -8,8 +8,8 @@
== Description ==
-Les **~IcônesDeLien** forment une nouvelle caractéristique optionnelle de ~PhpWiki.
-Lorsqu'elles sont activées, des icônes seront affichées devant les URL pour
+Les **~IcônesDeLien** forment une nouvelle caractéristique optionnelle de ~PhpWiki.
+Lorsqu'elles sont activées, des icônes seront affichées devant les URL pour
indiquer de quel type de lien il s'agit.
| {{/themes/default/images/http.png}} | lien http
@@ -41,10 +41,10 @@
//Une icône générique est affichée pour les autres liens d'un type moins commun.//
* news://nntp.news.com]
-* gopher://gopher.caltech.cmu.edu
+* gopher://gopher.caltech.cmu.edu
-IcônesDeLien s'affichera seulement lorsque le protocole d'URL fait partie de ceux qui
-sont autorisé dans PhpWiki. Les exemples suivants ne montrent rien et PhpWiki ignorera
+IcônesDeLien s'affichera seulement lorsque le protocole d'URL fait partie de ceux qui
+sont autorisé dans PhpWiki. Les exemples suivants ne montrent rien et PhpWiki ignorera
l'activation du double-clique à moins que l'administrateur l'ajoute :
* bogus://oedipus.nostradamus.com %%%
Modified: trunk/locale/fr/pgsrc/Aide%2FInterWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FInterWiki 2013-07-04 16:42:06 UTC (rev 8830)
+++ trunk/locale/fr/pgsrc/Aide%2FInterWiki 2013-07-09 08:02:04 UTC (rev 8831)
@@ -1,4 +1,4 @@
-Date: Thu, 27 Jan 2011 18:00:26 +0000
+Date: Mon, 8 Jul 2013 17:59:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FInterWiki;
@@ -6,39 +6,39 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-Ce wiki accepte les liens **~InterWiki** dans un style copié sur celui du wiki
-[UseMod:]. Les liens vers des pages d'autres wikis peuvent être réalisés
-sans avoir à connaître ou taper les URL complets, par exemple :
-MeatBall:InterWiki produira un lien vers la page nommée "~InterWiki" sur
+Ce wiki accepte les liens **~InterWiki** dans un style copié sur celui du wiki
+[UseMod:]. Les liens vers des pages d'autres wikis peuvent être réalisés
+sans avoir à connaître ou taper les URL complets, par exemple :
+MeatBall:InterWiki produira un lien vers la page nommée "~InterWiki" sur
MeatballWiki.
-La carte ~InterWiki est extraite du bloc <verbatim> dans la [[CarteInterWiki]],
-mais cette page doit être verrouillée pour que cela fonctionne.
-Ceci interdit aux hackers potentiels de pouvoir changer abominablement
-tous les liens ~InterWiki pour qu'ils pointent vers un URL diabolique.
-Si aucune carte n'est trouvée dans la [[CarteInterWiki]] (ou si la page n'est
+La carte ~InterWiki est extraite du bloc <verbatim> dans la [[CarteInterWiki]],
+mais cette page doit être verrouillée pour que cela fonctionne.
+Ceci interdit aux hackers potentiels de pouvoir changer abominablement
+tous les liens ~InterWiki pour qu'ils pointent vers un URL diabolique.
+Si aucune carte n'est trouvée dans la [[CarteInterWiki]] (ou si la page n'est
pas verrouillée), PhpWiki utilisera à la place le fichier lib/interwiki.map
-de votre distribution phpwiki. Le fichier de la carte ~Interwiki est
+de votre distribution phpwiki. Le fichier de la carte ~Interwiki est
utilisée sur PhpWiki : vous pouvez la voir sur [http://phpwiki.sf.net/interwiki.map].
-Le fichier de la carte est mis à jour à la main. Il est basé sur et
-périodiquement synchronisé avec [l'InterMap de UseMod|http://usemod.com/intermap.txt]
-mais il n'est pas tout à fait identique. Une différence notable par rapport
-à [UseMod:] est que PhpWiki supporte les '%s' au sein des URL dans la
+Le fichier de la carte est mis à jour à la main. Il est basé sur et
+périodiquement synchronisé avec [l'InterMap de UseMod|http://usemod.com/intermap.txt]
+mais il n'est pas tout à fait identique. Une différence notable par rapport
+à [UseMod:] est que PhpWiki supporte les '%s' au sein des URL dans la
carte -- voir l'entrée RFC pour un exemple de son fonctionnement.
-Toutes les entrées de la carte ~InterWiki ne sont pas forcément des wikis.
-Par exemple, celles-ci sont juste des sites web
-normaux : Dictionary:fungible, [JargonFile:Alderson loop], [IMDB:Roman Holiday],
+Toutes les entrées de la carte ~InterWiki ne sont pas forcément des wikis.
+Par exemple, celles-ci sont juste des sites web
+normaux : Dictionary:fungible, [JargonFile:Alderson loop], [IMDB:Roman Holiday],
RFC:2822, et ISBN:020171499X.
-Le mot-clé "Category" est une entrée spéciale qui permet de créer des liens
-entre une page et une page de catégorie sans créer de référence inverse.
-Ainsi [Category:Category] crée un lien vers la page CategoryCategory, et
-pourtant cette page n'apparaîtra pas dans la liste des rétroliens de
+Le mot-clé "Category" est une entrée spéciale qui permet de créer des liens
+entre une page et une page de catégorie sans créer de référence inverse.
+Ainsi [Category:Category] crée un lien vers la page CategoryCategory, et
+pourtant cette page n'apparaîtra pas dans la liste des rétroliens de
CategoryCategory.
-Le terme "~InterWiki" se réfère aussi à un concept plus large. Voir
+Le terme "~InterWiki" se réfère aussi à un concept plus ...
[truncated message content] |
|
From: <var...@us...> - 2013-07-17 12:08:06
|
Revision: 8832
http://sourceforge.net/p/phpwiki/code/8832
Author: vargenau
Date: 2013-07-17 12:08:03 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Use forge_get_config('groupdir_prefix')
Modified Paths:
--------------
trunk/g
trunk/view.php
Modified: trunk/g
===================================================================
--- trunk/g 2013-07-09 08:02:04 UTC (rev 8831)
+++ trunk/g 2013-07-17 12:08:03 UTC (rev 8832)
@@ -117,7 +117,7 @@
define('ENABLE_RATEIT', $wc->getWikiConfig('ENABLE_RATEIT'));
- define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
+ define('UPLOAD_FILE_PATH', forge_get_config('groupdir_prefix').'/'.WIKI_NAME.'/www/uploads/');
// define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
if ($project->isPublic()) {
define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
@@ -225,8 +225,8 @@
define('ENABLE_REVERSE_DNS', false);
// Web DAV location
- define('DEFAULT_DUMP_DIR', "/opt/groups/".$group_name."/wikidump/");
- define('HTML_DUMP_DIR', "/opt/groups/".$group_name."/wikidumphtml/");
+ define('DEFAULT_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidump/");
+ define('HTML_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidumphtml/");
define('COMPRESS_OUTPUT', false);
Modified: trunk/view.php
===================================================================
--- trunk/view.php 2013-07-09 08:02:04 UTC (rev 8831)
+++ trunk/view.php 2013-07-17 12:08:03 UTC (rev 8832)
@@ -75,7 +75,7 @@
array_shift($arr);
$path = join('/', $arr);
-$basepath = realpath('/opt/groups/' . $project->getUnixName() . '/www/uploads/');
+$basepath = realpath(forge_get_config('groupdir_prefix') .'/'. $project->getUnixName() . '/www/uploads/');
$filepath = realpath($basepath . '/' . $path);
$filename = basename($filepath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2013-12-05 11:12:57
|
Revision: 8844
http://sourceforge.net/p/phpwiki/code/8844
Author: vargenau
Date: 2013-12-05 11:12:54 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
Translate titles
Modified Paths:
--------------
trunk/lib/editpage.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/lib/editpage.php 2013-12-05 11:12:54 UTC (rev 8844)
@@ -689,23 +689,23 @@
$el['PREVIEW_B'] = Button('submit:edit[preview]', _("Preview"),
'wikiaction',
array('accesskey' => 'p',
- 'title' => 'Preview the current content [alt-p]'));
+ 'title' => _('Preview the current content [alt-p]')));
//if (!$this->isConcurrentUpdate() && $this->canEdit())
$el['SAVE_B'] = Button('submit:edit[save]',
_("Save"), 'wikiaction',
array('accesskey' => 's',
- 'title' => 'Save the current content as wikipage [alt-s]'));
+ 'title' => _('Save the current content as wikipage [alt-s]')));
$el['CHANGES_B'] = Button('submit:edit[diff]',
_("Changes"), 'wikiaction',
array('accesskey' => 'c',
- 'title' => 'Preview the current changes as diff [alt-c]'));
+ 'title' => _('Preview the current changes as diff [alt-c]')));
$el['UPLOAD_B'] = Button('submit:edit[upload]',
_("Upload"), 'wikiaction',
- array('title' => 'Select a local file and press Upload to attach into this page'));
+ array('title' => _('Select a local file and press Upload to attach into this page')));
$el['SPELLCHECK_B'] = Button('submit:edit[SpellCheck]',
_("Spell Check"), 'wikiaction',
- array('title' => 'Check the spelling'));
+ array('title' => _('Check the spelling')));
$el['IS_CURRENT'] = $this->version == $this->current->getVersion();
$el['WIDTH_PREF']
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/de.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-25 16:32+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -302,18 +302,34 @@
msgid "Preview"
msgstr "Vorschau"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "Die aktuelle Version ansehen"
+
msgid "Save"
msgstr "Speichern"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr "Änderungen"
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr "Hochladen"
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr "%s wird als Autor aufgenommen."
@@ -6165,9 +6181,6 @@
#~ msgid "Who Is Online"
#~ msgstr "Wer ist Online"
-#~ msgid "View the current version"
-#~ msgstr "Die aktuelle Version ansehen"
-
#~ msgid "Dump pages as XHTML"
#~ msgstr "Seiten als XHTML Dateien speichern"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/es.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -298,18 +298,34 @@
msgid "Preview"
msgstr "Previsualizar"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "Vea la versión actual"
+
msgid "Save"
msgstr "Guardar"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr "Cambios"
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr ""
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr "Registrarán al autor como %s."
@@ -5931,9 +5947,6 @@
#~ msgid "Included from %s:"
#~ msgstr "Inserción de “%s”:"
-#~ msgid "View the current version"
-#~ msgstr "Vea la versión actual"
-
#~ msgid "Dump pages as XHTML"
#~ msgstr "Páginas de la descarga como XHTML"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/fr.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -297,18 +297,33 @@
msgid "Preview"
msgstr "Prévisualiser"
+msgid "Preview the current content [alt-p]"
+msgstr "Prévisualiser le contenu actuel [alt-p]"
+
msgid "Save"
msgstr "Enregistrer"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr "Enregistrer le contenu actuel dans la page wiki [alt-s]"
+
msgid "Changes"
msgstr "Modifications"
+msgid "Preview the current changes as diff [alt-c]"
+msgstr "Prévisualiser les modifications actuelles en tant que diff [alt-c]"
+
msgid "Upload"
msgstr "Télécharger"
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr "Vérifier l'orthographe"
+msgid "Check the spelling"
+msgstr "Vérifier l'orthographe"
+
#, php-format
msgid "Author will be logged as %s."
msgstr "L'auteur sera enregistré sous le nom %s."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/it.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -288,18 +288,34 @@
msgid "Preview"
msgstr "Anteprima"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "Mostra il versione corrente"
+
msgid "Save"
msgstr "Registra"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr ""
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr ""
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr "L'autore sarà annotato come %s."
@@ -5858,9 +5874,6 @@
#~ msgid "Included from %s:"
#~ msgstr "Inserire dalla %s:"
-#~ msgid "View the current version"
-#~ msgstr "Mostra il versione corrente"
-
#~ msgid "Page %s not found."
#~ msgstr "%s: pagina non trovato."
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/ja.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -276,18 +276,34 @@
msgid "Preview"
msgstr "プレビューする"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "現在のバージョンを表示する"
+
msgid "Save"
msgstr "保存する"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr ""
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr "アップロード"
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr ""
@@ -6170,9 +6186,6 @@
#~ msgid "%s is empty"
#~ msgstr "%s が空です。"
-#~ msgid "View the current version"
-#~ msgstr "現在のバージョンを表示する"
-
#~ msgid "Dump pages as XHTML"
#~ msgstr "XHTMLで出力"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/nl.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -282,18 +282,33 @@
msgid "Preview"
msgstr "Voorvertonig"
+msgid "Preview the current content [alt-p]"
+msgstr ""
+
msgid "Save"
msgstr "Bewaar"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr "Veranderingen"
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr ""
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/phpwiki.pot 2013-12-05 11:12:54 UTC (rev 8844)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -276,18 +276,33 @@
msgid "Preview"
msgstr ""
+msgid "Preview the current content [alt-p]"
+msgstr ""
+
msgid "Save"
msgstr ""
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr ""
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr ""
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/sv.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -277,18 +277,33 @@
msgid "Preview"
msgstr "Översikt"
+msgid "Preview the current content [alt-p]"
+msgstr ""
+
msgid "Save"
msgstr "Spara"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr "Ändringar"
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr ""
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2013-09-25 14:33:42 UTC (rev 8843)
+++ trunk/locale/po/zh.po 2013-12-05 11:12:54 UTC (rev 8844)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-24 18:26+0200\n"
+"POT-Creation-Date: 2013-12-05 11:11+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -288,18 +288,34 @@
msgid "Preview"
msgstr "預覽"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "查看目前版本"
+
msgid "Save"
msgstr "儲存"
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
msgid "Changes"
msgstr ""
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
msgid "Upload"
msgstr "上傳"
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
msgid "Spell Check"
msgstr ""
+msgid "Check the spelling"
+msgstr ""
+
#, php-format
msgid "Author will be logged as %s."
msgstr "作者將登入為 %s."
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-05-06 13:40:22
|
Revision: 8854
http://sourceforge.net/p/phpwiki/code/8854
Author: vargenau
Date: 2014-05-06 13:40:19 +0000 (Tue, 06 May 2014)
Log Message:
-----------
Use default value for footer
Modified Paths:
--------------
trunk/themes/fusionforge/themeinfo.php
trunk/wikiadmin.php
trunk/wikilist.php
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2014-05-06 13:39:28 UTC (rev 8853)
+++ trunk/themes/fusionforge/themeinfo.php 2014-05-06 13:40:19 UTC (rev 8854)
@@ -87,7 +87,7 @@
$domain = textdomain(NULL);
textdomain('fusionforge');
- $HTML->footer(array());
+ $HTML->footer();
textdomain($domain);
}
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php 2014-05-06 13:39:28 UTC (rev 8853)
+++ trunk/wikiadmin.php 2014-05-06 13:40:19 UTC (rev 8854)
@@ -166,4 +166,4 @@
}
}
-site_project_footer(array());
+site_project_footer();
Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php 2014-05-06 13:39:28 UTC (rev 8853)
+++ trunk/wikilist.php 2014-05-06 13:40:19 UTC (rev 8854)
@@ -89,4 +89,4 @@
echo $HTML->listTableBottom();
-site_admin_footer(array());
+site_admin_footer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-04 12:52:27
|
Revision: 8862
http://sourceforge.net/p/phpwiki/code/8862
Author: vargenau
Date: 2014-06-04 12:52:24 +0000 (Wed, 04 Jun 2014)
Log Message:
-----------
Use CSS
Modified Paths:
--------------
trunk/themes/Crao/templates/editpage.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/Portland/templates/navbar.tmpl
trunk/themes/default/templates/pagelink.tmpl
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/default/templates/wikiforum.tmpl
trunk/wikiadmin.php
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/themes/Crao/templates/editpage.tmpl 2014-06-04 12:52:24 UTC (rev 8862)
@@ -31,7 +31,7 @@
<br class="clear-floats" />
<table class="fullwidth">
<tr><td><?php echo $EDIT_TOOLBAR ?></td>
- <td align="right"><div id="editarea-size">
+ <td class="align-right"><div id="editarea-size">
<?php echo _("Size").':'?>
<label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
<label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/themes/Crao/templates/navbar.tmpl 2014-06-04 12:52:24 UTC (rev 8862)
@@ -7,7 +7,7 @@
<?php } ?>
<div id="navbuttons">
<table width="fullwidth">
-<tr class="middle"><td align="left">
+<tr class="middle"><td class="align-left">
<?php echo WikiLink(_("RecentChanges"), "button") ?>
<?php if (!empty($revision)) { ?>
<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>
@@ -15,7 +15,7 @@
<?php echo $SEP?><?php echo Button(_("BackLinks"), _("BackLinks")) ?>
<?php } ?>
</td>
-<td align="right" width="150">
+<td class="align-right" width="150">
<div id="search">
<?php if (!empty($user) && $user->isSignedIn()) { ?>
<?php echo WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?php echo $SEP?>
@@ -44,7 +44,7 @@
title="<?php echo _("LiveSearch")?>"
onKeypress="liveSearchStart()"
onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?php echo _("Search")?>';}" />
- </div><br /><div align="left" id="LSResult"></div>
+ </div><br /><div class="align-left" id="LSResult"></div>
<?php } else { ?>
title="<?php echo _("TitleSearch")?>" />
</div>
Modified: trunk/themes/Portland/templates/navbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/navbar.tmpl 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/themes/Portland/templates/navbar.tmpl 2014-06-04 12:52:24 UTC (rev 8862)
@@ -22,7 +22,7 @@
<?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?>
<?php } ?>
</td>
- <td align="right">
+ <td class="align-right">
<?php echo Template('signin') ?>
</td>
</tr></table>
Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/themes/default/templates/pagelink.tmpl 2014-06-04 12:52:24 UTC (rev 8862)
@@ -12,7 +12,7 @@
}
?>
<tr><td style="width:100%" colspan="<?php echo $COLS ?>"><table class="fullwidth wikipaging"><tr class="wikipaging">
- <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
+ <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" class="align-left">
<?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
<?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?>
@@ -20,7 +20,7 @@
<td class="wikipaging-enabled" align="center">
<?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
</td>
- <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
+ <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" class="align-right">
<?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _("Next") . " >>") : ">>" ?>
<?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), ">>|") : ">>|" ?>
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/themes/default/templates/userprefs.tmpl 2014-06-04 12:52:24 UTC (rev 8862)
@@ -138,10 +138,10 @@
<?php if ($isForm and $user->mayChangePass()) { ?>
<tr><td colspan="2"><h2><?php echo ($request->getPref('passwd') ? _("Change Password") : _("Set Password")) ?></h2></td></tr>
- <tr><td align="right"><?php echo _("New password") . _(":")?></td>
+ <tr><td class="align-right"><?php echo _("New password") . _(":")?></td>
<td><input type="password" name="pref[passwd]" size="16" maxlength="16" class="text" value="" /></td>
<td></td></tr>
- <tr><td align="right"><?php echo _("Type it again") . _(":")?></td>
+ <tr><td class="align-right"><?php echo _("Type it again") . _(":")?></td>
<td><input type="password" name="pref[passwd2]" size="16" maxlength="16" class="text" value="" /></td>
<td></td></tr>
<?php } ?>
Modified: trunk/themes/default/templates/wikiforum.tmpl
===================================================================
--- trunk/themes/default/templates/wikiforum.tmpl 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/themes/default/templates/wikiforum.tmpl 2014-06-04 12:52:24 UTC (rev 8862)
@@ -21,11 +21,11 @@
<tr><th align="center"><?php echo _("Author")?></th><th align="center"><?php echo _("Message")?></th></tr>
<tr>
- <td align="left"><?php echo WikiLink($FORUM_CREATOR, 'if_known')?></td>
+ <td class="align-left"><?php echo WikiLink($FORUM_CREATOR, 'if_known')?></td>
<td>
<table class="wikiforum wikiforum-message">
- <tr><td align="left"><?php echo fmt("Posted: %s",$CDATE)?></td>
- <td align="right"><?php echo _("Reply")?></td></tr>
+ <tr><td class="align-left"><?php echo fmt("Posted: %s",$CDATE)?></td>
+ <td class="align-right"><?php echo _("Reply")?></td></tr>
<tr><td><?php echo $CONTENT ?></td></tr>
</table>
</td>
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php 2014-06-04 12:21:55 UTC (rev 8861)
+++ trunk/wikiadmin.php 2014-06-04 12:52:24 UTC (rev 8862)
@@ -147,12 +147,12 @@
$desc = $wc->getWikiConfigDescription($c);
print "<tr>\n<td>$desc</td>\n" .
- "<td align=\"center\">" .
+ '<td class="align-center">' .
"<input type=\"checkbox\" name=\"config[$c]\" value=\"1\"$checked /></td>\n" .
"</tr>\n";
}
print "</table>\n";
- print "<p align=\"right\"><input type=\"submit\" value=\"" .
+ print '<p class="align-right"><input type="submit" value="' .
_("Save Configuration") .
"\" /></p>";
print "</form>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-12 15:39:59
|
Revision: 8895
http://sourceforge.net/p/phpwiki/code/8895
Author: vargenau
Date: 2014-06-12 15:39:51 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
HTML::tt --> HTML::samp
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/diff.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin
trunk/pgsrc/Help%2FHelloWorldPlugin
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/BlockParser.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -246,7 +246,7 @@
$where = $this->where();
$tab = str_repeat('____', $this->getDepth()) . $tab;
printXML(HTML::div("$tab $msg: at: '",
- HTML::tt($where),
+ HTML::samp($where),
"'"));
flush();
}
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/PagePerm.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -115,10 +115,10 @@
}
*/
if ($type == 'page')
- return HTML::tt(HTML::strong($perm->asRwxString($owner, $group)));
+ return HTML::samp(HTML::strong($perm->asRwxString($owner, $group)));
elseif ($type == 'default')
- return HTML::tt($perm->asRwxString($owner, $group)); elseif ($type == 'inherited') {
- return HTML::tt(array('class' => 'inherited', 'style' => 'color:#aaa;'),
+ return HTML::samp($perm->asRwxString($owner, $group)); elseif ($type == 'inherited') {
+ return HTML::samp(array('class' => 'inherited', 'style' => 'color:#aaa;'),
$perm->asRwxString($owner, $group));
}
}
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/PageType.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -432,7 +432,7 @@
HTML::th($url_attr, _("InterWiki Address"))));
foreach ($map as $moniker => $interurl) {
$rows[] = HTML::tr(HTML::td($mon_attr, new Cached_WikiLinkIfKnown($moniker)),
- HTML::td($url_attr, HTML::tt($interurl)));
+ HTML::td($url_attr, HTML::samp($interurl)));
}
return HTML::table(array('class' => 'interwiki-map'),
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/diff.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -149,7 +149,7 @@
function _start_block($header)
{
$this->_block = HTML::div(array('class' => 'block'),
- HTML::tt($header));
+ HTML::samp($header));
}
function _end_block()
@@ -167,7 +167,7 @@
if ($elem)
$line = new HtmlElement($elem, $line);
$div->pushContent(HTML::div(array('class' => $class),
- HTML::tt(array('class' => 'prefix'),
+ HTML::samp(array('class' => 'prefix'),
$prefix),
$line, HTML::raw(' ')));
}
Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/LinkSearch.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -116,7 +116,7 @@
$hiddenfield,
$instructions, HTML::br(),
$pagefilter,
- HTML::strong(HTML::tt(array('id' => 'dirsign'), $dirsign)),
+ HTML::strong(HTML::samp(array('id' => 'dirsign'), $dirsign)),
$query,
HTML::raw(' '), $direction,
HTML::raw(' '), $submit);
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/SemanticSearch.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -155,7 +155,7 @@
(HTML::tr(
HTML::td($pagefilter, _(": ")),
HTML::td($relation),
- HTML::td(HTML::strong(HTML::tt(' :: '))),
+ HTML::td(HTML::strong(HTML::samp(' :: '))),
HTML::td($queryrel),
HTML::td($nbsp, $relsubmit, $nbsp, $enhancements)))));
@@ -332,7 +332,7 @@
$relquery = $this->regex_query($attribute, $args['case_exact'], $args['regex']);
if (!in_array($attr_op, $this->_supported_operators)) {
return HTML($form, $this->error(fmt("Illegal operator: %s",
- HTML::tt($attr_op))));
+ HTML::samp($attr_op))));
}
$s_base = preg_replace("/,/", "", $s);
$units = new Units();
@@ -379,7 +379,7 @@
} else {
$querydesc = $attribute . " " . $attr_op . " " . $s;
return HTML($form, $this->error(fmt("Only text operators can be used with strings: %s",
- HTML::tt($querydesc))));
+ HTML::samp($querydesc))));
}
if ($linkquery) {
Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/TeX2png.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -191,7 +191,7 @@
// or mathematical expression is wrong
switch ($this->isMathExp($text)) {
case 0: // not a mathematical expression
- $html = HTML::tt(array('class' => 'tex',
+ $html = HTML::samp(array('class' => 'tex',
'style' => 'color:red;'), $text);
break;
case 1: // an inlined mathematical expression
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/WatchPage.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -54,7 +54,7 @@
// This could be expanded as in Mediawiki to a list of each page with a remove button.
function showWatchList($pagelist)
{
- return HTML::strong(HTML::tt(empty($pagelist) ? _("<empty>") : $pagelist));
+ return HTML::strong(HTML::samp(empty($pagelist) ? _("<empty>") : $pagelist));
}
function addpagelist($page, $pagelist)
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -145,7 +145,7 @@
if ($checked) $pages[] = $name;
}
- $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br());
+ $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br());
return $header;
}
}
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -235,7 +235,7 @@
}
$perm_tree = pagePermissions($name);
$table = pagePermissionsAclFormat($perm_tree, !empty($pages));
- $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br());
+ $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br());
$first_page = $GLOBALS['request']->_dbi->getPage($name);
$owner = $first_page->getOwner();
list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
@@ -245,8 +245,8 @@
elseif ($type == 'page')
$type = _("individual page permission"); elseif ($type == 'default')
$type = _("default page permission");
- $header->pushContent(HTML::strong(_("Type") . _(": ")), HTML::tt($type), HTML::br());
- $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::tt($perm->asAclLines()), HTML::br());
+ $header->pushContent(HTML::strong(_("Type") . _(": ")), HTML::samp($type), HTML::br());
+ $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::samp($perm->asAclLines()), HTML::br());
$header->pushContent(HTML::p(HTML::strong(_("Description") . _(": ")),
_("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-06-12 15:39:51 UTC (rev 8895)
@@ -171,7 +171,7 @@
if ($checked) $pages[] = $name;
}
- $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br());
+ $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br());
return $header;
}
}
Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-06-12 15:39:51 UTC (rev 8895)
@@ -1,4 +1,4 @@
-Date: Mon, 8 Jul 2013 17:59:05 +0000
+Date: Thu, 12 Jun 2014 17:38:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHalloWeltPlugin;
@@ -68,7 +68,7 @@
// Any text that is returned will not be further transformed,
// so use html where necessary.
- $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
+ $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
THE_END);
return $html;
}
Modified: trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde 2014-06-12 15:39:51 UTC (rev 8895)
@@ -1,4 +1,4 @@
-Date: Mon, 8 Jul 2013 17:59:05 +0000
+Date: Thu, 12 Jun 2014 17:37:58 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Aide%2FPluginBonjourLeMonde;
@@ -69,7 +69,7 @@
// Any text that is returned will not be further transformed,
// so use html where necessary.
- $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
+ $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
THE_END);
return $html;
}
Modified: trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:39:51 UTC (rev 8895)
@@ -1,4 +1,4 @@
-Date: Fri, 4 Feb 2011 16:44:25 +0000
+Date: Thu, 12 Jun 2014 17:37:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FHelloWorldPlugin;
@@ -69,7 +69,7 @@
// Any text that is returned will not be further transformed,
// so use html where necessary.
- $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
+ $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
THE_END);
return $html;
}
Modified: trunk/pgsrc/Help%2FHelloWorldPlugin
===================================================================
--- trunk/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:12:50 UTC (rev 8894)
+++ trunk/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:39:51 UTC (rev 8895)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 12 Jun 2014 17:36:49 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FHelloWorldPlugin;
@@ -66,7 +66,7 @@
// Any text that is returned will not be further transformed,
// so use html where necessary.
- $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
+ $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
THE_END);
return $html;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-13 14:14:05
|
Revision: 8911
http://sourceforge.net/p/phpwiki/code/8911
Author: vargenau
Date: 2014-06-13 14:13:58 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Table summary attribute is obsolete in HTML 5
Modified Paths:
--------------
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/RichTable.php
trunk/pgsrc/Help%2FMediawikiTablePlugin
trunk/pgsrc/Help%2FOldStyleTablePlugin
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/lib/plugin/MediawikiTable.php 2014-06-13 14:13:58 UTC (rev 8911)
@@ -102,7 +102,7 @@
if (in_array($key, array("id", "class", "title", "style",
"bgcolor", "frame", "rules", "border",
"cellspacing", "cellpadding",
- "summary", "align", "width"))
+ "align", "width"))
) {
$table->setAttr($key, $value);
}
@@ -153,12 +153,6 @@
continue;
}
- // Table summary
- if (substr($line, 0, 2) == "|=") {
- $line = substr($line, 2);
- $table->setAttr("summary", trim($line));
- }
-
// Table caption
if (substr($line, 0, 2) == "|+") {
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/lib/plugin/OldStyleTable.php 2014-06-13 14:13:58 UTC (rev 8911)
@@ -58,7 +58,6 @@
'cellpadding' => '1',
'cellspacing' => '1',
'border' => '1',
- 'summary' => '',
);
}
@@ -92,7 +91,7 @@
$table = HTML::table($table_args);
if (!empty($caption))
$table->pushContent(HTML::caption($caption));
- if (preg_match("/^\s*(cellpadding|cellspacing|border|caption|summary)/", $lines[0]))
+ if (preg_match("/^\s*(cellpadding|cellspacing|border|caption)/", $lines[0]))
$lines[0] = '';
foreach ($lines as $line) {
if (!$line)
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/lib/plugin/RichTable.php 2014-06-13 14:13:58 UTC (rev 8911)
@@ -54,7 +54,7 @@
if (in_array($key, array("id", "class", "title", "style",
"bgcolor", "frame", "rules", "border",
"cellspacing", "cellpadding",
- "summary", "align", "width"))
+ "align", "width"))
) {
$table->setAttr($key, $value);
}
Modified: trunk/pgsrc/Help%2FMediawikiTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FMediawikiTablePlugin 2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/pgsrc/Help%2FMediawikiTablePlugin 2014-06-13 14:13:58 UTC (rev 8911)
@@ -1,4 +1,4 @@
-Date: Tue, 9 Nov 2010 14:24:02 +0000
+Date: Fri, 13 Jun 2014 16:12:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FMediawikiTablePlugin;
@@ -13,16 +13,11 @@
* The table starts with a line ##{|##.
* An optional table caption is made with a line starting with a pipe and a plus sign ##|+## followed by the caption.
-* An optional table summary is made with a line starting with a pipe and an equal sign ##|=## followed by the summary.
* A table row starts with a pipe and a hyphen: ##|-##.
* A table cell starts with a pipe on a new line, or a double bar ##||## on the same line.
* A header table cell starts with an exclamation mark, or a double exclamation mark ##!!## on the same line.
* The table ends with a line ##|}##.
-The summary syntax is an extension to the Mediawiki syntax.
-You can also simply put the summary as an attribute to the table.
-The summary is necessary to be able to create accessible tables.
-
If the first row of the table as made with header cells only, this row will be put in a //thead//.
In that case, this row will be repeated on every page when printing the table.
@@ -76,7 +71,6 @@
{| border="1" style="width: 100%"
|+ style="font-weight: bold; font-size: 150%;" | This is the table caption
-|= This is the table summary
|- style="white-space: nowrap"
! Header 1
! Header 2
@@ -94,7 +88,6 @@
{{{
{| border="1" style="width: 100%"
|+ style="font-weight: bold; font-size: 150%;" | This is the table caption
-|= This is the table summary
|- style="white-space: nowrap"
! Header 1
! Header 2
Modified: trunk/pgsrc/Help%2FOldStyleTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FOldStyleTablePlugin 2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/pgsrc/Help%2FOldStyleTablePlugin 2014-06-13 14:13:58 UTC (rev 8911)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Dec 2010 12:53:03 +0000
+Date: Fri, 13 Jun 2014 16:12:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FOldStyleTablePlugin;
@@ -61,10 +61,6 @@
| **cellpadding**
| Any number
| 1
-|-
-| **summary**
-| Any string
-| Empty string
|}
== Syntax ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-19 16:08:03
|
Revision: 8920
http://sourceforge.net/p/phpwiki/code/8920
Author: vargenau
Date: 2014-06-19 16:07:55 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
Remove IEFixes
Modified Paths:
--------------
trunk/TODO
trunk/lib/WikiTheme.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/blog/themeinfo.php
Removed Paths:
-------------
trunk/themes/Makefile.global
trunk/themes/MonoBook/IEFixes.css
trunk/themes/MonoBook/IEFixes.js
trunk/themes/blog/IEFixes.css
trunk/themes/default/IEFixes.css
trunk/themes/smaller/IEFixes.css
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/TODO 2014-06-19 16:07:55 UTC (rev 8920)
@@ -5,13 +5,6 @@
(to be tested in both Pear and ADODB)
* revert of Patch 3024787 by Sébastien Le Callonnec (caused an SQL syntax error)
-== Others==
-* Minimizer for JS/CSS
-** no "make clean" in themes
-** "make clean" does not work in themes with no Javascript
-** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors
-* plugin Video does not work (code reverted to r7204 to make it work again)
-
----
short-term TODO:
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/lib/WikiTheme.php 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1356,12 +1356,6 @@
$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
- if (isBrowserIE()) {
- $this->addMoreHeaders($this->_CSSlink(0,
- $this->_findFile('IEFixes.css'), 'all'));
- $this->addMoreHeaders("\n");
- }
-
/**
* The logo image appears on every page and links to the HomePage.
*/
Deleted: trunk/themes/Makefile.global
===================================================================
--- trunk/themes/Makefile.global 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/Makefile.global 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,29 +0,0 @@
-# themes/Makefile.global
-#
-# minify themes, for gnu make only
-
-.PHONY: all css js
-
-THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge
-
-# http://developer.yahoo.com/yui/compressor/
-YUICOMPRESSOR = java -jar ../default/yuicompressor-2.4.7.jar
-
-css: $(CSS_FILES)
-
-js: $(MAIN)-min.js $(patsubst %.js,%-min.js,$(JS_REST))
-
-clean:
- rm $(MAIN)-min.js $(patsubst %.js,%-min.js,$(JS_REST)) $(CSS_FILES)
-
-$(MAIN)-min.js : $(JS_MAIN)
- $(YUICOMPRESSOR) -o $@ $(JS_MAIN)
-
-%-min.css : %.css
- $(YUICOMPRESSOR) -o $@ $<
-
-%-min.js : %.js
- $(YUICOMPRESSOR) -o $@ $<
-
-IEFixes-min.js : IEFixes.js
- $(YUICOMPRESSOR) $< | sed -e's,style.floats,style.float,g' > $@
Deleted: trunk/themes/MonoBook/IEFixes.css
===================================================================
--- trunk/themes/MonoBook/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/MonoBook/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,11 +0,0 @@
-/*
-** Stylesheet filter for some b0rked browser
-** Don't touch, don't add anything here (can break the filter)
-** Add rules to the individual stylesheets.
-*/
-/* IE6.0 */
-@import "null?\"\{";
-@import "IE60Fixes.css";
-
-voice-family: "\"}\"";
-voice-family:inherit;
Deleted: trunk/themes/MonoBook/IEFixes.js
===================================================================
--- trunk/themes/MonoBook/IEFixes.js 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/MonoBook/IEFixes.js 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,47 +0,0 @@
-// IE fix javascript
-var rslt = navigator.appVersion.match(/MSIE (\d+\.\d+)/, '');
-if (rslt != null ) var version = Number(rslt[1]);
-else var version = 0;
-
-window.attachEvent("onload", hookit);
-function hookit() {
- fixalpha();
- relativeforfloats();
-}
-
-// png alpha transparency fixes
-function fixalpha(){
- // bg
- if(version >= 5.5 && document.getElementById('p-logo')) {
- var logoa = document.getElementById('p-logo').firstChild;
- var bg = logoa.currentStyle.backgroundImage;
- if (bg.match(/\.png/i) != null){
- var mypng = bg.substring(5,bg.length-2);
- logoa.style.backgroundImage = "none";
- logoa.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+mypng+"', sizingMethod='crop')";
- }
- }
-}
-
-// fix ie6 disappering float bug
-function relativeforfloats() {
- var bc = document.getElementById('bodyContent');
- if (bc) {
- var tables = bc.getElementsByTagName('table');
- var divs = bc.getElementsByTagName('div');
- }
- setrelative(tables);
- setrelative(divs);
-}
-function setrelative (nodes) {
- var i = 0;
- while (i < nodes.length) {
- if(((nodes[i].style.float && nodes[i].style.float != ('none') ||
- (nodes[i].align && nodes[i].align != ('none'))) &&
- (!nodes[i].style.position || nodes[i].style.position != 'relative')))
- {
- nodes[i].style.position = 'relative';
- }
- i++;
- }
-}
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/MonoBook/themeinfo.php 2014-06-19 16:07:55 UTC (rev 8920)
@@ -82,18 +82,6 @@
{
$this->addMoreHeaders(JavaScript("var ta;\nvar skin = '" . $this->_name . "';\n"));
$this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikibits.js"))));
- if (isBrowserIE()) {
- $ver = browserVersion();
- if ($ver > 5.5 and $ver < 7.0)
- $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IE60Fixes.css'), 'all'));
- elseif ($ver >= 7.0)
- $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IE70Fixes.css'), 'all'));
- unset($ver);
- $this->addMoreHeaders("\n");
- $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("IEFixes.js"))));
- $this->addMoreHeaders("\n");
- $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />'));
- }
$this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"'));
// CSS file defines fonts, colors and background images for this
Deleted: trunk/themes/blog/IEFixes.css
===================================================================
--- trunk/themes/blog/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/blog/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,7 +0,0 @@
-/*
-** Stylesheet filter for some b0rked browser
-*/
-
-div.actionbuttons a {
- font-size: 75%;
-}
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/blog/themeinfo.php 2014-06-19 16:07:55 UTC (rev 8920)
@@ -133,9 +133,6 @@
// override sidebar definitions:
$this->setDefaultCSS(_("blog"), 'Kubrick.css');
- if (isBrowserIE()) {
- $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'), 'all'));
- }
$this->addButtonAlias(_("(diff)"), "[diff]");
$this->addButtonAlias("...", "alltime");
Deleted: trunk/themes/default/IEFixes.css
===================================================================
--- trunk/themes/default/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/default/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,11 +0,0 @@
-/*
-** IE Fixes (5.0, 5.5, 6.0)
-*/
-
-#actionbuttons, #signin {
- font-size: 80%
-}
-
-td, .hint {
- font-size: 90%
-}
Deleted: trunk/themes/smaller/IEFixes.css
===================================================================
--- trunk/themes/smaller/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/smaller/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,11 +0,0 @@
-/*
-** IE Fixes (5.0, 5.5, 6.0)
-*/
-
-#actionbuttons, #signin {
- font-size: 80%
-}
-
-td, .hint {
- font-size: 90%
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-20 14:01:57
|
Revision: 8924
http://sourceforge.net/p/phpwiki/code/8924
Author: vargenau
Date: 2014-06-20 14:01:49 +0000 (Fri, 20 Jun 2014)
Log Message:
-----------
<tt>tt</tt>
Modified Paths:
--------------
trunk/pgsrc/Help%2FTextFormattingRules
trunk/themes/fusionforge/pgsrc/TextFormattingRules
Modified: trunk/pgsrc/Help%2FTextFormattingRules
===================================================================
--- trunk/pgsrc/Help%2FTextFormattingRules 2014-06-20 13:58:32 UTC (rev 8923)
+++ trunk/pgsrc/Help%2FTextFormattingRules 2014-06-20 14:01:49 UTC (rev 8924)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Jun 2014 11:12:56 +0000
+Date: Fri, 20 Jun 2014 16:00:43 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FTextFormattingRules;
@@ -20,7 +20,7 @@
**Preventing linking:** Prefix with "##~~##": ##~~~DoNotHyperlink##. \\
**Misc:** "##~\~\##" makes a linebreak, "##~----##" makes a horizontal rule. \\
**Allowed HTML tags:** <b>b</b> <big>big</big> <i>i</i>
-<small>small</small> ##tt## <em>em</em> <strong>strong</strong>
+<small>small</small> <tt>tt</tt> <em>em</em> <strong>strong</strong>
<s>s</s> <strike>strike</strike>
<abbr>abbr</abbr> <acronym>acronym</acronym> <cite>cite</cite>
<code>code</code> <dfn>dfn</dfn> <kbd>kbd</kbd> <samp>samp</samp>
Modified: trunk/themes/fusionforge/pgsrc/TextFormattingRules
===================================================================
--- trunk/themes/fusionforge/pgsrc/TextFormattingRules 2014-06-20 13:58:32 UTC (rev 8923)
+++ trunk/themes/fusionforge/pgsrc/TextFormattingRules 2014-06-20 14:01:49 UTC (rev 8924)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Fri, 20 Jun 2014 16:00:51 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=TextFormattingRules;
@@ -19,7 +19,7 @@
**Preventing linking:** Prefix with "##~~##": ##~~~DoNotHyperlink##. \\
**Misc:** "##~\~\##" makes a linebreak, "##~----##" makes a horizontal rule. \\
**Allowed HTML tags:** <b>b</b> <big>big</big> <i>i</i>
-<small>small</small> ##tt## <em>em</em> <strong>strong</strong>
+<small>small</small> <tt>tt</tt> <em>em</em> <strong>strong</strong>
<s>s</s> <strike>strike</strike>
<abbr>abbr</abbr> <acronym>acronym</acronym> <cite>cite</cite>
<code>code</code> <dfn>dfn</dfn> <kbd>kbd</kbd> <samp>samp</samp>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-23 08:22:24
|
Revision: 8925
http://sourceforge.net/p/phpwiki/code/8925
Author: vargenau
Date: 2014-06-23 08:22:12 +0000 (Mon, 23 Jun 2014)
Log Message:
-----------
Move main.css to monobook.css
Modified Paths:
--------------
trunk/lib/loadsave.php
trunk/themes/MonoBook/monobook.css
trunk/themes/MonoBook/wikistandard.css
Removed Paths:
-------------
trunk/themes/MonoBook/main.css
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2014-06-20 14:01:49 UTC (rev 8924)
+++ trunk/lib/loadsave.php 2014-06-23 08:22:12 UTC (rev 8925)
@@ -827,7 +827,6 @@
and ($from = $WikiTheme->_findFile(basename($css_file), true))
and basename($from)
) {
- // TODO: fix @import url(main.css);
if ($directory) {
$target = "$directory/" . basename($css_file);
if ($silent)
Deleted: trunk/themes/MonoBook/main.css
===================================================================
--- trunk/themes/MonoBook/main.css 2014-06-20 14:01:49 UTC (rev 8924)
+++ trunk/themes/MonoBook/main.css 2014-06-23 08:22:12 UTC (rev 8925)
@@ -1,2252 +0,0 @@
-/*
-** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
-** Copyright Gabriel Wicke - http://wikidev.net/
-** License: GPL (http://www.gnu.org/copyleft/gpl.html)
-**
-** Loosely based on http://www.positioniseverything.net/ordered-floats.html by Big John
-** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi, Joe Geldart & Tom Croucher,
-** Michael Zeltner and Geir Bækholt)
-** All you guys rock :)
-** Added phpwiki integration: Reini Urban, based on the phpwiki.css
-** by Jeff Dairiki
-*/
-
-#column-content {
- width: 100%;
- float: right;
- margin: 0 0 .6em -12.2em;
- padding: 0;
- height: 1%;
-}
-
-#content {
- position: relative;
- z-index: 2;
- margin: 2.8em 0 0 12.2em;
- padding: 0 1em 1.5em 1em;
- background-color: white;
- color: black;
- border: 1px solid #aaa;
- border-right: none;
- line-height: 1.5em;
-}
-
-#column-one {
- position: absolute;
- /*z-index: 3;*/
- padding-top: 160px;
- top: 0;
- left: 0;
-}
-
-/* the left column width is specified in class .portlet */
-
-/* Font size:
-** We take advantage of keyword scaling- browsers won't go below 9px
-** More at http://www.w3.org/2003/07/30-font-size
-** http://style.cleverchimp.com/font_size_intervals/altintervals.html
-*/
-
-body {
- font: small sans-serif;
- background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;
- color: black;
- margin: 0;
- padding: 0;
-}
-
-/* scale back up to a sane default */
-#globalWrapper {
- font-size: 127%;
- width: 100%;
- margin: 0;
- padding: 0;
-}
-
-.visualClear {
- clear: both;
-}
-
-/* general styles */
-
-table {
- font-size: 100%;
- color: black;
-}
-
-a {
- text-decoration: none;
- color: #002bb8;
- background-image: none;
-}
-
-a:visited {
- color: #5a3696;
-}
-
-a:active {
- color: #faa700;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-a.stub {
- color: #772233;
-}
-
-img {
- border: 0;
- vertical-align: middle;
-}
-
-p {
- margin: .4em 0 .5em 0;
- line-height: 1.5em;
-}
-
-p img {
- margin: 0;
-}
-
-hr {
- height: 1px;
- color: #aaa;
- background-color: #aaa;
- border: 0;
- margin: .2em 0 .2em 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: black;
- background-image: none;
- font-weight: bold;
- font-family: Tahoma, sans-serif;
- margin: 0;
- padding-top: 0.5em;
- padding-bottom: 0.17em;
- border-bottom: 1px solid #aaa;
-}
-
-h1 {
- font-size: 188%;
-}
-
-h2 {
- font-size: 150%;
-}
-
-h3 {
- font-size: 132%;
-}
-
-h4 {
- font-size: 116%;
-}
-
-h5 {
- font-size: 100%;
-}
-
-h6 {
- font-size: 80%;
-}
-
-h4, h5, h6 {
- border-bottom: none;
- font-weight: normal;
-}
-
-/* Because in some cases there is a <p> in nested lists */
-li p {
- margin: 0;
-}
-
-ul {
- line-height: 1.5em;
- list-style-type: square;
- margin: 0.3em 0 0 1.5em;
- padding: 0;
- list-style-image: url("images/bullet.png");
-}
-
-ol {
- line-height: 1.5em;
- margin: 0.3em 0 0 3.2em;
- padding: 0;
- list-style-image: none;
-}
-
-li {
- margin-bottom: 0.1em;
-}
-
-dt {
- font-weight: bold;
- margin-bottom: .1em;
-}
-
-dl {
- margin-top: .2em;
- margin-bottom: .5em;
-}
-
-dd {
- line-height: 1.5em;
- margin-left: 2em;
- margin-bottom: .1em;
-}
-
-fieldset {
- border: 1px solid #2f6fab;
- margin: 1em 0 1em 0;
- padding: 0 1em 1em 1em;
- line-height: 1.5em;
-}
-
-legend {
- /*background: white;*/
- padding: 0.5em;
- font-size: 95%;
-}
-
-form {
- border: none;
- margin: 0;
-}
-
-textarea {
- width: 100%;
- padding: .1em;
-}
-
-input.historysubmit {
- padding: 0 0.3em 0.3em 0.3em !important;
- font-size: 94%;
- cursor: pointer;
- height: 1.7em !important;
- margin-left: 1.6em;
-}
-
-select {
- vertical-align: top;
-}
-
-abbr, acronym, .explain {
- border-bottom: 1px dotted black;
- color: black;
- background-image: none;
- cursor: help;
-}
-
-q {
- font-family: Times, "Times New Roman", serif;
- font-style: italic;
-}
-
-/* disabled for now
-blockquote {
- font-family: Times, "Times New Roman", serif;
- font-style: italic;
-}*/
-code {
- background-color: #f9f9f9;
-}
-
-pre {
- padding: 1em;
- border: 1px dashed #2f6fab;
- color: black;
- background-color: #f9f9f9;
- line-height: 1.1em;
-}
-
-/* generic classes ----------------------------------------------- */
-
-.tt {
- font-family: monospace;
-}
-
-.strike {
- text-decoration: line-through;
-}
-
-.big {
- font-size: larger;
-}
-
-.align-left {
- text-align: left;
-}
-
-.align-right {
- text-align: right;
-}
-
-.align-center {
- text-align: center;
-}
-
-.top {
- vertical-align: top;
-}
-
-.bottom {
- vertical-align: bottom;
-}
-
-.middle {
- vertical-align: middle;
-}
-
-.baseline {
- vertical-align: baseline;
-}
-
-.nowrap {
- white-space: nowrap;
-}
-
-.fullwidth {
- width: 100%;
-}
-
-/* --------------------------------------------------------------- */
-
-/*
-** the main content area
-*/
-
-#siteSub {
- display: none;
-}
-
-#jump-to-nav {
- display: none;
-}
-
-#contentSub {
- font-size: 84%;
- line-height: 1.2em;
- margin: 0 0 1.4em 1em;
- color: #7d7d7d;
- width: auto;
-}
-
-span.subpages {
- display: block;
-}
-
-/* Some space under the headers in the content area */
-#bodyContent h1, #bodyContent h2 {
- margin-bottom: .6em;
-}
-
-#bodyContent h3, #bodyContent h4, #bodyContent h5 {
- margin-bottom: .3em;
-}
-
-.firstHeading {
- margin-bottom: 0.1em;
-}
-
-/* user notification thing */
-.usermessage {
- background-color: #ffce7b;
- border: 1px solid #ffa500;
- color: black;
- font-weight: bold;
- margin: 2em 0 1em;
- padding: .5em 1em;
- vertical-align: middle;
-}
-
-#siteNotice {
- text-align: center;
- font-size: 95%;
- padding: 0 .9em;
-}
-
-#siteNotice p {
- margin: 0;
- padding: 0;
-}
-
-.errorbox, .successbox {
- font-size: larger;
- border: 2px solid;
- padding: .5em 1em;
- float: left;
- margin-bottom: 2em;
- color: #000;
-}
-
-.errorbox {
- border-color: red;
- background-color: #fff2f2;
-}
-
-.successbox {
- border-color: green;
- background-color: #dfd;
-}
-
-.errorbox h2, .successbox h2 {
- font-size: 1em;
- font-weight: bold;
- display: inline;
- margin: 0 .5em 0 0;
- border: none;
-}
-
-#catlinks {
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- margin-top: 1em;
- clear: both;
-}
-
-/* currently unused, intended to be used by a metadata box
-in the bottom-right corner of the content area */
-.documentDescription {
- /* The summary text describing the document */
- font-weight: bold;
- display: block;
- margin: 1em 0;
- line-height: 1.5em;
-}
-
-.documentByLine {
- text-align: right;
- font-size: 90%;
- clear: both;
- font-weight: normal;
- color: #76797c;
-}
-
-/* emulate center */
-.center {
- width: 100%;
- text-align: center;
-}
-
-*.center * {
- margin-left: auto;
- margin-right: auto;
-}
-
-/* small for tables and similar */
-.small, .small * {
- font-size: 94%;
-}
-
-table.small {
- font-size: 100%;
-}
-
-/*
-** content styles
-*/
-#toc,
-.toc {
- width: 200px;
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
- float: right;
- clear: right;
-}
-
-#toc #toctitle,
-.toc .toctitle,
-.toc #toctitle {
- display: inline;
- border: none;
- padding: 0;
- font-size: 110%;
- font-weight: bold;
-}
-
-.toc .toclist,
-.toc #toclist {
- width: auto;
- border: none;
-}
-
-#toc #toctitle,
-.toc #toctitle,
-#toc .toctitle,
-.toc .toctitle {
- text-align: center;
-}
-
-#toc p,
-.toc p {
- margin: 0;
-}
-
-#toc ul,
-.toc ul {
- width: auto;
- border: none;
- line-height: 1.5em;
- list-style-type: square;
- list-style-image: url("images/bullet.png");
- font-size: 95%;
- margin-left: 5px;
- padding-left: 5px;
-}
-
-#toc ul ul,
-.toc ul ul {
- margin: 0 0 0 2em;
-}
-
-#toc .toctoggle,
-.toc .toctoggle {
- font-size: 94%;
-}
-
-.mw-warning {
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
-}
-
-.mw-warning {
- margin-left: 50px;
- margin-right: 50px;
- text-align: center;
-}
-
-/* images */
-div.floatright, table.floatright {
- clear: right;
- float: right;
- position: relative;
- margin: 0 0 .5em .5em;
- border: 0;
-}
-
-div.floatright p {
- font-style: italic;
-}
-
-div.floatleft, table.floatleft {
- float: left;
- position: relative;
- margin: 0 .5em .5em 0;
- border: 0;
-}
-
-div.floatleft p {
- font-style: italic;
-}
-
-/* thumbnails */
-div.thumb {
- margin-bottom: .5em;
- border-style: solid;
- border-color: white;
- width: auto;
-}
-
-div.thumb div {
- border: 1px solid #ccc;
- padding: 3px !important;
- background-color: #f9f9f9;
- font-size: 94%;
- text-align: center;
- overflow: hidden;
-}
-
-div.thumb div a img {
- border: 1px solid #ccc;
-}
-
-div.thumb div div.thumbcaption {
- border: none;
- text-align: left;
- line-height: 1.4em;
- padding: .3em 0 .1em 0;
-}
-
-div.magnify {
- float: right;
- border-style: none !important;
- background: none !important;
-}
-
-div.magnify a, div.magnify img {
- display: block;
- border-style: none !important;
- background: none !important;
-}
-
-div.tright {
- clear: right;
- float: right;
- border-width: .5em 0 .8em 1.4em;
-}
-
-div.tleft {
- float: left;
- margin-right: .5em;
- border-width: .5em 1.4em .8em 0;
-}
-
-.hiddenStructure {
- display: none;
- speak: none;
-}
-
-img.tex {
- vertical-align: middle;
-}
-
-span.texhtml {
- font-family: serif;
-}
-
-/*
-** classes for special content elements like town boxes
-** intended to be referenced directly from the wiki src
-*/
-
-/*
-** User styles
-*/
-/* table standards */
-table.rimage {
- float: right;
- position: relative;
- margin-left: 1em;
- margin-bottom: 1em;
- text-align: center;
-}
-
-.toccolours {
- border: 1px solid #aaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
-}
-
-div.townBox {
- position: relative;
- float: right;
- background-color: white;
- margin-left: 1em;
- border: 1px solid gray;
- padding: .3em;
- width: 200px;
- overflow: hidden;
- clear: right;
-}
-
-div.townBox dl {
- padding: 0;
- margin: 0 0 .3em;
- font-size: 96%;
-}
-
-div.townBox dl dt {
- background-image: none;
- margin: .4em 0 0;
-}
-
-div.townBox dl dd {
- margin: .1em 0 0 1.1em;
- background-color: #f3f3f3;
-}
-
-/*
-** edit views etc
-*/
-.special li {
- line-height: 1.4em;
- margin: 0;
- padding: 0;
-}
-
-/*
-** RecentChanges
-*/
-.pageinfo-majoredit {
- font-weight: normal; /*bold;*/
-}
-
-.wiki-summary {
- font-size: 94%;
- font-style: italic;
-}
-
-/* Page history styling */
-/* the auto-generated edit comments */
-.autocomment {
- color: gray;
-}
-
-#pagehistory span.user {
- margin-left: 1.4em;
- margin-right: .4em;
-}
-
-#pagehistory span.minor {
- font-weight: bold;
-}
-
-#pagehistory li {
- border: 1px solid white;
-}
-
-#pagehistory li.selected {
- background-color: #f9f9f9;
- border: 1px dashed #aaa;
-}
-
-/*
-** Diff rendering (unused)
-*/
-table.diff, td.diff-otitle, td.diff-ntitle {
- background-color: white;
-}
-
-td.diff-addedline {
- background-color: #cfc;
- font-size: smaller;
-}
-
-td.diff-deletedline {
- background-color: #ffa;
- font-size: smaller;
-}
-
-td.diff-context {
- background-color: #eee;
- font-size: smaller;
-}
-
-span.diffchange {
- color: red;
- font-weight: bold;
-}
-
-/**
- * Diff Output
- */
-/* main box */
-.diff {
- margin-top: 1ex;
- margin-bottom: 0.5ex;
- background-color: white;
- color: black;
- border-top: 1px solid #494f5d;
- border-left: 1px solid #494f5d;
- border-bottom: 1px solid #c6d2de;
- border-right: 1px solid #c6d2de;
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: .125em;
- padding-right: .125em;
- padding: 0;
- clear: both;
-}
-
-.diff .block {
- background-color: #ddd;
- padding-left: 1em;
-}
-
-/* individual blocks */
-.diff .context {
- background-color: white;
- border: none;
-}
-
-/* entire difftextblock */
-.difftext {
- margin-top: 0;
- margin-bottom: 0;
- background-color: white;
- border-top: 1px #e8e6df solid;
- border-left: 1px #e8e6df solid;
- border-bottom: 1px #d2d2d2 solid;
- border-right: 1px #b2b2b2 solid;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
- padding-bottom: 0;
- clear: both;
-}
-
-/* + - line prefix */
-.diff .block tt {
- font-weight: normal;
- font-family: monospace;
- color: black;
- margin-left: 0;
- border: none;
-}
-
-/* changed words */
-.diff del, .diff ins {
- font-weight: bold;
- text-decoration: none;
-}
-
-/* blocks containing deleted or added words */
-.diff .original, .diff .deleted,
-.diff .final, .diff .added {
- background-color: white;
-}
-
-/* blocks containing deleted words */
-.diff .original, .diff .deleted {
- background-color: #fcc;
- border: none;
-}
-
-/* blocks containing added words */
-.diff .final, .diff .added {
- background-color: #cfc;
- border: none;
-}
-
-/* deleted words */
-.diff del {
- background-color: #f99;
-}
-
-/* added words */
-.diff ins {
- background-color: #9f9;
-}
-
-/**
- * PageHistory, Info
- */
-td.pageinfo {
- font-weight: bold;
-}
-
-.pageinfo-minoredit, .pageinfo-authorid {
- font-size: smaller;
- font-style: oblique;
-}
-
-/* RssFeed */
-div.rss {
- margin: 1em;
- padding: 1em;
- font-size: 0.9em;
- background-color: #eeeeee;
- border: thin dashed #aaaaaa;
-}
-
-div.feed {
- color: #333;
- margin: -0.5em;
- margin-bottom: 0;
- padding: 0.3em;
- font-weight: bold;
- background-color: #f2f2f2;
- font-size: 1.2em;
-}
-
-div.itemdesc {
- padding-left: 1em;
-}
-
-div.rssitem {
- border-top: thin dashed #aaaaaa;
-}
-
-a.rssicon {
- font-weight: normal;
- font-size: small;
- vertical-align: middle;
-}
-
-/**
- * Calendar plugin
- */
-table.cal {
- border: 1px outset gray;
- background-color: white;
- margin: 0.5ex 0.5em;
- padding: 1px;
- /* For Mozilla */
- empty-cells: hide;
-}
-
-/* cells */
-table.cal td {
- background-color: white;
- text-align: right;
-}
-
-/* Month-name header */
-table.cal-header {
- font-size: larger;
-}
-
-table.cal-header tr, table.cal-header td {
- text-align: center;
-}
-
-.cal-arrow {
- font-weight: bold;
- text-decoration: none;
-}
-
-/* Day-names header */
-table.cal tbody tr .cal-dayname {
-}
-
-.cal-dayname td {
- text-align: center;
- font-size: smaller;
- text-decoration: underline;
-}
-
-/* Individual days */
-a.cal-hide {
- text-decoration: none;
-}
-
-/* Today */
-/* cell */
-table.cal td.cal-today {
- margin: 1px;
- border: 1px solid gray;
-}
-
-/* text */
-table.cal td.cal-today a.cal-hide {
-}
-
-/*
-** keep the whitespace in front of the ^=, hides rule from konqueror
-** this is css3, the validator doesn't like it when validating as css2
-*/
-#bodyContent a.external,
-#bodyContent a[href ^="gopher://"] {
- background: url("images/url.png") center right no-repeat;
- padding-right: 13px;
-}
-
-#bodyContent a[href ^="https://"],
-.link-https {
- background: url("images/lock_icon.png") center right no-repeat;
- padding-right: 16px;
-}
-
-#bodyContent a[href ^="mailto:"],
-.link-mailto {
- background: url("images/mail_icon.png") center right no-repeat;
- padding-right: 18px;
-}
-
-#bodyContent a[href ^="news://"] {
- background: url("images/news_icon.png") center right no-repeat;
- padding-right: 18px;
-}
-
-#bodyContent a[href ^="ftp://"],
-.link-ftp {
- background: url("images/file_icon.png") center right no-repeat;
- padding-right: 18px;
-}
-
-#bodyContent a[href ^="irc://"],
-.link-irc {
- background: url("images/discussionitem_icon.png") center right no-repeat;
- padding-right: 18px;
-}
-
-/* disable interwiki styling */
-#bodyContent a.extiw,
-#bodyContent a.extiw:active {
- color: #36b;
- background-image: none;
- padding: 0;
-}
-
-#bodyContent a.external {
- color: #36b;
-}
-
-/* this can be used in the content area to switch off
-special external link styling */
-#bodyContent .plainlinks a {
- background: none !important;
- padding: 0 !important;
-}
-
-/*
-** Structural Elements
-*/
-
-/*
-** general portlet styles (elements in the quickbar)
-*/
-.portlet {
- border: none;
- margin: 0 0 .5em;
- padding: 0;
- float: none;
- width: 11.6em;
- overflow: hidden;
-}
-
-.portlet h4 {
- font-size: 95%;
- font-weight: normal;
- white-space: nowrap;
-}
-
-.portlet h2 {
- background-color: transparent;
- padding: 0 1em 0 0.5em;
- text-transform: lowercase;
- display: inline;
- font-size: 91%;
- height: 1em;
- font-weight: normal;
- white-space: nowrap;
-}
-
-.portlet h6 {
- background-color: #ffae2e;
- border: 1px solid #2f6fab;
- border-style: solid solid none solid;
- padding: 0 1em 0 1em;
- text-transform: lowercase;
- display: block;
- font-size: 1em;
- height: 1.2em;
- font-weight: normal;
- white-space: nowrap;
-}
-
-.pBody {
- font-size: 95%;
- background-color: white;
- color: black;
- border-collapse: collapse;
- border: 1px solid #aaa;
- padding: 0 .8em .3em .5em;
-}
-
-.portlet h1,
-.portlet h2,
-.portlet h3,
-.portlet h4 {
- margin: 0;
- padding: 0;
-}
-
-.portlet ul {
- line-height: 1.5em;
- list-style-type: square;
- list-style-image: url("images/bullet.png");
- font-size: 95%;
-}
-
-.portlet li {
- padding: 0;
- margin: 0 0 0 0;
- margin-bottom: 0;
-}
-
-/*
-** Logo properties
- * Optionally at the right also an image
-*/
-
-#p-logo {
- position: absolute; /*needed to use z-index */
- z-index: 3;
- top: 0;
- left: 0;
- height: 155px;
- width: 12em;
- overflow: visible;
-}
-
-#p-logo h5 {
- display: none;
-}
-
-#p-logo a,
-#p-logo a:hover {
- display: block;
- height: 155px;
- width: 12.2em;
- background-repeat: no-repeat;
- background-position: 35% 50% !important;
- text-decoration: none;
-}
-
-/* At the right we put a small "wiki star" */
-#img-logo-right {
- position: absolute;
- z-index: 4;
- top: 0;
- right: 0;
- height: 86px;
- width: 86px;
- background: url("images/wiki_stamp.png") left no-repeat;
- background-repeat: no-repeat;
- overflow: visible;
-}
-
-/*
-** the navigation portlet
-*/
-
-#p-navigation {
- position: relative;
- z-index: 3;
-}
-
-#p-navigation .pBody {
- padding-right: 0;
-}
-
-#p-navigation a {
- display: block;
-}
-
-#p-navigation li.active a, #p-navigation li.active a:hover {
- text-decoration: none;
- display: inline;
- font-weight: bold;
-}
-
-/*
-** Search portlet
-*/
-#p-search {
- position: relative;
- z-index: 3;
-}
-
-input.searchButton {
- margin-top: 1px;
- padding: 0 0.4em !important;
- font-size: 95%;
- cursor: pointer;
- background-color: White;
- border: 1px solid #2f6fab;
-}
-
-#searchGoButton {
- padding-left: .5em;
- padding-right: .5em;
- font-weight: bold;
-}
-
-/*#searchInput, */
-#livesearch, #p-search input.dropdown {
- text-align: left;
- width: 9.9em;
- /*margin: 0;*/
- font-size: 95%;
-}
-
-#p-search .pBody {
- padding: .5em .4em .4em .4em;
- text-align: center;
-}
-
-/*
-** the personal toolbar
-*/
-
-#p-personal {
- position: absolute;
- z-index: 4;
- width: 40em;
- white-space: nowrap;
- padding: 0 0 0 0;
- margin: 0;
- right: 90px;
- top: 0.1em;
- border: none;
- overflow: visible;
- color: black;
- line-height: 1.2em;
-}
-
-#p-personal h5 {
- display: none;
-}
-
-#p-personal .portlet,
-#p-personal .pBody {
- z-index: 0;
- padding: 0;
- margin: 0;
- border: none;
- overflow: visible;
- background-image: none;
-}
-
-/* this is the ul contained in the portlet */
-#p-personal ul {
- z-index: 0;
- border: none;
- line-height: 1.5em;
- color: #2f6fab;
- padding: 0 2em 0 3em;
- margin: 0;
- text-align: right;
- /*text-transform: lowercase;*/
- list-style: none;
- background-image: none;
- cursor: default;
-}
-
-#p-personal li {
- z-index: 0;
- border: none;
- padding: 0;
- display: inline;
- color: #2f6fab;
- margin-left: 1em;
- line-height: 1.2em;
- background-image: none;
-}
-
-#p-personal li.active {
- font-weight: bold;
-}
-
-#p-personal li a {
- text-decoration: none;
- color: #005896;
- padding-bottom: 0.2em;
- background-image: none;
-}
-
-#p-personal li a:hover {
- background-color: white;
- padding-bottom: .2em;
- text-decoration: none;
-}
-
-#p-personal li.active a:hover {
- background-color: transparent;
-}
-
-/* the icon in front of the user name, single quotes
-in bg url to hide it from iemac */
-li#pt-userpage,
-li#pt-anonuserpage,
-li#pt-login {
- /*background: url('images/wikiuser.png') top left bottom no-repeat;*/
- background: url('images/wikiuser.png') left no-repeat;
- background-repeat: no-repeat;
- padding-left: 20px;
- text-transform: none;
-}
-
-#p-personal a.new {
- color: #ba0000;
-}
-
-/*
-** the page-related actions- page/talk, edit etc
-*/
-#p-cactions {
- position: absolute;
- /*z-index: 1;*/
- /* important! */
- top: 1.3em;
- left: 11.5em;
- margin: 0;
- white-space: nowrap;
- width: 76%;
- line-height: 1.1em;
- overflow: visible;
- background-image: none;
- border-collapse: collapse;
- padding-left: 1em;
- list-style: none;
- font-size: 95%;
-}
-
-#p-cactions .hiddenStructure {
- display: none;
-}
-
-#p-cactions ul {
- list-style: none;
-}
-
-#p-cactions li {
- display: inline;
- border: 1px solid #aaa;
- border-bottom: none;
- padding: 0 0 .1em 0;
- margin: 0 .3em 0 0;
- overflow: visible;
- background-color: white;
-}
-
-#p-cactions li.selected {
- border-color: #fabd23;
- padding: 0 0 0.2em 0 !important;
-}
-
-#p-cactions li a {
- position: relative;
- z-index: 0;
- background-color: #fbfbfb;
- color: #002bb8;
- border: none;
- padding: 0 .8em .3em;
- text-decoration: none;
- /*text-transform: lowercase;*/
- margin: 0;
-}
-
-#p-cactions li.selected a {
- z-index: 3;
- background-color: #fff;
- padding: 0 1em 0.2em;
-}
-
-#p-cactions .new a {
- color: #ba0000;
-}
-
-#p-cactions li a:hover {
- z-index: 3;
- text-decoration: none;
- background-color: #dedede;
-}
-
-/* http://universaleditbutton.org */
-#p-cactions li a#btn-edit {
- background: url('images/UEB16.png') top left no-repeat;
- background-repeat: no-repeat;
- padding-left: 20px !important;
- text-transform: none;
-}
-
-#p-cactions li a#btn-edit:hover {
- z-index: 3;
- text-decoration: none;
- background-color: #fff;
- /*padding-bottom: 0.3em !important;*/
-}
-
-#p-cactions h5 {
- display: none;
-}
-
-#p-cactions li.istalk {
- margin-right: 0;
-}
-
-#p-cactions li.istalk a {
- padding-right: .5em;
-}
-
-#p-cactions #ca-addsection a {
- padding-left: .4em;
- padding-right: .4em;
-}
-
-/* offsets to distinguish the tab groups */
-li#ca-talk {
- margin-right: 1.6em;
-}
-
-li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
- margin-left: 1.6em;
-}
-
-/*
-** the remaining portlets
-*/
-#p-tbx,
-#p-lang {
- position: relative;
- z-index: 3;
-}
-
-/*
-** footer
-*/
-#footer {
- background-color: white;
- border-top: 1px solid #fabd23;
- border-bottom: 1px solid #fabd23;
- margin: .6em 0 1em 0;
- border-left: 1px solid #fabd23;
- margin-left: 13.6em;
- padding: .4em 0 1.2em 0;
- text-align: center;
- font-size: 90%;
-}
-
-#footer ul {
- display: table-cell;
-}
-
-#footer li {
- display: inline;
- margin: 0 1.3em;
-}
-
-/* hide from incapable browsers */
-head:first-child+body #footer li {
- white-space: nowrap;
-}
-
-#f-poweredbyico, #f-copyrightico {
- display: table-cell;
- margin: 0 8px;
- padding-left: 1em;
- padding-right: 1em;
- vertical-align: middle;
-}
-
-/* js pref toc */
-#preftoc {
- float: left;
- margin: 1em 1em 1em 1em;
- width: 13em;
-}
-
-#preftoc li {
- border: 1px solid White;
-}
-
-#preftoc li.selected {
- background-color: #f9f9f9;
- border: 1px dashed #aaaaaa;
-}
-
-#preftoc a,
-#preftoc a:active {
- display: block;
- color: #0014a6;
-}
-
-#prefcontrol {
- clear: both;
- float: left;
- margin-top: 1em;
-}
-
-div.prefsectiontip {
- font-size: 95%;
- margin-top: 1em;
-}
-
-fieldset.operaprefsection {
- margin-left: 15em
-}
-
-/* more IE fixes */
-/* float/negative margin brokenness */
-* html #footer {
- margin-top: 0;
-}
-
-* html #column-content {
- display: inline;
- margin-bottom: 0;
-}
-
-* html div.editsection {
- font-size: smaller;
-}
-
-#pagehistory li.selected {
- position: relative;
-}
-
-* > html #column-one {
- position: absolute;
- left: 0;
- top: 0;
-}
-
-* > html #footer {
- margin-left: 13.2em;
-}
-
-.redirectText {
- font-size: 150%;
- margin: 5px;
-}
-
-.printfooter {
- display: none;
-}
-
-.not-patrolled {
- background-color: #ffa;
-}
-
-div.patrollink {
- font-size: 75%;
- text-align: right;
-}
-
-span.newpage, span.minor, span.searchmatch, span.bot {
- font-weight: bold;
-}
-
-span.unpatrolled {
- font-weight: bold;
- color: red;
-}
-
-span.searchmatch {
- color: red;
-}
-
-.sharedUploadNotice {
- font-style: italic;
-}
-
-span.updatedmarker {
- color: black;
- background-color: #0f0;
-}
-
-span.newpageletter {
- font-weight: bold;
- color: black;
- background-color: yellow;
-}
-
-span.minoreditletter {
- color: black;
- background-color: #c5ffe6;
-}
-
-table.gallery {
- border: 1px solid #ccc;
- margin: 2px;
- padding: 2px;
- background-color: white;
-}
-
-table.gallery tr {
- vertical-align: top;
-}
-
-table.gallery td {
- vertical-align: top;
- background-color: #f9f9f9;
- border: solid 2px white;
-}
-
-table.gallery td.galleryheader {
- text-align: center;
- font-weight: bold;
-}
-
-div.gallerybox {
- margin: 2px;
- width: 150px;
-}
-
-div.gallerybox div.thumb {
- text-align: center;
- border: 1px solid #ccc;
- margin: 2px;
-}
-
-div.gallerytext {
- font-size: 94%;
- padding: 2px 4px;
-}
-
-span.comment {
- font-style: italic;
-}
-
-span.changedby {
- font-size: 95%;
-}
-
-.previewnote {
- text-indent: 3em;
- color: #c00;
- border-bottom: 1px solid #aaa;
- padding-bottom: 1em;
- margin-bottom: 1em;
-}
-
-.previewnote p {
- margin: 0;
- padding: 0;
-}
-
-.editExternally {
- border: 1px solid gray;
- background-color: #ffffff;
- padding: 3px;
- margin-top: 0.5em;
- float: left;
- font-size: small;
- text-align: center;
-}
-
-.editExternallyHelp {
- font-style: italic;
- color: gray;
-}
-
-li span.deleted, span.history-deleted {
- text-decoration: line-through;
- color: #888;
- font-style: italic;
-}
-
-.toggle {
- margin-left: 2em;
- text-indent: -2em;
-}
-
-/* Classes for EXIF data display */
-table.mw_metadata {
- font-size: 0.8em;
- margin-left: 0.5em;
- margin-bottom: 0.5em;
- width: 300px;
-}
-
-table.mw_metadata caption {
- font-weight: bold;
-}
-
-table.mw_metadata th {
- font-weight: normal;
-}
-
-table.mw_metadata td {
- padding: 0.1em;
-}
-
-table.mw_metadata {
- border: none;
- border-collapse: collapse;
-}
-
-table.mw_metadata td, table.mw_metadata th {
- text-align: center;
- border: 1px solid #aaaaaa;
- padding-left: 0.1em;
- padding-right: 0.1em;
-}
-
-table.mw_metadata th {
- background-color: #f9f9f9;
-}
-
-table.mw_metadata td {
- background-color: #fcfcfc;
-}
-
-table.collapsed tr.collapsable {
- display: none;
-}
-
-/* filetoc */
-ul#filetoc {
- text-align: center;
- border: 1px solid #aaaaaa;
- background-color: #f9f9f9;
- padding: 5px;
- font-size: 95%;
- margin-bottom: 0.5em;
- margin-left: 0;
- margin-right: 0;
-}
-
-#filetoc li {
- display: inline;
- list-style-type: none;
- padding-right: 2em;
-}
-
-/* @bug 1714 */
-input#wpSave, input#wpDiff {
- margin-right: 0.33em;
-}
-
-#editform .editOptions {
- display: inline;
-}
-
-#wpSave {
- font-weight: bold;
-}
-
-/* Classes for article validation */
-
-table.revisionform_default {
- border: 1px solid #000000;
-}
-
-table.revisionform_focus {
- border: 1px solid #000000;
- background-color: #00BBFF;
-}
-
-tr.revision_tr_default {
- background-color: #EEEEEE;
-}
-
-tr.revision_tr_first {
- background-color: #DDDDDD;
-}
-
-p.revision_saved {
- color: green;
- font-weight: bold;
-}
-
-#mw_trackbacks {
- border: solid 1px #bbbbff;
- background-color: #eeeeff;
- padding: 0.2em;
-}
-
-/* Allmessages table */
-
-#allmessagestable th {
- background-color: #b2b2ff;
-}
-
-#allmessagestable tr.orig {
- background-color: #ffe2e2;
-}
-
-#allmessagestable tr.new {
- background-color: #e2ffe2;
-}
-
-#allmessagestable tr.def {
- background-color: #f0f0ff;
-}
-
-/* noarticletext */
-div.noarticletext {
- border: 1px solid #ccc;
- background-color: #fff;
- padding: .2em 1em;
- color: #000;
-}
-
-div#searchTargetContainer {
- left: 10px;
- top: 10px;
- width: 90%;
- background-color: white;
-}
-
-div#searchTarget {
- padding: 3px;
- margin: 5px;
- background-color: #F0F0F0;
- border: solid 1px blue;
-}
-
-div#searchTarget ul li {
- list-style: none;
-}
-
-div#searchTarget ul li:before {
- color: orange;
- content: "\00BB \0020";
-}
-
-div.multipageimagenavbox {
- border: solid 1px silver;
- padding: 4px;
- margin: 1em;
- background-color: #f0f0f0;
-}
-
-div.multipageimagenavbox div.thumb {
- border: none;
- margin-left: 2em;
- margin-right: 2em;
-}
-
-div.multipageimagenavbox hr {
- margin: 6px;
-}
-
-table.multipageimage td {
- text-align: center;
-}
-
-/*
- Table pager (e.g. Special:Imagelist)
- - remove underlines from the navigation link
- - collapse borders
- - set the borders to outsets (similar to Special:Allmessages)
- - remove line wrapping for all td and th, set background color
- - restore line wrapping for the last two table cells (description and size)
-*/
-.TablePager_nav a {
- text-decoration: none;
-}
-
-.TablePager {
- border-collapse: collapse;
-}
-
-.TablePager, .TablePager td, .TablePager th {
- border: 0.15em solid #777777;
- padding: 0 0.15em 0 0.15em;
-}
-
-.TablePager th {
- background-color: #eeeeff
-}
-
-.TablePager td {
- background-color: #ffffff
-}
-
-.TablePager tr:hover td {
- background-color: #eeeeff
-}
-
-.imagelist td, .imagelist th {
- white-space: nowrap
-}
-
-.imagelist .TablePager_col_links {
- background-color: #eeeeff
-}
-
-.imagelist .TablePager_col_img_description {
- white-space: normal
-}
-
-.imagelist th.TablePager_sort {
- background-color: #ccccff
-}
-
-/**
- * PhpWiki Tables
- */
-.pagelist {
- font-size: smaller;
-}
-
-.pagelist thead td {
- background-color: #e8e8e8;
- text-decoration: none;
- font-weight: bold;
-}
-
-.pagelist thead td u {
- text-decoration: none;
-}
-
-.pagelist tr {
- vertical-align: top;
-}
-
-.pagelist tr.evenrow {
- background-color: #eee;
-}
-
-.pagelist tr.oddrow {
- background-color: white;
-}
-
-th.gridbutton {
- background-color: ThreeDLightShadow;
- color: black;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-size: small;
- font-weight: normal;
- white-space: nowrap;
- margin: 5px 0;
- max-height: 24px;
- padding: 5px 0 5px 0;
- border-width: 1px;
- border-style: solid;
- border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
-}
-
-input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
- text-decoration: none;
- font-size: small;
- font-weight: normal;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- background-color: ThreeDLightShadow;
- color: black;
-}
-
-.wikipaging {
- font-size: 80%
-}
-
-.wikipaging-disabled {
- color: #999
-}
-
-/* plugin BoxRight */
-div.boxright {
- background-color: #e9fbff;
- width: 200px;
- right: 10px;
- padding: 0.5em;
- float: right;
- border: thin solid #888888;
- padding: 0.5em;
-}
-
-div#bottom {
- margin-left: 12.2em;
-}
-
-.error {
- color: black;
- background-color: #eee;
- margin-top: 1em;
- margin-bottom: 1em;
- padding-left: 0.8em;
- padding-right: 0.8em;
- padding-top: 0.8ex;
- padding-bottom: 0;
- border: medium solid red;
- clear: both;
-}
-
-.warning {
- color: black;
- background-color: #eee;
- margin-top: 1em;
- margin-bottom: 1em;
- padding-left: 0.8em;
- padding-right: 0.8em;
- padding-top: 0.8ex;
- padding-bottom: 0;
- border: thin solid blue;
- clear: both;
-}
-
-/* Debug */
-.debug {
- color: black;
- background-color: white;
- font-family: monospace;
- font-size: smaller;
- margin: 1ex 0;
- padding: 0.5ex 0.5em;
- border: medium solid #fff8dc; /* darker ivory */
-}
-
-/* Hints */
-.hint {
- color: black;
- background-color: #eeeeee;
- /* font-size: smaller; */
- font-style: italic;
- margin-left: 3em;
- padding: 0.5ex 0.5em;
- border: thin solid #aaaaaa;
-}
-
-span.hint {
- padding: 0;
-}
-
-/* Disabled Plugins */
-.disabled-plugin {
- clear: both;
- margin: 1ex 0;
- padding: 0;
-}
-
-.disabled-plugin .title {
- color: #400;
- background-color: inherit;
- font-size: x-small;
- text-align: right;
- padding: 0 0.5em;
-}
-
-.disabled-plugin pre {
- color: black;
- background-color: #ddd;
- margin: 0;
- padding: 0.3ex 0.5em;
-}
-
-/* "(Redirected from ...)" message. */
-span.redirectfrom {
- font-size: small;
- font-style: oblique;
- font-weight: normal;
- padding-left: 1em;
-}
-
-.search-context {
- background-color: white;
- font-style: oblique;
-}
-
-.search-term {
- background-color: yellow;
- font-weight: normal;
-}
-
-a.spell-wrong {
- color: #ba0000;
- background-color: yellow;
-}
-
-span.spell-wrong {
- color: #ba0000;
-}
-
-/**
- * Wiki Forms
- *
- * The div inside the wikiadmin upload form does not
- * have a class yet, so it must be referenced indirectly
- */
-/* div.wikiaction { background-color: #eee; } */
-/* div.wikiadmin { background-color: #fee; } */
-/* form.wikiadmin div { background-color: #fee; } */
-form.wikiformrich {
- background-color: #eee;
-}
-
-/**
- * Link styles
- */
-.wiki, .named-wiki {
- text-decoration: none;
- font-weight: normal;
- /* font-weight: bold; */
-}
-
-/* Action buttons */
-a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
-input.wikiaction, input.button, input.wikiadmin {
- text-decoration: none;
- font-family: Arial, Helvetica, sans-serif;
- /* don't wrap text buttons */
- white-space: nowrap;
- /*font-size: inherit; */
-}
-
-/*
-a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button {
- background-color: #ddd;
-}
-*/
-
-.wikiunsafe {
- background-color: #fcc;
-}
-
-/*
-a.wikiadmin, a.wikiadmin:visited, input.wikiadmin {
- background-color: #fdd;
-}
-*/
-
-/* Unknown links */
-.wikiunknown, .named-wikiunknown {
- font-weight: normal;
- font-size: 100%;
-}
-
-/* QuestionMark #600 */
-.wikiunknown a, .named-wikiunknown a {
- color: #447;
- background-color: #eee;
- text-decoration: none;
- font-weight: normal;
- font-size: smaller;
-}
-
-/* Backlinks */
-.backlinks {
- text-decoration: underline;
- color: #006;
-}
-
-h1 .backlinks {
- text-decoration: underline;
-}
-
-/* Interwiki links */
-/* .wikipage { font-weight: bold; } */
-.wikipage {
- font-weight: normal;
-}
-
-.interwiki {
- text-decoration: none;
-}
-
-.interwiki, i.interwiki .wikipage, em .interwiki .wikipage {
- font-style: oblique;
-}
-
-.interwiki .wikipage, i .interwiki, em .interwiki {
- font-style: normal;
-}
-
-/*
- * "E-mail" style blockquote
- */
-blockquote.mail-style-quote {
- border-left: medium #284 solid;
- padding-left: 1em;
- margin-left: 0;
- margin-right: 0;
-}
-
-.mail-style-quote blockquote.mail-style-quote {
- margin-left: -0.6em;
-}
-
-/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */
-
-/*
- * table class="boxed"
- * will put a border around the table (but not around the cells)
- *
- * table class="bordered"
- * will put a border around the table and the cells
- *
- * In both cases, the caption will be bold and centered under the table
- *
- * In both cases, the headers (th) will have a "#d8d8d8" background
- */
-
-table.boxed, table.bordered, table.bordered th, table.bordered td {
- border-width: 1px;
- border-style: solid;
- border-collapse: collapse;
- vertical-align: top;
-}
-
-table.boxed td, table.bordered td,
-table.boxed th, table.bordered th {
- padding-left: 5px;
- padding-right: 5px;
- padding-top: 0;
- padding-bottom: 0;
-}
-
-table.boxed caption, table.bordered caption {
- text-align: center;
- font-weight: bold;
- caption-side: bottom;
- padding-top: 0.8em;
-}
-
-table.boxed th, table.bordered th {
- font-weight: bold;
- background-color: #d8d8d8;
-}
-
-/* For RecentChanges plugin */
-td.tdselected, td.tdunselected {
- text-align: center;
- font-weight: bold;
- padding-left: 5px;
- padding-right: 5px;
-}
-
-td.tdselected {
- color: white;
- background-color: #554295;
-}
-
-td.tdunselected {
- color: black;
- background-color: #e9e8de;
-}
-
-/* Style for feedback
- * Use this style to tell the user that the operation he
- * requested was executed successfully, e.g:
- * User was successfully registered
-*/
-.feedback {
- font-weight: bold;
- border-width: 2px;
- border-style: solid;
- background-color: #DFD;
- border-color: green;
- padding: 0.5em;
-}
-
-#edit-public, h1.firstHeading-public, h1.firstHeading-rating-public {
- background-color: #ffce7b;
- border: 1px solid #ffa500;
-}
-
-/* PageTrail plugin */
-.pagetrail {
- background-color: #FFFF99;
- padding: 0.2em;
-}
-
-/* IncludePage plugin ================================================= */
-
-.transclusion-title {
- text-align: right;
- font-style: oblique;
- font-size: smaller;
- text-decoration: underline;
- margin-bottom: 0.25ex;
- margin-right: 0.25em;
-}
-
-.transclusion, .wiki-edithelp {
- font-size: smaller;
-}
-
-.transclusion {
- border: 1px solid gray;
- padding-left: 0.8em;
- padding-right: 0.8em;
- padding-top: 0;
- padding-bottom: 0;
- margin-left: 0.25em;
- margin-right: 0.25em;
- margin-bottom: 0.1ex;
-}
-
-.wiki-edithelp {
- background-color: white;
- border: medium solid #fff8dc; /* darker ivory */
- padding-left: 0.5em;
- padding-right: 0.5em;
- padding-top: 0.75ex;
- padding-bottom: 0.75ex;
- margin-left: 0;
- margin-right: 0;
- margin-top: 1ex;
- margin-bottom: 1ex;
-}
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css 2014-06-20 14:01:49 UTC (rev 8924)
+++ trunk/themes/MonoBook/monobook.css 2014-06-23 08:22:12 UTC (rev 8925)
@@ -1,9 +1,2252 @@
-@import url(main.css);
+/*
+** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
+** Copyright Gabriel Wicke - http://wikidev.net/
+** License: GPL (http://www.gnu.org/copyleft/gpl.html)
+**
+** Loosely based on http://www.positioniseverything.net/ordered-floats.html by Big John
+** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi, Joe Geldart & Tom Croucher,
+** Michael Zeltner and Geir Bækholt)
+** All you guys rock :)
+** Added phpwiki integration: Reini Urban, based on the phpwiki.css
+** by Jeff Dairiki
+*/
-/* For emacs users
+#column-content {
+ width: 100%;
+ float: right;
+ margin: 0 0 .6em -12.2em;
+ padding: 0;
+ height: 1%;
+}
+
+#content {
+ position: relative;
+ z-index: 2;
+ margin: 2.8em 0 0 12.2em;
+ padding: 0 1em 1.5em 1em;
+ background-color: white;
+ color: black;
+ border: 1px solid #aaa;
+ border-right: none;
+ line-height: 1.5em;
+}
+
+#column-one {
+ position: absolute;
+ /*z-index: 3;*/
+ padding-top: 160px;
+ top: 0;
+ left: 0;
+}
+
+/* the left column width is specified in class .portlet */
+
+/* Font size:
+** We take advantage of keyword scaling- browsers won't go below 9px
+** More at http://www.w3.org/2003/07/30-font-size
+** http://style.cleverchimp.com/font_size_intervals/altintervals.html
+*/
+
+body {
+ font: small sans-serif;
+ background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;
+ color: black;
+ margin: 0;
+ padding: 0;
+}
+
+/* scale back up to a sane default */
+#globalWrapper {
+ font-size: 127%;
+ width: 100%;
+ margin: 0;
+ padding: 0;
+}
+
+.visualClear {
+ clear: both;
+}
+
+/* general styles */
+
+table {
+ font-size: 100%;
+ color: black;
+}
+
+a {
+ text-decoration: none;
+ color: #002bb8;
+ background-image: none;
+}
+
+a:visited {
+ color: #5a3696;
+}
+
+a:active {
+ color: #faa700;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+a.stub {
+ color: #772233;
+}
+
+img {
+ border: 0;
+ vertical-align: middle;
+}
+
+p {
+ margin: .4em 0 .5em 0;
+ line-height: 1.5em;
+}
+
+p img {
+ margin: 0;
+}
+
+hr {
+ height: 1px;
+ color: #aaa;
+ background-color: #aaa;
+ border: 0;
+ margin: .2em 0 .2em 0;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ color: black;
+ background-image: none;
+ font-weight: bold;
+ font-family: Tahoma, sans-serif;
+ margin: 0;
+ padding-top: 0.5em;
+ padding-bottom: 0.17em;
+ border-bottom: 1px solid #aaa;
+}
+
+h1 {
+ font-size: 188%;
+}
+
+h2 {
+ font-size: 150%;
+}
+
+h3 {
+ font-size: 132%;
+}
+
+h4 {
+ font-size: 116%;
+}
+
+h5 {
+ font-size: 100%;
+}
+
+h6 {
+ font-size: 80%;
+}
+
+h4, h5, h6 {
+ border-bottom: none;
+ font-weight: normal;
+}
+
+/* Because in some cases there is a <p> in nested lists */
+li p {
+ margin: 0;
+}
+
+ul {
+ line-height: 1.5em;
+ list-style-type: square;
+ margin: 0.3em 0 0 1.5em;
+ padding: 0;
+ list-style-image: url("images/bullet.png");
+}
+
+ol {
+ line-height: 1.5em;
+ margin: 0.3em 0 0 3.2em;
+ padding: 0;
+ list-style-image: none;
+}
+
+li {
+ margin-bottom: 0.1em;
+}
+
+dt {
+ font-weight: bold;
+ margin-bottom: .1em;
+}
+
+dl {
+ margin-top: .2em;
+ margin-bottom: .5em;
+}
+
+dd {
+ line-height: 1.5em;
+ margin-left: 2em;
+ margin-bottom: .1em;
+}
+
+fieldset {
+ border: 1px solid #2f6fab;
+ margin: 1em 0 1em 0;
+ padding: 0 1em 1em 1em;
+ line-height: 1.5em;
+}
+
+legend {
+ /*background: white;*/
+ padding: 0.5em;
+ font-size: 95%;
+}
+
+form {
+ border: none;
+ margin: 0;
+}
+
+textarea {
+ width: 100%;
+ padding: .1em;
+}
+
+input.historysubmit {
+ padding: 0 0.3em 0.3em 0.3em !important;
+ font-size: 94%;
+ cursor: pointer;
+ height: 1.7em !important;
+ margin-left: 1.6em;
+}
+
+select {
+ vertical-align: top;
+}
+
+abbr, acronym, .explain {
+ border-bottom: 1px dotted black;
+ color: black;
+ background-image: none;
+ cursor: help;
+}
+
+q {
+ font-family: Times, "Times New Roman", serif;
+ font-style: italic;
+}
+
+/* disabled for now
+blockquote {
+ font-family: Times, "Times New Roman", serif;
+ font-style: italic;
+}*/
+code {
+ background-color: #f9f9f9;
+}
+
+pre {
+ padding: 1em;
+ border: 1px dashed #2f6fab;
+ color: black;
+ background-color: #f9f9f9;
+ line-height: 1.1em;
+}
+
+/* generic classes ----------------------------------------------- */
+
+.tt {
+ font-family: monospace;
+}
+
+.strike {
+ text-decoration: line-through;
+}
+
+.big {
+ font-size: larger;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-right {
+ text-align: right;
+}
+
+.align-center {
+ text-align: center;
+}
+
+.top {
+ vertical-align: top;
+}
+
+.bottom {
+ vertical-align: bottom;
+}
+
+.middle {
+ vertical-align: middle;
+}
+
+.baseline {
+ vertical-align: baseline;
+}
+
+.nowrap {
+ white-space: nowrap;
+}
+
+.fullwidth {
+ width: 100%;
+}
+
+/* --------------------------------------------------------------- */
+
+/*
+** the main content area
+*/
+
+#siteSub {
+ display: none;
+}
+
+#jump-to-nav {
+ display: none;
+}
+
+#contentSub {
+ font-size: 84%;
+ line-height: 1.2em;
+ margin: 0 0 1.4em 1em;
+ color: #7d7d7d;
+ width: auto;
+}
+
+span.subpages {
+ display: block;
+}
+
+/* Some space under the headers in the content area */
+#bodyContent h1, #bodyContent h2 {
+ margin-bottom: .6em;
+}
+
+#bodyContent h3, #bodyContent h4, #bodyContent h5 {
+ margin-bottom: .3em;
+}
+
+.firstHeading {
+ margin-bottom: 0.1em;
+}
+
+/* user notification thing */
+.usermessage {
+ background-color: #ffce7b;
+ border: 1px solid #ffa500;
+ color: black;
+ font-weight: bold;
+ margin: 2em 0 1em;
+ padding: .5em 1em;
+ vertical-align: middle;
+}
+
+#siteNotice {
+ text-align: center;
+ font-size: 95%;
+ padding: 0 .9em;
+}
+
+#siteNotice p {
+ margin: 0;
+ padding: 0;
+}
+
+.errorbox, .successbox {
+ font-size: larger;
+ border: 2px solid;
+ padding: .5em 1em;
+ float: left;
+ margin-bottom: 2em;
+ color: #000;
+}
+
+.errorbox {
+ border-color: red;
+ background-color: #fff2f2;
+}
+
+.successbox {
+ border-color: green;
+ background-color: #dfd;
+}
+
+.errorbox h2, .successbox h2 {
+ font-size: 1em;
+ font-weight: bold;
+ display: inline;
+ margin: 0 .5em 0 0;
+ border: none;
+}
+
+#catlinks {
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ margin-top: 1em;
+ clear: both;
+}
+
+/* currently unused, intended to be used by a metadata box
+in the bottom-right corner of the content area */
+.documentDescription {
+ /* The summary text describing the document */
+ font-weight: bold;
+ display: block;
+ margin: 1em 0;
+ line-height: 1.5em;
+}
+
+.documentByLine {
+ text-align: right;
+ font-size: 90%;
+ clear: both;
+ font-weight: normal;
+ color: #76797c;
+}
+
+/* emulate center */
+.center {
+ width: 100%;
+ text-align: center;
+}
+
+*.center * {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+/* small for tables and similar */
+.small, .small * {
+ font-size: 94%;
+}
+
+table.small {
+ font-size: 100%;
+}
+
+/*
+** content styles
+*/
+#toc,
+.toc {
+ width: 200px;
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
+ float: right;
+ clear: right;
+}
+
+#toc #toctitle,
+.toc .toctitle,
+.toc #toctitle {
+ display: inline;
+ border: none;
+ padding: 0;
+ font-size: 110%;
+ font-weight: bold;
+}
+
+.toc .toclist,
+.toc #toclist {
+ width: auto;
+ border: none;
+}
+
+#toc #toctitle,
+.toc #toctitle,
+#toc .toctitle,
+.toc .toctitle {
+ text-align: center;
+}
+
+#toc p,
+.toc p {
+ margin: 0;
+}
+
+#toc ul,
+.toc ul {
+ width: auto;
+ border: none;
+ line-height: 1.5em;
+ list-style-type: square;
+ list-style-image: url("images/bullet.png");
+ font-size: 95%;
+ margin-left: 5px;
+ padding-left: 5px;
+}
+
+#toc ul ul,
+.toc ul ul {
+ margin: 0 0 0 2em;
+}
+
+#toc .toctoggle,
+.toc .toctoggle {
+ font-size: 94%;
+}
+
+.mw-warning {
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
+}
+
+.mw-warning {
+ margin-left: 50px;
+ margin-right: 50px;
+ text-align: center;
+}
+
+/* images */
+div.floatright, table.floatright {
+ clear: right;
+ float: right;
+ position: relative;
+ margin: 0 0 .5em .5em;
+ border: 0;
+}
+
+div.floatright p {
+ font-style: italic;
+}
+
+div.floatleft, table.floatleft {
+ float: left;
+ position: relative;
+ margin: 0 .5em .5em 0;
+ border: 0;
+}
+
+div.floatleft p {
+ font-style: italic;
+}
+
+/* thumbnails */
+div.thumb {
+ margin-bottom: .5em;
+ border-style: solid;
+ border-color: white;
+ width: auto;
+}
+
+div.thumb div {
+ border: 1px solid #ccc;
+ padding: 3px !important;
+ background-color: #f9f9f9;
+ font-size: 94%;
+ text-align: center;
+ overflow: hidden;
+}
+
+div.thumb div a img {
+ border: 1px solid #ccc;
+}
+
+div.thumb div div.thumbcaption {
+ border: none;
+ text-align: left;
+ line-height: 1.4em;
+ padding: .3em 0 .1em 0;
+}
+
+div.magnify {
+ float: right;
+ border-style: none !important;
+ background: none !important;
+}
+
+div.magnify a, div.magnify img {
+ display: block;
+ border-style: none !important;
+ background: none !important;
+}
+
+div.tright {
+ clear: right;
+ float: right;
+ border-width: .5em 0 .8em 1.4em;
+}
+
+div.tleft {
+ float: left;
+ margin-right: .5em;
+ border-width: .5em 1.4em .8em 0;
+}
+
+.hiddenStructure {
+ display: none;
+ speak: none;
+}
+
+img.tex {
+ vertical-align: middle;
+}
+
+span.texhtml {
+ font-family: serif;
+}
+
+/*
+** classes for special content elements like town boxes
+** intended to be referenced directly from the wiki src
+*/
+
+/*
+** User styles
+*/
+/* table standards */
+table.rimage {
+ float: right;
+ position: relative;
+ margin-left: 1em;
+ margin-bottom: 1em;
+ text-align: center;
+}
+
+.toccolours {
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
+ padding: 5px;
+ font-size: 95%;
+}
+
+div.townBox {
+ position: relative;
+ float: right;
+ background-color: white;
+ margin-left: 1em;
+ border: 1px solid gray;
+ padding: .3em;
+ width: 200px;
+ overflow: hidden;
+ clear: right;
+}
+
+div.townBox dl {
+ padding: 0;
+ margin: 0 0 .3em;
+ font-size: 96%;
+}
+
+div.townBox dl dt {
+ background-image: none;
+ margin: .4em 0 0;
+}
+
+div.townBox dl dd {
+ margin: .1em 0 0 1.1em;
+ background-color: #f3f3f3;
+}
+
+/*
+** edit views etc
+*/
+.special li {
+ line-height: 1.4em;
+ margin: 0;
+ padding: 0;
+}
+
+/*
+** RecentChanges
+*/
+.pageinfo-majoredit {
+ font-weight: normal; /*bold;*/
+}
+
+.wiki-summary {
+ font-size: 94%;
+ font-style: italic;
+}
+
+/* Page history styling */
+/* the auto-generated edit comments */
+.autocomment {
+ color: gray;
+}
+
+#pagehistory span.user {
+ margin-left: 1.4em;
+ margin-right: .4em;
+}
+
+#pagehistory span.minor {
+ font-weight: bold;
+}
+
+#pagehistory li {
+ border: 1px solid white;
+}
+
+#pagehistory li.selected {
+ background-color: #f9f9f9;
+ border: 1px dashed #aaa;
+}
+
+/*
+** Diff rendering (unused)
+*/
+table.diff, td.diff-otitle, td.diff-ntitle {
+ background-color: white;
+}
+
+td.diff-addedline {
+ background-color: #cfc;
+ font-size: smaller;
+}
+
+td.diff-deletedline {
+ background-color: #ffa;
+ font-size: smaller;
+}
+
+td.diff-context {
+ background-color: #eee;
+ font-size: smaller;
+}
+
+span.diffchange {
+ color: red;
+ font-weight: bold;
+}
+
+/**
+ * Diff Output
+ */
+/* main box */
+.diff {
+ margin-top: 1ex;
+ margin-bottom: 0.5ex;
+ background-color: white;
+ color: black;
+ border-top: 1px solid #494f5d;
+ border-left: 1px solid #494f5d;
+ border-bottom: 1px solid #c6d2de;
+ border-right: 1px solid #c6d2de;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ padding-left: .125em;
+ padding-right: .125em;
+ padding: 0;
+ clear: both;
+}
+
+.diff .block {
+ background-color: #ddd;
+ padding-left: 1em;
+}
+
+/* individual blocks */
+.diff .context {
+ background-color: white;
+ border: none;
+}
+
+/* entire difftextblock */
+.difftext {
+ margin-top: 0;
+ margin-bottom: 0;
+ background-color: white;
+ border-top: 1px #e8e6df solid;
+ border-left: 1px #e8e6df solid;
+ border-bottom: 1px #d2d2d2 solid;
+ border-right: 1px #b2b2b2 solid;
+ padding-left: 0;
+ padding-right: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+ clear: both;
+}
+
+/* + - line prefix */
+.diff .block tt {
+ font-weight: normal;
+ font-family: monospace;
+ color: black;
+ margin-left: 0;
+ border: none;
+}
+
+/* changed words */
+.diff del, .diff ins {
+ font-weight: bold;
+ text-decoration: none;
+}
+
+/* blocks containing deleted or added words */
+.diff .original, .diff .deleted,
+.diff .final, .diff .added {
+ background-color: white;
+}
+
+/* blocks containing deleted words */
+.diff .original, .diff .deleted {
+ background-color: #fcc;
+ border: none;
+}
+
+/* blocks containing added words */
+.diff .final, .diff .added {
+ background-color: #cfc;
+ border: none;
+}
+
+/* deleted words */
+.diff del {
+ background-color: #f99;
+}
+
+/* added words */
+.diff ins {
+ background-color: #9f9;
+}
+
+/**
+ * PageHistory, Info
+ */
+td.pageinfo {
+ font-weight: bold;
+}
+
+.pageinfo-minoredit, .pageinfo-authorid {
+ font-size: smaller;
+ font-style: oblique;
+}
+
+/* RssFeed */
+div.rss {
+ margin: 1em;
+ padding: 1em;
+ font-size: 0.9em;
+ background-color: #eeeeee;
+ border: thin dashed #aaaaaa;
+}
+
+div.feed {
+ color: #333;
+ margin: -0.5em;
+ margin-bottom: 0;
+ padding: 0.3em;
+ font-weight: bold;
+ background-color: #f2f2f2;
+ font-size: 1.2em;
+}
+
+div.itemdesc {
+ padding-left: 1em;
+}
+
+div.rssitem {
+ border-top: thin dashed #aaaaaa;
+}
+
+a.rssicon {
+ font-weight: normal;
+ font-size: small;
+ vertical-align: middle;
+}
+
+/**
+ * Calendar plugin
+ */
+table.cal {
+ border: 1px outset gray;
+ background-color: white;
+ margin: 0.5ex 0.5em;
+ padding: 1px;
+ /* For Mozilla */
+ empty-cells: hide;
+}
+
+/* cells */
+table.cal td {
+ background-color: white;
+ text-align: right;
+}
+
+/* Month-name header */
+table.cal-header {
+ font-size: larger;
+}
+
+table.cal-header tr, table.cal-header td {
+ text-align: center;
+}
+
+.cal-arrow {
+ font-weight: bold;
+ text-decoration: none;
+}
+
+/* Day-names header */
+table.cal tbody tr .cal-dayname {
+}
+
+.cal-dayname td {
+ text-align: center;
+ font-size: smaller;
+ text-decoration: underline;
+}
+
+/* Individual days */
+a.cal-hide {
+ text-decoration: none;
+}
+
+/* Today */
+/* cell */
+table.cal td.cal-today {
+ margin: 1px;
+ border: 1px solid gray;
+}
+
+/* text */
+table.cal td.cal-today a.cal-hide {
+}
+
+/*
+** keep the whitespace in front of the ^=, hides rule from konqueror
+** this is css3, the validator doesn't like it when validating as css2
+*/
+#bodyContent a.external,
+#bodyContent a[href ^="gopher://"] {
+ background: url("images/url.png") center right no-repeat;
+ padding-right: 13px;
+}
+
+#bodyContent a[href ^="https://"],
+.link-https {
+ background: url("images/lock_icon.png") center right no-repeat;
+ padding-right: 16px;
+}
+
+#bodyContent a[href ^="mailto:"],
+.link-mailto {
+ background: url("images/mail_icon.png") center right no-repeat;
+ padding-right: 18px;
+}
+
+#bodyContent a[href ^="news://"] {
+ background: url("images/news_icon.png") center right no-repeat;
+ padding-right: 18px;
+}
+
+#bodyContent a[href ^="ftp://"],
+.link-ftp {
+ background: url("images/file_icon.png") center right no-repeat;
+ padding-right: 18px;
+}
+
+#bodyContent a[href ^="irc://"],
+.link-irc {
+ background: url("images/discussionitem_icon.png") center right no-repeat;
+ padding-right: 18px;
+}
+
+/* disable interwiki styling */
+#bodyContent a.extiw,
+#bodyContent a.extiw:active {
+ color: #36b;
+ background-image: none;
+ padding: 0;
+}
+
+#bodyContent a.external {
+ color: #36b;
+}
+
+/* this can be used in the content area to switch off
+special external link styling */
+#bodyContent .plainlinks a {
+ background: none !important;
+ padding: 0 !important;
+}
+
+/*
+** Structural Elements
+*/
+
+/*
+** general portlet styles (elements in the quickbar)
+*/
+.portlet {
+ border: none;
+ margin: 0 0 .5em;
+ padding: 0;
+ float: none;
+ width: 11.6em;
+ overflow: hidden;
+}
+
+.portlet h4 {
+ font-size: 95%;
+ font-weight: normal;
+ white-space: nowrap;
+}
+
+.portlet h2 {
+ background-color: transparent;
+ padding: 0 1em 0 0.5em;
+ text-transform: lowercase;
+ display: inline;
+ font-size: 91%;
+ height: 1em;
+ font-weight: normal;
+ white-space: nowrap;
+}
+
+.portlet h6 {
+ background-color: #ffae2e;
+ border: 1px solid #2f6fab;
+ border-style: solid solid none solid;
+ padding: 0 1em 0 1em;
+ text-transform: lowercase;
+ display: block;
+ font-size: 1em;
+ height: 1.2em;
+ font-weight: normal;
+ white-space: nowrap;
+}
+
+.pBody {
+ font-size: 95%;
+ background-color: white;
+ color: black;
+ border-collapse: collapse;
+ border: 1px solid #aaa;
+ padding: 0 .8em .3em .5em;
+}
+
+.portlet h1,
+.portlet h2,
+.portlet h3,
+.portlet h4 {
+ margin: 0;
+ padding: 0;
+}
+
+.portlet ul {
+ line-height: 1.5em;
+ list-style-type: square;
+ list-style-image: url("images/bullet.png");
+ font-size: 95%;
+}
+
+.portlet li {
+ padding: 0;
+ margin: 0 0 0 0;
+ margin-bottom: 0;
+}
+
+/*
+** Logo properties
+ * Optionally at the right also an image
+*/
+
+#p-logo {
+ position: absolute; /*needed to use z-index */
+ z-index: 3;
+ top: 0;
+ left: 0;
+ height: 155px;
+ width: 12em;
+ overflow: visible;
+}
+
+#p-logo h5 {
+ display: none;
+}
+
+#p-logo a,
+#p-logo a:hover {
+ display: block;
+ height: 155px;
+ width: 12.2em;
+ background-repeat: no-repeat;
+ background-position: 35% 50% !important;
+ text-decoration: none;
+}
+
+/* At the right we put a small "wiki star" */
+#img-logo-right {
+ position: absolute;
+ z-index: 4;
+ top: 0;
+ right: 0;
+ height: 86px;
+ width: 86px;
+ background: url("images/wiki_stamp.png") left no-repeat;
+ background-repeat: no-repeat;
+ overflow: visible;
+}
+
+/*
+** the navigation portlet
+*/
+
+#p-navigation {
+ position: relative;
+ z-index: 3;
+}
+
+#p-navigation .pBody {
+ padding-right: 0;
+}
+
+#p-navigation a {
+ display: block;
+}
+
+#p-navigation li.active a, #p-navigation li.active a:hover {
+ text-decoration: none;
+ display: inline;
+ font-weight: bold;
+}
+
+/*
+** Search portlet
+*/
+#p-search {
+ position: relative;
+ z-index: 3;
+}
+
+input.searchButton {
+ margin-top: 1px;
+ padding: 0 0.4em !important;
+ font-size: 95%;
+ cursor: pointer;
+ background-color: White;
+ border: 1px solid #2f6fab;...
[truncated message content] |
|
From: <var...@us...> - 2014-06-23 08:49:00
|
Revision: 8926
http://sourceforge.net/p/phpwiki/code/8926
Author: vargenau
Date: 2014-06-23 08:48:51 +0000 (Mon, 23 Jun 2014)
Log Message:
-----------
Remove AdminChmodPlugin doc since plugin was removed
Modified Paths:
--------------
trunk/locale/po/de.po
trunk/locale/po/ja.po
trunk/locale/po/zh.po
Removed Paths:
-------------
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits
trunk/pgsrc/Help%2FWikiAdminChmodPlugin
trunk/pgsrc/PhpWikiAdministration%2FChmod
Deleted: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2014-06-23 08:48:51 UTC (rev 8926)
@@ -1,9 +0,0 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-Content-Type: application/x-phpwiki;
- pagename=PhpWikiSystemverwalten%2FChmod;
- flags=PAGE_LOCKED;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-<<WikiAdminChmod >>
Deleted: trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits
===================================================================
--- trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits 2014-06-23 08:48:51 UTC (rev 8926)
@@ -1,12 +0,0 @@
-Date: Tue, 25 Jan 2011 21:26:14 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-Content-Type: application/x-phpwiki;
- pagename=AdministrationDePhpWiki%2FDroits;
- flags=PAGE_LOCKED;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-<<WikiAdminChmod>>
-
-----
-[[CatégoriePageDAction]]
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/locale/po/de.po 2014-06-23 08:48:51 UTC (rev 8926)
@@ -6131,9 +6131,6 @@
#~ msgid "Select the pages to change:"
#~ msgstr "Wählen Sie die Seiten zum Ändern:"
-#~ msgid "Chmod to permission:"
-#~ msgstr "Ändere auf Berechtigung:"
-
#, fuzzy
#~ msgid "History of all major edits by %s to page %s."
#~ msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/locale/po/ja.po 2014-06-23 08:48:51 UTC (rev 8926)
@@ -6160,10 +6160,6 @@
#~ msgstr "貴方個人の言語を選択"
#, fuzzy
-#~ msgid "WikiAdminChmod"
-#~ msgstr "管理"
-
-#, fuzzy
#~ msgid "period"
#~ msgstr "バージョン %d"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/locale/po/zh.po 2014-06-23 08:48:51 UTC (rev 8926)
@@ -6284,12 +6284,6 @@
#~ msgid "This plugin is currently under development and does not work!"
#~ msgstr "此 plugin 正在開發還不能運作!"
-#~ msgid "Chmod to permission:"
-#~ msgstr "改變權限為:"
-
-#~ msgid "(ugo : rwx)"
-#~ msgstr "(ugo : rwx)"
-
#, fuzzy
#~ msgid "period"
#~ msgstr "版本 %d"
Deleted: trunk/pgsrc/Help%2FWikiAdminChmodPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminChmodPlugin 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/pgsrc/Help%2FWikiAdminChmodPlugin 2014-06-23 08:48:51 UTC (rev 8926)
@@ -1,50 +0,0 @@
-Date: Fri, 7 Dec 2012 14:58:45 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-Content-Type: application/x-phpwiki;
- pagename=Help%2FWikiAdminChmodPlugin;
- flags=PAGE_LOCKED;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-The **~WikiAdminChmod** [[Help:WikiPlugin|plugin]] allows to change the mode bits of pages.
-
-== Usage ==
-{{{
-<<WikiAdminChmod arguments>>
-}}}
-
-== Arguments ==
-
-{| class="bordered"
-|-
-! Argument
-! Description
-! Default value
-|-
-| **s**
-| Pages to select
-| //None//
-|-
-| **perm**
-| Page permissions
-| //None//
-|}
-
-== Example ==
-
-{{{
-<<WikiAdminChmod s=Temp*>>
-}}}
-
-<<WikiAdminChmod s=Temp*>>
-
-== Author ==
-* [[Help:Reini Urban|Reini Urban]]
-
-== See Also ==
-* [[PhpWikiAdministration]]
-
-<noinclude>
-----
-[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
-</noinclude>
Deleted: trunk/pgsrc/PhpWikiAdministration%2FChmod
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FChmod 2014-06-23 08:22:12 UTC (rev 8925)
+++ trunk/pgsrc/PhpWikiAdministration%2FChmod 2014-06-23 08:48:51 UTC (rev 8926)
@@ -1,12 +0,0 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-Content-Type: application/x-phpwiki;
- pagename=PhpWikiAdministration%2FChmod;
- flags=PAGE_LOCKED;
- charset=UTF-8
-Content-Transfer-Encoding: binary
-
-<<WikiAdminChmod>>
-
-----
-[[CategoryActionPage]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-06-24 15:28:09
|
Revision: 8932
http://sourceforge.net/p/phpwiki/code/8932
Author: vargenau
Date: 2014-06-24 15:27:59 +0000 (Tue, 24 Jun 2014)
Log Message:
-----------
Use natcasesort, factor "fusionforge" theme test
Modified Paths:
--------------
trunk/lib/WikiTheme.php
trunk/lib/plugin/SystemInfo.php
trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2014-06-24 14:35:20 UTC (rev 8931)
+++ trunk/lib/WikiTheme.php 2014-06-24 15:27:59 UTC (rev 8932)
@@ -1922,14 +1922,15 @@
$dir = dir($dir_root);
if ($dir) {
while ($entry = $dir->read()) {
- if (is_dir($dir_root . '/' . $entry)
- and file_exists($dir_root . '/' . $entry . '/themeinfo.php')
- ) {
+ // 'fusionforge' cannot be selected as standalone theme
+ if (($entry != 'fusionforge') and (is_dir($dir_root . '/' . $entry)
+ and file_exists($dir_root . '/' . $entry . '/themeinfo.php'))) {
array_push($available_themes, $entry);
}
}
$dir->close();
}
+ natcasesort(&$available_themes);
return $available_themes;
}
@@ -1947,6 +1948,7 @@
}
$dir->close();
}
+ natcasesort(&$available_languages);
return $available_languages;
}
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2014-06-24 14:35:20 UTC (rev 8931)
+++ trunk/lib/plugin/SystemInfo.php 2014-06-24 15:27:59 UTC (rev 8932)
@@ -457,7 +457,7 @@
. implode(', ', $available_languages) . ". "
. _("Current language") . _(": ") . $GLOBALS['LANG']
. ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
- ? ". " . sprintf(_("Default language: “%s”"), DEFAULT_LANGUAGE)
+ ? ". " . _("Default language") . _(": ") . DEFAULT_LANGUAGE
: '');
}
@@ -470,7 +470,7 @@
. implode(', ', $available_themes) . ". "
. _("Current theme") . _(": ") . $WikiTheme->_name
. ((THEME != $WikiTheme->_name)
- ? ". " . sprintf(_("Default theme: “%s”"), THEME)
+ ? ". " . _("Default theme") . _(": ") . THEME
: '');
}
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2014-06-24 14:35:20 UTC (rev 8931)
+++ trunk/themes/default/templates/userprefs.tmpl 2014-06-24 15:27:59 UTC (rev 8932)
@@ -65,20 +65,16 @@
if ($isForm) {
$SelectOptions = HTML();
if (!empty($available_themes) and is_array($available_themes)) {
- sort(&$available_themes);
if (!$pref->get('theme') or $pref->get('theme') == THEME) {
$SelectOptions->pushContent(selectedOption("",_("<system theme>")));
} else {
$SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
}
foreach ($available_themes as $theme) {
- // 'fusionforge' cannot be selected as standalone theme
- if ($theme != 'fusionforge') {
- if ($theme == $pref->get('theme') and $theme != THEME) {
- $SelectOptions->pushContent(selectedOption($theme));
- } else {
- $SelectOptions->pushContent(unselectedOption($theme));
- }
+ if ($theme == $pref->get('theme') and $theme != THEME) {
+ $SelectOptions->pushContent(selectedOption($theme));
+ } else {
+ $SelectOptions->pushContent(unselectedOption($theme));
}
}
$SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
@@ -88,7 +84,6 @@
$SelectOptions = HTML();
if (!empty($available_languages) and is_array($available_languages)) {
- sort(&$available_languages);
if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE) {
$SelectOptions->pushContent(selectedOption("",_("<system language>")));
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-04 11:58:32
|
Revision: 8955
http://sourceforge.net/p/phpwiki/code/8955
Author: vargenau
Date: 2014-07-04 11:58:20 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
Move SyntaxHighlighter plugin to highlight.js
Modified Paths:
--------------
trunk/highlight.js/README.md
trunk/highlight.js/README.ru.md
trunk/highlight.js/highlight.pack.js
trunk/highlight.js/styles/arta.css
trunk/highlight.js/styles/ascetic.css
trunk/highlight.js/styles/brown_paper.css
trunk/highlight.js/styles/dark.css
trunk/highlight.js/styles/default.css
trunk/highlight.js/styles/far.css
trunk/highlight.js/styles/github.css
trunk/highlight.js/styles/googlecode.css
trunk/highlight.js/styles/idea.css
trunk/highlight.js/styles/ir_black.css
trunk/highlight.js/styles/magula.css
trunk/highlight.js/styles/monokai.css
trunk/highlight.js/styles/pojoaque.css
trunk/highlight.js/styles/rainbow.css
trunk/highlight.js/styles/school_book.css
trunk/highlight.js/styles/solarized_dark.css
trunk/highlight.js/styles/solarized_light.css
trunk/highlight.js/styles/sunburst.css
trunk/highlight.js/styles/tomorrow-night-blue.css
trunk/highlight.js/styles/tomorrow-night-bright.css
trunk/highlight.js/styles/tomorrow-night-eighties.css
trunk/highlight.js/styles/tomorrow-night.css
trunk/highlight.js/styles/tomorrow.css
trunk/highlight.js/styles/vs.css
trunk/highlight.js/styles/xcode.css
trunk/highlight.js/styles/zenburn.css
trunk/lib/plugin/SyntaxHighlighter.php
trunk/themes/fusionforge/templates/bottom.tmpl
Added Paths:
-----------
trunk/highlight.js/CHANGES.md
trunk/highlight.js/styles/atelier-dune.dark.css
trunk/highlight.js/styles/atelier-dune.light.css
trunk/highlight.js/styles/atelier-forest.dark.css
trunk/highlight.js/styles/atelier-forest.light.css
trunk/highlight.js/styles/atelier-heath.dark.css
trunk/highlight.js/styles/atelier-heath.light.css
trunk/highlight.js/styles/atelier-lakeside.dark.css
trunk/highlight.js/styles/atelier-lakeside.light.css
trunk/highlight.js/styles/atelier-seaside.dark.css
trunk/highlight.js/styles/atelier-seaside.light.css
trunk/highlight.js/styles/docco.css
trunk/highlight.js/styles/foundation.css
trunk/highlight.js/styles/mono-blue.css
trunk/highlight.js/styles/monokai_sublime.css
trunk/highlight.js/styles/obsidian.css
trunk/highlight.js/styles/paraiso.dark.css
trunk/highlight.js/styles/paraiso.light.css
trunk/highlight.js/styles/railscasts.css
Removed Paths:
-------------
trunk/highlight.js/classref.txt
Added: trunk/highlight.js/CHANGES.md
===================================================================
--- trunk/highlight.js/CHANGES.md (rev 0)
+++ trunk/highlight.js/CHANGES.md 2014-07-04 11:58:20 UTC (rev 8955)
@@ -0,0 +1,827 @@
+## Version 8.0 beta
+
+This new major release is quite a big overhaul bringing both new features and
+some backwards incompatible changes. However, chances are that the majority of
+users won't be affected by the latter: the basic scenario described in the
+README is left intact.
+
+Here's what did change in an incompatible way:
+
+- We're now prefixing all classes located in [CSS classes reference][cr] with
+ `hljs-`, by default, because some class names would collide with other
+ people's stylesheets. If you were using an older version, you might still want
+ the previous behavior, but still want to upgrade. To suppress this new
+ behavior, you would initialize like so:
+
+ ```html
+ <script type="text/javascript">
+ hljs.configure({classPrefix: ''});
+ hljs.initHighlightingOnLoad();
+ </script>
+ ```
+
+- `tabReplace` and `useBR` that were used in different places are also unified
+ into the global options object and are to be set using `configure(options)`.
+ This function is documented in our [API docs][]. Also note that these
+ parameters are gone from `highlightBlock` and `fixMarkup` which are now also
+ rely on `configure`.
+
+- We removed public-facing (though undocumented) object `hljs.LANGUAGES` which
+ was used to register languages with the library in favor of two new methods:
+ `registerLanguage` and `getLanguage`. Both are documented in our [API docs][].
+
+- Result returned from `highlight` and `highlightAuto` no longer contains two
+ separate attributes contributing to relevance score, `relevance` and
+ `keyword_count`. They are now unified in `relevance`.
+
+Another technically compatible change that nonetheless might need attention:
+
+- The structure of the NPM package was refactored, so if you had installed it
+ locally, you'll have to update your paths. The usual `require('highlight.js')`
+ works as before. This is contributed by [Dmitry Smolin][].
+
+New features:
+
+- Languages now can be recognized by multiple names like "js" for JavaScript or
+ "html" for, well, HTML (which earlier insisted on calling it "xml"). These
+ aliases can be specified in the class attribute of the code container in your
+ HTML as well as in various API calls. For now there are only a few very common
+ aliases but we'll expand it in the future. All of them are listed in the
+ [class reference][].
+
+- Language detection can now be restricted to a subset of languages relevant in
+ a given context — a web page or even a single highlighting call. This is
+ especially useful for node.js build that includes all the known languages.
+ Another example is a StackOverflow-style site where users specify languages
+ as tags rather than in the markdown-formatted code snippets. This is
+ documented in the [API reference][] (see methods `highlightAuto` and
+ `configure`).
+
+- Language definition syntax streamlined with [variants][] and
+ [beginKeywords][].
+
+New languages and styles:
+
+- *Oxygene* by [Carlo Kok][]
+- *Mathematica* by [Daniel Kvasnička][]
+- *Autohotkey* by [Seongwon Lee][]
+- *Atelier* family of styles in 10 variants by [Bram de Haan][]
+- *Paraíso* styles by [Jan T. Sott][]
+
+Miscelleanous improvements:
+
+- Highlighting `=>` prompts in Clojure.
+- [Jeremy Hull][] fixed a lot of styles for consistency.
+- Finally, highlighting PHP and HTML [mixed in peculiar ways][php-html].
+- Objective C and C# now properly highlight titles in method definition.
+- Big overhaul of relevance counting for a number of languages. Please do report
+ bugs about mis-detection of non-trivial code snippets!
+
+[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html
+[api docs]: http://highlightjs.readthedocs.org/en/latest/api.html
+[variants]: https://groups.google.com/d/topic/highlightjs/VoGC9-1p5vk/discussion
+[beginKeywords]: https://github.com/isagalaev/highlight.js/commit/6c7fdea002eb3949577a85b3f7930137c7c3038d
+[php-html]: https://twitter.com/highlightjs/status/408890903017689088
+
+[Carlo Kok]: https://github.com/carlokok
+[Bram de Haan]: https://github.com/atelierbram
+[Daniel Kvasnička]: https://github.com/dkvasnicka
+[Dmitry Smolin]: https://github.com/dimsmol
+[Jeremy Hull]: https://github.com/sourrust
+[Seongwon Lee]: https://github.com/dlimpid
+[Jan T. Sott]: https://github.com/idleberg
+
+
+## Version 7.5
+
+A catch-up release dealing with some of the accumulated contributions. This one
+is probably will be the last before the 8.0 which will be slightly backwards
+incompatible regarding some advanced use-cases.
+
+One outstanding change in this version is the addition of 6 languages to the
+[hosted script][d]: Markdown, ObjectiveC, CoffeeScript, Apache, Nginx and
+Makefile. It now weighs about 6K more but we're going to keep it under 30K.
+
+New languages:
+
+- OCaml by [Mehdi Dogguy][mehdid] and [Nicolas Braud-Santoni][nbraud]
+- [LiveCode Server][lcs] by [Ralf Bitter][revig]
+- Scilab by [Sylvestre Ledru][sylvestre]
+- basic support for Makefile by [Ivan Sagalaev][isagalaev]
+
+Improvements:
+
+- Ruby's got support for characters like `?A`, `?1`, `?\012` etc. and `%r{..}`
+ regexps.
+- Clojure now allows a function call in the beginning of s-expressions
+ `(($filter "myCount") (arr 1 2 3 4 5))`.
+- Haskell's got new keywords and now recognizes more things like pragmas,
+ preprocessors, modules, containers, FFIs etc. Thanks to [Zena Treep][treep]
+ for the implementation and to [Jeremy Hull][sourrust] for guiding it.
+- Miscelleanous fixes in PHP, Brainfuck, SCSS, Asciidoc, CMake, Python and F#.
+
+[mehdid]: https://github.com/mehdid
+[nbraud]: https://github.com/nbraud
+[revig]: https://github.com/revig
+[lcs]: http://livecode.com/developers/guides/server/
+[sylvestre]: https://github.com/sylvestre
+[isagalaev]: https://github.com/isagalaev
+[treep]: https://github.com/treep
+[sourrust]: https://github.com/sourrust
+[d]: http://highlightjs.org/download/
+
+
+## New core developers
+
+The latest long period of almost complete inactivity in the project coincided
+with growing interest to it led to a decision that now seems completely obvious:
+we need more core developers.
+
+So without further ado let me welcome to the core team two long-time
+contributors: [Jeremy Hull][] and [Oleg
+Efimov][].
+
+Hope now we'll be able to work through stuff faster!
+
+P.S. The historical commit is [here][1] for the record.
+
+[Jeremy Hull]: https://github.com/sourrust
+[Oleg Efimov]: https://github.com/sannis
+[1]: https://github.com/isagalaev/highlight.js/commit/f3056941bda56d2b72276b97bc0dd5f230f2473f
+
+
+## Version 7.4
+
+This long overdue version is a snapshot of the current source tree with all the
+changes that happened during the past year. Sorry for taking so long!
+
+Along with the changes in code highlight.js has finally got its new home at
+<http://highlightjs.org/>, moving from its craddle on Software Maniacs which it
+outgrew a long time ago. Be sure to report any bugs about the site to
+<mailto:in...@hi...>.
+
+On to what's new…
+
+New languages:
+
+- Handlebars templates by [Robin Ward][]
+- Oracle Rules Language by [Jason Jacobson][]
+- F# by [Joans Follesø][]
+- AsciiDoc and Haml by [Dan Allen][]
+- Lasso by [Eric Knibbe][]
+- SCSS by [Kurt Emch][]
+- VB.NET by [Poren Chiang][]
+- Mizar by [Kelley van Evert][]
+
+[Robin Ward]: https://github.com/eviltrout
+[Jason Jacobson]: https://github.com/jayce7
+[Joans Follesø]: https://github.com/follesoe
+[Dan Allen]: https://github.com/mojavelinux
+[Eric Knibbe]: https://github.com/EricFromCanada
+[Kurt Emch]: https://github.com/kemch
+[Poren Chiang]: https://github.com/rschiang
+[Kelley van Evert]: https://github.com/kelleyvanevert
+
+New style themes:
+
+- Monokai Sublime by [noformnocontent][]
+- Railscasts by [Damien White][]
+- Obsidian by [Alexander Marenin][]
+- Docco by [Simon Madine][]
+- Mono Blue by [Ivan Sagalaev][] (uses a single color hue for everything)
+- Foundation by [Dan Allen][]
+
+[noformnocontent]: http://nn.mit-license.org/
+[Damien White]: https://github.com/visoft
+[Alexander Marenin]: https://github.com/ioncreature
+[Simon Madine]: https://github.com/thingsinjars
+[Ivan Sagalaev]: https://github.com/isagalaev
+
+Other notable changes:
+
+- Corrected many corner cases in CSS.
+- Dropped Python 2 version of the build tool.
+- Implemented building for the AMD format.
+- Updated Rust keywords (thanks to [Dmitry Medvinsky][]).
+- Literal regexes can now be used in language definitions.
+- CoffeeScript highlighting is now significantly more robust and rich due to
+ input from [Cédric Néhémie][].
+
+[Dmitry Medvinsky]: https://github.com/dmedvinsky
+[Cédric Néhémie]: https://github.com/abe33
+
+
+## Version 7.3
+
+- Since this version highlight.js no longer works in IE version 8 and older.
+ It's made it possible to reduce the library size and dramatically improve code
+ readability and made it easier to maintain. Time to go forward!
+
+- New languages: AppleScript (by [Nathan Grigg][ng] and [Dr. Drang][dd]) and
+ Brainfuck (by [Evgeny Stepanischev][bolk]).
+
+- Improvements to existing languages:
+
+ - interpreter prompt in Python (`>>>` and `...`)
+ - @-properties and classes in CoffeeScript
+ - E4X in JavaScript (by [Oleg Efimov][oe])
+ - new keywords in Perl (by [Kirk Kimmel][kk])
+ - big Ruby syntax update (by [Vasily Polovnyov][vast])
+ - small fixes in Bash
+
+- Also Oleg Efimov did a great job of moving all the docs for language and style
+ developers and contributors from the old wiki under the source code in the
+ "docs" directory. Now these docs are nicely presented at
+ <http://highlightjs.readthedocs.org/>.
+
+[ng]: https://github.com/nathan11g
+[dd]: https://github.com/drdrang
+[bolk]: https://github.com/bolknote
+[oe]: https://github.com/Sannis
+[kk]: https://github.com/kimmel
+[vast]: https://github.com/vast
+
+
+## Version 7.2
+
+A regular bug-fix release without any significant new features. Enjoy!
+
+
+## Version 7.1
+
+A Summer crop:
+
+- [Marc Fornos][mf] made the definition for Clojure along with the matching
+ style Rainbow (which, of course, works for other languages too).
+- CoffeeScript support continues to improve getting support for regular
+ expressions.
+- Yoshihide Jimbo ported to highlight.js [five Tomorrow styles][tm] from the
+ [project by Chris Kempson][tm0].
+- Thanks to [Casey Duncun][cd] the library can now be built in the popular
+ [AMD format][amd].
+- And last but not least, we've got a fair number of correctness and consistency
+ fixes, including a pretty significant refactoring of Ruby.
+
+[mf]: https://github.com/mfornos
+[tm]: http://jmblog.github.com/color-themes-for-highlightjs/
+[tm0]: https://github.com/ChrisKempson/Tomorrow-Theme
+[cd]: https://github.com/caseman
+[amd]: http://requirejs.org/docs/whyamd.html
+
+
+## Version 7.0
+
+The reason for the new major version update is a global change of keyword syntax
+which resulted in the library getting smaller once again. For example, the
+hosted build is 2K less than at the previous version while supporting two new
+languages.
+
+Notable changes:
+
+- The library now works not only in a browser but also with [node.js][]. It is
+ installable with `npm install highlight.js`. [API][] docs are available on our
+ wiki.
+
+- The new unique feature (apparently) among syntax highlighters is highlighting
+ *HTTP* headers and an arbitrary language in the request body. The most useful
+ languages here are *XML* and *JSON* both of which highlight.js does support.
+ Here's [the detailed post][p] about the feature.
+
+- Two new style themes: a dark "south" *[Pojoaque][]* by Jason Tate and an
+ emulation of*XCode* IDE by [Angel Olloqui][ao].
+
+- Three new languages: *D* by [Aleksandar Ružičić][ar], *R* by [Joe Cheng][jc]
+ and *GLSL* by [Sergey Tikhomirov][st].
+
+- *Nginx* syntax has become a million times smaller and more universal thanks to
+ remaking it in a more generic manner that doesn't require listing all the
+ directives in the known universe.
+
+- Function titles are now highlighted in *PHP*.
+
+- *Haskell* and *VHDL* were significantly reworked to be more rich and correct
+ by their respective maintainers [Jeremy Hull][sr] and [Igor Kalnitsky][ik].
+
+And last but not least, many bugs have been fixed around correctness and
+language detection.
+
+Overall highlight.js currently supports 51 languages and 20 style themes.
+
+[node.js]: http://nodejs.org/
+[api]: http://softwaremaniacs.org/wiki/doku.php/highlight.js:api
+[p]: http://softwaremaniacs.org/blog/2012/05/10/http-and-json-in-highlight-js/en/
+[pojoaque]: http://web-cms-designs.com/ftopict-10-pojoaque-style-for-highlight-js-code-highlighter.html
+[ao]: https://github.com/angelolloqui
+[ar]: https://github.com/raleksandar
+[jc]: https://github.com/jcheng5
+[st]: https://github.com/tikhomirov
+[sr]: https://github.com/sourrust
+[ik]: https://github.com/ikalnitsky
+
+
+## Version 6.2
+
+A lot of things happened in highlight.js since the last version! We've got nine
+new contributors, the discussion group came alive, and the main branch on GitHub
+now counts more than 350 followers. Here are most significant results coming
+from all this activity:
+
+- 5 (five!) new languages: Rust, ActionScript, CoffeeScript, MatLab and
+ experimental support for markdown. Thanks go to [Andrey Vlasovskikh][av],
+ [Alexander Myadzel][am], [Dmytrii Nagirniak][dn], [Oleg Efimov][oe], [Denis
+ Bardadym][db] and [John Crepezzi][jc].
+
+- 2 new style themes: Monokai by [Luigi Maselli][lm] and stylistic imitation of
+ another well-known highlighter Google Code Prettify by [Aahan Krish][ak].
+
+- A vast number of [correctness fixes and code refactorings][log], mostly made
+ by [Oleg Efimov][oe] and [Evgeny Stepanischev][es].
+
+[av]: https://github.com/vlasovskikh
+[am]: https://github.com/myadzel
+[dn]: https://github.com/dnagir
+[oe]: https://github.com/Sannis
+[db]: https://github.com/btd
+[jc]: https://github.com/seejohnrun
+[lm]: http://grigio.org/
+[ak]: https://github.com/geekpanth3r
+[es]: https://github.com/bolknote
+[log]: https://github.com/isagalaev/highlight.js/commits/
+
+
+## Version 6.1 — Solarized
+
+[Jeremy Hull][jh] has implemented my dream feature — a port of [Solarized][]
+style theme famous for being based on the intricate color theory to achieve
+correct contrast and color perception. It is now available for highlight.js in
+both variants — light and dark.
+
+This version also adds a new original style Arta. Its author pumbur maintains a
+[heavily modified fork of highlight.js][pb] on GitHub.
+
+[jh]: https://github.com/sourrust
+[solarized]: http://ethanschoonover.com/solarized
+[pb]: https://github.com/pumbur/highlight.js
+
+
+## Version 6.0
+
+New major version of the highlighter has been built on a significantly
+refactored syntax. Due to this it's even smaller than the previous one while
+supporting more languages!
+
+New languages are:
+
+- Haskell by [Jeremy Hull][sourrust]
+- Erlang in two varieties — module and REPL — made collectively by [Nikolay
+ Zakharov][desh], [Dmitry Kovega][arhibot] and [Sergey Ignatov][ignatov]
+- Objective C by [Valerii Hiora][vhbit]
+- Vala by [Antono Vasiljev][antono]
+- Go by [Stephan Kountso][steplg]
+
+[sourrust]: https://github.com/sourrust
+[desh]: http://desh.su/
+[arhibot]: https://github.com/arhibot
+[ignatov]: https://github.com/ignatov
+[vhbit]: https://github.com/vhbit
+[antono]: https://github.com/antono
+[steplg]: https://github.com/steplg
+
+Also this version is marginally faster and fixes a number of small long-standing
+bugs.
+
+Developer overview of the new language syntax is available in a [blog post about
+recent beta release][beta].
+
+[beta]: http://softwaremaniacs.org/blog/2011/04/25/highlight-js-60-beta/en/
+
+P.S. New version is not yet available on a Yandex' CDN, so for now you have to
+download [your own copy][d].
+
+[d]: /soft/highlight/en/download/
+
+
+## Version 5.14
+
+Fixed bugs in HTML/XML detection and relevance introduced in previous
+refactoring.
+
+Also test.html now shows the second best result of language detection by
+relevance.
+
+
+## Version 5.13
+
+Past weekend began with a couple of simple additions for existing languages but
+ended up in a big code refactoring bringing along nice improvements for language
+developers.
+
+### For users
+
+- Description of C++ has got new keywords from the upcoming [C++ 0x][] standard.
+- Description of HTML has got new tags from [HTML 5][].
+- CSS-styles have been unified to use consistent padding and also have lost
+ pop-outs with names of detected languages.
+- [Igor Kalnitsky][ik] has sent two new language descriptions: CMake и VHDL.
+
+This makes total number of languages supported by highlight.js to reach 35.
+
+Bug fixes:
+
+- Custom classes on `<pre>` tags are not being overridden anymore
+- More correct highlighting of code blocks inside non-`<pre>` containers:
+ highlighter now doesn't insist on replacing them with its own container and
+ just replaces the contents.
+- Small fixes in browser compatibility and heuristics.
+
+[c++ 0x]: http://ru.wikipedia.org/wiki/C%2B%2B0x
+[html 5]: http://en.wikipedia.org/wiki/HTML5
+[ik]: http://kalnitsky.org.ua/
+
+### For developers
+
+The most significant change is the ability to include language submodes right
+under `contains` instead of defining explicit named submodes in the main array:
+
+ contains: [
+ 'string',
+ 'number',
+ {begin: '\\n', end: hljs.IMMEDIATE_RE}
+ ]
+
+This is useful for auxiliary modes needed only in one place to define parsing.
+Note that such modes often don't have `className` and hence won't generate a
+separate `<span>` in the resulting markup. This is similar in effect to
+`noMarkup: true`. All existing languages have been refactored accordingly.
+
+Test file test.html has at last become a real test. Now it not only puts the
+detected language name under the code snippet but also tests if it matches the
+expected one. Test summary is displayed right above all language snippets.
+
+
+## CDN
+
+Fine people at [Yandex][] agreed to host highlight.js on their big fast servers.
+[Link up][l]!
+
+[yandex]: http://yandex.com/
+[l]: http://softwaremaniacs.org/soft/highlight/en/download/
+
+
+## Version 5.10 — "Paris".
+
+Though I'm on a vacation in Paris, I decided to release a new version with a
+couple of small fixes:
+
+- Tomas Vitvar discovered that TAB replacement doesn't always work when used
+ with custom markup in code
+- SQL parsing is even more rigid now and doesn't step over SmallTalk in tests
+
+
+## Version 5.9
+
+A long-awaited version is finally released.
+
+New languages:
+
+- Andrew Fedorov made a definition for Lua
+- a long-time highlight.js contributor [Peter Leonov][pl] made a definition for
+ Nginx config
+- [Vladimir Moskva][vm] made a definition for TeX
+
+[pl]: http://kung-fu-tzu.ru/
+[vm]: http://fulc.ru/
+
+Fixes for existing languages:
+
+- [Loren Segal][ls] reworked the Ruby definition and added highlighting for
+ [YARD][] inline documentation
+- the definition of SQL has become more solid and now it shouldn't be overly
+ greedy when it comes to language detection
+
+[ls]: http://gnuu.org/
+[yard]: http://yardoc.org/
+
+The highlighter has become more usable as a library allowing to do highlighting
+from initialization code of JS frameworks and in ajax methods (see.
+readme.eng.txt).
+
+Also this version drops support for the [WordPress][wp] plugin. Everyone is
+welcome to [pick up its maintenance][p] if needed.
+
+[wp]: http://wordpress.org/
+[p]: http://bazaar.launchpad.net/~isagalaev/+junk/highlight/annotate/342/src/wp_highlight.js.php
+
+
+## Version 5.8
+
+- Jan Berkel has contributed a definition for Scala. +1 to hotness!
+- All CSS-styles are rewritten to work only inside `<pre>` tags to avoid
+ conflicts with host site styles.
+
+
+## Version 5.7.
+
+Fixed escaping of quotes in VBScript strings.
+
+
+## Version 5.5
+
+This version brings a small change: now .ini-files allow digits, underscores and
+square brackets in key names.
+
+
+## Version 5.4
+
+Fixed small but upsetting bug in the packer which caused incorrect highlighting
+of explicitly specified languages. Thanks to Andrew Fedorov for precise
+diagnostics!
+
+
+## Version 5.3
+
+The version to fulfil old promises.
+
+The most significant change is that highlight.js now preserves custom user
+markup in code along with its own highlighting markup. This means that now it's
+possible to use, say, links in code. Thanks to [Vladimir Dolzhenko][vd] for the
+[initial proposal][1] and for making a proof-of-concept patch.
+
+Also in this version:
+
+- [Vasily Polovnyov][vp] has sent a GitHub-like style and has implemented
+ support for CSS @-rules and Ruby symbols.
+- Yura Zaripov has sent two styles: Brown Paper and School Book.
+- Oleg Volchkov has sent a definition for [Parser 3][p3].
+
+[1]: http://softwaremaniacs.org/forum/highlightjs/6612/
+[p3]: http://www.parser.ru/
+[vp]: http://vasily.polovnyov.ru/
+[vd]: http://dolzhenko.blogspot.com/
+
+
+## Version 5.2
+
+- at last it's possible to replace indentation TABs with something sensible (e.g. 2 or 4 spaces)
+- new keywords and built-ins for 1C by Sergey Baranov
+- a couple of small fixes to Apache highlighting
+
+
+## Version 5.1
+
+This is one of those nice version consisting entirely of new and shiny
+contributions!
+
+- [Vladimir Ermakov][vooon] created highlighting for AVR Assembler
+- [Ruslan Keba][rukeba] created highlighting for Apache config file. Also his
+ original visual style for it is now available for all highlight.js languages
+ under the name "Magula".
+- [Shuen-Huei Guan][drake] (aka Drake) sent new keywords for RenderMan
+ languages. Also thanks go to [Konstantin Evdokimenko][ke] for his advice on
+ the matter.
+
+[vooon]: http://vehq.ru/about/
+[rukeba]: http://rukeba.com/
+[drake]: http://drakeguan.org/
+[ke]: http://k-evdokimenko.moikrug.ru/
+
+
+## Version 5.0
+
+The main change in the new major version of highlight.js is a mechanism for
+packing several languages along with the library itself into a single compressed
+file. Now sites using several languages will load considerably faster because
+the library won't dynamically include additional files while loading.
+
+Also this version fixes a long-standing bug with Javascript highlighting that
+couldn't distinguish between regular expressions and division operations.
+
+And as usually there were a couple of minor correctness fixes.
+
+Great thanks to all contributors! Keep using highlight.js.
+
+
+## Version 4.3
+
+This version comes with two contributions from [Jason Diamond][jd]:
+
+- language definition for C# (yes! it was a long-missed thing!)
+- Visual Studio-like highlighting style
+
+Plus there are a couple of minor bug fixes for parsing HTML and XML attributes.
+
+[jd]: http://jason.diamond.name/weblog/
+
+
+## Version 4.2
+
+The biggest news is highlighting for Lisp, courtesy of Vasily Polovnyov. It's
+somewhat experimental meaning that for highlighting "keywords" it doesn't use
+any pre-defined set of a Lisp dialect. Instead it tries to highlight first word
+in parentheses wherever it makes sense. I'd like to ask people programming in
+Lisp to confirm if it's a good idea and send feedback to [the forum][f].
+
+Other changes:
+
+- Smalltalk was excluded from DEFAULT_LANGUAGES to save traffic
+- [Vladimir Epifanov][voldmar] has implemented javascript style switcher for
+ test.html
+- comments now allowed inside Ruby function definition
+- [MEL][] language from [Shuen-Huei Guan][drake]
+- whitespace now allowed between `<pre>` and `<code>`
+- better auto-detection of C++ and PHP
+- HTML allows embedded VBScript (`<% .. %>`)
+
+[f]: http://softwaremaniacs.org/forum/highlightjs/
+[voldmar]: http://voldmar.ya.ru/
+[mel]: http://en.wikipedia.org/wiki/Maya_Embedded_Language
+[drake]: http://drakeguan.org/
+
+
+## Version 4.1
+
+Languages:
+
+- Bash from Vah
+- DOS bat-files from Alexander Makarov (Sam)
+- Diff files from Vasily Polovnyov
+- Ini files from myself though initial idea was from Sam
+
+Styles:
+
+- Zenburn from Vladimir Epifanov, this is an imitation of a
+ [well-known theme for Vim][zenburn].
+- Ascetic from myself, as a realization of ideals of non-flashy highlighting:
+ just one color in only three gradations :-)
+
+In other news. [One small bug][bug] was fixed, built-in keywords were added for
+Python and C++ which improved auto-detection for the latter (it was shame that
+[my wife's blog][alenacpp] had issues with it from time to time). And lastly
+thanks go to Sam for getting rid of my stylistic comments in code that were
+getting in the way of [JSMin][].
+
+[zenburn]: http://en.wikipedia.org/wiki/Zenburn
+[alenacpp]: http://alenacpp.blogspot.com/
+[bug]: http://softwaremaniacs.org/forum/viewtopic.php?id=1823
+[jsmin]: http://code.google.com/p/jsmin-php/
+
+
+## Version 4.0
+
+New major version is a result of vast refactoring and of many contributions.
+
+Visible new features:
+
+- Highlighting of embedded languages. Currently is implemented highlighting of
+ Javascript and CSS inside HTML.
+- Bundled 5 ready-made style themes!
+
+Invisible new features:
+
+- Highlight.js no longer pollutes global namespace. Only one object and one
+ function for backward compatibility.
+- Performance is further increased by about 15%.
+
+Changing of a major version number caused by a new format of language definition
+files. If you use some third-party language files they should be updated.
+
+
+## Version 3.5
+
+A very nice version in my opinion fixing a number of small bugs and slightly
+increased speed in a couple of corner cases. Thanks to everybody who reports
+bugs in he [forum][f] and by email!
+
+There is also a new language — XML. A custom XML formerly was detected as HTML
+and didn't highlight custom tags. In this version I tried to make custom XML to
+be detected and highlighted by its own rules. Which by the way include such
+things as CDATA sections and processing instructions (`<? ... ?>`).
+
+[f]: http://softwaremaniacs.org/forum/viewforum.php?id=6
+
+
+## Version 3.3
+
+[Vladimir Gubarkov][xonix] has provided an interesting and useful addition.
+File export.html contains a little program that shows and allows to copy and
+paste an HTML code generated by the highlighter for any code snippet. This can
+be useful in situations when one can't use the script itself on a site.
+
+
+[xonix]: http://xonixx.blogspot.com/
+
+
+## Version 3.2 consists completely of contributions:
+
+- Vladimir Gubarkov has described SmallTalk
+- Yuri Ivanov has described 1C
+- Peter Leonov has packaged the highlighter as a Firefox extension
+- Vladimir Ermakov has compiled a mod for phpBB
+
+Many thanks to you all!
+
+
+## Version 3.1
+
+Three new languages are available: Django templates, SQL and Axapta. The latter
+two are sent by [Dmitri Roudakov][1]. However I've almost entirely rewrote an
+SQL definition but I'd never started it be it from the ground up :-)
+
+The engine itself has got a long awaited feature of grouping keywords
+("keyword", "built-in function", "literal"). No more hacks!
+
+[1]: http://roudakov.ru/
+
+
+## Version 3.0
+
+It is major mainly because now highlight.js has grown large and has become
+modular. Now when you pass it a list of languages to highlight it will
+dynamically load into a browser only those languages.
+
+Also:
+
+- Konstantin Evdokimenko of [RibKit][] project has created a highlighting for
+ RenderMan Shading Language and RenderMan Interface Bytestream. Yay for more
+ languages!
+- Heuristics for C++ and HTML got better.
+- I've implemented (at last) a correct handling of backslash escapes in C-like
+ languages.
+
+There is also a small backwards incompatible change in the new version. The
+function initHighlighting that was used to initialize highlighting instead of
+initHighlightingOnLoad a long time ago no longer works. If you by chance still
+use it — replace it with the new one.
+
+[RibKit]: http://ribkit.sourceforge.net/
+
+
+## Version 2.9
+
+Highlight.js is a parser, not just a couple of regular expressions. That said
+I'm glad to announce that in the new version 2.9 has support for:
+
+- in-string substitutions for Ruby -- `#{...}`
+- strings from from numeric symbol codes (like #XX) for Delphi
+
+
+## Version 2.8
+
+A maintenance release with more tuned heuristics. Fully backwards compatible.
+
+
+## Version 2.7
+
+- Nikita Ledyaev presents highlighting for VBScript, yay!
+- A couple of bugs with escaping in strings were fixed thanks to Mickle
+- Ongoing tuning of heuristics
+
+Fixed bugs were rather unpleasant so I encourage everyone to upgrade!
+
+
+## Version 2.4
+
+- Peter Leonov provides another improved highlighting for Perl
+- Javascript gets a new kind of keywords — "literals". These are the words
+ "true", "false" and "null"
+
+Also highlight.js homepage now lists sites that use the library. Feel free to
+add your site by [dropping me a message][mail] until I find the time to build a
+submit form.
+
+[mail]: mailto:Ma...@So...
+
+
+## Version 2.3
+
+This version fixes IE breakage in previous version. My apologies to all who have
+already downloaded that one!
+
+
+## Version 2.2
+
+- added highlighting for Javascript
+- at last fixed parsing of Delphi's escaped apostrophes in strings
+- in Ruby fixed highlighting of keywords 'def' and 'class', same for 'sub' in
+ Perl
+
+
+## Version 2.0
+
+- Ruby support by [Anton Kovalyov][ak]
+- speed increased by orders of magnitude due to new way of parsing
+- this same way allows now correct highlighting of keywords in some tricky
+ places (like keyword "End" at the end of Delphi classes)
+
+[ak]: http://anton.kovalyov.net/
+
+
+## Version 1.0
+
+Version 1.0 of javascript syntax highlighter is released!
+
+It's the first version available with English description. Feel free to post
+your comments and question to [highlight.js forum][forum]. And don't be afraid
+if you find there some fancy Cyrillic letters -- it's for Russian users too :-)
+
+[forum]: http://softwaremaniacs.org/forum/viewforum.php?id=6
Modified: trunk/highlight.js/README.md
===================================================================
--- trunk/highlight.js/README.md 2014-07-04 11:55:05 UTC (rev 8954)
+++ trunk/highlight.js/README.md 2014-07-04 11:58:20 UTC (rev 8955)
@@ -24,13 +24,13 @@
- You can download your own customized version of "highlight.pack.js" or
use the hosted one as described on the download page:
- <http://softwaremaniacs.org/soft/highlight/en/download/>
+ <http://highlightjs.org/download/>
- Style themes are available in the download package or as hosted files.
To create a custom style for your site see the class reference in the file
- [classref.txt][cr] from the downloaded package.
+ [CSS classes reference][cr] from the downloaded package.
-[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt
+[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html
## node.js
@@ -42,7 +42,7 @@
Alternatively, you can build it from the source with only languages you need:
- python tools/build.py -tnode lang1 lang2 ..
+ python3 tools/build.py -tnode lang1 lang2 ..
Using the library:
@@ -56,6 +56,31 @@
hljs.highlightAuto(code).value;
```
+
+## AMD
+
+Highlight.js can be used with an AMD loader. You will need to build it from
+source in order to do so:
+
+```bash
+$ python3 tools/build.py -tamd lang1 lang2 ..
+```
+
+Which will generate a `build/highlight.pack.js` which will load as an AMD
+module with support for the built languages and can be used like so:
+
+```javascript
+require(["highlight.js/build/highlight.pack"], function(hljs){
+
+ // If you know the language
+ hljs.highlight(lang, code).value;
+
+ // Automatic language detection
+ hljs.highlightAuto(code).value;
+});
+```
+
+
## Tab replacement
You can replace TAB ('\x09') characters used for indentation in your code
@@ -64,9 +89,9 @@
```html
<script type="text/javascript">
- hljs.tabReplace = ' '; // 4 spaces
+ hljs.configure({tabReplace: ' '}); // 4 spaces
// ... or
- hljs.tabReplace = '<span class="indent">\t</span>';
+ hljs.configure({tabReplace: '<span class="indent">\t</span>'});
hljs.initHighlightingOnLoad();
</script>
@@ -75,9 +100,9 @@
## Custom initialization
If you use different markup for code blocks you can initialize them manually
-with `highlightBlock(code, tabReplace, useBR)` function. It takes a DOM element
-containing the code to highlight and optionally a string with which to replace
-TAB characters.
+with `highlightBlock(code)` function. It takes a DOM element containing the
+code to highlight and optionally a string with which to replace TAB
+characters.
Initialization using, for example, jQuery might look like this:
@@ -92,11 +117,11 @@
blocks.
If your code container relies on `<br>` tags instead of line breaks (i.e. if
-it's not `<pre>`) pass `true` into the third parameter of `highlightBlock`
-to make highlight.js use `<br>` in the output:
+it's not `<pre>`) set the `useBR` option to `true`:
```javascript
-$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)});
+hljs.configure({useBR: true});
+$('div.code').each(function(i, e) {hljs.highlightBlock(e)});
```
@@ -135,9 +160,8 @@
## Meta
-- Version: 7.3
-- URL: http://softwaremaniacs.org/soft/highlight/en/
-- Author: Ivan Sagalaev (<ma...@so...>)
+- Version: 8.0
+- URL: http://highlightjs.org/
For the license terms see LICENSE files.
-For the list of contributors see AUTHORS.en.txt file.
+For authors and contributors see AUTHORS.en.txt file.
Modified: trunk/highlight.js/README.ru.md
===================================================================
--- trunk/highlight.js/README.ru.md 2014-07-04 11:55:05 UTC (rev 8954)
+++ trunk/highlight.js/README.ru.md 2014-07-04 11:58:20 UTC (rev 8955)
@@ -26,14 +26,13 @@
- Вы можете скачать собственную версию "highlight.pack.js" или сослаться
на захостенный файл, как описано на странице загрузки:
- <http://softwaremaniacs.org/soft/highlight/download/>
+ <http://highlightjs.org/download/>
- Стилевые темы можно найти в загруженном архиве или также использовать
захостенные. Чтобы сделать собственный стиль для своего сайта, вам
- будет полезен справочник классов в файле [classref.txt][cr], который тоже
- есть в архиве.
+ будет полезен [CSS classes reference][cr], который тоже есть в архиве.
-[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt
+[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html
## node.js
@@ -45,7 +44,7 @@
Также её можно собрать из исходников с только теми языками, которые нужны:
- python tools/build.py -tnode lang1 lang2 ..
+ python3 tools/build.py -tnode lang1 lang2 ..
Использование библиотеки:
@@ -60,6 +59,30 @@
```
+## AMD
+
+Highlight.js можно использовать с загрузчиком AMD-модулей. Для этого его
+нужно собрать из исходников следующей командой:
+
+```bash
+$ python3 tools/build.py -tamd lang1 lang2 ..
+```
+
+Она создаст файл `build/highlight.pack.js`, который является загружаемым
+AMD-модулем и содержит все выбранные при сборке языки. Используется он так:
+
+```javascript
+require(["highlight.js/build/highlight.pack"], function(hljs){
+
+ // Если вы знаете язык
+ hljs.highlight(lang, code).value;
+
+ // Автоопределение языка
+ hljs.highlightAuto(code).value;
+});
+```
+
+
## Замена TABов
Также вы можете заменить символы TAB ('\x09'), используемые для отступов, на
@@ -68,9 +91,9 @@
```html
<script type="text/javascript">
- hljs.tabReplace = ' '; // 4 spaces
+ hljs.configure({tabReplace: ' '}); // 4 spaces
// ... or
- hljs.tabReplace = '<span class="indent">\t</span>';
+ hljs.configure({tabReplace: '<span class="indent">\t</span>'});
hljs.initHighlightingOnLoad();
</script>
@@ -80,9 +103,8 @@
## Инициализация вручную
Если вы используете другие теги для блоков кода, вы можете инициализировать их
-явно с помощью функции `highlightBlock(code, tabReplace, useBR)`. Она принимает
-DOM-элемент с текстом расцвечиваемого кода и опционально - строчку для замены
-символов TAB.
+явно с помощью функции `highlightBlock(code)`. Она принимает DOM-элемент с
+текстом расцвечиваемого кода и опционально - строчку для замены символов TAB.
Например с использованием jQuery код инициализации может выглядеть так:
@@ -97,10 +119,11 @@
повторно для уже раскрашенных блоков.
Если ваш блок кода использует `<br>` вместо переводов строки (т.е. если это не
-`<pre>`), передайте `true` третьим параметром в `highlightBlock`:
+`<pre>`), включите опцию `useBR`:
```javascript
-$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)});
+hljs.configure({useBR: true});
+$('div.code').each(function(i, e) {hljs.highlightBlock(e)});
```
@@ -141,9 +164,8 @@
## Координаты
-- Версия: 7.3
-- URL: http://softwaremaniacs.org/soft/highlight/
-- Автор: Иван Сагалаев (<ma...@so...>)
+- Версия: 8.0
+- URL: http://highlightjs.org/
Лицензионное соглашение читайте в файле LICENSE.
-Список соавторов читайте в файле AUTHORS.ru.txt
+Список авторов и соавторов читайте в файле AUTHORS.ru.txt
Deleted: trunk/highlight.js/classref.txt
===================================================================
--- trunk/highlight.js/classref.txt 2014-07-04 11:55:05 UTC (rev 8954)
+++ trunk/highlight.js/classref.txt 2014-07-04 11:58:20 UTC (rev 8955)
@@ -1,568 +0,0 @@
-This is a full list of available classes corresponding to languages'
-syntactic structures. The parentheses after language name contain identifiers
-used as class names in `<code>` element.
-
-Python ("python"):
-
- keyword keyword
- built_in built-in objects (None, False, True and Ellipsis)
- number number
- string string (of any type)
- comment comment
- decorator @-decorator for functions
- function function header "def some_name(...):"
- class class header "class SomeName(...):"
- title name of a function or a class inside a header
- params everything inside parentheses in a function's or class' header
-
-Python profiler results ("profile"):
-
- number number
- string string
- builtin builtin function entry
- filename filename in an entry
- summary profiling summary
- header header of table of results
- keyword column header
- function function name in an entry (including parentheses)
- title actual name of a function in an entry (excluding parentheses)
- prompt interpreter prompt (>>> or ...)
-
-Ruby ("ruby"):
-
- keyword keyword
- string string
- subst in-string substitution (#{...})
- comment comment
- yardoctag YARD tag
- function function header "def some_name(...):"
- class class header "class SomeName(...):"
- title name of a function or a class inside a header
- parent name of a parent class
- symbol symbol
-
-Perl ("perl"):
-
- keyword keyword
- comment comment
- number number
- string string
- regexp regular expression
- sub subroutine header (from "sub" till "{")
- variable variable starting with "$", "%", "@"
- operator operator
- pod plain old doc
-
-PHP ("php"):
-
- keyword keyword
- number number
- string string (of any type)
- comment comment
- phpdoc phpdoc params in comments
- variable variable starting with "$"
- preprocessor preprocessor marks: "<?php" and "?>"
-
-Scala ("scala"):
-
- keyword keyword
- number number
- string string
- comment comment
- annotation annotation
- javadoc javadoc comment
- javadoctag @-tag in javadoc
- class class header
- title class name inside a header
- params everything in parentheses inside a class header
- inheritance keywords "extends" and "with" inside class header
-
-Go language ("go"):
- comment comment
- string string constant
- number number
- keyword language keywords
- constant true false nil iota
- typename built-in plain types (int, string etc.)
- built_in built-in functions
-
-HTML, XML ("xml"):
-
- tag any tag from "<" till ">"
- attribute tag's attribute with or without value
- value attribute's value
- comment comment
- pi processing instruction (<? ... ?>)
- doctype <!DOCTYPE ... > declaration
- cdata CDATA section
-
-CSS ("css"):
-
- tag tag in selectors
- id #some_name in selectors
- class .some_name in selectors
- at_rule @-rule till first "{" or ";"
- attr_selector attribute selector (square brackets in a[href^=http://])
- pseudo pseudo classes and elemens (:after, ::after etc.)
- comment comment
- rules everything from "{" till "}"
- attribute property name inside a rule
- value property value inside a rule, from ":" till ";" or
- till the end of rule block
- number number within a value
- string string within a value
- hexcolor hex color (#FFFFFF) within a value
- function CSS function within a value
- important "!important" symbol
-
-Markdown ("markdown"):
-
- header header
- bullet list bullet
- emphasis emphasis
- strong strong emphasis
- blockquote blockquote
- code code
- horizontal_rule horizontal rule
- link_label link label
- link_url link url
-
-Django ("django"):
-
- keyword HTML tag in HTML, default tags and default filters in templates
- tag any tag from "<" till ">"
- comment comment
- doctype <!DOCTYPE ... > declaration
- attribute tag's attribute with or withou value
- value attribute's value
- template_tag template tag {% .. %}
- variable template variable {{ .. }}
- template_comment template comment, both {# .. #} and {% comment %}
- filter filter from "|" till the next filter or the end of tag
- argument filter argument
-
-JSON ("json"):
-
- number number
- literal "true", "false" and "null"
- string string value
- attribute name of an object property
- value value of an object property
-
-JavaScript ("javascript"):
-
- keyword keyword
- comment comment
- number number
- literal special literal: "true", "false" and "null"
- string string
- regexp regular expression
- function header of a function
- title name of a function inside a header
- params parentheses and everything inside them in a function's header
-
-CoffeeScript ("coffeescript"):
-
- keyword keyword
- comment comment
- number number
- literal special literal: "true", "false" and "null"
- string string
- regexp regular expression
- function header of a function
- class header of a class
- title name of a function variable inside a header
- params parentheses and everything inside them in a function's header
- property @-property within class and functions
-
-ActionScript ("actionscript"):
-
- comment comment
- string string
- number number
- keyword keywords
- literal literal
- reserved reserved keyword
- title name of declaration (package, class or function)
- preprocessor preprocessor directive (import, include)
- type type of returned value (for functions)
- package package (named or not)
- class class/interface
- function function
- param params of function
- rest_arg rest argument of function
-
-VBScript ("vbscript"):
-
- keyword keyword
- number number
- string string
- comment comment
- built_in built-in function
-
-HTTP ("http"):
-
- request first line of a request
- status first line of a response
- attribute header name
- string header value or query string in a request line
- number status code
-
-Lua ("lua"):
-
- keyword keyword
- number number
- string string
- comment comment
- built_in built-in operator
- function header of a function
- title name of a function inside a header
- params everything inside parentheses in a function's header
- long_brackets multiline string in [=[ .. ]=]
-
-Delphi ("delphi"):
-
- keyword keyword
- comment comment (of any type)
- number number
- string string
- function header of a function, procedure, constructor and destructor
- title name of a function, procedure, constructor or destructor
- inside a header
- params everything inside parentheses in a function's header
- class class' body from "= class" till "end;"
-
-Java ("java"):
-
- keyword keyword
- number number
- string string
- comment commment
- annotaion annotation
- javadoc javadoc comment
- class class header from "class" till "{"
- title class name inside a header
- params everything in parentheses inside a class header
- inheritance keywords "extends" and "implements" inside class header
-
-C++ ("cpp"):
-
- keyword keyword
- number number
- string string and character
- comment comment
- preprocessor preprocessor directive
- stl_container instantiation of STL containers ("vector<...>")
-
-Objective C ("objectivec"):
- keyword keyword
- built_in Cocoa/Cocoa Touch constants and classes
- number number
- string string
- comment comment
- preprocessor preprocessor directive
- class interface/implementation, protocol and forward class declaration
- variable properties and struct accesors
-
-Vala ("vala"):
-
- keyword keyword
- number number
- string string
- comment comment
- class class definitions
- title in class definition
- constant ALL_UPPER_CASE
-
-C# ("cs"):
-
- keyword keyword
- number number
- string string
- comment commment
- xmlDocTag xmldoc tag ("///", "<!--", "-->", "<..>")
-
-D language ("d"):
-
- comment comment
- string string constant
- number number
- keyword language keywords (including @attributes)
- constant true false null
- built_in built-in plain types (int, string etc.)
-
-RenderMan RSL ("rsl"):
-
- keyword keyword
- number number
- string string (including @"..")
- comment comment
- preprocessor preprocessor directive
- shader sahder keywords
- shading shading keywords
- built_in built-in function
-
-RenderMan RIB ("rib"):
-
- keyword keyword
- number number
- string string
- comment comment
- commands command
-
-Maya Embedded Language ("mel"):
-
- keyword keyword
- number number
- string string
- comment comment
- variable variable
-
-SQL ("sql"):
-
- keyword keyword (mostly SQL'92 and SQL'99)
- number number
- string string (of any type: "..", '..', `..`)
- comment comment
- aggregate aggregate function
-
-Smalltalk ("smalltalk"):
-
- keyword keyword
- number number
- string string
- comment commment
- symbol symbol
- array array
- class name of a class
- char char
- localvars block of local variables
-
-Lisp ("lisp"):
-
- keyword keyword
- number number
- string string
- comment commment
- variable variable
- literal b, t and nil
- list non-quoted list
- title first symbol in a non-quoted list
- body remainder of the non-quoted list
- quoted quoted list, both "(quote .. )" and "'(..)"
-
-Clojure ("clojure"):
-
- comment comments and hints
- string string
- number number
- collection collections
- attribute :keyword
- title function name (built-in or user defined)
- built_in built-in function name
-
-Ini ("ini"):
-
- title title of a section
- value value of a setting of any type
- string string
- number number
- keyword boolean value keyword
-
-Apache ("apache"):
-
- keyword keyword
- number number
- comment commment
- literal On and Off
- sqbracket variables in rewrites "%{..}"
- cbracket options in rewrites "[..]"
- tag begin and end of a configuration section
-
-Nginx ("nginx"):
-
- title directive title
- string string
- number number
- comment comment
- built_in built-in constant
- variable $-variable
- regexp regexp
-
-Diff ("diff"):
-
- header file header
- chunk chunk header within a file
- addition added lines
- deletion deleted lines
- change changed lines
-
-DOS ("dos"):
-
- keyword keyword
- flow batch control keyword
- stream DOS special files ("con", "prn", ...)
- winutils some commands (see dos.js specifically)
- envvar environment variables
-
-Bash ("bash"):
-
- keyword keyword
- string string
- number number
- comment comment
- literal special literal: "true" и "false"
- variable variable
- shebang script interpreter header
-
-CMake ("cmake")
-
- keyword keyword
- number number
- string string
- comment commment
- envvar $-variable
-
-Axapta ("axapta"):
-
- keyword keyword
- number number
- string string
- comment commment
- class class header from "class" till "{"
- title class name inside a header
- params everything in parentheses inside a class header
- inheritance keywords "extends" and "implements" inside class header
- preprocessor preprocessor directive
-
-1C ("1c"):
-
- keyword keyword
- number number
- date date
- string string
- comment commment
- function header of function or procudure
- title function name inside a header
- params everything in parentheses inside a function header
- preprocessor preprocessor directive
-
-AVR assembler ("avrasm"):
-
- keyword keyword
- built_in pre-defined register
- number number
- string string
- comment commment
- label label
- preprocessor preprocessor directive
- localvars substitution in .macro
-
-VHDL ("vhdl")
-
- keyword keyword
- number number
- string string
- comment commment
- literal signal logical value
- typename typename
- attribute signal attribute
-
-Parser3 ("parser3"):
-
- keyword keyword
- number number
- comment commment
- variable variable starting with "$"
- preprocessor preprocessor directive
- title user-defined name starting with "@"
-
-TeX ("tex"):
-
- comment comment
- number number
- command command
- parameter parameter
- formula formula
- special special symbol
-
-Haskell ("haskell"):
-
- keyword keyword
- number number
- string string
- comment comment
- class type classes and other data types
- title function name
- type type class name
- typedef definition of types (type, newtype, data)
-
-Erlang ("erlang"):
-
- comment comment
- string string
- number number
- keyword keyword
- record_name record access (#record_name)
- title name of declaration function
- variable variable (starts with capital letter or with _)
- pp.keywords module's attribute (-attribute)
- function_name atom or atom:atom in case of function call
-
-Rust ("rust"):
-
- comment comment
- string string
- number number
- keyword keyword
- title name of declaration
- preprocessor preprocessor directive
-
-Matlab ("matlab"):
-
- comment comment
- string string
- number number
- keyword keyword
- title function name
- function function
- param params of function
- matrix matrix in [ .. ]
- cell cell in { .. }
-
-R ("r"):
-
- comment comment
- string string constant
- number number
- keyword language keywords (function, if) plus "structural"
- functions (attach, require, setClass)
- literal special literal: TRUE, FALSE, NULL, NA, etc.
-
-OpenGL Shading Language ("glsl"):
-
- comment comment
- number number
- preprocessor preprocessor directive
- keyword keyword
- built_in GLSL built-in functions and variables
- literal true false
-
-AppleScript ("applescript"):
-
- keyword keyword
- command core AppleScript command
- constant AppleScript built in constant
- type AppleScript variable type (integer, etc.)
- property Applescript built in property (length, etc.)
- number number
- string string
- comment comment
- title name of a handler
-
-Brainfuck ("brainfuck"):
-
- title Brainfuck while loop command
- literal Brainfuck inc and dec commands
- comment comment
- string Brainfuck input and output commands
Modified: trunk/highlight.js/highlight.pack.js
===================================================================
--- trunk/highlight.js/highlight.pack.js 2014-07-04 11:55:05 UTC (rev 8954)
+++ trunk/highlight.js/highlight.pack.js 2014-07-04 11:58:20 UTC (rev 8955)
@@ -1 +1 @@
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y...
[truncated message content] |
|
From: <var...@us...> - 2014-07-07 12:15:02
|
Revision: 8957
http://sourceforge.net/p/phpwiki/code/8957
Author: vargenau
Date: 2014-07-07 12:14:56 +0000 (Mon, 07 Jul 2014)
Log Message:
-----------
Update doc for SyntaxHighlighterPlugin
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/configurator.php
trunk/pgsrc/Help%2FPluginManagerPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/ReleaseNotes
Removed Paths:
-------------
trunk/themes/default/highlight.css
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/config/config-dist.ini 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1275,11 +1275,6 @@
; http://sourceforge.net/projects/phpweather/
;PHPWEATHER_BASE_DIR =
-; SyntaxHighlight plugin
-; http://www.andre-simon.de/doku/highlight/highlight.html
-;HIGHLIGHT_EXE = /usr/local/bin/highlight
-;HIGHLIGHT_DATA_DIR = /usr/share/highlight
-
;===========================================================================
; Part Eight: PLUGINCACHED Pear/Cache Settings
;===========================================================================
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/configurator.php 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1660,10 +1660,6 @@
new _define_commented_optional('MY_JABBER_ID'); //
$properties["PHPWEATHER_BASE_DIR"] =
new _define_commented_optional('PHPWEATHER_BASE_DIR'); //
-$properties["HIGHLIGHT_EXE"] =
- new _define_commented_optional('HIGHLIGHT_EXE'); // /usr/local/bin/highlight
-$properties["HIGHLIGHT_DATA_DIR"] =
- new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
$properties["Part Eight"] =
new part('_part8', $SEPARATOR . "\n", "
Modified: trunk/pgsrc/Help%2FPluginManagerPlugin
===================================================================
--- trunk/pgsrc/Help%2FPluginManagerPlugin 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/pgsrc/Help%2FPluginManagerPlugin 2014-07-07 12:14:56 UTC (rev 8957)
@@ -57,7 +57,6 @@
* [[http://graphviz.org/ | graphviz]] for the [[Help:GraphVizPlugin|GraphViz]] plugin and [[Help:VisualWikiPlugin|VisualWiki]] plugin,
* [[http://ploticus.sourceforge.net/ | ploticus]] for the [[Help:PloticusPlugin|Ploticus]] plugin,
* [[http://phpweather.sf.net | phpweather]] for the [[Help:PhpWeatherPlugin|PhpWeather]] plugin,
-* [[http://www.andre-simon.de/ | highlight]] for the [[Help:SyntaxHighlighterPlugin|SyntaxHighlighter]] plugin,
* USE_DB_SESSION = true (default for the peardb, adodb or dba backends) for the [[Help:WhoIsOnlinePlugin|WhoIsOnline]] plugin,
* --with-xml support (with expat or libxml2) for the [[Help:RssFeedPlugin|RssFeed]] plugin (~ProjectSummary, ~RecentReleases) and ~HtmlParser support (~ImportHtml, ~HtmlAreaEditing),
* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email PhpWiki:PageChangeNotifications and ModeratedPage's,
Modified: trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
===================================================================
--- trunk/pgsrc/Help%2FSyntaxHighlighterPlugin 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/pgsrc/Help%2FSyntaxHighlighterPlugin 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1,4 +1,4 @@
-Date: Fri, 7 Dec 2012 14:58:45 +0000
+Date: Mon, 7 Jul 2014 14:09:37 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FSyntaxHighlighterPlugin;
@@ -6,11 +6,56 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-The **~SyntaxHighlighter** [[Help:WikiPlugin|plugin]] passes all its arguments through a C++
-highlighter called "highlight" (available at [[http://www.andre-simon.de]]).
+The **~SyntaxHighlighter** [[Help:WikiPlugin|plugin]] will highlight source
+code in a variety of languages.
+Highlighting is done in Javascript with [[http://highlightjs.org/]].
+
+Recognized languages are the following:
+| Apache | Bash | C# | C++
+| CSS | CoffeeScript | Diff | HTML, XML
+| HTTP | Ini | JSON | Java
+| JavaScript | Makefile | Markdown | Nginx
+| Objective C | PHP | Perl | Python
+| Ruby | SQL
+
== Arguments ==
+None.
+
+The source code is put between {{{<<SyntaxHighlighter}}} and {{{>>}}}.
+
+== Example ==
+
+{{{
+<<SyntaxHighlighter
+ #include <stdio.h>
+
+ int main() {
+ printf("Lalala\n");
+ }
+>>
+}}}
+
+will give:
+
+<<SyntaxHighlighter
+ #include <stdio.h>
+
+ int main() {
+ printf("Lalala\n");
+ }
+>>
+
+== History ==
+
+The first implementation of this plugin passed all its arguments through a C++
+highlighter called "highlight" (available at [[http://www.andre-simon.de]]).
+
+This implementation allowed the following arguments, which are now ignored.
+
+=== Former Arguments ===
+
{| class="bordered"
|-
! Argument
@@ -38,39 +83,11 @@
| 0 (optional)
|}
-== Example ==
-
-{{{
-<<SyntaxHighlighter syntax=c style=kr color=bright
- #include <stdio.h>
-
- int main() {
- printf("Lalala\n");
- }
->>
-}}}
-
-will give:
-
-<<SyntaxHighlighter syntax=c style=kr color=bright
- #include <stdio.h>
-
- int main() {
- printf("Lalala\n");
- }
->>
-
-I did not use beautifier, because it used up more than 8M of memory on
-my system and PHP killed it. I'm not sure whether this is a problem
-with my integration, or with beautifier itself.
-
== Authors ==
* alecthomas
-* Fixes by [[Help:Reini Urban|Reini Urban]]:
-** support options: syntax, style, color,
-** php version switch,
-** HIGHLIGHT_DATA_DIR, HIGHLIGHT_EXE constants,
+* Fixes by [[Help:Reini Urban|Reini Urban]]
+* Re-implementation with [[http://highlightjs.org/]] by Alain Peyrat and Marc-Etienne Vargenau, Alcatel-Lucent
<noinclude>
----
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/pgsrc/ReleaseNotes 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1,4 +1,4 @@
-Date: Wed, 30 Jan 2013 14:39:50 +0000
+Date: Mon, 7 Jul 2014 14:09:37 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -8,12 +8,19 @@
<<CreateToc with_toclink||=1 headers||=1,2,3>>
-== 1.4.0 2013-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+== 1.5.0 2014-??-?? Marc-Etienne Vargenau ==
+~PhpWiki 1.5.0 needs at least PHP 5.3. It is compatible with PHP 5.3, 5.4 and 5.5.
+
* Fix bad display in Toolbox menu (Sidebar and Monobook themes) reported by Harold Hallikainen
* Fix Captcha problem reported by Harold Hallikainen
* Merge OldTextFormattingRules into TextFormattingRules
+* ~SyntaxHighlighter plugin is now implemented with [[http://highlightjs.org/]] instead of [[http://www.andre-simon.de]].
+== 1.4.0 2014-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+
+~PhpWiki 1.4.0 is the same as ~PhpWiki 1.4.0RC1. It is the last release compatible with PHP 4.
+
== 1.4.0RC1 2010-09-17 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
This is a new major release, where everything changed from 1.2, and lots of changes since 1.3.14.
Deleted: trunk/themes/default/highlight.css
===================================================================
--- trunk/themes/default/highlight.css 2014-07-07 08:52:53 UTC (rev 8956)
+++ trunk/themes/default/highlight.css 2014-07-07 12:14:56 UTC (rev 8957)
@@ -1,64 +0,0 @@
-/* CSS definition file generated by highlight 2.0-22, http://www.andre-simon.de/ */
-
-/* Highlighting theme definition: */
-
-/* Used abbreviations: */
-/* key: Keywords */
-/* typ: Types and type modifiers */
-/* str: Strings */
-/* num: Numbers */
-/* com: Comments */
-/* esc: Escape characters */
-/* dir: Directive lines */
-/* dstr: Strings within directive lines */
-/* sym: Symbols */
-/* line: Line numbers */
-
-pre {
- color: #000000;
- background-color: #ffffff;
- font-size: 10pt;
- font-family: Courier, monospace;
-}
-
-.key {
- color: #000000;
- font-weight: bold;
-}
-
-.num {
- color: #2928ff;
-}
-
-.typ {
- color: #830000;
-}
-
-.esc {
- color: #ff00ff;
-}
-
-.str {
- color: #ff0000;
-}
-
-.dstr {
- color: #818100;
-}
-
-.com {
- color: #838183;
- font-style: italic;
-}
-
-.dir {
- color: #008200;
-}
-
-.sym {
- color: #000000;
-}
-
-.line {
- color: #555555;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-16 13:53:13
|
Revision: 8964
http://sourceforge.net/p/phpwiki/code/8964
Author: vargenau
Date: 2014-07-16 13:53:10 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
Make <?plugin-form TitleSearch ?> work
Modified Paths:
--------------
trunk/lib/plugin/TitleSearch.php
trunk/pgsrc/Help%2FTitleSearchPlugin
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2014-07-15 16:37:05 UTC (rev 8963)
+++ trunk/lib/plugin/TitleSearch.php 2014-07-16 13:53:10 UTC (rev 8964)
@@ -47,8 +47,8 @@
function getDefaultArguments()
{
- return array_merge
- (
+ // All PageList::supportedArgs, except 'pagename'
+ $args = array_merge(
PageList::supportedArgs(), // paging and more.
array('s' => false,
'auto_redirect' => false,
@@ -59,6 +59,8 @@
'regex' => 'auto',
'format' => false,
));
+ unset($args['pagename']);
+ return $args;
}
// info arg allows multiple columns
@@ -72,6 +74,10 @@
return HTML();
}
+ if (empty($args['sortby'])) {
+ $args['sortby'] = '';
+ }
+
// ^S != S* ^ matches only beginning of phrase, not of word.
// x* matches any word beginning with x
$query = new TextSearchQuery($args['s'], $args['case_exact'], $args['regex']);
Modified: trunk/pgsrc/Help%2FTitleSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FTitleSearchPlugin 2014-07-15 16:37:05 UTC (rev 8963)
+++ trunk/pgsrc/Help%2FTitleSearchPlugin 2014-07-16 13:53:10 UTC (rev 8964)
@@ -1,4 +1,4 @@
-Date: Fri, 7 Dec 2012 14:58:45 +0000
+Date: Wed, 16 Jul 2014 15:48:13 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FTitleSearchPlugin;
@@ -18,7 +18,8 @@
== Arguments ==
-All [[Help:PageList|PageList]] arguments, plus the following ones:
+All [[Help:PageList|PageList]] arguments (except //paganame//),
+plus the following ones:
{| class="bordered"
|-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-16 14:00:24
|
Revision: 8965
http://sourceforge.net/p/phpwiki/code/8965
Author: vargenau
Date: 2014-07-16 14:00:21 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
Make <?plugin-form FullTextSearch ?> work
Modified Paths:
--------------
trunk/lib/plugin/FullTextSearch.php
trunk/pgsrc/Help%2FFullTextSearchPlugin
Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php 2014-07-16 13:53:10 UTC (rev 8964)
+++ trunk/lib/plugin/FullTextSearch.php 2014-07-16 14:00:21 UTC (rev 8965)
@@ -49,8 +49,8 @@
function getDefaultArguments()
{
- return array_merge
- (
+ // All PageList::supportedArgs, except 'pagename'
+ $args = array_merge(
PageList::supportedArgs(), // paging and more.
array('s' => false,
'hilight' => true,
@@ -60,6 +60,8 @@
'noheader' => false,
'exclude' => false, // comma-separated list of glob
'quiet' => true)); // be less verbose
+ unset($args['pagename']);
+ return $args;
}
function run($dbi, $argstr, &$request, $basepage)
Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin 2014-07-16 13:53:10 UTC (rev 8964)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin 2014-07-16 14:00:21 UTC (rev 8965)
@@ -1,4 +1,4 @@
-Date: Fri, 11 Jan 2013 11:16:51 +0000
+Date: Wed, 16 Jul 2014 15:48:13 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Help%2FFullTextSearchPlugin;
@@ -15,7 +15,8 @@
== Arguments ==
-All [[Help:PageList|PageList]] arguments, plus the following ones:
+All [[Help:PageList|PageList]] arguments (except //paganame//),
+plus the following ones:
{| class="bordered"
|-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-18 09:44:46
|
Revision: 8986
http://sourceforge.net/p/phpwiki/code/8986
Author: vargenau
Date: 2014-07-18 09:44:34 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/HtmlParser.php
trunk/lib/InlineParser.php
trunk/lib/PageList.php
trunk/lib/RSSWriter091.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/TextSearchQuery.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiUser.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/XmlElement.php
trunk/lib/XmlRpcServer.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/blog/themeinfo.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/BlockParser.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -253,7 +253,7 @@
class BlockParser_InputSubBlock extends BlockParser_Input
{
- function BlockParser_InputSubBlock(&$input, $prefix_re, $initial_prefix = false)
+ function __construct(&$input, $prefix_re, $initial_prefix = false)
{
$this->_input = &$input;
$this->_prefix_pat = "/$prefix_re|\\s*\$/Ax";
@@ -486,8 +486,8 @@
*/
class TightSubBlock extends SubBlock
{
- function TightSubBlock(&$input, $indent_re, $initial_indent = false,
- $tag = 'div', $attr = false)
+ function __construct(&$input, $indent_re, $initial_indent = false,
+ $tag = 'div', $attr = false)
{
$this->SubBlock($input, $indent_re, $initial_indent, $tag, $attr);
@@ -611,7 +611,7 @@
{
public $_tag = 'dl';
- function Block_dl()
+ function __construct()
{
$this->_re = '\ {0,4}\S.*(?<!' . ESCAPE_CHAR . '):\s*$';
}
@@ -665,7 +665,7 @@
public $nrows;
public $ncols;
- function Block_table_dl_defn($term, $defn)
+ function __construct($term, $defn)
{
$this->XmlContent();
if (!is_array($defn))
@@ -817,7 +817,7 @@
{
public $_tag = 'dl-table'; // phony.
- function Block_table_dl()
+ function __construct()
{
$this->_re = '\ {0,4} (?:\S.*)? (?<!' . ESCAPE_CHAR . ') \| \s* $';
}
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/CachedMarkup.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -26,7 +26,7 @@
class CacheableMarkup extends XmlContent
{
- function CacheableMarkup($content, $basepage)
+ function __construct($content, $basepage)
{
$this->_basepage = $basepage;
$this->_buf = '';
@@ -354,7 +354,7 @@
class Cached_WikiLink extends Cached_Link
{
- function Cached_WikiLink($page, $label = false, $anchor = false)
+ function __construct($page, $label = false, $anchor = false)
{
$this->_page = $page;
/* ":DontStoreLink" */
@@ -442,7 +442,7 @@
class Cached_WikiLinkIfKnown extends Cached_WikiLink
{
- function Cached_WikiLinkIfKnown($moniker)
+ function __construct($moniker)
{
$this->_page = $moniker;
}
@@ -460,7 +460,7 @@
class Cached_SpellCheck extends Cached_WikiLink
{
- function Cached_SpellCheck($word, $suggs)
+ function __construct($word, $suggs)
{
$this->_page = $word;
$this->suggestions = $suggs;
@@ -478,7 +478,7 @@
class Cached_PhpwikiURL extends Cached_DynamicContent
{
- function Cached_PhpwikiURL($url, $label)
+ function __construct($url, $label)
{
$this->_url = $url;
if ($label)
@@ -529,7 +529,7 @@
class Cached_SemanticLink extends Cached_WikiLink
{
- function Cached_SemanticLink($url, $label = false)
+ function __construct($url, $label = false)
{
$this->_url = $url;
if ($label && $label != $url)
@@ -665,7 +665,7 @@
*/
class Cached_SearchHighlight extends Cached_DynamicContent
{
- function Cached_SearchHighlight($word, $engine)
+ function __construct($word, $engine)
{
$this->_word = $word;
$this->engine = $engine;
@@ -682,7 +682,7 @@
class Cached_ExternalLink extends Cached_Link
{
- function Cached_ExternalLink($url, $label = false)
+ function __construct($url, $label = false)
{
$this->_url = $url;
if ($label && $label != $url)
@@ -728,7 +728,7 @@
class Cached_InterwikiLink extends Cached_ExternalLink
{
- function Cached_InterwikiLink($link, $label = false)
+ function __construct($link, $label = false)
{
$this->_link = $link;
if ($label)
@@ -822,7 +822,7 @@
class Cached_PluginInvocation extends Cached_DynamicContent
{
- function Cached_PluginInvocation($pi)
+ function __construct($pi)
{
$this->_pi = $pi;
$loader = $this->_getLoader();
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/DbSession/ADODB.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -29,9 +29,8 @@
{
public $_backend_type = "ADODB";
- function DbSession_ADODB($dbh, $table)
+ function __construct($dbh, $table)
{
-
$this->_dbh = $dbh;
$this->_table = $table;
@@ -43,7 +42,6 @@
array(&$this, 'write'),
array(&$this, 'destroy'),
array(&$this, 'gc'));
- return $this;
}
function & _connect()
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/DbSession/PDO.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -10,9 +10,8 @@
{
public $_backend_type = "PDO";
- function DbSession_PDO($dbh, $table)
+ function __construct($dbh, $table)
{
-
$this->_dbh = $dbh;
$this->_table = $table;
@@ -24,7 +23,6 @@
array(&$this, 'write'),
array(&$this, 'destroy'),
array(&$this, 'gc'));
- return $this;
}
function & _connect()
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/DbSession/SQL.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -15,7 +15,7 @@
{
public $_backend_type = "SQL";
- function DbSession_SQL(&$dbh, $table)
+ function __construct(&$dbh, $table)
{
$this->_dbh = $dbh;
Modified: trunk/lib/DbSession/dba.php
===================================================================
--- trunk/lib/DbSession/dba.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/DbSession/dba.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -15,7 +15,7 @@
{
public $_backend_type = "dba";
- function DbSession_dba(&$dbh, $table)
+ function __construct(&$dbh, $table)
{
$this->_dbh = $dbh;
ini_set('session.save_handler', 'user');
@@ -26,7 +26,6 @@
array(&$this, 'write'),
array(&$this, 'destroy'),
array(&$this, 'gc'));
- return $this;
}
function quote($str)
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/HtmlParser.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -49,7 +49,7 @@
* dialect: "PhpWiki2", "PhpWiki"
* possible more dialects: MediaWiki, kwiki, c2
*/
- function HtmlParser($dialect = "PhpWiki2", $encoding = '')
+ function __construct($dialect = "PhpWiki2", $encoding = '')
{
$classname = "HtmlParser_" . $dialect;
if (class_exists($classname))
@@ -225,7 +225,7 @@
class HtmlParser_PhpWiki2
extends HtmlParser
{
- function HtmlParser_PhpWiki2()
+ function __construct()
{
$this->_handlers =
array('html' => '',
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/InlineParser.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -543,7 +543,7 @@
class Markup_spellcheck extends SimpleMarkup
{
- function Markup_spellcheck()
+ function __construct()
{
$this->suggestions = $GLOBALS['request']->getArg('suggestions');
}
@@ -566,7 +566,7 @@
class Markup_searchhighlight extends SimpleMarkup
{
- function Markup_searchhighlight()
+ function __construct()
{
$result = $GLOBALS['request']->_searchhighlight;
require_once 'lib/TextSearchQuery.php';
@@ -1214,7 +1214,7 @@
{
//public $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )';
- function Markup_html_entities()
+ function __construct()
{
$this->_entities = array('...' => '…',
'--' => '–',
@@ -1414,9 +1414,9 @@
class LinkTransformer extends InlineTransformer
{
- function LinkTransformer()
+ function __construct()
{
- $this->InlineTransformer(array('escape', 'wikicreolebracketlink', 'bracketlink', 'url',
+ parent::__construct(array('escape', 'wikicreolebracketlink', 'bracketlink', 'url',
'semanticlink', 'interwiki', 'wikiword',
));
}
@@ -1424,9 +1424,9 @@
class NowikiTransformer extends InlineTransformer
{
- function NowikiTransformer()
+ function __construct()
{
- $this->InlineTransformer
+ parent::__construct
(array('linebreak',
'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole',
'isonumchars', 'isohexchars', /*'html_entities',*/
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/PageList.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -171,9 +171,9 @@
class _PageList_Column extends _PageList_Column_base
{
- function _PageList_Column($field, $default_heading, $align = false)
+ function __construct($field, $default_heading, $align = false)
{
- $this->_PageList_Column_base($default_heading, $align);
+ parent::__construct($default_heading, $align);
$this->_need_rev = substr($field, 0, 4) == 'rev:';
$this->_iscustom = substr($field, 0, 7) == 'custom:';
@@ -214,10 +214,10 @@
*/
class _PageList_Column_custom extends _PageList_Column
{
- function _PageList_Column_custom($params)
+ function __construct($params)
{
$this->_pagelist =& $params[3];
- $this->_PageList_Column($params[0], $params[1], $params[2]);
+ parent::__construct($params[0], $params[1], $params[2]);
}
}
@@ -261,9 +261,9 @@
class _PageList_Column_bool extends _PageList_Column
{
- function _PageList_Column_bool($field, $default_heading, $text = 'yes')
+ function __construct($field, $default_heading, $text = 'yes')
{
- $this->_PageList_Column($field, $default_heading, 'center');
+ parent::__construct($field, $default_heading, 'center');
$this->_textIfTrue = $text;
$this->_textIfFalse = new RawXml('—'); //mdash
}
@@ -278,7 +278,7 @@
class _PageList_Column_checkbox extends _PageList_Column
{
- function _PageList_Column_checkbox($field, $default_heading, $name = 'p')
+ function __construct($field, $default_heading, $name = 'p')
{
$this->_name = $name;
$heading = HTML::input(array('type' => 'button',
@@ -287,7 +287,7 @@
'value' => $default_heading,
'onclick' => "flipAll(this.form)"
));
- $this->_PageList_Column($field, $heading, 'center');
+ parent::__construct($field, $heading, 'center');
}
function _getValuePageList($pagelist, $page_handle, &$revision_handle)
@@ -325,22 +325,22 @@
class _PageList_Column_time extends _PageList_Column
{
- function _PageList_Column_time($field, $default_heading)
+ function __construct($field, $default_heading)
{
- $this->_PageList_Column($field, $default_heading, 'right');
+ parent::__construct($field, $default_heading, 'right');
global $WikiTheme;
$this->WikiTheme = &$WikiTheme;
}
function _getValue($page_handle, &$revision_handle)
{
- $time = _PageList_Column::_getValue($page_handle, $revision_handle);
+ $time = parent::_getValue($page_handle, $revision_handle);
return $this->WikiTheme->formatDateTime($time);
}
function _getSortableValue($page_handle, &$revision_handle)
{
- return _PageList_Column::_getValue($page_handle, $revision_handle);
+ return parent::_getValue($page_handle, $revision_handle);
}
}
@@ -359,8 +359,8 @@
// (PHP memory limit exceeded)
class _PageList_Column_content extends _PageList_Column
{
- function _PageList_Column_content($field, $default_heading, $align = false,
- $search = false, $hilight_re = false)
+ function __construct($field, $default_heading, $align = false,
+ $search = false, $hilight_re = false)
{
$this->_PageList_Column($field, $default_heading, $align);
$this->bytes = 50;
@@ -459,9 +459,9 @@
class _PageList_Column_author extends _PageList_Column
{
- function _PageList_Column_author($field, $default_heading, $align = false)
+ function __construct($field, $default_heading, $align = false)
{
- _PageList_Column::_PageList_Column($field, $default_heading, $align);
+ parent::__construct($field, $default_heading, $align);
$this->dbi =& $GLOBALS['request']->getDbh();
}
@@ -493,7 +493,7 @@
function _getSortableValue($page_handle, &$revision_handle)
{
- return _PageList_Column::_getValue($page_handle, $revision_handle);
+ return parent::_getValue($page_handle, $revision_handle);
}
}
@@ -595,7 +595,7 @@
public $_sortby = array();
public $_maxlen = 0;
- function PageList($columns = false, $exclude = false, $options = false)
+ function __construct($columns = false, $exclude = false, $options = false)
{
// unique id per pagelist on each page.
if (!isset($GLOBALS['request']->_pagelist))
@@ -1830,7 +1830,7 @@
extends PageList
{
- function PageList_Selectable($columns = false, $exclude = '', $options = false)
+ function __construct($columns = false, $exclude = '', $options = false)
{
if ($columns) {
if (!is_array($columns))
@@ -1840,7 +1840,7 @@
} else {
$columns = array('checkbox', 'pagename');
}
- $this->PageList($columns, $exclude, $options);
+ parent::__construct($columns, $exclude, $options);
}
function addPageList($array)
@@ -1861,7 +1861,7 @@
extends PageList
{
- function PageList_Unselectable($columns = false, $exclude = '', $options = false)
+ function __construct($columns = false, $exclude = '', $options = false)
{
if ($columns) {
if (!is_array($columns))
@@ -1869,7 +1869,7 @@
} else {
$columns = array('pagename');
}
- $this->PageList($columns, $exclude, $options);
+ parent::__construct($columns, $exclude, $options);
}
function addPageList($array)
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/RSSWriter091.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -24,7 +24,7 @@
include_once 'lib/RssWriter.php';
class RSSWriter091 extends RSSWriter
{
- function RSSWriter091()
+ function __construct()
{
$this->XmlElement('rss', array('version' => "0.91"));
$this->_items = array();
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/RssWriter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -11,7 +11,7 @@
*/
class RssWriter extends XmlElement
{
- function RssWriter()
+ function __construct()
{
$this->XmlElement('rdf:RDF',
array('xmlns' => "http://purl.org/rss/1.0/",
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/RssWriter2.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -17,7 +17,7 @@
*/
class RssWriter2 extends RssWriter
{
- function RssWriter2()
+ function __construct()
{
$this->XmlElement('rss',
array('version' => "2.0"));
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/SemanticWeb.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -115,7 +115,7 @@
*/
class RdfWriter extends RssWriter // in fact it should be rewritten to be other way round.
{
- function RdfWriter(&$request, &$pagelist)
+ function __construct(&$request, &$pagelist)
{
$this->_request =& $request;
$this->_pagelist =& $pagelist;
@@ -296,7 +296,7 @@
* We need to detect units from the freetext query:
* population > 1 million
*/
- function SemanticAttributeSearchQuery($search_query, $placeholders, $unit = '')
+ function __construct($search_query, $placeholders, $unit = '')
{
$this->NumericSearchQuery($search_query, $placeholders);
$this->_units = new Units();
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/TextSearchQuery.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -304,7 +304,7 @@
*
* @see TextSearchQuery
*/
- function NullTextSearchQuery()
+ function __construct()
{
}
@@ -648,7 +648,7 @@
public $op = "WORD";
public $_op = TSQ_TOK_WORD;
- function TextSearchQuery_node_word($word)
+ function __construct($word)
{
$this->word = $word;
}
@@ -858,7 +858,7 @@
{
public $_op = TSQ_TOK_BINOP;
- function TextSearchQuery_node_binop($leaves)
+ function __construct($leaves)
{
$this->leaves = $leaves;
}
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/ADODB.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -71,7 +71,7 @@
extends WikiDB_backend
{
- function WikiDB_backend_ADODB($dbparams)
+ function __construct($dbparams)
{
$parsed = parseDSN($dbparams['dsn']);
$this->_dbparams = $dbparams;
@@ -1329,7 +1329,7 @@
class WikiDB_backend_ADODB_generic_iter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_ADODB_generic_iter($backend, $query_result, $field_list = NULL)
+ function __construct($backend, $query_result, $field_list = NULL)
{
$this->_backend = &$backend;
$this->_result = $query_result;
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/PDO.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -30,7 +30,7 @@
extends WikiDB_backend
{
- function WikiDB_backend_PDO($dbparams)
+ function __construct($dbparams)
{
$this->_dbparams = $dbparams;
if (strstr($dbparams['dsn'], "://")) { // pear DB syntax
@@ -1326,7 +1326,7 @@
class WikiDB_backend_PDO_generic_iter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_PDO_generic_iter($backend, $query_result, $field_list = NULL)
+ function __construct($backend, $query_result, $field_list = NULL)
{
$this->_backend = &$backend;
$this->_result = $query_result;
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -28,11 +28,10 @@
class WikiDB_backend_PDO_mysql
extends WikiDB_backend_PDO
{
- function WikiDB_backend_PDO_mysql($dbparams)
+ function __construct($dbparams)
{
+ parent::__construct($dbparams);
- $this->WikiDB_backend_PDO($dbparams);
-
if (!empty($this->_serverinfo['version'])) {
$arr = explode('.', $this->_serverinfo['version']);
$this->_serverinfo['version'] = (string)(($arr[0] * 100) + $arr[1]) . "." . (integer)$arr[2];
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/PearDB.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -7,7 +7,7 @@
{
public $_dbh;
- function WikiDB_backend_PearDB($dbparams)
+ function __construct($dbparams)
{
// Find and include PEAR's DB.php. maybe we should force our private version again...
// if DB would have exported its version number, it would be easier.
@@ -1214,7 +1214,7 @@
class WikiDB_backend_PearDB_generic_iter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_PearDB_generic_iter($backend, $query_result, $field_list = NULL)
+ function __construct($backend, $query_result, $field_list = NULL)
{
if (DB::isError($query_result)) {
// This shouldn't happen, I thought.
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -49,10 +49,10 @@
class WikiDB_backend_PearDB_ffpgsql
extends WikiDB_backend_PearDB_pgsql
{
- function WikiDB_backend_PearDB_ffpgsql($dbparams)
+ function __construct($dbparams)
{
$dbparams['dsn'] = str_replace('ffpgsql:', 'pgsql:', $dbparams['dsn']);
- parent::WikiDB_backend_PearDB_pgsql($dbparams);
+ parent::__construct($dbparams);
$p = strlen(PAGE_PREFIX) + 1;
$page_tbl = $this->_table_names['page_tbl'];
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -17,7 +17,7 @@
class WikiDB_backend_PearDB_pgsql
extends WikiDB_backend_PearDB
{
- function WikiDB_backend_PearDB_pgsql($dbparams)
+ function __construct($dbparams)
{
// The pgsql handler of (at least my version of) the PEAR::DB
// library generates three warnings when a database is opened:
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/cvs.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -72,7 +72,7 @@
* repository or assumed to exist. If on the other hand the parameter
* already exists, then it is not overwritten.
*/
- function WikiDB_backend_cvs($dbparam)
+ function __construct($dbparam)
{
// setup all the instance values.
$this->_docDir = $dbparam{CVS_DOC_DIR};
@@ -956,9 +956,9 @@
public $_searchString = '';
public $_docDir = "";
- function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(),
- $searchString = "",
- $documentDir = ".")
+ function __construct($arrayValue = array(),
+ $searchString = "",
+ $documentDir = ".")
{
$this->Cvs_Backend_Array_Iterator($arrayValue);
$_searchString = $searchString;
@@ -1002,10 +1002,10 @@
{
public $_searchString = '';
- function Cvs_Backend_Title_Search_Iterator($arrayValue = Array(),
- $searchString = "")
+ function __construct($arrayValue = array(),
+ $searchString = "")
{
- $this->Cvs_Backend_Array_Iterator($arrayValue);
+ parent::__construct($arrayValue);
$_searchString = $searchString;
}
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dba.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -6,7 +6,7 @@
class WikiDB_backend_dba
extends WikiDB_backend_dbaBase
{
- function WikiDB_backend_dba($dbparams)
+ function __construct($dbparams)
{
$directory = '/tmp';
$prefix = 'wiki_';
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dbaBase.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -44,7 +44,7 @@
class WikiDB_backend_dbaBase
extends WikiDB_backend
{
- function WikiDB_backend_dbaBase(&$dba)
+ function __construct(&$dba)
{
$this->_db = &$dba;
// TODO: page and version tables should be in their own files, probably.
@@ -658,7 +658,7 @@
extends WikiDB_backend_iterator
{
// fixed for linkrelations
- function WikiDB_backend_dbaBase_pageiter(&$backend, &$pages, $options = false)
+ function __construct(&$backend, &$pages, $options = false)
{
$this->_backend = $backend;
$this->_options = $options;
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -11,7 +11,7 @@
class WikiDB_backend_dumb_BackLinkIter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_dumb_BackLinkIter(&$backend, &$all_pages, $pagename)
+ function __construct(&$backend, &$all_pages, $pagename)
{
$this->_pages = $all_pages;
$this->_backend = &$backend;
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -38,8 +38,8 @@
class WikiDB_backend_dumb_LinkSearchIter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_dumb_LinkSearchIter(&$backend, &$pageiter, $search, $linktype,
- $relation = false, $options = array())
+ function __construct(&$backend, &$pageiter, $search, $linktype,
+ $relation = false, $options = array())
{
$this->_backend = &$backend;
$this->_pages = $pageiter;
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -11,7 +11,7 @@
class WikiDB_backend_dumb_MostPopularIter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_dumb_MostPopularIter($backend, &$all_pages, $limit)
+ function __construct($backend, &$all_pages, $limit)
{
$this->_pages = array();
$pages = &$this->_pages;
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -9,7 +9,7 @@
class WikiDB_backend_dumb_MostRecentIter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_dumb_MostRecentIter(&$backend, &$pages, $params)
+ function __construct(&$backend, &$pages, $params)
{
$limit = false;
extract($params);
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -2,8 +2,8 @@
class WikiDB_backend_dumb_TextSearchIter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_dumb_TextSearchIter(&$backend, &$pages, $search, $fulltext = false,
- $options = array())
+ function __construct(&$backend, &$pages, $search, $fulltext = false,
+ $options = array())
{
$this->_backend = &$backend;
$this->_pages = $pages;
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -8,7 +8,7 @@
class WikiDB_backend_dumb_WantedPagesIter
extends WikiDB_backend_iterator
{
- function WikiDB_backend_dumb_WantedPagesIter(&$backend, &$all_pages, $exclude = '', $sortby = '', $limit = '')
+ function __construct(&$backend, &$all_pages, $exclude = '', $sortby = '', $limit = '')
{
$this->_allpages = $all_pages;
$this->_allpages_array = $all_pages->asArray();
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiDB/backend/file.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -53,7 +53,7 @@
public $_page_version_data; // temporarily stores the versiondata (via _loadVersionData)
public $_latest_versions; // temporarily stores the latest version-numbers (for every pagename)
- function WikiDB_backend_file($dbparam)
+ function __construct($dbparam)
{
$this->data_dir = $dbparam['directory'];
if (file_exists($this->data_dir) and is_file($this->data_dir))
@@ -728,7 +728,7 @@
class WikiDB_backend_file_iter extends WikiDB_backend_iterator
{
- function WikiDB_backend_file_iter(&$backend, &$query_result, $options = array())
+ function __construct(&$backend, &$query_result, $options = array())
{
$this->_backend = &$backend;
$this->_result = $query_result;
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WikiUser.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -613,10 +613,9 @@
class _UserPreference_numeric
extends _UserPreference
{
- function _UserPreference_numeric($default, $minval = false,
- $maxval = false)
+ function __construct($default, $minval = false, $maxval = false)
{
- $this->_UserPreference((double)$default);
+ parent::__construct((double)$default);
$this->_minval = (double)$minval;
$this->_maxval = (double)$maxval;
}
@@ -635,10 +634,9 @@
class _UserPreference_int
extends _UserPreference_numeric
{
- function _UserPreference_int($default, $minval = false, $maxval = false)
+ function __construct($default, $minval = false, $maxval = false)
{
- $this->_UserPreference_numeric((int)$default, (int)$minval,
- (int)$maxval);
+ parent::__construct((int)$default, (int)$minval, (int)$maxval);
}
function sanify($value)
@@ -650,9 +648,9 @@
class _UserPreference_bool
extends _UserPreference
{
- function _UserPreference_bool($default = false)
+ function __construct($default = false)
{
- $this->_UserPreference((bool)$default);
+ parent::__construct((bool)$default);
}
function sanify($value)
@@ -680,9 +678,9 @@
class _UserPreference_language
extends _UserPreference
{
- function _UserPreference_language($default = DEFAULT_LANGUAGE)
+ function __construct($default = DEFAULT_LANGUAGE)
{
- $this->_UserPreference($default);
+ parent::__construct($default);
}
// FIXME: check for valid locale
@@ -700,9 +698,9 @@
class _UserPreference_theme
extends _UserPreference
{
- function _UserPreference_theme($default = THEME)
+ function __construct($default = THEME)
{
- $this->_UserPreference($default);
+ parent::__construct($default);
}
function sanify($value)
Modified: trunk/lib/WysiwygEdit/FCKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/FCKeditor.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WysiwygEdit/FCKeditor.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -18,7 +18,7 @@
class WysiwygEdit_FCKeditor extends WysiwygEdit
{
- function WysiwygEdit_FCKeditor()
+ function __construct()
{
global $LANG;
$this->_transformer_tags = false;
Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -18,7 +18,7 @@
class WysiwygEdit_Wikiwyg extends WysiwygEdit
{
- function WysiwygEdit_Wikiwyg()
+ function __construct()
{
global $request, $LANG;
$this->_transformer_tags = false;
Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/WysiwygEdit/tinymce.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -19,7 +19,7 @@
class WysiwygEdit_tinymce extends WysiwygEdit
{
- function WysiwygEdit_tinymce()
+ function __construct()
{
$this->_transformer_tags = false;
$this->BasePath = DATA_PATH . '/themes/default/tiny_mce/';
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/XmlElement.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -206,10 +206,9 @@
*/
class XmlElement extends XmlContent
{
- function XmlElement($tagname /* , $attr_or_content , ...*/)
+ function __construct($tagname /* , $attr_or_content , ...*/)
{
- //FIXME: php5 incompatible
- $this->XmlContent();
+ parent::__construct();
$this->_init(func_get_args());
}
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/XmlRpcServer.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -939,7 +939,7 @@
*/
class XmlRpcServer extends xmlrpc_server
{
- function XmlRpcServer($request = false)
+ function __construct($request = false)
{
global $wiki_dmap;
foreach ($wiki_dmap as $name => $val) {
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/diff.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -70,7 +70,7 @@
class WordLevelDiff extends MappedDiff
{
- function WordLevelDiff($orig_lines, $final_lines)
+ function __construct($orig_lines, $final_lines)
{
list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
list ($final_words, $final_stripped) = $this->_split($final_lines);
@@ -129,9 +129,9 @@
*/
class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter
{
- function HtmlUnifiedDiffFormatter($context_lines = 4)
+ function __construct($context_lines = 4)
{
- $this->UnifiedDiffFormatter($context_lines);
+ parent::__construct($context_lines);
}
function _start_diff()
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/diff3.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -44,7 +44,7 @@
{
public $type = 'copy';
- function _Diff3_CopyBlock($lines = false)
+ function __construct($lines = false)
{
$this->orig = $lines ? $lines : array();
$this->final1 = &$this->orig;
@@ -64,7 +64,7 @@
class _Diff3_BlockBuilder
{
- function _Diff3_BlockBuilder()
+ function __construct()
{
$this->_init();
}
@@ -116,7 +116,7 @@
class Diff3
{
- function Diff3($orig, $final1, $final2)
+ function __construct($orig, $final1, $final2)
{
$eng = new _DiffEngine;
$this->ConflictingBlocks = 0; //Conflict counter
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/difflib.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -34,7 +34,7 @@
{
public $type = 'copy';
- function _DiffOp_Copy($orig, $final = false)
+ function __construct($orig, $final = false)
{
if (!is_array($final))
$final = $orig;
@@ -52,7 +52,7 @@
{
public $type = 'delete';
- function _DiffOp_Delete($lines)
+ function __construct($lines)
{
$this->orig = $lines;
$this->final = false;
@@ -68,7 +68,7 @@
{
public $type = 'add';
- function _DiffOp_Add($lines)
+ function __construct($lines)
{
$this->final = $lines;
$this->orig = false;
@@ -84,7 +84,7 @@
{
public $type = 'change';
- function _DiffOp_Change($orig, $final)
+ function __construct($orig, $final)
{
$this->orig = $orig;
$this->final = $final;
@@ -670,7 +670,6 @@
function __construct($from_lines, $to_lines,
$mapped_from_lines, $mapped_to_lines)
{
-
assert(sizeof($from_lines) == sizeof($mapped_from_lines));
assert(sizeof($to_lines) == sizeof($mapped_to_lines));
@@ -863,7 +862,7 @@
*/
class UnifiedDiffFormatter extends DiffFormatter
{
- function UnifiedDiffFormatter($context_lines = 4)
+ function __construct($context_lines = 4)
{
$this->leading_context_lines = $context_lines;
$this->trailing_context_lines = $context_lines;
@@ -908,7 +907,7 @@
*/
class BlockDiffFormatter extends DiffFormatter
{
- function BlockDiffFormatter($context_lines = 4)
+ function __construct($context_lines = 4)
{
$this->leading_context_lines = $context_lines;
$this->trailing_context_lines = $context_lines;
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/loadsave.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -1363,7 +1363,7 @@
class LimitedFileSet extends FileSet
{
- function LimitedFileSet($dirname, $_include, $exclude)
+ function __construct($dirname, $_include, $exclude)
{
$this->_includefiles = $_include;
$this->_exclude = $exclude;
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/lib/main.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -52,7 +52,7 @@
{
public $_dbi;
- function WikiRequest()
+ function __construct()
{
$this->_dbi = WikiDB::open($GLOBALS['DBParams']);
// first mysql request costs [958ms]! [670ms] is mysql_connect()
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/themes/Sidebar/themeinfo.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -34,7 +34,7 @@
class WikiTheme_Sidebar extends WikiTheme_MonoBook
{
- function WikiTheme_Sidebar($theme_name = 'Sidebar')
+ function __construct($theme_name = 'Sidebar')
{
$this->WikiTheme($theme_name);
//$this->calendarInit(true);
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php 2014-07-17 17:03:59 UTC (rev 8985)
+++ trunk/themes/blog/themeinfo.php 2014-07-18 09:44:34 UTC (rev 8986)
@@ -46,7 +46,7 @@
class WikiTheme_blog extends WikiTheme
{
- function WikiTheme_blog($theme_name = 'blog')
+ function __construct($theme_name = 'blog')
{
$this->WikiTheme($theme_name);
$this->calendarInit(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-07-25 11:00:27
|
Revision: 8997
http://sourceforge.net/p/phpwiki/code/8997
Author: vargenau
Date: 2014-07-25 10:59:59 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Set Phpwiki version to 1.5.0
Modified Paths:
--------------
trunk/lib/prepend.php
trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
trunk/locale/de/pgsrc/AlleBenutzer
trunk/locale/de/pgsrc/AlleSeiten
trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
trunk/locale/de/pgsrc/BackLinks
trunk/locale/de/pgsrc/BenutzerEinstellungen
trunk/locale/de/pgsrc/DebugAuthInfo
trunk/locale/de/pgsrc/DebugGruppenInfo
trunk/locale/de/pgsrc/DebugInfo
trunk/locale/de/pgsrc/EditiereText
trunk/locale/de/pgsrc/Einstellungen
trunk/locale/de/pgsrc/FuzzySuche
trunk/locale/de/pgsrc/G%C3%A4steBuch
trunk/locale/de/pgsrc/GaesteBuch
trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
trunk/locale/de/pgsrc/GleicheSeiten
trunk/locale/de/pgsrc/Hilfe
trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
trunk/locale/de/pgsrc/Hilfe%2FGuterStil
trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
trunk/locale/de/pgsrc/HochLaden
trunk/locale/de/pgsrc/InterWikiListe
trunk/locale/de/pgsrc/KategorieAktionSeite
trunk/locale/de/pgsrc/KategorieKategorie
trunk/locale/de/pgsrc/KategorieWikiPlugin
trunk/locale/de/pgsrc/LinkSuche
trunk/locale/de/pgsrc/ListeRelationen
trunk/locale/de/pgsrc/ListeSeiten
trunk/locale/de/pgsrc/MeistBesucht
trunk/locale/de/pgsrc/ModerierteSeite
trunk/locale/de/pgsrc/NeueSeite
trunk/locale/de/pgsrc/Neueste%C3%84nderungen
trunk/locale/de/pgsrc/NeuesteSeiten
trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
trunk/locale/de/pgsrc/PhpWikiDokumentation
trunk/locale/de/pgsrc/PhpWikiSystemverwalten
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
trunk/locale/de/pgsrc/PhpWikiUmfrage
trunk/locale/de/pgsrc/SandKasten
trunk/locale/de/pgsrc/SandKiste
trunk/locale/de/pgsrc/SeiteBeobarten
trunk/locale/de/pgsrc/SeiteFinden
trunk/locale/de/pgsrc/SeiteSpeichern
trunk/locale/de/pgsrc/SeitenErzeugen
trunk/locale/de/pgsrc/SeitenInfo
trunk/locale/de/pgsrc/SeitenProtokoll
trunk/locale/de/pgsrc/SemantischeRelationen
trunk/locale/de/pgsrc/SemantischeSuche
trunk/locale/de/pgsrc/StartSeite
trunk/locale/de/pgsrc/StartSeiteAlias
trunk/locale/de/pgsrc/TitelSuche
trunk/locale/de/pgsrc/UpLoad
trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
trunk/locale/de/pgsrc/VerwaisteSeiten
trunk/locale/de/pgsrc/VolltextSuche
trunk/locale/de/pgsrc/Vorlage%2FBeispiel
trunk/locale/de/pgsrc/WerIstOnline
trunk/locale/de/pgsrc/WikiAdminAuswahl
trunk/locale/de/pgsrc/WunschZettelSeiten
trunk/locale/de/pgsrc/ZufallsSeite
trunk/locale/es/pgsrc/Ayuda
trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas
trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto
trunk/locale/es/pgsrc/Ayuda%2FKBrown
trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica
trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb
trunk/locale/es/pgsrc/BuscarP%C3%A1gina
trunk/locale/es/pgsrc/CajaDeArena
trunk/locale/es/pgsrc/CambiosRecientes
trunk/locale/es/pgsrc/MasPopulares
trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal
trunk/locale/es/pgsrc/TodasLasPaginas
trunk/locale/es/pgsrc/VisitantesRecientes
trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es
trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
trunk/locale/fr/pgsrc/AdministrationDePhpWiki
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer
trunk/locale/fr/pgsrc/Aide
trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
trunk/locale/fr/pgsrc/Aide%2FInterWiki
trunk/locale/fr/pgsrc/Aide%2FLienGoogle
trunk/locale/fr/pgsrc/Aide%2FPhpWiki
trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires
trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau
trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp
trunk/locale/fr/pgsrc/Aide%2FPluginCommenter
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me
trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
trunk/locale/fr/pgsrc/Aide%2FPluginRedirection
trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png
trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache
trunk/locale/fr/pgsrc/Aide%2FPluginWiki
trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog
trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead
trunk/locale/fr/pgsrc/Aide%2FStyleCorrect
trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
trunk/locale/fr/pgsrc/Aide%2FWabiSabi
trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb
trunk/locale/fr/pgsrc/AliasAccueil
trunk/locale/fr/pgsrc/Bac%C3%80Sable
trunk/locale/fr/pgsrc/CarteInterWiki
trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie
trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes
trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction
trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil
trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki
trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s
trunk/locale/fr/pgsrc/ChercherUnePage
trunk/locale/fr/pgsrc/ClassezLa
trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents
trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage
trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier
trunk/locale/fr/pgsrc/Derni%C3%A8resModifs
trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
trunk/locale/fr/pgsrc/DerniersVisiteurs
trunk/locale/fr/pgsrc/DocumentationDePhpWiki
trunk/locale/fr/pgsrc/GestionDesPlugins
trunk/locale/fr/pgsrc/HistoriqueDeLaPage
trunk/locale/fr/pgsrc/InfosAuthentification
trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
trunk/locale/fr/pgsrc/InfosSurLaPage
trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es
trunk/locale/fr/pgsrc/ListeDePages
trunk/locale/fr/pgsrc/ManuelPhpWiki
trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
trunk/locale/fr/pgsrc/NotesDeVersion
trunk/locale/fr/pgsrc/PageAccueil
trunk/locale/fr/pgsrc/PageAl%C3%A9atoire
trunk/locale/fr/pgsrc/PagesFloues
trunk/locale/fr/pgsrc/PagesOrphelines
trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es
trunk/locale/fr/pgsrc/PagesSemblables
trunk/locale/fr/pgsrc/PierrickMeignen
trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
trunk/locale/fr/pgsrc/QuiEstEnLigne
trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
trunk/locale/fr/pgsrc/R%C3%A9troLiens
trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral
trunk/locale/fr/pgsrc/RechercheInterWiki
trunk/locale/fr/pgsrc/RechercheParTitre
trunk/locale/fr/pgsrc/SommaireDuProjet
trunk/locale/fr/pgsrc/SondagePhpWiki
trunk/locale/fr/pgsrc/Suivre
trunk/locale/fr/pgsrc/TousLesUtilisateurs
trunk/locale/fr/pgsrc/ToutesLesPages
trunk/locale/fr/pgsrc/TraduireUnTexte
trunk/locale/fr/pgsrc/VersionsR%C3%A9centes
trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents
trunk/locale/it/pgsrc/Aiuto
trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine
trunk/locale/it/pgsrc/Aiuto%2FBuonStile
trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs
trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto
trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento
trunk/locale/it/pgsrc/Aiuto%2FWabiSabi
trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi
trunk/locale/it/pgsrc/CambiamentiRecenti
trunk/locale/it/pgsrc/FuzzyPages
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/locale/it/pgsrc/PaginaDiProva
trunk/locale/it/pgsrc/PaginaPrincipale
trunk/locale/it/pgsrc/PiuPopolari
trunk/locale/it/pgsrc/RicercaDelTesto
trunk/locale/it/pgsrc/RicercaSuTutto
trunk/locale/it/pgsrc/ScatolaDiSabbia
trunk/locale/it/pgsrc/SteveWainstead
trunk/locale/it/pgsrc/TrovaPagina
trunk/locale/it/pgsrc/TutteLePagine
trunk/locale/it/pgsrc/VisitatoriRecenti
trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2
trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8
trunk/locale/nl/pgsrc/Help
trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren
trunk/locale/nl/pgsrc/Help%2FGoedeStijl
trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken
trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen
trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken
trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen
trunk/locale/nl/pgsrc/Help%2FPhpWiki
trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers
trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
trunk/locale/nl/pgsrc/Help%2FVeranderTekst
trunk/locale/nl/pgsrc/Help%2FWabiSabi
trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb
trunk/locale/nl/pgsrc/MeestBezocht
trunk/locale/nl/pgsrc/PhpWikiBeheer
trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt
trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder
trunk/locale/nl/pgsrc/RecenteVeranderingen
trunk/locale/nl/pgsrc/ThuisPagina
trunk/locale/nl/pgsrc/UitgaveNoten
trunk/locale/nl/pgsrc/ZandBak
trunk/locale/nl/pgsrc/ZoekPagina
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/pgsrc/Framsida
trunk/locale/sv/pgsrc/Hj%C3%A4lp
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb
trunk/locale/sv/pgsrc/MestPopul%C3%A4r
trunk/locale/sv/pgsrc/PhpWikiAdministration
trunk/locale/sv/pgsrc/S%C3%B6kEfterSida
trunk/locale/sv/pgsrc/Sandl%C3%A5dan
trunk/locale/sv/pgsrc/Senaste%C3%84ndringar
trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81
trunk/locale/zh/pgsrc/AllPages
trunk/locale/zh/pgsrc/AllUsers
trunk/locale/zh/pgsrc/BackLinks
trunk/locale/zh/pgsrc/DebugInfo
trunk/locale/zh/pgsrc/FindPage
trunk/locale/zh/pgsrc/FullRecentChanges
trunk/locale/zh/pgsrc/FullTextSearch
trunk/locale/zh/pgsrc/FuzzyPages
trunk/locale/zh/pgsrc/Help
trunk/locale/zh/pgsrc/Help%2FAddingPages
trunk/locale/zh/pgsrc/Help%2FCalendarPlugin
trunk/locale/zh/pgsrc/Help%2FCommentPlugin
trunk/locale/zh/pgsrc/Help%2FEditText
trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin
trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin
trunk/locale/zh/pgsrc/Help%2FHowToUseWiki
trunk/locale/zh/pgsrc/Help%2FInterWiki
trunk/locale/zh/pgsrc/Help%2FLinkIcons
trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs
trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics
trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin
trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin
trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin
trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin
trunk/locale/zh/pgsrc/Help%2FPhpWiki
trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin
trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin
trunk/locale/zh/pgsrc/Help%2FTranscludePlugin
trunk/locale/zh/pgsrc/Help%2FWikiPlugin
trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb
trunk/locale/zh/pgsrc/HomePage
trunk/locale/zh/pgsrc/HomePageAlias
trunk/locale/zh/pgsrc/InterWikiMap
trunk/locale/zh/pgsrc/InterWikiSearch
trunk/locale/zh/pgsrc/LikePages
trunk/locale/zh/pgsrc/OrphanedPages
trunk/locale/zh/pgsrc/PageDump
trunk/locale/zh/pgsrc/PhpWikiAdministration
trunk/locale/zh/pgsrc/RandomPage
trunk/locale/zh/pgsrc/RecentChanges
trunk/locale/zh/pgsrc/RecentEdits
trunk/locale/zh/pgsrc/RecentVisitors
trunk/locale/zh/pgsrc/SandBox
trunk/locale/zh/pgsrc/TitleSearch
trunk/locale/zh/pgsrc/UpLoad
trunk/locale/zh/pgsrc/UserPreferences
trunk/locale/zh/pgsrc/WantedPages
trunk/pgsrc/AllPages
trunk/pgsrc/AllPagesByAcl
trunk/pgsrc/AllPagesCreatedByMe
trunk/pgsrc/AllPagesLastEditedByMe
trunk/pgsrc/AllPagesOwnedByMe
trunk/pgsrc/AllUserPages
trunk/pgsrc/AllUsers
trunk/pgsrc/AppendText
trunk/pgsrc/AuthorHistory
trunk/pgsrc/BackLinks
trunk/pgsrc/BlogArchives
trunk/pgsrc/BlogJournal
trunk/pgsrc/CategoryActionPage
trunk/pgsrc/CategoryCategory
trunk/pgsrc/CategoryGroup
trunk/pgsrc/CategoryHomePages
trunk/pgsrc/CategoryWikiPlugin
trunk/pgsrc/CreatePage
trunk/pgsrc/DebugAuthInfo
trunk/pgsrc/DebugBackendInfo
trunk/pgsrc/DebugGroupInfo
trunk/pgsrc/DebugInfo
trunk/pgsrc/EditMetaData
trunk/pgsrc/FindPage
trunk/pgsrc/FullRecentChanges
trunk/pgsrc/FullTextSearch
trunk/pgsrc/FuzzyPages
trunk/pgsrc/Help
trunk/pgsrc/Help%2FActionPage
trunk/pgsrc/Help%2FAddCommentPlugin
trunk/pgsrc/Help%2FAddingPages
trunk/pgsrc/Help%2FAdobe%20Flash
trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
trunk/pgsrc/Help%2FAllPagesPlugin
trunk/pgsrc/Help%2FAllUsersPlugin
trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
trunk/pgsrc/Help%2FAppendTextPlugin
trunk/pgsrc/Help%2FAsciiMathPlugin
trunk/pgsrc/Help%2FAsciiSVGPlugin
trunk/pgsrc/Help%2FAtomFeedPlugin
trunk/pgsrc/Help%2FAuthorHistoryPlugin
trunk/pgsrc/Help%2FBackLinksPlugin
trunk/pgsrc/Help%2FBlogArchivesPlugin
trunk/pgsrc/Help%2FBlogJournalPlugin
trunk/pgsrc/Help%2FBoxRightPlugin
trunk/pgsrc/Help%2FCacheTestPlugin
trunk/pgsrc/Help%2FCalendarListPlugin
trunk/pgsrc/Help%2FCalendarPlugin
trunk/pgsrc/Help%2FCategories
trunk/pgsrc/Help%2FCategoryPagePlugin
trunk/pgsrc/Help%2FChartPlugin
trunk/pgsrc/Help%2FCommentPlugin
trunk/pgsrc/Help%2FCreateBibPlugin
trunk/pgsrc/Help%2FCreatePagePlugin
trunk/pgsrc/Help%2FCreateTocPlugin
trunk/pgsrc/Help%2FCurrentTimePlugin
trunk/pgsrc/Help%2FDeadEndPagesPlugin
trunk/pgsrc/Help%2FDebugAuthInfoPlugin
trunk/pgsrc/Help%2FDebugBackendInfoPlugin
trunk/pgsrc/Help%2FDebugGroupInfoPlugin
trunk/pgsrc/Help%2FDiffPlugin
trunk/pgsrc/Help%2FDynamicIncludePagePlugin
trunk/pgsrc/Help%2FEditMetaDataPlugin
trunk/pgsrc/Help%2FEditText
trunk/pgsrc/Help%2FExternalSearchPlugin
trunk/pgsrc/Help%2FFacebookLikePlugin
trunk/pgsrc/Help%2FFileInfoPlugin
trunk/pgsrc/Help%2FFoafViewerPlugin
trunk/pgsrc/Help%2FFrameIncludePlugin
trunk/pgsrc/Help%2FFullTextSearchPlugin
trunk/pgsrc/Help%2FFuzzyPagesPlugin
trunk/pgsrc/Help%2FGoToPlugin
trunk/pgsrc/Help%2FGoodStyle
trunk/pgsrc/Help%2FGoogleLink
trunk/pgsrc/Help%2FGoogleMapsPlugin
trunk/pgsrc/Help%2FGooglePluginPlugin
trunk/pgsrc/Help%2FGraphVizPlugin
trunk/pgsrc/Help%2FHelloWorldPlugin
trunk/pgsrc/Help%2FHowToUseWiki
trunk/pgsrc/Help%2FHtmlConverterPlugin
trunk/pgsrc/Help%2FImages
trunk/pgsrc/Help%2FIncludePagePlugin
trunk/pgsrc/Help%2FIncludePagesPlugin
trunk/pgsrc/Help%2FIncludeSiteMapPlugin
trunk/pgsrc/Help%2FIncludeTreePlugin
trunk/pgsrc/Help%2FInterWiki
trunk/pgsrc/Help%2FInterWikiSearchPlugin
trunk/pgsrc/Help%2FJabberPresencePlugin
trunk/pgsrc/Help%2FJeff%20Dairiki
trunk/pgsrc/Help%2FLdapSearchPlugin
trunk/pgsrc/Help%2FLikePagesPlugin
trunk/pgsrc/Help%2FLinkDatabasePlugin
trunk/pgsrc/Help%2FLinkIcons
trunk/pgsrc/Help%2FListPagesPlugin
trunk/pgsrc/Help%2FListSubpagesPlugin
trunk/pgsrc/Help%2FMagicPhpWikiURLs
trunk/pgsrc/Help%2FMediawikiTablePlugin
trunk/pgsrc/Help%2FModeratedPagePlugin
trunk/pgsrc/Help%2FMoreAboutMechanics
trunk/pgsrc/Help%2FMostPopularPlugin
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/Help%2FNoCachePlugin
trunk/pgsrc/Help%2FOldStyleTablePlugin
trunk/pgsrc/Help%2FOrphanedPagesPlugin
trunk/pgsrc/Help%2FPageDumpPlugin
trunk/pgsrc/Help%2FPageGroupPlugin
trunk/pgsrc/Help%2FPageHistoryPlugin
trunk/pgsrc/Help%2FPageInfoPlugin
trunk/pgsrc/Help%2FPageList
trunk/pgsrc/Help%2FPagePermissions
trunk/pgsrc/Help%2FPageTrailPlugin
trunk/pgsrc/Help%2FPasswordResetPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides
trunk/pgsrc/Help%2FPhpHighlightPlugin
trunk/pgsrc/Help%2FPhpWeatherPlugin
trunk/pgsrc/Help%2FPhpWiki
trunk/pgsrc/Help%2FPloticusPlugin
trunk/pgsrc/Help%2FPluginManagerPlugin
trunk/pgsrc/Help%2FPopUpPlugin
trunk/pgsrc/Help%2FPopularNearbyPlugin
trunk/pgsrc/Help%2FPredefinedIcons
trunk/pgsrc/Help%2FPreferenceAppPlugin
trunk/pgsrc/Help%2FPreferencesInfoPlugin
trunk/pgsrc/Help%2FPrevNextPlugin
trunk/pgsrc/Help%2FRandomPagePlugin
trunk/pgsrc/Help%2FRateItPlugin
trunk/pgsrc/Help%2FRawHtmlPlugin
trunk/pgsrc/Help%2FRecentChangesCachedPlugin
trunk/pgsrc/Help%2FRecentChangesPlugin
trunk/pgsrc/Help%2FRecentCommentsPlugin
trunk/pgsrc/Help%2FRecentEditsPlugin
trunk/pgsrc/Help%2FRecentReferrersPlugin
trunk/pgsrc/Help%2FRedirectToPlugin
trunk/pgsrc/Help%2FReini%20Urban
trunk/pgsrc/Help%2FRelatedChangesPlugin
trunk/pgsrc/Help%2FRichTablePlugin
trunk/pgsrc/Help%2FRssFeedPlugin
trunk/pgsrc/Help%2FSearchHighlightPlugin
trunk/pgsrc/Help%2FSemanticRelations
trunk/pgsrc/Help%2FSemanticRelationsPlugin
trunk/pgsrc/Help%2FSemanticSearchPlugin
trunk/pgsrc/Help%2FSiteMapPlugin
trunk/pgsrc/Help%2FSpreadsheet
trunk/pgsrc/Help%2FSqlResultPlugin
trunk/pgsrc/Help%2FSteve%20Wainstead
trunk/pgsrc/Help%2FSyncWikiPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/Help%2FSystemInfoPlugin
trunk/pgsrc/Help%2FTeX2pngPlugin
trunk/pgsrc/Help%2FTemplatePlugin
trunk/pgsrc/Help%2FTexToPngPlugin
trunk/pgsrc/Help%2FTextFormattingRules
trunk/pgsrc/Help%2FTitleSearchPlugin
trunk/pgsrc/Help%2FTranscludePlugin
trunk/pgsrc/Help%2FTranslateTextPlugin
trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
trunk/pgsrc/Help%2FUpLoadPlugin
trunk/pgsrc/Help%2FUserPreferencesPlugin
trunk/pgsrc/Help%2FUserRatingsPlugin
trunk/pgsrc/Help%2FVideoPlugin
trunk/pgsrc/Help%2FVisualWikiPlugin
trunk/pgsrc/Help%2FWabiSabi
trunk/pgsrc/Help%2FWantedPagesOldPlugin
trunk/pgsrc/Help%2FWantedPagesPlugin
trunk/pgsrc/Help%2FWatchPagePlugin
trunk/pgsrc/Help%2FWhoIsOnlinePlugin
trunk/pgsrc/Help%2FWikiAdminChownPlugin
trunk/pgsrc/Help%2FWikiAdminPurgePlugin
trunk/pgsrc/Help%2FWikiAdminRemovePlugin
trunk/pgsrc/Help%2FWikiAdminRenamePlugin
trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
trunk/pgsrc/Help%2FWikiAdminSelectPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
trunk/pgsrc/Help%2FWikiBlogPlugin
trunk/pgsrc/Help%2FWikiFormPlugin
trunk/pgsrc/Help%2FWikiFormRichPlugin
trunk/pgsrc/Help%2FWikiForumPlugin
trunk/pgsrc/Help%2FWikiPlugin
trunk/pgsrc/Help%2FWikiPollPlugin
trunk/pgsrc/Help%2FWikiTranslationPlugin
trunk/pgsrc/Help%2FWikiWikiWeb
trunk/pgsrc/Help%2FWikicreole
trunk/pgsrc/Help%2FYouTubePlugin
trunk/pgsrc/Help%2Ftext2pngPlugin
trunk/pgsrc/HomePage
trunk/pgsrc/HomePageAlias
trunk/pgsrc/InterWikiMap
trunk/pgsrc/InterWikiSearch
trunk/pgsrc/LdapSearch
trunk/pgsrc/LeastPopular
trunk/pgsrc/LikePages
trunk/pgsrc/LinkDatabase
trunk/pgsrc/LinkSearch
trunk/pgsrc/ListRelations
trunk/pgsrc/LockedPages
trunk/pgsrc/ModeratedPage
trunk/pgsrc/MostPopular
trunk/pgsrc/MyRatings
trunk/pgsrc/MyRecentChanges
trunk/pgsrc/MyRecentEdits
trunk/pgsrc/NewPagesPerUser
trunk/pgsrc/OrphanedPages
trunk/pgsrc/PageDump
trunk/pgsrc/PageHistory
trunk/pgsrc/PageInfo
trunk/pgsrc/PasswordReset
trunk/pgsrc/PhpWikiAdministration
trunk/pgsrc/PhpWikiAdministration%2FChown
trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl
trunk/pgsrc/PhpWikiAdministration%2FPurge
trunk/pgsrc/PhpWikiAdministration%2FRemove
trunk/pgsrc/PhpWikiAdministration%2FRename
trunk/pgsrc/PhpWikiAdministration%2FSearchReplace
trunk/pgsrc/PhpWikiAdministration%2FSetAcl
trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/pgsrc/PhpWikiDebug
trunk/pgsrc/PhpWikiDocumentation
trunk/pgsrc/PhpWikiManual
trunk/pgsrc/PhpWikiPoll
trunk/pgsrc/PhpWikiRecentChanges
trunk/pgsrc/PluginManager
trunk/pgsrc/ProjectSummary
trunk/pgsrc/RandomPage
trunk/pgsrc/RateIt
trunk/pgsrc/RecentChanges
trunk/pgsrc/RecentChangesMyPages
trunk/pgsrc/RecentComments
trunk/pgsrc/RecentEdits
trunk/pgsrc/RecentNewPages
trunk/pgsrc/RecentReleases
trunk/pgsrc/RecentVisitors
trunk/pgsrc/RelatedChanges
trunk/pgsrc/ReleaseNotes
trunk/pgsrc/San%20Diego
trunk/pgsrc/SandBox
trunk/pgsrc/SearchHighlight
trunk/pgsrc/SemanticRelations
trunk/pgsrc/SemanticSearch
trunk/pgsrc/SetGlobalAccessRights
trunk/pgsrc/SetGlobalAccessRightsSimple
trunk/pgsrc/SpecialPages
trunk/pgsrc/SpellCheck
trunk/pgsrc/SystemInfo
trunk/pgsrc/Template%2FAttribute
trunk/pgsrc/Template%2FCategory
trunk/pgsrc/Template%2FExample
trunk/pgsrc/Template%2FLinkto
trunk/pgsrc/Template%2FNewPlugin
trunk/pgsrc/Template%2FRelation
trunk/pgsrc/Template%2FTalk
trunk/pgsrc/Template%2FUserPage
trunk/pgsrc/The%20PhpWiki%20programming%20team
trunk/pgsrc/TitleSearch
trunk/pgsrc/TranslateText
trunk/pgsrc/UpLoad
trunk/pgsrc/UriResolver
trunk/pgsrc/UserContribs
trunk/pgsrc/UserPreferences
trunk/pgsrc/UserRatings
trunk/pgsrc/WantedPages
trunk/pgsrc/WatchPage
trunk/pgsrc/WhoIsOnline
trunk/pgsrc/WikiAdminSelect
trunk/pgsrc/WikiBlog
trunk/pgsrc/area
trunk/pgsrc/is_a
trunk/pgsrc/located_in
trunk/pgsrc/population
trunk/themes/blog/pgsrc/About
trunk/themes/blog/pgsrc/Blog
trunk/themes/blog/pgsrc/BlogArchives
trunk/themes/blog/pgsrc/CategoryHowTo
trunk/themes/blog/pgsrc/HomePage
trunk/themes/blog/pgsrc/HowTo
trunk/themes/blog/pgsrc/PhotoAlbum
trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates
trunk/themes/fusionforge/pgsrc/CategoryWiki%20user
trunk/themes/fusionforge/pgsrc/ExternalPages
trunk/themes/fusionforge/pgsrc/FindPage
trunk/themes/fusionforge/pgsrc/HomePage
trunk/themes/fusionforge/pgsrc/InterWikiMap
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
trunk/themes/fusionforge/pgsrc/SpecialPages
trunk/themes/fusionforge/pgsrc/TextFormattingRules
trunk/themes/fusionforge/pgsrc/UpLoad
trunk/themes/fusionforge/pgsrc/colorbox
trunk/themes/fusionforge/pgsrc/titlebar
trunk/themes/wikilens/pgsrc/LeftbarContent
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/lib/prepend.php 2014-07-25 10:59:59 UTC (rev 8997)
@@ -5,7 +5,7 @@
*/
// see lib/stdlib.php: phpwiki_version()
-define('PHPWIKI_VERSION', '1.4.0');
+define('PHPWIKI_VERSION', '1.5.0');
/**
* Returns true if current php version is at mimimum a.b.c
Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=%C3%84hnlicheSeiten;
flags="";
Modified: trunk/locale/de/pgsrc/AlleBenutzer
===================================================================
--- trunk/locale/de/pgsrc/AlleBenutzer 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/AlleBenutzer 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=AlleBenutzer;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeiten
===================================================================
--- trunk/locale/de/pgsrc/AlleSeiten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/AlleSeiten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=AlleSeiten;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=AlleSeitenEditiertVonMir;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=AlleSeitenErzeugtVonMir;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=AlleSeitenImBesitzVonMir;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/BackLinks
===================================================================
--- trunk/locale/de/pgsrc/BackLinks 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/BackLinks 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=BackLinks;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen
===================================================================
--- trunk/locale/de/pgsrc/BenutzerEinstellungen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=BenutzerEinstellungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/DebugAuthInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugAuthInfo 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/DebugAuthInfo 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=DebugAuthInfo;
flags=LOCKED;
Modified: trunk/locale/de/pgsrc/DebugGruppenInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugGruppenInfo 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/DebugGruppenInfo 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=DebugGruppenInfo;
flags=LOCKED;
Modified: trunk/locale/de/pgsrc/DebugInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugInfo 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/DebugInfo 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=DebugInfo;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/EditiereText
===================================================================
--- trunk/locale/de/pgsrc/EditiereText 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/EditiereText 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:14:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=EditiereText;
flags="";
Modified: trunk/locale/de/pgsrc/Einstellungen
===================================================================
--- trunk/locale/de/pgsrc/Einstellungen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Einstellungen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Einstellungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/FuzzySuche
===================================================================
--- trunk/locale/de/pgsrc/FuzzySuche 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/FuzzySuche 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=FuzzySuche;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch
===================================================================
--- trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=G%C3%A4steBuch;
flags="";
Modified: trunk/locale/de/pgsrc/GaesteBuch
===================================================================
--- trunk/locale/de/pgsrc/GaesteBuch 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/GaesteBuch 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=GaesteBuch;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Geringf%C3%BCgige%C3%84nderungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/GleicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/GleicheSeiten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/GleicheSeiten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=GleicheSeiten;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe
===================================================================
--- trunk/locale/de/pgsrc/Hilfe 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAktionsSeite;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAutorenProtokollPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FGraphVizPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FGuterStil;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Thu, 12 Jun 2014 17:38:19 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHalloWeltPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHochLadenPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeueSeitePlugin;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeuerKommentarPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhpWiki;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextBearbeiten;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextFormatierungsRegeln;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FVorlagePlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWabiSabi;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWieManWikiBenutzt;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiTechnik;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiWikiWeb;
flags="";
Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/HochLaden 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=HochLaden;
flags="";
Modified: trunk/locale/de/pgsrc/InterWikiListe
===================================================================
--- trunk/locale/de/pgsrc/InterWikiListe 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/InterWikiListe 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=InterWikiListe;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/KategorieAktionSeite
===================================================================
--- trunk/locale/de/pgsrc/KategorieAktionSeite 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/KategorieAktionSeite 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=KategorieAktionSeite;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/KategorieKategorie
===================================================================
--- trunk/locale/de/pgsrc/KategorieKategorie 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/KategorieKategorie 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=KategorieKategorie;
flags="";
Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin
===================================================================
--- trunk/locale/de/pgsrc/KategorieWikiPlugin 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=KategorieWikiPlugin;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/LinkSuche
===================================================================
--- trunk/locale/de/pgsrc/LinkSuche 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/LinkSuche 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=LinkSuche;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/ListeRelationen
===================================================================
--- trunk/locale/de/pgsrc/ListeRelationen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/ListeRelationen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=ListeRelationen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/ListeSeiten
===================================================================
--- trunk/locale/de/pgsrc/ListeSeiten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/ListeSeiten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=ListeSeiten;
flags="";
Modified: trunk/locale/de/pgsrc/MeistBesucht
===================================================================
--- trunk/locale/de/pgsrc/MeistBesucht 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/MeistBesucht 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=MeistBesucht;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/ModerierteSeite 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=ModerierteSeite;
flags="LOCKED";
Modified: trunk/locale/de/pgsrc/NeueSeite
===================================================================
--- trunk/locale/de/pgsrc/NeueSeite 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/NeueSeite 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=NeueSeite;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=Neueste%C3%84nderungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/NeuesteSeiten
===================================================================
--- trunk/locale/de/pgsrc/NeuesteSeiten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/NeuesteSeiten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=NeuesteSeiten;
flags="";
Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
===================================================================
--- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PasswortZur%C3%BCcksetzen;
flags="";
Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiDokumentation 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiDokumentation;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FAclSetzen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FChown;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FL%C3%B6schen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FSuchenErsetzen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FUmbenennen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiUmfrage
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiUmfrage 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/PhpWikiUmfrage 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiUmfrage;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SandKasten
===================================================================
--- trunk/locale/de/pgsrc/SandKasten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/SandKasten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=SandKasten;
flags="";
Modified: trunk/locale/de/pgsrc/SandKiste
===================================================================
--- trunk/locale/de/pgsrc/SandKiste 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/SandKiste 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=SandKiste;
flags="";
Modified: trunk/locale/de/pgsrc/SeiteBeobarten
===================================================================
--- trunk/locale/de/pgsrc/SeiteBeobarten 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/SeiteBeobarten 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=SeiteBeobarten;
flags="";
Modified: trunk/locale/de/pgsrc/SeiteFinden
===================================================================
--- trunk/locale/de/pgsrc/SeiteFinden 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/SeiteFinden 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Mon, 8 Jul 2013 17:59:05 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=SeiteFinden;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SeiteSpeichern
===================================================================
--- trunk/locale/de/pgsrc/SeiteSpeichern 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/SeiteSpeichern 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
Content-Type: application/x-phpwiki;
pagename=SeiteSpeichern;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SeitenErzeugen
===================================================================
--- trunk/locale/de/pgsrc/SeitenErzeugen 2014-07-21 12:04:00 UTC (rev 8996)
+++ trunk/locale/de/pgsrc/SeitenErzeugen 2014-07-25 10:59:59 UTC (rev 8997)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by Ph...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X