1
0
mirror of https://github.com/Tygs/0bin.git synced 2023-08-10 21:13:00 +03:00

Merged and fixed burn after reading bug

This commit is contained in:
sam
2012-04-28 18:10:29 +07:00
parent 9f4fd6b711
commit 4206630fb0
10 changed files with 176 additions and 73 deletions

View File

@@ -8,8 +8,8 @@
content="0bin is a client-side-encrypted
pastebin with a burn after reading feature">
<link rel="shortcut icon" href="/static/img/favicon.ico">
<link href="/static/css/vs.css" rel="stylesheet" />
<link rel="shortcut icon" href="/static/ico/favicon.ico">
<link href="/static/css/prettify.css" rel="stylesheet" />
<link href="/static/css/bootstrap.css" rel="stylesheet">
<link href="/static/css/style.css" rel="stylesheet">
@@ -39,7 +39,7 @@
<div class="nav-collapse">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="https://github.com/sametmax/0bin/downloads">Download 0bin</a></li>
<li><a href="#download">Download 0bin</a></li>
<li><a href="#faq">Faq</a></li>
</ul>
<p class="navbar-text pull-right"><i>"A client side encrypted PasteBin..."</i></p>
@@ -82,12 +82,11 @@
</p>
</footer>
<script src="/static/js/lzw.js"></script>
<script src="/static/js/highlight.pack.js"></script>
<script src="/static/js/jquery.elastic.source.js"></script>
<script src="/static/js/lzw.js"></script>
<script src="/static/js/prettify.min.js"></script>
<!--
<script src="/static/js/jquery.js"></script>
<script src="/static/js/bootstrap-transition.js"></script>
@@ -102,6 +101,7 @@
<script src="/static/js/bootstrap-collapse.js"></script>
<script src="/static/js/bootstrap-carousel.js"></script>
<script src="/static/js/bootstrap-typeahead.js"></script>
-->
</body>

View File

@@ -1,11 +1,9 @@
<form class="well" method="post" action="/paste/create">
<p class="paste-option">
<label for="expiration">Expiration:</label>
<select name="expiration" >
<label for="expiration" >Expiration:</label>
<select id="expiration" name="expiration">
<option value="burn_after_reading">Burn after reading</option>
<option value="10_minutes">10 minutes</option>
<option value="1_hour">1 hour</option>
<option selected value="1_day">1 day</option>
<option value="1_month">1 month</option>
<option value="never">Never</option>
@@ -20,20 +18,6 @@
</p>
<p class="paste-option paste-option-down">
<label for="expiration" >Expiration:</label>
<select name="expiration" >
<option value="burn_after_reading">Burn after reading</option>
<option value="10_minutes">10 minutes</option>
<option value="1_hour">1 hour</option>
<option selected value="1_day">1 day</option>
<option value="1_month">1 month</option>
<option value="never">Never</option>
</select>
<button type="submit" class="btn btn-primary">Submit</button>
<p>
</form>
%rebase base

View File

@@ -14,30 +14,28 @@
%end
<div class="well">
<form action="/" method="get" accept-charset="utf-8">
<p>
<a href="{{ paste.path }}">Raw</a>
<span class="paste-option btn-group top">
<button class="btn">New Paste</button>
<button class="btn"><i class="icon-camera"></i>&nbsp;Clone</button>
</span>
</p>
<p></p>
<form action="/" method="get" accept-charset="utf-8">
<p>
<a href="#">Download</a>
<span class="paste-option btn-group top">
<button class="btn">New Paste</button>
<button class="btn"><i class="icon-camera"></i>&nbsp;Clone</button>
</span>
</p>
<p>
<pre id="paste-content" class="prettyprint">
<code>
{{ paste.content }}
</code>
</pre>
</p>
<p>
<pre id="paste-content" class="prettyprint linenums">
<code>
{{ paste.content }}
</code>
</pre>
</p>
<p class="paste-option btn-group bottom">
<button class="btn">New Paste</button>
<button class="btn"><i class="icon-camera"></i>&nbsp;Clone</button>
</p>
<p class="paste-option btn-group bottom">
<button class="btn">New Paste</button>
<button class="btn"><i class="icon-camera"></i>&nbsp;Clone</button>
</p>
</form>
</form>
</div>
%rebase base
%rebase base