[Svn] r3757 - in trunk/roundcubemail: . program/localization/en_US program/localization/pl_PL program/steps/mail skins/default skins/default/images skins/default/includes skins/default/templates

trac at roundcube.net trac at roundcube.net
Thu Jun 17 21:08:00 CEST 2010


Author: alec
Date: 2010-06-17 14:08:00 -0500 (Thu, 17 Jun 2010)
New Revision: 3757

Added:
   trunk/roundcubemail/skins/default/images/mail_footer.gif
Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/localization/en_US/labels.inc
   trunk/roundcubemail/program/localization/pl_PL/labels.inc
   trunk/roundcubemail/program/steps/mail/func.inc
   trunk/roundcubemail/skins/default/addressbook.css
   trunk/roundcubemail/skins/default/common.css
   trunk/roundcubemail/skins/default/functions.js
   trunk/roundcubemail/skins/default/ie6hacks.css
   trunk/roundcubemail/skins/default/iehacks.css
   trunk/roundcubemail/skins/default/images/mail_footer.png
   trunk/roundcubemail/skins/default/includes/header.html
   trunk/roundcubemail/skins/default/mail.css
   trunk/roundcubemail/skins/default/settings.css
   trunk/roundcubemail/skins/default/templates/addressbook.html
   trunk/roundcubemail/skins/default/templates/compose.html
   trunk/roundcubemail/skins/default/templates/editidentity.html
   trunk/roundcubemail/skins/default/templates/error.html
   trunk/roundcubemail/skins/default/templates/identities.html
   trunk/roundcubemail/skins/default/templates/importcontacts.html
   trunk/roundcubemail/skins/default/templates/login.html
   trunk/roundcubemail/skins/default/templates/mail.html
   trunk/roundcubemail/skins/default/templates/managefolders.html
   trunk/roundcubemail/skins/default/templates/message.html
   trunk/roundcubemail/skins/default/templates/messageerror.html
