diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 index f43f79d612..9043420258 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 @@ -290,7 +290,6 @@ /var/www/securedrop/static/i/font-awesome/info-circle-black.png r, /var/www/securedrop/static/i/font-awesome/lock-black.png r, /var/www/securedrop/static/i/font-awesome/refresh-blue.png r, - /var/www/securedrop/static/i/font-awesome/refresh-white.png r, /var/www/securedrop/static/i/font-awesome/times-white.png r, /var/www/securedrop/static/i/font-awesome/white/exclamation-circle.svg r, /var/www/securedrop/static/i/font-awesome/white/guard.svg r, diff --git a/securedrop/sass/source.sass b/securedrop/sass/source.sass index 5fa94ed09b..b4e1a80a49 100644 --- a/securedrop/sass/source.sass +++ b/securedrop/sass/source.sass @@ -276,22 +276,6 @@ p#max-file-size margin-bottom: 10px margin-top: 5px -#regenerate-submit - span - font-size: 0 - - &:after - content: "" - display: inline-block - background: - image: url(/static/i/font-awesome/refresh-white.png) - position: center - repeat: no-repeat - size: contain - opacity: 0.9 - height: 20px - width: 20px - #cancel &:before content: "" @@ -323,4 +307,4 @@ p#max-file-size background: image: url(/static/icons/chevron-left.png) - size: contain \ No newline at end of file + size: contain diff --git a/securedrop/source_app/main.py b/securedrop/source_app/main.py index 1f459729dc..e87d82e86e 100644 --- a/securedrop/source_app/main.py +++ b/securedrop/source_app/main.py @@ -34,7 +34,7 @@ def make_blueprint(config: SDConfig) -> Blueprint: def index() -> str: return render_template('index.html') - @view.route('/generate', methods=('GET', 'POST')) + @view.route('/generate', methods=('GET',)) def generate() -> Union[str, werkzeug.Response]: if SessionManager.is_user_logged_in(db_session=db.session): flash(gettext( diff --git a/securedrop/source_templates/generate.html b/securedrop/source_templates/generate.html index 2fe2e30e9f..558626671f 100644 --- a/securedrop/source_templates/generate.html +++ b/securedrop/source_templates/generate.html @@ -14,14 +14,6 @@

{{ gettext('Welcome') }}

{{ gettext('Codename') }}

{{ codename }} -
-
- - -
-

@@ -38,4 +30,4 @@

{{ gettext('Codename') }}

{{ gettext('SUBMIT DOCUMENTS') }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html index 363405cea1..3123b7dddc 100644 --- a/securedrop/source_templates/index.html +++ b/securedrop/source_templates/index.html @@ -108,4 +108,4 @@

- \ No newline at end of file + diff --git a/securedrop/static/i/font-awesome/refresh-white.png b/securedrop/static/i/font-awesome/refresh-white.png deleted file mode 100644 index f7243b7340..0000000000 Binary files a/securedrop/static/i/font-awesome/refresh-white.png and /dev/null differ diff --git a/securedrop/tests/functional/source_navigation_steps.py b/securedrop/tests/functional/source_navigation_steps.py index 1de8d74d35..d777cae6a3 100644 --- a/securedrop/tests/functional/source_navigation_steps.py +++ b/securedrop/tests/functional/source_navigation_steps.py @@ -47,7 +47,7 @@ def _source_clicks_submit_documents_on_homepage(self): assert self._is_on_generate_page() def _source_regenerates_codename(self): - self.safe_click_by_id("regenerate-submit") + self.driver.refresh() def _source_chooses_to_submit_documents(self): self._source_clicks_submit_documents_on_homepage() diff --git a/securedrop/tests/functional/test_source.py b/securedrop/tests/functional/test_source.py index 159cd140b5..7da0739f90 100644 --- a/securedrop/tests/functional/test_source.py +++ b/securedrop/tests/functional/test_source.py @@ -146,7 +146,7 @@ def test_duplicate_generate_pages(self): def test_refreshed_duplicate_generate_pages(self): # Test generation of multiple codenames in different browser tabs, including behavior - # of refreshing the codemae in each tab. Ref. issue 4458. + # of refreshing the codename in each tab. Ref. issue 4458. # Generate a codename in Tab A assert len(self.driver.window_handles) == 1