Merge branch 'develop' of https://github.com/ZeroDot1/onionshare into ZeroDot1-develop

This commit is contained in:
Micah Lee 2019-03-22 15:23:53 -07:00
commit f15fee8ee2
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
7 changed files with 122 additions and 107 deletions

View file

@ -1,16 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<title>OnionShare: 403 Forbidden</title> <title>OnionShare: 403 Forbidden</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/static/css/style.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all">
</head> </head>
<body>
<body>
<div class="info-wrapper"> <div class="info-wrapper">
<div class="info"> <div class="info">
<p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> <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> <p class="info-header">You are not allowed to perform that action at this time.</p>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -1,16 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<title>OnionShare: 404 Not Found</title> <title>OnionShare: 404 Not Found</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon">
<link href="/static/css/style.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all">
</head> </head>
<body>
<body>
<div class="info-wrapper"> <div class="info-wrapper">
<div class="info"> <div class="info">
<p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p> <p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p>
<p class="info-header">404 Not Found</p> <p class="info-header">404 Not Found</p>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -1,10 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<title>OnionShare</title> <title>OnionShare</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" />
</head> </head>
<body>
<body>
<p>OnionShare download in progress</p> <p>OnionShare download in progress</p>
</body> </body>
</html> </html>

View file

@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<title>OnionShare</title> <title>OnionShare</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon">
<link href="/static/css/style.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="none" onload="if(media!='all')media='all'">
</head> </head>
<body> <body>
@ -53,6 +53,6 @@
</div> </div>
<script src="/static/js/receive-noscript.js"></script> <script src="/static/js/receive-noscript.js"></script>
<script src="/static/js/jquery-3.3.1.min.js"></script> <script src="/static/js/jquery-3.3.1.min.js"></script>
<script src="/static/js/receive.js"></script> <script async src="/static/js/receive.js"></script>
</body> </body>
</html> </html>

View file

@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<title>OnionShare</title> <title>OnionShare</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon">
<link href="/static/css/style.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all">
</head> </head>
<body> <body>

View file

@ -1,13 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<title>OnionShare</title> <title>OnionShare</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon">
<link href="/static/css/style.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all">
<meta name="onionshare-filename" content="{{ filename }}"> <meta name="onionshare-filename" content="{{ filename }}">
<meta name="onionshare-filesize" content="{{ filesize }}"> <meta name="onionshare-filesize" content="{{ filesize }}">
</head> </head>
<body>
<body>
<header class="clearfix"> <header class="clearfix">
<div class="right"> <div class="right">
@ -51,6 +53,7 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
<script src="/static/js/send.js"></script> <script async src="/static/js/send.js" charset="utf-8"></script>
</body> </body>
</html> </html>

View file

@ -1,11 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<title>OnionShare is closed</title> <title>OnionShare is closed</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/static/img/favicon.ico" rel="icon" type="image/x-icon">
<link href="/static/css/style.css" rel="stylesheet" type="text/css" /> <link rel="stylesheet" rel="subresource" type="text/css" href="/static/css/style.css" media="all">
</head> </head>
<body>
<body>
<header class="clearfix"> <header class="clearfix">
<img class="logo" src="/static/img/logo.png" title="OnionShare"> <img class="logo" src="/static/img/logo.png" title="OnionShare">
<h1>OnionShare</h1> <h1>OnionShare</h1>
@ -18,5 +20,6 @@
<p class="info-description">You may now close this window.</p> <p class="info-description">You may now close this window.</p>
</div> </div>
</div> </div>
</body> </body>
</html> </html>