The screenshot desc is now used. Small css changes.

git-svn-id: http://code.elgg.org/elgg/trunk@8037 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 5a3bdad8a26c9fbb6c658830ae6b19f8cbaaa6b6..acbe42e84f4c1854fef2779c5d688b1388e940fb 100644 (file)
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -127,10 +127,13 @@ $screenshots = $plugin->manifest->getScreenshots();
 if ($screenshots) {
        $base_url = elgg_get_plugins_path() . $plugin->getID() . '/';
        foreach ($screenshots as $screenshot) {
+               $desc = elgg_echo($screenshot['description']);
+               $alt = htmlentities($desc, ENT_QUOTES, 'UTF-8');
                $screenshot_full = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
                $screenshot_src = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
 
-               $screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a href=\"$screenshot_full\"><img src=\"$screenshot_src\"></a></li>";
+               $screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a href=\"$screenshot_full\">"
+                                                       . "<img src=\"$screenshot_src\" alt=\"$alt\"></a></li>";
        }
 }
 

diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 2e05ae7ee3ec372ff8513182a81885dedfb4665e..b83bee87f31ab037f0d3d868761619afb5880c75 100644 (file)
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -117,8 +117,14 @@ foreach ($installed_plugins as $plugin) {
                                });
                        }
 
-                       var img = '<img class="pas" src="' + $(this).attr('href') + '">';
-                       lb.html(img);
+                       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';

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index eec474dd4cb17cb9af67a74753407ffc60ca508d..9d1c5d23c5041eb181703f5def699be58ffcdef3 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -966,11 +966,14 @@ ul.admin_plugins {
        position: absolute;
        width: 99%;
        text-align: center;
-       background-color: #eeeeee;
+       background-color: white;
        border: 1px solid #999999;
        -moz-border-radius: 8px;
        -webkit-border-radius: 8px;
 }
+.elgg-plugin-screenshot-lightbox h2 {
+       color:black;
+}
 .active {
        border:1px solid #999999;
        background:white;