Adopt buttons used in mobile template to new buttonIcon widget

This commit is contained in:
Hadi Nategh 2022-08-23 13:14:22 +02:00
parent 3552fa13e7
commit bf6f50f14e
9 changed files with 57 additions and 33 deletions

View File

@ -362,14 +362,14 @@
<rows>
<row disabled="@hidebuttons" class="dialogHeadbar" >
<hbox span="all" width="100%">
<button id="button[apply]" class="button_apply" image="apply" background_image="1"/>
<button id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" tabindex="25" image="delete" background_image="1"/>
<button id="button[apply]" class="button_apply" image="apply"/>
<button id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" tabindex="25" image="delete"/>
</hbox>
</row>
<row disabled="!@showsearchbuttons" class="dialogHeadbar">
<hbox span="all" width="100%">
<button label="Search" id="button[search]" image="search" background_image="1"/>
<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
<button label="Search" id="button[search]" image="search"/>
<button label="Cancel" id="button[cancelsearch]" image="cancel"/>
</hbox>
</row>
<row class="dialogHeader">

View File

@ -11,10 +11,10 @@
<rows>
<row class="dialogHeadbar" >
<hbox span="all">
<button id="button[save]" onclick="return app.admin.check_owner(widget);" image="save" background_image="1"/>
<button id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply" background_image="1"/>
<buttononly id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
<buttononly statustext="Delete this category" id="button[delete]" onclick="egw.open_link('admin.admin_categories.delete','_browser','450x400');window.close();" image="delete" background_image="1"/>
<button id="button[save]" onclick="return app.admin.check_owner(widget);" image="save"/>
<button id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply"/>
<buttononly id="button[cancel]" onclick="window.close();" image="cancel"/>
<buttononly statustext="Delete this category" id="button[delete]" onclick="egw.open_link('admin.admin_categories.delete','_browser','450x400');window.close();" image="delete"/>
</hbox>
</row>
<row>

View File

@ -300,8 +300,8 @@
<row disabled="!@hide_smime_upload">
<description value="Current certificate"/>
<hbox>
<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export" background_image="1"/>
<buttononly id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete" background_image="1"/>
<buttononly id="smime_export_p12" label="export certificate as p12" onclick="app.admin.smime_exportCert" image="export"/>
<buttononly id="smime_delete_p12" label="Delete certificate" onclick="app.admin.change_account" image="delete"/>
</hbox>
</row>
</rows>
@ -318,9 +318,9 @@
<hbox span="all">
<button id="button[save]"/>
<button id="button[apply]" />
<button statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand" background_image="1"/>
<button statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand"/>
<button id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')"/>
<button label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" image="delete" background_image="1"/>
<button label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" image="delete"/>
</hbox>
</row>
<row disabled="!@accounts" class="dialogHeader">

View File

@ -149,10 +149,10 @@
<rows>
<row disabled="@hidebuttons" class="dialogHeadbar" >
<hbox span="all" width="100%">
<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
<button statustext="delete this entry" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1" span="all"/>
<timestamper statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" background_image="1" image="timestamp" target="info_des"/>
<checkbox toggle_on=" " toggle_off=" " id="no_notifications" class="notification_check"/>
<button statustext="Apply the changes" id="button[apply]" image="apply"/>
<button statustext="delete this entry" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"/>
<timestamper statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" image="timesheet" target="info_des"/>
<et2-switch toggle_on=" " toggle_off=" " label="notifications" id="no_notifications" class="notification_check"/>
<textbox type="integer" id="info_number" readonly="true" class="entry_id"/>
</hbox>
</row>

View File

@ -47,6 +47,6 @@
<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/></vbox>
</hbox>
<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" right_header="mail.index.header_right"/>
<buttononly id="button[mailcreate]" class="plus_button" onclick="app.mail.mail_compose(false);" size="large" image="plus" circle="true"/>
<buttononly id="composeMail" class="plus_button" onclick="app.mail.mail_compose(false);" size="large" image="plus" circle="true" background_image="true"/>
</template>
</overlay>

View File

@ -10,14 +10,14 @@
<rows>
<row disabled="@hidebuttons" class="dialogHeadbar" >
<hbox span="all" width="100%">
<button statustext="Saves this entry" id="button[save]" image="save" background_image="1"/>
<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
<button statustext="Saves this entry" id="button[save]" image="save"/>
<button statustext="Apply the changes" id="button[apply]" image="apply"/>
</hbox>
</row>
<row disabled="!@showsearchbuttons" class="dialogHeadbar">
<hbox span="all" width="100%">
<button label="Search" id="button[search]" image="search" background_image="1"/>
<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
<button label="Search" id="button[search]" image="search"/>
<button label="Cancel" id="button[cancelsearch]" image="cancel"/>
</hbox>
</row>
<row>

