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

Arrange calendar edit popup template

Browse Source
This commit is contained in:
Hadi Nategh 2014-03-11 10:45:02 +00:00
parent f007e39cfd
commit e00ddbaeb3
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/js/app.js
View File

@ -92,6 +92,7 @@ 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')
@ -1160,5 +1161,16 @@ app.classes.calendar = AppJS.extend(
// Stop the normal bubbling if this is called on click // Stop the normal bubbling if this is called on click
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);
} }
}); });

6
calendar/templates/default/app.css
View File

@ -1,5 +1,11 @@
/* $Id$ */ /* $Id$ */
// Header classes
tr.dialogHeader td, tr.dialogHeader2 td, tr.dialogHeader3 td, tr.dialogHeader4 td,
tr.dialogOperators td,.dialogFooterToolbar {
padding: 5px 0 5px 0;
vertical-align: middle;
}
.calendar_inputFullWidth input { width: 100%; } .calendar_inputFullWidth input { width: 100%; }
/****************************************************************** /******************************************************************

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

@ -197,7 +197,7 @@
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row class="th gray" disabled="@view"> <row class="th gray" disabled="@view" height="28">
<description value="Add new alarm" span="all"/> <description value="Add new alarm" span="all"/>
</row> </row>
<row class="row add_alarm_action" height="50" disabled="@no_add_alarm"> <row class="row add_alarm_action" height="50" disabled="@no_add_alarm">
@ -289,22 +289,26 @@
<column width="88"/> <column width="88"/>
<column width="80"/> <column width="80"/>
<column/> <column/>
<column width="50"/>
<column width="50"/>
</columns> </columns>
<rows> <rows>
<row class="dialog-header" height="28"> <row class="dialogHeader" height="28">
<description value="Title"/> <description value="Title"/>
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" span="all"/> <textbox id="title" needed="1" size="75" maxlength="255" tabindex="1" class="et2_fullWidth" span="2"/>
<appicon/>
<description id="cal_id_titlebar"/>
</row> </row>
<row class="dialog-header2" height="28"> <row class="dialogHeader2" height="28">
<description for="start" value="Start" width="88"/> <description for="start" value="Start" width="88"/>
<date-time id="start" needed="1" class="required"/> <date-time id="start" needed="1" class="required"/>
<checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable" span="all"/> <checkbox statustext="Event will occupy the whole day" label="whole day" id="whole_day" options=",, ,disable" span="all"/>
</row> </row>
<row class="dialog-header2" height="28"> <row class="dialogHeader2" height="28">
<description for="duration" value="Duration" width="0" id="calendar_edit_duration"/> <description for="duration" value="Duration" width="0" id="calendar_edit_duration" />
<hbox> <hbox>
<menulist> <menulist >
<menupopup statustext="Duration of the meeting" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/> <menupopup statustext="Duration of the meeting" class="et2_fullWidth" id="duration" no_lang="1" onchange="app.calendar.set_enddate_visibility" options="Use end date,,,,,,,false"/>
</menulist> </menulist>
<date-time id="end"/> <date-time id="end"/>
</hbox> </hbox>
@ -334,7 +338,7 @@
</tabpanels> </tabpanels>
</tabbox> </tabbox>
</row> </row>
<row disabled="!@owner" class="dialog-operators"> <row disabled="!@owner" class="dialogOperators">
<description value="Owner"/> <description value="Owner"/>
<menulist> <menulist>
<menupopup type="select-account" id="owner" readonly="true"/> <menupopup type="select-account" id="owner" readonly="true"/>
@ -348,7 +352,7 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<hbox class="dialog-footer-toolbar"> <hbox class="dialogFooterToolbar">
<button statustext="saves the changes made" label="Save" id="button[save]" image="save" background_image="1" onclick="app.calendar.move_edit_series"/> <button statustext="saves the changes made" label="Save" id="button[save]" image="save" background_image="1" onclick="app.calendar.move_edit_series"/>
<button statustext="apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1" onclick="app.calendar.move_edit_series"/> <button statustext="apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1" onclick="app.calendar.move_edit_series"/>
<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/> <button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>