Changeset 5617 in subversion

Timestamp:

Dec 14, 2011 6:13:38 PM (18 months ago)

Author:

thomasb

Message:

Larry is growing up

Location:

trunk/roundcubemail

Files:

• program/steps/settings/edit_identity.inc (modified) (1 diff)
• skins/larry/images/splitter.png (added)
• skins/larry/mail.css (modified) (9 diffs)
• skins/larry/settings.css (modified) (3 diffs)
• skins/larry/styles.css (modified) (10 diffs)
• skins/larry/templates/folderedit.html (added)
• skins/larry/templates/folders.html (added)
• skins/larry/templates/identityedit.html (modified) (1 diff)
• skins/larry/templates/mail.html (modified) (3 diffs)
• skins/larry/templates/messagepreview.html (added)
• skins/larry/ui.js (modified) (3 diffs)

trunk/roundcubemail/program/steps/settings/edit_identity.inc

@@ -112 +112 @@
 
   unset($plugin);
-  unset($attrib['form']);
+  unset($attrib['form'], $attrib['id']);
 
   // return the complete edit form as table

trunk/roundcubemail/skins/larry/mail.css

@@ -625 +625 @@
 /**** message view ****/
 
+#mailpreviewframe {
+        display: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        bottom: 28px;
+}
+
+#messagecontframe {
+        border: 0;
+        border-radius: 4px 4px 0 0;
+}
+
 #messagecontent {
         position: absolute;
@@ -637 +651 @@
 #messageheader,
 #partheader {
+        position: relative;
         padding: 3px 0;
         background: #fff;
@@ -655 +670 @@
 }
 
+h3.subject {
+        font-size: 14px;
+        margin: 0 8em 0 0;
+        padding: 8px 8px 4px 8px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+}
+
 .headers-table td {
         color: #666;
@@ -695 +719 @@
 }
 
+#messagepreviewheader {
+        margin: 0 8px;
+        padding-bottom: 8px;
+        border-bottom: 2px solid #f0f0f0;
+}
+
+#messagepreviewheader .headers-table {
+        margin: 0 -8px;
+}
+
+#messagepreviewheader h3.subject {
+        padding-left: 0;
+}
+
+#messagepreviewheader #countcontrols,
 #messageheader #countcontrols {
         position: absolute;
@@ -710 +749 @@
 }
 
-#messagecontent .leftcol {
+#messagecontent .leftcol,
+#messagepreview .leftcol {
         margin-right: 250px;
 }
 
