From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 31 Jul 2009 17:28:32 +0000 (-0400)
Subject: EmbeddedRenderers -> EmbeddedRenderer, remove require_once statements
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f63e82e38e634b7b38d4fc0ccf90d1a5be943932;p=horde.git

EmbeddedRenderers -> EmbeddedRenderer, remove require_once statements
---

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/EmbeddedRenderer/Carousel.php b/ansel/lib/View/EmbeddedRenderer/Carousel.php
new file mode 100644
index 000000000..8335212bf
--- /dev/null
+++ b/ansel/lib/View/EmbeddedRenderer/Carousel.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Ansel_View_EmbeddedRenderer_Carousel
+ *
+ * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael J. Rubinsky <mrubinsk@horde.org>
+ * @package Ansel
+ */
+class Ansel_View_EmbeddedRenderer_Carousel extends Ansel_View_Gallery
+{
+    /**
+     * Create a new renderer.
+     *
+     * @see Ansel_View_Embedded
+     *
+     * @param array $params
+     *
+     * @return Ansel_View_EmbeddedRenderer  The renderer object.
+     */
+    function makeView($params = array())
+    {
+        $view = new Ansel_View_EmbeddedRenderer_Carousel();
+        $view->_params = $params;
+
+        return $view;
+    }
+
+    /**
+     * Build the javascript that will render the view.
+     *
+     * @return string  A string containing valid javascript.
+     */
+    function html()
+    {
+
+    }
+
+}
diff --git a/ansel/lib/View/EmbeddedRenderer/GalleryLink.php b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
new file mode 100644
index 000000000..35bbe2472
--- /dev/null
+++ b/ansel/lib/View/EmbeddedRenderer/GalleryLink.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Ansel_View_EmbeddedRenderer_GalleryLink
+ *
+ * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * Example usage:
+ * <pre>
+ *
+ *   <script type="text/javascript" src="http://example.com/horde/services/
+ *   imple.php?imple=Embed/impleApp=ansel/gallery_view=GalleryLink/
+ *   gallery_slug=slug1:slug2:slug3/container=divId/
+ *   thumbsize=prettythumb/style=ansel_polaroid"></script>
+ *   <div id="divId"></div>
+ *   <style type="text/css">#divId .anselGalleryWidget img {border:none;}</style>
+ *
+ *
+ * @author  Michael J. Rubinsky <mrubinsk@horde.org>
+ * @package Ansel
+ */
+class Ansel_View_EmbeddedRenderer_GalleryLink extends Ansel_View_Gallery
+{
+    /**
+     * Create a new renderer.
+     *
+     * @see Ansel_View_Embedded
+     *
+     * @param array $params
+     *
+     * @return Ansel_View_EmbeddedRenderer  The renderer object.
+     */
+    function makeView($params = array())
+    {
+        $view = new Ansel_View_EmbeddedRenderer_GalleryLink();
+        $view->_params = $params;
+
+        return $view;
+    }
+
+    /**
+     * Build the javascript that will render the view.
+     *
+     * @return string  A string containing valid javascript.
+     */
+    function html()
+    {
+        /* Read in parameters and set defaults */
+
+        /* Required */
+        $node = $this->_params['container'];
+        if (empty($node)) {
+            return '';
+        }
+
+        /* Need at least one of these */
+        $galleries = !empty($this->_params['gallery_slug']) ? explode(':', $this->_params['gallery_slug']) : '';
+        $haveSlugs = true;
+        if (empty($galleries)) {
+            $galleries = !empty($this->_params['gallery_id']) ? explode(':', $this->_params['gallery_id']) : null;
+            $haveSlugs = false;
+        }
+
+        /* Determine the style/thumnailsize etc... */
+        $thumbsize = empty($this->_params['thumbsize']) ?
+            'thumb' :
+            $this->_params['thumbsize'];
+
+        foreach ($galleries as $identifier) {
+            if ($haveSlugs) {
+                $gallery = $this->getGallery(null, $identifier);
+            } else {
+                $gallery = $this->getGallery($identifier);
+            }
+            if (is_a($gallery, 'PEAR_Error')) {
+                Horde::logMessage($gallery, __FILE__, __LINE__, PEAR_LOG_ERR);
+                exit;
+            }
+            if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) {
+                return '';
+            }
+
+            /*If a gallery_style is not specified, default to the gallery's
+             * defined style. Note that this only matters if the $thumbsize
+             * parameter is set to 'prettythumb' anyway.
+             */
+            $gallery_style = empty($this->_params['style']) ?
+                $gallery->get('style') :
+                $this->_params['style'];
+
+            /* Ideally, since gallery default images are unique in that each style
+             * needs it's own unique image_id, the thumbsize and style parameters
+             * are mutually exclusive - specifying a specific gallery style is only
+             * needed if requesting the prettythumb thumbsize value. Make sure that
+             * both were not passed in.
+             */
+            if ($thumbsize == 'thumb') {
+                $images[] = $gallery->getDefaultImage('ansel_default');
+            } else {
+                $images[] = $gallery->getDefaultImage($gallery_style);
+            }
+        }
+        $json = $GLOBALS['ansel_storage']->getImageJson($images, null, true, $thumbsize, true);
+
+        /* Some paths */
+        $cssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/jsembed.css', true);
+        $js_path = $GLOBALS['registry']->get('jsuri', 'horde');
+        $pturl = Horde::url($js_path . '/prototype.js', true);
+        $ansel_js_path = $GLOBALS['registry']->get('jsuri', 'ansel');
+        $jsurl = Horde::url($ansel_js_path . '/embed.js', true);
+
+        /* Start building the javascript - we use the same parameters as with
+         * the mini gallery view so we can use the same javascript to display it
+         */
+        $html = <<<EOT
+            //<![CDATA[
+            // Old fashioned way to play nice with Safari 2 (Adding script inline with the
+            // DOM won't work).  Need two seperate files output here since the incldued
+            // files don't seem to be parsed until after the entire page is loaded, so we
+            // can't include prototype on the same page it's needed.
+
+            if (typeof anseljson == 'undefined') {
+                if (typeof Prototype == 'undefined') {
+                    document.write('<script type="text/javascript" src="$pturl"></script>');
+                }
+                anselnodes = new Array();
+                anseljson = new Object();
+                document.write('<link type="text/css" rel="stylesheet" href="$cssurl" />');
+                document.write('<script type="text/javascript" src="$jsurl"></script>');
+            }
+            anselnodes[anselnodes.length] = '$node';
+            anseljson['$node'] = new Object();
+            anseljson['$node']['data'] = $json;
+            anseljson['$node']['perpage'] = 0;
+            anseljson['$node']['page'] = 0;
+            anseljson['$node']['hideLinks'] = false;
+            anseljson['$node']['linkToGallery'] = true;
+            //]]>
+EOT;
+
+        return $html;
+    }
+
+}
diff --git a/ansel/lib/View/EmbeddedRenderer/Mini.php b/ansel/lib/View/EmbeddedRenderer/Mini.php
new file mode 100644
index 000000000..a8743d11b
--- /dev/null
+++ b/ansel/lib/View/EmbeddedRenderer/Mini.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Ansel_View_EmbeddedRenderer_Mini
+ *
+ * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael J. Rubinsky <mrubinsk@horde.org>
+ * @package Ansel
+ */
+class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery
+{
+    /**
+     * Create a new renderer.
+     *
+     * @see Ansel_View_Embedded
+     *
+     * @param array $params
+     *
+     * @return Ansel_View_EmbeddedRenderer  The renderer object.
+     */
+    function makeView($params = array())
+    {
+        $view = new Ansel_View_EmbeddedRenderer_Mini();
+        $view->_params = $params;
+
+        return $view;
+    }
+
+    /**
+     * Build the javascript that will render the view.
+     *
+     * @return string  A string containing valid javascript.
+     */
+    function html()
+    {
+        /* Read in parameters and set defaults */
+
+        /* Required */
+        $node = $this->_params['container'];
+        if (empty($node)) {
+            return '';
+        }
+
+        /* Optional */
+        $gallery_slug = !empty($this->_params['gallery_slug']) ? $this->_params['gallery_slug'] : '';
+        $gallery_id = !empty($this->_params['gallery_id']) ? $this->_params['gallery_id']: null;
+
+        $start = (isset($this->_params['start'])) ? $this->_params['start'] : 0;
+        $count = (isset($this->_params['count'])) ? $this->_params['count'] : 0;
+        $perpage = (isset($this->_params['perpage'])) ? $this->_params['perpage'] : 0;
+        $thumbsize = (!empty($this->_params['thumbsize'])) ? $this->_params['thumbsize'] : 'mini';
+        // Limit to these image views only.
+        if ($thumbsize != 'mini' && $thumbsize != 'thumb' &&
+            $thumbsize != 'prettythumb' && $thumbsize != 'screen') {
+
+             $thumbsize = 'mini';
+        }
+
+        /* An image list instead of a gallery? */
+        $images = (!empty($this->_params['images'])) ? $this->_params['images'] : array();
+        if (!empty($images)) {
+            // Images are filtered for age and password protected galleries
+            // in the ::getImageJson() call since they could all be from different
+            // galleries.
+            $images = explode(':', $images);
+        } else {
+            $this->gallery = $this->getGallery($gallery_id, $gallery_slug);
+            if (is_a($this->gallery, 'PEAR_Error')) {
+                Horde::logMessage($this->gallery, __FILE__, __LINE__, PEAR_LOG_ERR);
+                exit;
+            }
+
+            // We don't allow age restricted or password locked galleries to be
+            // viewed via the mini embedded view since it shows *all* the images
+            if (!$this->gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ) ||
+                !$this->gallery->isOldEnough() ||
+                $this->gallery->hasPasswd()) {
+
+                return '';
+            }
+        }
+
+        if (empty($images)) {
+            $json = $this->json(null, true, $start, $count, $thumbsize, true);
+            $json_full = $this->json(null, true, $start, $count, 'screen', true);
+        } else {
+            $json = $GLOBALS['ansel_storage']->getImageJson($images, null, true, $thumbsize, true);
+            $json_full = $GLOBALS['ansel_storage']->getImageJson($images, null, true, 'screen', true);
+        }
+
+        /* Some paths */
+        $cssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/embed.css', true);
+        $hcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'horde') . '/embed.css', true);
+        $js_path = $GLOBALS['registry']->get('jsuri', 'horde');
+        $pturl = Horde::url($js_path . '/prototype.js', true);
+        $hjsurl = Horde::url($js_path . '/tooltips.js', true);
+        $ansel_js_path = $GLOBALS['registry']->get('jsuri', 'ansel');
+        $jsurl = Horde::url($ansel_js_path . '/embed.js', true);
+        $hideLinks = (bool)!empty($this->_params['hidelinks']);
+
+        /* Lightbox specific URLs */
+        if (!empty($this->_params['lightbox'])) {
+            $effectsurl = Horde::url($js_path . '/effects.js', true);
+            $lbjsurl = Horde::url($ansel_js_path . '/lightbox.js', true);
+            $lbcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/lightbox.css', true);
+        }
+
+        /* Start building the javascript */
+        $html = <<<EOT
+            //<![CDATA[
+            // Old fashioned way to play nice with Safari 2 (Adding script inline with the
+            // DOM won't work).  Need two seperate files output here since the incldued
+            // files don't seem to be parsed until after the entire page is loaded, so we
+            // can't include prototype on the same page it's needed.
+
+            if (typeof anseljson == 'undefined') {
+                if (typeof Prototype == 'undefined') {
+                    document.write('<script type="text/javascript" src="$pturl"></script>');
+                }
+                if (typeof Horde_ToolTips == 'undefined') {
+                    document.write('<script type="text/javascript" src="$hjsurl"></script>');
+                    document.write('<link type="text/css" rel="stylesheet" href="$hcssurl" />');
+                }
+
+                anselnodes = new Array();
+                anseljson = new Object();
+                document.write('<link type="text/css" rel="stylesheet" href="$cssurl" />');
+                document.write('<script type="text/javascript" src="$jsurl"></script>');
+            }
+            anselnodes[anselnodes.length] = '$node';
+            anseljson['$node'] = new Object();
+            anseljson['$node']['data'] = $json;
+            anseljson['$node']['perpage'] = $perpage;
+            anseljson['$node']['page'] = 0;
+            anseljson['$node']['hideLinks'] = '$hideLinks';
+            //]]>
+
+EOT;
+            /* Special requirements for lightbox */
+            if (!empty($lbjsurl)) {
+                $graphic_dir = Horde::applicationUrl($GLOBALS['registry']->getImageDir(), true, -1);
+                $imageText = _("Photo");
+                $labelOf = _("of");
+                $html .= <<<EOT
+                if (typeof Effect == 'undefined') {
+                    document.write('<script type="text/javascript" src="$effectsurl"></script>');
+                }
+
+                /* Make sure we only include this stuff once */
+                if (typeof lbOptions == 'undefined') {
+
+                    document.write('<script type="text/javascript" src="$lbjsurl"></script>');
+                    document.write('<link type="text/css" rel="stylesheet" href="$lbcssurl" />');
+
+                    lbOptions = {
+                        fileLoadingImage: '$graphic_dir/lightbox/loading.gif',
+                        fileBottomNavCloseImage: '$graphic_dir/lightbox/closelabel.gif',
+                        overlayOpacity: 0.8,
+                        animate: true,
+                        resizeSpeed: 7,
+                        borderSize: 10,
+                        labelImage: '$imageText',
+                        labelOf: '$labelOf',
+                        returnURL: '#',
+                        startPage: 0
+                    }
+                }
+                anseljson['$node']['lightbox'] = $json_full;
+EOT;
+        }
+        return $html;
+    }
+
+}
diff --git a/ansel/lib/View/EmbeddedRenderer/Slideshow.php b/ansel/lib/View/EmbeddedRenderer/Slideshow.php
new file mode 100644
index 000000000..139b01728
--- /dev/null
+++ b/ansel/lib/View/EmbeddedRenderer/Slideshow.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Ansel_View_EmbeddedRenderer_Slideshow
+ *
+ * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael J. Rubinsky <mrubinsk@horde.org>
+ * @package Ansel
+ */
+class Ansel_View_EmbeddedRenderer_Slideshow extends Ansel_View_Gallery
+{
+    /**
+     * Create a new renderer.
+     *
+     * @see Ansel_View_Embedded
+     *
+     * @param array $params
+     *
+     * @return Ansel_View_EmbeddedRenderer  The renderer object.
+     */
+    function makeView($params = array())
+    {
+        $view = new Ansel_View_EmbeddedRenderer_Carousel();
+        $view->_params = $params;
+
+        return $view;
+    }
+
+    /**
+     * Build the javascript that will render the view.
+     *
+     * @return string  A string containing valid javascript.
+     */
+    function html()
+    {
+
+    }
+
+}
diff --git a/ansel/lib/View/EmbeddedRenderers/Carousel.php b/ansel/lib/View/EmbeddedRenderers/Carousel.php
deleted file mode 100644
index 730ff52a0..000000000
--- a/ansel/lib/View/EmbeddedRenderers/Carousel.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/** Ansel_View_Gallery **/
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
-/**
- * Ansel_View_EmbeddedRenderer_Carousel
- *
- * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author  Michael J. Rubinsky <mrubinsk@horde.org>
- * @package Ansel
- */
-class Ansel_View_EmbeddedRenderer_Carousel extends Ansel_View_Gallery {
-
-    /**
-     * Create a new renderer.
-     *
-     * @see Ansel_View_Embedded
-     *
-     * @param array $params
-     *
-     * @return Ansel_View_EmbeddedRenderer  The renderer object.
-     */
-    function makeView($params = array())
-    {
-        $view = new Ansel_View_EmbeddedRenderer_Carousel();
-        $view->_params = $params;
-
-        return $view;
-    }
-
-    /**
-     * Build the javascript that will render the view.
-     *
-     * @return string  A string containing valid javascript.
-     */
-    function html()
-    {
-
-    }
-
-}
diff --git a/ansel/lib/View/EmbeddedRenderers/GalleryLink.php b/ansel/lib/View/EmbeddedRenderers/GalleryLink.php
deleted file mode 100644
index 34799fcd2..000000000
--- a/ansel/lib/View/EmbeddedRenderers/GalleryLink.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/** Ansel_View_Gallery */
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
-/**
- * Ansel_View_EmbeddedRenderer_GalleryLink
- *
- * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * Example usage:
- * <pre>
- *
- *   <script type="text/javascript" src="http://example.com/horde/services/
- *   imple.php?imple=Embed/impleApp=ansel/gallery_view=GalleryLink/
- *   gallery_slug=slug1:slug2:slug3/container=divId/
- *   thumbsize=prettythumb/style=ansel_polaroid"></script>
- *   <div id="divId"></div>
- *   <style type="text/css">#divId .anselGalleryWidget img {border:none;}</style>
- *
- *
- * @author  Michael J. Rubinsky <mrubinsk@horde.org>
- * @package Ansel
- */
-class Ansel_View_EmbeddedRenderer_GalleryLink extends Ansel_View_Gallery {
-
-    /**
-     * Create a new renderer.
-     *
-     * @see Ansel_View_Embedded
-     *
-     * @param array $params
-     *
-     * @return Ansel_View_EmbeddedRenderer  The renderer object.
-     */
-    function makeView($params = array())
-    {
-        $view = new Ansel_View_EmbeddedRenderer_GalleryLink();
-        $view->_params = $params;
-
-        return $view;
-    }
-
-    /**
-     * Build the javascript that will render the view.
-     *
-     * @return string  A string containing valid javascript.
-     */
-    function html()
-    {
-        /* Read in parameters and set defaults */
-
-        /* Required */
-        $node = $this->_params['container'];
-        if (empty($node)) {
-            return '';
-        }
-
-        /* Need at least one of these */
-        $galleries = !empty($this->_params['gallery_slug']) ? explode(':', $this->_params['gallery_slug']) : '';
-        $haveSlugs = true;
-        if (empty($galleries)) {
-            $galleries = !empty($this->_params['gallery_id']) ? explode(':', $this->_params['gallery_id']) : null;
-            $haveSlugs = false;
-        }
-
-        /* Determine the style/thumnailsize etc... */
-        $thumbsize = empty($this->_params['thumbsize']) ?
-            'thumb' :
-            $this->_params['thumbsize'];
-
-        foreach ($galleries as $identifier) {
-            if ($haveSlugs) {
-                $gallery = $this->getGallery(null, $identifier);
-            } else {
-                $gallery = $this->getGallery($identifier);
-            }
-            if (is_a($gallery, 'PEAR_Error')) {
-                Horde::logMessage($gallery, __FILE__, __LINE__, PEAR_LOG_ERR);
-                exit;
-            }
-            if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) {
-                return '';
-            }
-
-            /*If a gallery_style is not specified, default to the gallery's
-             * defined style. Note that this only matters if the $thumbsize
-             * parameter is set to 'prettythumb' anyway.
-             */
-            $gallery_style = empty($this->_params['style']) ?
-                $gallery->get('style') :
-                $this->_params['style'];
-
-            /* Ideally, since gallery default images are unique in that each style
-             * needs it's own unique image_id, the thumbsize and style parameters
-             * are mutually exclusive - specifying a specific gallery style is only
-             * needed if requesting the prettythumb thumbsize value. Make sure that
-             * both were not passed in.
-             */
-            if ($thumbsize == 'thumb') {
-                $images[] = $gallery->getDefaultImage('ansel_default');
-            } else {
-                $images[] = $gallery->getDefaultImage($gallery_style);
-            }
-        }
-        $json = $GLOBALS['ansel_storage']->getImageJson($images, null, true, $thumbsize, true);
-
-        /* Some paths */
-        $cssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/jsembed.css', true);
-        $js_path = $GLOBALS['registry']->get('jsuri', 'horde');
-        $pturl = Horde::url($js_path . '/prototype.js', true);
-        $ansel_js_path = $GLOBALS['registry']->get('jsuri', 'ansel');
-        $jsurl = Horde::url($ansel_js_path . '/embed.js', true);
-
-        /* Start building the javascript - we use the same parameters as with
-         * the mini gallery view so we can use the same javascript to display it
-         */
-        $html = <<<EOT
-            //<![CDATA[
-            // Old fashioned way to play nice with Safari 2 (Adding script inline with the
-            // DOM won't work).  Need two seperate files output here since the incldued
-            // files don't seem to be parsed until after the entire page is loaded, so we
-            // can't include prototype on the same page it's needed.
-
-            if (typeof anseljson == 'undefined') {
-                if (typeof Prototype == 'undefined') {
-                    document.write('<script type="text/javascript" src="$pturl"></script>');
-                }
-                anselnodes = new Array();
-                anseljson = new Object();
-                document.write('<link type="text/css" rel="stylesheet" href="$cssurl" />');
-                document.write('<script type="text/javascript" src="$jsurl"></script>');
-            }
-            anselnodes[anselnodes.length] = '$node';
-            anseljson['$node'] = new Object();
-            anseljson['$node']['data'] = $json;
-            anseljson['$node']['perpage'] = 0;
-            anseljson['$node']['page'] = 0;
-            anseljson['$node']['hideLinks'] = false;
-            anseljson['$node']['linkToGallery'] = true;
-            //]]>
-EOT;
-
-        return $html;
-    }
-
-}
diff --git a/ansel/lib/View/EmbeddedRenderers/Mini.php b/ansel/lib/View/EmbeddedRenderers/Mini.php
deleted file mode 100644
index 2abaf4064..000000000
--- a/ansel/lib/View/EmbeddedRenderers/Mini.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/** Ansel_View_Gallery */
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
-/**
- * Ansel_View_EmbeddedRenderer_Mini
- *
- * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author  Michael J. Rubinsky <mrubinsk@horde.org>
- * @package Ansel
- */
-class Ansel_View_EmbeddedRenderer_Mini extends Ansel_View_Gallery {
-
-    /**
-     * Create a new renderer.
-     *
-     * @see Ansel_View_Embedded
-     *
-     * @param array $params
-     *
-     * @return Ansel_View_EmbeddedRenderer  The renderer object.
-     */
-    function makeView($params = array())
-    {
-        $view = new Ansel_View_EmbeddedRenderer_Mini();
-        $view->_params = $params;
-
-        return $view;
-    }
-
-    /**
-     * Build the javascript that will render the view.
-     *
-     * @return string  A string containing valid javascript.
-     */
-    function html()
-    {
-        /* Read in parameters and set defaults */
-
-        /* Required */
-        $node = $this->_params['container'];
-        if (empty($node)) {
-            return '';
-        }
-
-        /* Optional */
-        $gallery_slug = !empty($this->_params['gallery_slug']) ? $this->_params['gallery_slug'] : '';
-        $gallery_id = !empty($this->_params['gallery_id']) ? $this->_params['gallery_id']: null;
-
-        $start = (isset($this->_params['start'])) ? $this->_params['start'] : 0;
-        $count = (isset($this->_params['count'])) ? $this->_params['count'] : 0;
-        $perpage = (isset($this->_params['perpage'])) ? $this->_params['perpage'] : 0;
-        $thumbsize = (!empty($this->_params['thumbsize'])) ? $this->_params['thumbsize'] : 'mini';
-        // Limit to these image views only.
-        if ($thumbsize != 'mini' && $thumbsize != 'thumb' &&
-            $thumbsize != 'prettythumb' && $thumbsize != 'screen') {
-
-             $thumbsize = 'mini';
-        }
-
-        /* An image list instead of a gallery? */
-        $images = (!empty($this->_params['images'])) ? $this->_params['images'] : array();
-        if (!empty($images)) {
-            // Images are filtered for age and password protected galleries
-            // in the ::getImageJson() call since they could all be from different
-            // galleries.
-            $images = explode(':', $images);
-        } else {
-            $this->gallery = $this->getGallery($gallery_id, $gallery_slug);
-            if (is_a($this->gallery, 'PEAR_Error')) {
-                Horde::logMessage($this->gallery, __FILE__, __LINE__, PEAR_LOG_ERR);
-                exit;
-            }
-
-            // We don't allow age restricted or password locked galleries to be
-            // viewed via the mini embedded view since it shows *all* the images
-            if (!$this->gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ) ||
-                !$this->gallery->isOldEnough() ||
-                $this->gallery->hasPasswd()) {
-
-                return '';
-            }
-        }
-
-        if (empty($images)) {
-            $json = $this->json(null, true, $start, $count, $thumbsize, true);
-            $json_full = $this->json(null, true, $start, $count, 'screen', true);
-        } else {
-            $json = $GLOBALS['ansel_storage']->getImageJson($images, null, true, $thumbsize, true);
-            $json_full = $GLOBALS['ansel_storage']->getImageJson($images, null, true, 'screen', true);
-        }
-
-        /* Some paths */
-        $cssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/embed.css', true);
-        $hcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'horde') . '/embed.css', true);
-        $js_path = $GLOBALS['registry']->get('jsuri', 'horde');
-        $pturl = Horde::url($js_path . '/prototype.js', true);
-        $hjsurl = Horde::url($js_path . '/tooltips.js', true);
-        $ansel_js_path = $GLOBALS['registry']->get('jsuri', 'ansel');
-        $jsurl = Horde::url($ansel_js_path . '/embed.js', true);
-        $hideLinks = (bool)!empty($this->_params['hidelinks']);
-
-        /* Lightbox specific URLs */
-        if (!empty($this->_params['lightbox'])) {
-            $effectsurl = Horde::url($js_path . '/effects.js', true);
-            $lbjsurl = Horde::url($ansel_js_path . '/lightbox.js', true);
-            $lbcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/lightbox.css', true);
-        }
-
-        /* Start building the javascript */
-        $html = <<<EOT
-            //<![CDATA[
-            // Old fashioned way to play nice with Safari 2 (Adding script inline with the
-            // DOM won't work).  Need two seperate files output here since the incldued
-            // files don't seem to be parsed until after the entire page is loaded, so we
-            // can't include prototype on the same page it's needed.
-
-            if (typeof anseljson == 'undefined') {
-                if (typeof Prototype == 'undefined') {
-                    document.write('<script type="text/javascript" src="$pturl"></script>');
-                }
-                if (typeof Horde_ToolTips == 'undefined') {
-                    document.write('<script type="text/javascript" src="$hjsurl"></script>');
-                    document.write('<link type="text/css" rel="stylesheet" href="$hcssurl" />');
-                }
-
-                anselnodes = new Array();
-                anseljson = new Object();
-                document.write('<link type="text/css" rel="stylesheet" href="$cssurl" />');
-                document.write('<script type="text/javascript" src="$jsurl"></script>');
-            }
-            anselnodes[anselnodes.length] = '$node';
-            anseljson['$node'] = new Object();
-            anseljson['$node']['data'] = $json;
-            anseljson['$node']['perpage'] = $perpage;
-            anseljson['$node']['page'] = 0;
-            anseljson['$node']['hideLinks'] = '$hideLinks';
-            //]]>
-
-EOT;
-            /* Special requirements for lightbox */
-            if (!empty($lbjsurl)) {
-                $graphic_dir = Horde::applicationUrl($GLOBALS['registry']->getImageDir(), true, -1);
-                $imageText = _("Photo");
-                $labelOf = _("of");
-                $html .= <<<EOT
-                if (typeof Effect == 'undefined') {
-                    document.write('<script type="text/javascript" src="$effectsurl"></script>');
-                }
-
-                /* Make sure we only include this stuff once */
-                if (typeof lbOptions == 'undefined') {
-
-                    document.write('<script type="text/javascript" src="$lbjsurl"></script>');
-                    document.write('<link type="text/css" rel="stylesheet" href="$lbcssurl" />');
-
-                    lbOptions = {
-                        fileLoadingImage: '$graphic_dir/lightbox/loading.gif',
-                        fileBottomNavCloseImage: '$graphic_dir/lightbox/closelabel.gif',
-                        overlayOpacity: 0.8,
-                        animate: true,
-                        resizeSpeed: 7,
-                        borderSize: 10,
-                        labelImage: '$imageText',
-                        labelOf: '$labelOf',
-                        returnURL: '#',
-                        startPage: 0
-                    }
-                }
-                anseljson['$node']['lightbox'] = $json_full;
-EOT;
-        }
-        return $html;
-    }
-
-}
diff --git a/ansel/lib/View/EmbeddedRenderers/Slideshow.php b/ansel/lib/View/EmbeddedRenderers/Slideshow.php
deleted file mode 100644
index 9a624fed2..000000000
--- a/ansel/lib/View/EmbeddedRenderers/Slideshow.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/** Ansel_View_Gallery **/
-require_once ANSEL_BASE . '/lib/Views/Gallery.php';
-
-/**
- * Ansel_View_EmbeddedRenderer_Slideshow
- *
- * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author  Michael J. Rubinsky <mrubinsk@horde.org>
- * @package Ansel
- */
-class Ansel_View_EmbeddedRenderer_Slideshow extends Ansel_View_Gallery {
-
-    /**
-     * Create a new renderer.
-     *
-     * @see Ansel_View_Embedded
-     *
-     * @param array $params
-     *
-     * @return Ansel_View_EmbeddedRenderer  The renderer object.
-     */
-    function makeView($params = array())
-    {
-        $view = new Ansel_View_EmbeddedRenderer_Carousel();
-        $view->_params = $params;
-
-        return $view;
-    }
-
-    /**
-     * Build the javascript that will render the view.
-     *
-     * @return string  A string containing valid javascript.
-     */
-    function html()
-    {
-
-    }
-
-}
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
      *
      */