From 27f9e6aadbde3cefaad2aea77d0e46ce26708ef3 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 1 Jun 2023 11:22:15 +0300 Subject: [PATCH] Address review comments --- ietf/static/images/iab-logo-white.svg | 64 +++++++++ ietf/static/images/ietf-logo-nor-white.svg | 160 +++++++++++++++++---- ietf/static/images/ietf-logo-white.svg | 146 +++++++++++++++++++ ietf/static/images/irtf-logo-white.svg | 65 +++++++++ ietf/static/images/irtf-logo.svg | 12 +- ietf/templates/401.html | 4 +- ietf/templates/403.html | 4 +- ietf/templates/404.html | 4 +- ietf/templates/500.html | 4 +- ietf/templates/doc/document_info.html | 14 +- ietf/templates/doc/frontpage.html | 6 +- ietf/templates/logo.html | 11 ++ ietf/templates/oidc_provider/error.html | 4 +- package.json | 3 + 14 files changed, 441 insertions(+), 60 deletions(-) create mode 100644 ietf/static/images/iab-logo-white.svg create mode 100644 ietf/static/images/ietf-logo-white.svg create mode 100644 ietf/static/images/irtf-logo-white.svg create mode 100644 ietf/templates/logo.html diff --git a/ietf/static/images/iab-logo-white.svg b/ietf/static/images/iab-logo-white.svg new file mode 100644 index 000000000..264b7bb84 --- /dev/null +++ b/ietf/static/images/iab-logo-white.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + diff --git a/ietf/static/images/ietf-logo-nor-white.svg b/ietf/static/images/ietf-logo-nor-white.svg index 004e58af8..42c033600 100644 --- a/ietf/static/images/ietf-logo-nor-white.svg +++ b/ietf/static/images/ietf-logo-nor-white.svg @@ -1,26 +1,136 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ietf/static/images/ietf-logo-white.svg b/ietf/static/images/ietf-logo-white.svg new file mode 100644 index 000000000..2417f917c --- /dev/null +++ b/ietf/static/images/ietf-logo-white.svg @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ietf/static/images/irtf-logo-white.svg b/ietf/static/images/irtf-logo-white.svg new file mode 100644 index 000000000..a67412581 --- /dev/null +++ b/ietf/static/images/irtf-logo-white.svg @@ -0,0 +1,65 @@ + + + + + R + + + + + + diff --git a/ietf/static/images/irtf-logo.svg b/ietf/static/images/irtf-logo.svg index be64890b2..10b2a9681 100644 --- a/ietf/static/images/irtf-logo.svg +++ b/ietf/static/images/irtf-logo.svg @@ -6,7 +6,7 @@ version="1.1" id="svg303" sodipodi:docname="irtf-logo.svg" - inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)" + inkscape:version="1.2.2 (b0a84865, 2022-12-01)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -24,12 +24,12 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="1.0373737" - inkscape:cx="304.1334" - inkscape:cy="446.80136" + inkscape:cx="303.65142" + inkscape:cy="447.76535" inkscape:window-width="1797" inkscape:window-height="1083" inkscape:window-x="951" - inkscape:window-y="445" + inkscape:window-y="417" inkscape:window-maximized="0" inkscape:current-layer="svg303" /> R + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

Authentication Required

diff --git a/ietf/templates/403.html b/ietf/templates/403.html index 155e4ea99..2ea87eb3a 100644 --- a/ietf/templates/403.html +++ b/ietf/templates/403.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}Error: Restricted Access{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

Restricted Access

diff --git a/ietf/templates/404.html b/ietf/templates/404.html index de247c89a..b21bd5d97 100644 --- a/ietf/templates/404.html +++ b/ietf/templates/404.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}Error: Page Not Found{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

The page you were looking for couldn't be found

diff --git a/ietf/templates/500.html b/ietf/templates/500.html index b7ea01bdd..bd205dad6 100644 --- a/ietf/templates/500.html +++ b/ietf/templates/500.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}500 Internal Server Error{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

Internal Server Error

diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html index 392c5f124..18a809bd2 100644 --- a/ietf/templates/doc/document_info.html +++ b/ietf/templates/doc/document_info.html @@ -238,17 +238,9 @@ href="{% url 'ietf.doc.views_draft.review_possibly_replaces' name=doc.name %}">E {% endif %} {% if document_html %} {% if doc.stream.name|lower in 'iab,ietf,irtf' %} - {{ doc.stream.name|upper }} Logo +
+ {% include "logo.html" with org=doc.stream.name|lower classes="w-25 mt-1" only %} +
{% else %} {{ stream_desc }} {% endif %} diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html index 38575aab4..070a7878f 100644 --- a/ietf/templates/doc/frontpage.html +++ b/ietf/templates/doc/frontpage.html @@ -11,9 +11,9 @@
- + {% if server_mode != "production" %}

Datatracker – {{ server_mode|capfirst }} Mode

{% else %} diff --git a/ietf/templates/logo.html b/ietf/templates/logo.html new file mode 100644 index 000000000..bd57c6990 --- /dev/null +++ b/ietf/templates/logo.html @@ -0,0 +1,11 @@ +{% load origin %} +{% load static %} +{% origin %} + + + + {{ org|upper }} Logo + \ No newline at end of file diff --git a/ietf/templates/oidc_provider/error.html b/ietf/templates/oidc_provider/error.html index db41e6395..0499c750e 100644 --- a/ietf/templates/oidc_provider/error.html +++ b/ietf/templates/oidc_provider/error.html @@ -3,9 +3,7 @@ {% load static %} {% block title %}Permission Error{% endblock %} {% block content %} - IETF + {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}

{{ error }}

diff --git a/package.json b/package.json index d49b6ad63..7261c75e4 100644 --- a/package.json +++ b/package.json @@ -89,6 +89,7 @@ "ietf/static/css/select2.scss", "ietf/static/images/iab-logo-card.png", "ietf/static/images/iab-logo.svg", + "ietf/static/images/iab-logo-white.svg", "ietf/static/images/iesg-draft-state-diagram.png", "ietf/static/images/ietf-logo-card.png", "ietf/static/images/ietf-logo-nor-16-dev.png", @@ -104,8 +105,10 @@ "ietf/static/images/ietf-logo-nor-mask.svg", "ietf/static/images/ietf-logo-nor-white.svg", "ietf/static/images/ietf-logo-nor.svg", + "ietf/static/images/ietf-logo-white.svg", "ietf/static/images/ietf-logo.svg", "ietf/static/images/irtf-logo-card.png", + "ietf/static/images/irtf-logo-white.svg", "ietf/static/images/irtf-logo.svg", "ietf/static/js/agenda_filter.js", "ietf/static/js/agenda_materials.js",