From f2314f24c7b6ca9b9ae3b852a1822174a23ddbd1 Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Mon, 11 Mar 2019 17:27:17 +1100
Subject: [PATCH] Use png rather than svg for warning image. Concatenate flash
 messages with commas to reduce page height. Allow warning message to be wider

---
 onionshare/web/receive_mode.py |  12 +++++++-----
 share/static/css/style.css     |   5 -----
 share/static/img/warning.png   | Bin 0 -> 804 bytes
 share/templates/receive.html   |   3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 share/static/img/warning.png

diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py
index d6ef86ad..25d7aa1b 100644
--- a/onionshare/web/receive_mode.py
+++ b/onionshare/web/receive_mode.py
@@ -112,12 +112,14 @@ class ReceiveModeWeb(object):
                 else:
                     flash(msg, 'info')
             else:
+                msg = 'Sent '
                 for filename in filenames:
-                    msg = 'Sent {}'.format(filename)
-                    if ajax:
-                        info_flashes.append(msg)
-                    else:
-                        flash(msg, 'info')
+                    msg += '{}, '.format(filename)
+                msg = msg.rstrip(', ')
+                if ajax:
+                    info_flashes.append(msg)
+                else:
+                    flash(msg, 'info')
 
             if self.can_upload:
                 if ajax:
diff --git a/share/static/css/style.css b/share/static/css/style.css
index 987f08f5..e445e5de 100644
--- a/share/static/css/style.css
+++ b/share/static/css/style.css
@@ -228,7 +228,6 @@ div#noscript {
   color: #d709df;
   padding: 1em;
   line-height: 150%;
-  max-width: 700px;
   margin: 0 auto;
 }
 
@@ -236,10 +235,6 @@ div#noscript a, div#noscript a:visited {
   color: #d709df;
 }
 
-div#noscript svg {
-  max-width: 30px;
-}
-
 .disable-noscript-xss-wrapper {
   max-width: 900px;
   margin: 0 auto;
diff --git a/share/static/img/warning.png b/share/static/img/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..9be8cbaf1a8f5fbbb20c742d51302b22c3eca975
GIT binary patch
literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq0015U000yS1^@s6nyZb(00004b3#c}2nYxW
zd<bNS00009a7bBm0003;0003;0pPWiF#rGn8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H101R|RSaeirbZlh+MrmwpATa>ZAngDE0*OgPK~zYIt(8wm6mb;C
zKW}!{c2>j`(zH$2#aI=hLb@b`R5vey6hRPCco0t!Q6SXWAiPG_RfFmfQA7kDqAn$b
z2iL8|T|?{-WG?9LtnSY1urAcH|J41$!0_IDzn}Mp-!L*;zt~`IX0D6M5YR;R^h-r2
z(r(wi!>et7@|$MOre0H((JBISY7&*vnoV_p+xbmHRj*bYrMw0n19630!0)n_BKZc;
zTE_bVWKdw$sWC4)24g7W-3k8~!b}C@7R)!wxm+2!*_CX64m#Nr_pKPpSyR%FB6X2{
zD1Cra0erh)eSav`9twM-1E}!~!G$BOor%t+bjE#2#OYUIu=-$?2>?gsRM2jp4tt{m
zV(80kk6>^;@JXO~Ct$NgFTQT?c@ptPd|)o4s9G}c!;XzOmYxLOZ4EHA6L8Uu6()PN
zC9$b4m%7b|U%X2P#E_r;+MgCN&ehrOr*pN7$AI4If+hQ!yOSM@J#pWP>DgG@aLagD
z!gb)JeCkVz>W;PrkdPJC0`=Lhg#Sok2QtHV3!v6YEd%xCAYBQ+<kyO9EN_aYDB7zn
ziCRzUd?nCgDhw8llrxIxag;kK9fqMtfy8#e1y8l22g@0QiH?!n{X*kH{e~@TfVWa`
z!Hq>__;W*SZzTaCZ|uT`ZG<TCXWKgc<-tIs$CkSYu3}+fPc#_zM&Ald0WGD5GgM#A
zTQUE?wPL3_r;kp?xZIO!o68lxTHgX`oEsus0cuJC^EB_c&Ay(vZzTr~0bL~w8IUMK
z4AlS-*aj?LA3RA;`_*q70{6>2>;mmX^~^4z04GuwQwWAkGi^3o{y~9ZVE-<I|C53#
i;3oU^WG}%)<-uQK-|9^Ts!G}b0000<MNUMnLSTX_pkxpL

literal 0
HcmV?d00001

diff --git a/share/templates/receive.html b/share/templates/receive.html
index 5b7ab23c..a93537c5 100644
--- a/share/templates/receive.html
+++ b/share/templates/receive.html
@@ -19,8 +19,7 @@
       -->
       <div id="noscript">
         <p>
-          <?xml version="1.0" encoding="UTF-8"?> <svg style="fill:#d709df;" viewBox="0 0 325 213" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <!-- Generator: Sketch 52.3 (67297) - http://www.bohemiancoding.com/sketch --> <title>Fill 1</title> <desc>Created with Sketch.</desc> <g id="Page-1" stroke="none" stroke-width="1" fill-rule="evenodd"> <path d="M62.864,111.653 L91.886,39.767 C93.839,34.888 99.374,32.518 104.249,34.473 C109.119,36.424 111.496,41.965 109.541,46.843 L93.83,86.5 C93.83,86.5 92.708,89.255 95.364,90.32 C98.076,91.407 99.109,88.616 99.109,88.616 L122.001,31.502 C123.955,26.627 129.381,24.41 134.254,26.363 C139.132,28.319 141.088,33.494 139.134,38.369 L116.242,95.481 C116.242,95.481 115.421,98.392 118.044,99.443 C120.641,100.484 121.957,97.771 121.957,97.771 L148.665,31.141 C150.618,26.268 155.775,24.039 160.65,25.993 C165.526,27.947 167.745,33.133 165.792,38.006 L139.085,104.636 C139.085,104.636 138.148,107.362 140.955,108.487 C143.714,109.592 144.798,106.926 144.798,106.926 L164.638,57.429 C166.592,52.553 171.634,51.027 176.507,52.98 C181.385,54.935 183.728,59.422 181.774,64.297 L152.778,136.637 C152.778,136.637 151.966,140.046 158.705,136.582 C175.983,127.715 183.235,127.482 183.235,127.482 C183.235,127.482 196.66,126.483 197.652,138.4 C198.368,147.042 194.399,145.9 184.966,152.378 C176.619,158.117 151.891,172.097 151.891,172.097 C151.891,172.097 121.294,191.835 94.92,181.263 C94.92,181.263 42.378,162.76 62.864,111.653 Z M270.905,152.632 L270.905,28.8 C270.905,12.96 257.946,0 242.106,0 L28.8,0 C12.96,0 0,12.96 0,28.8 L0,182.478 C0,198.318 12.96,211.278 28.8,211.278 L231.808,211.278 L242.106,211.278 L325.04,212.782 L270.905,152.632 Z" id="Fill-1" fill="#d709df"></path> </g> </svg>
-          <strong>Warning:</strong> Due to a bug in Tor Browser and Firefox, uploads
+          <img src="/static/img/warning.png" title="Warning" /><strong>Warning:</strong> Due to a bug in Tor Browser and Firefox, uploads
           sometimes never finish. To upload reliably, either set your Tor Browser
           <a rel="noreferrer" target="_blank" href="https://tb-manual.torproject.org/en-US/security-slider/">security slider</a>
           to Standard or