Add id attribute to hyperlink and image templates

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

diff --git a/functions/page_header.php b/functions/page_header.php
index 8b4b6b77b3b81be3c3a44393e46c7b0258bcb64a..f3ec779285989df34d75f74191a5bbd49bf33da5 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -169,6 +169,7 @@ function makeInternalLink($path, $text, $target='') {
     //
     $oTemplate->assign('onclick', '');
     $oTemplate->assign('class', '');
+    $oTemplate->assign('id', '');
 
     return $oTemplate->fetch('hyperlink.tpl');
 }

diff --git a/functions/strings.php b/functions/strings.php
index a6096d9e93af714bc26c76e5d8632a39d8659aaa..757ebdb2ff67d2285e27d7abfd975465488cb389 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -816,6 +816,7 @@ function makeComposeLink($url, $text = null, $target='') {
         $oTemplate->assign('text', $text);
         $oTemplate->assign('onclick', "comp_in_new('$compuri','$compose_width','$compose_height')");
         $oTemplate->assign('class', '');
+        $oTemplate->assign('id', '');
         return $oTemplate->fetch('hyperlink.tpl');
     }
 

diff --git a/functions/template/general_util.php b/functions/template/general_util.php
index 512b9f1c8d1517deacc6ea9b09aaf1763c3544c4..bb320a245edd77d9cb4101e1c29aa013b71a0f85 100644 (file)
--- a/functions/template/general_util.php
+++ b/functions/template/general_util.php
@@ -117,6 +117,8 @@ function getIcon($icon_theme_path, $icon_name, $text_icon, $alt_text='', $w=NULL
             $oTemplate->assign('border', '');
             $oTemplate->assign('hspace', '');
             $oTemplate->assign('vspace', '');
+            $oTemplate->assign('class', '');
+            $oTemplate->assign('id', '');
 
             $icon = $oTemplate->fetch('image.tpl');
         } else {

diff --git a/plugins/listcommands/functions.php b/plugins/listcommands/functions.php
index c2cf13d83837f2d6439bf938f2a340e0e4ca06ac..b906c8cc807abc38c8666f07a0aa02ffb4d3469a 100644 (file)
--- a/plugins/listcommands/functions.php
+++ b/plugins/listcommands/functions.php
@@ -67,6 +67,7 @@ function plugin_listcommands_menu_do() {
             $oTemplate->assign('target', '_blank');
             $oTemplate->assign('text', $fieldsdescr[$cmd]);
             $oTemplate->assign('class', '');
+            $oTemplate->assign('id', '');
             $oTemplate->assign('onclick', '');
             $output = $oTemplate->fetch('hyperlink.tpl');
             $links[] = $output;

diff --git a/src/login.php b/src/login.php
index 5c35a8870dc94ead4a2a428e77ff40d3c05d1214..670130f984fd35b575105dd0d75ed90f96b3b466 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -145,6 +145,8 @@ if (isset($org_logo) && $org_logo) {
         $oTemplate->assign('height', '');
     }
     $oTemplate->assign('onclick', '');
+    $oTemplate->assign('id', '');
+    $oTemplate->assign('title', '');
     $oTemplate->assign('align', '');
     $oTemplate->assign('border', '');
     $oTemplate->assign('hspace', '');

diff --git a/templates/default/hyperlink.tpl b/templates/default/hyperlink.tpl
index 50f83888b55f66263fb496e660bd0f6d20cd2a91..52156d8292e38e22bd1b535665b9ea7dd73436e9 100644 (file)
--- a/templates/default/hyperlink.tpl
+++ b/templates/default/hyperlink.tpl
@@ -12,6 +12,7 @@
   *                   (optional; may not be present)
   *      + $onclick - onClick JavaScript handler (optional; may not be present)
   *      + $class   - CSS class name (optional; may not be present)
+  *      + $id      - ID name (optional; may not be present)
   *
   * @copyright © 1999-2006 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -26,4 +27,4 @@
 extract($t);
 
 
-?><a href="<?php echo $uri ?>"<?php if (!empty($target)) echo ' target="' . $target . '"'; ?><?php if (!empty($onclick)) echo ' onclick="' . $onclick . '"'; ?><?php if (!empty($class)) echo ' class="' . $class . '"'; ?>><?php echo $text; ?></a>
+?><a href="<?php echo $uri ?>"<?php if (!empty($target)) echo ' target="' . $target . '"'; ?><?php if (!empty($onclick)) echo ' onclick="' . $onclick . '"'; ?><?php if (!empty($class)) echo ' class="' . $class . '"'; ?><?php if (!empty($id)) echo ' id="' . $id . '"'; ?>><?php echo $text; ?></a>

diff --git a/templates/default/image.tpl b/templates/default/image.tpl
index d9d4fbaa1c4ca125d11da7f6467b1c8a8458b32a..3f06277da39644add47f5a19f20034f2792bf2f7 100644 (file)
--- a/templates/default/image.tpl
+++ b/templates/default/image.tpl
@@ -7,6 +7,7 @@
   *
   * The following variables are available in this template:
   *      + $src     - the image source path
+  *      + $id      - ID name (optional; may not be present)
   *      + $class   - CSS class name (optional; may not be present)
   *      + $alt     - alternative link text
   *                   (optional; may not be present)
@@ -39,4 +40,4 @@
 extract($t);
 
 
-?><img src="<?php echo $src ?>"<?php if (!empty($class)) echo ' class="' . $class . '"'; ?><?php if (!empty($alt)) echo ' alt="' . $alt . '"'; ?><?php if (!empty($title)) echo ' title="' . $title . '"'; ?><?php if (!empty($onclick)) echo ' onclick="' . $onclick . '"'; ?><?php if (!empty($width)) echo ' width="' . $width . '"'; ?><?php if (!empty($height)) echo ' height="' . $height . '"'; ?><?php if (!empty($align)) echo ' align="' . $align . '"'; ?><?php if (!empty($border)) echo ' border="' . $border . '"'; ?><?php if (!empty($hspace)) echo ' hspace="' . $hspace . '"'; ?><?php if (!empty($vspace)) echo ' vspace="' . $vspace . '"'; ?> />
+?><img src="<?php echo $src ?>"<?php if (!empty($class)) echo ' class="' . $class . '"'; ?><?php if (!empty($id)) echo ' id="' . $id . '"'; ?><?php if (!empty($alt)) echo ' alt="' . $alt . '"'; ?><?php if (!empty($title)) echo ' title="' . $title . '"'; ?><?php if (!empty($onclick)) echo ' onclick="' . $onclick . '"'; ?><?php if (!empty($width)) echo ' width="' . $width . '"'; ?><?php if (!empty($height)) echo ' height="' . $height . '"'; ?><?php if (!empty($align)) echo ' align="' . $align . '"'; ?><?php if (!empty($border)) echo ' border="' . $border . '"'; ?><?php if (!empty($hspace)) echo ' hspace="' . $hspace . '"'; ?><?php if (!empty($vspace)) echo ' vspace="' . $vspace . '"'; ?> />