Log:
- UI unification 
- Added button to hide/unhide the preview pane (#1484215)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/CHANGELOG	2010-06-17 19:08:00 UTC (rev 3757)
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Add button to hide/unhide the preview pane (#1484215)
 - Fix no-cache headers on https to prevent content caching by proxies (#1486798)
 - Fix attachment filenames broken with TNEF decoder using long filenames (#1486795)
 - Use user's timezone in Date header, not server's timezone (#1486119)

Modified: trunk/roundcubemail/program/localization/en_US/labels.inc
===================================================================
--- trunk/roundcubemail/program/localization/en_US/labels.inc	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/program/localization/en_US/labels.inc	2010-06-17 19:08:00 UTC (rev 3757)
@@ -142,6 +142,7 @@
 $labels['markflagged']      = 'As flagged';
 $labels['markunflagged']    = 'As unflagged';
 $labels['messageactions']   = 'More actions...';
+$labels['preview']          = 'Preview';
 
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
@@ -246,6 +247,7 @@
 
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
 
 $labels['edit']   = 'Edit';
 $labels['cancel'] = 'Cancel';

Modified: trunk/roundcubemail/program/localization/pl_PL/labels.inc
===================================================================
--- trunk/roundcubemail/program/localization/pl_PL/labels.inc	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/program/localization/pl_PL/labels.inc	2010-06-17 19:08:00 UTC (rev 3757)
@@ -345,5 +345,7 @@
 $labels['korean'] = 'koreański';
 $labels['chinese'] = 'chiński';
 $labels['folderactions'] = 'Działania na folderach...';
+$labels['contacts'] = 'Kontakty';
+$labels['preview'] = 'Podgląd';
 
 ?>

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2010-06-17 19:08:00 UTC (rev 3757)
@@ -407,14 +407,15 @@
  */
 function rcmail_messagecontent_frame($attrib)
   {
-  global $OUTPUT;
+  global $OUTPUT, $RCMAIL;
 
   if (empty($attrib['id']))
     $attrib['id'] = 'rcmailcontentwindow';
 
   $attrib['name'] = $attrib['id'];
 
-  $OUTPUT->set_env('contentframe', $attrib['id']);
+  if ($RCMAIL->config->get('preview_pane'))
+    $OUTPUT->set_env('contentframe', $attrib['id']);
   $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
 
   return html::iframe($attrib);

Modified: trunk/roundcubemail/skins/default/addressbook.css
===================================================================
--- trunk/roundcubemail/skins/default/addressbook.css	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/skins/default/addressbook.css	2010-06-17 19:08:00 UTC (rev 3757)
@@ -74,20 +74,11 @@
 
 #abookcountbar
 {
-  position: absolute;
-  bottom: 6px;
-  left: 225px;
-  width: 240px;
-  height: 20px;
-  text-align: left;
+  margin-top: 4px;
+  margin-left: 4px;
+  min-width: 200px;
 }
 
-#abookcountbar span
-{
-  font-size: 11px;
-  color: #333333;
-}
-
 #addressscreen
 {
   position: absolute;
@@ -122,7 +113,7 @@
   bottom: 0px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
-  overflow: auto;
+  overflow: hidden;
 }
 
 #contactgroupslist

Modified: trunk/roundcubemail/skins/default/common.css
===================================================================
--- trunk/roundcubemail/skins/default/common.css	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/skins/default/common.css	2010-06-17 19:08:00 UTC (rev 3757)
@@ -243,73 +243,6 @@
   left: 20px;
 }
 
-.pagenav a.button,
-.pagenav a.buttonPas
-{
-  display: block;
-  float: left;
-  width: 11px;
-  height: 11px;
-  padding: 0;
-  margin: 1px;
-  overflow: hidden;
-  background: url(images/pagenav.gif) 0 0 no-repeat transparent;
-  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
-}
-
-.pagenav a.buttonPas {
-  opacity: 0.35;
-}
-
-.pagenav a.firstpageSel {
-  background-position: 0 -11px;
-}
-
-.pagenav a.prevpage {
-  background-position: -11px 0;
-}
-
-.pagenav a.prevpageSel {
-  background-position: -11px -11px;
-}
-
-.pagenav a.nextpage {
-  background-position: -22px 0;
-}
-
-.pagenav a.nextpageSel {
-  background-position: -22px -11px;
-}
-
-.pagenav a.lastpage {
-  background-position: -33px 0;
-}
-
-.pagenav a.lastpageSel {
-  background-position: -33px -11px;
-}
-
-.splitter
-{
-  user-select: none;
-  -moz-user-select: none;
-  -khtml-user-select: none;
-  position: absolute;
-  background: url(images/dimple.png) center no-repeat;
-}
-
-.splitter-h
-{
-  cursor: n-resize;
-  background-position: center 2px;
-}
-
-.splitter-v
-{
-  cursor: e-resize;
-  background-position: 2px center;
-}
-
 .boxtitle
 {
   height: 12px !important;
@@ -350,6 +283,7 @@
   bottom: 0px;
   left: 0px;
   right: 0px;
+  overflow: hidden;
   height: 22px;
   border-top: 1px solid #999;
   background: url('images/listheader.gif') top left repeat-x #CCC;
@@ -379,6 +313,80 @@
   opacity: 0.35;
 }
 
+.pagenav span
+{
+  color: #666;
+  font-size: 11px;
+  text-shadow: white 1px 1px;
+}
+
+.pagenav a.button,
+.pagenav a.buttonPas
+{
+  display: block;
+  float: left;
+  width: 11px;
+  height: 11px;
+  padding: 0;
+  margin: 1px;
+  overflow: hidden;
+  background: url(images/pagenav.gif) 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
+}
+
+.pagenav a.buttonPas {
+  opacity: 0.35;
+}
+
+.pagenav a.firstpageSel {
+  background-position: 0 -11px;
+}
+
+.pagenav a.prevpage {
+  background-position: -11px 0;
+}
+
+.pagenav a.prevpageSel {
+  background-position: -11px -11px;
+}
+
+.pagenav a.nextpage {
+  background-position: -22px 0;
+}
+
+.pagenav a.nextpageSel {
+  background-position: -22px -11px;
+}
+
+.pagenav a.lastpage {
+  background-position: -33px 0;
+}
+
+.pagenav a.lastpageSel {
+  background-position: -33px -11px;
+}
+
+.splitter
+{
+  user-select: none;
+  -moz-user-select: none;
+  -khtml-user-select: none;
+  position: absolute;
+  background: url(images/dimple.png) center no-repeat;
+}
+
+.splitter-h
+{
+  cursor: n-resize;
+  background-position: center 2px;
+}
+
+.splitter-v
+{
+  cursor: e-resize;
+  background-position: 2px center;
+}
+
 .popupmenu
 {
   position: absolute;
@@ -436,7 +444,6 @@
 }
 
 
-
 /***** common table settings ******/
 
 table.records-table thead tr td

Modified: trunk/roundcubemail/skins/default/functions.js
===================================================================
--- trunk/roundcubemail/skins/default/functions.js	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/skins/default/functions.js	2010-06-17 19:08:00 UTC (rev 3757)
@@ -325,6 +325,38 @@
         this[k].hide();
     }
   }
+},
+
+switch_preview_pane: function(elem)
+{
+  var uid, prev_frm = $('#mailpreviewframe');
+
+  if (elem.checked) {
+    rcmail.env.contentframe = 'messagecontframe';
+    if (mailviewsplit.layer) {
+      mailviewsplit.resize();
+      mailviewsplit.layer.elm.style.display = '';
+    } else
+      mailviewsplit.init();
+    prev_frm.show();
+    if (uid = rcmail.message_list.get_single_selection())
+      rcmail.show_message(uid, false, true);
+    rcmail.http_post('save-pref', '_name=preview_pane&_value=1');
+  } else {
+    prev_frm.hide();
+    if (bw.ie6 || bw.ie7) {
+      var fr = document.getElementById('mailcontframe');
+      fr.style.bottom = 0;
+      fr.style.height = parseInt(fr.parentNode.offsetHeight)+'px';  
+    }
+    else
+      $('#mailcontframe').css({height: 'auto', bottom: 0});
+    if (mailviewsplit.layer)
+      mailviewsplit.layer.elm.style.display = 'none';
+    rcmail.env.contentframe = null;
+    rcmail.show_contentframe(false);
+    rcmail.http_post('save-pref', '_name=preview_pane&_value=0');
+  }
 }
 
 };

Modified: trunk/roundcubemail/skins/default/ie6hacks.css
===================================================================
--- trunk/roundcubemail/skins/default/ie6hacks.css	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/skins/default/ie6hacks.css	2010-06-17 19:08:00 UTC (rev 3757)
@@ -10,7 +10,7 @@
   behavior: url(skins/default/pngbehavior.htc);
 }
 
