More Pro stuff.

master
Nick Sergeant 2012-06-26 16:38:38 -04:00
parent bbb01430c6
commit fa32388e97
7 changed files with 120 additions and 24 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -211,32 +211,49 @@ header.main {
width: 189px;
a.mini-profile {
border-right: 1px solid rgba(#4D6768, .25);
display: block;
padding: 14px 13px 11px 13px;
span.avatar {
background-repeat: no-repeat;
border: 1px solid #3A5E67;
display: inline-block;
display: block;
float: left;
height: 35px;
width: 35px;
@include border-radius();
}
span.username {
color: #FFF;
display: inline-block;
font: 500 14px $Helvetica;
margin-left: 8px;
max-width: 88px;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: 14px;
}
i {
display: inline-block;
opacity: .3;
margin-left: 8px;
vertical-align: 12px;
span.info {
span.username {
color: #FFF;
display: inline-block;
font: 500 14px $Helvetica;
margin: 1px 0 0 8px;
max-width: 88px;
overflow: hidden;
text-overflow: ellipsis;
}
i {
display: block;
float: right;
margin: 1px 0 0 8px;
opacity: .3;
}
span.type {
color: #72979C;
display: inline-block;
font: bold 11px $Helvetica;
margin: 1px 0 0 8px;
min-width: 100px;
padding-bottom: 7px;
text-transform: uppercase;
span.is-pro {
color: #3299B7;
font-style: italic;
}
}
}
&:hover {
background: rgba(#5C8086, .2);
@ -290,6 +307,15 @@ header.main {
i {
background-position: -288px -120px;
}
span.info {
span.type {
color: #B0D7DD;
span.is-pro {
color: #85D2DD;
}
}
}
}
ul {
display: block;
@ -872,7 +898,7 @@ article.snipt {
background-image: none;
padding-left: 0;
span {
span.avatar {
background-color: transparent;
background-position: top left;
background-repeat: no-repeat;
@ -883,6 +909,18 @@ article.snipt {
width: 15px;
@include border-radius(3px);
}
span.pro {
a {
color: #3299B7;
font: italic bold 10px $Helvetica;
margin-left: 5px;
text-transform: uppercase;
&:hover {
text-decoration: underline;
}
}
}
}
&.comments {
background: transparent url('/static/images/comments-icon.png') 0 2px no-repeat;
@ -1236,6 +1274,7 @@ body.static {
margin-bottom: 20px;
}
p {
line-height: 20px;
margin: 15px 0;
}
}
@ -1532,3 +1571,12 @@ body.blog {
}
}
}
body.pro {
h2 {
span.pro {
color: #3299B7;
font-style: italic;
font-weight: bold;
}
}
}

View File

@ -80,8 +80,13 @@
<ul class="attrs">
{% block author %}
<li class="author">
<span style="background-image: url('https://secure.gravatar.com/avatar/{{ snipt.user.email|md5 }}?s=15&amp;d=https%3A%2F%2Fsnipt.net%2Fstatic%2Fimages%2Fauthor-icon.png');"></span>
<a href="{{ snipt.user.get_absolute_url }}">{{ snipt.user.username }}</a>
<span class="avatar" style="background-image: url('https://secure.gravatar.com/avatar/{{ snipt.user.email|md5 }}?s=15&amp;d=https%3A%2F%2Fsnipt.net%2Fstatic%2Fimages%2Fauthor-icon.png');"></span>
<a href="{{ snipt.user.get_absolute_url }}">
{{ snipt.user.username }}
</a>
{% if snipt.user.profile.is_pro %}
<span class="pro"><a href="/pro/">Pro</a></span>
{% endif %}
</li>
{% endblock %}
{% if snipt.blog_post %}

View File

@ -96,15 +96,33 @@
<aside class="nav">
<a href="#" class="mini-profile">
<span class="avatar" style="background-image: url('https://secure.gravatar.com/avatar/{{ request.user.email|md5 }}?s=35');"></span>
<span class="username">{{ request.user.username }}</span>
<i class="icon-cog icon-white"></i>
<span class="info">
<span class="username">{{ request.user.username }}</span>
<i class="icon-cog icon-white"></i>
<span class="type">
{% if request.user.profile.is_pro %}
<span class="is-pro">Pro</span>
{% else %}
Basic member
{% endif %}
</span>
</span>
</a>
<ul>
<li>
<a href="/{{ request.user.username }}/">
<i class="icon-user icon-white"></i>
View profile</a>
View profile
</a>
</li>
{% if not request.user.profile.is_pro %}
<li>
<a href="/pro/">
<i class="icon-star-empty icon-white"></i>
Upgrade to Pro
</a>
</li>
{% endif %}
<li>
<a href="/password/change/">
<i class="icon-wrench icon-white"></i>

24
templates/pro.html Normal file
View File

@ -0,0 +1,24 @@
{% extends "registration/registration_base.html" %}
{% block page-title %}Pro - {{ block.super }}{% endblock %}
{% block body-class %}{{ block.super }} static pro{% endblock %}
{% block content %}
<div class="static-box">
<h2><span class="pro">Pro</span> members</h2>
<p>We're still buiding our <span class="pro">Pro</span> platform, but we gaurantee that it's going to kick ass. By becoming a Pro now, you'll get access to Pro features the moment they're released.</p>
<h6>Current Pro features:</h6>
<ul>
<li>&ldquo;Pro&rdquo; badge throughout the site.</li>
<li>You&rsquo;re supporting current and future development. This stuff takes time and money.</li>
</ul>
<h6>Planned Pro features (not in order):</h6>
<ul>
<li>Collaborative group editing of snipts.</li>
<li>Site-wide setting for viewing snipts in different themes.</li>
<li>Ability to theme your embedded snipts in a specific theme.</li>
<li>Custom domain and premium (Pro-only) themes for your <a href="https://blog.snipt.net/">Snipt blog</a>.</li>
</ul>
</div>
{% endblock %}

View File

@ -34,6 +34,7 @@ urlpatterns = patterns('',
url(r'^robots.txt$', direct_to_template, {'template': 'robots.txt'}),
url(r'^humans.txt$', direct_to_template, {'template': 'humans.txt'}),
url(r'^sitemap.xml$', sitemap),
url(r'^pro/$', direct_to_template, {'template': 'pro.html'}),
url(r'^api/public/lexer/$', lexers),