extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-13 10:11:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change deprecated et2_dialog for Et2Dialog webcomponent

Browse Source
This commit is contained in:
nathan 2024-12-09 14:56:34 -07:00
parent a8324d595b
commit 2356c6e0dd
32 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/templates/default/edit.xet
View File

@ -423,7 +423,7 @@
<et2-button label="Apply" id="button[apply]" class="button_apply" image="apply"></et2-button> <et2-button label="Apply" id="button[apply]" class="button_apply" image="apply"></et2-button>
<et2-button label="Cancel" id="button[cancel]" class="button_cancel" onclick="if($cont[view] || false) return true; window.close(); return false;" image="cancel"></et2-button> <et2-button label="Cancel" id="button[cancel]" class="button_cancel" onclick="if($cont[view] || false) return true; window.close(); return false;" image="cancel"></et2-button>
<et2-checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all" disabled="@hide_change_org"></et2-checkbox> <et2-checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all" disabled="@hide_change_org"></et2-checkbox>
<et2-button align="right" label="Delete" id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" image="delete"></et2-button> <et2-button align="right" label="Delete" id="button[delete]" class="button_delete" onclick="Et2Dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" image="delete"></et2-button>
</et2-hbox> </et2-hbox>
</row> </row>

2
addressbook/templates/mobile/edit.xet
View File

@ -314,7 +314,7 @@
<row disabled="@hidebuttons" class="dialogHeadbar" > <row disabled="@hidebuttons" class="dialogHeadbar" >
<et2-hbox span="all" width="100%"> <et2-hbox span="all" width="100%">
<et2-button-icon id="button[apply]" class="button_apply" image="apply"></et2-button-icon> <et2-button-icon id="button[apply]" class="button_apply" image="apply"></et2-button-icon>
<et2-button-icon id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" tabindex="25" image="delete"></et2-button-icon> <et2-button-icon id="button[delete]" class="button_delete" onclick="Et2Dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" tabindex="25" image="delete"></et2-button-icon>
</et2-hbox> </et2-hbox>
</row> </row>
<row disabled="!@showsearchbuttons" class="dialogHeadbar"> <row disabled="!@showsearchbuttons" class="dialogHeadbar">

2
admin/inc/class.admin_mail.inc.php
View File

@ -1236,7 +1236,7 @@ class admin_mail
// if account is for multiple user, change delete confirmation to reflect that // if account is for multiple user, change delete confirmation to reflect that
if (Mail\Account::is_multiple($content)) if (Mail\Account::is_multiple($content))
{ {
$tpl->setElementAttribute('button[delete]', 'onclick', "et2_dialog.confirm(widget,'This is NOT a personal mail account!\\n\\nAccount will be deleted for ALL users!\\n\\nAre you really sure you want to do that?','Delete this account')"); $tpl->setElementAttribute('button[delete]', 'onclick', "Et2Dialog.confirm(widget,'This is NOT a personal mail account!\\n\\nAccount will be deleted for ALL users!\\n\\nAre you really sure you want to do that?','Delete this account')");
} }
// if no edit access, make whole dialog readonly // if no edit access, make whole dialog readonly

2
admin/templates/default/customfield_edit.xet
View File

@ -80,7 +80,7 @@
<et2-button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply"></et2-button> <et2-button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply"></et2-button>
<et2-button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button> <et2-button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
</et2-hbox> </et2-hbox>
<et2-button align="right" statustext="delete this entry" label="Delete" id="button[delete]" image="delete" onclick="et2_dialog.confirm(widget,'Delete this entry?','Delete')" span="all"></et2-button> <et2-button align="right" statustext="delete this entry" label="Delete" id="button[delete]" image="delete" onclick="Et2Dialog.confirm(widget,'Delete this entry?','Delete')" span="all"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

2
admin/templates/default/customtranslation.xet
View File

@ -17,7 +17,7 @@
<row> <row>
<et2-textbox id="${row}[phrase]"></et2-textbox> <et2-textbox id="${row}[phrase]"></et2-textbox>
<et2-textbox id="${row}[translation]"></et2-textbox> <et2-textbox id="${row}[translation]"></et2-textbox>
<et2-button align="center" label="Delete" id="delete[$row]" onclick="et2_dialog.confirm(widget,'Delete','Delete')" image="delete"></et2-button> <et2-button align="center" label="Delete" id="delete[$row]" onclick="Et2Dialog.confirm(widget,'Delete','Delete')" image="delete"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

6
admin/templates/default/mailaccount.xet
View File

