Merge commit 'upstream/master'

14 files changed, 185 insertions, 446 deletions

diff --git a/installer/installer.php b/installer/installer.php
index 50657d80..fedb4251 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -110,6 +110,7 @@ class installer {
 
   static function mysql_version($config) {
     $result = mysql_query("SHOW VARIABLES WHERE variable_name = \"version\"");
+    $row = mysql_fetch_object($result);
     return $row->Value;
   }
 
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index ca90a484..f4d46a4e 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -1,111 +1,161 @@
-/* ####### states, interactions, positioning ########### */
+/**
+ * Gallery 3 commonly reused screen styles
+ *
+ * Sheet organization:
+ *  1)  Text
+ *  2)  States and interactions
+ *  3)  Positioning and order
+ *  4)  Reusable containers/widgets
+ */
 
-/* states */
+/** *******************************************************************
+ * 1) Text
+ **********************************************************************/
 
-.g-active,   .g-enabled,  .g-available,   .g-editable,              .g-selected,   .g-highlight {
+
+.g-txt-small {
+	font-size: .8em;
+}
+
+.g-txt-big {
+	font-size: 1.2em;
+}
+
+.g-txt-right {
+	text-align: right;
+}
+
+/** *******************************************************************
+ * 2) States and interactions
+ **********************************************************************/
+
+.g-active,
+.g-enabled,
+.g-available,
+.g-editable,
+.g-selected,
+.g-highlight {
   font-weight: bold;
 }
-.g-inactive, .g-disabled, .g-unavailable, .g-uneditable, .g-locked, .g-unselected, .g-understate {
+
+.g-inactive,
+.g-disabled,
+.g-unavailable,
+.g-uneditable,
+.g-locked,
+.g-unselected,
+.g-understate {
   color: #ccc;
   font-weight: normal;
 }
 
-.g-error, .g-denied {
-	
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
+  background-position: .4em 50%;
+  background-repeat: no-repeat;
+  padding: .4em .5em .4em 30px;
 }
-.g-success, .g-allowed {
-	
+
+.g-error,
+.g-denied {
+  background-color: #f6cbca;
+  color: #f00;
+  background-image: url('lib/images/ico-error.png');
 }
+
 .g-info {
-	
+  background-color: #e8e8e8;
+  background-image: url('lib/images/ico-info.png');
+}
+
+.g-success,
+.g-allowed {
+  background-color: #d9efc2;
+  background-image: url('lib/images/ico-success.png');
 }
+
 .g-warning {
-	
+  background-color: #fcf9ce;
+  background-image: url('lib/images/ico-warning.png');
+}
+
+form .g-error {
+  background-color: #fff;
 }
 
 .g-open {
-	
 }
+
 .g-closed {
-	
 }
 
 .g-installed {
-	
 }
+
 .g-default {
-	
 }
 
-/* interactions */
-
-.g-draggable, .ui-draggable {
+.g-draggable,
+.ui-draggable {
 	cursor: move;
 }
+
 .g-target {
-	
 }
 
-
-
-/* positioning */
+/** *******************************************************************
+ * 3) Positioning and order
+ **********************************************************************/
 
 .g-right {
 	float: right;
 }
+
 .g-left {
 	float: left;
 }
 
-/* order */
-
 .g-first {
-	
 }
+
 .g-last {
-	
 }
+
 .g-even-row {
-  
-}
-.g-odd-row {
-	
 }
 
-/* text */
-
-.g-txt-small {
-	font-size: .8em;
-}
-.g-txt-big {
-	font-size: 1.2em;
-}
-.g-txt-right {
-	text-align: right;
+.g-odd-row {
 }
 
-/* ####### reusable containers/widgets ########### */
+/** *******************************************************************
+ * 4) Reusable containers/widgets
+ **********************************************************************/
 
 .g-dialog {
-	
 }
 
-.g-button { /* a link styled like a button */
-	
+.g-button {
 }
 
 .g-progressbar {
-	
 }
 
 .g-block {
-	
 }
 
 .g-message-box {
-	
+  width: 100%;
+}
+
+.g-message {
+  border: 1px solid #ccc;
+  margin-bottom: .4em;
+}
+
+.g-pager {
 }
 
 .g-list-horizontal {
-	
 }
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 05bc0923..4bca8653 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -22,7 +22,7 @@
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
       <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
         <td>
@@ -42,10 +42,6 @@
 
   <? if ($running_tasks->count()): ?>
   <div id="gRunningTasks">
-    <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-       class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-      <?= t("cancel all") ?></a>
-
     <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
@@ -66,12 +62,15 @@
         </th>
         <th>
           <?= t("Action") ?>
+          <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
+             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+            <?= t("cancel all") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
       <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
@@ -116,10 +115,6 @@
 
   <? if ($finished_tasks->count()): ?>
   <div id="gFinishedTasks">
-    <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-         class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-       <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-
     <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
@@ -140,12 +135,15 @@
         </th>
         <th>
           <?= t("Action") ?>
+          <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+               class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+             <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
       <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 509e87b5..0f33d508 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -23,6 +23,7 @@
       animation = null;
       delta = 1;
     }
+    $.fn.gallery_hover_init();
   }
 
   update = function() {
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4a65d20e..15b5538d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,6 +1,6 @@
 
 /*******************************************************************
- * Dialog wide stylings
+ * Dialog wide styles
  */
 #gOrganize {
   overflow: hidden;
@@ -18,7 +18,7 @@
   width: 25%;
 }
 
-#gOrganize .yui-gf #gMessage {
+#gMessage {
   margin-bottom: .4em;
   width: 75%;
   white-space: nowrap;
@@ -34,7 +34,7 @@
 }
 
 /*******************************************************************
- * Album Tree styling
+ * Album Tree styles
  */
 #gOrganizeTreeContainer {
   height: 100%;
@@ -43,20 +43,14 @@
   padding: 0 !important;
 }
 
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
-}
-
-.gOrganizeAlbumText:hover {
-  border: 1px dashed #999;
-  padding: 1px;
+#gOrganizeAlbumTree .selected {
+  background-color: #cfdeff;
+  border-bottom: 1px solid #999;
+  margin-right: 0px;
 }
 
-#gOrganizeAlbumTree .selected {
-  background-color: #cfdeff !important;
-  border-bottom: 1px solid #999 !important;
-  display: block;
-  padding: .3em 0;
+#gOrganizeAlbumTree ul li {
+  padding-left: 1.2em;
 }
 
 .gOrganizeAlbum span {
@@ -66,15 +60,22 @@
 .gOrganizeAlbumText {
   cursor: pointer;
   width: auto;
+  margin: 2px 0px 1px 2px;
+  display: block;
 }
+
+.gOrganizeAlbumText:hover {
+  background: #eee;
+}
+
 /*******************************************************************
- * Album Panel Styles
+ * Album panel styles
  */
 #gOrganizeMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
   background-color: #cfdeff;
-  border: 1px solid #999 !important;
+  border: 1px solid #999;
   border-top: none !important;
   border-left: none !important;
   overflow-x: hidden;
@@ -89,9 +90,9 @@
   float: left;
   font-size: 0.8em;
   padding: .5em !important;
-  opacity: .5;
   border-left: 1px hidden #13A;
   border-right: 1px hidden #13A;
+  margin: 4px;
 }
 
 .gOrganizeMicroThumb {
@@ -102,28 +103,32 @@
 }
 
 .gOrganizeMicroThumbGridCell.ui-state-selected {
-  opacity: 1;
+  margin: 2px;
+  border: 2px solid #13A;
 }
 
 .ui-selectable-lasso {
   z-index: 2000 !important;
-  border: 1px dashed #13A;
+  border: 1px dashed #00F;
+  opacity: 0.25;
+  background: #13A;
 }
 
 .gThumbnail {
   padding: .5em;
 }
 
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbGrid .gAlbum {
   background-color: #e8e8e8;
 }
 
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
-  opacity: 1;
+.gOrganizeMicroThumbGridCell:hover {
+  margin: 2px;
+  border: 2px solid #13A;
 }
 
 /****************************************************************
- * Organize Controls styling
+ * Controls styles
  */
 #gOrganizeControls {
   padding-left: 8px;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index edafae61..d4449b38 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -94,7 +94,9 @@
       if (source_ids.length) {
 	$.post(options.url,
 	       { "source_ids[]": source_ids },
-	       function(data) { $.organize._refresh(data); },
+	       function(data) {
+		 $.organize._refresh(data);
+	       },
 	      "json");
       }
     },
