From dab1d03d81c538966d03fb9318a4588a9e803b44 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 24 Mar 2012 11:20:07 -0500 Subject: Allow to run directly from a git checkout (#1037) Signed-off-by: Sol Jerome --- src/lib/Server/Reports/reports/templates/404.html | 8 -- .../Reports/reports/templates/base-timeview.html | 25 ---- src/lib/Server/Reports/reports/templates/base.html | 95 --------------- .../Reports/reports/templates/clients/detail.html | 127 --------------------- .../reports/templates/clients/detailed-list.html | 46 -------- .../Reports/reports/templates/clients/history.html | 20 ---- .../Reports/reports/templates/clients/index.html | 34 ------ .../Reports/reports/templates/clients/manage.html | 45 -------- .../reports/templates/config_items/item.html | 115 ------------------- .../reports/templates/config_items/listing.html | 33 ------ .../reports/templates/displays/summary.html | 42 ------- .../Reports/reports/templates/displays/timing.html | 38 ------ .../reports/templates/widgets/filter_bar.html | 13 --- .../reports/templates/widgets/interaction_list.inc | 38 ------ .../reports/templates/widgets/page_bar.html | 23 ---- 15 files changed, 702 deletions(-) delete mode 100644 src/lib/Server/Reports/reports/templates/404.html delete mode 100644 src/lib/Server/Reports/reports/templates/base-timeview.html delete mode 100644 src/lib/Server/Reports/reports/templates/base.html delete mode 100644 src/lib/Server/Reports/reports/templates/clients/detail.html delete mode 100644 src/lib/Server/Reports/reports/templates/clients/detailed-list.html delete mode 100644 src/lib/Server/Reports/reports/templates/clients/history.html delete mode 100644 src/lib/Server/Reports/reports/templates/clients/index.html delete mode 100644 src/lib/Server/Reports/reports/templates/clients/manage.html delete mode 100644 src/lib/Server/Reports/reports/templates/config_items/item.html delete mode 100644 src/lib/Server/Reports/reports/templates/config_items/listing.html delete mode 100644 src/lib/Server/Reports/reports/templates/displays/summary.html delete mode 100644 src/lib/Server/Reports/reports/templates/displays/timing.html delete mode 100644 src/lib/Server/Reports/reports/templates/widgets/filter_bar.html delete mode 100644 src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc delete mode 100644 src/lib/Server/Reports/reports/templates/widgets/page_bar.html (limited to 'src/lib/Server/Reports/reports/templates') diff --git a/src/lib/Server/Reports/reports/templates/404.html b/src/lib/Server/Reports/reports/templates/404.html deleted file mode 100644 index 168bd9fec..000000000 --- a/src/lib/Server/Reports/reports/templates/404.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'base.html' %} -{% block title %}Bcfg2 - Page not found{% endblock %} -{% block fullcontent %} -

Page not found

-

-The page or object requested could not be found. -

-{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/base-timeview.html b/src/lib/Server/Reports/reports/templates/base-timeview.html deleted file mode 100644 index 842de36f0..000000000 --- a/src/lib/Server/Reports/reports/templates/base-timeview.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} - -{% block timepiece %} - -{% if not timestamp %}Rendered at {% now "Y-m-d H:i" %} | {% else %}View as of {{ timestamp|date:"Y-m-d H:i" }} | {% endif %}{% spaceless %} - [change] -
-{% endspaceless %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/base.html b/src/lib/Server/Reports/reports/templates/base.html deleted file mode 100644 index f541c0d2b..000000000 --- a/src/lib/Server/Reports/reports/templates/base.html +++ /dev/null @@ -1,95 +0,0 @@ -{% load bcfg2_tags %} - - - - - -{% block title %}Bcfg2 Reporting System{% endblock %} - - - - - - - - - - - - - -{% block extra_header_info %}{% endblock %} - - - - - - -
-
- {% block fullcontent %} -
-

{% block pagebanner %}Page Banner{% endblock %}

-
{% block timepiece %}Rendered at {% now "Y-m-d H:i" %}{% endblock %}
-
-
- {% block content %}{% endblock %} -
- {% endblock %} -
-
- {% block sidemenu %} -
    -
  • Overview
    • -
- -
    -
  • Clients
    • -
- -
    -
  • Entries Configured
    • -
- -{% comment %} - TODO -
    -
  • Entry Types
    • -
- -{% endcomment %} - - {% endblock %} -
-
-
- - - - - diff --git a/src/lib/Server/Reports/reports/templates/clients/detail.html b/src/lib/Server/Reports/reports/templates/clients/detail.html deleted file mode 100644 index dd4295f21..000000000 --- a/src/lib/Server/Reports/reports/templates/clients/detail.html +++ /dev/null @@ -1,127 +0,0 @@ -{% extends "base.html" %} -{% load bcfg2_tags %} - -{% block title %}Bcfg2 - Client {{client.name}}{% endblock %} - -{% block extra_header_info %} - -{% endblock %} - -{% block body_onload %}javascript:clientdetailload(){% endblock %} - -{% block pagebanner %}Client Details{% endblock %} - -{% block content %} -
-

{{client.name}}

- [manage] - View History | Jump to  - -
- - {% if interaction.isstale %} -
- This node did not run within the last 24 hours — it may be out of date. -
- {% endif %} - - - {% if interaction.server %} - - {% endif %} - {% if interaction.repo_rev_code %} - - {% endif %} - - - {% if not interaction.isclean %} - - {% endif %} -
Timestamp{{interaction.timestamp}}
Served by{{interaction.server}}
Revision{{interaction.repo_rev_code}}
State{{interaction.state|capfirst}}
Managed entries{{interaction.totalcount}}
Deviation{{interaction.percentbad|floatformat:"3"}}%
- - {% if interaction.bad_entry_count %} -
-
-

Bad Entries — {{ interaction.bad_entry_count }}

-
[+]
-
- - {% for e in interaction.bad|sortwell %} - - - - - {% endfor %} -
{{e.entry.kind}}: - {{e.entry.name}}
-
- {% endif %} - - {% if interaction.modified_entry_count %} -
-
-

Modified Entries — {{ interaction.modified_entry_count }}

-
[+]
-
- - {% for e in interaction.modified|sortwell %} - - - - - {% endfor %} -
{{e.entry.kind}}: - {{e.entry.name}}
-
- {% endif %} - - {% if interaction.extra_entry_count %} -
-
-

Extra Entries — {{ interaction.extra_entry_count }}

-
[+]
-
- - {% for e in interaction.extra|sortwell %} - - - - - {% endfor %} -
{{e.entry.kind}}:{{e.entry.name}}
-
- {% endif %} - - {% if entry_list %} -
-
-

Recent Interactions

-
-
- {% include "widgets/interaction_list.inc" %} -
more...
-
-
- {% endif %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/clients/detailed-list.html b/src/lib/Server/Reports/reports/templates/clients/detailed-list.html deleted file mode 100644 index 0c1fae8d5..000000000 --- a/src/lib/Server/Reports/reports/templates/clients/detailed-list.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends "base-timeview.html" %} -{% load bcfg2_tags %} - -{% block title %}Bcfg2 - Detailed Client Listing{% endblock %} -{% block pagebanner %}Clients - Detailed View{% endblock %} - -{% block content %} -
-{% if entry_list %} - {% filter_navigator %} - - - - - - - - - - - - {% for entry in entry_list %} - - - - - - - - - - - {% endfor %} -
NodeStateGoodBadModifiedExtraLast RunServer
{{ entry.client.name }}{{ entry.state }}{{ entry.goodcount }}{{ entry.bad_entry_count }}{{ entry.modified_entry_count }}{{ entry.extra_entry_count }}{{ entry.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe }} - {% if entry.server %} - {{ entry.server }} - {% else %} -   - {% endif %} -
-{% else %} -

No client records are available.

-{% endif %} -
-{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/clients/history.html b/src/lib/Server/Reports/reports/templates/clients/history.html deleted file mode 100644 index 01d4ec2f4..000000000 --- a/src/lib/Server/Reports/reports/templates/clients/history.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} -{% load bcfg2_tags %} - -{% block title %}Bcfg2 - Interaction History{% endblock %} -{% block pagebanner %}Interaction history{% if client %} for {{ client.name }}{% endif %}{% endblock %} - -{% block extra_header_info %} -{% endblock %} - -{% block content %} -
-{% if entry_list %} - {% filter_navigator %} - {% include "widgets/interaction_list.inc" %} -{% else %} -

No client records are available.

-{% endif %} -
-{% page_navigator %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/clients/index.html b/src/lib/Server/Reports/reports/templates/clients/index.html deleted file mode 100644 index e0c0d2d7a..000000000 --- a/src/lib/Server/Reports/reports/templates/clients/index.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "base-timeview.html" %} - -{% block extra_header_info %} -{% endblock%} - -{% block title %}Bcfg2 - Client Grid View{% endblock %} - -{% block pagebanner %}Clients - Grid View{% endblock %} - -{% block content %} - -{% if inter_list %} - - {% for inter in inter_list %} - {% if forloop.first %}{% endif %} - - {% if forloop.last %} - - {% else %} - {% if forloop.counter|divisibleby:"4" %}{% endif %} - {% endif %} - {% endfor %} -
- {{ inter.client.name }} -
-{% else %} -

No client records are available.

-{% endif %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/clients/manage.html b/src/lib/Server/Reports/reports/templates/clients/manage.html deleted file mode 100644 index 5725ae577..000000000 --- a/src/lib/Server/Reports/reports/templates/clients/manage.html +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "base.html" %} - -{% block extra_header_info %} -{% endblock%} - -{% block title %}Bcfg2 - Manage Clients{% endblock %} - -{% block pagebanner %}Clients - Manage{% endblock %} - -{% block content %} -
- {% if message %} -
{{ message }}
- {% endif %} -{% if clients %} - - - - - - - {% for client in clients %} - - - - - - {% endfor %} -
NodeExpirationManage
- - - {{ client.name }}{% firstof client.expiration 'Active' %} -
-
{# here for no reason other then to validate #} - - - -
-
-
-
-{% else %} -

No client records are available.

-{% endif %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/config_items/item.html b/src/lib/Server/Reports/reports/templates/config_items/item.html deleted file mode 100644 index cc99ef503..000000000 --- a/src/lib/Server/Reports/reports/templates/config_items/item.html +++ /dev/null @@ -1,115 +0,0 @@ -{% extends "base.html" %} -{% load syntax_coloring %} - - -{% block title %}Bcfg2 - Element Details{% endblock %} - - -{% block extra_header_info %} - -{% endblock%} - -{% block pagebanner %}Element Details{% endblock %} - -{% block content %} -
-

{{mod_or_bad|capfirst}} {{item.entry.kind}}: {{item.entry.name}}

-
- -
- - {% if isextra %} -

This item exists on the host but is not defined in the configuration.

- {% endif %} - - {% if not item.reason.current_exists %} -
This item does not currently exist on the host but is specified to exist in the configuration.
- {% endif %} - - {% if item.reason.current_owner or item.reason.current_group or item.reason.current_perms or item.reason.current_status or item.reason.current_status or item.reason.current_to or item.reason.current_version %} - - - - {% if item.reason.current_owner %} - - - {% endif %} - {% if item.reason.current_group %} - - - {% endif %} - {% if item.reason.current_perms %} - - - {% endif %} - {% if item.reason.current_status %} - - - {% endif %} - {% if item.reason.current_to %} - - - {% endif %} - {% if item.reason.current_version %} - - - {% endif %} -
Problem TypeExpectedFound
Owner{{item.reason.owner}}{{item.reason.current_owner}}
Group{{item.reason.group}}{{item.reason.current_group}}
Permissions{{item.reason.perms}}{{item.reason.current_perms}}
Status{{item.reason.status}}{{item.reason.current_status}}
Symlink Target{{item.reason.to}}{{item.reason.current_to}}
Package Version{{item.reason.version|cut:"("|cut:")"}}{{item.reason.current_version|cut:"("|cut:")"}}
- {% endif %} - - {% if item.reason.current_diff or item.reason.is_sensitive %} -
-
- {% if item.reason.is_sensitive %} -

File contents unavailable, as they might contain sensitive data.

- {% else %} -

Incorrect file contents

- {% endif %} -
- {% if not item.reason.is_sensitive %} -
- {{ item.reason.current_diff|syntaxhilight }} -
- {% endif %} -
- {% endif %} - - -
-
-

Occurences on {{ timestamp|date:"Y-m-d" }}

-
- {% if associated_list %} - - {% for inter in associated_list %} - - - - {% endfor %} -
{{inter.client.name}}{{inter.timestamp}}
- {% else %} -

Missing client list

- {% endif %} -
- -
-{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Server/Reports/reports/templates/config_items/listing.html deleted file mode 100644 index 9b1026a08..000000000 --- a/src/lib/Server/Reports/reports/templates/config_items/listing.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "base-timeview.html" %} -{% load bcfg2_tags %} - -{% block title %}Bcfg2 - Element Listing{% endblock %} - -{% block extra_header_info %} -{% endblock%} - -{% block pagebanner %}{{mod_or_bad|capfirst}} Element Listing{% endblock %} - -{% block content %} -{% if item_list_dict %} - {% for kind, entries in item_list_dict.items %} - -
-
-

{{ kind }} — {{ entries|length }}

-
[–]
-
- - - {% for e in entries %} - - - - {% endfor %} -
{{e.entry.name}}
-
- {% endfor %} -{% else %} -

There are currently no inconsistent configuration entries.

-{% endif %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/displays/summary.html b/src/lib/Server/Reports/reports/templates/displays/summary.html deleted file mode 100644 index b9847cf96..000000000 --- a/src/lib/Server/Reports/reports/templates/displays/summary.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "base-timeview.html" %} -{% load bcfg2_tags %} - -{% block title %}Bcfg2 - Client Summary{% endblock %} -{% block pagebanner %}Clients - Summary{% endblock %} - -{% block body_onload %}javascript:hide_table_array(hide_tables){% endblock %} - -{% block extra_header_info %} - -{% endblock%} - -{% block content %} -
-

{{ node_count }} nodes reporting in

-
-{% if summary_data %} - {% for summary in summary_data %} -
-
-

{{ summary.nodes|length }} {{ summary.label }}

-
[+]
-
- - - {% for node in summary.nodes|sort_interactions_by_name %} - - - - {% endfor %} -
{{ node.client.name }}
-
- {% endfor %} -{% else %} -

No data to report on

-{% endif %} -{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/displays/timing.html b/src/lib/Server/Reports/reports/templates/displays/timing.html deleted file mode 100644 index 47accb2cb..000000000 --- a/src/lib/Server/Reports/reports/templates/displays/timing.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base-timeview.html" %} -{% load bcfg2_tags %} - -{% block title %}Bcfg2 - Performance Metrics{% endblock %} -{% block pagebanner %}Performance Metrics{% endblock %} - - -{% block extra_header_info %} -{% endblock%} - -{% block content %} -
- {% if metrics %} - - - - - - - - - - - {% for metric in metrics|dictsort:"name" %} - - - {% for mitem in metric|build_metric_list %} - - {% endfor %} - - {% endfor %} -
NameParseProbeInventoryInstallConfigTotal
{{ metric.name }}{{ mitem }}
- {% else %} -

No metric data available

- {% endif %} -
-{% endblock %} diff --git a/src/lib/Server/Reports/reports/templates/widgets/filter_bar.html b/src/lib/Server/Reports/reports/templates/widgets/filter_bar.html deleted file mode 100644 index 6b57baf6a..000000000 --- a/src/lib/Server/Reports/reports/templates/widgets/filter_bar.html +++ /dev/null @@ -1,13 +0,0 @@ -{% spaceless %} -{% if filters %} -{% for filter, filter_url in filters %} - {% if forloop.first %} -
Active filters (click to remove): - {% endif %} - {{ filter|capfirst }}{% if not forloop.last %}, {% endif %} - {% if forloop.last %} -
- {% endif %} -{% endfor %} -{% endif %} -{% endspaceless %} diff --git a/src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc b/src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc deleted file mode 100644 index 8f2dec1dc..000000000 --- a/src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc +++ /dev/null @@ -1,38 +0,0 @@ -{% load bcfg2_tags %} -
- - - - {% if not client %} - - {% endif %} - - - - - - - - {% for entry in entry_list %} - - - {% if not client %} - - {% endif %} - - - - - - - - {% endfor %} -
TimestampClientStateGoodBadModifiedExtraServer
{{ entry.timestamp|date:"Y-m-d\&\n\b\s\p\;H:i"|safe }}{{ entry.client.name }}{{ entry.state }}{{ entry.goodcount }}{{ entry.bad_entry_count }}{{ entry.modified_entry_count }}{{ entry.extra_entry_count }} - {% if entry.server %} - {{ entry.server }} - {% else %} -   - {% endif %} -
-
diff --git a/src/lib/Server/Reports/reports/templates/widgets/page_bar.html b/src/lib/Server/Reports/reports/templates/widgets/page_bar.html deleted file mode 100644 index aa0def83e..000000000 --- a/src/lib/Server/Reports/reports/templates/widgets/page_bar.html +++ /dev/null @@ -1,23 +0,0 @@ -{% spaceless %} -{% for page, page_url in pager %} - {% if forloop.first %} -
- {% if prev_page %}< Prev {% endif %} - {% if first_page %}1 ... {% endif %} - {% endif %} - {% ifequal page current_page %} - {{ page }} - {% else %} - {{ page }} - {% endifequal %} - {% if forloop.last %} - {% if last_page %} ... {{ total_pages }} {% endif %} - {% if next_page %}Next > {% endif %} - |{% for limit, limit_url in page_limits %} {{ limit }}{% endfor %} -
- {% else %} -   - {% endif %} -{% endfor %} -{% endspaceless %} - -- cgit v1.2.3-1-g7c22