mirror/0bin
1
0
Fork 0
mirror of https://github.com/Tygs/0bin.git synced 2023-08-10 21:13:00 +03:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
max 2012-05-07 15:33:55 +07:00
commit 5f9427be43
13 changed files with 450 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ dist
content
*.sublime-project
*.sublime-workspace
settings_local.py

5
__init__.py
View File

@ -0,0 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# vim: ai ts=4 sts=4 et sw=4
VERSION = __version__ = "0.1"

34
settings.py
View File

@ -1,17 +1,14 @@
# -*- coding: utf-8 -*-
import os
import math
ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
STATIC_FILES_ROOT = os.path.join(ROOT_DIR, 'static')
#####################################################
# You can start editing settings after this comment #
#####################################################
# import default settings value from src/default_settings.py
# you can refer to this file if you forgot what
# settings is for and what it is set to by default
# DO NOT ALTER THIS LINE
from src.default_settings import *
# debug will get you error message and auto reload
# don't set this to True in production
DEBUG = True
DEBUG = False
# absolute path where the paste files should be store
# default in projectdirectory/static/content/
@ -19,19 +16,28 @@ DEBUG = True
PASTE_FILES_ROOT = os.path.join(STATIC_FILES_ROOT, 'content')
# Port and host the embeded python server should be using
# You can also specify them using the --host and --port script options
# which have priority on these settings
HOST = "127.0.0.1"
PORT= "8000"
# User and group the server should run as. Set to None if it should be the
# current user
# current user. Some OS don't support it and if so, it will be ignored.
USER = None
GROUP = None
# limit size of pasted text in bytes. Be carefull allowing too much size can slow down user's
# browser
# limit size of pasted text in bytes. Be carefull allowing too much
# size can slow down user's browser
MAX_SIZE = 1024 * 500
MAX_SIZE_KB = int(math.ceil(MAX_SIZE / 1024.0))
# Email for contact
EMAIL = "your@email.com"
EMAIL = "your@email.com"
# this import a file named settings_local.py if it exists
# you may want to create such a file to have different settings
# on each machine
try:
from settings_local import *
except ImportError:
pass

10
src/__init__.py
View File

@ -1,13 +1,3 @@
# -*- coding: utf-8 -*-
"""
General configuration and imports gathering.
"""
import os
import sys
import settings
from paste import Paste
from utils import drop_privileges, dmerge

35
src/default_settings.py Normal file
View File

@ -0,0 +1,35 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# vim: ai ts=4 sts=4 et sw=4
import os
import math
ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
STATIC_FILES_ROOT = os.path.join(ROOT_DIR, 'static')
# debug will get you error message and auto reload
# don't set this to True in production
DEBUG = False
# absolute path where the paste files should be store
# default in projectdirectory/static/content/
# use "/" even under Windows
PASTE_FILES_ROOT = os.path.join(STATIC_FILES_ROOT, 'content')
# Port and host the embeded python server should be using
# You can also specify them using the --host and --port script options
# which have priority on these settings
HOST = "127.0.0.1"
PORT= "8000"
# User and group the server should run as. Set to None if it should be the
# current user. Some OS don't support it and if so, it will be ignored.
USER = None
GROUP = None
# limit size of pasted text in bytes. Be carefull allowing too much size can slow down user's
# browser
MAX_SIZE = 1024 * 500
MAX_SIZE_KB = int(math.ceil(MAX_SIZE / 1024.0))

12
start.py
View File

