diff options
| -rw-r--r-- | manifest.xml | 10 | ||||
| -rw-r--r-- | start.php | 2 | ||||
| -rw-r--r-- | views/default/css/lightbox.php | 8 | ||||
| -rw-r--r-- | views/default/js/lightbox.php | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/manifest.xml b/manifest.xml index 8f79f9186..1cfeacd3d 100644 --- a/manifest.xml +++ b/manifest.xml @@ -13,8 +13,14 @@ <type>elgg_release</type> <version>1.8</version> </requires> - <conflicts> + <requires> + <type>priority</type> + <priority>after</priority> + <plugin>embed</plugin> + </requires> + <requires> <type>elgg_release</type> <version>1.9</version> - </conflicts> + <comparison>lt</comparison> + </requires> </plugin_manifest> @@ -13,5 +13,5 @@ elgg_register_event_handler('init', 'system', 'colorbox_init'); * */ function colorbox_init() { - + } diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php index 6ba4dd254..b96d9cb05 100644 --- a/views/default/css/lightbox.php +++ b/views/default/css/lightbox.php @@ -8,7 +8,7 @@ * @subpackage UI */ -$jquery_path = elgg_get_site_url() . 'vendors/jquery/'; +$jquery_path = elgg_get_site_url() . 'mod/colorbox/vendors/jquery/'; ?> /* @@ -21,7 +21,7 @@ $jquery_path = elgg_get_site_url() . 'vendors/jquery/'; ColorBox Core Style: The following CSS is consistent between example themes and should not be altered. */ -#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} +body > #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} #cboxOverlay{position:fixed; width:100%; height:100%;} #cboxMiddleLeft, #cboxBottomLeft{clear:left;} #cboxContent{position:relative;} @@ -31,7 +31,7 @@ $jquery_path = elgg_get_site_url() . 'vendors/jquery/'; #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} .cboxPhoto{float:left; margin:auto; border:0; display:block; max-width: none;} .cboxIframe{width:100%; height:100%; display:block; border:0;} -#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;} +body > #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;} /* User Style: @@ -39,7 +39,7 @@ $jquery_path = elgg_get_site_url() . 'vendors/jquery/'; ordered & tabbed in a way that represents the nesting of the generated HTML. */ #cboxOverlay{background:#000;} -#colorbox{} +body > #colorbox{} #cboxContent{margin-top:20px;} .cboxIframe{background:#fff;} #cboxError{padding:50px; border:1px solid #ccc;} diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php index 85fd2b717..a7beaadcc 100644 --- a/views/default/js/lightbox.php +++ b/views/default/js/lightbox.php @@ -36,6 +36,6 @@ elgg.register_hook_handler('init', 'system', elgg.ui.lightbox.init); <?php -$js_path = elgg_get_config('path'); -$js_path = "{$js_path}vendors/jquery/colorbox/colorbox/jquery.colorbox-min.js"; +$js_path = elgg_get_plugins_path(); +$js_path = "{$js_path}colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox-min.js"; include $js_path; |