Fixes #3954 using lightbox for plugin screenshots

diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index c3e7e3ab0e4840e0e48956c57784e4f78a8743e7..b793175e06f5bfa97de7a83c41f5492a8045bc87 100644 (file)
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -8,6 +8,9 @@
  * @subpackage Admin.Plugins
  */
 
+elgg_load_js('lightbox');
+elgg_load_css('lightbox');
+
 elgg_generate_plugin_entities();
 $installed_plugins = elgg_get_plugins('any');
 $show_category = get_input('category', 'all');

diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index d4dd06822d1f4e253b3038af97fb64aed8355d1b..5cefba5124598fa4402a80d54b4e9f1506286d4e 100644 (file)
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -17,9 +17,6 @@ elgg.admin.init = function () {
                $(this).stop().slideUp('medium');
        });
 
-       // plugin screenshot modal
-       $('.elgg-plugin-screenshot a').click(elgg.admin.displayPluginScreenshot);
-
        // draggable plugin reordering
        $('#elgg-plugin-list > ul').sortable({
                items:                'li:has(> .elgg-state-draggable)',
@@ -73,48 +70,6 @@ elgg.admin.movePlugin = function(e, ui) {
        });
 };
 
-/**
- * Display a plugin screenshot.
- *
- * @param {Object} e The event object.
- * @return void
- */
-elgg.admin.displayPluginScreenshot = function(e) {
-       e.preventDefault();
-       var lb = $('.elgg-plugin-screenshot-lightbox');
-
-       if (lb.length < 1) {
-               $('body').append('<div class="elgg-plugin-screenshot-lightbox"></div>');
-               lb = $('.elgg-plugin-screenshot-lightbox');
-
-               lb.click(function() {
-                       lb.hide();
-               });
-
-               $(document).click(function(e) {
-                       var target = $(e.target);
-                       if (target.is('a') && target.hasClass('elgg-plugin-screenshot-lightbox')) {
-                               lb.hide();
-                               e.preventDefault();
-                       }
-               });
-       }
-
-       var html = '<img class="pas" src="' + $(this).attr('href') + '">';
-       var desc = $(this).find('img').attr('alt');
-
-       if (desc) {
-               html = '<h2 class="pam">' + desc + '</h2>' + html;
-       }
-
-       lb.html(html);
-
-       top_pos = $(window).scrollTop() + 10 + 'px';
-       left_pos = $(window).scrollLeft() + 5 + 'px';
-
-       lb.css('top', top_pos).css('left', left_pos).show();
-};
-
 /**
  * In-line editing for custom profile fields
  *

diff --git a/views/default/object/plugin/full.php b/views/default/object/plugin/full.php
index db4e4dbcc4e1a33bd60dc8cc70d486810de120f6..8955178a64ee226b279a58c20cdc20ffb312c6a8 100644 (file)
--- a/views/default/object/plugin/full.php
+++ b/views/default/object/plugin/full.php
@@ -156,7 +156,7 @@ if ($screenshots) {
                $screenshot_full = "{$vars['url']}admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
                $screenshot_src = "{$vars['url']}admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
 
-               $screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a href=\"$screenshot_full\">"
+               $screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a class=\"elgg-lightbox\" href=\"$screenshot_full\">"
                                                        . "<img src=\"$screenshot_src\" alt=\"$alt\"></a></li>";
        }
 }