Skip to content

Display of web page is improved #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lwzm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Display of web page is improved #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1237822
Reserve the sequence of nodes
lwzm Jul 26, 2017
0456377
Show suitable version at web
lwzm Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion psdash/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from gevent.pywsgi import WSGIServer
import locale
import argparse
import collections
import logging
import socket
import urllib
Expand Down Expand Up @@ -33,7 +34,7 @@ def create_from_cli_args(cls):
return cls(args=None)

def __init__(self, config_overrides=None, args=tuple()):
self._nodes = {}
self._nodes = collections.OrderedDict()
config = self._load_args_config(args)
if config_overrides:
config.update(config_overrides)
Expand Down
2 changes: 1 addition & 1 deletion psdash/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="header">
<div class="logo">
<a href="{{ url_for(".index") }}">
<span class="app-name"># psdash <small>v0.6.0</small></span>
<span class="app-name"># psdash <small>v{{ psdash_version }}</small></span>
</a>
</div>
<div class="top-nav">
Expand Down
4 changes: 3 additions & 1 deletion psdash/web.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import locale
from flask import render_template, request, session, jsonify, Response, Blueprint, current_app, g
from werkzeug.local import LocalProxy
from psdash import __version__ as psdash_version
from psdash.helpers import socket_families, socket_types

logger = logging.getLogger('psdash.web')
Expand Down Expand Up @@ -43,7 +44,8 @@ def inject_header_data():
return {
'os': sysinfo['os'].decode('utf-8'),
'hostname': sysinfo['hostname'].decode('utf-8'),
'uptime': uptime
'uptime': uptime,
'psdash_version': psdash_version,
}

@webapp.url_defaults
Expand Down