removed 'ALT+' from all titles of elements with accesskeys (FS#1172)

darcs-hash:20081012181638-f7d6d-d4614321134f78fc176688d8aaf9d9acccf1952e.gz

4 files changed, 6 insertions, 6 deletions

diff --git a/inc/form.php b/inc/form.php
index cd72f7b43..767788ea4 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -350,7 +350,7 @@ function form_makeButton($type, $act, $value='', $attrs=array()) {
   $elem = array('_elem'=>'button', 'type'=>$type, '_action'=>$act, 
                 'value'=>$value, 'class'=>'button');
   if (!empty($attrs['accesskey']) && empty($attrs['title'])) {
-    $attrs['title'] = $value . ' [ALT+'.strtoupper($attrs['accesskey']).']';
+    $attrs['title'] = $value . ' ['.strtoupper($attrs['accesskey']).']';
   }
   return array_merge($elem, $attrs);
 }
diff --git a/inc/html.php b/inc/html.php
index b9c6138b2..570f12b17 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -183,8 +183,8 @@ function html_btn($name,$id,$akey,$params,$method='get',$tooltip=''){
 
   $ret .= '<input type="submit" value="'.htmlspecialchars($label).'" class="button" ';
   if($akey){
-    $tip .= ' [ALT+'.strtoupper($akey).']';
-    $ret .= 'accesskey="'.$akey.'" ';
+    $tip .= ' ['.strtoupper($akey).']';
+    $ret .= 'accesskey="'.htmlspecialchars($label).' '.$akey.'" ';
   }
   $ret .= 'title="'.$tip.'" ';
   $ret .= '/>';
diff --git a/inc/media.php b/inc/media.php
index 243772ad5..0da8a8578 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -132,9 +132,9 @@ function media_metaform($id,$auth){
     echo '<div class="buttons">'.NL;
     echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
     echo '<input name="do[save]" type="submit" value="'.$lang['btn_save'].
-         '" title="ALT+S" accesskey="s" class="button" />'.NL;
+         '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
     echo '<input name="do[cancel]" type="submit" value="'.$lang['btn_cancel'].
-         '" title="ALT+C" accesskey="c" class="button" />'.NL;
+         '" title="'.$lang['btn_cancel'].' [C]" accesskey="c" class="button" />'.NL;
     echo '</div>'.NL;
     echo '</form>'.NL;
 }
diff --git a/inc/template.php b/inc/template.php
index 1385c7547..7fea8c7ac 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -790,7 +790,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
   print '<input type="text" ';
   if($ACT == 'search') print 'value="'.htmlspecialchars($_REQUEST['id']).'" ';
   if(!$autocomplete) print 'autocomplete="off" ';
-  print 'id="qsearch__in" accesskey="f" name="id" class="edit" title="[ALT+F]" />';
+  print 'id="qsearch__in" accesskey="f" name="id" class="edit" title="[F]" />';
   print '<input type="submit" value="'.$lang['btn_search'].'" class="button" title="'.$lang['btn_search'].'" />';
   if($ajax) print '<div id="qsearch__out" class="ajax_qsearch JSpopup"></div>';
   print '</div></form>';