From e0866a12ea8f1db553587080e683240e8019d083 Mon Sep 17 00:00:00 2001 From: Corey Hammerton Date: Wed, 28 Oct 2015 19:54:16 -0400 Subject: [PATCH] puppetboard/catalog: Making the catalog tables searchable Also standardizing the form declarations --- puppetboard/forms.py | 2 +- puppetboard/templates/catalog.html | 2 +- puppetboard/templates/catalog_compare.html | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/puppetboard/forms.py b/puppetboard/forms.py index 5be3b1f..17243c2 100644 --- a/puppetboard/forms.py +++ b/puppetboard/forms.py @@ -25,4 +25,4 @@ class QueryForm(Form): class CatalogForm(Form): """The form used to compare the catalogs of different nodes.""" compare = HiddenField('compare') - against = SelectField(u'against') + against = SelectField('against') diff --git a/puppetboard/templates/catalog.html b/puppetboard/templates/catalog.html index 3a43248..782606c 100644 --- a/puppetboard/templates/catalog.html +++ b/puppetboard/templates/catalog.html @@ -48,7 +48,7 @@ Target - + {% for edge in catalog.get_edges() %} {{edge.source}} diff --git a/puppetboard/templates/catalog_compare.html b/puppetboard/templates/catalog_compare.html index 705210a..a70d8c2 100644 --- a/puppetboard/templates/catalog_compare.html +++ b/puppetboard/templates/catalog_compare.html @@ -1,5 +1,8 @@ {% extends 'layout.html' %} {% block content %} +
+ +
@@ -16,7 +19,7 @@ - + {% for resource in compare.get_resources() %} @@ -30,7 +33,7 @@ - + {% for resource in against.get_resources() %} @@ -50,7 +53,7 @@ - + {% for edge in compare.get_edges() %} @@ -70,7 +73,7 @@ - + {% for edge in against.get_edges() %}
Resources
{{resource.type_}}[{{resource.name}}]
Resources
{{resource.type_}}[{{resource.name}}]Target
{{edge.source}}Target
{{edge.source}}