From c653c27509ffe3d66f0eab96277e9a6a47edee4a Mon Sep 17 00:00:00 2001 From: deflax Date: Sun, 25 Mar 2018 15:09:10 +0300 Subject: [PATCH] moar dashboard eyecandy --- app/panel/routes.py | 8 ++++++-- app/templates/base.html | 2 +- app/templates/panel/vdc_pool.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/panel/routes.py b/app/panel/routes.py index a510769..e46e976 100644 --- a/app/panel/routes.py +++ b/app/panel/routes.py @@ -53,7 +53,11 @@ def dashboard(): for invcls in inv_deployments: if invcls.user_id == cuser.pid: inv_deploycubeids.extend([invcls.machine_id]) - + #warning detector + if invcls.warning == True or invcls.enabled == False: + warnflag = True + else: + warnflag = False inv_services = cuser.inv_services.filter_by(deleted=False).order_by(Service.date_last_charge.asc()).all() inv_domains = cuser.inv_domains.filter_by(deleted=False).order_by(Domain.date_created.desc()).all() @@ -89,5 +93,5 @@ def dashboard(): send_email(current_app.config['MAIL_USERNAME'], 'Cube {} is unreachable'.format(unit_id), 'vmanager/email/adm_unreachable', user=current_user, unit_id=unit_id, error=str(e)) - return render_template('panel/dashboard.html', form=form, sys_regions=sys_regions, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses, rrd=rrd, status=statuses, regions=regions) + return render_template('panel/dashboard.html', form=form, sys_regions=sys_regions, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses, rrd=rrd, status=statuses, warnflag=warnflag, regions=regions) diff --git a/app/templates/base.html b/app/templates/base.html index 93f92ac..6f05f27 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -35,6 +35,7 @@ {% block content %} {% block outside_container %}{% endblock %}
+
{% for message in get_flashed_messages() %}
@@ -42,7 +43,6 @@
{% endfor %} -
{% block page_content %}{% endblock %}
diff --git a/app/templates/panel/vdc_pool.html b/app/templates/panel/vdc_pool.html index 9e3758f..6149b6d 100644 --- a/app/templates/panel/vdc_pool.html +++ b/app/templates/panel/vdc_pool.html @@ -16,7 +16,7 @@ {% if deploy.enabled == False or deploy.warning == True %}
{% else %} -
+
{% endif %}