-#header img
+#logo
 {
   width: 178px;
   height: 47px;
@@ -49,6 +49,11 @@
   padding-right: 10px;
 }
 
+#listcontrols a.button,
+#listcontrols a.buttonPas {
+  background-image: url(images/mail_footer.gif);
+}
+
 #messagetoolbar a.button,
 #messagetoolbar a.buttonPas {
   background-image: url(images/mail_toolbar.gif);
@@ -76,6 +81,7 @@
 .boxfooter
 {
   width: 100%;
+  bottom: -1px;
 }
 
 .boxtitle,
@@ -86,6 +92,6 @@
 
 .boxlistcontent
 {
-  height: expression((parseInt(this.parentNode.offsetHeight)-42)+'px');
-  width: 100%;
+  top: 21px;
+  height: expression((parseInt(this.parentNode.offsetHeight)-24-parseInt(this.style.top?this.style.top:21))+'px');
 }

Modified: trunk/roundcubemail/skins/default/iehacks.css
===================================================================
--- trunk/roundcubemail/skins/default/iehacks.css	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/skins/default/iehacks.css	2010-06-17 19:08:00 UTC (rev 3757)
@@ -61,8 +61,7 @@
   background-image: url(images/mail_toolbar.gif);
 }
 
-#listcontrols a.buttonPas,
-#mailboxcontrols a.buttonPas
+#listcontrols a.buttonPas
 {
   filter: alpha(opacity=35);
 }
@@ -75,12 +74,12 @@
 #mainscreen
 {
   width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-101)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-96)+'px');
 }
 
 #directorylistbox
 {
-  height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-115)+'px');
 }
 
 #addresslist,
@@ -102,7 +101,7 @@
 #messagepartcontainer
 {
   width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-100)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-90)+'px');
 }
 
 #mailrightcontent
@@ -148,13 +147,9 @@
 {
   width: expression((parseInt(this.parentNode.offsetWidth)-180)+'px');
   height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px');
+  overflow: hidden;
 }
 
-#messagecanvas 
-{
-  width: expression((parseInt(this.parentNode.offsetWidth)-20)+'px');
-}
-
 #countcontrols
 {
   width: 24em;
@@ -189,7 +184,7 @@
 #addressscreen
 {
   width: expression((parseInt(document.documentElement.clientWidth)-245)+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-115)+'px');
 }
 
 #prefsscreen
@@ -201,7 +196,7 @@
 #importbox
 {
   width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-145)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-140)+'px');
 }
 
 #contacts-table
@@ -266,3 +261,8 @@
   margin: 0 4px;
   padding: 0.8em;
 }
+
+#listcontrols input
+{
+  margin-top: 2px;
+}

Added: trunk/roundcubemail/skins/default/images/mail_footer.gif
===================================================================
(Binary files differ)


Property changes on: trunk/roundcubemail/skins/default/images/mail_footer.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/roundcubemail/skins/default/images/mail_footer.png
===================================================================
(Binary files differ)

Modified: trunk/roundcubemail/skins/default/includes/header.html
===================================================================
--- trunk/roundcubemail/skins/default/includes/header.html	2010-06-17 08:01:20 UTC (rev 3756)
+++ trunk/roundcubemail/skins/default/includes/header.html	2010-06-17 19:08:00 UTC (rev 3757)
@@ -1,3 +1,3 @@
-<div id="header"><a href="./"><img src="/images/roundcube_logo.png" alt="logo" title="<roundcube:object name='productname' />" /></a></div>
+<div id="header"><a href="./"><img id="logo" src="/images/roundcube_logo.png" alt="logo" title="<roundcube:object name='productname' />" /></a&g