From 577eb6f725449fea5738ca122eedb5e4b2c8ff56 Mon Sep 17 00:00:00 2001 From: brettp Date: Sat, 5 Feb 2011 21:10:35 +0000 Subject: The screenshot desc is now used. Small css changes. git-svn-id: http://code.elgg.org/elgg/trunk@8037 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/admin/components/plugin.php | 5 ++++- views/default/admin/plugins/advanced.php | 10 ++++++++-- views/default/css/admin.php | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php index 5a3bdad8a..acbe42e84 100644 --- 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 .= "
  • "; + $screenshots_html .= "
  • " + . "\"$alt\"
  • "; } } diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index 2e05ae7ee..b83bee87f 100644 --- 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 = ''; - lb.html(img); + var html = ''; + var desc = $(this).find('img').attr('alt'); + + if (desc) { + html = '

    ' + desc + '

    ' + 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 eec474dd4..9d1c5d23c 100644 --- 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; -- cgit v1.2.3