Adding status bar to the compose window

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index d6c3ad3958ec42f2f039b82a27001b30d8f21dda..fd072dc954176397bdc3dd8fa116a00aa9f2831a 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -8,7 +8,7 @@
  *
  * Prints the page header (duh)
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
@@ -49,7 +49,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
     
     if ($squirrelmail_language == 'ja_JP') {
         echo "<!-- \xfd\xfe -->\n";
-        echo '<meta http-equiv="Content-type" content="text/html; charset=euc-jp">' . "\n";
+        echo '<meta http-equiv="Content-type" content="text/html; charset=euc-jp" />' . "\n";
     }
     
     if ($do_hook) {
@@ -166,7 +166,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                            '   var newwin = window.open(comp_uri' .
                            ', "_blank",'.
                            '"width='.$compose_width. ',height='.$compose_height.
-                           ',scrollbars=yes,resizable=yes");'."\n".
+                           ',scrollbars=yes,resizable=yes,status=yes");'."\n".
                            "}\n\n";
                     $js .= "function comp_in_new(comp_uri) {\n".
                            "       if (!comp_uri) {\n".
@@ -175,7 +175,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                            '    var newwin = window.open(comp_uri' .
                            ', "_blank",'.
                            '"width='.$compose_width. ',height='.$compose_height.
-                           ',scrollbars=yes,resizable=yes");'."\n".
+                           ',scrollbars=yes,resizable=yes,status=yes");'."\n".
                            "}\n\n";
                 }
 
@@ -206,6 +206,12 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
             {
                 if ($reply_focus == 'select') $js .= "document.forms['compose'].body.select();}\n";
                 else if ($reply_focus == 'focus') $js .= "document.forms['compose'].body.focus();}\n";
+                else if ($reply_focus == 'none') $js .= "}\n";
+            }
+            // no reply focus also applies to composing new messages
+            else if ($reply_focus == 'none')
+            {
+                $js .= "}\n";
             }
             else
                 $js .= "var f = document.forms.length;\n".
@@ -266,13 +272,13 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                         $compose_height = '550';
                     }
                     $js .= "function comp_in_new(comp_uri) {\n".
-                 "       if (!comp_uri) {\n".
-                 '           comp_uri = "'.$compose_uri."\";\n".
-                 '       }'. "\n".
+                         "       if (!comp_uri) {\n".
+                         '           comp_uri = "'.$compose_uri."\";\n".
+                         '       }'. "\n".
                          '    var newwin = window.open(comp_uri' .
                          ', "_blank",'.
                          '"width='.$compose_width. ',height='.$compose_height.
-                         ',scrollbars=yes,resizable=yes");'."\n".
+                         ',scrollbars=yes,resizable=yes,status=yes");'."\n".
                          "}\n\n";
 
                 }
@@ -315,7 +321,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
                                  : html_tag( 'td', '', 'left' ) )
         . "\n";
     $urlMailbox = urlencode($mailbox);
-    echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&startMessage='.$startMessage);
+    echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&amp;startMessage='.$startMessage);
     echo "&nbsp;&nbsp;\n";
     displayInternalLink ('src/addressbook.php', _("Addresses"));
     echo "&nbsp;&nbsp;\n";
@@ -341,7 +347,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
         echo "</td>\n";
     }
     echo "   </tr>\n".
-        "</table><br>\n\n";
+        "</table><br />\n\n";
 }
 
 /**
@@ -380,6 +386,12 @@ function compose_Header($color, $mailbox) {
             {
                 if ($reply_focus == 'select') $js .= "document.forms['compose'].body.select();}\n";
                 else if ($reply_focus == 'focus') $js .= "document.forms['compose'].body.focus();}\n";
+                else if ($reply_focus == 'none') $js .= "}\n";
+            }
+            // no reply focus also applies to composing new messages
+            else if ($reply_focus == 'none')
+            {
+                $js .= "}\n";
             }
             else
                 $js .= "var f = document.forms.length;\n".