diff options
Diffstat (limited to 'share/templates')
| -rw-r--r-- | share/templates/403.html | 29 | ||||
| -rw-r--r-- | share/templates/404.html | 29 | ||||
| -rw-r--r-- | share/templates/denied.html | 17 | ||||
| -rw-r--r-- | share/templates/receive.html | 44 | ||||
| -rw-r--r-- | share/templates/receive_noscript_xss.html | 4 | ||||
| -rw-r--r-- | share/templates/send.html | 105 | ||||
| -rw-r--r-- | share/templates/thankyou.html | 39 |
7 files changed, 141 insertions, 126 deletions
diff --git a/share/templates/403.html b/share/templates/403.html index df81f3e7..f3ea4e0e 100644 --- a/share/templates/403.html +++ b/share/templates/403.html @@ -1,16 +1,19 @@ <!DOCTYPE html> <html> - <head> - <title>OnionShare: 403 Forbidden</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - <link href="/static/css/style.css" rel="stylesheet" type="text/css" /> - </head> - <body> - <div class="info-wrapper"> - <div class="info"> - <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> - <p class="info-header">You are not allowed to perform that action at this time.</p> - </div> - </div> - </body> + +<head> + <title>OnionShare: 403 Forbidden</title> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> + <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all"> +</head> + +<body> + <div class="info-wrapper"> + <div class="info"> + <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> + <p class="info-header">You are not allowed to perform that action at this time.</p> + </div> + </div> +</body> + </html> diff --git a/share/templates/404.html b/share/templates/404.html index 264ca517..1c5d7d2d 100644 --- a/share/templates/404.html +++ b/share/templates/404.html @@ -1,16 +1,19 @@ <!DOCTYPE html> <html> - <head> - <title>OnionShare: 404 Not Found</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - <link href="/static/css/style.css" rel="stylesheet" type="text/css" /> - </head> - <body> - <div class="info-wrapper"> - <div class="info"> - <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> - <p class="info-header">404 Not Found</p> - </div> - </div> - </body> + +<head> + <title>OnionShare: 404 Not Found</title> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon"> + <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all"> +</head> + +<body> + <div class="info-wrapper"> + <div class="info"> + <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> + <p class="info-header">404 Not Found</p> + </div> + </div> +</body> + </html> diff --git a/share/templates/denied.html b/share/templates/denied.html index 5d411d62..94fb379b 100644 --- a/share/templates/denied.html +++ b/share/templates/denied.html @@ -1,10 +1,13 @@ <!DOCTYPE html> <html> - <head> - <title>OnionShare</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - </head> - <body> - <p>OnionShare download in progress</p> - </body> + +<head> + <title>OnionShare</title> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> +</head> + +<body> + <p>OnionShare download in progress</p> +</body> + </html> diff --git a/share/templates/receive.html b/share/templates/receive.html index a557a967..4f207a03 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -2,8 +2,8 @@ <html> <head> <title>OnionShare</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - <link href="/static/css/style.css" rel="stylesheet" type="text/css" /> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon"> + <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all"> </head> <body> @@ -13,16 +13,24 @@ </header> <div class="upload-wrapper"> + <!-- + We are not using a <noscript> tag because it only works when the security slider is set to + Safest, not Safer: https://trac.torproject.org/projects/tor/ticket/29506 + --> + <div id="noscript"> + <p> + <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 + <a target="_blank" href="/noscript-xss-instructions">turn off your Tor Browser's NoScript XSS setting</a>.</p> + </div> + <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> <p class="upload-header">Send Files</p> <p class="upload-description">Select the files you want to send, then click "Send Files"...</p> - <form id="send" method="post" enctype="multipart/form-data" action="{{ upload_action }}"> - <p><input type="file" id="file-select" name="file[]" multiple /></p> - <p><button type="submit" id="send-button" class="button">Send Files</button></p> - </form> - <div id="uploads"></div> <div> @@ -37,22 +45,14 @@ </ul> </div> - <!-- - We are not using a <noscript> tag because it only works when the security slider is set to - Safest, not Safer: https://trac.torproject.org/projects/tor/ticket/29506 - --> - <div id="noscript"> - <p> - <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 - <a target="_blank" href="/noscript-xss-instructions">turn off your Tor Browser's NoScript XSS setting</a>.</p> - </div> - <script src="/static/js/receive-noscript.js"></script> + <form id="send" method="post" enctype="multipart/form-data" action="{{ upload_action }}"> + <p><input type="file" id="file-select" name="file[]" multiple /></p> + <p><button type="submit" id="send-button" class="button">Send Files</button></p> + </form> </div> - <script src="/static/js/jquery-3.3.1.min.js"></script> - <script src="/static/js/receive.js"></script> + <script src="/static/js/receive-noscript.js"></script> + <script src="/static/js/jquery-3.4.0.min.js"></script> + <script async src="/static/js/receive.js"></script> </body> </html> diff --git a/share/templates/receive_noscript_xss.html b/share/templates/receive_noscript_xss.html index bf846b03..bce78524 100644 --- a/share/templates/receive_noscript_xss.html +++ b/share/templates/receive_noscript_xss.html @@ -2,8 +2,8 @@ <html> <head> <title>OnionShare</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - <link href="/static/css/style.css" rel="stylesheet" type="text/css" /> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon"> + <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all"> </head> <body> diff --git a/share/templates/send.html b/share/templates/send.html index e7e1fde0..2a56829a 100644 --- a/share/templates/send.html +++ b/share/templates/send.html @@ -1,56 +1,59 @@ <!DOCTYPE html> <html> - <head> - <title>OnionShare</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - <link href="/static/css/style.css" rel="stylesheet" type="text/css" /> - <meta name="onionshare-filename" content="{{ filename }}"> - <meta name="onionshare-filesize" content="{{ filesize }}"> - </head> - <body> - <header class="clearfix"> - <div class="right"> - <ul> - <li>Total size: <strong>{{ filesize_human }}</strong> {% if is_zipped %} (compressed){% endif %}</li> - {% if slug %} - <li><a class="button" href='/{{ slug }}/download'>Download Files</a></li> - {% else %} - <li><a class="button" href='/download'>Download Files</a></li> - {% endif %} - </ul> - </div> - <img class="logo" src="/static/img/logo.png" title="OnionShare"> - <h1>OnionShare</h1> - </header> +<head> + <title>OnionShare</title> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon"> + <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all"> + <meta name="onionshare-filename" content="{{ filename }}"> + <meta name="onionshare-filesize" content="{{ filesize }}"> +</head> + +<body> + + <header class="clearfix"> + <div class="right"> + <ul> + <li>Total size: <strong>{{ filesize_human }}</strong> {% if is_zipped %} (compressed){% endif %}</li> + {% if slug %} + <li><a class="button" href='/{{ slug }}/download'>Download Files</a></li> + {% else %} + <li><a class="button" href='/download'>Download Files</a></li> + {% endif %} + </ul> + </div> + <img class="logo" src="/static/img/logo.png" title="OnionShare"> + <h1>OnionShare</h1> + </header> + + <table class="file-list" id="file-list"> + <tr> + <th id="filename-header">Filename</th> + <th id="size-header">Size</th> + <th></th> + </tr> + {% for info in file_info.dirs %} + <tr> + <td> + <img width="30" height="30" title="" alt="" src="/static/img/web_folder.png" /> + {{ info.basename }} + </td> + <td>{{ info.size_human }}</td> + <td></td> + </tr> + {% endfor %} + {% for info in file_info.files %} + <tr> + <td> + <img width="30" height="30" title="" alt="" src="/static/img/web_file.png" /> + {{ info.basename }} + </td> + <td>{{ info.size_human }}</td> + <td></td> + </tr> + {% endfor %} + </table> + <script async src="/static/js/send.js" charset="utf-8"></script> +</body> - <table class="file-list" id="file-list"> - <tr> - <th id="filename-header">Filename</th> - <th id="size-header">Size</th> - <th></th> - </tr> - {% for info in file_info.dirs %} - <tr> - <td> - <img width="30" height="30" title="" alt="" src="/static/img/web_folder.png" /> - {{ info.basename }} - </td> - <td>{{ info.size_human }}</td> - <td></td> - </tr> - {% endfor %} - {% for info in file_info.files %} - <tr> - <td> - <img width="30" height="30" title="" alt="" src="/static/img/web_file.png" /> - {{ info.basename }} - </td> - <td>{{ info.size_human }}</td> - <td></td> - </tr> - {% endfor %} - </table> - <script src="/static/js/send.js"></script> - </body> </html> diff --git a/share/templates/thankyou.html b/share/templates/thankyou.html index 64c8b369..c4b39cde 100644 --- a/share/templates/thankyou.html +++ b/share/templates/thankyou.html @@ -1,22 +1,25 @@ <!DOCTYPE html> <html> - <head> - <title>OnionShare is closed</title> - <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> - <link href="/static/css/style.css" rel="stylesheet" type="text/css" /> - </head> - <body> - <header class="clearfix"> - <img class="logo" src="/static/img/logo.png" title="OnionShare"> - <h1>OnionShare</h1> - </header> - <div class="info-wrapper"> - <div class="info"> - <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> - <p class="info-header">Thank you for using OnionShare</p> - <p class="info-description">You may now close this window.</p> - </div> - </div> - </body> +<head> + <title>OnionShare is closed</title> + <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon"> + <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all"> +</head> + +<body> + <header class="clearfix"> + <img class="logo" src="/static/img/logo.png" title="OnionShare"> + <h1>OnionShare</h1> + </header> + + <div class="info-wrapper"> + <div class="info"> + <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> + <p class="info-header">Thank you for using OnionShare</p> + <p class="info-description">You may now close this window.</p> + </div> + </div> +</body> + </html> |