@ -266,7 +266,7 @@
<et2-description for="mailForwardingAddress" value="Forward email's to"></et2-description> <et2-description for="mailForwardingAddress" value="Forward email's to"></et2-description>
<et2-email id="mailForwardingAddress" multiple="true" searchUrl="" emailDisplay="email"></et2-email> <et2-email id="mailForwardingAddress" multiple="true" searchUrl="" emailDisplay="email"></et2-email>
<et2-vbox> <et2-vbox>
<et2-checkbox label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox> <et2-checkbox label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) Et2Dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox>
<et2-checkbox label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox> <et2-checkbox label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox>
</et2-vbox> </et2-vbox>
</row> </row>
@ -374,8 +374,8 @@
<et2-button label="Apply" id="button[apply]"></et2-button> <et2-button label="Apply" id="button[apply]"></et2-button>
<et2-button statustext="Use wizard to detect or verify configuration" label="Wizard" id="button[wizard]" image="magic"></et2-button> <et2-button statustext="Use wizard to detect or verify configuration" label="Wizard" id="button[wizard]" image="magic"></et2-button>
<et2-button label="Cancel" id="button[cancel]" onclick="window.close();"></et2-button> <et2-button label="Cancel" id="button[cancel]" onclick="window.close();"></et2-button>
<et2-button align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')" hideOnReadonly="true"></et2-button> <et2-button align="right" label="Delete" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this account','Delete')" hideOnReadonly="true"></et2-button>
<et2-button align="right" label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" hideOnReadonly="true" image="delete"></et2-button> <et2-button align="right" label="Delete identity" id="button[delete_identity]" onclick="Et2Dialog.confirm(widget,'Delete identity','Delete')" hideOnReadonly="true" image="delete"></et2-button>
</et2-hbox> </et2-hbox>
</template> </template>
</overlay> </overlay>

2
admin/templates/default/token.edit.xet
View File

@ -66,7 +66,7 @@
<et2-button label="Apply" id="button[apply]"></et2-button> <et2-button label="Apply" id="button[apply]"></et2-button>
<et2-button label="Cancel" id="button[cancel]" noValidation="true"></et2-button> <et2-button label="Cancel" id="button[cancel]" noValidation="true"></et2-button>
<et2-button align="right" label="Revoke" id="button[delete]" <et2-button align="right" label="Revoke" id="button[delete]"
onclick="et2_dialog.confirm(widget,'Revoke this token','Revoke')"></et2-button> onclick="Et2Dialog.confirm(widget,'Revoke this token','Revoke')"></et2-button>
</et2-hbox> </et2-hbox>
</row> </row>
</rows> </rows>

6
admin/templates/mobile/mailaccount.xet
View File

@ -238,7 +238,7 @@
<row disabled="@no_forward_available"> <row disabled="@no_forward_available">
<et2-description></et2-description> <et2-description></et2-description>
<et2-vbox> <et2-vbox>
<et2-checkbox label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox> <et2-checkbox label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) Et2Dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox>
<et2-checkbox label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox> <et2-checkbox label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox>
</et2-vbox> </et2-vbox>
</row> </row>
@ -302,8 +302,8 @@
<et2-button-icon id="button[save]"></et2-button-icon> <et2-button-icon id="button[save]"></et2-button-icon>
<et2-button-icon id="button[apply]"></et2-button-icon> <et2-button-icon id="button[apply]"></et2-button-icon>
<et2-button-icon statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand"></et2-button-icon> <et2-button-icon statustext="Use wizard to detect or verify configuration" id="button[wizard]" image="magicwand"></et2-button-icon>
<et2-button-icon id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this account','Delete')"></et2-button-icon> <et2-button-icon id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this account','Delete')"></et2-button-icon>
<et2-button-icon label="Delete identity" id="button[delete_identity]" onclick="et2_dialog.confirm(widget,'Delete identity','Delete')" image="delete"></et2-button-icon> <et2-button-icon label="Delete identity" id="button[delete_identity]" onclick="Et2Dialog.confirm(widget,'Delete identity','Delete')" image="delete"></et2-button-icon>
</et2-hbox> </et2-hbox>
</row> </row>
<row disabled="!@accounts" class="dialogHeader"> <row disabled="!@accounts" class="dialogHeader">

8
api/js/etemplate/et2_extension_nextmatch_actions.js
View File

@ -292,11 +292,11 @@ export function fetchAll(ids, nextmatch, callback)
var count = idsArr.length; var count = idsArr.length;
var total = nextmatch.controller._grid.getTotalCount(); var total = nextmatch.controller._grid.getTotalCount();
var cancel = false; var cancel = false;
var dialog = et2_dialog.show_dialog( var dialog = Et2Dialog.show_dialog(
// Abort the long task if they canceled the data load // Abort the long task if they canceled the data load
function() {count = total; cancel=true;}, function() {count = total; cancel=true;},
egw.lang('Loading'), egw.lang('please wait...'),{},[ egw.lang('Loading'), egw.lang('please wait...'),{},[
{"button_id": et2_dialog.CANCEL_BUTTON,"text": egw.lang('cancel'),id: 'dialog[cancel]',image: 'cancel'} {"button_id": Et2Dialog.CANCEL_BUTTON, "text": egw.lang('cancel'), id: 'dialog[cancel]', image: 'cancel'}
] ]
); );
@ -346,11 +346,11 @@ export function doLongTask(idsArr, all, _action, nextmatch)
if(all) if(all)
{ {
var fetching = fetchAll(idsArr, nextmatch,function(idsArr){ var fetching = fetchAll(idsArr, nextmatch,function(idsArr){
et2_dialog.long_task(null,_action.data.message||_action.caption,_action.data.title,_action.data.menuaction,idsArr); Et2Dialog.long_task(null, _action.data.message || _action.caption, _action.data.title, _action.data.menuaction, idsArr);
}); });
if(fetching) return true; if(fetching) return true;
} }
et2_dialog.long_task(null,_action.data.message||_action.caption,_action.data.title,_action.data.menuaction,idsArr); Et2Dialog.long_task(null, _action.data.message || _action.caption, _action.data.title, _action.data.menuaction, idsArr);
return true; return true;
} }
return false; return false;

