holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some splitter fixes:

Browse Source 
- Use new isDocked() instead of looking inside widget
- Some CSS fixes
This commit is contained in:
Nathan Gray 2013-11-20 23:35:27 +00:00
parent e623ea8c82
commit f0279d44a3
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/js/app.js
View File

@ -438,10 +438,12 @@ app.classes.mail = AppJS.extend(
var splitter = this.et2.getWidgetById('mailSplitter'); var splitter = this.et2.getWidgetById('mailSplitter');
if (typeof splitter == 'undefined' || splitter == null) return; if (typeof splitter == 'undefined' || splitter == null) return;
var splitterDN = splitter.getDOMNode(); var splitterDN = splitter.getDOMNode();
// check if DOM Node has class that contains docked; then we assume the bar docked, whatever our class var states
for (var i=0; i < splitterDN.childNodes[1].classList.length;i++) if (splitterDN.childNodes[1].classList[i].search(/docked/)>=0) this.mail_previewAreaActive = false; if(splitter.isDocked())
//if this.mail_previewAreaActive but clientHeight of childNode is 0, assume this.mail_previewAreaActive incorrect {
if ( this.mail_previewAreaActive && splitterDN.childNodes.length > 2 && splitterDN.childNodes[2].clientHeight < 15) this.mail_previewAreaActive=false; this.mail_previewAreaActive = false;
}
//this.et2.getWidgetById('mailPreviewHeadersFrom').set_disabled(_value); //this.et2.getWidgetById('mailPreviewHeadersFrom').set_disabled(_value);
//this.et2.getWidgetById('mailPreviewHeadersTo').set_disabled(_value); //this.et2.getWidgetById('mailPreviewHeadersTo').set_disabled(_value);
//this.et2.getWidgetById('mailPreviewHeadersDate').set_disabled(_value); //this.et2.getWidgetById('mailPreviewHeadersDate').set_disabled(_value);

57
mail/templates/default/app.css
View File

@ -5,8 +5,8 @@ textarea
} }
.defaultProfile { color:#000000; font-weight:bold !important; } .defaultProfile { color:#000000; font-weight:bold !important; }
.quoted1 { color:#660066; } .quoted1 { color:#660066; }
.quoted2 { color:#007777; } .quoted2 { color:#007777; }
.quoted3 { color:#990000; } .quoted3 { color:#990000; }
@ -165,21 +165,21 @@ A.sieveRowInActive
{ {
FONT-SIZE: 11px; FONT-SIZE: 11px;
height : 14px; height : 14px;
padding: 0; padding: 0;
color: Silver; color: Silver;
} }
.bodyDIV { .bodyDIV {
position:absolute; position:absolute;
background-color:white; background-color:white;
top:134px; top:134px;
bottom:0px; bottom:0px;
width:100%; width:100%;
border-top: 1px solid #efefdf; border-top: 1px solid #efefdf;
} }
.bodyDIVAttachment { .bodyDIVAttachment {
bottom:80px; bottom:80px;
} }
#attachmentSpanAllDIV{ #attachmentSpanAllDIV{
@ -189,24 +189,24 @@ A.sieveRowInActive
} }
#attachmentDIV { #attachmentDIV {
position:fixed; position:fixed;
background-color:#efefdf; background-color:#efefdf;
bottom:0px; bottom:0px;
min-height:80px; min-height:80px;
max-height:239px; max-height:239px;
width:100%; width:100%;
border-top: 1px solid silver; border-top: 1px solid silver;
overflow:auto; overflow:auto;
} }
#popupattachmentDIV { #popupattachmentDIV {
position:top; position:top;
background-color:#efefdf; background-color:#efefdf;
bottom:0px; bottom:0px;
min-height:80px; min-height:80px;
max-height:239px; max-height:239px;
width:100%; width:100%;
border-top: 1px solid silver; border-top: 1px solid silver;
overflow:auto; overflow:auto;
} }
@ -214,7 +214,7 @@ pre {
white-space: pre-wrap; /* Mozilla, since 1999 */ white-space: pre-wrap; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */ white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */ white-space: -o-pre-wrap; /* Opera 7 */
width: 99%; width: 99%;
} }
/* /*
@ -371,7 +371,8 @@ input[type=button] {
.mailDisplay, #mail-index_mailPreview { .mailDisplay, #mail-index_mailPreview {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
margin-top: 3px; padding-top: 3px;
background-color: white;
} }
#mail-compose_fileselector { #mail-compose_fileselector {
width: 245px !important; width: 245px !important;
@ -432,7 +433,7 @@ input[type=button] {
right: 0; right: 0;
} }
#mail-index_previewAttachmentArea { #mail-index_previewAttachmentArea {
background-color:#efefdf; background-color:#efefdf;
max-height: 3em; max-height: 3em;
max-width: 50%; max-width: 50%;
position: absolute; position: absolute;
@ -442,7 +443,7 @@ input[type=button] {
top: 25px; top: 25px;
border: 1px solid red; border: 1px solid red;
opacity: 1; opacity: 1;
-moz-opacity:1: -moz-opacity:1;
filter: Alpha(opacity=100); filter: Alpha(opacity=100);
display: inline-block !important; display: inline-block !important;
} }
@ -482,18 +483,18 @@ input[type=button] {
margin:0px; margin:0px;
} }
.mailDisplayAttachments { .mailDisplayAttachments {
background-color:#efefdf; background-color:#efefdf;
height: 121px; height: 121px;
position: fixed; position: fixed;
bottom: .1em; bottom: .1em;
border: 1px solid red; border: 1px solid red;
opacity: 1; opacity: 1;
-moz-opacity:1: -moz-opacity:1;
filter: Alpha(opacity=100); filter: Alpha(opacity=100);
} }
/* /*
#divGenTime { #divGenTime {
background-color:#efefdf; background-color:#efefdf;
max-height: 10%; max-height: 10%;
position: fixed; position: fixed;
bottom: 1px; bottom: 1px;