Fixed SSL support; improved Courier compatibility; some visual enhancements and bugfixes

12 files changed, 82 insertions, 62 deletions

diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index d660c3c8f..a0fb15c8a 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -4,7 +4,7 @@
 #abooktoolbar
 {
   position: absolute;
-  top: 32px;
+  top: 45px;
   left: 200px;
   height: 35px;
 }
@@ -17,7 +17,7 @@
 #abookcountbar
 {
   position: absolute;
-  top: 50px;
+  top: 60px;
   left: 490px;
   width: 200px;
   height: 20px;
@@ -34,10 +34,10 @@
 #addresslist
 {
   position: absolute;
-  top: 75px;
+  top: 85px;
   left: 20px;
   width: 450px;
-  bottom: 60px;
+  bottom: 40px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
   overflow: auto;
@@ -63,10 +63,10 @@
 #contacts-box
 {
   position: absolute;
-  top: 75px;
+  top: 85px;
   left: 490px;
   right: 40px;
-  bottom: 60px;
+  bottom: 40px;
   border: 1px solid #999999;
   overflow: hidden;
   /* css hack for IE */
diff --git a/skins/default/common.css b/skins/default/common.css
index 2ba97d843..67e404e69 100755
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -3,7 +3,7 @@
 body
 {
   margin: 8px;
-  background-color: #F2F2F2; /* #EBEBEB; */
+  background-color: #F6F6F6; /* #EBEBEB; */
   color: #000000;
 }
 
@@ -103,43 +103,62 @@ img
 
 #header
 {
-/* margin: 10px auto; */
+  position: absolute;
+  top: 10px;
+  left: 20px;
   width: 170px;
   height: 40px;
-  margin-top: 0px;
-  margin-left: 10px;
-/* border: 1px solid #cccccc;  */
+  z-index: 100;
 }
 
-#footer
+#taskbar
 {
-  position: fixed !important;
-  left: 0px;
+  position: absolute;
+  top: 0px;
   right: 0px;
-  bottom: 0px !important;
-  height: 40px;
-  background-color: #f2f2f2;
+  width: 600px;
+  height: 37px;
+  background: url(images/taskbar.gif) top right no-repeat;
+  padding: 10px 24px 0px 0px;
+  text-align: right;
+  white-space: nowrap;
+  z-index: 2;
+}
 
-  /* css hack for IE */
-  position: absolute;
-  bottom: auto;
-  top: expression((parseInt(document.documentElement.clientHeight)+parseInt(document.documentElement.scrollTop)-42)+'px');
-  width: expression(parseInt(document.documentElement.clientWidth)+'px');
+#taskbar a,
+#taskbar a:active,
+#taskbar a:visited
+{
+  font-size: 11px;
+  color: #666666;
+  text-decoration: none;
+  padding: 6px 16px 6px 30px;
+  background-repeat: no-repeat;
 }
 
-#taskbar
+#taskbar a:hover
 {
-  margin: 0px auto;
-  width: 400px;
-  height: 34px;
-  padding: 3px;
-  text-align: center;
-  border: 1px solid #cccccc;  
+  color: #333333;
 }
 
-#taskbar a
+a.button-mail
 {
-  padding-right: 10px;
+  background-image: url(images/buttons/mail.gif);
+}
+
+a.button-addressbook
+{
+  background-image: url(images/buttons/addressbook.gif);
+}
+
+a.button-settings
+{
+  background-image: url(images/buttons/settings.gif);
+}
+
+a.button-logout
+{
+  background-image: url(images/buttons/logout.gif);
 }
 
 
@@ -147,7 +166,7 @@ img
 {
   position: absolute;
   display: none;
-  top: 0px;
+  top: -1px;
   left: 200px;
   right: 200px;
   z-index: 5000;
@@ -157,8 +176,8 @@ img
 {
   width: 400px;
   margin: 0px auto;
-  height: 22px;
-  min-height: 22px;
+  height: 24px;
+  min-height: 24px;
   padding: 8px 10px 8px 46px;
 }
 
@@ -188,7 +207,7 @@ img
 #message div.loading
 {
   background: url(images/display/loading.gif) 6px 3px no-repeat;
-  background-color: #EFEFEF;
+  background-color: #EBEBEB;
   border: 1px solid #CCCCCC;
 }
 
diff --git a/skins/default/images/buttons/addressbook.gif b/skins/default/images/buttons/addressbook.gif
new file mode 100644
index 000000000..d8c0c1787
--- /dev/null
+++ b/skins/default/images/buttons/addressbook.gif
diff --git a/skins/default/images/buttons/logout.gif b/skins/default/images/buttons/logout.gif
index f8000fc5a..93eb1aae7 100644
--- a/skins/default/images/buttons/logout.gif
+++ b/skins/default/images/buttons/logout.gif
diff --git a/skins/default/images/buttons/mail.gif b/skins/default/images/buttons/mail.gif
new file mode 100644
index 000000000..8bb93f747
--- /dev/null
+++ b/skins/default/images/buttons/mail.gif
diff --git a/skins/default/images/buttons/settings.gif b/skins/default/images/buttons/settings.gif
new file mode 100644
index 000000000..a390cd969
--- /dev/null
+++ b/skins/default/images/buttons/settings.gif
diff --git a/skins/default/images/taskbar.gif b/skins/default/images/taskbar.gif
new file mode 100644
index 000000000..b6fc91ce4
--- /dev/null
+++ b/skins/default/images/taskbar.gif
diff --git a/skins/default/includes/header.html b/skins/default/includes/header.html
index b795ad19b..375140fa1 100644
--- a/skins/default/includes/header.html
+++ b/skins/default/includes/header.html
@@ -1,3 +1,10 @@
-<div id="header"><img src="/images/roundcube_logo.png" width="165" height="55" alt="RoundCube Webmail" /></div>
+<div id="taskbar">
+<roundcube:button command="mail" label="mail" class="button-mail" />
+<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" />
+<roundcube:button command="settings" label="settings" class="button-settings" />
+<roundcube:button command="logout" label="logout" class="button-logout" />
+</div>
+
+<div id="header"><roundcube:button command="mail" image="/images/roundcube_logo.png" alt="RoundCube Webmail" width="165" height="55" /></div>
 
 <roundcube:object name="message" id="message" />
\ No newline at end of file
diff --git a/skins/default/includes/taskbar.html b/skins/default/includes/taskbar.html
index b0ebc552c..be3d57df0 100644
--- a/skins/default/includes/taskbar.html
+++ b/skins/default/includes/taskbar.html
@@ -1,11 +1,3 @@
-<div id="footer">
-<div id="taskbar">
-<roundcube:button command="mail" image="/images/buttons/mail.png" title="mail" width="32" height="32" />
-<roundcube:button command="addressbook" image="/images/buttons/addressbook.png" title="addressbook" width="32" height="32" />
-<roundcube:button command="settings" image="/images/buttons/settings.png" title="settings" width="32" height="32" />
-<roundcube:button command="logout" image="/images/buttons/logout.png" title="logout" width="32" height="32" />
-</div>
-</div>
 
 <!--
 <form name="debugform" style="position:absolute; right:10px; bottom:10px;">
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 5ebad537d..3925c4e4a 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -4,7 +4,7 @@
 #messagetoolbar
 {
   position: absolute;
-  top: 20px;
+  top: 45px;
   left: 200px;
   right: 250px;
   height: 35px;
@@ -44,7 +44,7 @@
 {
   position: absolute;
   left: 200px;
-  bottom: 60px;
+  bottom: 20px;
   height: 16px;
   width: 400px;
 }
@@ -73,8 +73,8 @@
 #messagecountbar
 {
   position: absolute;
-  top: 35px;
-  right: 60px;
+  top: 60px;
+  right: 40px;
   width: 250px;
   height: 20px;
   text-align: right;
@@ -98,10 +98,10 @@
 #mailcontframe
 {
   position: absolute;
-  top: 60px;
+  top: 85px;
   left: 200px;
   right: 40px;
-  bottom: 80px;
+  bottom: 40px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
   overflow: auto;
@@ -160,7 +160,7 @@
 #mailboxlist-header
 {
   position: absolute;
-  top: 80px;
+  top: 85px;
   left: 20px;
   width: 140px !important;
 /*  width: 162px; */
@@ -177,10 +177,10 @@
 #mailboxlist-container
 {
   position: absolute;
-  top: 100px;
+  top: 105px;
   left: 20px;
   width: 160px;
-  bottom: 80px;
+  bottom: 40px;
   border: 1px solid #CCCCCC;
   background-color: #F9F9F9;
   overflow: auto;
@@ -403,11 +403,11 @@ body.messagelist
 #messageframe
 {
   position: absolute;
-  top: 70px;
+  top: 85px;
   left: 200px;
   right: 40px;
   /* css hack for IE */
-  margin-bottom: 50px;
+  margin-bottom: 10px;
   width: expression(document.body.clientWidth-240);
 }
 
@@ -476,7 +476,7 @@ table.headers-table tr td.subject
 {
   min-height: 300px;
   margin-top: 10px;
-  margin-bottom: 50px;
+  margin-bottom: 10px;
   background-color: #FFFFFF;
   border: 1px solid #cccccc;
   border-top: none;
@@ -535,10 +535,10 @@ div.message-part pre
 #compose-container
 {
   position: absolute;
-  top: 70px;
+  top: 90px;
   left: 200px;
   right: 40px;
-  bottom: 60px;
+  bottom: 20px;
   padding: 0px;
   margin: 0px;
   /* css hack for IE */
diff --git a/skins/default/settings.css b/skins/default/settings.css
index b35f715c4..427a73968 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -4,7 +4,7 @@
 #tabsbar
 {
   position: absolute;
-  top: 42px;
+  top: 45px;
   left: 220px;
   right: 60px;
   height: 22px;
@@ -120,7 +120,7 @@ div.settingsbox
 {
   width: 500px;
   margin-top: 20px;
-  margin-bottom: 50px;
+  margin-bottom: 20px;
   border: 1px solid #999999;
 }
 
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 7f44f5790..bf928c2eb 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -7,7 +7,7 @@
 
 #login-form
   {
-	margin: 50px auto;
+	margin: 150px auto;
 	width: 350px;
   }
 
@@ -15,7 +15,9 @@
 </head>
 <body>
 
-<roundcube:include file="/includes/header.html" />
+<div id="header"><img src="skins/default/images/roundcube_logo.png" id="rcmbtn104" width="165" height="55" border="0" alt="RoundCube Webmail" /></div>
+
+<roundcube:object name="message" id="message" />
 
 <div id="login-form">
 <form name="form" action="./" method="post">