Commit bf4e1063 authored by echel0n's avatar echel0n
Browse files

Updated remaining ui-icon icons to fontawesome.

Fixed issue #260 - removed redundant clear errors and clear warnings button, merged into one button.
parent 5962b546
# Changelog
- * 1ebac36 - 2018-09-20: Added UHD to quality preset ANY. Added quality preset "ANY + Unknown". Added ability to set quality size for unknown qualities.
- * 6f293ad - 2018-09-20: Updated remaining ui-icon icons to fontawesome. Fixed issue #260 - removed redundant clear errors and clear warnings button, merged into one button.
- * 5962b54 - 2018-09-20: Added UHD to quality preset ANY. Added quality preset "ANY + Unknown". Added ability to set quality size for unknown qualities.
- * 5bf995b - 2018-09-18: Release v9.3.79
- * dbb7543 - 2018-09-18: Fixed issue with custom webroot and too many redirects
- * a7d0209 - 2018-09-17: Pre-Release v9.3.79.dev10
......
......@@ -1895,7 +1895,7 @@ class Home(WebHandler):
submenu = [
{'title': _('Edit'), 'path': '/home/editShow?show=%d' % showObj.indexerid,
'icon': 'ui-icon ui-icon-pencil'}]
'icon': 'fas fa-edit'}]
return self.render(
"/home/test_renaming.mako",
......@@ -3603,9 +3603,9 @@ class History(WebHandler):
history['actions'].sort(key=lambda d: d['time'], reverse=True)
submenu = [
{'title': _('Clear History'), 'path': '/history/clearHistory', 'icon': 'ui-icon ui-icon-trash',
{'title': _('Clear History'), 'path': '/history/clearHistory', 'icon': 'fas fa-trash',
'class': 'clearhistory', 'confirm': True},
{'title': _('Trim History'), 'path': '/history/trimHistory', 'icon': 'ui-icon ui-icon-trash',
{'title': _('Trim History'), 'path': '/history/trimHistory', 'icon': 'fas fa-cut',
'class': 'trimhistory', 'confirm': True},
]
......@@ -4858,14 +4858,11 @@ class Logs(WebHandler):
def __init__(self, *args, **kwargs):
super(Logs, self).__init__(*args, **kwargs)
def LogsMenu(self, level):
def LogsMenu(self):
menu = [
{'title': _('Clear Errors'), 'path': '/logs/clearerrors/',
'requires': self.haveErrors() and level == sickrage.app.log.ERROR,
'icon': 'ui-icon ui-icon-trash'},
{'title': _('Clear Warnings'), 'path': '/logs/clearerrors/?level=' + str(sickrage.app.log.WARNING),
'requires': self.haveWarnings() and level == sickrage.app.log.WARNING,
'icon': 'ui-icon ui-icon-trash'},
{'title': _('Clear All'), 'path': '/logs/clearAll/',
'requires': self.haveErrors() or self.haveWarnings(),
'icon': 'fas fa-trash'},
]
return menu
......@@ -4877,7 +4874,7 @@ class Logs(WebHandler):
header="Logs & Errors",
title="Logs & Errors",
topmenu="system",
submenu=self.LogsMenu(level),
submenu=self.LogsMenu(),
logLevel=level,
controller='logs',
action='errors'
......@@ -4893,11 +4890,9 @@ class Logs(WebHandler):
if len(WarningViewer.errors) > 0:
return True
def clearerrors(self, level=None):
if int(level or sickrage.app.log.ERROR) == sickrage.app.log.WARNING:
WarningViewer.clear()
else:
ErrorViewer.clear()
def clearAll(self):
WarningViewer.clear()
ErrorViewer.clear()
return self.redirect("/logs/viewlog/")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment