From fab5aceeaee89dae4a1045cba10cbdce341b8cbe Mon Sep 17 00:00:00 2001
From: Matt Claypotch <thepotch@gmail.com>
Date: Thu, 12 Aug 2010 15:27:10 -0700
Subject: [PATCH] Bug 574291, collection detail pages styling

---
 apps/access/helpers.py                        |   2 +-
 apps/bandwagon/models.py                      |  10 +-
 .../templates/bandwagon/ajax_new.html         |   2 +-
 .../templates/bandwagon/barometer.html        |   3 +-
 .../bandwagon/collection_detail.html          |  99 +++++++++------
 apps/bandwagon/views.py                       |   1 -
 media/css/main.css                            |  28 +++--
 media/css/zamboni/zamboni.css                 | 116 +++++++++++++++++-
 media/img/zamboni/icons/collections.png       | Bin 0 -> 8878 bytes
 9 files changed, 205 insertions(+), 56 deletions(-)
 create mode 100644 media/img/zamboni/icons/collections.png

diff --git a/apps/access/helpers.py b/apps/access/helpers.py
index ee7a4bd8b7..9161bd31cf 100644
--- a/apps/access/helpers.py
+++ b/apps/access/helpers.py
@@ -6,6 +6,6 @@ import acl
 
 @register.function
 @jinja2.contextfunction
-def check_ownership(context, object, require_owner):
+def check_ownership(context, object, require_owner=False):
     return acl.check_ownership(context['request'], object,
                                require_owner=require_owner)
diff --git a/apps/bandwagon/models.py b/apps/bandwagon/models.py
index 60f5b30535..d81f215fe2 100644
--- a/apps/bandwagon/models.py
+++ b/apps/bandwagon/models.py
@@ -140,6 +140,14 @@ class Collection(amo.models.ModelBase):
         return reverse('collections.vote',
                        args=[self.author_nickname, self.slug, 'down'])
 
+    def edit_url(self):
+        return reverse('collections.edit',
+                       args=[self.author_nickname, self.slug])
+
+    def delete_url(self):
+        return reverse('collections.delete',
+                       args=[self.author_nickname, self.slug])
+
     @property
     def author_nickname(self):
         return self.author.nickname if self.author else 'anonymous'
@@ -236,7 +244,7 @@ class Collection(amo.models.ModelBase):
 
     @caching.cached_method
     def publishable_by(self, user):
-        return bool(self.users.filter(pk=user.id))
+        return bool(self.owned_by(user) or self.users.filter(pk=user.id))
 
     @staticmethod
     def transformer(collections):
diff --git a/apps/bandwagon/templates/bandwagon/ajax_new.html b/apps/bandwagon/templates/bandwagon/ajax_new.html
index 1cd65e7270..2629dac1e8 100644
--- a/apps/bandwagon/templates/bandwagon/ajax_new.html
+++ b/apps/bandwagon/templates/bandwagon/ajax_new.html
@@ -1,4 +1,4 @@
-<div id="collections-new">
+<div id="collections-new" class='collections-details'>
   <h3>{{ _('Start a New Collection') }}</h3>
 
   <form>
diff --git a/apps/bandwagon/templates/bandwagon/barometer.html b/apps/bandwagon/templates/bandwagon/barometer.html
index 88aec844cc..a4d1ca4d2e 100644
--- a/apps/bandwagon/templates/bandwagon/barometer.html
+++ b/apps/bandwagon/templates/bandwagon/barometer.html
@@ -3,13 +3,12 @@
     <input class="{{ up_class }}" value="{{ c.upvotes }}" type="submit"
            title="{{ up_title }}"/>
   </form>
-
   <form method="post" class="downvote" action="{{ down_action }}">
     <input class="{{ down_class }}" value="{{ c.downvotes }}" type="submit"
            title="{{ down_title }}">
   </form>
