From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 18 May 2007 13:31:55 +0000 (+0000)
Subject: Remove duplicated javascript function definition
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=a3c4ab30ff27907288487990b370f8d0471a7816

Remove duplicated javascript function definition

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

diff --git a/templates/default_advanced/page_header.tpl b/templates/default_advanced/page_header.tpl
index 2e830cfe..08b147cf 100644
--- a/templates/default_advanced/page_header.tpl
+++ b/templates/default_advanced/page_header.tpl
@@ -119,7 +119,12 @@ $help_link		= makeInternalLink ('src/help.php', $help_str);
 </div>
 <br />
 <!-- End Header Navigation Table -->
-<?php } ?>
+<?php 
+   } 
+
+   // now, some generic javascript for use with preview pane
+
+?>
 <script type="text/javascript" language="JavaScript">
 <!--
    var delayed_page_load_uri = '';
@@ -127,6 +132,11 @@ $help_link		= makeInternalLink ('src/help.php', $help_str);
    { page_load_uri = page_uri; setTimeout('page_load()', 500); }
    function page_load()
    { document.location = page_load_uri; }
+   function refresh_message_list()
+   {
+      if (typeof(parent.right.delayed_page_load) != 'undefined')
+         parent.right.delayed_page_load("<?php echo $message_list_href; ?>");
+   }
 <?php 
 
    // autohide the preview pane if desired when not viewing messages,
diff --git a/templates/default_advanced/read_menubar_buttons.tpl b/templates/default_advanced/read_menubar_buttons.tpl
index 0819c05f..152dad4c 100644
--- a/templates/default_advanced/read_menubar_buttons.tpl
+++ b/templates/default_advanced/read_menubar_buttons.tpl
@@ -70,14 +70,6 @@ $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_lis
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';
-if ($show_preview_pane) { ?>
-   <script>
-   <!--
-      function refresh_message_list()
-      { parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); }
-   // -->
-   </script>
-<?php }
 
 
 /** Begin template **/
diff --git a/templates/default_advanced/read_menubar_nav.tpl b/templates/default_advanced/read_menubar_nav.tpl
index d14e07f5..ade69122 100644
--- a/templates/default_advanced/read_menubar_nav.tpl
+++ b/templates/default_advanced/read_menubar_nav.tpl
@@ -66,17 +66,6 @@ $pp_refresh_message_list = getPref($data_dir, $username, 'pp_refresh_message_lis
 $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
 $show_preview_pane = checkForJavascript() && $use_previewPane;
 $empty_frame_uri = $base_uri . 'plugins/preview_pane/empty_frame.php';
-if ($show_preview_pane) { ?>
-   <script>
-   <!--
-      function refresh_message_list()
-      { 
-          if (typeof(parent.right.delayed_page_load) != 'undefined')
-              parent.right.delayed_page_load("<?php echo $message_list_href; ?>"); 
-      }
-   // -->
-   </script>
-<?php }
 
 
 /** Begin template **/