relabel email field to options

Conflicts:
	src/General/Config.coffee
	src/Posting/QR.coffee

src/General/Config.coffee

@@ -906,7 +906,7 @@ Config =
 
   QR:
     'QR.personas': """
-      #email:"sage";boards:jp;always
+      #options:"sage";boards:jp;always
     """
 
   time: '%m/%d/%y(%a)%H:%M:%S'

src/General/html/Features/QuickReply.html

@@ -10,7 +10,7 @@
 <form>
   <div class=persona>
     <input name=name  data-name=name  list="list-name" placeholder=Name    class=field size=1 tabindex=10>
-    <input name=email data-name=email list="list-email" placeholder=E-mail  class=field size=1 tabindex=20>
+    <input name=email data-name=email list="list-email" placeholder=Options class=field size=1 tabindex=20>
     <input name=sub   data-name=sub   list="list-sub" placeholder=Subject class=field size=1 tabindex=30> 
   </div>
   <div class=textarea>

src/General/html/Settings/Advanced.html

@@ -74,10 +74,10 @@
     Lines starting with a <code>#</code> will be ignored.
   </p>
   <ul>You can use these settings with each item, separate them with semicolons:
-    <li>Possible items are: <code>name</code>, <code>email</code>, <code>subject</code> and <code>password</code>.</li>
-    <li>Wrap values of items with quotes, like this: <code>email:"sage"</code>.</li>
-    <li>Force values as defaults with the <code>always</code> keyword, for example: <code>email:"sage";always</code>.</li>
-    <li>Select specific boards for an item, separated with commas, for example: <code>email:"sage";boards:jp;always</code>.</li>
+    <li>Possible items are: <code>name</code>, <code>options</code> (or equivalently <code>email</code>), <code>subject</code> and <code>password</code>.</li>
+    <li>Wrap values of items with quotes, like this: <code>options:"sage"</code>.</li>
+    <li>Force values as defaults with the <code>always</code> keyword, for example: <code>options:"sage";always</code>.</li>
+    <li>Select specific boards for an item, separated with commas, for example: <code>options:"sage";boards:jp;always</code>.</li>
   </ul>
 </fieldset>
 
@@ -117,4 +117,4 @@
     <button id=apply-css>Apply CSS</button>
     <textarea name=usercss class=field spellcheck=false #{if Conf['Custom CSS'] then '' else 'disabled'}></textarea>
   </div>
-</fieldset>
+</fieldset>

src/Posting/QR.coffee

@@ -461,7 +461,7 @@ QR =
     QR.max_width_video = QR.max_height_video = 2048
     QR.max_duration_video = 120
 
-    QR.spoiler = !!$ 'input[name=spoiler]'
+    QR.spoiler = !!$ '.postForm input[name=spoiler]'
     if QR.spoiler
       $.addClass QR.nodes.el, 'has-spoiler'
     else

src/Posting/QR.persona.coffee

@@ -16,7 +16,7 @@ QR.persona =
 
   parseItem: (item, types) ->
     return if item[0] is '#'
-    return unless match = item.match /(name|email|subject|password):"(.*)"/i
+    return unless match = item.match /(name|options|email|subject|password):"(.*)"/i
     [match, type, val]  = match
 
     # Don't mix up item settings with val.
@@ -30,7 +30,8 @@ QR.persona =
       QR.persona.pwd = val
       return
 
-    type = 'sub' if type is 'subject'
+    type = 'email' if type is 'options'
+    type = 'sub'   if type is 'subject'
 
     if /always/i.test item
       QR.persona.always[type] = val