Use jQuery UI close icon for full size close. Quote and code cleanup

2 files changed, 37 insertions, 29 deletions

diff --git a/core/images/ico-close.png b/core/images/ico-close.png
deleted file mode 100644
index a70e47d9..00000000
--- a/core/images/ico-close.png
+++ /dev/null
diff --git a/core/js/fullsize.js b/core/js/fullsize.js
index df5bcf19..f6b586ae 100644
--- a/core/js/fullsize.js
+++ b/core/js/fullsize.js
@@ -1,43 +1,48 @@
+/**
+ * @todo Move inline CSS out to external style sheet (theme style sheet)
+ */
 $(document).ready(function() {
   $("#gFullsizeLink").click(function() {
     var width = $(document).width();
     var height = $(document).height();
 
     $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
-		     'style="border-width: 0px; margin: 0px; padding: 0px; background: black ' +
-		     'none repeat scroll 0% 0%; position: absolute; top: 0px; left: 0px; ' +
-		     'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; '  +
-		     '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
-		     '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
+      'style="border: none; margin: 0; padding: 0; background: #000 ' +
+      'none repeat scroll 0% 0%; position: absolute; top: 0px; left: 0px; ' +
+      'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; '  +
+      '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
+      '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
 
     var image_size = _auto_fit(fullsize_detail.width, fullsize_detail.height);
 
-    $("body").append("<div id='gFullsize' class='ui-dialog ui-widget' " +
-		     "style='overflow: hidden; display: block; " +
-		     "position: absolute; z-index: 1002; outline-color: -moz-use-text-color; " +
-		     "outline-style: none; outline-width: 0px; " +
-		     "height: " + image_size.height + "px; " +
-		     "width: " + image_size.width + "px; " +
-		     "top: " + image_size.top + "px; left: " + image_size.left + "px;'>" +
-		     "<img id='gFullSizeImage' src='" + fullsize_detail.url + "'" +
-		     "height='" + image_size.height + "' width='" + image_size.width + "'/></div");
+    $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
+      'style="overflow: hidden; display: block; ' +
+      'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
+      'outline-style: none; outline-width: 0px; ' +
+      'height: ' + image_size.height + 'px; ' +
+      'width: ' + image_size.width + 'px; ' +
+      'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
+      '<img id="gFullSizeImage" src="' + fullsize_detail.url + '"' +
+      'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
 
-    $("#gFullsize").append("<div id='gFullsizeClose' style='z-index: 1003; position: absolute; right: 1em; top: 1em;'><img src='" + fullsize_detail.close + "' /></div>");
+    $("#gFullsize").append('<span id="gFullsizeClose" class="ui-icon ' +
+      'ui-icon-closethick ui-corner-all" style="z-index: 1003; position: absolute; ' +
+      'right: 1em; top: 1em;"></span>');
     $("#gFullsizeClose").click(function() {
       $("#gFullsizeOverlay*").remove();
       $("#gFullsize").remove();
     });
-			      $(window).resize(function() {
-						 $("#gFullsizeOverlay").width($(document).width());
-						 $("#gFullsizeOverlay").height($(document).height());
-						 image_size = _auto_fit(fullsize_detail.width, fullsize_detail.height);
-						 $("#gFullsize").height(image_size.height);
-						 $("#gFullsize").width(image_size.width);
-						 $("#gFullsize").css("top", image_size.top);
-						 $("#gFullsize").css("left", image_size.left);
-						 $("#gFullSizeImage").height(image_size.height);
-						 $("#gFullSizeImage").width(image_size.width);
-					       });
+    $(window).resize(function() {
+      $("#gFullsizeOverlay").width($(document).width());
+      $("#gFullsizeOverlay").height($(document).height());
+      image_size = _auto_fit(fullsize_detail.width, fullsize_detail.height);
+      $("#gFullsize").height(image_size.height);
+      $("#gFullsize").width(image_size.width);
+      $("#gFullsize").css("top", image_size.top);
+      $("#gFullsize").css("left", image_size.left);
+      $("#gFullSizeImage").height(image_size.height);
+      $("#gFullSizeImage").width(image_size.width);
+    });
   });
 });
 
@@ -64,7 +69,10 @@ function _auto_fit(imageWidth, imageHeight) {
   }
 
   // handle the case where the calculation is almost zero (2.14e-14)
-  return {top: ((windowHeight - imageHeight) / 2).toFixed(2),
-	  left: ((windowWidth - imageWidth) / 2).toFixed(2),
-	  width: imageWidth.toFixed(2), height: imageHeight.toFixed(2)};
+  return {
+    top: ((windowHeight - imageHeight) / 2).toFixed(2),
+    left: ((windowWidth - imageWidth) / 2).toFixed(2),
+    width: imageWidth.toFixed(2),
+    height: imageHeight.toFixed(2)
+    };
 }