Merge branch 'master' into upstream-master

Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html

diff --cc mediagoblin.ini
Simple merge

diff --cc mediagoblin/processing/__init__.py
Simple merge

diff --cc mediagoblin/routing.py
Simple merge

diff --cc mediagoblin/static/css/base.css
Simple merge

diff --cc mediagoblin/templates/mediagoblin/base.html
index 8c9eaeb2b13dafe25226d63b1781bc564ddd888a,eb37e25fc6d52622940ce9df7ec2c446b81b1df3..df0b94aa2c91de631dc211ce7eaa8cc47a630cac
--- 1/mediagoblin/templates/mediagoblin/base.html
--- 2/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@@ -140,20 -132,13 +142,21 @@@
                <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
                  {%- trans %}Create new collection{% endtrans -%}
                </a>
 -              {% if request.user.is_admin %}
+               {% template_hook("create_blog_home") %}
 +              {% if request.user.has_privilege('admin','moderator') %}
                  <p>
 -                  <span class="dropdown_title">Admin powers:</span>
 -                  <a href="{{ request.urlgen('mediagoblin.admin.panel') }}">
 +                  <span class="dropdown_title">Moderation powers:</span>
 +                  <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
                      {%- trans %}Media processing panel{% endtrans -%}
                    </a>
 +                  &middot;
 +                  <a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
 +                    {%- trans %}User management panel{% endtrans -%}
 +                  </a>
 +                  &middot;
 +                  <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
 +                    {%- trans %}Report management panel{% endtrans -%}
 +                  </a>
                  </p>
                {% endif %}
                {% include 'mediagoblin/fragments/header_notifications.html' %}

