Fix merge conflicts

diff --cc mediagoblin/static/css/base.css
index 76e37c1b2d39b4448f6917697dfccc5ba53206cf,e89ce8a23ca5f73413f015031875b02b653065a7..f4359791034f769b132da5cf09e628509fc5492c
--- 1/mediagoblin/static/css/base.css
--- 2/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@@ -192,13 -230,13 +230,21 @@@ text-align: center
    float: right;
  }
  
 +textarea#comment_content {
 +  resize: vertical;
 +  width: 634px;
 +  height: 90px;
 +  border: none;
 +  background-color: #f1f1f1;
 +  padding: 3px;
++
+ .clear {
+   clear: both;
+   display: block;
+   overflow: hidden;
+   visibility: hidden;
+   width: 0;
+   height: 0;
  }
  
  /* forms */

diff --cc mediagoblin/templates/mediagoblin/auth/change_fp.html
index e8e64023d2b533c43bd0331a88b84b8cff455f86,9c8c79bf717c5085e9242798edb75863f071fb1d..d95516e8250eff293be8e47cc4c425395ac42980
--- 1/mediagoblin/templates/mediagoblin/auth/change_fp.html
--- 2/mediagoblin/templates/mediagoblin/auth/change_fp.html
+++ b/mediagoblin/templates/mediagoblin/auth/change_fp.html
@@@ -19,13 -19,7 +19,12 @@@
  
  {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
  
 +{% block mediagoblin_head %}
 +  <script type="text/javascript"
 +          src="{{ request.staticdirect('/js/show_password.js') }}"></script>
 +{% endblock mediagoblin_head %}
 +
  {% block mediagoblin_content %}
- 
    <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
          method="POST" enctype="multipart/form-data">
      {{ csrf_token }}

diff --cc mediagoblin/templates/mediagoblin/auth/register.html
Simple merge

diff --cc mediagoblin/templates/mediagoblin/edit/attachments.html
index 06062cd339fd5b06bcd7c8dc83dbca172b208776,ff357a8cb433ea17209d6a233ce967178e1a74f4..bd972b2a8c1c08128c31fd0cbb7fb9e7d3de99ed
--- 1/mediagoblin/templates/mediagoblin/edit/attachments.html
--- 2/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@@ -20,10 -20,10 +20,10 @@@
  {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
  {% block mediagoblin_content %}
    <form action="{{ request.urlgen('mediagoblin.edit.attachments',
 -                               user= media.get_uploader().username,
 +                               user= media.get_uploader.username,
                                 media= media._id) }}"
          method="POST" enctype="multipart/form-data">
-     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
+     <div class="form_box">
        <h1>Editing attachments for {{ media.title }}</h1>
        <div style="text-align: center;" >
          <img src="{{ request.app.public_store.file_url(

diff --cc mediagoblin/templates/mediagoblin/edit/edit.html
index 024a2b4d9b8de460cad78d8c7335e108b9dd6ba2,d034160068c6527d12376e342069d6a6d63fc210..142004666d009be38b7c6a6e68eb8ddd6c92ec1a
--- 1/mediagoblin/templates/mediagoblin/edit/edit.html
--- 2/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@@ -22,10 -22,10 +22,10 @@@
  {% block mediagoblin_content %}
  
    <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
 -                               user= media.get_uploader().username,
 +                               user= media.get_uploader.username,
                                 media= media._id) }}"
          method="POST" enctype="multipart/form-data">
-     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
+     <div class="form_box_xl">
        <h1>{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}</h1>
        <div style="text-align: center;" >
          <img src="{{ request.app.public_store.file_url(

diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
index 4b5c9337ca42d1f77cd0fca863b7f7a6656dc84a,0c3f373e05bc8dee164c482c5f0b7b9815267513..10525f4c4166b8179c0be7505d92a5817c578c44
--- 1/mediagoblin/templates/mediagoblin/user_pages/media.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@@ -106,42 -107,45 +106,42 @@@
            </div>
          </form>
        {% endif %}
 -      {% if comments %}
 -        {% for comment in comments %}
 -          {% set comment_author = comment.author() %}
 -                {% if pagination.active_id == comment._id %}
 -              <div class="comment_wrapper comment_active" id="comment-{{ comment._id }}">
 -                          <a name="comment" id="comment"></a>
 -            {% else %}
 -              <div class="comment_wrapper" id="comment-{{ comment._id }}">
 -                {% endif %}
 -                <div class="comment_content">
 -                  {% autoescape False %}
 -                    {{ comment.content_html }}
 -                  {% endautoescape %}
 -                  <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
 -                  <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
 -                              user = comment_author.username) }}">
 -                    {{ comment_author.username }}
 -                  </a>
 -                  {% trans %}at{% endtrans %} 
 -                  <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
 -                                comment = comment._id,
 -                                user = media.get_uploader().username,
 -                                media = media.slug) }}#comment">
 -                    {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
 -                  </a>
 -                </div>
 -              </div>
 -        {% endfor %}
 -      {{ render_pagination(request, pagination, 
 -                request.urlgen('mediagoblin.user_pages.media_home',
 -                user = media.get_uploader().username,
 -                media = media._id)) }}
 +      {% for comment in comments %}
 +        {% set comment_author = comment.get_author %}
 +              {% if pagination.active_id == comment._id %}
 +            <div class="comment_wrapper comment_active" id="comment-{{ comment._id }}">
 +                        <a name="comment" id="comment"></a>
 +          {% else %}
 +            <div class="comment_wrapper" id="comment-{{ comment._id }}">
 +              {% endif %}
 +          <div class="comment_content">
 +            {% autoescape False %}
 +              {{ comment.content_html }}
 +            {% endautoescape %}
 +            <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
 +            <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
 +                            user = comment_author.username) }}">
 +              {{ comment_author.username }}
 +            </a>
 +            {% trans %}at{% endtrans %}
 +            <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
 +                   comment = comment._id,
 +                   user = media.get_uploader.username,
 +                   media = media.slug) }}#comment">
 +              {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
 +            </a>
 +          </div>
 +        </div>
 +      {% endfor %}
 +      {{ render_pagination(request, pagination,
 +                 media.url_for_self(request.urlgen)) }}
      {% endif %}
    </div>
-   <div class="grid_5 omega">
+   <div class="media_sidebar">
      {% trans user_url=request.urlgen(
                  'mediagoblin.user_pages.user_home',
 -                user=media.get_uploader().username),
 -                username=media.get_uploader().username -%}
 +                user=media.get_uploader.username),
 +                username=media.get_uploader.username -%}
        <p>❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
      {%- endtrans %}  
      {% include "mediagoblin/utils/prev_next.html" %}

diff --cc mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 408bca05b6f03e3d9671232b81ac8699d2d32474,8e0f2904ad4c793d7a529914af9812ed937b7ca3..dcb148e0514bdc87b9dac620e3ac3def5b6f7254
--- 1/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@@ -22,10 -22,10 +22,10 @@@
  {% block mediagoblin_content %}
  
    <form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete',
 -                                user=media.get_uploader().username,
 +                                user=media.get_uploader.username,
                                  media=media._id) }}"
          method="POST" enctype="multipart/form-data">
-     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
+     <div class="form_box">
        <h1>
          {%- trans title=media.title -%}
            Really delete {{ title }}?

diff --cc mediagoblin/templates/mediagoblin/user_pages/user.html
index a50849b0a97010383bebbe2212a88b5bb882e968,8a1d3a762c61edbc7342de51ff3afee21cd3e02a..c8eb902676d1b7d94bd9e01650df1872dc585429
--- 1/mediagoblin/templates/mediagoblin/user_pages/user.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@@ -90,8 -90,8 +90,8 @@@
      </h1>
  
      {% if not user.url and not user.bio %}
 -      {% if request.user._id == user._id %}
 +      {% if request.user and (request.user._id == user._id) %}
-         <div class="grid_6 alpha empty_space">
+         <div class="profile_sidebar empty_space">
            <p>
              {% trans %}Here's a spot to tell others about yourself.{% endtrans %}
            </p>
@@@ -100,19 -100,20 +100,19 @@@
               class="button_action">
              {%- trans %}Edit profile{% endtrans -%}
            </a>
 -        </div>
        {% else %}
-         <div class="grid_6 alpha empty_space">
+         <div class="profile_sidebar empty_space">
            <p>
              {% trans -%}
                This user hasn't filled in their profile (yet).
              {%- endtrans %}
            </p>
 -        </div>
        {% endif %}
      {% else %}
-       <div class="grid_6 alpha">
+       <div class="profile_sidebar">
          {% include "mediagoblin/utils/profile.html" %}
 -        {% if request.user._id == user._id or request.user.is_admin %}
 +        {% if request.user and
 +              (request.user._id == user._id or request.user.is_admin) %}
            <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
                            user.username }}">
              {%- trans %}Edit profile{% endtrans -%}