Small code and style cleanup
This commit is contained in:
parent
b023e7fce2
commit
a16a9c5810
5 changed files with 3 additions and 5 deletions
|
@ -1469,7 +1469,6 @@ class calendar extends rcube_plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
$event = get_input_value('_id', RCUBE_INPUT_GPC);
|
$event = get_input_value('_id', RCUBE_INPUT_GPC);
|
||||||
$calendar = get_input_value('calendar', RCUBE_INPUT_GPC);
|
|
||||||
$uploadid = get_input_value('_uploadid', RCUBE_INPUT_GPC);
|
$uploadid = get_input_value('_uploadid', RCUBE_INPUT_GPC);
|
||||||
|
|
||||||
$eventid = 'cal:'.$event;
|
$eventid = 'cal:'.$event;
|
||||||
|
|
|
@ -462,7 +462,6 @@ class kolab_calendar
|
||||||
// in kolab_storage attachments are indexed by content-id
|
// in kolab_storage attachments are indexed by content-id
|
||||||
$object['_attachments'] = array();
|
$object['_attachments'] = array();
|
||||||
if (is_array($event['attachments'])) {
|
if (is_array($event['attachments'])) {
|
||||||
$collisions = array();
|
|
||||||
foreach ($event['attachments'] as $idx => $attachment) {
|
foreach ($event['attachments'] as $idx => $attachment) {
|
||||||
$key = null;
|
$key = null;
|
||||||
// Roundcube ID has nothing to do with the storage ID, remove it
|
// Roundcube ID has nothing to do with the storage ID, remove it
|
||||||
|
|
|
@ -623,7 +623,7 @@ class calendar_ui
|
||||||
|
|
||||||
return html::div($attrib,
|
return html::div($attrib,
|
||||||
html::div(null, $input->show()) .
|
html::div(null, $input->show()) .
|
||||||
html::div('buttons', $button->show(rcube_label('upload'), array('class' => 'button mainaction',
|
html::div('formbuttons', $button->show(rcube_label('upload'), array('class' => 'button mainaction',
|
||||||
'onclick' => JS_OBJECT_NAME . ".upload_file(this.form)"))) .
|
'onclick' => JS_OBJECT_NAME . ".upload_file(this.form)"))) .
|
||||||
html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
|
html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
|
||||||
);
|
);
|
||||||
|
|
|
@ -364,7 +364,7 @@ a.miniColors-trigger {
|
||||||
padding-top: 1.2em;
|
padding-top: 1.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#edit-attachments-form .buttons {
|
#edit-attachments-form .formbuttons {
|
||||||
margin: 0.5em 0;
|
margin: 0.5em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -371,7 +371,7 @@ a.miniColors-trigger {
|
||||||
border-top: 2px solid #fafafa;
|
border-top: 2px solid #fafafa;
|
||||||
}
|
}
|
||||||
|
|
||||||
#edit-attachments-form .buttons {
|
#edit-attachments-form .formbuttons {
|
||||||
margin: 0.5em 0;
|
margin: 0.5em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue