From b87600e92cb79f12fd4ed5f04fda3a1920562e52 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Mon, 16 Nov 2009 21:53:40 -0500
Subject: [PATCH] admin ui cleanup

---
 classes/ComicPressAdmin.inc                   |   1 +
 .../_comic-image-ordering-sorters.inc         |   7 +----
 css/cp-admin.css                              |  28 +++++++++++++-----
 images/comicpress-icon.png                    | Bin 0 -> 905 bytes
 js/ComicImageOrdering.js                      |   2 +-
 js/MediaUpload.js                             |   8 ++---
 6 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 images/comicpress-icon.png

diff --git a/classes/ComicPressAdmin.inc b/classes/ComicPressAdmin.inc
index 08c82c3..6c11dca 100644
--- a/classes/ComicPressAdmin.inc
+++ b/classes/ComicPressAdmin.inc
@@ -83,6 +83,7 @@ class ComicPressAdmin {
 		}
 
 		if (strpos($pagenow, "-upload") !== false) {
+			wp_enqueue_style('cp-admin', plugin_dir_url(dirname(__FILE__)) . '/css/cp-admin.css');
 			wp_enqueue_script('cp-media', plugin_dir_url(dirname(__FILE__)) . '/js/MediaUpload.js', array('prototype'));
 		}
 	}
diff --git a/classes/partials/_comic-image-ordering-sorters.inc b/classes/partials/_comic-image-ordering-sorters.inc
index ea95c01..336ec04 100644
--- a/classes/partials/_comic-image-ordering-sorters.inc
+++ b/classes/partials/_comic-image-ordering-sorters.inc
@@ -27,13 +27,8 @@
 							<?php if (isset($info['file'])) { ?>
 								<p><strong><?php echo esc_html($result->source_name) ?>:</strong> <?php echo esc_html(basename($info['file'])) ?></p>
 							<?php } ?>
