From f85ca19cef3aa2d7eac3cecb73f806a0d75c740d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 7 Jun 2015 21:33:35 +0200
Subject: [PATCH] Use <noscript> tag for qute:settings without JS.

There was already a noscript tag, this just removes the special check and makes
it a bit more obvious.

See #727.
---
 qutebrowser/browser/network/qutescheme.py | 16 ++++------------
 qutebrowser/html/settings.html            |  4 +++-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/browser/network/qutescheme.py b/qutebrowser/browser/network/qutescheme.py
index 48b3dbd5f..73ba5772a 100644
--- a/qutebrowser/browser/network/qutescheme.py
+++ b/qutebrowser/browser/network/qutescheme.py
@@ -179,18 +179,10 @@ def qute_help(win_id, request):
 
 def qute_settings(win_id, _request):
     """Handler for qute:settings. View/change qute configuration."""
-    if not QWebSettings.globalSettings().testAttribute(
-            QWebSettings.JavascriptEnabled):
-        # https://github.com/The-Compiler/qutebrowser/issues/727
-        template = jinja.env.get_template('pre.html')
-        html = template.render(
-            title='Failed to open qute:settings.',
-            content="qute:settings needs javascript enabled to work.")
-    else:
-        config_getter = functools.partial(objreg.get('config').get, raw=True)
-        html = jinja.env.get_template('settings.html').render(
-            win_id=win_id, title='settings', config=configdata,
-            confget=config_getter)
+    config_getter = functools.partial(objreg.get('config').get, raw=True)
+    html = jinja.env.get_template('settings.html').render(
+        win_id=win_id, title='settings', config=configdata,
+        confget=config_getter)
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
diff --git a/qutebrowser/html/settings.html b/qutebrowser/html/settings.html
index c4fbdcc59..57a0502ba 100644
--- a/qutebrowser/html/settings.html
+++ b/qutebrowser/html/settings.html
@@ -14,10 +14,12 @@ pre { margin: 2px; }
 th, td { border: 1px solid grey; padding: 0px 5px; }
 th { background: lightgrey; }
 th pre { color: grey; text-align: left; }
+.noscript, .noscript-text { color:red; }
+.noscript-text { margin-bottom: 5cm; }
 {% endblock %}
 
 {% block content %}
-<noscript><h1>View Only</h1><p>Changing settings requires javascript to be enabled</p></noscript>
+<noscript><h1 class="noscript">View Only</h1><p class="noscript-text">Changing settings requires javascript to be enabled!</p></noscript>
 <header><h1>{{ title }}</h1></header>
 <table>
 {% for section in config.DATA %}