[commits] Horde-Hatchery branch master updated. c3775f24dc359573f0da6290806bf24e83cc9cc6

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 888b0912932aee5f4bc11d855b6945d139aa5e13

6dc6d2e... Don't blindly update the user prefs for display_calendars.
19320d2... Make sure if we pass a display_cal parameter, that ONLY those calendars are displayed.
33a6e2a... fix session variable name
20bfe43... Store the value of display_cal parameter in the session.
c3775f2... Replace calendar panel with a "Return to my calendars" link when displaying display_cals.

-----------------------------------------------------------------------

commit 6dc6d2e8cfdf9b9f03d0bea9afdc6b4cfab78715
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Sep 2 11:52:31 2009 -0400

    Don't blindly update the user prefs for display_calendars.
    
    Only update the pref if we explicitly pass a toggle_calendar or if we
    are creating the user's first share.

 kronolith/lib/Kronolith.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/patchsets.php/?rt=horde-hatchery&ps=6dc6d2e8cfdf9b9f03d0bea9afdc6b4cfab78715

-----------------------------------------------------------------------

commit 19320d243985503c4f9eb318f1eb7bee55d92392
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Sep 2 11:57:39 2009 -0400

    Make sure if we pass a display_cal parameter, that ONLY those calendars are displayed.

 kronolith/lib/Kronolith.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/patchsets.php/?rt=horde-hatchery&ps=19320d243985503c4f9eb318f1eb7bee55d92392

-----------------------------------------------------------------------

commit 33a6e2acbd7a18c8a318f856372d1eb8372f785f
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Sep 2 12:34:14 2009 -0400

    fix session variable name

 kronolith/lib/Kronolith.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/patchsets.php/?rt=horde-hatchery&ps=33a6e2acbd7a18c8a318f856372d1eb8372f785f

-----------------------------------------------------------------------

commit 20bfe432dca165b68d45fd817c69a83fbd28cd0b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Sep 2 13:19:03 2009 -0400

    Store the value of display_cal parameter in the session.
    
    This makes display_cal do what it was originally inteneded to do.
    Does not update user prefs (that's what toggle_calendar is for), but
    just makes sure that ONLY the calendar(s) in the parameter are displayed.
    Must pass an empty value for display_cal to clear the session value.
    
    Still need to work out how to trigger the emptying of the value...probably
    will replace the calendar panel with a 'close' link or similar when the session
    variable contains data. This also solves the issue of dealing with the user changing
    the calendars displayed via the panel while showing only display_cal.

 kronolith/lib/Kronolith.php |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

http://git.horde.org/patchsets.php/?rt=horde-hatchery&ps=20bfe432dca165b68d45fd817c69a83fbd28cd0b

-----------------------------------------------------------------------

commit c3775f24dc359573f0da6290806bf24e83cc9cc6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Sep 2 15:24:47 2009 -0400

    Replace calendar panel with a "Return to my calendars" link when displaying display_cals.

 kronolith/templates/panel.inc |    6 ++++++
 kronolith/themes/screen.css   |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

http://git.horde.org/patchsets.php/?rt=horde-hatchery&ps=c3775f24dc359573f0da6290806bf24e83cc9cc6