feature 2406 added: if the user wants a new album in the upload form, the album

is created before the start of the upload. The ergonomy is now simpler, the
page is smaller and cleaner.

bug 2373 fixed: now that album is created before upload, uploadify.php gets the
category_id and the level: as soon as it is uploaded (function add_uploaded_file)
the photo gets its final privacy level and is directly associated to the album.
This way, we can have an error on a photo without making orphan all photos of
the same upload group.

feature 2405 added: as soon as a photo is uploaded, its thumbnail is displayed
in the "Uploaded Photos" fieldset, without waiting for other photos to be
uploaded. The latest photos comes first.

I have slighlty changed the integration of colorbox in core. Now we have 2
styles available and by default, we use style2 (overlay in black, title and
control icons outside the popup). It is also used for zooming on bulk manager
in unit mode.

display change: on each uploading photos, instead of showing the transfer
speed, we display the transfer progression in %

bug fixed: the color of the "Start Upload" button was not correct because the
button was not a submit button but a simple type=button.

language: "Upload" button becomes "Start Upload" button.


git-svn-id: http://piwigo.org/svn/trunk@11962 68402e56-0260-453c-a942-63ccdbb3a9ee

23 files changed, 298 insertions, 32 deletions

diff --git a/themes/default/images/ajax-loader-small.gif b/themes/default/images/ajax-loader-small.gif
new file mode 100644
index 000000000..09d621ede
--- /dev/null
+++ b/themes/default/images/ajax-loader-small.gif
diff --git a/themes/default/images/colorbox-controls.png b/themes/default/images/colorbox-controls.png
deleted file mode 100644
index a01e054da..000000000
--- a/themes/default/images/colorbox-controls.png
+++ /dev/null
diff --git a/themes/default/js/plugins/colorbox/style1/colorbox.css b/themes/default/js/plugins/colorbox/style1/colorbox.css
new file mode 100644
index 000000000..e49aa7cc7
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/colorbox.css
@@ -0,0 +1,82 @@
+/*

+    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;}

+#cboxOverlay{position:fixed; width:100%; height:100%;}

+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}

+#cboxContent{position:relative;}

+#cboxLoadedContent{overflow:auto;}

+#cboxTitle{margin:0;}

+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}

+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}

+.cboxPhoto{float:left; margin:auto; border:0; display:block;}

+.cboxIframe{width:100%; height:100%; display:block; border:0;}

+

+/* 

+    User Style:

+    Change the following styles to modify the appearance of ColorBox.  They are

+    ordered & tabbed in a way that represents the nesting of the generated HTML.

+*/

+#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}

+#colorbox{}

+    #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -100px 0;}

+    #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -129px 0;}

+    #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -100px -29px;}

+    #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -129px -29px;}

+    #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;}

+    #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;}

+    #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;}

+    #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;}

+    #cboxContent{background:#fff; overflow:hidden;}

+        #cboxError{padding:50px; border:1px solid #ccc;}

+        #cboxLoadedContent{margin-bottom:28px;}

+        #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}

+        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}

+        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}

+        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}

+        #cboxPrevious.hover{background-position:-75px -25px;}

+        #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}

+        #cboxNext.hover{background-position:-50px -25px;}

+        #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}

+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}

+        #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}

+        #cboxClose.hover{background-position:-25px -25px;}

+

+/*

+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill

+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to IE9.

+*/

+.cboxIE #cboxTopLeft,

+.cboxIE #cboxTopCenter,

+.cboxIE #cboxTopRight,

+.cboxIE #cboxBottomLeft,

+.cboxIE #cboxBottomCenter,

+.cboxIE #cboxBottomRight,

+.cboxIE #cboxMiddleLeft,

+.cboxIE #cboxMiddleRight {

+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);

+}

+

+/*

+  The following provides PNG transparency support for IE6

+*/

+.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);}

+.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);}

+.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);}

+.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);}

+.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);}

+.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);}

+.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);}

+.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);}

+

+.cboxIE6 #cboxTopLeft,

+.cboxIE6 #cboxTopCenter,

+.cboxIE6 #cboxTopRight,

+.cboxIE6 #cboxBottomLeft,

+.cboxIE6 #cboxBottomCenter,

+.cboxIE6 #cboxBottomRight,

+.cboxIE6 #cboxMiddleLeft,

+.cboxIE6 #cboxMiddleRight {

