diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:40:10 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:40:10 -0400 |
| commit | afcb0aee40230c68dd99f5ea2501b7ba7e444560 (patch) | |
| tree | 5ccd10e78128c70e71a36ca9080a652a7bd833d5 /apps/calendar/templates | |
| parent | 02dc34320978bfbcb30dea34b87808837586bb65 (diff) | |
| parent | b9f9228a22944184803a8835282862e468812c1d (diff) | |
| download | nextcloud-server-afcb0aee40230c68dd99f5ea2501b7ba7e444560.tar.gz nextcloud-server-afcb0aee40230c68dd99f5ea2501b7ba7e444560.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/templates')
| -rwxr-xr-x | apps/calendar/templates/calendar.php | 1 | ||||
| -rw-r--r-- | apps/calendar/templates/part.eventform.php | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php index 63c3b500296..ba9423a66f1 100755 --- a/apps/calendar/templates/calendar.php +++ b/apps/calendar/templates/calendar.php @@ -1,6 +1,7 @@ <script type='text/javascript'> var defaultView = '<?php echo OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') ?>'; var eventSources = <?php echo json_encode($_['eventSources']) ?>; + var categories = <?php echo json_encode($_['categories']); ?>; var dayNames = <?php echo json_encode($l->tA(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'))) ?>; var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'))) ?>; var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>; diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php index 3e12f2973e2..c63630a5a05 100644 --- a/apps/calendar/templates/part.eventform.php +++ b/apps/calendar/templates/part.eventform.php @@ -26,12 +26,8 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <tr> <th width="75px"><?php echo $l->t("Category");?>:</th> <td> - <select id="category" name="categories[]" multiple="multiple" title="<?php echo $l->t("Select category") ?>"> - <?php - if (!isset($_['categories'])) {$_['categories'] = array();} - echo html_select_options($_['category_options'], $_['categories'], array('combine'=>true)); - ?> - </select> + <input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>"> + <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a> </td> <?php if(count($_['calendar_options']) > 1) { ?> <th width="75px"> <?php echo $l->t("Calendar");?>:</th> @@ -253,4 +249,4 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <div id="tabs-5"> <?php echo $this->inc('share.dropdown'); ?> </div> -<?php } ?>
\ No newline at end of file +<?php } ?> |