From 6514fd962f7f1afa56d1ddd18dd400973b88a3ff Mon Sep 17 00:00:00 2001
From: Gregory Koberger <gkoberger@mozilla.com>
Date: Wed, 1 Sep 2010 14:50:21 -0700
Subject: [PATCH] Clean up Icon Upload for collections (bug 592581)

---
 .../templates/bandwagon/includes/addedit.html | 21 +++++++++++--------
 media/css/zamboni/zamboni.css                 | 13 ++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/apps/bandwagon/templates/bandwagon/includes/addedit.html b/apps/bandwagon/templates/bandwagon/includes/addedit.html
index 0e538abacec..dec6df76560 100644
--- a/apps/bandwagon/templates/bandwagon/includes/addedit.html
+++ b/apps/bandwagon/templates/bandwagon/includes/addedit.html
@@ -24,18 +24,21 @@ <h3>{{ _('Collection Description') }}</h3>
   </p>
   <label>{{ form.listed.label }}</label>
   {{ form.listed|safe }}
-  <p>
+
+  <br />
+  <label>{{ form.icon.label|safe }}</label> {{ _('(optional)') }}
+
+
+  <div id="icon_upload">
     {% if collection %}
-    <img src="{{ collection.icon_url }}">
+      <img src="{{ collection.icon_url }}" class="icon_preview" />
     {% endif %}
-
     {{ form.errors['icon']|safe }}
-    {{ form.icon.label|safe }} {{ _('(optional)') }}
     {{ form.icon|safe }}
-  </p>
-  <p>
-  {{ _('PNG and JPG supported.  Image will be resized to 32x32.') }}
-  </p>
-</fieldset>
+    <p class="note">
+    {{ _('PNG and JPG supported.  Image will be resized to 32x32.') }}
+    </p>
+  </div>
+  </fieldset>
 
 
diff --git a/media/css/zamboni/zamboni.css b/media/css/zamboni/zamboni.css
index bd623fdd0ef..0525330f97d 100644
--- a/media/css/zamboni/zamboni.css
+++ b/media/css/zamboni/zamboni.css
@@ -2527,6 +2527,19 @@ label > .optional {
     width: 100%;
 }
 
+#icon_upload {
+  overflow:auto;
+  padding-top:5px;
+}
+
+#icon_upload .icon_preview  {
+  -moz-border-radius:5px 5px 5px 5px;
+  border:1px solid #C1E0EA;
+  float:left;
+  margin-right:10px;
+  padding:8px;
+}
+
 #ajax_collections_list {
     margin: 0 0 .5em 0;
 }