diff --git a/securedrop/sass/source.sass b/securedrop/sass/source.sass index ef5c69a518..9058628c51 100644 --- a/securedrop/sass/source.sass +++ b/securedrop/sass/source.sass @@ -458,18 +458,18 @@ mark background: $passphrase_masked_color clip-path: polygon(0% 0%, 0% 100%, 20% 100%, 20% 0%, 23% 0%, 23% 100%, 32% 100%, 32% 0%, 35% 0%, 35% 100%, 42% 100%, 42% 0%, 45% 0%, 45% 100%, 64% 100%, 64% 0%, 67% 0%, 67% 100%, 74% 100%, 74% 0%, 77% 0%, 77% 100%, 90% 100%, 90% 0%, 93% 0%, 93% 100%, 100% 100%, 100% 0%) -#codename-reminder +#passphrase-reminder font-size: 18px color: $heading_alt_color -#codename-show-checkbox +#passphrase-show-checkbox position: absolute @include ltr left: -999rem @include rtl right: -999rem - &~ #codename-show + &~ #passphrase-show font-size: 11px line-height: 14px margin-top: -2px @@ -486,7 +486,7 @@ mark border-color: $checkbox_hover_border box-shadow: inset 0 0 0 1px $checkbox_hover_border_inside - @mixin codename-show-checkbox + @mixin passphrase-show-checkbox content: "" background: $body_bg display: block @@ -496,10 +496,10 @@ mark &::before @include ltr - @include codename-show-checkbox + @include passphrase-show-checkbox &::after @include rtl - @include codename-show-checkbox + @include passphrase-show-checkbox &::before @include ltr @@ -510,7 +510,7 @@ mark margin-left: 12px float: right - &:focus-visible ~ #codename-show + &:focus-visible ~ #passphrase-show box-shadow: 0 0 0 3px $focus_shadow &:checked ~ mark > span @@ -528,14 +528,14 @@ mark height: 13px border: 0 - &:checked ~ #codename-show::before + &:checked ~ #passphrase-show::before @include ltr @include checked - &:checked ~ #codename-show::after + &:checked ~ #passphrase-show::after @include rtl @include checked -#codename-show +#passphrase-show display: block #upload @@ -937,7 +937,7 @@ section[aria-labelledby="submit-heading"] section[aria-labelledby="welcome-heading"] margin-top: 50px -section[aria-labelledby="codename-reminder"] + section h2 +section[aria-labelledby="passphrase-reminder"] + section h2 padding-top: 26px #source-lookup main, #source-logout main @@ -1128,7 +1128,7 @@ section[aria-labelledby="codename-reminder"] + section h2 .info padding: 9px -#flashed + section, #codename-hint + section:not(#flashed) +#flashed + section, #passphrase-hint + section:not(#flashed) margin-top: 3em #source-lookup nav + section:not(#flashed) diff --git a/securedrop/source_app/session_manager.py b/securedrop/source_app/session_manager.py index 7459a58ab6..812649c292 100644 --- a/securedrop/source_app/session_manager.py +++ b/securedrop/source_app/session_manager.py @@ -30,7 +30,7 @@ class SessionManager: """Helper to manage the user's session cookie accessible via flask.session.""" # The keys in flask.session for the user's passphrase and expiration date - _SESSION_COOKIE_KEY_FOR_CODENAME = "codename" + _SESSION_COOKIE_KEY_FOR_CODENAME = "passphrase" _SESSION_COOKIE_KEY_FOR_EXPIRATION_DATE = "expires" @classmethod diff --git a/securedrop/source_templates/error.html b/securedrop/source_templates/error.html index 082832161e..0075847757 100644 --- a/securedrop/source_templates/error.html +++ b/securedrop/source_templates/error.html @@ -4,5 +4,5 @@
{{ gettext('Sorry, the website encountered an error and was unable to complete your request.') }}
-{{ gettext('Look up a codename...') }}
+{{ gettext('Look up a passphrase...') }}
{% endblock %} diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html index c5bc113908..ab8e1ef9c6 100644 --- a/securedrop/source_templates/index.html +++ b/securedrop/source_templates/index.html @@ -71,7 +71,7 @@{{ gettext('Already have a codename? Check for replies or submit something new.') }}
+{{ gettext('Already have a passphrase? Check for replies or submit something new.') }}
{{ gettext('LOG IN') }} diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html index a8cc330e55..788fc85a90 100644 --- a/securedrop/source_templates/lookup.html +++ b/securedrop/source_templates/lookup.html @@ -20,12 +20,12 @@{{ gettext('A codename in SecureDrop functions as both your username and your password.') }}
-{{ gettext('You will need this codename to log into our SecureDrop later:') }}
+{{ gettext('A passphrase in SecureDrop functions as both your username and your password.') }}
+{{ gettext('You will need this passphrase to log into our SecureDrop later:') }}
- {{ utils.codename(new_user_passphrase) }} + {{ utils.passphrase(new_user_passphrase) }} -- {{ gettext("You have received a reply. To protect your identity in the unlikely event someone learns your codename, please delete all replies when you're done with them. This also lets us know that you are aware of our reply. You can respond by submitting new files and messages above.") }} + {{ gettext("You have received a reply. To protect your identity in the unlikely event someone learns your passphrase, please delete all replies when you're done with them. This also lets us know that you are aware of our reply. You can respond by submitting new files and messages above.") }}
{% for reply in replies %} {%- set timestamp = utils.relative_time(reply.date) -%} diff --git a/securedrop/source_templates/notfound.html b/securedrop/source_templates/notfound.html index 9abd23cb4f..1e2966e13d 100644 --- a/securedrop/source_templates/notfound.html +++ b/securedrop/source_templates/notfound.html @@ -4,5 +4,5 @@{{ gettext("Sorry, we couldn't locate what you requested.") }}
-{{ gettext('Look up a codename...') }}
+{{ gettext('Look up a passphrase...') }}
{% endblock %} diff --git a/securedrop/source_templates/utils.html b/securedrop/source_templates/utils.html index c01887109d..96a40151df 100644 --- a/securedrop/source_templates/utils.html +++ b/securedrop/source_templates/utils.html @@ -3,19 +3,19 @@ datetime="{{ date|html_datetime_format }}">{{ date|rel_datetime_format(relative=True) }} {%- endmacro -%} -{%- macro codename(codename, new=True) -%} -