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

fix sometimes shown old / no longer used delete dialog, buttons in new dialog were not translated and missing tooltip

Browse Source
This commit is contained in:
Ralf Becker 2015-10-26 15:08:44 +00:00
parent 3637ed12b4
commit 1c4a640fde
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/app.js
View File

@ -95,7 +95,6 @@ app.classes.calendar = AppJS.extend(
case 'calendar.edit':
if (typeof content.data['conflicts'] == 'undefined')
{
$j(document.getElementById('calendar-edit_calendar-delete_series')).hide();
//Check if it's fallback from conflict window or it's from edit window
if (content.data['button_was'] != 'freetime')
{
@ -218,7 +217,7 @@ app.classes.calendar = AppJS.extend(
{
// Just open the merge
window.open(_url.replace('&ajax=true',''),'_blank');
// Tell framework app took care of it
return true;
}
@ -876,21 +875,21 @@ app.classes.calendar = AppJS.extend(
var buttons = [
{
button_id: 'keep',
statustext:'All exceptions are converted into single events.',
text: 'Keep exceptions',
title: this.egw.lang('All exceptions are converted into single events.'),
text: this.egw.lang('Keep exceptions'),
id: 'button[delete_keep_exceptions]',
image: 'keep', "default":true
},
{
button_id: 'delete',
statustext:'The exceptions are deleted together with the series.',
text: 'Delete exceptions',
title: this.egw.lang('The exceptions are deleted together with the series.'),
text: this.egw.lang('Delete exceptions'),
id: 'button[delete_exceptions]',
image: 'delete'
},
{
button_id: 'cancel',
text: 'Cancel',
text: this.egw.lang('Cancel'),
id: 'dialog[cancel]',
image: 'cancel'
}

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

@ -243,20 +243,6 @@
<template id="calendar.edit.history" template="" lang="" group="0" version="1.7.002">
<historylog id="history" options="history_status" width="100%" />
</template>
<template id="calendar.delete_series" template="" lang="" group="0" version="1.7.003">
<vbox>
<hbox class="promptheader">
<description value="This event is part of a series"/>
</hbox>
<vbox class="prompt">
<description value="Do you want to keep the series exceptions in your calendar?"/>
<hbox align="center">
<button statustext="All exceptions are converted into single events." label="Keep exceptions" id="button[delete_keep_exceptions]" image="keep" background_image="1"/>
<button statustext="The exceptions are deleted together with the series." label="Delete exceptions" id="button[delete_exceptions]" image="delete" background_image="1"/>
</hbox>
</vbox>
</vbox>
</template>
<template id="calendar.edit" template="" lang="" group="0" version="1.9.001">
<grid width="100%">
<columns>
@ -334,6 +320,5 @@
<checkbox label="Do not notify" id="no_notifications"/>
<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"/>
</hbox>
<template id="calendar.delete_series"/>
</template>
</overlay>