Merge pull request #2932 from hoosteeno/master

[fix bug 1104115] Remove author's license and related UI
mdn · Dec 4, 2014 · 8c5200a · 8c5200a
2 parents 9493ae7 + dccc1a8
commit 8c5200a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/kuma/demos/__init__.py b/kuma/demos/__init__.py
@@ -625,12 +625,6 @@
         'link': _('http://creativecommons.org/publicdomain/zero/1.0/'),
         'icon': '',
     },
-    {
-        'name': "author",
-        'title': _("Author's"),
-        'link': '',
-        'icon': '',
-    },
 )))
 
 

diff --git a/kuma/demos/templates/demos/detail.html b/kuma/demos/templates/demos/detail.html
@@ -258,22 +258,17 @@ <h1>{{ ngettext('{comments_total} comment so far', '{comments_total} comments so
 
             <h3 class="mod-title">{{_('About this Demo')}}</h3>
 
-            {% if submission.license_name != 'author' %}
-                <p class="download"><a href="{{ url('demos_download', slug=submission.slug) }}">{% trans file_ksize=(submission.demo_package.size/1024)|round(2,'ceil')|e %}Download the Source <span class="note">{{file_ksize}} KB &middot; ZIP File</span>{% endtrans %}</a></p>
-                {% if submission.source_code_url %}
-                <p class="browse"><a href="{{ submission.source_code_url }}">Browse the Source
-                    {# TODO: Show "hosted by {{domain}}?" #}
-                    {% if false %}<span class="note">Hosted on GitHub</span>{% endif %}</a></p>
-                {% endif %}
+            <p class="download"><a href="{{ url('demos_download', slug=submission.slug) }}">{% trans file_ksize=(submission.demo_package.size/1024)|round(2,'ceil')|e %}Download the Source <span class="note">{{file_ksize}} KB &middot; ZIP File</span>{% endtrans %}</a></p>
+            {% if submission.source_code_url %}
+            <p class="browse"><a href="{{ submission.source_code_url }}">Browse the Source
+                {# TODO: Show "hosted by {{domain}}?" #}
+                {% if false %}<span class="note">Hosted on GitHub</span>{% endif %}</a></p>
             {% endif %}
             {% set license_class = submission.license_name %}
             <p class="license {{ license_class }}">
                 {% trans link=license_link(submission.license_name)|e, title=license_title(submission.license_name)|e %}
                     This demo is released under the <a href="{{link}}">{{title}}</a> license.
                 {% endtrans %}
-                {% if submission.license_name == 'author' %}
-                {% trans %}It includes proprietary software.{% endtrans %}
-                {% endif %}
             </p>
           </div>