projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d8a014e)
Remove errant comment and add some comments about why not removing menubar for compos...
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 6 Feb 2007 10:55:40 +0000 (10:55 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 6 Feb 2007 10:55:40 +0000 (10:55 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12235 7612ce4b-ef26-0410-bec9-ea0150e637f0

templates/default_advanced/page_header.tpl patch | blob | blame | history

diff --git a/templates/default_advanced/page_header.tpl b/templates/default_advanced/page_header.tpl
index 7f30409e337edec96cdb6eb76f77c365bc5fd677..64ac2065032ce04221b2f4c92cd56ab283201af8 100644 (file)
--- a/templates/default_advanced/page_header.tpl
+++ b/templates/default_advanced/page_header.tpl
@@ -63,12 +63,22 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
 <body <?php echo $body_tag_js; ?>>
 <?php
 
 <body <?php echo $body_tag_js; ?>>
 <?php
 
-   /** if preview pane turned on, do not show menubar above message or compose view */
+   /** if preview pane turned on, do not show menubar above message */
    global $data_dir, $username, $PHP_SELF, $pp_skip_menubar;
    $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
    $show_preview_pane = checkForJavascript() && $use_previewPane;
    $current_page_is_read_body = (strpos($PHP_SELF, '/read_body.php') !== FALSE);
    if (!$pp_skip_menubar && (!$current_page_is_read_body || !$show_preview_pane)) {
    global $data_dir, $username, $PHP_SELF, $pp_skip_menubar;
    $use_previewPane = getPref($data_dir, $username, 'use_previewPane', 0);
    $show_preview_pane = checkForJavascript() && $use_previewPane;
    $current_page_is_read_body = (strpos($PHP_SELF, '/read_body.php') !== FALSE);
    if (!$pp_skip_menubar && (!$current_page_is_read_body || !$show_preview_pane)) {
+// Note: If we want to hide menubar on compose screen, we could do the following, 
+// but the compose screen when in the message list frame should not have the menubar
+// hidden... which would require some javascript to detect the current frame name
+// and then use document.write() to output the menubar if needed... and we'll
+// leave that for some other time
+//-   if (!$pp_skip_menubar && (!$current_page_is_read_body || !$show_preview_pane)) {
+//+   $current_page_is_compose = (strpos($PHP_SELF, '/compose.php') !== FALSE);
+//+   if (!$pp_skip_menubar 
+//+    && ((!$current_page_is_read_body && !$current_page_is_compose) 
+//+        || !$show_preview_pane)) {
 
 ?>
 <div id="page_header">
 
 ?>
 <div id="page_header">
Unnamed repository; edit this file 'description' to name the repository.