6
calendar/templates/default/edit.xet
View File

@ -30,7 +30,7 @@
<et2-description id="${row}[offset]" noLang="1"></et2-description> <et2-description id="${row}[offset]" noLang="1"></et2-description>
<et2-checkbox align="center" id="${row}[all]" readonly="true"></et2-checkbox> <et2-checkbox align="center" id="${row}[all]" readonly="true"></et2-checkbox>
<et2-select-account id="${row}[owner]" readonly="true"></et2-select-account> <et2-select-account id="${row}[owner]" readonly="true"></et2-select-account>
<et2-button align="left" disabled="!$row_cont[time]" statustext="Delete this alarm" label="Delete" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"></et2-button> <et2-button align="left" disabled="!$row_cont[time]" statustext="Delete this alarm" label="Delete" id="delete_alarm[$row_cont[id]]" onclick="Et2Dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -131,7 +131,7 @@
<rows> <rows>
<row> <row>
<et2-date-time id="$row" readonly="true"></et2-date-time> <et2-date-time id="$row" readonly="true"></et2-date-time>
<et2-button-icon statustext="Delete this recurrence" id="delete_rdate[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this recurrence','Delete')" image="delete"></et2-button-icon> <et2-button-icon statustext="Delete this recurrence" id="delete_rdate[$row_cont]" onclick="Et2Dialog.confirm(widget,'Delete this recurrence','Delete')" image="delete"></et2-button-icon>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -152,7 +152,7 @@
<rows> <rows>
<row> <row>
<et2-date-time id="$row" readonly="true"></et2-date-time> <et2-date-time id="$row" readonly="true"></et2-date-time>
<et2-button-icon statustext="Delete this exception" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"></et2-button-icon> <et2-button-icon statustext="Delete this exception" id="delete_exception[$row_cont]" onclick="Et2Dialog.confirm(widget,'Delete this exception','Delete')" image="delete"></et2-button-icon>
</row> </row>
</rows> </rows>
</grid> </grid>

2
calendar/templates/default/meeting.xet
View File

@ -53,7 +53,7 @@
<et2-description value="This mail cancels a meeting" class="meetingRequestMessage"></et2-description> <et2-description value="This mail cancels a meeting" class="meetingRequestMessage"></et2-description>
<et2-hbox class="buttonRow"> <et2-hbox class="buttonRow">
<et2-button label="Apply" statustext="Removes the event from my calendar" id="button[cancel]"></et2-button> <et2-button label="Apply" statustext="Removes the event from my calendar" id="button[cancel]"></et2-button>
<et2-button label="Delete" statustext="Delete this meeting for all participants" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this meeting for all participants','Delete')"></et2-button> <et2-button label="Delete" statustext="Delete this meeting for all participants" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this meeting for all participants','Delete')"></et2-button>
<et2-button statustext="Edit event in calendar" label="Edit" id="button[edit]" image="edit" <et2-button statustext="Edit event in calendar" label="Edit" id="button[edit]" image="edit"
onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;"></et2-button> onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;"></et2-button>
</et2-hbox> </et2-hbox>

6
calendar/templates/mobile/edit.xet
View File

@ -43,7 +43,7 @@
<et2-checkbox align="center" id="${row}[all]" label="all" readonly="true"></et2-checkbox> <et2-checkbox align="center" id="${row}[all]" label="all" readonly="true"></et2-checkbox>
<et2-select-account id="${row}[owner]" readonly="true"></et2-select-account> <et2-select-account id="${row}[owner]" readonly="true"></et2-select-account>
</et2-hbox> </et2-hbox>
<et2-button-icon align="center" statustext="Delete this alarm" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"></et2-button-icon> <et2-button-icon align="center" statustext="Delete this alarm" id="delete_alarm[$row_cont[id]]" onclick="Et2Dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"></et2-button-icon>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -131,7 +131,7 @@
<rows> <rows>
<row> <row>
<et2-date-time id="$row" readonly="true"></et2-date-time> <et2-date-time id="$row" readonly="true"></et2-date-time>
<et2-button statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"></et2-button> <et2-button statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="Et2Dialog.confirm(widget,'Delete this exception','Delete')" image="delete"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -191,7 +191,7 @@
<row disabled="@hidebuttons" class="dialogHeadbar" > <row disabled="@hidebuttons" class="dialogHeadbar" >
<et2-hbox span="all" width="100%"> <et2-hbox span="all" width="100%">
<et2-button-icon statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon> <et2-button-icon statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon>
<et2-button-icon statustext="delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button-icon> <et2-button-icon statustext="delete this entry" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button-icon>
<et2-button-icon statustext="Find free timeslots where the selected participants are available for the given timespan" <et2-button-icon statustext="Find free timeslots where the selected participants are available for the given timespan"
id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="clock-history" noSubmit="true"></et2-button-icon> id="freetime" label="Freetime" onclick="app.calendar.freetime_search" image="clock-history" noSubmit="true"></et2-button-icon>
<et2-button-toggle label="notifications" id="no_notifications" class="notification_check" onIcon="bell-fill" offIcon="bell-slash"/> <et2-button-toggle label="notifications" id="no_notifications" class="notification_check" onIcon="bell-fill" offIcon="bell-slash"/>

