From 6edd33b4243157f3bcb56d2f2997c93f4aa0324a Mon Sep 17 00:00:00 2001 From: Hillary Jeffrey Date: Wed, 10 Aug 2016 10:33:32 -0400 Subject: [PATCH 1/2] Welcome page links on build server Adds useful links to the welcome page on the build server. --- cfgov/templates/welcome.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cfgov/templates/welcome.html b/cfgov/templates/welcome.html index cce7a3cba32..f0c1d1f4909 100644 --- a/cfgov/templates/welcome.html +++ b/cfgov/templates/welcome.html @@ -1,16 +1,27 @@ {% overextends "wagtailadmin/login.html" %} {% load i18n admin_static %} + +{% buildlinks = {"Design Manual - Global Elements": "https://cfpb.github.io/design-manual/global-elements/global-elements.html", + "Design Manual - Page Components": "https://cfpb.github.io/design-manual/page-components/page-components.html", + "Wagtail How-to": "https://github.cfpb.gov/pages/flapjack/wagtail-documentation/"} %} + {% block furniture %}

{% trans 'Welcome' %}
- You've logged in to the consumerfinance.gov editorial tools. + You've logged in to the consumerfinance.gov editorial tools.

Continue on to...

+ {% endfor %}
{% endblock %} From 7ea75153b313686fa09e665dcd785591b420890f Mon Sep 17 00:00:00 2001 From: kurtrwall Date: Wed, 10 Aug 2016 11:37:54 -0400 Subject: [PATCH 2/2] Change up the page markup --- cfgov/templates/wagtailadmin/login.html | 6 +++- cfgov/templates/welcome.html | 45 +++++++++++++++++-------- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/cfgov/templates/wagtailadmin/login.html b/cfgov/templates/wagtailadmin/login.html index b89f781e7bc..7e59696ec6b 100644 --- a/cfgov/templates/wagtailadmin/login.html +++ b/cfgov/templates/wagtailadmin/login.html @@ -17,7 +17,11 @@ {% endif %} -

Log in to consumerfinance.gov

+ {% if 'build' in request.site.hostname %} +

Log in to demo Wagtail

+ {% else %} +

Log in to consumerfinance.gov

+ {% endif %}
{% csrf_token %} diff --git a/cfgov/templates/welcome.html b/cfgov/templates/welcome.html index f0c1d1f4909..6c8e54939d7 100644 --- a/cfgov/templates/welcome.html +++ b/cfgov/templates/welcome.html @@ -1,27 +1,44 @@ {% overextends "wagtailadmin/login.html" %} {% load i18n admin_static %} - -{% buildlinks = {"Design Manual - Global Elements": "https://cfpb.github.io/design-manual/global-elements/global-elements.html", - "Design Manual - Page Components": "https://cfpb.github.io/design-manual/page-components/page-components.html", - "Wagtail How-to": "https://github.cfpb.gov/pages/flapjack/wagtail-documentation/"} %} - {% block furniture %}
+

{% trans 'Welcome' %}
- You've logged in to the consumerfinance.gov editorial tools. + {% if 'build' in request.site.hostname %} + You've logged in to the demo Wagtail. + {% else %} + You've logged in to the consumerfinance.gov editorial tools. + {% endif %}

-

Continue on to...

+ +

Choose which admin interface you'd like to go to

    - {% for name, url in destinations %} -
  • {{name}}
  • - {% endfor %} - {% if 'build' in request.site.hostname %} - {% for name, url in linkdict %} + {% for name, url in destinations %}
  • {{name}}
  • {% endfor %} - {% endif %}
- {% endfor %} + + {% if 'build' in request.site.hostname %} +

Helpful links

+ + {% endif %} +
{% endblock %}