diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 15:20:50 +0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 15:20:50 +0400 |
| commit | e888f4d9bc40dddd197f858d3fe585df631189b6 (patch) | |
| tree | 9d8ac7fe47108628340f6021f494995a25200ab4 /apps/calendar | |
| parent | e2f64394f3ba3ec7a1e653a654982dbfe9c4370b (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/templates/part.eventform.php | 8 | ||||
| -rw-r--r-- | apps/calendar/templates/part.showevent.php | 8 | ||||
| -rw-r--r-- | apps/calendar/templates/settings.php | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php index c63630a5a05..1eee099d0d1 100644 --- a/apps/calendar/templates/part.eventform.php +++ b/apps/calendar/templates/part.eventform.php @@ -7,8 +7,8 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <ul> <li><a href="#tabs-1"><?php echo $l->t('Eventinfo'); ?></a></li> <li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li> - <li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li> - <li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li> + <!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li> + <li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>--> <?php if($_['access'] == 'owner') { ?> <li><a href="#tabs-5"><?php echo $l->t('Share'); ?></a></li> <?php } ?> @@ -243,8 +243,8 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid <?php echo $l->t('Summary'); ?>:<span id="repeatsummary"></span> </div> </div> -<div id="tabs-3">//Alarm</div> -<div id="tabs-4">//Attendees</div> +<!--<div id="tabs-3">//Alarm</div> +<div id="tabs-4">//Attendees</div>--> <?php if($_['access'] == 'owner') { ?> <div id="tabs-5"> <?php echo $this->inc('share.dropdown'); ?> diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php index c0521830563..6baf0415d54 100644 --- a/apps/calendar/templates/part.showevent.php +++ b/apps/calendar/templates/part.showevent.php @@ -2,8 +2,8 @@ <ul> <li><a href="#tabs-1"><?php echo $l->t('Eventinfo'); ?></a></li> <li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li> - <li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li> - <li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li> + <!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li> + <li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>--> </ul> <div id="tabs-1"> <table width="100%"> @@ -241,7 +241,7 @@ <?php echo $l->t('Summary'); ?>:<span id="repeatsummary"></span> </div> </div> -<div id="tabs-3">//Alarm</div> -<div id="tabs-4">//Attendees</div> +<!--<div id="tabs-3">//Alarm</div> +<div id="tabs-4">//Attendees</div>--> </div>
\ No newline at end of file diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php index fb2a04a6498..3488fec0187 100644 --- a/apps/calendar/templates/settings.php +++ b/apps/calendar/templates/settings.php @@ -9,7 +9,7 @@ ?> <form id="calendar"> <fieldset class="personalblock"> - <strong><?php echo $l->t('Calendar'); ?></strong> + <legend><?php echo $l->t('Calendar'); ?></legend> <table class="nostyle"> <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone"> <?php @@ -47,6 +47,6 @@ </table> <?php echo $l->t('Calendar CalDAV syncing address:');?> - <?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?><br /> + <code><?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?></code><br /> </fieldset> </form> |