Merge.
Nick Sergeant
commit
cacaecfcd6
11
README.md
11
README.md
|
|
@ -9,8 +9,13 @@ getting a local copy running.
|
|||
|
||||
1. Clone the repo.
|
||||
2. Setup a virtualenv.
|
||||
3. `pip install -r requirements`
|
||||
4. Copy local_settings-template.py to local_settings.py and edit the settings.
|
||||
5. Run it!
|
||||
3. `pip install -r requirements.txt`
|
||||
4. `pip install --index-url https://code.stripe.com --upgrade stripe`
|
||||
5. Copy local_settings-template.py to local_settings.py and edit the settings.
|
||||
6. Comment out [this line](https://github.com/nicksergeant/snipt/blob/master/snipts/models.py#L19) from `snipts/models.py`
|
||||
7. `python manage.py syncdb`
|
||||
8. `python manage.py migrate`
|
||||
9. Uncomment the line in `snipt/models.py`
|
||||
10. `python manage.py runserver`
|
||||
|
||||
Any problems / questions / bugs, [create an issue](https://github.com/nicksergeant/snipt/issues). Thanks! :)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -932,7 +932,9 @@ article.snipt {
|
|||
line-height: 20px;
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
line-height: 29px;
|
||||
margin-bottom: 9px;
|
||||
margin-top: 0;
|
||||
}
|
||||
h1 {
|
||||
font-size: 20px;
|
||||
|
|
@ -1163,7 +1165,7 @@ article.snipt {
|
|||
font: normal 12px/16px $Consolas;
|
||||
height: 200px;
|
||||
margin: 0;
|
||||
width: 520px;
|
||||
width: 515px;
|
||||
}
|
||||
}
|
||||
&.selected {
|
||||
|
|
@ -1963,3 +1965,68 @@ body.stats {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
body.jobs {
|
||||
section.jobs {
|
||||
margin: 30px;
|
||||
|
||||
h4 {
|
||||
border-bottom: 1px solid #C0C0C0;
|
||||
color: #999999;
|
||||
font-size: 14px;
|
||||
margin-top: 30px;
|
||||
padding-bottom: 5px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
ul {
|
||||
margin: 0;
|
||||
|
||||
li {
|
||||
list-style-type: none;
|
||||
margin: 10px 0;
|
||||
|
||||
a {
|
||||
background: #FBFBFB;
|
||||
border: 1px solid #DDDDDD;
|
||||
color: #333333;
|
||||
display: block;
|
||||
padding: 10px;
|
||||
@include border-radius;
|
||||
@include box-shadow(0, 1px, 1px, rgba(0, 0, 0, .3));
|
||||
|
||||
&:hover {
|
||||
background: rgba(#FBFBFB, .5);
|
||||
}
|
||||
span.left {
|
||||
float: left;
|
||||
|
||||
span {
|
||||
display: block;
|
||||
|
||||
&.job {
|
||||
color: #3096B4;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
span.right {
|
||||
float: right;
|
||||
|
||||
span {
|
||||
display: block;
|
||||
text-align: right;
|
||||
|
||||
&.location {
|
||||
color: #999999;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
BeautifulSoup
|
||||
boto
|
||||
bugsnag
|
||||
biplist
|
||||
Django
|
||||
django-annoying
|
||||
django-appconf
|
||||
django-bcrypt
|
||||
django-extensions
|
||||
django-markdown-deux
|
||||
django-pagination
|
||||
django-taggit
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/snipt.css?37" />
|
||||
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/snipt.css?39" />
|
||||
|
||||
{% if has_snipts and not detail %}
|
||||
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ request.path }}?rss{% if not public %}&api_key={{ request.user.api_key.key }}{% endif %}" />
|
||||
|
|
@ -58,6 +58,9 @@
|
|||
<li>
|
||||
<a href="/public/" {% if '/public/' in request.path or public %} class="active"{% endif %}>Public snipts</a>
|
||||
</li>
|
||||
<!--<li>-->
|
||||
<!--<a href="/jobs/" {% if '/jobs/' in request.path %} class="active"{% endif %}>Jobs</a>-->
|
||||
<!--</li>-->
|
||||
<li>
|
||||
<a href="/login/?next={{ request.path }}" {% if '/login/' in request.path %} class="active"{% endif %}>Log in</a>
|
||||
</li>
|
||||
|
|
@ -71,6 +74,9 @@
|
|||
<li>
|
||||
<a href="/public/" {% if '/public/' in request.path or public %} class="active"{% endif %}>Public snipts</a>
|
||||
</li>
|
||||
<!--<li>-->
|
||||
<!--<a href="/jobs/" {% if '/jobs/' in request.path %} class="active"{% endif %}>Jobs</a>-->
|
||||
<!--</li>-->
|
||||
<li class="add-snipt">
|
||||
<button class="btn btn-info btn-large" id="add-snipt">
|
||||
Add {% if request.user.username == 'blog' %}Post{% else %}Snipt{% endif %}
|
||||
|
|
@ -124,13 +130,6 @@
|
|||
Upgrade to Pro
|
||||
</a>
|
||||
</li>
|
||||
{% else %}
|
||||
<li>
|
||||
<a href="mailto:pro@snipt.net">
|
||||
<i class="icon-envelope icon-white"></i>
|
||||
Email Pro Support
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li>
|
||||
<a href="/password/change/">
|
||||
|
|
@ -212,6 +211,9 @@
|
|||
<li class="blog">
|
||||
<a href="https://blog.snipt.net/">Blog</a>
|
||||
</li>
|
||||
<li class="jobs roadmap">
|
||||
<a href="/jobs/">Jobs</a>
|
||||
</li>
|
||||
{% if not request.user.profile.is_pro %}
|
||||
<li class="pro">
|
||||
<a href="/pro/">Go Pro</a>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,118 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% load pagination_tags %}
|
||||
|
||||
{% block page-title %}Snipt Jobs{% endblock %}
|
||||
|
||||
{% block body-class %}{{ block.super }} static jobs{% endblock %}
|
||||
|
||||
{% block breadcrumb %}
|
||||
<li><a href="/jobs/">Snipt Jobs</a></li>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="jobs">
|
||||
<h4>New (7)</h4>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<h4>Past week (27)</h4>
|
||||
<ul>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="group">
|
||||
<span class="left">
|
||||
<span class="job">Visual Designer</span>
|
||||
<span class="company">Acto A/S</span>
|
||||
</span>
|
||||
<span class="right">
|
||||
<span class="location">Dallas, TX, USA</span>
|
||||
<span class="date">Oct 15, 2012</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
{% endblock %}
|
||||
3
urls.py
3
urls.py
|
|
@ -1,4 +1,4 @@
|
|||
from views import (amazon_search, amazon_image, lexers, pro_signup,
|
||||
from views import (amazon_search, amazon_image, jobs, lexers, pro_signup,
|
||||
sitemap, tags, pro_signup_complete, stats)
|
||||
from django.conf.urls.defaults import include, patterns, url
|
||||
from django.views.generic.simple import direct_to_template
|
||||
|
|
@ -41,6 +41,7 @@ urlpatterns = patterns('',
|
|||
url(r'^pro/signup/$', pro_signup),
|
||||
url(r'^pro/signup/complete/$', pro_signup_complete),
|
||||
|
||||
url(r'^jobs/$', jobs),
|
||||
url(r'^stats/$', stats),
|
||||
|
||||
url(r'^api/public/lexer/$', lexers),
|
||||
|
|
|
|||
Loading…
Reference in New Issue