From d84b547d77869f5356d5aedcd76ef195185cce1e Mon Sep 17 00:00:00 2001 From: checktheroads Date: Wed, 7 Aug 2019 11:09:18 -0700 Subject: [PATCH] :lipstick: Bulma > Bootstrap --- hyperglass/render/templates/404.html.j2 | 6 ++-- hyperglass/render/templates/500.html.j2 | 6 ++-- hyperglass/render/templates/base.html.j2 | 1 + hyperglass/render/templates/errortext.html.j2 | 19 +++++------ hyperglass/render/templates/index.html.j2 | 4 +-- .../render/templates/ratelimit-query.html.j2 | 33 +++++++++++-------- .../render/templates/ratelimit-site.html.j2 | 12 ++----- 7 files changed, 37 insertions(+), 44 deletions(-) diff --git a/hyperglass/render/templates/404.html.j2 b/hyperglass/render/templates/404.html.j2 index 7b21267..00256c3 100644 --- a/hyperglass/render/templates/404.html.j2 +++ b/hyperglass/render/templates/404.html.j2 @@ -1,10 +1,8 @@ {% extends "templates/base.html.j2" %} {% block content %} -
- {% import "templates/errortext.html.j2" as errortext %} - {{ errortext.errortext(branding.text.error404.title, branding.text.error404.subtitle.format(uri=uri), branding.text.error404.button, "h1", "h3") }} -
+{% import "templates/errortext.html.j2" as errortext %} + {{ errortext.errortext(branding.text.error404.title, branding.text.error404.subtitle.format(uri=uri), branding.text.error404.button) }} {% endblock %} {% block footer %} diff --git a/hyperglass/render/templates/500.html.j2 b/hyperglass/render/templates/500.html.j2 index 92604e5..cb1e58a 100644 --- a/hyperglass/render/templates/500.html.j2 +++ b/hyperglass/render/templates/500.html.j2 @@ -1,10 +1,8 @@ {% extends "templates/base.html.j2" %} {% block content %} -
- {% import "templates/errortext.html.j2" as errortext %} - {{ errortext.errortext(branding.text.error500.title, branding.text.error500.subtitle, branding.text.error500.button, "h1", "h3") }} -
+{% import "templates/errortext.html.j2" as errortext %} + {{ errortext.errortext(branding.text.error500.title, branding.text.error500.subtitle, branding.text.error500.button) }} {% endblock %} {% block footer %} diff --git a/hyperglass/render/templates/base.html.j2 b/hyperglass/render/templates/base.html.j2 index 7fe065f..ebb6ac3 100644 --- a/hyperglass/render/templates/base.html.j2 +++ b/hyperglass/render/templates/base.html.j2 @@ -22,6 +22,7 @@ +{% include "templates/ratelimit-query.html.j2" %}
diff --git a/hyperglass/render/templates/errortext.html.j2 b/hyperglass/render/templates/errortext.html.j2 index 0d4de63..2087f90 100644 --- a/hyperglass/render/templates/errortext.html.j2 +++ b/hyperglass/render/templates/errortext.html.j2 @@ -1,12 +1,11 @@ -{% macro errortext(title, subtitle, button, size_title="h1", size_subtitle="h3") -%} -
- <{{ size_title }} class="ui header">{{ title }} - - <{{ size_subtitle }} class="ui header">{{ subtitle }} -
- +{% macro errortext(title, subtitle, button) -%} + +
+
+

{{ title }}

+

{{ subtitle }}

+
+ {{ button }} +
{%- endmacro %} \ No newline at end of file diff --git a/hyperglass/render/templates/index.html.j2 b/hyperglass/render/templates/index.html.j2 index 1f87c57..91127f9 100644 --- a/hyperglass/render/templates/index.html.j2 +++ b/hyperglass/render/templates/index.html.j2 @@ -1,7 +1,5 @@ {% extends "templates/base.html.j2" %} -{# {% include "templates/ratelimit-query.html.j2" %} #} - {% block content %}
+ aria-label="{{ branding.text.query_placeholder }}" aria-describedby="query_target" id="query_target">
+
#} +
+ +

{{ features.rate_limit.query.title }}

+

{{ features.rate_limit.query.message }}

+
+
+ +
+
\ No newline at end of file diff --git a/hyperglass/render/templates/ratelimit-site.html.j2 b/hyperglass/render/templates/ratelimit-site.html.j2 index d51d157..8504252 100644 --- a/hyperglass/render/templates/ratelimit-site.html.j2 +++ b/hyperglass/render/templates/ratelimit-site.html.j2 @@ -1,16 +1,8 @@ {% extends "templates/base.html.j2" %} - - {% block head %} - {% include "templates/inlinestyle.html.j2" %} - {% endblock %} - - {% block content %} -
- {% import "templates/errortext.html.j2" as errortext %} - {{ errortext.errortext(features.rate_limit.site.title, features.rate_limit.site.subtitle, features.rate_limit.site.button, "h1", "h3") }} -
+{% import "templates/errortext.html.j2" as errortext %} + {{ errortext.errortext(features.rate_limit.site.title, features.rate_limit.site.subtitle, features.rate_limit.site.button) }} {% endblock %} {% block footer %}