+    _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");

+}

diff --git a/themes/default/js/plugins/colorbox/style1/images/border.png b/themes/default/js/plugins/colorbox/style1/images/border.png
new file mode 100644
index 000000000..f463a10d8
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/border.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/controls.png b/themes/default/js/plugins/colorbox/style1/images/controls.png
new file mode 100644
index 000000000..925717661
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/controls.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png
new file mode 100644
index 000000000..0d4475edf
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomCenter.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png
new file mode 100644
index 000000000..2775eba89
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomLeft.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png
new file mode 100644
index 000000000..f7f51379c
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderBottomRight.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png
new file mode 100644
index 000000000..a2d63d156
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleLeft.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png
new file mode 100644
index 000000000..fd7c3e849
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderMiddleRight.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png
new file mode 100644
index 000000000..2937a9cf9
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopCenter.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png
new file mode 100644
index 000000000..f9d458b5b
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopLeft.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png b/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png
new file mode 100644
index 000000000..74b8583cf
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/ie6/borderTopRight.png
diff --git a/themes/default/images/colorbox-loading.gif b/themes/default/js/plugins/colorbox/style1/images/loading.gif
index b4695d811..b4695d811 100644
--- a/themes/default/images/colorbox-loading.gif
+++ b/themes/default/js/plugins/colorbox/style1/images/loading.gif
diff --git a/themes/default/js/plugins/colorbox/style1/images/loading_background.png b/themes/default/js/plugins/colorbox/style1/images/loading_background.png
new file mode 100644
index 000000000..6ae83e697
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/loading_background.png
diff --git a/themes/default/js/plugins/colorbox/style1/images/overlay.png b/themes/default/js/plugins/colorbox/style1/images/overlay.png
new file mode 100644
index 000000000..53ea98f70
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/images/overlay.png
diff --git a/themes/default/js/plugins/colorbox/style1/index.html b/themes/default/js/plugins/colorbox/style1/index.html
new file mode 100644
index 000000000..abf749c3c
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style1/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>

+<html lang="en">

+	<head>

+	<meta charset=utf-8 />

+	<title>ColorBox Examples</title>

+	<style type="text/css">

+		body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}

+		a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}

+		h2{font-size:13px; margin:15px 0 0 0;}

+	</style>

+	<link media="screen" rel="stylesheet" href="colorbox.css" />

+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>

+	<script src="../colorbox/jquery.colorbox.js"></script>

+	<script>

+		$(document).ready(function(){

+			//Examples of how to assign the ColorBox event to elements

+			$("a[rel='example1']").colorbox();

+			$("a[rel='example2']").colorbox({transition:"fade"});

+			$("a[rel='example3']").colorbox({transition:"none", width:"75%", height:"75%"});

+			$("a[rel='example4']").colorbox({slideshow:true});

+			$(".example5").colorbox();

+			$(".example6").colorbox({iframe:true, innerWidth:425, innerHeight:344});

+			$(".example7").colorbox({width:"80%", height:"80%", iframe:true});

+			$(".example8").colorbox({width:"50%", inline:true, href:"#inline_example1"});

+			$(".example9").colorbox({

+				onOpen:function(){ alert('onOpen: colorbox is about to open'); },

+				onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },

+				onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },

+				onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },

+				onClosed:function(){ alert('onClosed: colorbox has completely closed'); }

+			});

+			

+			//Example of preserving a JavaScript event for inline calls.

+			$("#click").click(function(){ 

+				$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");

+				return false;

+			});

+		});

+	</script>

+</head>

+<body>

+	<h1>ColorBox Demonstration</h1>

+	

+	<h2>Elastic Transition</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example1" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example1" title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example1" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>Fade Transition</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example2" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example2" title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example2" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>No Transition + fixed width and height (75% of screen size)</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example3"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example3"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example3"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>Slideshow</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example4"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example4"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example4"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>Other Content Types</h2>

+	<p><a class='example5' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>

+	<p><a class='example5' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>

+	<p><a class='example6' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>

+	<p><a class='example7' href="http://google.com">Outside Webpage (Iframe)</a></p>

+	<p><a class='example8' href="#">Inline HTML</a></p>

+	

+	<h2>Demonstration of using callbacks</h2>

+	<p><a class='example9' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>

+	

+	<!-- This contains the hidden content for inline calls -->

