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

Remove icon from base.html

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-15 14:31:21 +02:00
parent 36a5614c61
commit 3a6bcb3dd0
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/browser/qutescheme.py
View File

@ -123,8 +123,7 @@ class add_handler: # pylint: disable=invalid-name
title="Error while opening qute://url", title="Error while opening qute://url",
url=url.toDisplayString(), url=url.toDisplayString(),
error='{} is not available with this ' error='{} is not available with this '
'backend'.format(url.toDisplayString()), 'backend'.format(url.toDisplayString()))
icon='')
return 'text/html', html return 'text/html', html
@ -415,8 +414,7 @@ def qute_help(url):
"properly. If you are running qutebrowser from the git " "properly. If you are running qutebrowser from the git "
"repository, please run scripts/asciidoc2html.py. " "repository, please run scripts/asciidoc2html.py. "
"If you're running a released version this is a bug, please " "If you're running a released version this is a bug, please "
"use :report to report it.", "use :report to report it.")
icon='')
return 'text/html', html return 'text/html', html
urlpath = url.path() urlpath = url.path()
if not urlpath or urlpath == '/': if not urlpath or urlpath == '/':

2
qutebrowser/browser/webengine/webenginetab.py
View File

@ -693,7 +693,7 @@ class WebEngineTab(browsertab.AbstractTab):
error_page = jinja.render( error_page = jinja.render(
'error.html', 'error.html',
title="Error loading page: {}".format(url_string), title="Error loading page: {}".format(url_string),
url=url_string, error="Authentication required", icon='') url=url_string, error="Authentication required")
self.set_html(error_page) self.set_html(error_page)
@pyqtSlot('QWebEngineFullScreenRequest') @pyqtSlot('QWebEngineFullScreenRequest')

2
qutebrowser/browser/webengine/webview.py
View File

@ -212,7 +212,7 @@ class WebEnginePage(QWebEnginePage):
url_string = url.toDisplayString() url_string = url.toDisplayString()
error_page = jinja.render( error_page = jinja.render(
'error.html', title="Error loading page: {}".format(url_string), 'error.html', title="Error loading page: {}".format(url_string),
url=url_string, error=str(error), icon='') url=url_string, error=str(error))
if error.is_overridable(): if error.is_overridable():
ignore = shared.ignore_certificate_errors( ignore = shared.ignore_certificate_errors(

5
qutebrowser/browser/webkit/network/filescheme.py
View File

@ -101,13 +101,12 @@ def dirbrowser_html(path):
except OSError as e: except OSError as e:
html = jinja.render('error.html', html = jinja.render('error.html',
title="Error while reading directory", title="Error while reading directory",
url='file:///{}'.format(path), error=str(e), url='file:///{}'.format(path), error=str(e))
icon='')
return html.encode('UTF-8', errors='xmlcharrefreplace') return html.encode('UTF-8', errors='xmlcharrefreplace')
files = get_file_list(path, all_files, os.path.isfile) files = get_file_list(path, all_files, os.path.isfile)
directories = get_file_list(path, all_files, os.path.isdir) directories = get_file_list(path, all_files, os.path.isdir)
html = jinja.render('dirbrowser.html', title=title, url=path, icon='', html = jinja.render('dirbrowser.html', title=title, url=path,
parent=parent, files=files, directories=directories) parent=parent, files=files, directories=directories)
return html.encode('UTF-8', errors='xmlcharrefreplace') return html.encode('UTF-8', errors='xmlcharrefreplace')

2
qutebrowser/browser/webkit/webpage.py
View File

@ -170,7 +170,7 @@ class BrowserPage(QWebPage):
title = "Error loading page: {}".format(urlstr) title = "Error loading page: {}".format(urlstr)
error_html = jinja.render( error_html = jinja.render(
'error.html', 'error.html',
title=title, url=urlstr, error=error_str, icon='') title=title, url=urlstr, error=error_str)
errpage.content = error_html.encode('utf-8') errpage.content = error_html.encode('utf-8')
errpage.encoding = 'utf-8' errpage.encoding = 'utf-8'
return True return True

3
qutebrowser/html/base.html
View File

@ -7,9 +7,6 @@ vim: ft=html fileencoding=utf-8 sts=4 sw=4 et:
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ title }}</title> <title>{{ title }}</title>
{% if icon %}
<link rel='icon' type='image/png' href="{{ icon }}">
{% endif %}
<style type="text/css"> <style type="text/css">
{% block style %} {% block style %}
body { body {

2
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -707,7 +707,7 @@ class TabbedBrowser(tabwidget.TabWidget):
url_string = tab.url(requested=True).toDisplayString() url_string = tab.url(requested=True).toDisplayString()
error_page = jinja.render( error_page = jinja.render(
'error.html', title="Error loading {}".format(url_string), 'error.html', title="Error loading {}".format(url_string),
url=url_string, error=msg, icon='') url=url_string, error=msg)
QTimer.singleShot(0, lambda: tab.set_html(error_page)) QTimer.singleShot(0, lambda: tab.set_html(error_page))
log.webview.error(msg) log.webview.error(msg)
else: else: