Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-03 20:04:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflict from receiver-mode-gui branch

Browse source
This commit is contained in:
Miguel Jacq 2018-09-04 11:48:39 +10:00
commit b0d2183a3e
8 changed files with 91 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

50
share/static/css/style.css
View file

@ -142,3 +142,53 @@ ul.flashes li {
margin: 0;
padding: 10px;
}
li.error {
list-style: none;
margin: 0;
padding: 0;
color: #ffffff;
background-color: #c90c0c;
border: 0;
border-radius: 5px;
text-align: left;
}
li.info {
list-style: none;
margin: 0;
padding: 0;
color: #000000;
background-color: #a9e26c;
border: 0;
border-radius: 5px;
text-align: left;
}
.closed-wrapper {
display: flex;
align-items: center;
justify-content: center;
min-height: 400px;
}
.closed {
text-align: center;
}
.closed img {
width: 120px;
height: 120px;
}
.closed .closed-header {
font-size: 30px;
font-weight: normal;
color: #666666;
margin: 0 0 10px 0;
}
.closed .closed-description {
color: #666666;
margin: 0 0 20px 0;
}

14
share/templates/closed.html
View file

@ -3,8 +3,20 @@
<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>
<p>Thank you for using OnionShare</p>
<header class="clearfix">
<img class="logo" src="/static/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
</header>
<div class="closed-wrapper">
<div class="closed">
<p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p>
<p class="closed-header">Thank you for using OnionShare</p>
<p class="closed-description">You may now close this window.</p>
</div>
</div>
</body>
</html>

16
share/templates/receive.html
View file

@ -21,11 +21,11 @@
<p><input type="file" name="file[]" multiple /></p>
<p><input type="submit" class="button" value="Send Files" /></p>
<div>
{% with messages = get_flashed_messages() %}
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<ul class=flashes>
{% for message in messages %}
<li>{{ message }}</li>
{% for category, message in messages %}
<li class="{{ category }}">{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
@ -35,9 +35,13 @@
</div>
</div>
{% if receive_allow_receiver_shutdown %}
<form method="post" action="{{ close_action }}">
<input type="submit" class="close-button" value="I'm Finished Uploading" />
</form>
{% with messages = get_flashed_messages() %}
{% if messages %}
<form method="post" action="{{ close_action }}">
<input type="submit" class="close-button" value="I'm Finished Sending" />
</form>
{% endif %}
{% endwith %}
{% endif %}
</body>
</html>