From 11ea018f9b6b30192b2a8c08a85265bdf9d3ce21 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 24 Jul 2006 18:51:58 +0200
Subject: add button lables to title attribute #862

Instead of only showing the accesskey in button's title tooltips now the button
label is shown additionally. This helps blind users with screenreaders.

darcs-hash:20060724165158-7ad00-056481f9120c383cac03b1b2c6c397e829b7d103.gz
---
 inc/html.php     | 23 ++++++++++++++---------
 inc/template.php |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 58199e1cd..128cdeb00 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -150,7 +150,7 @@ function html_topbtn(){
   global $lang;
 
   $ret  = '';
-  $ret  = '<a class="nolink" href="#dokuwiki__top"><input type="button" class="button" value="'.$lang['btn_top'].'" onclick="window.scrollTo(0, 0)" /></a>';
+  $ret  = '<a class="nolink" href="#dokuwiki__top"><input type="button" class="button" value="'.$lang['btn_top'].'" onclick="window.scrollTo(0, 0)" title="'.$lang['btn_top'].'" /></a>';
 
   return $ret;
 }
@@ -173,10 +173,12 @@ function html_backtomedia_button($params,$akey=''){
   }
 
   $ret .= '<input type="submit" value="'.htmlspecialchars($lang['btn_backtomedia']).'" class="button" ';
+  $tit = htmlspecialchars($lang['btn_backtomedia']);
   if($akey){
-    $ret .= 'title="ALT+'.strtoupper($akey).'" ';
+    $tit .= ' [ALT+'.strtoupper($akey).']';
     $ret .= 'accesskey="'.$akey.'" ';
   }
+  $ret .= 'title="'.$tit.'" ';
   $ret .= '/>';
   $ret .= '</div></form>';
 
@@ -221,14 +223,17 @@ function html_btn($name,$id,$akey,$params,$method='get',$tooltip=''){
     }
   }
 
+  if ($tooltip!='') {
+      $tip = htmlspecialchars($tooltip);
+  }else{
+      $tip = htmlspecialchars($label);
+  }
+
   $ret .= '<input type="submit" value="'.htmlspecialchars($label).'" class="button" ';
   if($akey){
-    $tip = '[ALT+'.strtoupper($akey).']';
+    $tip .= ' [ALT+'.strtoupper($akey).']';
     $ret .= 'accesskey="'.$akey.'" ';
   }
-  if ($tooltip!='') {
-      $tip = htmlspecialchars($tooltip);
-  }
   $ret .= 'title="'.$tip.'" ';
   $ret .= '/>';
   $ret .= '</div></form>';
@@ -823,7 +828,7 @@ function html_conflict($text,$summary){
     <input type="hidden" name="wikitext" value="<?php echo formText($text)?>" />
     <input type="hidden" name="summary" value="<?php echo formText($summary)?>" />
 
-    <input class="button" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="[ALT+S]" />
+    <input class="button" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="<?php echo $lang['btn_save']?> [ALT+S]" />
     <input class="button" type="submit" name="do" value="<?php echo $lang['btn_cancel']?>" />
   </div>
   </form>
@@ -1062,8 +1067,8 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
       <div id="size__ctl"></div>
       <?php if($wr){?>
          <div class="editButtons">
-            <input class="button" id="edbtn__save" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="[ALT+S]" tabindex="4" />
-            <input class="button" id="edbtn__preview" type="submit" name="do" value="<?php echo $lang['btn_preview']?>" accesskey="p" title="[ALT+P]" tabindex="5" />
+            <input class="button" id="edbtn__save" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="<?php echo $lang['btn_save']?> [ALT+S]" tabindex="4" />
+            <input class="button" id="edbtn__preview" type="submit" name="do" value="<?php echo $lang['btn_preview']?>" accesskey="p" title="<?php echo $lang['btn_preview']?> [ALT+P]" tabindex="5" />
             <input class="button" type="submit" name="do[draftdel]" value="<?php echo $lang['btn_cancel']?>" tabindex="6" />
          </div>
       <?php } ?>
diff --git a/inc/template.php b/inc/template.php
index 82a1bdef7..ac24096a3 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -527,7 +527,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
   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 '<input type="submit" value="'.$lang['btn_search'].'" class="button" />';
+  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>';
 }
-- 
cgit v1.2.3