+	<div style='display:none'>

+		<div id='inline_example1' style='padding:10px; background:#fff;'>

+		<p><strong>This content comes from a hidden element on this page.</strong></p>

+		<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.<br />

+		<a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>

+		

+		<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>

+		<p>Updating Content Example:<br />

+		<a class="example5" href="../content/flash.html">Click here to load new content</a></p>

+		</div>

+	</div>

+</body>

+</html>
\ No newline at end of file
diff --git a/themes/default/js/plugins/colorbox/style2/colorbox.css b/themes/default/js/plugins/colorbox/style2/colorbox.css
new file mode 100644
index 000000000..2aaf65e63
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style2/colorbox.css
@@ -0,0 +1,42 @@
+/*

+    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;}

+#cboxOverlay{position:fixed; width:100%; height:100%;}

+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}

+#cboxContent{position:relative;}

+#cboxLoadedContent{overflow:auto;}

+#cboxTitle{margin:0;}

+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}

+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}

+.cboxPhoto{float:left; margin:auto; border:0; display:block;}

+.cboxIframe{width:100%; height:100%; display:block; border:0;}

+

+/* 

+    User Style:

+    Change the following styles to modify the appearance of ColorBox.  They are

+    ordered & tabbed in a way that represents the nesting of the generated HTML.

+*/

+#cboxOverlay{background:#000;}

+#colorbox{}

+    #cboxContent{margin-top:32px; overflow:visible;}

+        #cboxError{padding:50px; border:1px solid #ccc;}

+        #cboxLoadedContent{background:#f1f1f1; padding:1px;}

+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}

+        #cboxLoadingOverlay{background:#000;}

+        #cboxTitle{position:absolute; top:-22px; left:0; color:#fff;}

+        #cboxTitle:first-letter{text-transform:capitalize;}

+        #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;}

+        #cboxSlideshow, #cboxPrevious, #cboxNext, #cboxClose{text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(images/controls.png) no-repeat 0 0;}

+        #cboxPrevious{background-position:0px 0px; right:44px;}

+        #cboxPrevious.hover{background-position:0px -25px;}

+        #cboxNext{background-position:-25px 0px; right:22px;}

+        #cboxNext.hover{background-position:-25px -25px;}

+        #cboxClose{background-position:-50px 0px; right:0;}

+        #cboxClose.hover{background-position:-50px -25px;}

+        .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}

+        .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}

+        .cboxSlideshow_on #cboxSlideshow.hover{background-position:-100px -25px;}

+        .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}

+        .cboxSlideshow_off #cboxSlideshow.hover{background-position:-75px -25px;}

diff --git a/themes/default/js/plugins/colorbox/style2/images/controls.png b/themes/default/js/plugins/colorbox/style2/images/controls.png
new file mode 100644
index 000000000..f85134b8c
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style2/images/controls.png
diff --git a/themes/default/js/plugins/colorbox/style2/images/controls.png.old b/themes/default/js/plugins/colorbox/style2/images/controls.png.old
new file mode 100644
index 000000000..8569b57f1
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style2/images/controls.png.old
diff --git a/themes/default/js/plugins/colorbox/style2/images/loading.gif b/themes/default/js/plugins/colorbox/style2/images/loading.gif
new file mode 100644
index 000000000..19c67bbd0
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style2/images/loading.gif
diff --git a/themes/default/js/plugins/colorbox/style2/index.html b/themes/default/js/plugins/colorbox/style2/index.html
new file mode 100644
index 000000000..abf749c3c
--- /dev/null
+++ b/themes/default/js/plugins/colorbox/style2/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>

+<html lang="en">

+	<head>

+	<meta charset=utf-8 />

+	<title>ColorBox Examples</title>

+	<style type="text/css">

+		body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}

+		a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}

+		h2{font-size:13px; margin:15px 0 0 0;}

+	</style>

+	<link media="screen" rel="stylesheet" href="colorbox.css" />

+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>

+	<script src="../colorbox/jquery.colorbox.js"></script>

+	<script>

