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

Mail compose and display dialog styling improvment

Browse Source
This commit is contained in:
Hadi Nategh 2014-09-04 09:01:43 +00:00
parent e5dcceb27b
commit fe2e78f628
6 changed files with 71 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/js/app.js
View File

@ -3058,7 +3058,7 @@ app.classes.mail = AppJS.extend(
*/
composeUploadStart: function ()
{
var boxAttachment = this.et2.getWidgetById('mailUploadProgress');
var boxAttachment = this.et2.getWidgetById('attachments');
if (boxAttachment)
{
var groupbox = boxAttachment.getParent();

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

@ -187,6 +187,7 @@ table tr.attachmentRow > td{
table tr.attachmentRow > td > img {
background:transparent;
padding-left: 5px;
cursor: pointer;
}
#mail-compose_attachments.egwGridView_grid {
display:table !important;

3
mail/templates/default/compose.xet
View File

@ -14,7 +14,7 @@
</description>
<description class="email-button-group file">
<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
</description>
<description class="email-button-group egw">
<description class="$cont[noSaveAsAvailable]" value="Save:"/>
@ -115,7 +115,6 @@
</groupbox>
<groupbox class="et2_file mailUploadSection" disabled="@no_griddata">
<caption label="Files"/>
<box class="mailUploadProgress" id="mailUploadProgress" width="99%"/>
<grid id="attachments" width="100%" maxheight="165" class="egwGridView_grid">
<columns>
<column disabled="!@showtempname" width="10%"/>

58
mail/templates/default/display.xet
View File

@ -50,37 +50,37 @@
<box class="$cont[mailDisplayContainerClass]">
<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
</box>
<box class="$cont[mailDisplayAttachmentsClass]">
<!-- <html id="mail_displayattachments"/> -->
<grid disabled="@no_griddata" id="mail_displayattachments" class="egwGridView_grid" width="100%">
<columns>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column width="70%" />
<column width="11%" />
<column width="3%"/>
<column width="3%"/>
<column width="3%"/>
<column />
</columns>
<rows>
<row class="row attachmentRow" >
<description id="${row}[attachment_number]" />
<description id="${row}[partID]" />
<description id="${row}[type]" />
<description id="${row}[winmailFlag]" />
<description class="useEllipsis et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
<description align="right" id="${row}[size]" />
<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
</row>
</rows>
</grid>
</box>
<columns>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column disabled="!@showtempname"/>
<column width="70%" />
<column width="11%" />
<column width="3%"/>
<column width="3%"/>
<column width="3%"/>
<column />
</columns>
<rows>
<row class="row attachmentRow" >
<description id="${row}[attachment_number]" />
<description id="${row}[partID]" />
<description id="${row}[type]" />
<description id="${row}[winmailFlag]" />
<description class="useEllipsis et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
<description align="right" id="${row}[size]" />
<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
</row>
</rows>
</grid>
</groupbox>
</vbox>
</template>
</overlay>

24
mail/templates/pixelegg/app.css
View File

@ -180,6 +180,7 @@ table tr.attachmentRow > td {
table tr.attachmentRow > td > img {
background: transparent;
padding-left: 5px;
cursor: pointer;
}
#mail-compose_attachments.egwGridView_grid {
display: table !important;
@ -756,6 +757,9 @@ iframe#mail-display_mailDisplayBodySrc {
.mailDisplayContainer {
border: 0px;
}
body {
background-color: white;
}
div#mail-index {
margin: 0 1% 0 0 !important;
}
@ -1412,9 +1416,13 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
margin: 0px 8px;
}
#mail-compose fieldset.mailUploadSection {
border: 1px solid silver;
border-top: 1px solid silver;
font-size: 0.8em;
margin: 8px 0;
border-bottom: none;
border-left: none;
border-right: none;
width: 99%;
}
#divGenTime_mail {
display: none;
@ -1705,14 +1713,14 @@ div#popupMainDiv {
background-color: .background_color_15_gray;
}
#mail-display .mailDisplayAttachments {
background-color: #f0f0f0;
max-height: 10%;
max-height: 12%;
position: fixed;
bottom: 26px;
border: 0px solid #560ead;
border-bottom: 0px;
opacity: 1;
-moz-opacity: 1;
margin-left: 10px;
width: 98%;
}
#mail-display .mailDisplayAttachments img {
width: 16px;
@ -2651,9 +2659,13 @@ div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon {
position: fixed;
overflow: hidden;
overflow-y: auto;
border: 0px solid silver;
border-top: 2px solid silver;
top: 120px;
bottom: 110px;
bottom: 108px;
border-bottom: 1px solid silver;
width: 98%;
background-color: white;
margin-left: 10px;
}
.mailDisplayHeaders {
overflow: hidden;

35
mail/templates/pixelegg/app.less
View File

@ -56,7 +56,9 @@ iframe#mail-display_mailDisplayBodySrc{
border: 0px;
}
body {
background-color: white;
}
@ -635,9 +637,13 @@ div#mail-index{
// Anhang
fieldset.mailUploadSection{
border:1px solid silver;
font-size: 0.8em;
margin: 8px 0;
border-top: 1px solid silver;
font-size: 0.8em;
margin: 8px 0;
border-bottom: none;
border-left: none;
border-right: none;
width: 99%;
}
@ -869,19 +875,16 @@ div#popupMainDiv{
.mailDisplayAttachments {
// background-color:#efefdf;
.background_color_10_gray;
max-height: 10%;
max-height: 12%;
position: fixed;
bottom: 26px;
border: 0px solid @egw_color_3_a;
border-bottom: 0px;
opacity: 1;
-moz-opacity:1;
// filter: Alpha(opacity=100);
margin-left: 10px;
width:98%;
img {width: 16px;}
}
@ -1838,9 +1841,13 @@ div.mailPreviewHeaders div.mail_extraEmails {
position: fixed;
overflow: hidden;
overflow-y: auto;
border: 0px solid silver;
top: 120px;
bottom: 110px;
border-top: 2px solid silver;
top: 120px;
bottom: 108px;
border-bottom: 1px solid silver;
width: 98%;
background-color: white;
margin-left: 10px;
}
.mailDisplayHeaders {