Skip to content

Add further expiration options #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manvari wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add further expiration options #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb288a9
Add more expiration options
Apr 3, 2014
e888b75
Don't forget expiration options for paste.tpl
Apr 8, 2014
03566e0
[paste.tpl] fix indentation from last commit
Apr 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions zerobin/paste.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,22 @@ class Paste(object):
DIR_CACHE = set()

DURATIONS = {
u'10_mins': 10 * 60,

@eirnym eirnym Aug 9, 2014

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

datetime.timedelta(minutes=10).seconds

u'30_mins': 30 * 60,
u'1_hour': 1 * 3600,
u'3_hours': 3 * 3600,
u'6_hours': 6 * 3600,
u'12_hours': 12 * 3600,
u'1_day': 24 * 3600,
u'2_days': 2 * 24 * 3600,
u'5_days': 5 * 24 * 3600,
u'10_days': 10 * 24 * 3600,
u'15_days': 15 * 24 * 3600,
u'20_days': 20 * 24 * 3600,
u'1_month': 30 * 24 * 3600,
u'2_months': 2 * 30 * 24 * 3600,
u'6_months': 6 * 30 * 24 * 3600,
u'1_year': 12 * 30 * 24 * 3600,
u'never': 365 * 24 * 3600 * 100,
}

Expand Down
14 changes: 14 additions & 0 deletions zerobin/views/home.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,22 @@
<label for="expiration" >Expiration:</label>
<select id="expiration" name="expiration">
<option value="burn_after_reading">Burn after reading</option>
<option value="10_mins">10 minutes</option>
<option value="30_mins">30 minutes</option>
<option value="1_hour">1 hour</option>
<option value="3_hours">3 hours</option>
<option value="6_hours">6 hours</option>
<option value="12_hours">12 hours</option>
<option selected value="1_day">1 day</option>
<option value="2_days">2 days</option>
<option value="5_days">5 days</option>
<option value="10_days">10 days</option>
<option value="15_days">15 days</option>
<option value="20_days">20 days</option>
<option value="1_month">1 month</option>
<option value="2_months">2 months</option>,
<option value="6_months">6 months</option>
<option value="1_year">1 year</option>
<option value="never">Never</option>
</select>
<button type="submit" class="btn btn-primary">Submit</button>
Expand Down
22 changes: 18 additions & 4 deletions zerobin/views/paste.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,24 @@
<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>
<option value="burn_after_reading">Burn after reading</option>
<option value="10_mins">10 minutes</option>
<option value="30_mins">30 minutes</option>
<option value="1_hour">1 hour</option>
<option value="3_hours">3 hours</option>
<option value="6_hours">6 hours</option>
<option value="12_hours">12 hours</option>
<option selected value="1_day">1 day</option>
<option value="2_days">2 days</option>
<option value="5_days">5 days</option>
<option value="10_days">10 days</option>
<option value="15_days">15 days</option>
<option value="20_days">20 days</option>
<option value="1_month">1 month</option>
<option value="2_months">2 months</option>
<option value="6_months">6 months</option>
<option value="1_year">1 year</option>
<option value="never">Never</option>
</select>
<button type="submit" class="btn btn-primary">Submit</button>
<button class="btn btn-danger">Cancel clone</button>
Expand Down