extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed positioned itself right of compose, because used hbox, setting now white-space: normal, which makes hbox a vbox effectivly

Browse Source
This commit is contained in:
Ralf Becker 2014-01-31 08:06:41 +00:00
parent 90b00597b9
commit 06c0967ace
4 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,6 +542,10 @@ div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-c
margin-left: 3px; margin-left: 3px;
} }
div.mailComposeBody {
white-space: normal !important;
}
div.mailPreviewHeaders div.mail_extraEmails { div.mailPreviewHeaders div.mail_extraEmails {
display: inline-block; display: inline-block;
max-height: 1.3em; max-height: 1.3em;

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

@ -5,41 +5,41 @@
<html id="msg" class="message"/> <html id="msg" class="message"/>
<vbox class="mailCompose mailComposeHeaderSection" width="99%"> <vbox class="mailCompose mailComposeHeaderSection" width="99%">
<hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar"> <hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar">
<button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/> <button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/>
<description class="email-button-group save"> <description class="email-button-group save">
<buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/> <buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/>
<buttononly class="et2_button ui-button" label="Save as Draft and Print" value="saveAsDraftAndPrint" id="button[saveAsDraftAndPrint]" image="print" onclick="app.mail.saveAsDraftAndPrint"/> <buttononly class="et2_button ui-button" label="Save as Draft and Print" value="saveAsDraftAndPrint" id="button[saveAsDraftAndPrint]" image="print" onclick="app.mail.saveAsDraftAndPrint"/>
</description> </description>
<description class="email-button-group file"> <description class="email-button-group file">
<vfs-select class="$cont[vfsNotAvailable]" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose"/> <vfs-select class="$cont[vfsNotAvailable]" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose"/>
<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" id="uploadForCompose" drop_target ="mailUploadSection"/> <file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" id="uploadForCompose" drop_target ="mailUploadSection"/>
</description> </description>
<description class="email-button-group egw"> <description class="email-button-group egw">
<description class="$cont[noSaveAsAvailable]" value="Save:"/> <description class="$cont[noSaveAsAvailable]" value="Save:"/>
<hbox class="$cont[noInfologAvailable]"> <hbox class="$cont[noInfologAvailable]">
<image class="et2_button ui-button et2_button_icon" label="Save as infolog on send" src="infolog/navbar" no_lang="1"/> <image class="et2_button ui-button et2_button_icon" label="Save as infolog on send" src="infolog/navbar" no_lang="1"/>
<checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/> <checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/>
</hbox> </hbox>
<hbox class="$cont[noTrackerAvailable]"> <hbox class="$cont[noTrackerAvailable]">
<image class="et2_button ui-button et2_button_icon" label="Save as tracker on send" src="tracker/navbar" no_lang="1"/> <image class="et2_button ui-button et2_button_icon" label="Save as tracker on send" src="tracker/navbar" no_lang="1"/>
<checkbox statustext="check to save as trackerentry on send" id="to_tracker" options="on,off"/> <checkbox statustext="check to save as trackerentry on send" id="to_tracker" options="on,off"/>
</hbox> </hbox>
</description> </description>
<description class="email-button-group notification"> <description class="email-button-group notification">
<description value="Recieve notification"/> <description value="Recieve notification"/>
<checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="$cont[disposition]"/> <checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="$cont[disposition]"/>
</description> </description>
<description class="email-button-group priority"> <description class="email-button-group priority">
<description value="Priority"/> <description value="Priority"/>
<menulist> <menulist>
<menupopup id="priority"/> <menupopup id="priority"/>
</menulist> </menulist>
</description> </description>
</hbox> </hbox>
<grid width="100%"> <grid width="100%">
<columns> <columns>

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

@ -540,6 +540,9 @@ div.mailComposeBody,
div.mailPreviewHeaders > * { div.mailPreviewHeaders > * {
margin-left: 3px; margin-left: 3px;
} }
div.mailComposeBody {
white-space: normal !important;
}
div.mailPreviewHeaders div.mail_extraEmails { div.mailPreviewHeaders div.mail_extraEmails {
display: inline-block; display: inline-block;
max-height: 1.3em; max-height: 1.3em;

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

@ -340,21 +340,21 @@ div#mail-index{
} }
} }
span.notification {float: left; span.notification {float: left;
span.et2_label {line-height: 25px;} span.et2_label {line-height: 25px;}
} }
span.priority {float: left; span.priority {float: left;
span.et2_label {line-height: 25px;} span.et2_label {line-height: 25px;}
} }
img{.dimension_height_m;} img{.dimension_height_m;}
img[src$="svg"]{ img[src$="svg"]{
.gradient_vertical (@gray_30, @gray_40); .gradient_vertical (@gray_30, @gray_40);
background-color: @gray_60; background-color: @gray_60;
.dimension_height_m; .dimension_height_m;
&:hover { &:hover {
.box_shadow_standard_light_hover; .box_shadow_standard_light_hover;
background-color:@color_positive_action; background-color:@color_positive_action;
.gradient_vertical (@color_positive_action, @color_positive_action); .gradient_vertical (@color_positive_action, @color_positive_action);
} }
} }
@ -364,12 +364,12 @@ div#mail-index{
/*// Button senden -> dev_buttons.less*/ /*// Button senden -> dev_buttons.less*/
button.et2_button { button.et2_button {
/*.dimension_height_m;*/ /*.dimension_height_m;*/
/* &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} /* &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
&:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/ &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/
} }
.mail-compose_button{ .mail-compose_button{
height: 27px; height: 27px;
margin-right: 3px !important; margin-right: 3px !important;
@ -399,7 +399,7 @@ div#mail-index{
margin: 3px; margin: 3px;
.Complete_Button_Icon_normal; .Complete_Button_Icon_normal;
.dimension_height_s; .dimension_height_s;
&:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
} }
@ -448,7 +448,7 @@ div#mail-index{
/*save / Speichern als */ /*save / Speichern als */
//als Infolog //als Infolog
#mail-compose_to_infolog{ #mail-compose_to_infolog{
margin-right: 5px !important; margin-right: 5px !important;
&:hover{ &:hover{
.scale; .scale;
@ -490,14 +490,14 @@ div#mail-index{
margin: 2px 0; margin: 2px 0;
width: 98%; width: 98%;
span { span {
font-size: 0.8em; font-size: 0.8em;
text-align: right; text-align: right;
padding-right: 5px; padding-right: 5px;
} }
span.ms-close-btn { span.ms-close-btn {
width: auto; width: auto;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-right: 8px; padding-right: 8px;
} }
@ -514,7 +514,7 @@ div#mail-index{
/*Von*/ /*Von*/
select#mail-compose_mailaccount {width: 100%; height: 30px;} select#mail-compose_mailaccount {width: 100%; height: 30px;}
/*An*/ /*An*/
/*Kopie*/ /*Kopie*/
span#mail-compose_cc_expander{ span#mail-compose_cc_expander{
.Complete_Button_normal; .Complete_Button_normal;
@ -537,7 +537,7 @@ div#mail-index{
} }
/*Betreff*/ /*Betreff*/
input#mail-compose_subject { max-width: 716px;} input#mail-compose_subject { max-width: 716px;}
/*HTML Box*/ /*HTML Box*/
input#mail-compose_mimeType {margin-left: 12px;} input#mail-compose_mimeType {margin-left: 12px;}