From 599804dbd261bb9cf000a50cf023ff09ae3bfac5 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 20 Nov 2015 13:56:11 -0800
Subject: [PATCH] Remove 'Hide Original Post Form' option; show toggle for
 original form in smaller font. #600

---
 src/General/Config.coffee          |  5 -----
 src/Posting/Captcha.replace.coffee |  1 -
 src/Posting/QR.coffee              | 10 +++-------
 src/css/style.css                  |  6 ++++++
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 0d90af310..f5a4d4609 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -455,11 +455,6 @@ Config =
         'Show the classic name, email, and subject fields in the QR, even when 4chan doesn\'t use them all.'
         1
       ]
-      'Hide Original Post Form': [
-        true
-        'Hide the normal post form.'
-        1
-      ]
       'Cooldown': [
         true
         'Indicate the remaining time before posting again.'
diff --git a/src/Posting/Captcha.replace.coffee b/src/Posting/Captcha.replace.coffee
index 356f5c95c..aa645370f 100644
--- a/src/Posting/Captcha.replace.coffee
+++ b/src/Posting/Captcha.replace.coffee
@@ -1,7 +1,6 @@
 Captcha.replace =
   init: ->
     return unless d.cookie.indexOf('pass_enabled=1') < 0
-    return if location.hostname is 'boards.4chan.org' and Conf['Hide Original Post Form']
 
     if Conf['Force Noscript Captcha'] and Main.jsEnabled
       $.ready Captcha.replace.noscript
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index b9bcdb6f9..c3d2d712b 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -57,12 +57,6 @@ QR =
 
       Header.addShortcut sc
 
-    if Conf['Hide Original Post Form']
-      $.addClass doc, 'hide-original-post-form'
-      unless Main.jsEnabled
-        # Prevent unnecessary loading of fallback iframe.
-        $.onExists doc, '#postForm noscript', true, $.rm
-
   initReady: ->
     $.off d, '4chanXInitFinished', @initReady
     QR.postingIsEnabled = !!$.id 'postForm'
@@ -88,7 +82,9 @@ QR =
 
       $.prepend $('.navLinksBot'), linkBot
 
-    $.before $.id('togglePostFormLink'), link
+    origToggle = $.id 'togglePostFormLink'
+    $.before origToggle, link
+    origToggle.firstElementChild.textContent = 'Original Form'
 
     $.on d, 'QRGetFile',          QR.getFile
     $.on d, 'QRSetFile',          QR.setFile
diff --git a/src/css/style.css b/src/css/style.css
index 0930899b4..3718dc4f0 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1212,6 +1212,7 @@ input[name="Default Volume"] {
 }
 .qr-link-container {
   text-align: center;
+  margin: 16px 0;
 }
 .qr-link-container-bottom {
   width: 200px;
@@ -1229,6 +1230,11 @@ input[name="Default Volume"] {
   border-width: 1px;
   font-size: 10pt;
 }
+.qr-link-container + #togglePostFormLink {
+  font-size: 10pt;
+  font-weight: normal;
+  margin: -8px 0 3.5px;
+}
 .persona {
   width: 100%;
   display: -webkit-flex;