From f63e82e38e634b7b38d4fc0ccf90d1a5be943932 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Fri, 31 Jul 2009 13:28:32 -0400
Subject: [PATCH] EmbeddedRenderers -> EmbeddedRenderer, remove require_once
 statements

---
 ansel/lib/Block/my_galleries.php                                  | 1 +
 .../lib/View/{EmbeddedRenderers => EmbeddedRenderer}/Carousel.php | 8 ++------
 .../View/{EmbeddedRenderers => EmbeddedRenderer}/GalleryLink.php  | 8 ++------
 ansel/lib/View/{EmbeddedRenderers => EmbeddedRenderer}/Mini.php   | 8 ++------
 .../View/{EmbeddedRenderers => EmbeddedRenderer}/Slideshow.php    | 8 ++------
 ansel/lib/View/Image.php                                          | 7 -------
 6 files changed, 9 insertions(+), 31 deletions(-)
 rename ansel/lib/View/{EmbeddedRenderers => EmbeddedRenderer}/Carousel.php (91%)
 rename ansel/lib/View/{EmbeddedRenderers => EmbeddedRenderer}/GalleryLink.php (98%)
 rename ansel/lib/View/{EmbeddedRenderers => EmbeddedRenderer}/Mini.php (98%)
 rename ansel/lib/View/{EmbeddedRenderers => EmbeddedRenderer}/Slideshow.php (91%)

diff --git a/ansel/lib/Block/my_galleries.php b/ansel/lib/Block/my_galleries.php
index 32758b399..6a92a7ee6 100644
--- a/ansel/lib/Block/my_galleries.php
+++ b/ansel/lib/Block/my_galleries.php
@@ -37,6 +37,7 @@ class Horde_Block_ansel_my_galleries extends Horde_Block {
 
     function _content()
     {
+        Horde::addScriptFile('ToolTips.js', 'horde', true);
         /* Get the top level galleries */
         $galleries = $GLOBALS['ansel_storage']->listGalleries(
             PERMS_EDIT, Horde_Auth::getAuth(), null, false, 0,
diff --git a/ansel/lib/View/EmbeddedRenderers/Carousel.php b/ansel/lib/View/EmbeddedRenderer/Carousel.php
similarity index 91%
rename from ansel/lib/View/EmbeddedRenderers/Carousel.php
rename to ansel/lib/View/EmbeddedRenderer/Carousel.php
index 730ff52a0..8335212bf 100644
--- a/ansel/lib/View/EmbeddedRenderers/Carousel.php
+++ b/ansel/lib/View/EmbeddedRenderer/Carousel.php
@@ -1,8 +1,4 @@
 <?php
-
-/** Ansel_View_Gallery **/
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
 /**
  * Ansel_View_EmbeddedRenderer_Carousel
  *
@@ -14,8 +10,8 @@ require_once ANSEL_BASE . '/lib/Views/Gallery.php';
  * @author  Michael J. Rubinsky <mrubinsk@horde.org>
  * @package Ansel
  */
-class Ansel_View_EmbeddedRenderer_Carousel extends Ansel_View_Gallery {
-
+class Ansel_View_EmbeddedRenderer_Carousel extends Ansel_View_Gallery
+{
     /**
      * Create a new renderer.
      *
diff --git a/ansel/lib/View/EmbeddedRenderers/GalleryLink.php b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
similarity index 98%
rename from ansel/lib/View/EmbeddedRenderers/GalleryLink.php
rename to ansel/lib/View/EmbeddedRenderer/GalleryLink.php
index 34799fcd2..35bbe2472 100644
--- a/ansel/lib/View/EmbeddedRenderers/GalleryLink.php
+++ b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
@@ -1,8 +1,4 @@
 <?php
-
-/** Ansel_View_Gallery */
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
 /**
  * Ansel_View_EmbeddedRenderer_GalleryLink
  *
@@ -25,8 +21,8 @@ require_once ANSEL_BASE . '/lib/Views/Gallery.php';
  * @author  Michael J. Rubinsky <mrubinsk@horde.org>
  * @package Ansel
  */
-class Ansel_View_EmbeddedRenderer_GalleryLink extends Ansel_View_Gallery {
-
+class Ansel_View_EmbeddedRenderer_GalleryLink extends Ansel_View_Gallery
+{
     /**
      * Create a new renderer.
      *
diff --git a/ansel/lib/View/EmbeddedRenderers/Mini.php b/ansel/lib/View/EmbeddedRenderer/Mini.php
similarity index 98%
rename from ansel/lib/View/EmbeddedRenderers/Mini.php
rename to ansel/lib/View/EmbeddedRenderer/Mini.php
index 2abaf4064..a8743d11b 100644
--- a/ansel/lib/View/EmbeddedRenderers/Mini.php
+++ b/ansel/lib/View/EmbeddedRenderer/Mini.php
@@ -1,8 +1,4 @@
 <?php
-
-/** Ansel_View_Gallery */
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
 /**
  * Ansel_View_EmbeddedRenderer_Mini
  *
@@ -14,8 +10,8 @@ require_once ANSEL_BASE . '/lib/Views/Gallery.php';
  * @author  Michael J. Rubinsky <mrubinsk@horde.org>
  * @package Ansel
  */
-class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery {
-
+class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery
+{
     /**
      * Create a new renderer.
      *
diff --git a/ansel/lib/View/EmbeddedRenderers/Slideshow.php b/ansel/lib/View/EmbeddedRenderer/Slideshow.php
similarity index 91%
rename from ansel/lib/View/EmbeddedRenderers/Slideshow.php
rename to ansel/lib/View/EmbeddedRenderer/Slideshow.php
index 9a624fed2..139b01728 100644
--- a/ansel/lib/View/EmbeddedRenderers/Slideshow.php
+++ b/ansel/lib/View/EmbeddedRenderer/Slideshow.php
@@ -1,8 +1,4 @@
 <?php
-
-/** Ansel_View_Gallery **/
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
 /**
  * Ansel_View_EmbeddedRenderer_Slideshow
  *
@@ -14,8 +10,8 @@ require_once ANSEL_BASE . '/lib/Views/Gallery.php';
  * @author  Michael J. Rubinsky <mrubinsk@horde.org>
  * @package Ansel
  */
-class Ansel_View_EmbeddedRenderer_Slideshow extends Ansel_View_Gallery {
-
+class Ansel_View_EmbeddedRenderer_Slideshow extends Ansel_View_Gallery
+{
     /**
      * Create a new renderer.
      *
diff --git a/ansel/lib/View/Image.php b/ansel/lib/View/Image.php
index 87cb6eb16..c3649e605 100644
--- a/ansel/lib/View/Image.php
+++ b/ansel/lib/View/Image.php
@@ -13,13 +13,6 @@
 class Ansel_View_Image extends Ansel_View_Base
 {
     /**
-     *  The image selected for this view.
-     *
-     * @var Ansel_Image
-     */
-    //public $image;
-
-    /**
      * Const'r
      *
      */
-- 
2.11.0