@ -1,4 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# vim: ai ts=4 sts=4 et sw=4
"""
Main script including controller, rooting, dependancy management, and
@ -13,6 +15,8 @@ import math
from datetime import datetime, timedelta
# add project dir and libs dir to the PYTHON PATH to ensure they are
# importable
import settings
sys.path.insert(0, os.path.dirname(settings.ROOT_DIR))
sys.path.append(os.path.join(settings.ROOT_DIR, 'libs'))
@ -23,7 +27,10 @@ from bottle import (Bottle, route, run, abort, error,
import clize
from src import settings, Paste, drop_privileges, dmerge
from src.paste import Paste
from src.utils import drop_privileges, dmerge
app = Bottle()
@ -31,7 +38,6 @@ global_vars = {
'settings' : settings
}
@app.route('/')
@view('home')
def index():
@ -98,10 +104,8 @@ def display_paste(paste_id):
return error404(ValueError)
context = {'paste': paste, 'keep_alive': keep_alive}
return dmerge(context, global_vars)
@app.error(404)
@view('404')
def error404(code):

65
static/css/style.css
View File

@ -119,12 +119,21 @@ h4#pixels-total {
float:left;
}
.file-upload {
html.file-upload p.file-upload {
float: left;
margin: 22px 0px 0px 21px;
display: none;
}
html.file-upload p.file-upload {
display:inherit;
}
html.no-file-upload p.file-upload {
display:none;
}
input.btn-upload {
position: relative;
left: -6px;
@ -147,14 +156,19 @@ input.hide-upload {
height: 49px;
}
/* Paste Page */
.items {
text-align: center;
}
/* Paste Page */
#paste-content {
background-color: white;
padding:1em;
}
#paste-content.done {
background-color: white;
padding-top:1em;
padding-left:0;
}
.submit-form {
@ -176,8 +190,8 @@ li.L5, li.L6, li.L7, li.L8, li.L9
list-style-type: decimal;
background: inherit;
}
.margin-color {
.prettyprint.linenums {
-webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
@ -254,7 +268,7 @@ button.btn, input[type="submit"].btn {
margin-left: 5px;
}
.btn-primary {
.btn-primary, .btn-danger {
position:relative;
top:-4px;
}
@ -274,4 +288,37 @@ button.btn, input[type="submit"].btn {
text-indent: 10px;
text-align:left;
}
.lnk-option canvas {
vertical-align:middle;
margin-right:10px;
}
/* Previous paste list */
.previous-pastes .item {
margin-top:5px;
vertical-align:middle;
line-height:24px;
padding-left:1em;
}
.previous-pastes canvas {
display:block;
float:left;
margin-right:5px;
}
html.local-storage .no-local-storage {
display:none;
}
html.no-local-storage .local-storage {
display:none;
}
canvas {
border: 1px solid white;
}

402
static/js/behavior.js
View File

@ -5,11 +5,35 @@ sjcl.random.startCollectors();
/* Ensure jquery use cache for ajax requests */
$.ajaxSetup({ cache: true });
/** Create a function that create inline callbacks.
We use it to create callbacks for onliners with static arguments
E.G:
$('stuff').hide(function()(console.log(1, 2, 3)))
Becomes:
$('stuff').hide(mkcb(console.log, 1, 2, 3))
*/
function mkcb(func){
var args = arguments;
return function(){
return func.apply(func, Array.prototype.slice.call(args, 1))
}
}
/***************************
**** 0bin utilities ***
****************************/
zerobin = {
/** Base64 + compress + encrypt, with callbacks before each operation,
and all of them are executed in a timed continuation to give
a change to the UI to respond.
*/
version: '0.1',
encrypt: function(key, content, toBase64Callback,
compressCallback, encryptCallback, doneCallback) {
@ -112,20 +136,21 @@ zerobin = {
return sjcl.codec.base64.fromBits(sjcl.random.randomWords(8, 0), 0);
},
getDate: function(){
var date = new Date();
return date.getDate()+"-"+(date.getMonth()+1)+"-"+date.getFullYear();
getFormatedDate: function(date){
var date = date || new Date();
return ((date.getMonth() +1 ) + '-' +
date.getDate() + '-' + date.getFullYear());
},
getTime: function(){
var date = new Date();
var h=date.getHours();
var m=date.getMinutes();
var s=date.getSeconds();
if (h<10) {h = "0" + h}
if (m<10) {m = "0" + m}
if (s<10) {s = "0" + s}
return h+":"+m+":"+s;
getFormatedTime: function(date){
var date = date || new Date();
var h = date.getHours();
var m = date.getMinutes();
var s = date.getSeconds();
if (h < 10) {h = "0" + h}
if (m < 10) {m = "0" + m}
if (s < 10) {s = "0" + s}
return h + ":" + m + ":" + s;
},
numOrdA: function(a, b){
@ -133,8 +158,8 @@ zerobin = {
},
getKeys: function(){
var keys = new Array();
for(i=0; i<=localStorage.length; i++){
var keys = [];
for(i=0; i <= localStorage.length; i++){
if(localStorage.key(i) != null)
keys[i] = parseInt(localStorage.key(i),10);
}
@ -148,64 +173,89 @@ zerobin = {
});
},
/** Check for browser support of the named featured. Store the result
and add a class to the html tag with the result */
support: {
localstorage: function(){
return !!(localStorage);
},
history: function(){
return !!(window.history && history.pushState);
}
localStorage: (function(){
var val = !!(localStorage);
$('html').addClass((val ? '' : 'no-') + 'local-storage');
return val;
})(),
history: (function(){
var val = !!(window.history && history.pushState);
$('html').addClass((val ? '' : 'no-') + 'history');
return val;
})(),
fileUpload: (function(){
var w = window;
var val = !!(w.File && w.FileReader && w.FileList && w.Blob);
$('html').addClass((val ? '' : 'no-') + 'file-upload');
return val;
})(),
},
storatePaste: function(url){
if (zerobin.support.localstorage){
var date = new Date();
var paste = zerobin.getDate()+" "+zerobin.getTime()+";"+url;
if (zerobin.support.localStorage){
var paste = (zerobin.getFormatedDate() + " " +
zerobin.getFormatedTime() + ";" + url);
var keys = zerobin.getKeys();
if(keys.length < 1)
keys[0] = 0;
if(keys.length < 1){keys[0] = 0}
if (localStorage.length > 19)
if (localStorage.length > 19) {
void localStorage.removeItem(keys[0]);
}
localStorage.setItem(keys.reverse()[0]+1, paste);
}
},
getPastes: function(){
if (zerobin.support.localstorage){
var pastes = '';
var keys = zerobin.getKeys();
keys.reverse();
/** Return a list of the previous paste url with creation date */
getPreviousPastes: function(){
var pastes = [],
keys = zerobin.getKeys(),
date = zerobin.getFormatedDate();
keys.reverse();
for (i=0; i<=keys.length-1; i++)
{
var paste = localStorage.getItem(keys[i]);
if (paste.split(';')[0].split(' ')[0] == zerobin.getDate()){
var display_date = paste.split(';')[0].split(' ')[1];
var on_at = 'at ';
}else{
var display_date = zerobin.getDate();
var on_at = 'on ';
}
pastes = pastes + '<li><a class="items" href="' + paste.split(';')[1] + '">' + on_at + display_date + '</a></li>';
for (i=0; i <= keys.length-1; i++) {
var paste = localStorage.getItem(keys[i]).split(';');
var displayDate = paste[0].split(' ')[0];
var prefix = 'the ';
if (displayDate == date){
displayDate = paste[0].split(' ')[1];
prefix = 'at ';
}
if (!pastes){
return '<i class="grey">Your previous pastes will be saved in your browser using <a href="http://www.w3.org/TR/webstorage/">localStorage</a>.</i>';
}
return pastes;
}else{
return 'Sorry your browser does not support LocalStorage, We cannot display your previous pastes.';
pastes.push({displayDate: displayDate, prefix: prefix, link: paste[1]});
}
return pastes
},
getPasteContent: function(){
var content_clone = '' ;
$("#paste-content li").each(function(index) {
content_clone = content_clone + $(this).text() + '\n';
});
return content_clone;
/** Return an link object with the URL as href so you can extract host,
protocol, hash, etc*/
parseUrl: function(url){
var a = document.createElement('a');
a.href = url
return a
},
getPasteId: function(url){
loc = url ? zerobin.parseUrl(url) : window.location
return loc.pathname.replace(/[/]|paste/g, '');
},
/** Return the paste content stripted from any code coloration */
getPasteContent: function(){
var copy = '' ;
$("#paste-content li").each(function(index) {
copy = copy + $(this).text() + '\n';
});
return copy;
},
/** Return an approximate estimate the number of bytes in a text */
count: function(text, options) {
// Set option defaults
var crlf = /(\r?\n|\r)/g;
@ -219,6 +269,7 @@ zerobin = {
return length + nonAscii + Math.max(0, options.lineBreaks * (lineBreaks - 1));
},
/** Create a message, style it and insert it in the alert box */
message: function(type, message, title, flush, callback) {
$(window).scrollTop(0);
@ -233,10 +284,23 @@ zerobin = {
else {$('.title', $message).remove()}
$message.prependTo($('#main')).show('fadeUp', callback);
},
/** Return a progress bar object */
progressBar: function(selector){
var $container = $(selector);
var bar = {container: $container, elem: $container.find('.bar')};
bar.set = function(text, rate){bar.elem.text(text).css('width', rate)};
return bar;
}
};
/***************************
**** On document ready ***
****************************/
$(function(){
/**
@ -245,31 +309,32 @@ $(function(){
posting it using ajax. Then redirect to the address of the
newly created paste, adding the key in the hash.
*/
$('button[type=submit]').live("click", function(e){
$('.btn-primary').on("click", function(e){
e.preventDefault();
var paste = $('textarea').val();
var sizebytes = zerobin.count($('#content').val(), { });
var sizebytes = zerobin.count($('#content').val());
var oversized = sizebytes > zerobin.max_size;
var readable_fsize = Math.round(sizebytes/1024);
var readable_maxsize = Math.round(zerobin.max_size/1024)
var readableFsize = Math.round(sizebytes / 1024);
var readableMaxsize = Math.round(zerobin.max_size / 1024);
if (oversized){
zerobin.message('error',
('Your file is <strong class="file-size">' + readable_fsize +
('Your file is <strong class="file-size">' + readablFfsize +
'</strong>KB. You have reached the maximum size limit of ' +
readable_maxsize + 'KB.'),
readableMaxsize + 'KB.'),
'Warning!', true)
}
if (!oversized && paste.trim()) {
$form = $('input, textarea, select, button').prop('disabled', true);
$form.prop('disabled', true);
$bar = $('form.well .progress').show();
var $loading = $('form.well .progress .bar')
.css('width', '25%')
.text('Converting paste to bits...');
// set up progress bar
var bar = zerobin.progressBar('form.well .progress');
bar.container.show();
bar.set('Converting paste to bits...', '25%');
/* Encode, compress, encrypt and send the paste then redirect the user
to the new paste. We ensure a loading animation is updated
@ -282,20 +347,20 @@ $('button[type=submit]').live("click", function(e){
zerobin.encrypt(key, paste,
function(){$loading.text('Encoding to base64...').css('width', '45%')},
function(){$loading.text('Compressing...').css('width', '65%')},
function(){$loading.text('Encrypting...').css('width', '85%')},
mkcb(bar.set, 'Encoding to base64...', '45%'),
mkcb(bar.set, 'Compressing...', '65%'),
mkcb(bar.set, 'Encrypting...', '85%'),
/* This block deal with sending the data, redirection or error handling */
function(content){
$loading.text('Sending...').css('width', '95%');
bar.set('Sending...', '95%');
var data = {content: content, expiration: expiration};
$.post('/paste/create', data)
.error(function(error) {
$form.prop('disabled', false);
$loading.hide();
bar.container.hide();
zerobin.message(
'error',
'Paste could not be saved. Please try again later.',
@ -304,12 +369,12 @@ $('button[type=submit]').live("click", function(e){
})
.success(function(data) {
$loading.text('Redirecting to new paste...').css('width', '100%');
bar.set('Redirecting to new paste...', '100%');
if (data['status'] == 'error') {
zerobin.message('error', data['message'], 'Error');
$form.prop('disabled', false);
$bar.hide();
bar.container.hide();
} else {
var paste_url = '/paste/' + data['paste'] + '#' + key;
zerobin.storatePaste(paste_url);
@ -320,7 +385,7 @@ $('button[type=submit]').live("click", function(e){
);
} catch (err) {
$form.prop('disabled', false);
$bar.hide();
bar.container.hide();
zerobin.message('error', 'Paste could not be encrypted. Aborting.',
'Error');
}
@ -332,29 +397,46 @@ $('button[type=submit]').live("click", function(e){
DECRYPTION:
On the display paste page, decrypt and decompress the paste content,
add syntax coloration then setup the copy to clipboard button.
Also calculate and set the paste visual hash.
*/
var content = $('#paste-content').text().trim();
var key = window.location.hash.substring(1);
var error = false;
if (content && key) {
var $bar = $('.well form .progress').show();
var $loading = $('.well form .progress .bar').css('width', '25%')
.text('Decrypting paste...');
/* Load the lib for visual canvas, create one from the paste id and
insert it */
$.getScript("/static/js/vizhash.min.js").done(function(script, textStatus) {
if (vizhash.supportCanvas) {
var vhash = vizhash.canvasHash(zerobin.getPasteId(), 24, 24);
$('<a class="vhash" href="#"></a>').click(function(e){
e.preventDefault();
if(confirm("This picture is unique to your paste so you can identify" +
" it quickly. \n\n Do you want to know more about this?")){
window.open("http://is.gd/IJaMRG", "_blank");
}
}).prependTo('.lnk-option').append(vhash.canvas);
}
});
$form = $('input, textarea, select, button').prop('disabled', true);
var bar = zerobin.progressBar('.well form .progress');
bar.container.show();
bar.set('Decrypting paste...', '25%');
zerobin.decrypt(key, content,
/* On error*/
function(){
$bar.hide();
zerobin.message('error', 'Could not decrypt data (Wrong key ?)',
'Error');
bar.container.hide();
zerobin.message('error', 'Could not decrypt data (Wrong key ?)', 'Error');
},
/* Update progress bar */
function(){$loading.text('Decompressing...').css('width', '45%')},
function(){$loading.text('Base64 decoding...').css('width', '65%')},
function(){$loading.text('From bits to string...').css('width', '85%')},
mkcb(bar.set, 'Decompressing...', '45%'),
mkcb(bar.set, 'Base64 decoding...', '65%'),
mkcb(bar.set, 'From bits to string...', '85%'),
/* When done */
function(content){
@ -363,7 +445,7 @@ if (content && key) {
$('#paste-content').text(content);
content = '';
$loading.text('Code coloration...').css('width', '95%');
bar.set('Code coloration...', '95%');
/* Add a continuation to let the UI redraw */
setTimeout(function(){
@ -372,16 +454,21 @@ if (content && key) {
ZeroClipboard.setMoviePath('/static/js/ZeroClipboard.swf');
var clip = new ZeroClipboard.Client();
// Callback to reposition the clibpboad flash animation overlay
var reposition = function(){clip.reposition()};
clip.addEventListener('mouseup', function(){
clip.setText(zerobin.getPasteContent());
});
clip.addEventListener('complete', function(){
zerobin.message('info', 'The paste is now in your clipboard',
'', false, function(){clip.reposition()});
});
clip.addEventListener('complete',
mkcb(zerobin.message, 'info',
'The paste is now in your clipboard',
'', true, reposition)
);
clip.glue('clip-button');
window.onresize = clip.reposition;
window.onresize = reposition;
/* Setup link to get the paste short url*/
@ -393,7 +480,7 @@ if (content && key) {
$('#copy-success').hide();
zerobin.message('success',
'<a href="' + tinyurl + '">' + tinyurl + '</a>',
'Short url', true, function(){clip.reposition()}
'Short url', true, reposition
)
$('#short-url').text('Get short url');
});
@ -401,20 +488,23 @@ if (content && key) {
/* Remap the message close handler to include the clipboard
flash reposition */
$(".close").die().live('click', function(e){
$(".close").off().on('click', function(e){
e.preventDefault();
$(this).parent().fadeOut(function(){clip.reposition()});
$(this).parent().fadeOut(reposition);
});
/** Syntaxic coloration */
prettyPrint();
/** Add margin color */
$("#paste-content").addClass("margin-color");
/* Class to switch to paste content style with coloration done */
$('#paste-content').addClass('done');
/* Display result */
$loading.text('Done').css('width', '100%');
$bar.hide();
bar.set('Done', '100%');
bar.container.hide();
$form.prop('disabled', false);
}, 250);
}
@ -423,9 +513,9 @@ if (content && key) {
} /* End of "DECRYPTION" */
/* Synchronize expiration select boxes value */
$('.paste-option select').live('change', function(){
var value = $(this).val();
$('.paste-option select').val(value);
$('.paste-option select').on('change', function(){
var $this = $(this);
$this.val($this.val());
});
@ -434,11 +524,12 @@ $('#content').elastic();
/* Display bottom paste option buttons when needed */
$('#content').live('keyup change', function(){
$('#content').on('keyup change', function(){
if($('#content').height() < 400 ){
$('.paste-option.down').remove();
}
else {
if ($('.paste-option').length == 1) {
$('.paste-option').clone().addClass('down').appendTo('form.well');
}
@ -446,60 +537,99 @@ $('#content').live('keyup change', function(){
});
/* Display previous pastes */
$('.previous-pastes .items').html(zerobin.getPastes());
/* clone a paste */
/* Display previous pastes */
if (zerobin.support.localStorage){
var $container = $('.previous-pastes'),
pastes = zerobin.getPreviousPastes();
if (pastes.length){
$.getScript("/static/js/vizhash.min.js").done(function(script, textStatus) {
$container.find('.item').remove();
$.each(zerobin.getPreviousPastes(), function(i, paste){
var $li = $('<li class="item"></li>').appendTo($container);
var $link = $('<a></a>').attr('href', paste.link)
.text(paste.prefix + paste.displayDate)
.appendTo($li);
if (vizhash.supportCanvas) {
var pasteId = zerobin.getPasteId(paste.link);
var vhash = vizhash.canvasHash(pasteId, 24, 24).canvas;
$link.prepend($(vhash).addClass('vhash'));
}
// hightlite the current link and make sure clicking the link
// does redirect to the page
if (paste.link.replace(/#[^#]+/, '') == window.location.pathname){
$li.addClass('active');
$link.click(function(){window.location.reload()});
}
});
});
}
}
/* Event handler for "clone paste" button */
$('.btn-clone').click(function(e){
e.preventDefault();
var content_clone = zerobin.getPasteContent();
$('.submit-form').show();
$('.paste-form').remove();
$('#content').val(content_clone);
$('#content').trigger('change');
$('.paste-form').hide();
$('#content').val(zerobin.getPasteContent()).trigger('change');
});
$('.clone .btn-danger').click(function(e){
e.preventDefault();
$('.submit-form').hide();
$('.paste-form').show();
});
/* Upload file using HTML5 File API */
if (zerobin.support.fileUpload) {
if (window.File && window.FileReader && window.FileList && window.Blob) {
$('.file-upload').show();
var upload = function(files) {
var reader = new FileReader();
reader.onload = function(event) {
$('#content').val(event.target.result).trigger('change');
};
reader.readAsText(files[0]);
}
var $buttonOverlay = $('#file-upload');
var $button = $('.btn-upload');
try {
$button.val('Uploading...');
$button.prop('disabled', true);
$buttonOverlay.change(function(){upload(this.files)});
}
catch (e) {
zerobin.message('error', 'Could no upload the file', 'Error');
$button.val('Upload File');
$button.prop('disabled', false);
}
$button.prop('disabled', false);
$button.val('Upload File');
$buttonOverlay.mouseover(mkcb($(this).css, 'cursor', 'pointer'));
}
var file_upload = function(file) {
var reader = new FileReader();
reader.onload = function(event) {
var content = event.target.result;
$('#content').val(content);
$('#content').trigger('change');
};
reader.readAsText(file[0]);
}
try {
$('#file-upload').change(function() {
file_upload(this.files);
});
}
catch (e) {
zerobin.message('error', 'Could no upload the file', 'Error');
}
$('#file-upload').mouseover(function(){
$(this).css( 'cursor', 'pointer' );
});
/* Alerts */
$(".close").live('click', function(e){
$(".close").on('click', function(e){
e.preventDefault();
$(this).parent().fadeOut();
});
}); /* End of "document ready" jquery callback */

2
static/js/vizhash.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
views/404.tpl
View File

@ -1,8 +1,8 @@
<p class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">×</a>
<strong class="title">Error!</strong>
<strong class="title">404 Error!</strong>
<span class="message">
This paste has expired or wrong url, please check again.
Either this paste has expired or this page never existed.
</span>
</p>

34
views/base.tpl
View File

@ -19,9 +19,10 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script src="/static/js/sjcl.js"></script>
<script src="/static/js/jquery-1.7.2.min.js"></script>
<script src="/static/js/sjcl.js"></script>
<script src="/static/js/behavior.js"></script>
<script type="text/javascript">
zerobin.max_size = {{ settings.MAX_SIZE }};
</script>
@ -59,7 +60,19 @@
<div class="well sidebar-nav">
<ul class="nav nav-list previous-pastes">
<li class="nav-header">Previous pastes</li>
<li class="items"></li>
<li class="item local-storage">
<em class="grey">
Your previous pastes will be saved in your browser using
<a href="http://www.w3.org/TR/webstorage/">localStorage</a>.
</em>
</li>
<li class="item no-local-storage">
<em class="grey">
Sorry your browser does not support
<a href="http://www.w3.org/TR/webstorage/">LocalStorage</a>,
We cannot display your previous pastes.
</em>
</li>
</ul>
</div><!--/.well -->
</div><!--/span-->
@ -95,27 +108,10 @@
</p>
</footer>
<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/ZeroClipboard.js"></script>
<!--
<script src="/static/js/jquery.js"></script>
<script src="/static/js/bootstrap-transition.js"></script>
<script src="/static/js/bootstrap-alert.js"></script>
<script src="/static/js/bootstrap-modal.js"></script>
<script src="/static/js/bootstrap-dropdown.js"></script>
<script src="/static/js/bootstrap-scrollspy.js"></script>
<script src="/static/js/bootstrap-tab.js"></script>
<script src="/static/js/bootstrap-tooltip.js"></script>
<script src="/static/js/bootstrap-popover.js"></script>
<script src="/static/js/bootstrap-button.js"></script>
<script src="/static/js/bootstrap-collapse.js"></script>
<script src="/static/js/bootstrap-carousel.js"></script>
<script src="/static/js/bootstrap-typeahead.js"></script>
-->
<p id="alert-template">
<a class="close" data-dismiss="alert" href="#">×</a>

36
views/home.tpl
View File

@ -4,24 +4,24 @@
</p>
<form class="well" method="post" action="/paste/create">
<p class="paste-option">
<label for="expiration" >Expiration:</label>
<select id="expiration" name="expiration">
<option value="burn_after_reading">Burn after reading</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>
<p>
<div class="progress progress-striped active">
<div class="bar"></div>
</div>
<textarea rows="10" style="width:100%;"
class="input-xlarge"
id="content" name="content"></textarea>
</p>
<p class="paste-option">
<label for="expiration" >Expiration:</label>
<select id="expiration" name="expiration">
<option value="burn_after_reading">Burn after reading</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>
<p>
<div class="progress progress-striped active">
<div class="bar"></div>
</div>
<textarea rows="10" style="width:100%;"
class="input-xlarge"
id="content" name="content"></textarea>
</p>
</form>

41
views/paste.tpl
View File

@ -53,25 +53,28 @@
</div>
<!-- For cloning -->
<span class="submit-form">
<form class="well" method="post" action="/paste/create">
<p class="paste-option">
<label for="expiration" >Expiration:</label>
<select id="expiration" name="expiration">
<option value="burn_after_reading">Burn after reading</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>
<p>
<textarea rows="10" style="width:100%;"
class="input-xlarge"
id="content" name="content"></textarea>
</p>
</form>
</span>
<div class="submit-form clone">
<form class="well" method="post" action="/paste/create">
<p class="paste-option">
<label for="expiration" >Expiration:</label>
<select id="expiration" name="expiration">
<option value="burn_after_reading">Burn after reading</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>
<p>
<div class="progress progress-striped active">
<div class="bar"></div>
</div>
<textarea rows="10" style="width:100%;"
class="input-xlarge"
id="content" name="content"></textarea>
</p>
</form>
</div>
%rebase base settings=settings