Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9717] trunk
|
From: <var...@us...> - 2015-08-20 16:28:58
|
Revision: 9717
http://sourceforge.net/p/phpwiki/code/9717
Author: vargenau
Date: 2015-08-20 16:28:55 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
Remove accesskeys
Modified Paths:
--------------
trunk/lib/HtmlElement.php
trunk/lib/WikiTheme.php
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
trunk/passencrypt.php
trunk/pgsrc/ReleaseNotes
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Sidebar/templates/logo.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/Sidebar/templates/search.tmpl
trunk/themes/default/templates/search.tmpl
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/lib/HtmlElement.php 2015-08-20 16:28:55 UTC (rev 9717)
@@ -70,12 +70,10 @@
/** Add a "tooltip" to an element.
*
* @param string $tooltip_text The tooltip text.
- * @param string $accesskey.
*/
- function addTooltip($tooltip_text, $accesskey = '')
+ function addTooltip($tooltip_text)
{
$this->setAttr('title', $tooltip_text);
- if ($accesskey) $this->setAccesskey($accesskey);
// FIXME: this should be initialized from title by an onLoad() function.
// (though, that may not be possible.)
@@ -85,28 +83,6 @@
$this->setAttr('onmouseout', "window.status='';return true;");
}
- function setAccesskey($key)
- {
- global $WikiTheme;
- if (strlen($key) != 1) return;
- $this->setAttr("accesskey", $key);
-
- if (!empty($this->_attr['title'])) {
- if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m)) {
- $this->_attr['title'] = preg_replace
- ("/\[(alt-)?(.)\]$/",
- "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-\\2]",
- $this->_attr['title']);
- } else {
- $this->_attr['title'] .=
- " [" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
- }
- } else {
- $this->_attr['title'] =
- "[" . $WikiTheme->tooltipAccessKeyPrefix() . "-$key]";
- }
- }
-
function emptyTag()
{
if (($this->_properties & HTMLTAG_EMPTY) == 0)
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/lib/WikiTheme.php 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1030,41 +1030,9 @@
if ($action == 'browse')
unset($attr['action']);
- $options = $this->fixAccesskey($options);
-
return $this->makeButton($label, WikiURL($pagename, $attr), $class, $options);
}
- function tooltipAccessKeyPrefix()
- {
- static $tooltipAccessKeyPrefix = null;
- if ($tooltipAccessKeyPrefix) return $tooltipAccessKeyPrefix;
-
- $tooltipAccessKeyPrefix = 'alt';
- if (isBrowserOpera()) $tooltipAccessKeyPrefix = 'shift-esc';
- elseif (isBrowserSafari() or browserDetect("Mac") or isBrowserKonqueror())
- $tooltipAccessKeyPrefix = 'ctrl'; // ff2 win and x11 only
- elseif ((browserDetect("firefox/2") or browserDetect("minefield/3") or browserDetect("SeaMonkey/1.1"))
- and ((browserDetect("windows") or browserDetect("x11")))
- )
- $tooltipAccessKeyPrefix = 'alt-shift';
- return $tooltipAccessKeyPrefix;
- }
-
- /*
- * Define the access key in the title only, with ending [p] or [alt-p].
- * This fixes the prefix in the title and sets the access key.
- */
- function fixAccesskey($attrs)
- {
- if (!empty($attrs['title']) and preg_match("/\[(alt-)?(.)\]$/", $attrs['title'], $m)) {
- if (empty($attrs['accesskey'])) $attrs['accesskey'] = $m[2];
- // firefox 'alt-shift', MSIE: 'alt', ... see wikibits.js
- $attrs['title'] = preg_replace("/\[(alt-)?(.)\]$/", "[" . $this->tooltipAccessKeyPrefix() . "-\\2]", $attrs['title']);
- }
- return $attrs;
- }
-
/**
* Make a "button" which links to a wiki-page.
*
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/lib/editpage.php 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1032,16 +1032,13 @@
}
$el['PREVIEW_B'] = Button('submit:edit[preview]', _("Preview"),
'wikiaction',
- array('accesskey' => 'p',
- 'title' => _('Preview the current content [alt-p]')));
+ array('title' => _('Preview the current content')));
$el['SAVE_B'] = Button('submit:edit[save]',
_("Save"), 'wikiaction',
- array('accesskey' => 's',
- 'title' => _('Save the current content as wikipage [alt-s]')));
+ array('title' => _('Save the current content as wikipage')));
$el['CHANGES_B'] = Button('submit:edit[diff]',
_("Changes"), 'wikiaction',
- array('accesskey' => 'c',
- 'title' => _('Preview the current changes as diff [alt-c]')));
+ array('title' => _('Preview the current changes as diff')));
$el['UPLOAD_B'] = Button('submit:edit[upload]',
_("Upload"), 'wikiaction',
array('title' => _('Select a local file and press Upload to attach into this page')));
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 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/de.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+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."
@@ -429,17 +429,19 @@
msgid "Insert Image or Video"
msgstr "Bild oder Video einfügen"
-msgid "Preview the current content [alt-p]"
-msgstr "Die aktuelle Version vorschauen [alt-p]"
+msgid "Preview the current content"
+msgstr "Die aktuelle Version vorschauen"
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
+#, fuzzy
+msgid "Save the current content as wikipage"
+msgstr "Die aktuelle Version vorschauen"
msgid "Changes"
msgstr "Änderungen"
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
+#, fuzzy
+msgid "Preview the current changes as diff"
+msgstr "Die aktuelle Version vorschauen"
msgid "Upload"
msgstr "Hochladen"
@@ -6082,30 +6084,9 @@
msgid "Upgrade"
msgstr "Updaten"
-#~ msgid "Bold text [alt-b]"
-#~ msgstr "Fetter Text [alt-f]"
-
-#~ msgid "Italic text [alt-i]"
-#~ msgstr "Kursiver Text [alt-k]"
-
-#~ msgid "Strike"
-#~ msgstr "Durchstreichen"
-
-#~ msgid "Color"
-#~ msgstr "Farbe"
-
-#~ msgid "H"
-#~ msgstr "H."
-
-#~ msgid "W"
-#~ msgstr "Br."
-
#~ msgid "Adjust"
#~ msgstr "Justieren"
-#~ msgid "PgsrcTranslation"
-#~ msgstr "PgsrcTranslation"
-
#~ msgid "Wanted Pages for %s (%d total):"
#~ msgstr "WunschZettelSeiten für %s (%d gesamt):"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/es.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -426,17 +426,19 @@
msgstr ""
#, fuzzy
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr "Vea la versión actual"
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
+#, fuzzy
+msgid "Save the current content as wikipage"
+msgstr "Vea la versión actual"
msgid "Changes"
msgstr "Cambios"
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
+#, fuzzy
+msgid "Preview the current changes as diff"
+msgstr "Vea la versión actual"
msgid "Upload"
msgstr ""
@@ -5906,21 +5908,9 @@
msgid "Upgrade"
msgstr "Mejora"
-#~ msgid "Bold text [alt-b]"
-#~ msgstr "Texto en negrilla [alt-b]"
-
-#~ msgid "Italic text [alt-i]"
-#~ msgstr "Texto del itálico [alt-i]"
-
#~ msgid "Click a button to get an example text"
#~ msgstr "Chasque un botón para conseguir un texto del ejemplo"
-#~ msgid "H"
-#~ msgstr "Al"
-
-#~ msgid "W"
-#~ msgstr "An"
-
#~ msgid "Columns: %s."
#~ msgstr "Columnas: %s."
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/fr.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+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."
@@ -433,17 +433,17 @@
msgid "Insert Image or Video"
msgstr "Ajouter une image ou une vidéo"
-msgid "Preview the current content [alt-p]"
-msgstr "Prévisualiser le contenu actuel [alt-p]"
+msgid "Preview the current content"
+msgstr "Prévisualiser le contenu actuel"
-msgid "Save the current content as wikipage [alt-s]"
-msgstr "Enregistrer le contenu actuel dans la page wiki [alt-s]"
+msgid "Save the current content as wikipage"
+msgstr "Enregistrer le contenu actuel dans la page wiki"
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 "Preview the current changes as diff"
+msgstr "Prévisualiser les modifications actuelles en tant que diff"
msgid "Upload"
msgstr "Télécharger"
@@ -6008,27 +6008,9 @@
msgid "Upgrade"
msgstr "Mettre à jour"
-#~ msgid "Bold text [alt-b]"
-#~ msgstr "Gras [alt-b]"
-
-#~ msgid "Italic text [alt-i]"
-#~ msgstr "Italique [alt-i]"
-
-#~ msgid "Strike"
-#~ msgstr "Biffé"
-
-#~ msgid "Color"
-#~ msgstr "Couleur"
-
#~ msgid "Click a button to get an example text"
#~ msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
-#~ msgid "H"
-#~ msgstr "H"
-
-#~ msgid "W"
-#~ msgstr "L"
-
#~ msgid "Adjust"
#~ msgstr "Ajuster"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/it.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+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"
@@ -416,17 +416,19 @@
msgstr ""
#, fuzzy
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr "Mostra il versione corrente"
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
+#, fuzzy
+msgid "Save the current content as wikipage"
+msgstr "Mostra il versione corrente"
msgid "Changes"
msgstr ""
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
+#, fuzzy
+msgid "Preview the current changes as diff"
+msgstr "Mostra il versione corrente"
msgid "Upload"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/ja.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+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"
@@ -404,17 +404,19 @@
msgstr ""
#, fuzzy
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr "現在のバージョンを表示する"
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
+#, fuzzy
+msgid "Save the current content as wikipage"
+msgstr "現在のバージョンを表示する"
msgid "Changes"
msgstr ""
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
+#, fuzzy
+msgid "Preview the current changes as diff"
+msgstr "現在のバージョンを表示する"
msgid "Upload"
msgstr "アップロード"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/nl.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+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"
@@ -409,16 +409,16 @@
msgid "Insert Image or Video"
msgstr ""
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr ""
-msgid "Save the current content as wikipage [alt-s]"
+msgid "Save the current content as wikipage"
msgstr ""
msgid "Changes"
msgstr "Veranderingen"
-msgid "Preview the current changes as diff [alt-c]"
+msgid "Preview the current changes as diff"
msgstr ""
msgid "Upload"
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/phpwiki.pot 2015-08-20 16:28:55 UTC (rev 9717)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+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"
@@ -403,16 +403,16 @@
msgid "Insert Image or Video"
msgstr ""
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr ""
-msgid "Save the current content as wikipage [alt-s]"
+msgid "Save the current content as wikipage"
msgstr ""
msgid "Changes"
msgstr ""
-msgid "Preview the current changes as diff [alt-c]"
+msgid "Preview the current changes as diff"
msgstr ""
msgid "Upload"
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/sv.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -404,16 +404,16 @@
msgid "Insert Image or Video"
msgstr ""
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr ""
-msgid "Save the current content as wikipage [alt-s]"
+msgid "Save the current content as wikipage"
msgstr ""
msgid "Changes"
msgstr "Ändringar"
-msgid "Preview the current changes as diff [alt-c]"
+msgid "Preview the current changes as diff"
msgstr ""
msgid "Upload"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/locale/po/zh.po 2015-08-20 16:28:55 UTC (rev 9717)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 14:50+0200\n"
+"POT-Creation-Date: 2015-08-20 18:25+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -426,17 +426,19 @@
msgstr ""
#, fuzzy
-msgid "Preview the current content [alt-p]"
+msgid "Preview the current content"
msgstr "查看目前版本"
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
+#, fuzzy
+msgid "Save the current content as wikipage"
+msgstr "查看目前版本"
msgid "Changes"
msgstr ""
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
+#, fuzzy
+msgid "Preview the current changes as diff"
+msgstr "查看目前版本"
msgid "Upload"
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/passencrypt.php
===================================================================
--- trunk/passencrypt.php 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/passencrypt.php 2015-08-20 16:28:55 UTC (rev 9717)
@@ -111,7 +111,7 @@
<form action="<?php echo $REQUEST_URI ?>" method="post">
<fieldset>
- <legend accesskey="P">Encrypt</legend>
+ <legend>Encrypt</legend>
Enter a password twice to encrypt it:<br/>
<input type="password" name="password" value=""/><br/>
<input type="password" name="password2" value=""/> <input type="submit" value="Encrypt"/>
@@ -120,7 +120,7 @@
or:<br/>
<br/>
<fieldset>
- <legend accesskey="C">Generate</legend>
+ <legend>Generate</legend>
Create a new random password: <input type="submit" name="create" value="Create"/>
</fieldset>
</form>
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/pgsrc/ReleaseNotes 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Jul 2015 11:05:03 +0000
+Date: Thu, 20 Aug 2015 18:21:22 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -11,6 +11,7 @@
== 1.5.5 2015-XX-XX Marc-Etienne Vargenau ==
* Fix tooltip translation in ~CreateToc plugin
+* Remove access keys
== 1.5.4 2015-06-29 Marc-Etienne Vargenau ==
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1,5 +1,4 @@
<?php
- //$p = $WikiTheme->tooltipAccessKeyPrefix();
$dbh = $request->getDbh();
$isAdmin = $user->isAdmin();
$pagename = $page->getName();
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1,7 +1,6 @@
<?php
// With MonoBook it is similar to Sidebar, named boxes at the left.
// actionbuttons, navigation, search, toolbox
-$p = $WikiTheme->tooltipAccessKeyPrefix();
?>
<!-- The left navigation/search bar -->
<!-- Here you should add favorite Links and Categories -->
@@ -10,7 +9,7 @@
<div class="pBody">
<ul>
<li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li>
- <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?></li>
+ <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li>
<li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
<li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
<li id="n-likepages"><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li>
@@ -55,7 +54,7 @@
<li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
<?php } ?>
<?php if ($user->isSignedIn()) { ?>
- <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+ <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
<?php } ?>
<?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
<script type="text/javascript"><!--
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/MonoBook/themeinfo.php 2015-08-20 16:28:55 UTC (rev 9717)
@@ -49,7 +49,6 @@
if ($action == 'browse')
unset($attr['action']);
- $options = $this->fixAccesskey($options);
return $this->makeButton($label, WikiURL($pagename, $attr), $class, $options);
}
Modified: trunk/themes/Sidebar/templates/logo.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/logo.tmpl 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/Sidebar/templates/logo.tmpl 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1,2 +1,2 @@
-<div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" title="Visit the Home Page [<?php echo $WikiTheme->tooltipAccessKeyPrefix() ?>-z]" accesskey="z"><span class="logo"><?php echo WIKI_NAME ?></span></a></div>
+<div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" title="Visit the Home Page"><span class="logo"><?php echo WIKI_NAME ?></span></a></div>
<img id="img-logo-right" src="<?php echo $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" height="86" width="86" />
Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/Sidebar/templates/navbar.tmpl 2015-08-20 16:28:55 UTC (rev 9717)
@@ -1,7 +1,6 @@
<?php
// With MonoBook it is similar to Sidebar, named boxes at the left.
// actionbuttons, navigation, search, toolbox
-$p = $WikiTheme->tooltipAccessKeyPrefix();
?>
<!-- The left navigation/search bar -->
<!-- Here you should add favorite Links and Categories -->
@@ -39,13 +38,13 @@
<h2><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h2>
<div class="pBody" id="p-tb-body">
<ul>
- <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?> </li>
+ <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li>
<li><?php echo WikiLink(_("RecentNewPages")) ?></li>
<?php if (!empty($revision)) { ?>
<li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+ <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li>
<li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
<?php } ?>
<?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
Modified: trunk/themes/Sidebar/templates/search.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/search.tmpl 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/Sidebar/templates/search.tmpl 2015-08-20 16:28:55 UTC (rev 9717)
@@ -3,7 +3,6 @@
method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
<?php
$s = $request->getArg('s') ? $request->getArg('s') : _("Search");
-$p = $WikiTheme->tooltipAccessKeyPrefix();
if (! USE_PATH_INFO) { ?>
<input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />
<?php } ?>
@@ -14,9 +13,8 @@
onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
onmouseout="window.status=''; return true;"
onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
- accesskey="f"
type="text" id="search"
- title="<?php echo _("Search term(s)") . " [$p-f]"?>" />
+ title="<?php echo _("Search term(s)") ?>" />
<?php echo $SEARCH_AFTER ?>
</form>
</div>
Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl 2015-08-17 15:19:33 UTC (rev 9716)
+++ trunk/themes/default/templates/search.tmpl 2015-08-20 16:28:55 UTC (rev 9717)
@@ -3,7 +3,6 @@
method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
<?php
$s = $request->getArg('s') ? $request->getArg('s') : _("Search");
-$p = $WikiTheme->tooltipAccessKeyPrefix();
if (! USE_PATH_INFO) { ?>
<input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" />
<?php } ?>
@@ -14,9 +13,8 @@
onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
onmouseout="window.status=''; return true;"
onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
- accesskey="f"
type="text" id="search"
- title="<?php echo _("TitleSearch") . " [$p-f]"?>" />
+ title="<?php echo _("TitleSearch") ?>" />
<?php echo empty($SEARCH_AFTER) ? '' : $SEARCH_AFTER ?>
</form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
