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

A few more changes on calendar edit popup layout

Browse Source
This commit is contained in:
Hadi Nategh 2014-03-11 14:08:12 +00:00
parent 05f8a151b8
commit 0024a805c5
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/js/app.js
View File

@ -92,7 +92,6 @@ app.classes.calendar = AppJS.extend(
case 'calendar.edit': case 'calendar.edit':
if (typeof content.data['conflicts'] == 'undefined') if (typeof content.data['conflicts'] == 'undefined')
{ {
this.cal_id_titlebar(content.data['id']);
$j(document.getElementById('calendar-edit_calendar-delete_series')).hide(); $j(document.getElementById('calendar-edit_calendar-delete_series')).hide();
//Check if it's fallback from conflict window or it's from edit window //Check if it's fallback from conflict window or it's from edit window
if (content.data['button_was'] != 'freetime') if (content.data['button_was'] != 'freetime')
@ -1163,14 +1162,4 @@ app.classes.calendar = AppJS.extend(
return false; return false;
}, },
/**
* Show calendar Id in edit popup's titlebar after the cal icon
*
* @param {string} _id cal_id
*/
cal_id_titlebar: function (_id)
{
var calId = this.et2.getWidgetById('cal_id_titlebar');
calId.set_value('#'+_id);
}
}); });

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

@ -27,15 +27,11 @@
<description/> <description/>
<checkbox label="Private" id="public" options="0,1"/> <checkbox label="Private" id="public" options="0,1"/>
</row> </row>
<row>
<description/>
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
</row>
</rows> </rows>
</grid> </grid>
<vbox align="right" options="0,0" class="calendar_category_details" height="240"> <vbox align="right" options="0,0" class="calendar_category_details">
<description for="category" value="Categories" class="row_on"/> <description for="category" value="Categories" class="row_on"/>
<listbox type="select-cat" id="category" rows="9" height="230"/> <listbox type="select-cat" id="category" rows="9" />
</vbox> </vbox>
</hbox> </hbox>
</template> </template>
@ -106,8 +102,7 @@
</columns> </columns>
<rows> <rows>
<row class="th gray"> <row class="th gray">
<description value="Repeating Event Information" span="3"/> <description value="Repeating Event Information" span="all"/>
<description font_style="n" id="id"/>
</row> </row>
<row disabled="!@reference"> <row disabled="!@reference">
<description value="Exception"/> <description value="Exception"/>
@ -296,8 +291,8 @@
<row class="dialogHeader" height="28"> <row class="dialogHeader" height="28">
<description value="Title"/> <description value="Title"/>
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" class="et2_fullWidth" span="2"/> <textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" class="et2_fullWidth" span="2"/>
<description font_style="n" id="id"/>
<appicon/> <appicon/>
<description id="cal_id_titlebar"/>
</row> </row>
<row class="dialogHeader2" height="28"> <row class="dialogHeader2" height="28">
<description for="start" value="Start" width="88"/> <description for="start" value="Start" width="88"/>
@ -359,6 +354,7 @@
<menulist> <menulist>
<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.calendar.actions_change" options="Actions..."/> <menupopup statustext="Execute a further action for this entry" id="action" onchange="app.calendar.actions_change" options="Actions..."/>
</menulist> </menulist>
<checkbox label="Do not notify of these changes" 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"/> <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> </hbox>
</template> </template>