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

Change old confirm dialogs to new et2_dialog in calendar edit popup

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-23 10:27:18 +00:00
parent a788827c1e
commit 40b33e6a1d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/js/app.js
View File

@ -476,7 +476,7 @@ app.classes.calendar = AppJS.extend(
* @param {Array} exceptions an array contains number of exception entries * @param {Array} exceptions an array contains number of exception entries
* *
*/ */
delete_btn: function(exceptions) delete_btn: function(widget,exceptions)
{ {
var content = this.et2.getArrayMgr('content').data; var content = this.et2.getArrayMgr('content').data;
@ -486,11 +486,11 @@ app.classes.calendar = AppJS.extend(
} }
else if (content['recur_type'] !== 0) else if (content['recur_type'] !== 0)
{ {
return confirm('Delete this series of recuring events'); et2_dialog.confirm(widget,'Delete this series of recuring events','Delete Series');
} }
else else
{ {
return confirm('Delete this event'); et2_dialog.confirm(widget,'Delete this event','Delete');
} }
}, },

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

@ -173,7 +173,7 @@
<rows> <rows>
<row> <row>
<date-time id="$row" readonly="true"/> <date-time id="$row" readonly="true"/>
<button statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="return confirm('Delete this exception');" image="delete"/> <button statustext="Delete this exception" label="Delete" id="delete_exception[$row_cont]" onclick="et2_dialog.confirm(widget,'Delete this exception','Delete')" image="delete"/>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -270,7 +270,7 @@
<menulist> <menulist>
<menupopup type="select-account" id="${row}[owner]" readonly="true"/> <menupopup type="select-account" id="${row}[owner]" readonly="true"/>
</menulist> </menulist>
<button align="center" statustext="Delete this alarm" label="Delete" id="delete_alarm[$row_cont[id]]" onclick="return confirm('Delete this alarm');" image="delete"/> <button align="center" statustext="Delete this alarm" label="Delete" id="delete_alarm[$row_cont[id]]" onclick="et2_dialog.confirm(widget,'Delete this alarm','Delete')" image="delete"/>
</row> </row>
</rows> </rows>
</grid> </grid>
@ -308,8 +308,8 @@
<template id="calendar.edit" template="" lang="" group="0" version="1.9.001"> <template id="calendar.edit" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="100"/> <column width="%10"/>
<column width="300"/> <column width="%100"/>
<column/> <column/>
<column/> <column/>
</columns> </columns>
@ -320,9 +320,9 @@
<description/> <description/>
<description/> <description/>
</row> </row>
<row class="th dialog-header" height="28"> <row class="dialog-header" height="28">
<description value="Title"/> <description value="Title"/>
<hbox needed="1" options="0,0" span="all"> <hbox needed="1" options="0,0" span="4">
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/> <textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/>
<description font_style="b" id="id" class="calendar_calId"/> <description font_style="b" id="id" class="calendar_calId"/>
</hbox> </hbox>
@ -371,7 +371,7 @@
</menulist> </menulist>
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/> <checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
</hbox> </hbox>
<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="return app.calendar.delete_btn($cont[query_delete_exceptions]);" image="delete" background_image="1"/> <button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="app.calendar.delete_btn(widget,$cont[query_delete_exceptions]);" image="delete" background_image="1"/>
</row> </row>
<row > <row >
<template id="calendar.delete_series" span="all" /> <template id="calendar.delete_series" span="all" />