From b6607196a6bdfa42d201e7fbc204c19f78de57ae Mon Sep 17 00:00:00 2001
From: Andre D <andre@andred.ca>
Date: Mon, 20 May 2013 23:33:25 -0700
Subject: [PATCH] banning: Add the ability to set a note at ban time.

---
 r2/r2/controllers/api.py            |  3 +++
 r2/r2/public/static/css/reddit.less |  5 +++++
 r2/r2/templates/userlist.html       | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index d164c85b5..30dad07b1 100755
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -788,6 +788,9 @@ class ApiController(RedditController, OAuth2ResourceController):
             # the right one and update its data.
             c.user.friend_rels_cache(_update=True)
             c.user.add_friend_note(friend, note or '')
+        
+        if type in ('banned', 'wikibanned'):
+            container.add_rel_note(type, friend, note)
 
         cls = dict(friend=FriendList,
                    moderator=ModList,
diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less
index d8502d677..c5a3cdb23 100755
--- a/r2/r2/public/static/css/reddit.less
+++ b/r2/r2/public/static/css/reddit.less
@@ -5471,6 +5471,11 @@ body:not(.gold) .allminus-link {
 .rel-note.edited button[type=submit] { display: inline-block; }
 .rel-note.edited input[type=text] { width: 250px; margin-right: 0px; }
 
+.friend-add.edited .ban-reason { display: block; }
+
+.ban-reason {
+    display: none;
+}
 
 .gold-accent h1,
 .gold-accent th {
diff --git a/r2/r2/templates/userlist.html b/r2/r2/templates/userlist.html
index 5993f8352..3b45210cc 100644
--- a/r2/r2/templates/userlist.html
+++ b/r2/r2/templates/userlist.html
@@ -27,7 +27,7 @@
   <% from r2.models import ModeratorPermissionSet %>
   <% from r2.lib.pages import ModeratorPermissions %>
   <form action="/post/${dest}"
-        method="post" class="pretty-form medium-text"
+        method="post" class="pretty-form medium-text friend-add"
         onsubmit="return post_form(this, '${dest}')"
         id="${add_type}">
     <h1>${title}</h1>
@@ -35,7 +35,17 @@
     <input type="hidden" name="action" value="add">
     <input type="hidden" name="container" value="${container_name}">
     <input type="hidden" name="type" value="${add_type}">
-    <input type="text" name="name" id="name">
+    %if add_type in ("banned", "wikibanned"):
+        <label for="name">${_('who to ban?')} &nbsp;</label>
+        <input type="text" onfocus="$(this).parent('form').addClass('edited')" class="friend-name" name="name" id="name">
+        <span class="ban-reason">
+            <label for="note">${_('why the ban?')}</label>
+            <input type="text" maxlength="300" name="note" id="note">
+            <span>${_('(will not be visible to user)')}</span>
+        </span>
+    %else:
+        <input type="text" name="name" id="name">
+    %endif
     %if add_type == "moderator_invite":
       ${ModeratorPermissions(None, 'moderator',
                              ModeratorPermissionSet(all=True),