Fixes #4791 shows png files instead of SVG in source index

Adds 3 png files and also updates the source index tempate to use the png files.
freedomofpress · Sep 19, 2019 · 7e4b2ba · 7e4b2ba
1 parent 4a61b7e
commit 7e4b2ba
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
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
@@ -249,6 +249,7 @@
   /var/www/securedrop/static/i/delete_gray.png r,
   /var/www/securedrop/static/i/delete_red.png r,
   /var/www/securedrop/static/i/favicon.png r,
+  /var/www/securedrop/static/i/font-awesome/black/guard.png r,
   /var/www/securedrop/static/i/font-awesome/black/guard.svg r,
   /var/www/securedrop/static/i/font-awesome/black/times.svg r,
   /var/www/securedrop/static/i/font-awesome/cancel-blue.png r,
@@ -265,7 +266,9 @@
   /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.png r,
   /var/www/securedrop/static/i/font-awesome/white/exclamation-circle.svg r,
+  /var/www/securedrop/static/i/font-awesome/white/guard.png r,
   /var/www/securedrop/static/i/font-awesome/white/guard.svg r,
   /var/www/securedrop/static/i/hand_with_fingerprint.png r,
   /var/www/securedrop/static/i/languages_arrow.png r,

diff --git a/securedrop/source_templates/index.html b/securedrop/source_templates/index.html
@@ -13,7 +13,7 @@
     {% endassets %}
   </head>
   <body id="source-index">
-    <div id="js-warning" class="warning"><img src="{{ url_for('static', filename='i/font-awesome/white/exclamation-circle.svg') }}" height="12" alt="warning icon">&nbsp; {{ gettext('Your Tor Browser\'s <a id="disable-js" href=""><strong>Security Setting</strong></a> is too low. Use the <img src="{icon}" alt="shield icon"> &nbsp;button in your browser’s toolbar to change it.').format(icon=url_for("static", filename="i/font-awesome/white/guard.svg"))  }} </div>
+    <div id="js-warning" class="warning"><img src="{{ url_for('static', filename='i/font-awesome/white/exclamation-circle.png') }}" height="12" alt="warning icon">&nbsp; {{ gettext('Your Tor Browser\'s <a id="disable-js" href=""><strong>Security Setting</strong></a> is too low. Use the <img src="{icon}" alt="shield icon"> &nbsp;button in your browser’s toolbar to change it.').format(icon=url_for("static", filename="i/font-awesome/white/guard.png"))  }} </div>
     <div id="use-tor-browser" class="warning">{{ gettext('<strong>It is recommended to use the Tor Browser to access SecureDrop:</strong> <a id="recommend-tor" href="{tor_browser_url}">Learn how to install it</a>, or ignore this warning to continue.').format(tor_browser_url=url_for('info.recommend_tor_browser')) }} <img id="use-tor-browser-close" class="close" src="{{ url_for('static', filename='i/font-awesome/times-white.png') }}" width="12" height="12"></div>
     <div id="orfox-browser" class="warning">{{ gettext('<strong>It is recommended you use the desktop version of Tor Browser to access SecureDrop, as Orfox does not provide the same level of security and anonymity as the desktop versions.</strong> <a id="recommend-tor" href="{tor_browser_url}">Learn how to install it</a>, or ignore this warning to continue.').format(tor_browser_url=url_for('info.recommend_tor_browser')) }} <img id="orfox-browser-close" class="close" src="{{ url_for('static', filename='i/font-awesome/times-white.png') }}" width="12" height="12"></div>
 
@@ -76,7 +76,7 @@ <h2 class="welcome-text">
     reading the page. Hidden by default. #}
     <div class="bubble" id="security-setting-info" class="info">
       <ol>
-        <li>{{ gettext('Click the <img src="{icon}" alt="shield icon"> in the toolbar above').format(icon=url_for("static", filename="i/font-awesome/black/guard.svg"))  }}</li>
+        <li>{{ gettext('Click the <img src="{icon}" alt="shield icon"> in the toolbar above').format(icon=url_for("static", filename="i/font-awesome/black/guard.png"))  }}</li>
         <li>{{ gettext('Select <strong>Advanced Security Settings</strong>') }}</li>
         <li>{{ gettext('Select <strong>Safest</strong>') }}</li>
       </ol>

diff --git a/securedrop/static/i/font-awesome/black/guard.png b/securedrop/static/i/font-awesome/black/guard.png
diff --git a/securedrop/static/i/font-awesome/white/exclamation-circle.png b/securedrop/static/i/font-awesome/white/exclamation-circle.png
diff --git a/securedrop/static/i/font-awesome/white/guard.png b/securedrop/static/i/font-awesome/white/guard.png