diff --git a/securedrop/source_templates/base.html b/securedrop/source_templates/base.html index 5e60143155..ab3d6f530b 100644 --- a/securedrop/source_templates/base.html +++ b/securedrop/source_templates/base.html @@ -16,40 +16,45 @@ {% include 'banner_warning_flashed.html' %} -
-
{% block header %} - + {% endblock %} -
+
{% if g.show_offline_message %} +

{{ gettext("We're sorry, our SecureDrop is currently offline.") }}

{{ gettext("Please try again later. Check our website for more information.") }}

+
{% else %} {% if 'logged_in' in session %} - {{ gettext('LOG OUT') }} + {% endif %} + {# FIXME: {% if not new_user%}
{% endif %} + #} {% endif %} {% block body %}{% endblock %} -
-
+ {% block footer %} {% include 'footer.html' %} {% endblock %} -
diff --git a/securedrop/source_templates/footer.html b/securedrop/source_templates/footer.html index ca7b8dda9c..9e42720788 100644 --- a/securedrop/source_templates/footer.html +++ b/securedrop/source_templates/footer.html @@ -1,12 +1,14 @@ -
diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html index e8e771d689..0b04efd181 100644 --- a/securedrop/source_templates/generate.html +++ b/securedrop/source_templates/generate.html @@ -3,34 +3,43 @@ {% block body %}

{{ gettext('Welcome') }}

- +{# FIXME: aside.center #} +

{{ gettext('Please either write this codename down and keep it in a safe place, or memorize it.') }}

-

{{ gettext('This codename is what you will use in future visits to receive messages from our team in response to what you submit on the next screen.') }}

+

{{ gettext('This codename is what you will use in future visits to receive messages from our team in response to what you submit on the next screen.') }}

+{# FIXME:
+#} -
+
+ {# FIXME: -

{{ codename }}

+ #} + + {{ codename }}
-
+
+{# FIXME: +
- +#}

{{ gettext('Because we do not track users of our SecureDrop service, in future visits, using this codename will be the only way we have to communicate with you should we have questions or are interested in additional information. Unlike passwords, there is no way to retrieve a lost codename.') }} @@ -40,6 +49,7 @@

{{ gettext('Welcome') }}

diff --git a/securedrop/tests/test_source.py b/securedrop/tests/test_source.py index b601a9c083..fd6e8dfb3f 100644 --- a/securedrop/tests/test_source.py +++ b/securedrop/tests/test_source.py @@ -101,8 +101,8 @@ def _find_codename(html): """Find a source codename (diceware passphrase) in HTML""" # Codenames may contain HTML escape characters, and the wordlist # contains various symbols. - codename_re = (r'

]*id="codename"[^>]*>' - r'(?P[a-z0-9 &#;?:=@_.*+()\'"$%!-]+)

') + codename_re = (r']*id="codename"[^>]*>' + r'(?P[a-z0-9 &#;?:=@_.*+()\'"$%!-]+)') codename_match = re.search(codename_re, html) assert codename_match is not None return codename_match.group('codename')