Allow text alternative for images to percolate all the way through template layers

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12031 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/html.php b/functions/html.php
index 3ce05b3f8e063345e2e618f9dc227f105150cb0e..3172bc5044d4c7fd855e0def212b323d61fea25e 100644 (file)
--- a/functions/html.php
+++ b/functions/html.php
@@ -74,6 +74,12 @@ function create_hyperlink($uri, $text, $target='', $onclick='', $class='', $id='
  *                        (OPTIONAL; default not used)
  * @param string $vspace  The image's vspace attribute value 
  *                        (OPTIONAL; default not used)
+ * @param string $text_alternative A text replacement for the entire
+ *                                 image tag, to be used at the 
+ *                                 discretion of the template set,
+ *                                 if for some reason the image tag
+ *                                 cannot or should not be produced
+ *                                 (OPTIONAL; default not used)
  *
  * @return string The desired hyperlink tag.
  *
@@ -82,7 +88,8 @@ function create_hyperlink($uri, $text, $target='', $onclick='', $class='', $id='
  */
 function create_image($src, $alt='', $width='', $height='', 
                       $border='', $class='', $id='', $onclick='', 
-                      $title='', $align='', $hspace='', $vspace='') {
+                      $title='', $align='', $hspace='', $vspace='',
+                      $text_alternative='') {
 
     global $oTemplate;
 
@@ -98,6 +105,7 @@ function create_image($src, $alt='', $width='', $height='',
     $oTemplate->assign('align', $align);
     $oTemplate->assign('hspace', $hspace);
     $oTemplate->assign('vspace', $vspace);
+    $oTemplate->assign('text_alternative', $text_alternative);
 
     return $oTemplate->fetch('image.tpl');
 

diff --git a/functions/template/general_util.php b/functions/template/general_util.php
index 48db0e6852069b41f55331fdf230e19c363f34fb..8ea12de51137256309db4dfc00383fe4965cacca 100644 (file)
--- a/functions/template/general_util.php
+++ b/functions/template/general_util.php
@@ -103,7 +103,8 @@ function getIcon($icon_theme_path, $icon_name, $text_icon, $alt_text='', $w=NULL
         // If we found an icon, build an img tag to display it.  If we didn't
         // find an image, we will revert back to the text icon.
         if (!is_null($icon_path)) {
-            $icon = create_image($icon_path, $alt_text, $w, $h, '', '', '', '', $alt_text);
+            $icon = create_image($icon_path, $alt_text, $w, $h, '', '', '', 
+                                 '', $alt_text, '', '', '', $text_icon);
         } else {
             $icon = $text_icon;
         }

diff --git a/templates/default/image.tpl b/templates/default/image.tpl
index 3f06277da39644add47f5a19f20034f2792bf2f7..61ad8cf83cc445e955869e7ac64e6a2d29d09109 100644 (file)
--- a/templates/default/image.tpl
+++ b/templates/default/image.tpl
@@ -26,6 +26,10 @@
   *      + $vspace  - the image's vspace attribute value
   *                   (optional; may not be present)
   *      + $onclick - onClick JavaScript handler (optional; may not be present)
+  *      + $text_alternative - A text replacement for the entire
+  *                            image tag, if for some reason the 
+  *                            image tag cannot or should not be 
+  *                            produced (optional; may not be present)
   *
   * @copyright © 1999-2006 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License