Merge pull request #3350 from rtfd/better-tags

Try and get folks to put more tags.

Author: ericholscher

docs/contribute.rst

@@ -71,6 +71,7 @@ command will be run immediately and will inform you of the changes and errors.
 .. _Sprintable: https://github.com/rtfd/readthedocs.org/issues?q=is%3Aopen+is%3Aissue+label%3ASprintable
 .. _contribution-guide.org: http://www.contribution-guide.org/#submitting-bugs
 
+.. _pre-commit: https://github.com/pre-commit/pre-commit
 .. _autoflake: https://github.com/myint/autoflake
 .. _autopep8: https://github.com/hhatto/autopep8
 .. _docformatter: https://github.com/myint/docformatter

readthedocs/projects/forms.py

@@ -161,8 +161,8 @@ class Meta(object):
             'documentation_type',
             'language',
             'programming_language',
-            'project_url',
             'tags',
+            'project_url',
         )
 
     description = forms.CharField(

readthedocs/settings/test.py

@@ -17,6 +17,12 @@ class CommunityTestSettings(CommunityDevSettings):
     DEBUG = False
     TEMPLATE_DEBUG = False
 
+    @property
+    def LOGGING(self):  # noqa - avoid pep8 N802
+        logging = super(CommunityDevSettings, self).LOGGING
+        return logging
+
+
 
 CommunityTestSettings.load_settings(__name__)
 

readthedocs/templates/core/project_detail_right.html

@@ -24,10 +24,10 @@ <h3>{% trans "Last Built" %}</h3>
               <span class="build-state build-state-failing">{% trans "failed" %}</span>
             {% endif %}
           {% else %}
-            Currently Building
+            {% trans "Currently Building" %}
           {% endif %}
       {% else %}
-        No builds yet
+        {% trans "No builds yet" %}
       {% endif %}
     {% endwith %}
   </p>
@@ -61,16 +61,25 @@ <h3>{% trans "Badge" %}</h3>
 
 
 {% block tags %}
-  {% if project.tags.count %}
     <h3>{% trans "Tags" %}</h3>
     <p>
-      {% for tag in project.tags.all %}
-        <a href="{% url "projects_tag_detail" tag.slug %}">{{ tag.name }}</a>{% if forloop.last %}{% else %}, {% endif %}
-      {% empty %}
-        <span class="quiet">{% trans "No tags" %}</span>
-      {% endfor %}
+
+    {% if project.tags.exists %}
+        {% for tag in project.tags.all %}
+          <a href="{% url "projects_tag_detail" tag.slug %}">{{ tag.name }}</a>{% if forloop.last %}{% else %}, {% endif %}
+        {% endfor %}
+    {% else %}
+      {% trans "Project has no tags." %}
+      {% if request.user|is_admin:project %}
+
+        {% url 'projects_edit' project.slug as edit_url %}
+          {% blocktrans %}
+          Add some in your <a href="{{ edit_url }}">project settings</a>.
+          {% endblocktrans %}
+      {% endif %}
+    {% endif %}
+
     </p>
-  {% endif %}
 {% endblock %}
 
 {% block privacy-level %}