# HG changeset patch # User Steve Losh # Date 1324567525 18000 # Node ID 21705c97d2cca66f459ae3d72b57181e396edbb5 # Parent d0651ea8718f1273f22dda248d7f28ac8ac8772b Remove colorbox. diff -r d0651ea8718f -r 21705c97d2cc layout/skeleton/_base.html --- a/layout/skeleton/_base.html Mon Oct 10 00:45:29 2011 -0400 +++ b/layout/skeleton/_base.html Thu Dec 22 10:25:25 2011 -0500 @@ -18,7 +18,6 @@ {% block css %} - {% block extra_css %}{% endblock %} {% endblock %} @@ -26,7 +25,6 @@ {% block js %} - diff -r d0651ea8718f -r 21705c97d2cc media/css/colorbox.css --- a/media/css/colorbox.css Mon Oct 10 00:45:29 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* - ColorBox Core Style - The following rules are the styles that are consistant between themes. - Avoid changing this area to maintain compatability with future versions of ColorBox. -*/ -#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; overflow:visible;} -#cboxLoadedContent{overflow:auto;} -#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;} -#cboxTitle{margin:0;} -#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;} -#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} - -/* - ColorBox example user style - The following rules are ordered and tabbed in a way that represents the - order/nesting of the generated HTML, so that the structure easier to understand. -*/ -#cboxOverlay{background:#000;} - -#colorbox{} - #cboxTopLeft{width:14px; height:14px; background:url(/media/images/colorbox/controls.png) 0 0 no-repeat;} - #cboxTopCenter{height:14px; background:url(/media/images/colorbox/border.png) top left repeat-x;} - #cboxTopRight{width:14px; height:14px; background:url(/media/images/colorbox/controls.png) -36px 0 no-repeat;} - #cboxBottomLeft{width:14px; height:43px; background:url(/media/images/colorbox/controls.png) 0 -32px no-repeat;} - #cboxBottomCenter{height:43px; background:url(/media/images/colorbox/border.png) bottom left repeat-x;} - #cboxBottomRight{width:14px; height:43px; background:url(/media/images/colorbox/controls.png) -36px -32px no-repeat;} - #cboxMiddleLeft{width:14px; background:url(/media/images/colorbox/controls.png) -175px 0 repeat-y;} - #cboxMiddleRight{width:14px; background:url(/media/images/colorbox/controls.png) -211px 0 repeat-y;} - #cboxContent{background:#fff;} - #cboxLoadedContent{margin-bottom:5px;} - #cboxLoadingOverlay{background:url(/media/images/colorbox/loading_background.png) center center no-repeat;} - #cboxLoadingGraphic{background:url(/media/images/colorbox/loading.gif) center center no-repeat;} - #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;} - #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;} - - #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{position:absolute; bottom:-29px; background:url(/media/images/colorbox/controls.png) 0px 0px no-repeat; width:23px; height:23px; text-indent:-9999px;} - #cboxPrevious{left:0px; background-position: -51px -25px;} - #cboxPrevious.hover{background-position:-51px 0px;} - #cboxNext{left:27px; background-position:-75px -25px;} - #cboxNext.hover{background-position:-75px 0px;} - #cboxClose{right:0; background-position:-100px -25px;} - #cboxClose.hover{background-position:-100px 0px;} - - .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;} - .cboxSlideshow_on #cboxSlideshow.hover{background-position:-150px 0px;} - .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;} - .cboxSlideshow_off #cboxSlideshow.hover{background-position:-125px 0px;} \ No newline at end of file diff -r d0651ea8718f -r 21705c97d2cc media/images/colorbox/border.png Binary file media/images/colorbox/border.png has changed diff -r d0651ea8718f -r 21705c97d2cc media/images/colorbox/controls.png Binary file media/images/colorbox/controls.png has changed diff -r d0651ea8718f -r 21705c97d2cc media/images/colorbox/loading.gif Binary file media/images/colorbox/loading.gif has changed diff -r d0651ea8718f -r 21705c97d2cc media/images/colorbox/loading_background.png Binary file media/images/colorbox/loading_background.png has changed diff -r d0651ea8718f -r 21705c97d2cc media/js/jquery.colorbox.js --- a/media/js/jquery.colorbox.js Mon Oct 10 00:45:29 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,752 +0,0 @@ -// ColorBox v1.3.5 - a full featured, light-weight, customizable lightbox based on jQuery 1.3 -// c) 2009 Jack Moore - www.colorpowered.com - jack@colorpowered.com -// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php - -(function ($) { - // Shortcuts (to increase compression) - var colorbox = 'colorbox', - hover = 'hover', - TRUE = true, - FALSE = false, - cboxPublic, - isIE = !$.support.opacity, - isIE6 = isIE && !window.XMLHttpRequest, - - // Event Strings (to increase compression) - cbox_open = 'cbox_open', - cbox_load = 'cbox_load', - cbox_complete = 'cbox_complete', - cbox_cleanup = 'cbox_cleanup', - cbox_closed = 'cbox_closed', - cbox_resize = 'resize.cbox_resize', - - // Cached jQuery Object Variables - $overlay, - $cbox, - $wrap, - $content, - $topBorder, - $leftBorder, - $rightBorder, - $bottomBorder, - $related, - $window, - $loaded, - $loadingBay, - $loadingOverlay, - $loadingGraphic, - $title, - $current, - $slideshow, - $next, - $prev, - $close, - - // Variables for cached values or use across multiple functions - interfaceHeight, - interfaceWidth, - loadedHeight, - loadedWidth, - element, - bookmark, - index, - settings, - open, - active, - - // ColorBox Default Settings. - // See http://colorpowered.com/colorbox for details. - defaults = { - transition: "elastic", - speed: 350, - width: FALSE, - height: FALSE, - innerWidth: FALSE, - innerHeight: FALSE, - initialWidth: "400", - initialHeight: "400", - maxWidth: FALSE, - maxHeight: FALSE, - scalePhotos: TRUE, - scrolling: TRUE, - inline: FALSE, - html: FALSE, - iframe: FALSE, - photo: FALSE, - href: FALSE, - title: FALSE, - rel: FALSE, - opacity: 0.9, - preloading: TRUE, - current: "image {current} of {total}", - previous: "previous", - next: "next", - close: "close", - open: FALSE, - overlayClose: TRUE, - - slideshow: FALSE, - slideshowAuto: TRUE, - slideshowSpeed: 2500, - slideshowStart: "start slideshow", - slideshowStop: "stop slideshow", - - onOpen: FALSE, - onLoad: FALSE, - onComplete: FALSE, - onCleanup: FALSE, - onClosed: FALSE - }; - - // **************** - // HELPER FUNCTIONS - // **************** - - // Convert % values to pixels - function setSize(size, dimension) { - dimension = dimension === 'x' ? $window.width() : $window.height();//document.documentElement.clientWidth : document.documentElement.clientHeight; - return (typeof size === 'string') ? Math.round((size.match(/%/) ? (dimension / 100) * parseInt(size, 10) : parseInt(size, 10))) : size; - } - - // Checks an href to see if it is a photo. - // There is a force photo option (photo: true) for hrefs that cannot be matched by this regex. - function isImage(url) { - url = $.isFunction(url) ? url.call(element) : url; - return settings.photo || url.match(/\.(gif|png|jpg|jpeg|bmp)(?:\?([^#]*))?(?:#(\.*))?$/i); - } - - // Assigns functions results to their respective settings. This allows functions to be used to set ColorBox options. - function process() { - for (var i in settings) { - if ($.isFunction(settings[i]) && i.substring(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time. - settings[i] = settings[i].call(element); - } - } - } - - function launch(elem) { - - element = elem; - - settings = $(element).data(colorbox); - - process(); // Convert functions to their returned values. - - var rel = settings.rel || element.rel; - - if (rel && rel !== 'nofollow') { - $related = $('.cboxElement').filter(function () { - var relRelated = $(this).data(colorbox).rel || this.rel; - return (relRelated === rel); - }); - index = $related.index(element); - - // Check direct calls to ColorBox. - if (index < 0) { - $related = $related.add(element); - index = $related.length - 1; - } - } else { - $related = $(element); - index = 0; - } - - if (!open) { - open = TRUE; - - active = TRUE; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys. - - bookmark = element; - - bookmark.blur(); // Remove the focus from the calling element. - - // Set Navigation Key Bindings - $().bind("keydown.cbox_close", function (e) { - if (e.keyCode === 27) { - e.preventDefault(); - cboxPublic.close(); - } - }).bind("keydown.cbox_arrows", function (e) { - if ($related.length > 1) { - if (e.keyCode === 37) { - e.preventDefault(); - $prev.click(); - } else if (e.keyCode === 39) { - e.preventDefault(); - $next.click(); - } - } - }); - - if (settings.overlayClose) { - $overlay.css({"cursor": "pointer"}).one('click', cboxPublic.close); - } - - $.event.trigger(cbox_open); - if (settings.onOpen) { - settings.onOpen.call(element); - } - - $overlay.css({"opacity": settings.opacity}).show(); - - // Opens inital empty ColorBox prior to content being loaded. - settings.w = setSize(settings.initialWidth, 'x'); - settings.h = setSize(settings.initialHeight, 'y'); - cboxPublic.position(0); - - if (isIE6) { - $window.bind('resize.cboxie6 scroll.cboxie6', function () { - $overlay.css({width: $window.width(), height: $window.height(), top: $window.scrollTop(), left: $window.scrollLeft()}); - }).trigger("scroll.cboxie6"); - } - } - - $current.add($prev).add($next).add($slideshow).add($title).hide(); - - $close.html(settings.close).show(); - - cboxPublic.slideshow(); - - cboxPublic.load(); - } - - // **************** - // PUBLIC FUNCTIONS - // Usage format: $.fn.colorbox.close(); - // Usage from within an iframe: parent.$.fn.colorbox.close(); - // **************** - - cboxPublic = $.fn.colorbox = function (options, callback) { - var $this = this; - - if (!$this.length) { - if ($this.selector === '') { // empty selector means a direct call, ie: $.fn.colorbox(); - $this = $($this); - options.open = TRUE; - } else { // else the selector didn't match anything, and colorbox should go ahead and return. - return this; - } - } - - $this.each(function () { - var data = $.extend({}, $(this).data(colorbox) ? $(this).data(colorbox) : defaults, options); - - $(this).data(colorbox, data).addClass("cboxElement"); - - if (callback) { - $(this).data(colorbox).onComplete = callback; - } - }); - - if (options && options.open) { - launch($this); - } - - return this; - }; - - // Initialize ColorBox: store common calculations, preload the interface graphics, append the html. - // This preps colorbox for a speedy open when clicked, and lightens the burdon on the browser by only - // having to run once, instead of each time colorbox is opened. - cboxPublic.init = function () { - - // jQuery object generator to save a bit of space - function $div(id) { - return $('
'); - } - - // Create & Append jQuery Objects - $window = $(window); - $cbox = $('
'); - $overlay = $div("Overlay").hide(); - $wrap = $div("Wrapper"); - $content = $div("Content").append( - $loaded = $div("LoadedContent").css({width: 0, height: 0}), - $loadingOverlay = $div("LoadingOverlay"), - $loadingGraphic = $div("LoadingGraphic"), - $title = $div("Title"), - $current = $div("Current"), - $slideshow = $div("Slideshow"), - $next = $div("Next"), - $prev = $div("Previous"), - $close = $div("Close") - ); - $wrap.append( // The 3x3 Grid that makes up ColorBox - $('
').append( - $div("TopLeft"), - $topBorder = $div("TopCenter"), - $div("TopRight") - ), - $('
').append( - $leftBorder = $div("MiddleLeft"), - $content, - $rightBorder = $div("MiddleRight") - ), - $('
').append( - $div("BottomLeft"), - $bottomBorder = $div("BottomCenter"), - $div("BottomRight") - ) - ).children().children().css({'float': 'left'}); - - $loadingBay = $("
"); - - $('body').prepend($overlay, $cbox.append($wrap, $loadingBay)); - - if (isIE) { - $cbox.addClass('cboxIE'); - if (isIE6) { - $overlay.css('position', 'absolute'); - } - } - - // Add rollover event to navigation elements - $content.children() - .addClass(hover) - .mouseover(function () { $(this).addClass(hover); }) - .mouseout(function () { $(this).removeClass(hover); }); - - // Cache values needed for size calculations - interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(TRUE) - $content.height();//Subtraction needed for IE6 - interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(TRUE) - $content.width(); - loadedHeight = $loaded.outerHeight(TRUE); - loadedWidth = $loaded.outerWidth(TRUE); - - // Setting padding to remove the need to do size conversions during the animation step. - $cbox.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth}).hide(); - - // Setup button & key events. - $next.click(cboxPublic.next); - $prev.click(cboxPublic.prev); - $close.click(cboxPublic.close); - - // Adding the 'hover' class allowed the browser to load the hover-state - // background graphics. The class can now can be removed. - $content.children().removeClass(hover); - - $('.cboxElement').live('click', function (e) { - if (e.button !== 0 && typeof e.button !== 'undefined') {// checks to see if it was a non-left mouse-click. - return TRUE; - } else { - launch(this); - return FALSE; - } - }); - }; - - cboxPublic.position = function (speed, loadedCallback) { - var - animate_speed, - winHeight = $window.height(), - // keeps the top and left positions within the browser's viewport. - posTop = Math.max(winHeight - settings.h - loadedHeight - interfaceHeight,0)/2 + $window.scrollTop(), - posLeft = Math.max(document.documentElement.clientWidth - settings.w - loadedWidth - interfaceWidth,0)/2 + $window.scrollLeft(); - - // setting the speed to 0 to reduce the delay between same-sized content. - animate_speed = ($cbox.width() === settings.w+loadedWidth && $cbox.height() === settings.h+loadedHeight) ? 0 : speed; - - // this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly, - // but it has to be shrank down around the size of div#colorbox when it's done. If not, - // it can invoke an obscure IE bug when using iframes. - $wrap[0].style.width = $wrap[0].style.height = "9999px"; - - function modalDimensions (that) { - // loading overlay size has to be sure that IE6 uses the correct height. - $topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = that.style.width; - $loadingGraphic[0].style.height = $loadingOverlay[0].style.height = $content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = that.style.height; - } - - $cbox.dequeue().animate({width:settings.w+loadedWidth, height:settings.h+loadedHeight, top:posTop, left:posLeft}, {duration: animate_speed, - complete: function(){ - modalDimensions(this); - - active = FALSE; - - // shrink the wrapper down to exactly the size of colorbox to avoid a bug in IE's iframe implementation. - $wrap[0].style.width = (settings.w+loadedWidth+interfaceWidth) + "px"; - $wrap[0].style.height = (settings.h+loadedHeight+interfaceHeight) + "px"; - - if (loadedCallback) {loadedCallback();} - }, - step: function(){ - modalDimensions(this); - } - }); - }; - - cboxPublic.resize = function (object) { - if(!open){ return; } - - var topMargin, - prev, - prevSrc, - next, - nextSrc, - photo, - timeout, - speed = settings.transition==="none" ? 0 : settings.speed; - - $window.unbind(cbox_resize); - - if(!object){ - timeout = setTimeout(function(){ // timer allows IE to render the dimensions before attempting to calculate the height - var $child = $loaded.wrapInner("
").children(); // temporary wrapper to get an accurate estimate of just how high the total content should be. - settings.h = $child.height(); - $loaded.css({height:settings.h}); - $child.replaceWith($child.children()); // ditch the temporary wrapper div used in height calculation - cboxPublic.position(speed); - }, 1); - return; - } - - $loaded.remove(); - $loaded = $('
').html(object); - - function getWidth(){ - settings.w = settings.w || $loaded.width(); - settings.w = settings.mw && settings.mw < settings.w ? settings.mw : settings.w; - return settings.w; - } - function getHeight(){ - settings.h = settings.h || $loaded.height(); - settings.h = settings.mh && settings.mh < settings.h ? settings.mh : settings.h; - return settings.h; - } - - $loaded.hide() - .appendTo($loadingBay)// content has to be appended to the DOM for accurate size calculations. Appended to an absolutely positioned element, rather than BODY, which avoids an extremely brief display of the vertical scrollbar in Firefox that can occur for a small minority of websites. - .css({width:getWidth(), overflow:settings.scrolling ? 'auto' : 'hidden'}) - .css({height:getHeight()})// sets the height independently from the width in case the new width influences the value of height. - .prependTo($content); - - $('#cboxPhoto').css({cssFloat:'none'});// floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width. - - // Hides SELECT elements in IE6 because they would otherwise sit on top of the overlay. - if (isIE6) { - $('select:not(#colorbox select)').filter(function(){ - return this.style.visibility !== 'hidden'; - }).css({'visibility':'hidden'}).one(cbox_cleanup, function(){ - this.style.visibility = 'inherit'; - }); - } - - function setPosition (s) { - cboxPublic.position(s, function(){ - if (!open) { return; } - - if (isIE) { - //This fadeIn helps the bicubic resampling to kick-in. - if( photo ){$loaded.fadeIn(100);} - //IE adds a filter when ColorBox fades in and out that can cause problems if the loaded content contains transparent pngs. - $cbox[0].style.removeAttribute("filter"); - } - - //Waited until the iframe is added to the DOM & it is visible before setting the src. - //This increases compatability with pages using DOM dependent JavaScript. - if(settings.iframe){ - $loaded.append("