diff --git a/glances/core/glances_globals.py b/glances/core/glances_globals.py index b5d92b55..47472c4d 100644 --- a/glances/core/glances_globals.py +++ b/glances/core/glances_globals.py @@ -19,7 +19,7 @@ # Glances informations __appname__ = 'glances' -__version__ = '2.0_RC3' +__version__ = '2.0_RC4' __author__ = 'Nicolas Hennion ' __license__ = 'LGPL' diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 9464c168..fe5ea208 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -182,10 +182,15 @@ class glancesBottle: tpl += '
' continue if plugin_name == 'processlist' and m['splittable']: - # Display first word of splittable stats (Process name) - tpl += '%s' % \ - (self.__style_list[m['decoration']], - m['msg'].split(' ', 1)[0].replace(' ', ' ')) + # Processlist: Display first 20 chars of the process name + if m['msg'].split(' ', 1)[0] != '': + tpl += ' %s' % \ + (self.__style_list[m['decoration']], + m['msg'].split(' ', 1)[0].replace(' ', ' ')[:20]) + elif m['optional']: + # Manage optional stats (responsive design) + tpl += '%s' % \ + (self.__style_list[m['decoration']], m['msg'].replace(' ', ' ')) else: # Display stat tpl += '%s' % \ diff --git a/glances/outputs/static/css/style.css b/glances/outputs/static/css/style.css index 48eba91f..49e45f59 100644 --- a/glances/outputs/static/css/style.css +++ b/glances/outputs/static/css/style.css @@ -127,20 +127,31 @@ div#newline{ margin: 1em; } #processlist {} +/* article#processlist>div>div>span:last-child { visibility: hidden; white-space: nowrap; } +*/ #now {} /*Responsive design*/ -@media only screen and (max-width: 1024px) { +@media only screen and (max-width: 1600px) { body { font-size:90%; } } +@media only screen and (max-width: 1280px) { + body { font-size:80%; } +} +@media only screen and (max-width: 1024px) { + body { font-size:80%; } + #processlist .hide { display: none; } +} @media only screen and (max-width: 768px) { - body { font-size:60%; } + body { font-size:70%; } aside { margin-right: 1%; } + .hide { display: none; } } @media only screen and (max-width: 480px) { - body { font-size:30%; } + body { font-size:60%; } aside { margin-right: 1%; } + .hide { display: none; } }