View File

@ -7744,7 +7744,7 @@ div[id^="mail-"] .search.nm-mob-header,
form[id^="mail-"] .search.nm-mob-header,
div[id^="mail-"] .dialogHeadbar,
form[id^="mail-"] .dialogHeadbar {
background-color: #006699;
background-color: #006699 !important;
}
#mail_sidebox_header {
border-left: 6px solid #006699 !important;
@ -8632,6 +8632,14 @@ table.egwGridView_grid img.et2_appicon {
display: flex;
border-bottom: 1px solid transparent;
}
body .et2_nextmatch .nm-mob-header et2-button-icon {
font-size: 2.3em;
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;
background-color: transparent !important;
background-size: 24px 24px !important;
border: none;
}
body .et2_nextmatch .nm-mob-header button {
height: 50px;
width: 50px;
@ -8656,13 +8664,13 @@ table.egwGridView_grid img.et2_appicon {
width: 50px;
height: 50px;
display: block;
float: right;
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;
background-color: transparent !important;
background-size: 24px 24px !important;
border: none;
order: 9;
padding: 0 1em 0 1em;
}
body .et2_nextmatch .nm-mob-header button.nm_toggle_header:focus {
outline: none;
@ -8677,13 +8685,13 @@ table.egwGridView_grid img.et2_appicon {
width: 50px;
height: 50px;
display: block;
float: right;
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;
background-color: transparent !important;
background-size: 24px 24px !important;
border: none;
order: 10;
padding: 0 1em 0 1em;
}
body .et2_nextmatch .nm-mob-header button.nm_action_header:focus {
outline: none;
@ -8708,10 +8716,10 @@ table.egwGridView_grid img.et2_appicon {
width: 50px;
height: 50px;
display: inline-block;
float: right;
text-align: center;
display: none;
order: 7;
padding: 0 1em 0 1em;
}
body .et2_nextmatch .nm-mob-header div.nm_favorites_div {
order: 8;
@ -9053,6 +9061,14 @@ table.egwGridView_grid img.et2_appicon {
body div#popupMainDiv {
padding: 0;
}
body .dialogHeadbar et2-button-icon {
font-size: 2.3em;
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;
background-color: transparent !important;
background-size: 24px 24px !important;
border: none;
}
body .dialogHeadbar button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;

View File

@ -801,6 +801,10 @@
z-index: 1;
display: flex;
border-bottom: 1px solid transparent;
et2-button-icon {
font-size: 2.3em;
.white-svg;
}
button {
height: @mobile-elem-height;
width: @mobile-button-width;
@ -825,12 +829,12 @@
width:50px;
height:50px;
display:block;
float:right;
.white-svg;
&:focus{
outline:none;
}
order: 9;
padding: 0 1em 0 1em;
}
button.nm_action_header {
background-image: url(../../api/templates/default/images/dots.svg);
@ -842,12 +846,12 @@
width:50px;
height:50px;
display:block;
float:right;
.white-svg;
&:focus{
outline:none;
}
order: 10;
padding: 0 1em 0 1em;
}
button.nm_action_header.back {
background-image: url(../../api/templates/default/images/cancelled.svg);
@ -865,10 +869,10 @@
width: 50px;
height: 50px;
display: inline-block;
float: right;
text-align: center;
display:none;
order:7;
padding: 0 1em 0 1em;
}
div.nm_favorites_div {
order:8;
@ -1212,6 +1216,10 @@
}
div#popupMainDiv {padding:0;}
.dialogHeadbar {
et2-button-icon {
font-size: 2.3em;
.white-svg;
}
button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {
.white-svg;
padding-right: 15px;

View File

@ -105,16 +105,16 @@
<rows>
<row disabled="@hidebuttons" class="dialogHeadbar" >
<hbox span="all" width="100%">
<button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new" background_image="1"/>
<button statustext="Applies the changes made" id="button[apply]" image="apply" background_image="1"/>
<button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete" background_image="1"/>
<button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"/>
<button statustext="Applies the changes made" id="button[apply]" image="apply"/>
<button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"/>
<textbox type="integer" id="ts_id" readonly="true" class="entry_id"/>
</hbox>
</row>
<row disabled="!@showsearchbuttons" class="dialogHeadbar">
<hbox span="all" width="100%">
<button label="Search" id="button[search]" image="search" background_image="1"/>
<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
<button label="Search" id="button[search]" image="search"/>
<button label="Cancel" id="button[cancelsearch]" image="cancel"/>
</hbox>
</row>
<row disabled="@ts_viewtype">