+		$(document).ready(function(){

+			//Examples of how to assign the ColorBox event to elements

+			$("a[rel='example1']").colorbox();

+			$("a[rel='example2']").colorbox({transition:"fade"});

+			$("a[rel='example3']").colorbox({transition:"none", width:"75%", height:"75%"});

+			$("a[rel='example4']").colorbox({slideshow:true});

+			$(".example5").colorbox();

+			$(".example6").colorbox({iframe:true, innerWidth:425, innerHeight:344});

+			$(".example7").colorbox({width:"80%", height:"80%", iframe:true});

+			$(".example8").colorbox({width:"50%", inline:true, href:"#inline_example1"});

+			$(".example9").colorbox({

+				onOpen:function(){ alert('onOpen: colorbox is about to open'); },

+				onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },

+				onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },

+				onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },

+				onClosed:function(){ alert('onClosed: colorbox has completely closed'); }

+			});

+			

+			//Example of preserving a JavaScript event for inline calls.

+			$("#click").click(function(){ 

+				$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");

+				return false;

+			});

+		});

+	</script>

+</head>

+<body>

+	<h1>ColorBox Demonstration</h1>

+	

+	<h2>Elastic Transition</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example1" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example1" title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example1" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>Fade Transition</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example2" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example2" title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example2" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>No Transition + fixed width and height (75% of screen size)</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example3"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example3"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example3"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>Slideshow</h2>

+	<p><a href="../content/ohoopee1.jpg" rel="example4"  title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>

+	<p><a href="../content/ohoopee2.jpg" rel="example4"  title="On the Ohoopee as a child">Grouped Photo 2</a></p>

+	<p><a href="../content/ohoopee3.jpg" rel="example4"  title="On the Ohoopee as an adult">Grouped Photo 3</a></p>

+	

+	<h2>Other Content Types</h2>

+	<p><a class='example5' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>

+	<p><a class='example5' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>

+	<p><a class='example6' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>

+	<p><a class='example7' href="http://google.com">Outside Webpage (Iframe)</a></p>

+	<p><a class='example8' href="#">Inline HTML</a></p>

+	

+	<h2>Demonstration of using callbacks</h2>

+	<p><a class='example9' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>

+	

+	<!-- This contains the hidden content for inline calls -->

+	<div style='display:none'>

+		<div id='inline_example1' style='padding:10px; background:#fff;'>

+		<p><strong>This content comes from a hidden element on this page.</strong></p>

+		<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.<br />

+		<a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>

+		

+		<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>

+		<p>Updating Content Example:<br />

+		<a class="example5" href="../content/flash.html">Click here to load new content</a></p>

+		</div>

+	</div>

+</body>

+</html>
\ No newline at end of file
diff --git a/themes/default/js/plugins/jquery.colorbox.css b/themes/default/js/plugins/jquery.colorbox.css
deleted file mode 100644
index 07e8c40de..000000000
--- a/themes/default/js/plugins/jquery.colorbox.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ColorBox Core Style */

-#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;}

-#cboxLoadedContent{overflow:auto;}

-#cboxTitle{margin:0;}

-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}

-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}

-.cboxPhoto{float:left; margin:auto; border:0; display:block;}

-.cboxIframe{width:100%; height:100%; display:block; border:0;}

-

-/* User Style */

-#cboxWrapper{border-radius:10px; -moz-border-radius:10px: -webkit-border-radius:10px; background:#fff;}

-#cboxOverlay{background:#000;}

-#colorbox{}

-    #cboxTopLeft, #cboxTopRight, #cboxBottomLeft, #cboxBottomRight{width:11px; height:11px;}

-    #cboxMiddleLeft, #cboxMiddleRight{width:11px;}

-    #cboxTopCenter, #cboxBottomCenter{height:11px;} 

-    #cboxContent{background:#fff; overflow:hidden;}

-        #cboxError{padding:50px; colorbox-border:1px solid #ccc;}

-        #cboxLoadedContent{margin-bottom:28px;}

-        #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#666;}

-        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}

-        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}

-        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(../../images/colorbox-controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}

-        #cboxPrevious.hover{background-position:-50px -25px;}

-        #cboxNext{position:absolute; bottom:0; left:27px; background:url(../../images/colorbox-controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}

-        #cboxNext.hover{background-position:-25px -25px;}

-        #cboxLoadingGraphic{background:url(../../images/colorbox-loading.gif) no-repeat center center;}

-        #cboxClose{position:absolute; bottom:0; right:0; background:url(../../images/colorbox-controls.png) no-repeat 0 0; width:25px; height:25px; text-indent:-9999px;}

-        #cboxClose.hover{background-position:0 -25px;}
\ No newline at end of file