diff --cc mediagoblin/templates/mediagoblin/user_pages/user.html
index 37983400543f09108905abe00bda965f0f6dd009,6cb6aa515b63fb9e20bee6820d89eb0908a8ccf2..d554b7e8e570b05cec71c83f2b0fe06a1c774b5e
--- 1/mediagoblin/templates/mediagoblin/user_pages/user.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@@ -41,86 -38,135 +41,91 @@@
  
  
  {% block mediagoblin_content -%}
 -  {# If no user... #}
 -  {% if not user %}
 -    <p>{% trans %}Sorry, no such user found.{% endtrans %}</p>
 -
 -  {# User exists, but needs verification #}
 -  {% elif user.status == "needs_email_verification" %}
 -    {% if user == request.user %}
 -      {# this should only be visible when you are this user #}
 -      <div class="form_box">
 -        <h1>{% trans %}Email verification needed{% endtrans %}</h1>
 +  <h1>
 +    {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
 +  </h1>
  
 +  {% if not user.url and not user.bio %}
 +    {% if request.user and (request.user.id == user.id) %}
 +      <div class="profile_sidebar empty_space">
          <p>
 -          {% trans -%}
 -            Almost done! Your account still needs to be activated.
 -          {%- endtrans %}
 -        </p>
 -        <p>
 -          {% trans -%}
 -            An email should arrive in a few moments with instructions on how to do so.
 -          {%- endtrans %}
 +          {% trans %}Here's a spot to tell others about yourself.{% endtrans %}
          </p>
 -        <p>{% trans %}In case it doesn't:{% endtrans %}</p>
 -  
 -        <a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}"
 -           class="button_action_highlight">{% trans %}Resend verification email{% endtrans %}</a>
 -      </div>
 +        <a href="{{ request.urlgen('mediagoblin.edit.profile',
 +                 user=user.username) }}" class="button_action">
 +          {%- trans %}Edit profile{% endtrans -%}
 +        </a>
      {% else %}
 -      {# if the user is not you, but still needs to verify their email #}
 -      <div class="form_box">
 -        <h1>{% trans %}Email verification needed{% endtrans %}</h1>
 -
 +      <div class="profile_sidebar empty_space">
          <p>
            {% trans -%}
 -            Someone has registered an account with this username, but it still has to be activated.
 -          {%- endtrans %}
 -        </p>
 -  
 -        <p>
 -          {% trans login_url=request.urlgen('mediagoblin.auth.login') -%}
 -            If you are that person but you've lost your verification email, you can <a href="{{ login_url }}">log in</a> and resend it.
 +            This user hasn't filled in their profile (yet).
            {%- endtrans %}
          </p>
 -      </div>
      {% endif %}
 -
 -  {# Active(?) (or at least verified at some point) user, horray! #}
    {% else %}
 -    <h1>
 -      {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
 -    </h1>
 -
 -    {% if not user.url and not user.bio %}
 -      {% if request.user and (request.user.id == user.id) %}
 -        <div class="profile_sidebar empty_space">
 -          <p>
 -            {% trans %}Here's a spot to tell others about yourself.{% endtrans %}
 -          </p>
 -          <a href="{{ request.urlgen('mediagoblin.edit.profile',
 -                   user=user.username) }}" class="button_action">
 -            {%- trans %}Edit profile{% endtrans -%}
 -          </a>
 -      {% else %}
 -        <div class="profile_sidebar empty_space">
 -          <p>
 -            {% trans -%}
 -              This user hasn't filled in their profile (yet).
 -            {%- endtrans %}
 -          </p>
 +    <div class="profile_sidebar">
 +      {% include "mediagoblin/utils/profile.html" %}
 +      {% if request.user and
 +            (request.user.id == user.id or request.user.has_privilege('admin')) %}
 +        <a href="{{ request.urlgen('mediagoblin.edit.profile',
 +                 user=user.username) }}">
 +          {%- trans %}Edit profile{% endtrans -%}
 +        </a>
        {% endif %}
 -    {% else %}
 -      <div class="profile_sidebar">
 -        {% include "mediagoblin/utils/profile.html" %}
 -        {% if request.user and
 -              (request.user.id == user.id or request.user.is_admin) %}
 -          <a href="{{ request.urlgen('mediagoblin.edit.profile',
 -                   user=user.username) }}">
 -            {%- trans %}Edit profile{% endtrans -%}
 -          </a>
 -        {% endif %}
 -    {% endif %}
 +  {% endif %}
 +    <p>
 +      <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list',
 +                                         user=user.username) }}">
 +        {%- trans %}Browse collections{% endtrans -%}
 +      </a>
 +    </p>
 +  </div>
 +
 +  {% if media_entries.count() %}
 +    <div class="profile_showcase">
 +      {{ object_gallery(request, media_entries, pagination,
 +                        pagination_base_url=user_gallery_url, col_number=3) }}
 +      {% include "mediagoblin/utils/object_gallery.html" %}
 +      <div class="clear"></div>
        <p>
 -        <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list',
 -                                           user=user.username) }}">
 -          {%- trans %}Browse collections{% endtrans -%}
 +        <a href="{{ user_gallery_url }}">
 +          {% trans username=user.username -%}
 +            View all of {{ username }}'s media{% endtrans -%}
          </a>
        </p>
 +      {% set feed_url = request.urlgen(
 +                'mediagoblin.user_pages.atom_feed',
 +                user=user.username) %}
 +      {% include "mediagoblin/utils/feed_link.html" %}
      </div>
 -
 -    {% if media_entries.count() %}
 -      <div class="profile_showcase">
 -        {{ object_gallery(request, media_entries, pagination,
 -                          pagination_base_url=user_gallery_url, col_number=3) }}
 -        {% include "mediagoblin/utils/object_gallery.html" %}
 -        <div class="clear"></div>
 +  {% else %}
 +    {% if request.user and (request.user.id == user.id) %}
 +      <div class="profile_showcase empty_space">
          <p>
 -          <a href="{{ user_gallery_url }}">
 -            {% trans username=user.username -%}
 -              View all of {{ username }}'s media{% endtrans -%}
 -          </a>
 +          {% trans -%}
 +          This is where your media will appear, but you don't seem to have added anything yet.
 +          {%- endtrans %}
          </p>
 +        <a class="button_action"
 +           href="{{ request.urlgen('mediagoblin.submit.start') }}">
 +          {%- trans %}Add media{% endtrans -%}
 +        </a>
+         {% set feed_url = request.urlgen(
+                   'mediagoblin.user_pages.atom_feed',
+                   user=user.username) %}
+         {% template_hook("user_profile") %}
+         {% include "mediagoblin/utils/feed_link.html" %}
        </div>
      {% else %}
 -      {% if request.user and (request.user.id == user.id) %}
 -        <div class="profile_showcase empty_space">
 -          <p>
 -            {% trans -%}
 -            This is where your media will appear, but you don't seem to have added anything yet.
 -            {%- endtrans %}
 -          </p>
 -          <a class="button_action"
 -             href="{{ request.urlgen('mediagoblin.submit.start') }}">
 -            {%- trans %}Add media{% endtrans -%}
 -          </a>
 -        </div>
 -      {% else %}
 -        <div class="profile_showcase empty_space">
 -          <p>
 -            {% trans -%}
 -            There doesn't seem to be any media here yet...
 -            {%- endtrans %}
 -          </p>
 -        </div>
 -      {% endif %}
 +      <div class="profile_showcase empty_space">
 +        <p>
 +          {% trans -%}
 +          There doesn't seem to be any media here yet...
 +          {%- endtrans %}
 +        </p>
 +      </div>
      {% endif %}
 -    <div class="clear"></div>
    {% endif %}
 +  <div class="clear"></div>
  {% endblock %}

diff --cc mediagoblin/user_pages/views.py
Simple merge