Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2011-09-29 01:25:22 +0400
committerBart Visscher <bartv@thisnet.nl>2011-09-29 01:25:22 +0400
commitf29f601ec4d0a569baa8fcc8c5e946c50a9703d6 (patch)
tree98e5c6dae1457f303b50edcc87a145139d1c64b7 /apps/calendar
parentc9c7d5e1aa423616334deaed86f516a2f84b7aff (diff)
Revert "commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)"
Implemented the calendar color as background of the events. This reverts commit 59d4ddd9051c5aaf80140484767ff274d3ce6630.
Diffstat (limited to 'apps/calendar')
-rw-r--r--apps/calendar/templates/part.editcalendar.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/templates/part.editcalendar.php b/apps/calendar/templates/part.editcalendar.php
index fe9b1f1e97c..b5c786f63c1 100644
--- a/apps/calendar/templates/part.editcalendar.php
+++ b/apps/calendar/templates/part.editcalendar.php
@@ -30,13 +30,13 @@
<td>
<textarea id="description_<?php echo $_['calendar']['id'] ?>"><?php echo $_['calendar']['description'] ?></textarea>
</td>
-</tr><!--
+</tr>
<tr>
<th><?php echo $l->t('Calendar color') ?></th>
<td>
<input id="calendarcolor_<?php echo $_['calendar']['id'] ?>" type="text" value="<?php echo $_['calendar']['calendarcolor'] ?>">
</td>
-</tr>-->
+</tr>
</table>
<input style="float: left;" type="button" onclick="Calendar.UI.Calendar.submit(this, <?php echo $_['new'] ? "'new'" : $_['calendar']['id'] ?>);" value="<?php echo $_['new'] ? $l->t("Save") : $l->t("Submit"); ?>">
<input style="float: left;" type="button" onclick="Calendar.UI.Calendar.cancel(this, <?php echo $_['new'] ? "'new'" : $_['calendar']['id'] ?>);" value="<?php echo $l->t("Cancel"); ?>">