-							<?php if (isset($info['width']) && isset($info['height'])) { ?>
-								<p>
-									<strong><?php _e('Size:', 'comicpress') ?></strong>
-									<?php echo esc_html(sprintf('%dx%d', $info['width'], $info['height'])) ?>
-								</p>
-							<?php } ?>
 							<?php	if (count($comicpress->comicpress_options['image_types']) > 1) { ?>
+
 								<a class="comic-ordering-show-associations" href="#"><?php _e('Edit associations', 'comicpress') ?></a>
 								<div class="comic-ordering-associations">
 									<ul>
diff --git a/css/cp-admin.css b/css/cp-admin.css
index acc068a..0fb35da 100644
--- a/css/cp-admin.css
+++ b/css/cp-admin.css
@@ -68,9 +68,11 @@
 .cp-comic-attachment {
   cursor: move;
   background-color: #ffd7d7;
-  margin-bottom: 10px;
-  border-bottom: solid #aaa 1px;
-  padding-bottom: 10px
+  padding: 10px;
+  border: solid #DFDFDF 1px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  margin-bottom: 10px
 }
 
 .enabled {
@@ -129,11 +131,11 @@
 
 .comic-ordering-associations {
 	border: solid #aaa 1px;
-	padding: 5px;
-	width: 100%
+	padding: 0.25em;
 }
 
-.comicpress-admin h3 {
+.comicpress-admin h3,
+.comic-ordering-show-associations {
 	border: solid #464646 1px;
 	padding: 0.25em;
 	background: #6D6D6D;
@@ -145,11 +147,23 @@
 	-moz-border-radius-topright: 5px;
 	margin-bottom: 0;
 	cursor: hand;
-	cursor: pointer
+	cursor: pointer;
+	display: block;
+	text-decoration: none;
+	font-size: 13px;
+	font-weight: bold;
 }
 
 .comicpress-holder {
 	border: solid #464646 1px;
 	border-top: none;
 	padding: 0.5em
+}
+
+.comicpress-is-managing {
+	width: 16px;
+	height: 36px;
+	background: url(../images/comicpress-icon.png) left center no-repeat;
+	float: right;
+	display: inline
 }
\ No newline at end of file
diff --git a/images/comicpress-icon.png b/images/comicpress-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a838003714237c5f6bd9651d8235d4c9abb34a14
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RU0SW^n0{Pj7hX4Qr8%ab#R5;6}
zlih1ubsWY&zjM+gZTgZXwpvb{b!9DS+G(fEi@{1-sVFF;VQd$|kTI!q7ybjY;BH0P
zpo1dnrdRa^5%j{BE)LnCETE94S)F#V=A`LMlBP9DljfYS7p=v6pZn+GdEoOX01;7u
z6EJ`m(uqW5J{ld&o2DPYXBfGGa5x?ag}wy715BW%loGXXZUlzRWb&Oau3QP*mZd_&
z!*q0a1F)V-k+^*uUDqXY`Et|<2HysL0V+yFT)?yO+1U?2o1E+$o0!077-+hV(lh|X
zwh`N=kje1<^fad@Cl?1sM$Q8<B_fB-Wb%WlbLU3JUcZ2+-AB7&;0pw>EepF|2c@VK
zi?}=<mSXq#_S!WrethGW5e!~XBJ#%jXU<F+Pd=f#j`R{7eV)d)HWs6|*vw`T%c8;U
z=FqWY9C~_)yPw=7b3aKYwJdMV%)IGHClZmh`wOb4w}->WkK+pjnEUi5nM9o3Y83>O
zrcwNB84W0JtU;wrHknZAL?Ystk46VwyE`;BHPY1|BL8p+Gd9QeY8DaUUsbXu_X->A
zRw`_*WRUeN^U>&_BX631m0QK_a-!)v#XpxQrT(B=$n#%`ZL|F#$<AhhaxRB%+2l>r
z?*Q;P6dq3#0JZ!ErNw!w#R5ucfM8oTV$}iAfMyLG`@s&MVdPA!-dRnj0BC)z3vaWV
zQn8NM`x6w<z+Rx*Yg4Q30j3Rv!|}~(o$a}wsH~*veCinj{r&h_8u2<6-UjeG75?T%
zjJ_j09t_g%(%BZBfp9pkzc)4IiN}6@spYqr(hBQzgkQvebO<pY;;iq`<aW~B?xo}C
z5Z$NFQo8#iJLMAf;Zrhp>C(FgAWe^*9C`VXI=<&l()sE|+`WVBq*Lr}tRj^%yUV|`
z{`p6g*H-xE?^Y&$`1t^&1C+md?QGvGt=ss0ZRl-&wB{D1R>Lahu(vkJZ<YDF<YoNE
z%;Mna=y@Q9h#(?OB61?VurPZyGHzdgRF^wFN|r*JEQK_=)1%~ir!H3`<92#sVOB&=
f?0ZoE_s;(SMc<NV^Q{WH00000NkvXXu0mjfzL&F8

literal 0
HcmV?d00001

diff --git a/js/ComicImageOrdering.js b/js/ComicImageOrdering.js
index 3d3858e..6a25d9a 100644
--- a/js/ComicImageOrdering.js
+++ b/js/ComicImageOrdering.js
@@ -111,7 +111,7 @@ ComicImageOrdering.setup = function() {
 
 			att.select('.comic-ordering-show-associations').pop().observe('click', function(e) {
 				Event.stop(e);
-				associations_box.toggle();
+				new Effect[associations_box.visible() ? 'BlindUp' : 'BlindDown'](associations_box, { duration: 0.25 });
 			});
 		});
 
diff --git a/js/MediaUpload.js b/js/MediaUpload.js
index 127f3df..2f0a8fd 100644
--- a/js/MediaUpload.js
+++ b/js/MediaUpload.js
@@ -10,13 +10,9 @@ Event.observe(window, 'load', function() {
       if (b) { b[(t.value == 'none') ? 'show' : 'hide'](); }
     }
 
-    item.select('input[name*=comic_image_type]').each(function(radio) {
-      radio.observe('click', function(e) { show_insert(radio); });
-    });
-    
-    var type = item.select('input[name*=comic_image_type][checked]').pop();
+    var type = item.select('input[name*=comicpress_management][checked]').pop();
     if (type) {
-      item.select('.filename.new').pop().insert({bottom: new Element('strong').update(type.parentNode.innerHTML.stripTags())});
+      item.select('.filename.new').pop().insert({bottom: new Element('div').addClassName('comicpress-is-managing')});
       show_insert(type);
     }
   });