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

Work in progress of mail attachment box styling in compose and display dialogs

Browse Source
This commit is contained in:
Hadi Nategh 2014-09-04 11:54:14 +00:00
parent a7a5048414
commit f119d61d32
6 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/js/app.js
View File

@ -3064,6 +3064,8 @@ app.classes.mail = AppJS.extend(
var groupbox = boxAttachment.getParent(); var groupbox = boxAttachment.getParent();
if (groupbox) groupbox.set_disabled(false); if (groupbox) groupbox.set_disabled(false);
} }
//Resize the compose dialog
this.compose_resizeHandler();
return true; return true;
}, },

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

@ -181,7 +181,16 @@ A.sieveRowInActive
.bodyDIVAttachment { .bodyDIVAttachment {
bottom:80px; bottom:80px;
} }
table tr.attachmentRow > td{
padding:0 !important;
}
table tr.attachmentRow > td > img {
background:transparent;
padding-left: 5px;
}
#mail-compose_attachments.egwGridView_grid {
display:table !important;
}
#attachmentSpanAllDIV{ #attachmentSpanAllDIV{
background-color:#efefdf; background-color:#efefdf;
height:260px; height:260px;
@ -275,11 +284,9 @@ pre {
} }
.useEllipsis { .useEllipsis {
text-overflow: ellipsis; text-overflow: ellipsis;
width: 250px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
float: left;
} }
#mail-index { #mail-index {
position: relative position: relative
@ -540,7 +547,6 @@ div.mail-compose_fileselector {
margin:0px; margin:0px;
} }
.mailDisplayAttachments { .mailDisplayAttachments {
background-color:#f0f0f0;
height: 121px; height: 121px;
position: fixed; position: fixed;
bottom: .1em; bottom: .1em;

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

@ -116,25 +116,22 @@
<groupbox class="et2_file mailUploadSection" disabled="@no_griddata"> <groupbox class="et2_file mailUploadSection" disabled="@no_griddata">
<caption label="Files"/> <caption label="Files"/>
<box class="mailUploadProgress" id="mailUploadProgress" width="99%"/> <box class="mailUploadProgress" id="mailUploadProgress" width="99%"/>
<grid id="attachments" width="100%" maxheight="165" overflow="auto"> <grid id="attachments" width="100%" maxheight="165" class="egwGridView_grid">
<columns> <columns>
<column disabled="!@showtempname"/> <column disabled="!@showtempname" width="10%"/>
<column width="50%" /> <column width="85%"/>
<column width="25%" /> <column width="8%"/>
<column width="15%"/> <column width="" />
<column /> </columns>
</columns> <rows>
<rows> <row class="row attachmentRow">
<row > <description id="${row}[tmp_name]"/>
<description id="${row}[tmp_name]" /> <description class="useEllipsis et2_link" id="${row}[name]" no_lang="1" onclick="app.mail.displayUploadedFile"/>
<description class="useEllipsis et2_link" id="${row}[name]" no_lang="1" onclick="app.mail.displayUploadedFile"/> <description align="right" id="${row}[size]" />
<description id="${row}[type]" /> <button id="delete[$row_cont[tmp_name]]" value="Delete" image="delete"/>
<description align="right" id="${row}[size]" /> </row>
<button id="delete[$row_cont[tmp_name]]" value="Delete" image="delete" /> </rows>
</row>
</rows>
</grid> </grid>
</groupbox> </groupbox>
</vbox> </vbox>
</template> </template>

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

@ -52,14 +52,13 @@
</box> </box>
<box class="$cont[mailDisplayAttachmentsClass]"> <box class="$cont[mailDisplayAttachmentsClass]">
<!-- <html id="mail_displayattachments"/> --> <!-- <html id="mail_displayattachments"/> -->
<grid disabled="@no_griddata" id="mail_displayattachments"> <grid disabled="@no_griddata" id="mail_displayattachments" class="egwGridView_grid" width="100%">
<columns> <columns>
<column disabled="!@showtempname"/> <column disabled="!@showtempname"/>
<column disabled="!@showtempname"/> <column disabled="!@showtempname"/>
<column disabled="!@showtempname"/> <column disabled="!@showtempname"/>
<column disabled="!@showtempname"/> <column disabled="!@showtempname"/>
<column width="50%" /> <column width="70%" />
<column width="20%" />
<column width="11%" /> <column width="11%" />
<column width="3%"/> <column width="3%"/>
<column width="3%"/> <column width="3%"/>
@ -67,13 +66,12 @@
<column /> <column />
</columns> </columns>
<rows> <rows>
<row > <row class="row attachmentRow" >
<description id="${row}[attachment_number]" /> <description id="${row}[attachment_number]" />
<description id="${row}[partID]" /> <description id="${row}[partID]" />
<description id="${row}[type]" /> <description id="${row}[type]" />
<description id="${row}[winmailFlag]" /> <description id="${row}[winmailFlag]" />
<description class="useEllipsis et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/> <description class="useEllipsis et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
<description id="${row}[mimetype]" />
<description align="right" id="${row}[size]" /> <description align="right" id="${row}[size]" />
<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/> <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 id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>

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

@ -174,6 +174,16 @@ A.sieveRowInActive {
.bodyDIVAttachment { .bodyDIVAttachment {
bottom: 80px; bottom: 80px;
} }
table tr.attachmentRow > td {
padding: 0 !important;
}
table tr.attachmentRow > td > img {
background: transparent;
padding-left: 5px;
}
#mail-compose_attachments.egwGridView_grid {
display: table !important;
}
#attachmentSpanAllDIV { #attachmentSpanAllDIV {
background-color: #efefdf; background-color: #efefdf;
height: 260px; height: 260px;
@ -270,11 +280,9 @@ pre {
} }
.useEllipsis { .useEllipsis {
text-overflow: ellipsis; text-overflow: ellipsis;
width: 250px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
float: left;
} }
#mail-index { #mail-index {
position: relative; position: relative;
@ -539,7 +547,6 @@ div.mail-compose_fileselector {
margin: 0px; margin: 0px;
} }
.mailDisplayAttachments { .mailDisplayAttachments {
background-color: #f0f0f0;
height: 121px; height: 121px;
position: fixed; position: fixed;
bottom: .1em; bottom: .1em;
@ -548,6 +555,9 @@ div.mail-compose_fileselector {
-moz-opacity: 1; -moz-opacity: 1;
filter: alpha(opacity=100); filter: alpha(opacity=100);
} }
#mail-display_mailDisplayBodySrc {
height: 100%;
}
#divGenTime_mail { #divGenTime_mail {
display: none; display: none;
} }
@ -1402,10 +1412,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
margin: 0px 8px; margin: 0px 8px;
} }
#mail-compose fieldset.mailUploadSection { #mail-compose fieldset.mailUploadSection {
border: 1px solid silver;
font-size: 0.8em; font-size: 0.8em;
border: none;
margin: 8px 0; margin: 8px 0;
background-color: #d9d9d9;
} }
#divGenTime_mail { #divGenTime_mail {
display: none; display: none;
@ -2123,9 +2132,9 @@ pre {
} }
.useEllipsis { .useEllipsis {
text-overflow: ellipsis; text-overflow: ellipsis;
width: 250px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-wrap: break-word;
} }
#mail-index { #mail-index {
position: relative; position: relative;

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

@ -635,11 +635,9 @@ div#mail-index{
// Anhang // Anhang
fieldset.mailUploadSection{ fieldset.mailUploadSection{
border:1px solid silver;
font-size: 0.8em; font-size: 0.8em;
border: none;
margin: 8px 0; margin: 8px 0;
.background_color_15_gray;
} }
@ -1406,9 +1404,9 @@ pre {
.useEllipsis { .useEllipsis {
text-overflow: ellipsis; text-overflow: ellipsis;
width: 250px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-wrap: break-word;
} }