@@ -152,11 +154,12 @@
     },
 
     set_handlers: function() {
-      $("#gOrganizeMicroThumbPanel").selectable({filter: ".gOrganizeMicroThumbGridCell"});
-      $("#gOrganizeMicroThumbPanel").droppable($.organize.content_droppable);
-
-      $(".gOrganizeMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
-      $(".gOrganizeMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
+      $("#gOrganizeMicroThumbPanel")
+	.selectable({filter: ".gOrganizeMicroThumbGridCell"})
+	.droppable($.organize.content_droppable);
+      $(".gOrganizeMicroThumbGridCell")
+	.draggable($.organize.micro_thumb_draggable)
+	.mousemove($.organize.mouse_move_handler);
       $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
       $(".gOrganizeAlbumText").click($.organize.show_album);
       $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 50c202b0..c0c23f94 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,9 +3,7 @@
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gOrganizeAlbumText
-               <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
-               "
+  <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
         ref="<?= $album->id ?>">
     <?= html::clean($album->title) ?>
   </span>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index c275eb10..21b2b31c 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -312,7 +312,6 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: red;
   background-image: url('../images/ico-error.png');
 }
 
@@ -346,11 +345,7 @@ table .gSuccess {
   background-color: transparent !important;
 }
 
-.gPager .gInfo,
-table .gError,
-table .gInfo,
-table .gSuccess,
-table .gWarning {
+.gPager .gInfo {
   background-image: none !important;
 }
 
diff --git a/themes/admin_default/js/jquery.dropshadow.js b/themes/admin_default/js/jquery.dropshadow.js
deleted file mode 100644
index af7c4b00..00000000
--- a/themes/admin_default/js/jquery.dropshadow.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-	VERSION: Drop Shadow jQuery Plugin 1.6  12-13-2007
-
-	REQUIRES: jquery.js (1.2.6 or later)
-
-	SYNTAX: $(selector).dropShadow(options);  // Creates new drop shadows
-					$(selector).redrawShadow();       // Redraws shadows on elements
-					$(selector).removeShadow();       // Removes shadows from elements
-					$(selector).shadowId();           // Returns an existing shadow's ID
-
-	OPTIONS:
-
-		left    : integer (default = 4)
-		top     : integer (default = 4)
-		blur    : integer (default = 2)
-		opacity : decimal (default = 0.5)
-		color   : string (default = "black")
-		swap    : boolean (default = false)
-
-	The left and top parameters specify the distance and direction, in	pixels, to
-	offset the shadow. Zero values position the shadow directly behind the element.
-	Positive values shift the shadow to the right and down, while negative values
-	shift the shadow to the left and up.
-
-	The blur parameter specifies the spread, or dispersion, of the shadow. Zero
-	produces a sharp shadow, one or two produces a normal shadow, and	three or four
-	produces a softer shadow. Higher values increase the processing load.
-
-	The opacity parameter	should be a decimal value, usually less than one. You can
-	use a value	higher than one in special situations, e.g. with extreme blurring.
-
-	Color is specified in the usual manner, with a color name or hex value. The
-	color parameter	does not apply with transparent images.
-
-	The swap parameter reverses the stacking order of the original and the shadow.
-	This can be used for special effects, like an embossed or engraved look.
-
-	EXPLANATION:
-
-	This jQuery plug-in adds soft drop shadows behind page elements. It is only
-	intended for adding a few drop shadows to mostly stationary objects, like a
-	page heading, a photo, or content containers.
-
-	The shadows it creates are not bound to the original elements, so they won't
-	move or change size automatically if the original elements change. A window
-	resize event listener is assigned, which should re-align the shadows in many
-	cases, but if the elements otherwise move or resize you will have to handle
-	those events manually. Shadows can be redrawn with the redrawShadow() method
-	or removed with the removeShadow() method. The redrawShadow() method uses the
-	same options used to create the original shadow. If you want to change the
-	options, you should remove the shadow first and then create a new shadow.
-
-	The dropShadow method returns a jQuery collection of the new shadow(s). If
-	further manipulation is required, you can store it in a variable like this:
-
-		var myShadow = $("#myElement").dropShadow();
-
-	You can also read the ID of the shadow from the original element at a later
-	time. To get a shadow's ID, either read the shadowId attribute of the
-	original element or call the shadowId() method. For example:
-
-		var myShadowId = $("#myElement").attr("shadowId");  or
-		var myShadowId = $("#myElement").shadowId();
-
-	If the original element does not already have an ID assigned, a random ID will
-	be generated for the shadow. However, if the original does have an ID, the
-	shadow's ID will be the original ID and "_dropShadow". For example, if the
-	element's ID is "myElement", the shadow's ID would be "myElement_dropShadow".
-
-	If you have a long piece of text and the user resizes the	window so that the
-	text wraps or unwraps, the shape of the text changes and the words are no
-	longer in the same positions. In that case, you can either preset the height
-	and width, so that it becomes a fixed box, or you can shadow each word
-	separately, like this:
-
-		<h1><span>Your</span> <span>Page</span> <span>Title</span></h1>
-
-		$("h1 span").dropShadow();
-
-	The dropShadow method attempts to determine whether the selected elements have
-	transparent backgrounds. If you want to shadow the content inside an element,
-	like text or a transparent image, it must not have a background-color or
-	background-image style. If the element has a solid background it will create a
-	rectangular	shadow around the outside box.
-
-	The shadow elements are positioned absolutely one layer below the original
-	element, which is positioned relatively (unless it's already absolute).
-
-	*** All shadows have the "dropShadow" class, for selecting with CSS or jQuery.
-
-	ISSUES:
-
-		1)	Limited styling of shadowed elements by ID. Because IDs must be unique,
-				and the shadows have their own ID, styles applied by ID won't transfer
-				to the shadows. Instead, style elements by class or use inline styles.
-		2)	Sometimes shadows don't align properly. Elements may need to be wrapped
-				in container elements, margins or floats changed, etc. or you may just
-				have to tweak the left and top offsets to get them to align. For example,
-				with draggable objects, you have to wrap them inside two divs. Make the
-				outer div draggable and set the inner div's position to relative. Then
-				you can create a shadow on the element inside the inner div.
-		3)	If the user changes font sizes it will throw the shadows off. Browsers
-				do not expose an event for font size changes. The only known way to
-				detect a user font size change is to embed an invisible text element and
-				then continuously poll for changes in size.
-		4)	Safari support is shaky, and may require even more tweaks/wrappers, etc.
-
-		The bottom line is that this is a gimick effect, not PFM, and if you push it
-		too hard or expect it to work in every possible situation on every browser,
-		you will be disappointed. Use it sparingly, and don't use it for anything
-		critical. Otherwise, have fun with it!
-
-	AUTHOR: Larry Stevens (McLars@eyebulb.com) This work is in the public domain,
-					and it is not supported in any way. Use it at your own risk.
-*/
-
-
-(function($){
-
-	var dropShadowZindex = 1;  //z-index counter
-
-	$.fn.dropShadow = function(options)
-	{
-		// Default options
-		var opt = $.extend({
-			left: 4,
-			top: 4,
-			blur: 2,
-			opacity: .5,
-			color: "black",
-			swap: false
-			}, options);
-		var jShadows = $([]);  //empty jQuery collection
-
-		// Loop through original elements
-		this.not(".dropShadow").each(function()
-		{
-			var jthis = $(this);
-			var shadows = [];
-			var blur = (opt.blur <= 0) ? 0 : opt.blur;
-			var opacity = (blur == 0) ? opt.opacity : opt.opacity / (blur * 8);
-			var zOriginal = (opt.swap) ? dropShadowZindex : dropShadowZindex + 1;
-			var zShadow = (opt.swap) ? dropShadowZindex + 1 : dropShadowZindex;
-
-			// Create ID for shadow
-			var shadowId;
-			if (this.id) {
-				shadowId = this.id + "_dropShadow";
-			}
-			else {
-				shadowId = "ds" + (1 + Math.floor(9999 * Math.random()));
-			}
-
-			// Modify original element
-			$.data(this, "shadowId", shadowId); //store id in expando
-			$.data(this, "shadowOptions", options); //store options in expando
-			jthis
-				.attr("shadowId", shadowId)
-				.css("zIndex", zOriginal);
-			if (jthis.css("position") != "absolute") {
-				jthis.css({
-					position: "relative",
-					zoom: 1 //for IE layout
-				});
-			}
-
-			// Create first shadow layer
-			bgColor = jthis.css("backgroundColor");
-			if (bgColor == "rgba(0, 0, 0, 0)") bgColor = "transparent";  //Safari
-			if (bgColor != "transparent" || jthis.css("backgroundImage") != "none"
-					|| this.nodeName == "SELECT"
-					|| this.nodeName == "INPUT"
-					|| this.nodeName == "TEXTAREA") {
-				shadows[0] = $("<div></div>")
-					.css("background", opt.color);
-			}
-			else {
-				shadows[0] = jthis
-					.clone()
-					.removeAttr("id")
-					.removeAttr("name")
-					.removeAttr("shadowId")
-					.css("color", opt.color);
-			}
-			shadows[0]
-				.addClass("dropShadow")
-				.css({
-					height: jthis.outerHeight(),
-					left: blur,
-					opacity: opacity,
-					position: "absolute",
-					top: blur,
-					width: jthis.outerWidth(),
-					zIndex: zShadow
-				});
-
-			// Create other shadow layers
-			var layers = (8 * blur) + 1;
-			for (i = 1; i < layers; i++) {
-				shadows[i] = shadows[0].clone();
-			}
-
-			// Position layers
-			var i = 1;
-			var j = blur;
-			while (j > 0) {
-				shadows[i].css({left: j * 2, top: 0});           //top
-				shadows[i + 1].css({left: j * 4, top: j * 2});   //right
-				shadows[i + 2].css({left: j * 2, top: j * 4});   //bottom
-				shadows[i + 3].css({left: 0, top: j * 2});       //left
-				shadows[i + 4].css({left: j * 3, top: j});       //top-right
-				shadows[i + 5].css({left: j * 3, top: j * 3});   //bottom-right
-				shadows[i + 6].css({left: j, top: j * 3});       //bottom-left
-				shadows[i + 7].css({left: j, top: j});           //top-left
-				i += 8;
-				j--;
-			}
-
-			// Create container
-			var divShadow = $("<div></div>")
-				.attr("id", shadowId)
-				.addClass("dropShadow")
-				.css({
-					left: jthis.position().left + opt.left - blur,
-					marginTop: jthis.css("marginTop"),
-					marginRight: jthis.css("marginRight"),
-					marginBottom: jthis.css("marginBottom"),
-					marginLeft: jthis.css("marginLeft"),
-					position: "absolute",
-					top: jthis.position().top + opt.top - blur,
-					zIndex: zShadow
-				});
-
-			// Add layers to container
-			for (i = 0; i < layers; i++) {
-				divShadow.append(shadows[i]);
-			}
-
-			// Add container to DOM
-			jthis.after(divShadow);
-
-			// Add shadow to return set
-			jShadows = jShadows.add(divShadow);
-
-			// Re-align shadow on window resize
-			$(window).resize(function()
-			{
-				try {
-					divShadow.css({
-						left: jthis.position().left + opt.left - blur,
-						top: jthis.position().top + opt.top - blur
-					});
-				}
-				catch(e){}
-			});
-
-			// Increment z-index counter
-			dropShadowZindex += 2;
-
-		});  //end each
-
-		return this.pushStack(jShadows);
-	};
-
-
-	$.fn.redrawShadow = function()
-	{
-		// Remove existing shadows
-		this.removeShadow();
-
-		// Draw new shadows
-		return this.each(function()
-		{
-			var shadowOptions = $.data(this, "shadowOptions");
-			$(this).dropShadow(shadowOptions);
-		});
-	};
-
-
-	$.fn.removeShadow = function()
-	{
-		return this.each(function()
-		{
-			var shadowId = $(this).shadowId();
-			$("div#" + shadowId).remove();
-		});
-	};
-
-
-	$.fn.shadowId = function()
-	{
-		return $.data(this[0], "shadowId");
-	};
-
-
-	$(function()
-	{
-		// Suppress printing of shadows
-		var noPrint = "<style type='text/css' media='print'>";
-		noPrint += ".dropShadow{visibility:hidden;}</style>";
-		$("head").append(noPrint);
-	});
-
-})(jQuery);
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index daa6dd70..1e09fd9f 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -47,9 +47,6 @@ $(document).ready(function(){
   $(".gAvailable .gBlock").addClass("ui-corner-all");
   $(".gUnavailable").addClass("ui-corner-all");
 
-  // Add drop shadows
-  $(".gSelected").dropShadow();
-
   // Add hover state for buttons
   $(".ui-state-default").hover(
     function() {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 5eb30bde..7cf4cfbe 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -308,7 +308,6 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: #f00;
   background-image: url('../images/ico-error.png');
 }
 
diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
deleted file mode 100644
index 040a4062..00000000
--- a/themes/default/views/footer.html.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->footer() ?>
-<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
-<?= $footer_text ?>
-<? endif ?>
-
-<? if (module::get_var("gallery", "show_credits")): ?>
-<ul id="gCredits">
-  <?= $theme->credits() ?>
-</ul>
-<? endif ?>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
deleted file mode 100644
index dcfa6fd8..00000000
--- a/themes/default/views/header.html.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gBanner">
-  <?= $theme->header_top() ?>
-  <? if ($header_text = module::get_var("gallery", "header_text")): ?>
-  <?= $header_text ?>
-  <? else: ?>
-  <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
-    <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
-  </a>
-  <? endif ?>
-  <div id="gSiteMenu">
-  <?= $theme->site_menu() ?>
-  </div>
-  <?= $theme->header_bottom() ?>
-</div>
-
-<? if (!empty($parents)): ?>
-<ul class="gBreadcrumbs">
-  <? foreach ($parents as $parent): ?>
-  <li>
-    <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-      <?= html::purify($parent->title) ?>
-    </a>
-  </li>
-  <? endforeach ?>
-  <li class="active"><?= html::purify($item->title) ?></li>
-</ul>
-<? endif ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 2696442b..7d181ea0 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -76,7 +76,33 @@
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
       <div id="gHeader">
-        <?= new View("header.html") ?>
+        <div id="gBanner">
+          <?= $theme->header_top() ?>
+          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
+          <?= $header_text ?>
+          <? else: ?>
+          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+          </a>
+          <? endif ?>
+          <div id="gSiteMenu">
+          <?= $theme->site_menu() ?>
+          </div>
+          <?= $theme->header_bottom() ?>
+        </div>
+
+        <? if (!empty($parents)): ?>
+        <ul class="gBreadcrumbs">
+          <? foreach ($parents as $parent): ?>
+          <li>
+            <a href="<?= url::site("albums/{$parent->id}?show={$theme->item()->id}") ?>">
+              <?= html::purify($parent->title) ?>
+            </a>
+          </li>
+          <? endforeach ?>
+          <li class="active"><?= html::purify($theme->item()->title) ?></li>
+        </ul>
+        <? endif ?>
       </div>
       <div id="bd">
         <div id="yui-main">
@@ -94,7 +120,16 @@
         </div>
       </div>
       <div id="gFooter">
-        <?= new View("footer.html") ?>
+        <?= $theme->footer() ?>
+        <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
+        <?= $footer_text ?>
+        <? endif ?>
+
+        <? if (module::get_var("gallery", "show_credits")): ?>
+        <ul id="gCredits">
+          <?= $theme->credits() ?>
+        </ul>
+        <? endif ?>
       </div>
     </div>
     <?= $theme->page_bottom() ?>