Happy New Year

[squirrelmail.git] / templates / default / read_toolbar.tpl

diff --git a/templates/default/read_toolbar.tpl b/templates/default/read_toolbar.tpl
index 2d6d8791ecb9b60621aadf90846f519f4b0cb7cb..ed28c966434e40b2be76aaaad8c6d66bbb3714bb 100644 (file)
--- a/templates/default/read_toolbar.tpl
+++ b/templates/default/read_toolbar.tpl
@@ -11,8 +11,9 @@
  *               following elements:
  *          $link['URL']  - URL needed to access the action
  *          $link['Text'] - Text to be displayed for the action.
+ *          $link['Target'] - Optional link target
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2018 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -33,36 +34,11 @@ extract($t);
         if (empty($link['Text']))
             continue;
             
-        # Printer firendly link must be handled a little differently
-        if ($link['Text'] == _("View Printable Version")) {
-            if ($javascript_on) {
-                ?>
- <script type="text/javascript">
- <!--
- function printFormat () {
-     print_win = window.open("../src/printer_friendly_main.php<?php echo $link['URL']; ?>", "Print", "width=800; height=600");
-     print_win.focus();
- }
- // -->
- </script>
- <a href="javascript:printFormat()"><?php echo $link['Text']; ?></a>
-                <?php
-            } else {
-                # everything else follows this format...
-                ?>
- <a href="../src/printer_friendly_bottom.php<?php echo $link['URL']; ?>" target="_blank"><?php echo $link['Text']; ?></a>
-               <?php
-            }
-        } else {
-            ?>
- <a href="<?php echo $link['URL']; ?>"><?php echo $link['Text']; ?></a>
-            <?php
-        }
+            ?><a href="<?php echo $link['URL']; ?>"<?php echo (empty($link['Target'])?'':' target="' . $link['Target'] . '"')?> style="white-space: nowrap;"><?php echo $link['Text']; ?></a><?php
         
         # Spit out a divider between each element
         if ($count < count($links)-1) {
-            ?>
- &nbsp;|&nbsp;
+            ?>&nbsp;|
             <?php
         }
     }