Misc template changes

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

diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl
index 106bc236ff11e401c4eab18b2043fb5a6f59d125..bbe6b1914c93b3461e0df6bad4984ada3f697102 100644 (file)
--- a/templates/default/left_main.tpl
+++ b/templates/default/left_main.tpl
@@ -10,8 +10,8 @@
  *                         template.  Indexes are as follows:
  *          $settings['iconThemePath'] - Path to the desired icon theme.  If
  *                         the user has disabled icons, this will be NULL.
- *          $settings['templateDirectory'] - contains the path to the current
- *                         template directory.  This may be needed by third
+ *          $settings['templateID'] - contains the ID of the current
+ *                         template set.  This may be needed by third
  *                         party packages that don't integrate easily.
  *          $settings['unreadNotificationEnabled'] - Boolean TRUE if the user
  *                         wants to see unread message count on mailboxes

diff --git a/templates/default/webmail.tpl b/templates/default/webmail.tpl
index c3a8d3facd88517ba031d927985dbd66c1ce66f8..7cfd793c90b9bfb7c2d7aea4019b8874a31a5af6 100644 (file)
--- a/templates/default/webmail.tpl
+++ b/templates/default/webmail.tpl
@@ -45,4 +45,4 @@ if ($ret != '') {
     $output = $ret;
 }
 
-echo $output ."\n</frameset>";
\ No newline at end of file
+echo $output ."\n</frameset>";

diff --git a/templates/default_advanced/left_main.tpl b/templates/default_advanced/left_main.tpl
index 423799d47be084328af71415d4509c731e71b8a9..cedc11c7c0796fc7313460e0a971ca5e41df3569 100644 (file)
--- a/templates/default_advanced/left_main.tpl
+++ b/templates/default_advanced/left_main.tpl
@@ -14,8 +14,8 @@
  *                         template.  Indexes are as follows:
  *          $settings['iconThemePath'] - Path to the desired icon theme.  If
  *                         the user has disabled icons, this will be NULL.
- *          $settings['templateDirectory'] - contains the path to the current
- *                         template directory.  This may be needed by third
+ *          $settings['templateID'] - contains the ID of the current
+ *                         template set.  This may be needed by third
  *                         party packages that don't integrate easily.
  *          $settings['unreadNotificationEnabled'] - Boolean TRUE if the user
  *                         wants to see unread message count on mailboxes
@@ -95,7 +95,7 @@ function buildMailboxTree ($box, $settings, $parent_node=-1) {
         return '';
     }
     
-    $image_path = $settings['templateDirectory'] . 'images/';
+    $image_path = Template::calculate_template_images_directory($settings['templateID']);
     $out = '';
     if ($box['IsRoot']) {
         // Determine the path to the correct images
@@ -309,4 +309,4 @@ if ($settings['messageRecyclingEnabled']) {
 </script>
 </div>
 <?php do_hook('left_main_after'); ?>
-</div>
\ No newline at end of file
+</div>