-  {# L10n: Link to remove a collection vote #}
   <a class="{{ cancel_class }}" href="#" title="{{ cancel_title }}">{{ _('Remove') }}</a>
+  {# L10n: Link to remove a collection vote #}
   {% if user.is_anonymous() %}
     <div class="collection-rate-dropdown install-note">
       <div class="collection-rate-login">
diff --git a/apps/bandwagon/templates/bandwagon/collection_detail.html b/apps/bandwagon/templates/bandwagon/collection_detail.html
index 030bed5407..d11b4236f3 100644
--- a/apps/bandwagon/templates/bandwagon/collection_detail.html
+++ b/apps/bandwagon/templates/bandwagon/collection_detail.html
@@ -7,8 +7,6 @@
 {% block bodyclass %}inverse{% endblock %}
 
 {% block content %}
-<div class="primary">
-<header>
   {% with crumbs = [(url('collections.list'), _('Collections')), (None, c.name)] %}
     {% if c.author %}
       {% do crumbs.insert(1, (url('collections.user', c.author.nickname), c.author.display_name)) %}
@@ -24,15 +22,14 @@
       {% endif %}
     </h2>
     {% if collection.author %}
-    <h4 class="author">
+    <h4 class='author'>
       {% trans users=users_list([collection.author]) %}
         by {{ users }}
       {% endtrans %}
     </h4>
     {% endif %}
   </hgroup>
-</header>
-
+<div class="primary">
 <div class="featured">
   <div class="featured-inner object-lead">
     <div class="meta">
@@ -40,10 +37,10 @@
         <li>{{ barometer(collection) }}</li>
         <li class="followers">
           {% trans p=c.subscribers, num=c.subscribers|numberfmt %}
-            {{ num }} follower {% pluralize %} {{ num }} followers
+            <span>{{ num }}</span> follower {% pluralize %} <span>{{ num }}</span> followers
           {% endtrans %}
         </li>
-        <li>{{ _('Updated {0}')|f(c.modified) }}</li>
+        <li>{{ _('Updated {0}')|f(c.modified|datetime) }}</li>
         {% if perms.view_stats %}
         <li>
           <a href="{{ remora_url('/statistics/collection/' + c.uuid) }}">
@@ -52,42 +49,62 @@
         {% endif %}
       </ul>
     </div>
-    <h3>{{ _('About this Collection') }}</h3>
-    {% if c.description %}
-      <p>{{ c.description }}</p>
-    {% elif c.type == amo.COLLECTION_MOBILE %}
-      <p>{{ _('Add-ons synced to my Mobile Firefox using the Add-on Collector') }}</p>
-    {% endif %}
+    <div class='object-details'>
+      <h3>{{ _('About this Collection') }}</h3>
+      {% if c.description %}
+        <p>{{ c.description }}</p>
+      {% elif c.type == amo.COLLECTION_MOBILE %}
+        <p>{{ _('Add-ons synced to my Mobile Firefox using the Add-on Collector') }}</p>
+      {% endif %}
+      <p class="highlight collection-admin">
+        {{ _('More Options:') }}
+        {% if c.publishable_by(user) %}
+          <a class="edit" href="{{ c.edit_url() }}">{{ _('Edit Collection') }}</a>
+          {% if collection.owned_by(user) %}
+            <a class="delete" href="{{ c.delete_url() }}">{{ _('Delete Collection') }}</a>
+          {% endif %}
+        {% endif %}
+      </p>
+    </div>
   </div>
 </div>
 
-<div class="separated-listing">
-  <h3>
-    {% trans num=addons.paginator.count %}
-      {{ num }} Add-on in this Collection
-    {% pluralize %}
-      {{ num }} Add-ons in this Collection
-    {% endtrans %}
-  </h3>
-  <form class="item-sort go" action="">
-    <label for="sortby">{{ _('Sort by:') }}</label>
-    <select id="sortby" name="{{ filter.key }}">
-      {% for value, title in filter.opts %}
-      <option value="{{ value }}" {{ value|ifeq(filter.field, 'selected') }}>
-        {{ title }}</option>
-      {% endfor %}
-    </select>
-    <button type="submit">{{ _('Go') }}</button>
-  </form>
-  {% cache addons.object_list %}
-    {% if c.all_personas %}
+{% cache addons.object_list %}
+  {% if c.all_personas %}
+    <div class='collections-personas'>
+      <h3>
+        {% trans num=addons.paginator.count %}
+          {{ num }} Persona in this Collection
+        {% pluralize %}
+          {{ num }} Personas in this Collection
+        {% endtrans %}
+      </h3>
       {{ persona_grid(addons.object_list) }}
-    {% else %}
+    </div>
+  {% else %}
+    <div class="separated-listing">
+      <h3>
+        {% trans num=addons.paginator.count %}
+          {{ num }} Add-on in this Collection
+        {% pluralize %}
+          {{ num }} Add-ons in this Collection
+        {% endtrans %}
+      </h3>
+      <form class="item-sort go" action="">
+        <label for="sortby">{{ _('Sort by:') }}</label>
+        <select id="sortby" name="{{ filter.key }}">
+          {% for value, title in filter.opts %}
+          <option value="{{ value }}" {{ value|ifeq(filter.field, 'selected') }}>
+            {{ title }}</option>
+          {% endfor %}
+        </select>
+        <button type="submit">{{ _('Go') }}</button>
+      </form>
       {{ addon_listing_items(addons.object_list, notes=notes.next()) }}
-    {% endif %}
-    {{ addons|paginator }}
-  {% endcache %}
-</div>
+    </div>
+  {% endif %}
+  {{ addons|paginator }}
+{% endcache %}
 </div> {# primary #}
 
 <div class="secondary">
@@ -117,10 +134,12 @@
 {% if author_collections %}
   <div>
     <h3>{{ _('More by this User') }}</h3>
+    <ul class="addon-collections">
     {% for ac in author_collections %}
-      <a class="collectionitem" href="{{ ac.get_url_path() }}">
-        {{ ac.name }}</a>
+      <li><a class="collectionitem" href="{{ ac.get_url_path() }}">
+        {{ ac.name }}</a></li>
     {% endfor %}
+    </ul>
     <a class="more-info" href="{{ url('collections.user', c.author.nickname) }}">
       {{ _('See all collections by this user') }}</a>
   </div>
diff --git a/apps/bandwagon/views.py b/apps/bandwagon/views.py
index 8a7478c66f..623b45a791 100644
--- a/apps/bandwagon/views.py
+++ b/apps/bandwagon/views.py
@@ -230,7 +230,6 @@ def ajax_new(request):
 
         if form.is_valid():
             collection = form.save()
-            CollectionUser(collection=collection, user=request.amo_user).save()
             addon_id = request.REQUEST['addon_id']
             a = Addon.objects.get(pk=addon_id)
             collection.add_addon(a)
diff --git a/media/css/main.css b/media/css/main.css
index b0f153670b..b7aaaf855a 100644
--- a/media/css/main.css
+++ b/media/css/main.css
@@ -420,7 +420,8 @@ input.placeholder {
 }
 
 textarea {
-    width: 99%;
+    width: 100%;
+    -moz-box-sizing: border-box;
     display: block;
 }
 
@@ -3052,10 +3053,6 @@ ol.pagination + .num-results {
     float: right;
 }
 
-.separated-listing .item h3 {
-    float: none;
-}
-
 .separated-listing form.item-sort {
     float: right;
     margin-top: -0.2em;
@@ -3065,8 +3062,12 @@ ol.pagination + .num-results {
     float: left;
 }
 
+.separated-listing .item img.icon {
+    overflow: hidden;
+}
+
 .separated-listing .item .item-info {
-    border: none;
+    border-left: 1px dashed #b4dfee;
     margin-bottom: 2em;
 }
 
@@ -3078,9 +3079,18 @@ ol.pagination + .num-results {
     margin: 0;
 }
 
+.separated-listing .item .persona-inner {
+    padding: 0;
+}
+
+.separated-listing .item .persona-large .persona-preview [data-browsertheme] {
+    height: 72px;
+}
+
 .separated-listing blockquote {
     margin-right: 11em;
     clear: left;
+    overflow-x:hidden;
 }
 
 .separated-listing .item h4 {
@@ -3113,9 +3123,9 @@ ol.pagination + .num-results {
 .separated-listing .item {
     border: 1px solid #C9E8F3;
     margin: 0 0 1em 0;
-    -moz-border-radius:3px;
-    -webkit-border-radius: 3px;
-    border-radius:3px;
+    -moz-border-radius:8px;
+    -webkit-border-radius: 8px;
+    border-radius:8px;
 }
 
 .listing .item {
diff --git a/media/css/zamboni/zamboni.css b/media/css/zamboni/zamboni.css
index 20c3b5ce5d..9114f5165b 100644
--- a/media/css/zamboni/zamboni.css
+++ b/media/css/zamboni/zamboni.css
@@ -9,6 +9,7 @@
 .article.version:after,
 .article.review:after,
 .grouped_ratings li:after,
+.bars:after,
 #review-form p:after {
     content: ".";
     display: block;
@@ -32,7 +33,6 @@ li.usertag {
 }
 
 header {
-    margin: 0 1em;
     display: block;
 }
 
@@ -2464,3 +2464,117 @@ h6.author, .author a {
 .collections-contributors tr:hover a {
     display: inline;
 }
+
+.collections-personas .personas-grid {
+    border: 1px solid #C9E8F3;
+    padding: 1em;
+    margin: 0 0 1em 0;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    border-radius :8px;
+    background-color: #ffffff;
+    clear:both;
+}
+
+.featured div.meta {
+    margin-top: 0;
+}
+
+.meta li {
+    line-height: 2em;
+}
+
+.followers {
+    color: #37a632;
+}
+.followers span {
+    font-weight: bold;
+}
+
+.listing-footer .delete {
+    float: right;
+    color: red;
+}
+
+.tab-wrapper .content {
+    margin: 1em;
+}
+
+.tab-wrapper .listing-footer {
+    padding-top: .5em;
+    z-index: 0;
+}
+
+table#addons-list, table#contributors-list {
+    width: 100%;
+}
+#addons-list .comments {
+    display: none;
+}
+#addons-list tr {
+    border-top: 1px dotted #A5BFCE;
+}
+#addons-list tr:hover,
+.ui-state-hover {
+    background-color: #e4f5fb;
+}
+#addons-list td, #addons-list h3 {
+    line-height: 36px;
+    margin: 0;
+    padding: 0;
+}
+#addons-list img {
+    float: left;
+    margin: 2px 1em 0 0;
+}
+.ui-autocomplete {
+    background-color: #fff;
+    border: 1px solid black;
+    width: 300px;
+    z-index: 11;
+}
+.ui-autocomplete a {
+    display: block;
+    line-height: 32px;
+}
+#addons-list a.remove,
+#addons-list a.comment,
+#contributors-list a.remove {
+    cursor: pointer;
+    display: block;
+    width: 16px;
+    height: 16px;
+    margin: 10px;
+    text-indent: -9000px;
+    background-repeat: no-repeat;
+    background-image: url(../../img/zamboni/icons/collections.png);
+}
+#addons-list a.remove,
+#contributors-list a.remove {
+    background-position: 0 -250px;
+}
+#addons-list a.remove:hover,
+#contributors-list a.remove:hover,
+.collection-admin a.delete {
+    background-position: 0 -200px;
+}
+#addons-list a.comment {
+    background-position: 0 -800px;
+}
+
+.collection-admin {
+    font-weight: bold;
+    padding: .5em 1em;
+    margin-bottom: 0;
+    display: inline-block;
+}
+.collection-admin a {
+    background-repeat: no-repeat;
+    background-image: url(../../img/zamboni/icons/collections.png);
+    margin-left: 1em;
+    white-space: nowrap;
+    padding-left: 22px;
+}
+.collection-admin a.edit {
+    background-position: 0 -300px;
+}
diff --git a/media/img/zamboni/icons/collections.png b/media/img/zamboni/icons/collections.png
new file mode 100644
index 0000000000000000000000000000000000000000..c23dd0a1b15361963ae410e96086e01a9ed01465
GIT binary patch
literal 8878
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
R1OF%i$x6Z`3f~y||38}Ed8q&Z

literal 0
HcmV?d00001