Change Curses message for history

This commit is contained in:
Nicolargo 2016-05-31 14:09:23 +02:00
parent 95260056d5
commit 6a049073da
4 changed files with 8 additions and 3 deletions

View File

@ -13,3 +13,5 @@ API documentation is available at:
.. _XML-RPC server: http://docs.python.org/2/library/simplexmlrpcserver.html
.. _RESTful-JSON: http://jsonapi.org/
.. autobottle:: glances.outputs.glances_bottle:GlancesBottle.app

View File

@ -34,7 +34,7 @@ from glances import __version__
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = []
extensions = ['sphinxcontrib.autohttp.bottle']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

View File

@ -59,6 +59,9 @@ class GlancesBottle(object):
# Path where the statics files are stored
self.STATIC_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'static')
def app(self):
return self._app()
def check_auth(self, username, password):
"""Check if a username/password combination is valid."""
if username == self.args.username:

View File

@ -770,9 +770,9 @@ class _GlancesCurses(object):
try:
self.glances_graph.graph_enabled()
except Exception:
self.display_popup('History disabled\nEnable it using --enable-history')
self.display_popup('History disabled\nEnable it using --export-graph')
else:
self.display_popup('History disabled\nPlease install matplotlib')
self.display_popup('History disabled')
self.graph_tag = False
self.reset_history_tag = False