rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'HolySmoke86-option-description'

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-26 07:02:00 +02:00
commit 67c24ec014
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.asciidoc
View File

@ -132,6 +132,7 @@ Changed
* `fonts -> messages.error` * `fonts -> messages.error`
* `fonts -> messages.warning` * `fonts -> messages.warning`
* `fonts -> messages.info` * `fonts -> messages.info`
- The `qute:settings` page now also shows option descriptions.
Deprecated Deprecated
~~~~~~~~~~ ~~~~~~~~~~

1
README.asciidoc
View File

@ -258,6 +258,7 @@ Contributors, sorted by the number of commits in descending order:
* Dietrich Daroch * Dietrich Daroch
* Derek Sivers * Derek Sivers
* Daniel Lu * Daniel Lu
* Daniel Karbach
* Arseniy Seroka * Arseniy Seroka
* Andy Balaam * Andy Balaam
* Andreas Fischer * Andreas Fischer

7
qutebrowser/html/settings.html
View File

@ -15,6 +15,7 @@ th { background: lightgrey; }
th pre { color: grey; text-align: left; } th pre { color: grey; text-align: left; }
.noscript, .noscript-text { color:red; } .noscript, .noscript-text { color:red; }
.noscript-text { margin-bottom: 5cm; } .noscript-text { margin-bottom: 5cm; }
.option_description { margin: .5ex 0; color: grey; font-size: 80%; font-style: italic; white-space: pre-line; }
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@ -25,7 +26,11 @@ th pre { color: grey; text-align: left; }
<tr><th colspan="2"><h3>{{ section }}</h3><pre>{{ config.SECTION_DESC.get(section)|wordwrap(width=120) }}</pre></th></tr> <tr><th colspan="2"><h3>{{ section }}</h3><pre>{{ config.SECTION_DESC.get(section)|wordwrap(width=120) }}</pre></th></tr>
{% for d, e in config.DATA.get(section).items() %} {% for d, e in config.DATA.get(section).items() %}
<tr> <tr>
<td>{{ d }} (Current: {{ confget(section, d)|truncate(100) }})</td> <td>{{ d }} (Current: {{ confget(section, d)|truncate(100) }})
{% if config.DATA.get(section).descriptions[d] %}
<p class="option_description">{{ config.DATA.get(section).descriptions[d]|e }}</p>
{% endif %}
</td>
<td> <td>
<input type="text" <input type="text"
onblur="cset('{{ section }}', '{{ d }}', this)" onblur="cset('{{ section }}', '{{ d }}', this)"