X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fmoderation%2Fuser.html;h=37e7eee9521321b2ca7fcdef67155bceffc245b3;hb=4a9a796a7fd7fcc144229c19260cbd1c02c279f0;hp=1be9dd8053579b2c9ae4e5654b90a339322d9e13;hpb=8e91df87349b91611a4dfcf3f2640cb540307144;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html
index 1be9dd80..37e7eee9 100644
--- a/mediagoblin/templates/mediagoblin/moderation/user.html
+++ b/mediagoblin/templates/mediagoblin/moderation/user.html
@@ -29,16 +29,27 @@
 {% endblock %}
 
 {%- block mediagoblin_head %}
- <script src="{{ request.staticdirect('/js/setup_report_forms.js') }}"></script>
+ <script src="{{ request.staticdirect('/js/setup_report_forms.js') }}">
+ </script>
 {% endblock %}
 
 {% block mediagoblin_content -%}
+    <div class="row">
+      <div class="sixteen columns">
+        <a href="{{ request.urlgen('mediagoblin.moderation.users') }}"
+           class="return_to_panel button_action"
+           title="Return to Users Panel">
+          {% trans %}Return to Users Panel{% endtrans %}</a>
+      </div>
+    </div>
+    <div class="row">
+      <div class="six columns">
   {# 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" %}
-    <div class="form_box">
+  {% elif not user.has_privilege('active') %}
+    <div class="profile_sidebar empty_space">
     <h1>{% trans %}Email verification needed{% endtrans %}</h1>
     <p>
       {% trans -%}
@@ -47,125 +58,128 @@
       {%- 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.
-      {%- endtrans %}
-    </p>
     </div>
 
   {# Active(?) (or at least verified at some point) user, horray! #}
   {% else %}
-    <a href="{{ request.urlgen('mediagoblin.moderation.users') }}"
-       class="return_to_panel button_action"
-       title="Return to Users Panel">
-      {% trans %}Return to Users Panel{% endtrans %}</a>
-    <h1>
-      {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
-    {% if user_banned and user_banned.expiration_date %}
-      &mdash; BANNED until {{ user_banned.expiration_date }}
-    {% elif user_banned %}
-      &mdash; Banned Indefinitely
-    {% endif %}
-    </h1>
-    {% if not user.url and not user.bio %}
-        <div class="profile_sidebar empty_space">
+        <h1>
+          {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
+        {% if user_banned and user_banned.expiration_date %}
+          &mdash; {% trans expiration_date=user_banned.expiration_date -%}
+            BANNED until {{ expiration_date }}
+          {%- endtrans %}
+        {% elif user_banned %}
+          &mdash; {% trans %}Banned Indefinitely{% endtrans %}
+        {% endif %}
+        </h1>
+        {% if not user.url and not user.bio %}
+            <div class="profile_sidebar empty_space">
+              <p>
+                {% trans -%}
+                  This user hasn't filled in their profile (yet).
+                {%- endtrans %}
+              </p>
+        {% else %}
+          <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 %}
+        {% endif %}
           <p>
-            {% trans -%}
-              This user hasn't filled in their profile (yet).
-            {%- endtrans %}
+            <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list',
+                                               user=user.username) }}">
+              {%- trans %}Browse collections{% endtrans -%}
+            </a>
           </p>
-    {% else %}
-      <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 %}
-    {% endif %}
-      <p>
-        <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list',
-                                           user=user.username) }}">
-          {%- trans %}Browse collections{% endtrans -%}
-        </a>
-      </p>
-    </div>
+        </div>
   {% endif %}
+    </div>
   {% if user %}
-    <h2>{%- trans %}Active Reports on {% endtrans -%}{{ user.username }}</h2>
-    {% if reports.count() %}
-    <table class="admin_side_panel">
-      <tr>
-        <th>{%- trans %}Report ID{% endtrans -%}</th>
-        <th>{%- trans %}Reported Content{% endtrans -%}</th>
-        <th>{%- trans %}Description of Report{% endtrans -%}</th>
-      </tr>
-      {% for report in reports %}
-        <tr>
-          <td>
-            <img src="{{ request.staticdirect('/images/icon_clipboard.png') }}" />
-            <a href="{{ request.urlgen('mediagoblin.moderation.reports_detail',
-                                               report_id=report.id) }}">
-              {%- trans %}Report #{% endtrans -%}{{ report.id }}
-            </a>
-          </td>
-          <td>
-            {% if report.discriminator == "comment_report" %}
-              <a>{%- trans %}Reported Comment{% endtrans -%}</a>
-            {% elif report.discriminator == "media_report" %}
-              <a>{%- trans %}Reported Media Entry{% endtrans -%}</a>
-            {% endif %}
-          </td>
-          <td>{{ report.report_content[:21] }}
-                {% if report.report_content|count >20 %}...{% endif %}</td>
-          <td>{%- trans %}Resolve{% endtrans -%}</td>
-        </tr>
-      {% endfor %}
-        <tr><td></td><td></td>
-    </table>
-    {% else %}
-      {%- trans %}No active reports filed on {% endtrans -%} {{ user.username }}
-    {% endif %}
-    <a  href="{{ request.urlgen('mediagoblin.moderation.reports') }}?active_reported_user={{user.id}}&closed_reported_user={{user.id}}"
-        class="right_align">{{ user.username }}'s report history</a>
-    <span class=clear></span>
-    <h2>{{ user.username }}'s Privileges</h2>
-      <form method=POST action="{{ request.urlgen(
-        'mediagoblin.moderation.ban_or_unban',
-        user=user.username) }}" class="right_align">
-        {{ csrf_token }}
-        {% if request.user.has_privilege('admin') and not user_banned and
-            not user.id == request.user.id %}
-          {{ wtforms_util.render_divs(ban_form) }}
-          <input type=submit class="button_action"
-               value="{% trans %}Ban User{% endtrans %}"
-               id="ban_user_submit" />
-        {% elif request.user.has_privilege('admin') and
-            not user.id == request.user.id %}
-          <input type=submit class="button_action right_align"
-               value="{% trans %}UnBan User{% endtrans %}" />
+      <div class="ten columns">
+        <h2>
+          {%- trans username=user.username -%}
+            Active Reports on {{ username }}
+          {%- endtrans -%}
+        </h2>
+        {% if reports.count() %}
+        <table class="admin_side_panel">
+          <tr>
+            <th>{%- trans %}Report ID{% endtrans -%}</th>
+            <th>{%- trans %}Reported Content{% endtrans -%}</th>
+            <th>{%- trans %}Description of Report{% endtrans -%}</th>
+          </tr>
+          {% for report in reports %}
+            <tr>
+              <td>
+                <img src="{{ request.staticdirect('/images/icon_clipboard.png') }}" />
+                <a href="{{ request.urlgen('mediagoblin.moderation.reports_detail',
+                                                   report_id=report.id) }}">
+                  {%- trans report_number=report.id -%}
+                    Report #{{ report_number }}
+                  {%- endtrans -%}
+                </a>
+              </td>
+              <td>
+                {% if report.discriminator == "comment_report" %}
+                  <a>{%- trans %}Reported Comment{% endtrans -%}</a>
+                {% elif report.discriminator == "media_report" %}
+                  <a>{%- trans %}Reported Media Entry{% endtrans -%}</a>
+                {% endif %}
+              </td>
+              <td>{{ report.report_content[:21] }}
+                    {% if report.report_content|count >20 %}...{% endif %}</td>
+              <td>{%- trans %}Resolve{% endtrans -%}</td>
+            </tr>
+          {% endfor %}
+            <tr><td></td><td></td>
+        </table>
+        {% else %}
+          {%- trans username=user.username -%}
+            No active reports filed on {{ username }}
+          {%- endtrans -%}
         {% endif %}
-      </form>
+        <p>
+          <span>
+              <a href="{{ request.urlgen(
+                  'mediagoblin.moderation.reports') }}?reported_user={{user.id}}">
+              {%- trans
+                  username=user.username %}All reports on {{ username }}{% endtrans %}</a>
+          &middot;
+              <a href="{{ request.urlgen(
+                      'mediagoblin.moderation.reports') }}?reporter={{user.id}}">
+              {%- trans username=user.username -%}
+                All reports that {{ username }} has filed
+              {%- endtrans %}</a>
+          </span>
+          <span class=clear></span>
+        </p>
+      </div>
+    </div>
+    <div class="row foot">
+    <h2>{% trans username=user.username -%}
+          {{ username }}'s Privileges{% endtrans %}</h2>
+    <div class="six columns">
     <form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege',
                user=user.username) }}"
           method=post >
     <table class="admin_side_panel">
         <tr>
           <th>{% trans %}Privilege{% endtrans %}</th>
-          <th>{% trans %}User Has Privilege{% endtrans %}</th>
+          <th>{% trans %}Granted{% endtrans %}</th>
         </tr>
         {% for privilege in privileges %}
           <tr>
             <td>{{ privilege.privilege_name }}</td>
             {% if privilege in user.all_privileges  %}
               <td class="user_with_privilege">
-                Yes{% else %}
+                {% trans %}Yes{% endtrans %}{% else %}
               <td class="user_without_privilege">
-                No{% endif %}
+                {% trans %}No{% endtrans %}{% endif %}
             </td>
             {% if request.user.has_privilege('admin') %}
               <td>
@@ -186,6 +200,25 @@
     {{ csrf_token }}
     <input type=hidden name=privilege_name id=hidden_privilege_name />
     </form>
+    </div>
+    <div class="five columns">
+      <form method=POST action="{{ request.urlgen(
+        'mediagoblin.moderation.ban_or_unban',
+        user=user.username) }}">
+        {{ csrf_token }}
+        {% if request.user.has_privilege('admin') and not user_banned and
+            not user.id == request.user.id %}
+          {{ wtforms_util.render_divs(ban_form) }}
+          <input type=submit class="button_action"
+               value="{% trans %}Ban User{% endtrans %}"
+               id="ban_user_submit" />
+        {% elif request.user.has_privilege('admin') and
+            not user.id == request.user.id %}
+          <input type=submit class="button_action"
+                 value="{% trans %}UnBan User{% endtrans %}" />
+        {% endif %}
+      </form>
+    </div>
   {% endif %}
     <script>
 $(document).ready(function(){
@@ -198,4 +231,5 @@ $(document).ready(function(){
     });
 });
     </script>
+</div><!--whoami-->
 {% endblock %}