From 2658747347eb37cb74a565bf151b407fe4f25283 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 2 Sep 2009 16:18:57 -0400
Subject: [PATCH] tweak panel display when displaying display_cals.

Add displayed calendar(s) name, and allow expanding/collapsing.
Tweak text to display 'Return to calendars' when anonymous user.
---
 kronolith/templates/panel.inc | 21 +++++++++++----------
 kronolith/themes/screen.css   |  9 ++++++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/kronolith/templates/panel.inc b/kronolith/templates/panel.inc
index 118076aa3..ea9b4691d 100644
--- a/kronolith/templates/panel.inc
+++ b/kronolith/templates/panel.inc
@@ -1,8 +1,3 @@
-<?php if (!empty($_SESSION['kronolith']['display_cal'])): ?>
-<div id="pageControls">
- <a id="sbarClose" href="<?php echo Horde_Util::addParameter(Horde::selfUrl(true), 'display_cal', '') ?>"><?php echo _("Return to my calendars")?></a>
-</div>
-<?php else: ?>
 <script type="text/javascript">
 function toggleTags(domid)
 {
@@ -31,13 +26,19 @@ foreach (Kronolith::listCalendars() as $id => $cal) {
 
 $tagger = Kronolith::getTagger();
 ?>
-
 <div id="pageControls">
-
-<a id="sbarShow" href="#" onclick="sbarToggle(); return false;"><?php echo _("Calendars") ?></a>
-<a id="sbarHide" href="#" onclick="sbarToggle(); return false;"><?php echo _("Calendars") ?></a>
-
+ <a id="sbarShow" href="#" onclick="sbarToggle(); return false;"><?php echo _("Calendars") ?></a>
+ <a id="sbarHide" href="#" onclick="sbarToggle(); return false;"><?php echo _("Calendars") ?></a>
+ <?php if (!empty($_SESSION['kronolith']['display_cal'])): ?>
+   <a id="sbarClose" href="<?php echo Horde_Util::addParameter(Horde::selfUrl(true), 'display_cal', '') ?>"><?php echo sprintf(_("Return to %s calendars"), Horde_Auth::getAuth() ? _("my") : '') ?></a>
+ <?php endif; ?>
 <div id="pageControlsInner">
+<?php if (!empty($_SESSION['kronolith']['display_cal'])): ?>
+  <h4><?php echo ngettext("Showing calendar:", "Showing Calendars", count($calendar_names)) ?></h4>
+  <?php foreach ($calendar_names as $name): ?>
+   <h4><?php echo $name ?></h4>
+  <?php endforeach; ?>
+<?php else: ?>
 <form action="<?php echo Horde::selfUrl() ?>" method="post">
 <?php echo Horde_Util::formInput() ?>
  <h4><?php echo _("Search for Calendars:") ?></h4>
diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css
index 5628dde9f..73f3caa83 100644
--- a/kronolith/themes/screen.css
+++ b/kronolith/themes/screen.css
@@ -220,11 +220,12 @@ body.rightPanel #page {
 body #pageControlsInner {
     display: none;
 }
-body #sbarShow, body #sbarHide, body #sbarClose {
+body #sbarShow, body #sbarHide {
     padding-left: 18px;
     white-space: nowrap;
     font-weight: bold;
 }
+
 body #sbarShow {
     display: block;
     background: transparent url("graphics/plus.png") center left no-repeat;
@@ -233,6 +234,12 @@ body #sbarHide {
     display: none;
     background: transparent url("graphics/minus.png") center left no-repeat;
 }
+
+body #sbarClose {
+	white-space: nowrap;
+	padding-left: 18px;
+}
+
 body.rightPanel #pageControlsInner {
     display: block;
 }
-- 
2.11.0