-#messagecontent .rightcol {
+#messagecontent .rightcol,
+#messagepreview .rightcol {
         float: right;
 /*
@@ -729 +770 @@
 }
 
-
 #messagebody {
         margin: 8px;
@@ -739 +779 @@
 }
 
-#message-objects div.notice {
+#message-objects div.notice,
+#message-buttons div.notice {
+        display: block;
         color: #960;
         border: 1px solid #ffdf0e;
@@ -761 +803 @@
 div.message-htmlpart {
         padding: 10px 2px;
-        border-top: 1px solid #ccc;
+        border-top: 2px solid #f0f0f0;
 }
 
 #messagebody div:first-child {
         border-top: 0;
-}
-
-div.message-part a,
-div.message-htmlpart a {
-        color: #0000CC;
 }
 
@@ -813 +850 @@
         background: #fff;
         border: 0;
-        border-bottom: 2px dotted #ccc;
+        border-bottom: 2px solid #f0f0f0;
 }
 

trunk/roundcubemail/skins/larry/settings.css

@@ -146 +146 @@
 }
 
+#folderslist,
 #identitieslist {
         position: absolute;
@@ -154 +155 @@
 }
 
+#folder-details,
 #identity-details {
         position: absolute;
@@ -162 +164 @@
 }
 
+#subscription-table tr.root td {
+        font-size: 5%;
+        height: 5px;
+        padding: 2px;
+}
+
+#subscription-table td.subscribed {
+        padding: 3px 12px 3px 3px;
+        text-align: right;
+}
+

trunk/roundcubemail/skins/larry/styles.css

@@ -214 +214 @@
 }
 
+.pagenav a.button {
+        padding: 1px 3px;
+}
+
 .pagenav a.button span.inner {
         display: inline-block;
-        width: 12px;
-        height: 12px;
+        width: 16px;
+        height: 13px;
         text-indent: 1000px;
         overflow: hidden;
-        background: url(images/buttons.png) -8px -211px no-repeat;
+        background: url(images/buttons.png) -6px -211px no-repeat;
 }
 
 .pagenav a.prevpage span.inner {
-        background-position: -8px -226px;
+        background-position: -7px -226px;
 }
 
 .pagenav a.nextpage span.inner {
-        background-position: -30px -226px;
+        background-position: -28px -226px;
 }
 
 .pagenav a.lastpage span.inner {
-        background-position: -30px -211px;
+        background-position: -28px -211px;
+}
+
+.pagenav a.pageup span.inner {
+        background-position: -7px -256px;
+}
+
+.pagenav a.pagedown span.inner {
+        background-position: -29px -256px;
+}
+
+.pagenav a.viewsource span.inner {
+        background-position: -7px -271px;
+}
+
+.pagenav a.extwin span.inner {
+        background-position: -29px -271px;
 }
 
@@ -271 +291 @@
         color: #555;
         font-weight: bold;
-        padding: 6px 40px 6px 25px;
+        padding: 6px 30px 6px 25px;
         display: inline-block;
         white-space: nowrap;
@@ -312 +332 @@
         background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
         background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
 }
 
@@ -531 +554 @@
 .listing tbody td,
 .listing li {
+        display: block;
         font-size: 11px;
-        display: block;
         border-top: 1px solid #fff;
         border-bottom: 1px solid #bbd3da;
@@ -552 +575 @@
 }
 
+.listing tbody td {
+        display: table-cell;
+}
+
 .listbox .listitem.selected,
 .listbox .tablink.selected,
@@ -571 +598 @@
 }
 
-ul.listing li.droptarget {
+ul.listing li.droptarget,
+table.listing tr.droptarget td {
         background-color: #c7e3ef;
 }
@@ -612 +640 @@
 
 .boxfooter .listbutton.add .inner {
-        background-position: 8px -1210px;
+        background-position: 10px -1210px;
 }
 
 .boxfooter .listbutton.groupactions .inner {
-        background-position: 4px -1292px;
+        background-position: 5px -1292px;
 }
 
@@ -640 +668 @@
         background: #fff;
         margin: 38px 0 20px 0;
+}
+
+body.iframe.fullheight {
+        margin: 0;
 }
 
@@ -688 +720 @@
         font-size: 14px;
         font-weight: bold;
-        margin-bottom: 10px;
+        padding-bottom: 10px;
+        margin-bottom: 0;
+}
+
+.propform fieldset fieldset legend {
+        color: #666;
+        font-size: 12px;
 }
 
@@ -1005 +1043 @@
 
 #rcmdraglayer {
-        min-width: 300px;
+        min-width: 260px;
         width: auto !important;
-        width: 300px;
+        width: 260px;
         padding: 6px 8px;
         background: #444;

trunk/roundcubemail/skins/larry/templates/identityedit.html

@@ -31 +31 @@
 <p class="formbuttons">
         <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-        <roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" style="margin-left:0.5em" />
+        <roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" />
 </p>
 </div>

trunk/roundcubemail/skins/larry/templates/mail.html

@@ -4 +4 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
+<style type="text/css">
+<roundcube:if condition="config:preview_pane == true" />
+        #mailview-top { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-38 : 300" />px; }
+        #mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 320" />px; height: auto; }
+        #mailpreviewframe { display: block; }
+<roundcube:endif />
+</style>
+
 </head>
 <body>
@@ -75 +83 @@
 
 <div id="mailview-bottom" class="uibox">
+
 <div id="mailpreviewframe">
-
+<roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" src="/watermark.html" />
 </div>
 
@@ -106 +115 @@
 
 <div id="mailboxmenu" class="popupmenu">
-        <ul class="toolbarmenu">
+        <ul class="toolbarmenu" id="mailboxoptionsmenu">
                 <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
                 <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>

trunk/roundcubemail/skins/larry/ui.js

@@ -38 +38 @@
 //      rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
       rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
-      $('#mailpreviewtoggle').click(function(e){ toggle_preview_pane(e); return false });
+      $('#mailpreviewtoggle').addClass($('#mailpreviewframe').is(':visible') ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
       $('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
       $('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });
@@ -102 +102 @@
     
     if (!$('#attachment-list li').length) {
-      $('#messagecontent div.rightcol').hide();
-      $('#messagecontent .leftcol').css('margin-right', '0');
+      $('div.rightcol').hide();
+      $('div.leftcol').css('margin-right', '0');
     }
   }
@@ -190 +190 @@
   function toggle_preview_pane(e)
   {
-    var button = $(e.target);
-    var visible = !button.hasClass('enabled');
-    
+    var button = $(e.target),
+      frame = $('#mailpreviewframe'),
+      visible = !frame.is(':visible'),
+      splitter = parseInt(bw.get_cookie('mailviewsplitter') || 320),
+      topstyles, bottomstyles, uid;
+
+    frame.toggle();
     button.removeClass().addClass(visible ? 'enabled' : 'closed');
 
-//    rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
+    if (visible) {
+      topstyles = { height:(splitter-38)+'px', bottom:'auto' };
+      bottomstyles = { top:(splitter+5)+'px', height:'auto' };
+      rcmail.env.contentframe = 'messagecontframe';
+      if (uid = rcmail.message_list.get_single_selection())
+        rcmail.show_message(uid, false, true);
+    }
+    else {
+      topstyles = { height:'auto', bottom:'28px' };
+      bottomstyles = { top:'auto', height:'26px' };
+      rcmail.env.contentframe = null;
+      rcmail.show_contentframe(false);
+    }
+
+    $('#mailview-top').css(topstyles);
+    $('#mailview-bottom').css(bottomstyles);
+
+    if (visible && uid && rcmail.message_list)
+      rcmail.message_list.scrollto(uid);
+
+    rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
   }