2
filemanager/templates/default/admin.xet
View File

@ -88,7 +88,7 @@
<et2-hbox disabled="!@versioning"> <et2-hbox disabled="!@versioning">
<et2-number id="mtime" label="Delete all older versions and deleted files older then %s days" statustext="0 means all, -N newer then N days" precision="0"></et2-number> <et2-number id="mtime" label="Delete all older versions and deleted files older then %s days" statustext="0 means all, -N newer then N days" precision="0"></et2-number>
<et2-textbox label="under directory" id="versionedpath" statustext="/ = everywhere"></et2-textbox> <et2-textbox label="under directory" id="versionedpath" statustext="/ = everywhere"></et2-textbox>
<et2-button id="delete-versions" label="Finally delete" onclick="et2_dialog.confirm(widget,'Finally delete all older versions and deleted files under given directory.\n\nThis can NOT be undone!','Confirm final delete');" image="delete"></et2-button> <et2-button id="delete-versions" label="Finally delete" onclick="Et2Dialog.confirm(widget,'Finally delete all older versions and deleted files under given directory.\n\nThis can NOT be undone!','Confirm final delete');" image="delete"></et2-button>
</et2-hbox> </et2-hbox>
<grid> <grid>
<columns> <columns>

2
filemanager/templates/default/file.xet
View File

@ -131,7 +131,7 @@
<et2-select-account id="${row}[owner]" readonly="true"></et2-select-account> <et2-select-account id="${row}[owner]" readonly="true"></et2-select-account>
<et2-select id="${row}[rights]" readonly="true"></et2-select> <et2-select id="${row}[rights]" readonly="true"></et2-select>
<et2-description id="${row}[path]"></et2-description> <et2-description id="${row}[path]"></et2-description>
<et2-button label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="et2_dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"></et2-button> <et2-button label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="Et2Dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

2
filemanager/templates/mobile/file.xet
View File

@ -141,7 +141,7 @@
<et2-select-account id="${row}[owner]" readonly="true"></et2-select-account> <et2-select-account id="${row}[owner]" readonly="true"></et2-select-account>
<et2-select id="${row}[rights]" readonly="true"></et2-select> <et2-select id="${row}[rights]" readonly="true"></et2-select>
<et2-description id="${row}[path]"></et2-description> <et2-description id="${row}[path]"></et2-description>
<et2-button label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="et2_dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"></et2-button> <et2-button label="Delete" id="delete[$row_cont[ino]-$row_cont[owner]]" onclick="Et2Dialog.confirm(widget,'Delete this extended ACL?','Delete')" image="delete"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

6
home/js/Et2PortletList.ts
View File

@ -67,7 +67,7 @@ export class Et2PortletList extends Et2Portlet
let dialog = et2_createWidget("dialog", { let dialog = et2_createWidget("dialog", {
callback: function(button_id, value) callback: function(button_id, value)
{ {
if(button_id == et2_dialog.CANCEL_BUTTON) if(button_id == Et2Dialog.CANCEL_BUTTON)
{ {
return; return;
} }
@ -91,7 +91,7 @@ export class Et2PortletList extends Et2Portlet
list.set_value(new_list); list.set_value(new_list);
} }
}, },
buttons: et2_dialog.BUTTONS_OK_CANCEL, buttons: Et2Dialog.BUTTONS_OK_CANCEL,
title: app.home.egw.lang('add'), title: app.home.egw.lang('add'),
template: path, template: path,
value: {content: [{label: app.home.egw.lang('add'), type: 'link-entry', name: 'add', size: ''}]} value: {content: [{label: app.home.egw.lang('add'), type: 'link-entry', name: 'add', size: ''}]}
@ -122,7 +122,7 @@ export class Et2PortletList extends Et2Portlet
} }
if(changed) if(changed)
{ {
widget._process_edit(et2_dialog.OK_BUTTON, { widget._process_edit(Et2Dialog.OK_BUTTON, {
list: new_list || {} list: new_list || {}
}); });
} }

5
home/js/app.ts
View File

