diff options
| author | Nicolargo <nicolas@nicolargo.com> | 2015-01-03 17:43:14 +0100 |
|---|---|---|
| committer | Nicolargo <nicolas@nicolargo.com> | 2015-01-03 17:43:14 +0100 |
| commit | 0a99364c9f4a04bcdd6fb086b3f617836e6c0643 (patch) | |
| tree | d706d686b68b6f3ca0965200870a1f7cbba82d93 | |
| parent | ea1bb83b61c89b94d65db29e4e3f284329ac8404 (diff) | |
| parent | 86760cfa100192aa32009fd75b80691c1b00ee96 (diff) | |
Merge branch 'develop' of github.com:nicolargo/glances into develop
| -rw-r--r-- | glances/outputs/bottle/base.tpl | 1 | ||||
| -rw-r--r-- | glances/outputs/glances_bottle.py | 6 | ||||
| -rw-r--r-- | glances/outputs/static/favicon.ico | bin | 0 -> 4286 bytes |
3 files changed, 7 insertions, 0 deletions
diff --git a/glances/outputs/bottle/base.tpl b/glances/outputs/bottle/base.tpl index c0fec737..30f73a35 100644 --- a/glances/outputs/bottle/base.tpl +++ b/glances/outputs/bottle/base.tpl @@ -5,6 +5,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/> <title>Glances</title> + <link rel="icon" type="image/x-icon" href="favicon.ico" /> <link rel="stylesheet" type="text/css" href="normalize.css" /> <link rel="stylesheet" type="text/css" href="bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="style.css" /> diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 25237225..ac19f2d3 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -62,6 +62,7 @@ class GlancesBottle(object): self._app.route('/<refresh_time:int>', method=["GET", "POST"], callback=self._index) self._app.route('/<filename:re:.*\.css>', method="GET", callback=self._css) self._app.route('/<filename:re:.*\.js>', method="GET", callback=self._js) + self._app.route('/favicon.ico', method="GET", callback=self._favicon) # REST API self._app.route('/api/2/pluginslist', method="GET", callback=self._api_plugins) self._app.route('/api/2/all', method="GET", callback=self._api_all) @@ -110,6 +111,11 @@ class GlancesBottle(object): # Return the static file return static_file(filename, root=os.path.join(self.STATIC_PATH, 'js')) + def _favicon(self): + """Bottle callback for favicon.""" + # Return the static file + return static_file('favicon.ico', root=self.STATIC_PATH) + def _api_plugins(self): """ Glances API RESTFul implementation diff --git a/glances/outputs/static/favicon.ico b/glances/outputs/static/favicon.ico Binary files differnew file mode 100644 index 00000000..5722f077 --- /dev/null +++ b/glances/outputs/static/favicon.ico |