Remove remaining links to /about/team page

reddit-archive · Jun 22, 2016 · e355b0d · e355b0d
1 parent 28332d6
commit e355b0d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py
@@ -92,7 +92,6 @@ def __getattr__(self, attr):
                      advertising  = _("advertise"),
                      gold         = _('reddit gold'),
                      reddits      = _('subreddits'),
-                     team         = _('team'),
                      rules        = _('site rules'),
                      jobs         = _('jobs'),
                      transparency = _("transparency"),

diff --git a/r2/r2/lib/template_helpers.py b/r2/r2/lib/template_helpers.py
@@ -572,8 +572,6 @@ def add_attr(attrs, kind, label=None, link=None, cssclass=None, symbol=None):
         cssclass = 'admin'
         if not label:
             label = _('reddit admin, speaking officially')
-        if not link:
-            link = '/about/team'
     elif kind in ('X', '@'):
         priority = 5
         cssclass = 'gray'

diff --git a/r2/r2/templates/messagecompose.html b/r2/r2/templates/messagecompose.html
@@ -107,9 +107,7 @@ <h1>${_("send a private message")}</h1>
     var admins = ${unsafe(simplejson.dumps(thing.admins))};
 
     if ($.inArray(elem.value, admins) >= 0) {
-      $(".admin-to")
-        .text(elem.value)
-        .attr('href', '/about/team/#user/' + elem.value);
+      $(".admin-to").text(elem.value);
       $(".clippy").show();
     } else {
       $(".clippy").hide();
@@ -124,17 +122,13 @@ <h1>${_("send a private message")}</h1>
        <p>
          Before you click "send", you might want to make sure that
          &#32;
-         <a class="admin-to" href="/about/team/#user/${thing.to}">${thing.to}</a>
+         <span class="admin-to">${thing.to}</span>
          &#32;
-         is the right admin for the job. The
-         &#32;
-         <a href="/about/team/">team page</a>
-         &#32;
-         has some info about who handles what.
-
-         Also:
+         is the right admin for the job.
        </p>
 
+       <p>In many cases, there is probably a better alternative than messaging an individual admin:</p>
+
        <ul>
          <li>If you'd like to message all the admins at once, send your message to the&#32;<a href="/message/compose?to=${g.admin_message_acct|u}">admin message list.</a></li>
 
@@ -151,7 +145,7 @@ <h1>${_("send a private message")}</h1>
          <li>If
            &#32;
            <span class="admin-to">${thing.to}</span>
-           &#32;<i>is</i>&#32; is a moderator of a specific subreddit you're
+           &#32;<i>is</i>&#32; a moderator of a specific subreddit you're
            inquiring about, and that's actually the reason you're writing, please
            message 
            &#32;

diff --git a/r2/r2/templates/profilebar.html b/r2/r2/templates/profilebar.html
@@ -33,7 +33,7 @@ <h1>${thing.user.name}
     %if thing.user.employee:
       <span class="user-distinction">
         [
-        <a href="/about/team/#user/${thing.user.name.lower()}" class="admin" title="reddit admin">A</a>
+        <span class="admin" title="reddit admin">A</span>
         ]
       </span>
     %endif