Archived
1
0

Merge branch 'devel'

Conflicts:
	contrib/templates/default/post.mustache
This commit is contained in:
jeff 2015-10-01 14:28:36 -04:00
commit 2366781282
7 changed files with 27 additions and 1 deletions

BIN
contrib/static/clearnet.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 846 B

BIN
contrib/static/i2p.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -108,6 +108,17 @@ th {
padding-right: 15px; padding-right: 15px;
} }
#captcha_img {
background: #d3d3d3;
}
input, textarea {
color: whitesmoke;
background: #2d2d2d;
border-color: #4D28CA;
border-radius: 3px;
}
html { html {
color: #ededed; color: #ededed;
background: #262230; background: #262230;

BIN
contrib/static/tor.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -1,9 +1,20 @@
<div class="{{{CSSClass}}}" id="{{PostHash}}"> <div class="{{CSSClass}}" id="{{PostHash}}">
<p class="intro"> <p class="intro">
<label for="delete_{{PostHash}}"> <label for="delete_{{PostHash}}">
<span class="frontend"> <span class="frontend">
[[ {{Frontend}} ]] [[ {{Frontend}} ]]
</span> </span>
<span class="origin">
{{#IsI2P}}
<img src="{{Prefix}}static/i2p.png" alt="post from i2p" />
{{/IsI2P}}
{{#IsTor}}
<img src="{{Prefix}}static/tor.png" alt="post from tor" />
{{/IsTor}}
{{#IsClearnet}}
<img src="{{Prefix}}static/clearnet.png" alt="post from clearnet" />
{{/IsClearnet}}
</span>
<span class="subject"> <span class="subject">
{{Subject}} {{Subject}}
</span> </span>

View File

@ -1,4 +1,6 @@
<html> <html>
<meta charset="utf-8" />
<link rel="stylesheet" href="{{prefix}}static/site.css"></link>
<meta http-equiv="refresh" content="1; {{redirect_url}}" /> <meta http-equiv="refresh" content="1; {{redirect_url}}" />
<body> <body>
<p>post failed: {{reason}}</p> <p>post failed: {{reason}}</p>

View File

@ -5,6 +5,8 @@
- message_id ( the value of the Message-ID header in the post we made, the truncated sha1 of this is the >>posthash ) - message_id ( the value of the Message-ID header in the post we made, the truncated sha1 of this is the >>posthash )
}} }}
<html> <html>
<meta charset="utf-8" />
<link rel="stylesheet" href="{{prefix}}static/site.css"></link>
<meta http-equiv="refresh" content="2; {{redirect_url}}" /> <meta http-equiv="refresh" content="2; {{redirect_url}}" />
<body> <body>
<pre>posted as {{message_id}}</pre> <pre>posted as {{message_id}}</pre>