@ -20,6 +20,7 @@ import "./Et2PortletNote";
import './Et2PortletWeather'; import './Et2PortletWeather';
import "../../calendar/js/Et2PortletCalendar"; import "../../calendar/js/Et2PortletCalendar";
import Sortable from "sortablejs/modular/sortable.complete.esm.js"; import Sortable from "sortablejs/modular/sortable.complete.esm.js";
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
/** /**
* JS for home application * JS for home application
@ -343,7 +344,7 @@ export class HomeApp extends EgwApp
// If you use a template, the second parameter will be the value of the template, as if it were submitted. // If you use a template, the second parameter will be the value of the template, as if it were submitted.
callback: function(button_id, value) callback: function(button_id, value)
{ {
if(button_id != et2_dialog.OK_BUTTON) if(button_id != Et2Dialog.OK_BUTTON)
{ {
return; return;
} }
@ -351,7 +352,7 @@ export class HomeApp extends EgwApp
// Pass them to server // Pass them to server
egw.json('home_ui::ajax_set_default', ['add', portlet_ids, value.group || false]).sendRequest(true); egw.json('home_ui::ajax_set_default', ['add', portlet_ids, value.group || false]).sendRequest(true);
}, },
buttons: et2_dialog.BUTTONS_OK_CANCEL, buttons: Et2Dialog.BUTTONS_OK_CANCEL,
title: action.caption, title: action.caption,
template: "home.set_default", template: "home.set_default",
value: {content: {}, sel_options: {group: {default: egw.lang('All'), forced: egw.lang('Forced')}}} value: {content: {}, sel_options: {group: {default: egw.lang('All'), forced: egw.lang('Forced')}}}

2
infolog/templates/default/edit.xet
View File

@ -212,7 +212,7 @@
<et2-button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button> <et2-button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
<et2-select statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" emptyLabel="Actions..."></et2-select> <et2-select statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" emptyLabel="Actions..."></et2-select>
<et2-checkbox label="Do not notify" id="no_notifications" statustext="Do not notify of these changes"></et2-checkbox> <et2-checkbox label="Do not notify" id="no_notifications" statustext="Do not notify of these changes"></et2-checkbox>
<et2-button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete"></et2-button> <et2-button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; Et2Dialog.confirm(widget,'Delete this entry','Delete');" image="delete"></et2-button>
</et2-hbox> </et2-hbox>
</row> </row>
</rows> </rows>

2
infolog/templates/mobile/edit.xet
View File

@ -139,7 +139,7 @@
<row disabled="@hidebuttons" class="dialogHeadbar" > <row disabled="@hidebuttons" class="dialogHeadbar" >
<et2-hbox span="all" width="100%"> <et2-hbox span="all" width="100%">
<et2-button-icon statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon> <et2-button-icon statustext="Apply the changes" id="button[apply]" image="apply"></et2-button-icon>
<et2-button-icon 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"></et2-button-icon> <et2-button-icon statustext="delete this entry" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; Et2Dialog.confirm(widget,'Delete this entry','Delete');" image="delete" span="all"></et2-button-icon>
<et2-button-timestamp statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" image="timesheet" target="info_des"></et2-button-timestamp> <et2-button-timestamp statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" image="timesheet" target="info_des"></et2-button-timestamp>
<et2-button-toggle label="notifications" id="no_notifications" class="notification_check" onIcon="bell-fill" offIcon="bell-slash"/> <et2-button-toggle label="notifications" id="no_notifications" class="notification_check" onIcon="bell-fill" offIcon="bell-slash"/>
<et2-number id="info_number" readonly="true" class="entry_id" precision="0"></et2-number> <et2-number id="info_number" readonly="true" class="entry_id" precision="0"></et2-number>

25
mail/js/app.js
View File

@ -13,8 +13,7 @@
import {AppJS} from "../../api/js/jsapi/app_base.js"; import {AppJS} from "../../api/js/jsapi/app_base.js";
import {et2_createWidget} from "../../api/js/etemplate/et2_core_widget"; import {et2_createWidget} from "../../api/js/etemplate/et2_core_widget";
import {et2_dialog} from "../../api/js/etemplate/et2_widget_dialog"; import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
import {et2_button} from "../../api/js/etemplate/et2_widget_button";
import {egw_getObjectManager} from '../../api/js/egw_action/egw_action'; import {egw_getObjectManager} from '../../api/js/egw_action/egw_action';
import {egwIsMobile, egwSetBit} from "../../api/js/egw_action/egw_action_common"; import {egwIsMobile, egwSetBit} from "../../api/js/egw_action/egw_action_common";
import {EGW_AO_FLAG_DEFAULT_FOCUS} from "../../api/js/egw_action/egw_action_constants"; import {EGW_AO_FLAG_DEFAULT_FOCUS} from "../../api/js/egw_action/egw_action_constants";
@ -5899,8 +5898,7 @@ app.classes.mail = AppJS.extend(
{ {
var self = this; var self = this;
var pass_exp = egw.preference('smime_pass_exp', 'mail'); var pass_exp = egw.preference('smime_pass_exp', 'mail');
et2_createWidget("dialog", const dialog = loadWebComponent("et2-dialog", {
{
callback: function(_button_id, _value) callback: function(_button_id, _value)
{ {
if (_button_id == 'send' && _value) if (_button_id == 'send' && _value)
@ -5926,7 +5924,8 @@ app.classes.mail = AppJS.extend(
}}, }},
template: egw.webserverUrl+'/api/templates/default/password.xet', template: egw.webserverUrl+'/api/templates/default/password.xet',
resizable: false resizable: false
}, et2_dialog._create_parent('mail')); });
document.body.append(dialog);
}, },
/** /**
@ -6107,8 +6106,7 @@ app.classes.mail = AppJS.extend(
'presets[org_unit]': _metadata.certDetails.subject.organizationUnitName 'presets[org_unit]': _metadata.certDetails.subject.organizationUnitName
}; };
content.class=""; content.class="";
et2_createWidget("dialog", const dialog = et2_createWidget('et2-dialog', {
{
callback: function(_button_id, _value) callback: function(_button_id, _value)
{ {
if (_button_id == 'contact' && _value) if (_button_id == 'contact' && _value)
@ -6130,7 +6128,8 @@ app.classes.mail = AppJS.extend(
value:{content:content}, value:{content:content},
template: egw.webserverUrl+'/mail/templates/default/smimeCertAddToContact.xet?1', template: egw.webserverUrl+'/mail/templates/default/smimeCertAddToContact.xet?1',
resizable: false resizable: false
}, et2_dialog._create_parent('mail')); });
document.body.append(dialog);
}, },
/** /**
@ -6177,7 +6176,7 @@ app.classes.mail = AppJS.extend(
var data = (_sender && _sender.uid) ? {data:_sender} : egw.dataGetUIDdata(id); var data = (_sender && _sender.uid) ? {data:_sender} : egw.dataGetUIDdata(id);
var subject = data && data.data? data.data.subject : ""; var subject = data && data.data? data.data.subject : "";
et2_createWidget("dialog", const dialog = et2_createWidget("et2-dialog",
{ {
callback: function(_button_id, _value) { callback: function(_button_id, _value) {
var newSubject = null; var newSubject = null;
@ -6215,7 +6214,8 @@ app.classes.mail = AppJS.extend(
template: egw.webserverUrl + '/mail/templates/default/modifyMessageSubjectDialog.xet?1', template: egw.webserverUrl + '/mail/templates/default/modifyMessageSubjectDialog.xet?1',
resizable: false, resizable: false,
width: 500 width: 500
}, et2_dialog._create_parent('mail')); });
document.body.append(dialog);
}, },
/** /**
@ -6263,7 +6263,7 @@ app.classes.mail = AppJS.extend(
var pref_id = _senders[0].id.split('::')[0]+'_predefined_compose_addresses'; var pref_id = _senders[0].id.split('::')[0]+'_predefined_compose_addresses';
var prefs = egw.preference(pref_id, 'mail'); var prefs = egw.preference(pref_id, 'mail');
et2_createWidget("dialog", const dialog = loadWebComponent("et2-dialog",
{ {
callback: function (_button_id, _value) callback: function (_button_id, _value)
{ {
@ -6281,7 +6281,8 @@ app.classes.mail = AppJS.extend(
minWidth: 410, minWidth: 410,
template: egw.webserverUrl + '/mail/templates/default/predefinedAddressesDialog.xet?', template: egw.webserverUrl + '/mail/templates/default/predefinedAddressesDialog.xet?',
resizable: false, resizable: false,
}, et2_dialog._create_parent('mail')); });
document.body.append(dialog);
}, },
/** /**

2
mail/templates/default/acl.xet
View File

@ -74,7 +74,7 @@
<et2-checkbox align="center" id="${row}[acl_e]" onchange="app.mail.acl_common_rights"></et2-checkbox> <et2-checkbox align="center" id="${row}[acl_e]" onchange="app.mail.acl_common_rights"></et2-checkbox>
<et2-checkbox align="center" id="${row}[acl_a]" onchange="app.mail.acl_common_rights"></et2-checkbox> <et2-checkbox align="center" id="${row}[acl_a]" onchange="app.mail.acl_common_rights"></et2-checkbox>
<et2-checkbox align="center" id="${row}[acl_recursive]"></et2-checkbox> <et2-checkbox align="center" id="${row}[acl_recursive]"></et2-checkbox>
<et2-button align="right" statustext="Delete this ACL" label="Delete" id="delete[${row}]" value="${row}" image="delete" onclick="et2_dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"></et2-button> <et2-button align="right" statustext="Delete this ACL" label="Delete" id="delete[${row}]" value="${row}" image="delete" onclick="Et2Dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

2
mail/templates/mobile/acl.xet
View File

@ -32,7 +32,7 @@
<et2-hbox> <et2-hbox>
<et2-select id="${row}[acl]" label="Rights" onchange="app.mail.acl_common_rights_selector"></et2-select> <et2-select id="${row}[acl]" label="Rights" onchange="app.mail.acl_common_rights_selector"></et2-select>
<et2-checkbox align="center" label="Recursively" id="${row}[acl_recursive]"></et2-checkbox> <et2-checkbox align="center" label="Recursively" id="${row}[acl_recursive]"></et2-checkbox>
<et2-button-icon align="right" statustext="Delete this ACL" id="delete[${row}]" value="${row}" image="delete" onclick="et2_dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"></et2-button-icon> <et2-button-icon align="right" statustext="Delete this ACL" id="delete[${row}]" value="${row}" image="delete" onclick="Et2Dialog.confirm(widget,'Do you really want to remove all rights from this account?','Remove')"></et2-button-icon>
</et2-hbox> </et2-hbox>
<et2-hbox class="aclDetails"> <et2-hbox class="aclDetails">

5
notifications/js/notificationajaxpopup.js
View File

@ -949,12 +949,13 @@
$egwpopup_fw.click(function(){window.app.notifications.toggle();}); $egwpopup_fw.click(function(){window.app.notifications.toggle();});
jQuery(".egwpopup_deleteall", '#egwpopup').click(function(_ev){ jQuery(".egwpopup_deleteall", '#egwpopup').click(function(_ev){
_ev.stopPropagation(); _ev.stopPropagation();
et2_dialog.show_dialog( function(_button){ Et2Dialog.show_dialog(function (_button)
{
if (_button == 2) window.app.notifications.delete_all(); if (_button == 2) window.app.notifications.delete_all();
}, },
egw.lang('Are you sure you want to delete all notifications?'), egw.lang('Are you sure you want to delete all notifications?'),
egw.lang('Delete notifications'), egw.lang('Delete notifications'),
null, et2_dialog.BUTTON_YES_NO, et2_dialog.WARNING_MESSAGE, undefined, egw null, Et2Dialog.BUTTON_YES_NO, Et2Dialog.WARNING_MESSAGE, undefined, egw
); );
}); });
jQuery(".egwpopup_seenall", '#egwpopup').click(function(){window.app.notifications.mark_all_seen()}); jQuery(".egwpopup_seenall", '#egwpopup').click(function(){window.app.notifications.mark_all_seen()});

3
pixelegg/js/fw_mobile.js
View File

@ -1139,7 +1139,8 @@ import {tapAndSwipe} from "../../api/js/tapandswipe";
jQuery(window).on('popstate', function(e){ jQuery(window).on('popstate', function(e){
// Check if user wants to logout and ask a confirmation // Check if user wants to logout and ask a confirmation
if (window.location.hash == '#main') { if (window.location.hash == '#main') {
et2_dialog.show_dialog(function(button){ Et2Dialog.show_dialog(function (button)
{
if (button === 3){ if (button === 3){
history.forward(); history.forward();
return; return;

2
preferences/templates/default/password.xet
View File

@ -37,7 +37,7 @@
<et2-vbox> <et2-vbox>
<et2-button id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."></et2-button> <et2-button id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."></et2-button>
<et2-button id="action[reset]" label="Reset QRCode" statustext="Generate new QRCode to disable existing one, after enabling the new one!"></et2-button> <et2-button id="action[reset]" label="Reset QRCode" statustext="Generate new QRCode to disable existing one, after enabling the new one!"></et2-button>
<et2-button id="action[disable]" label="Disable Two Factor Auth" onclick="et2_dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')" statustext="Disabling allows to again log in without a second factor."></et2-button> <et2-button id="action[disable]" label="Disable Two Factor Auth" onclick="Et2Dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')" statustext="Disabling allows to again log in without a second factor."></et2-button>
</et2-vbox> </et2-vbox>
<et2-description id="status" class="toptStatus"></et2-description> <et2-description id="status" class="toptStatus"></et2-description>
</row> </row>

2
preferences/templates/mobile/password.xet
View File

@ -30,7 +30,7 @@
<et2-vbox> <et2-vbox>
<et2-button id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."></et2-button> <et2-button id="action[show]" label="Show QRCode" statustext="Show QRCode to enable on an additional device."></et2-button>
<et2-button id="action[reset]" label="Reset QRCode" statustext="Generate new QRCode to disable existing one, after enabling the new one!"></et2-button> <et2-button id="action[reset]" label="Reset QRCode" statustext="Generate new QRCode to disable existing one, after enabling the new one!"></et2-button>
<et2-button id="action[disable]" label="Disable Two Factor Auth" onclick="et2_dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')" statustext="Disabling allows to again log in without a second factor."></et2-button> <et2-button id="action[disable]" label="Disable Two Factor Auth" onclick="Et2Dialog.confirm(widget,'Are you sure?','Disable Two Factor Auth')" statustext="Disabling allows to again log in without a second factor."></et2-button>
</et2-vbox> </et2-vbox>
<et2-description id="status" class="toptStatus"></et2-description> <et2-description id="status" class="toptStatus"></et2-description>
</row> </row>

2
resources/templates/default/edit.xet
View File

@ -175,7 +175,7 @@
<et2-button label="Apply" id="button[apply]" image="apply"></et2-button> <et2-button label="Apply" id="button[apply]" image="apply"></et2-button>
<et2-button label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button> <et2-button label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
</et2-hbox> </et2-hbox>
<et2-button align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button> <et2-button align="right" label="Delete" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

2
resources/templates/mobile/edit.xet
View File

@ -121,7 +121,7 @@
<row class="dialogHeadbar" > <row class="dialogHeadbar" >
<et2-hbox> <et2-hbox>
<et2-button-icon id="button[apply]" image="apply"></et2-button-icon> <et2-button-icon id="button[apply]" image="apply"></et2-button-icon>
<et2-button-icon id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button-icon> <et2-button-icon id="button[delete]" onclick="Et2Dialog.confirm(widget,'Do you really want to delete this resource?','Delete')" image="delete"></et2-button-icon>
<et2-number id="res_id" readonly="true" class="entry_id" precision="0"></et2-number> <et2-number id="res_id" readonly="true" class="entry_id" precision="0"></et2-number>
</et2-hbox> </et2-hbox>
</row> </row>

2
timesheet/templates/default/edit.xet
View File

@ -187,7 +187,7 @@
<et2-button statustext="closes the window without saving the changes" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button> <et2-button statustext="closes the window without saving the changes" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel"></et2-button>
<html id="js"/> <html id="js"/>
</et2-hbox> </et2-hbox>
<et2-button hideOnReadonly="true" align="right" statustext="Delete this entry" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button> <et2-button hideOnReadonly="true" align="right" statustext="Delete this entry" label="Delete" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button>
<et2-button hideOnReadonly="true" align="right" statustext="Restore this entry" label="Undelete" id="button[undelete]" image="undelete"></et2-button> <et2-button hideOnReadonly="true" align="right" statustext="Restore this entry" label="Undelete" id="button[undelete]" image="undelete"></et2-button>
</et2-hbox> </et2-hbox>
</row> </row>

2
timesheet/templates/default/editstatus.xet
View File

@ -40,7 +40,7 @@
<et2-textbox maxlength="150" id="${row}[name]" placeholder="--&gt; enter new name"></et2-textbox> <et2-textbox maxlength="150" id="${row}[name]" placeholder="--&gt; enter new name"></et2-textbox>
<et2-select id="${row}[parent]" emptyLabel="Select one ..."></et2-select> <et2-select id="${row}[parent]" emptyLabel="Select one ..."></et2-select>
<et2-checkbox id="${row}[admin]" statustext="Only admin can edit this status"></et2-checkbox> <et2-checkbox id="${row}[admin]" statustext="Only admin can edit this status"></et2-checkbox>
<et2-button image="delete" label="Delete" align="center" id="delete[$row_cont[id]]" statustext="Delete this status" onclick="et2_dialog.confirm(widget,'Delete this status','Delete')"></et2-button> <et2-button image="delete" label="Delete" align="center" id="delete[$row_cont[id]]" statustext="Delete this status" onclick="Et2Dialog.confirm(widget,'Delete this status','Delete')"></et2-button>
</row> </row>
</rows> </rows>
</grid> </grid>

2
timesheet/templates/mobile/edit.xet
View File

@ -98,7 +98,7 @@
<et2-hbox span="all" width="100%"> <et2-hbox span="all" width="100%">
<et2-button-icon statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"></et2-button-icon> <et2-button-icon statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"></et2-button-icon>
<et2-button-icon statustext="Applies the changes made" id="button[apply]" image="apply"></et2-button-icon> <et2-button-icon statustext="Applies the changes made" id="button[apply]" image="apply"></et2-button-icon>
<et2-button-icon statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button-icon> <et2-button-icon statustext="Delete this entry" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button-icon>
<et2-number id="ts_id" readonly="true" class="entry_id" precision="0"></et2-number> <et2-number id="ts_id" readonly="true" class="entry_id" precision="0"></et2-number>
</et2-hbox> </et2-hbox>
</row> </row>

2
timesheet/templates/mobile/view.xet
View File

@ -83,7 +83,7 @@
<et2-hbox span="all" width="100%"> <et2-hbox span="all" width="100%">
<et2-button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"></et2-button> <et2-button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new"></et2-button>
<et2-button statustext="Applies the changes made" id="button[apply]" image="apply"></et2-button> <et2-button statustext="Applies the changes made" id="button[apply]" image="apply"></et2-button>
<et2-button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button> <et2-button statustext="Delete this entry" id="button[delete]" onclick="Et2Dialog.confirm(widget,'Delete this entry','Delete')" image="delete"></et2-button>
<et2-number id="ts_id" readonly="true" class="entry_id" precision="0"></et2-number> <et2-number id="ts_id" readonly="true" class="entry_id" precision="0"></et2-number>
</et2-hbox> </et2-hbox>
</row> </row>