marrub
/
snipt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blog post functionality.

master
Nick Sergeant 2012-05-24 22:20:06 -04:00
parent 254a664f51
commit b12135eb90
9 changed files with 220 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
media/css/style.css
View File

@ -760,6 +760,15 @@ article.snipt.favorited div.container header {
article.snipt.favorited div.container header h1 a {
padding-right: 25px;
}
article.snipt.blog-post div.container header {
background: #7f7f7f;
background: -webkit-gradient(linear, left top, left bottom, from(white), to(#f0f4fc));
background: -moz-linear-gradient(center top, white 0%, #f0f4fc 100%);
background: -moz-gradient(center top, white 0%, #f0f4fc 100%);
-webkit-box-shadow: inset 0 -1px 0 #e3e9f5;
-moz-box-shadow: inset 0 -1px 0 #e3e9f5;
box-shadow: inset 0 -1px 0 #e3e9f5;
}
article.private-snipt div.container header {
background: #7f7f7f url("/static/images/private-icon.png") top right no-repeat;
@ -770,6 +779,15 @@ article.private-snipt div.container header {
article.private-snipt div.container header h1 a {
padding-right: 25px;
}
article.private-snipt.blog-post div.container header {
background: #7f7f7f url("/static/images/private-icon.png") top right no-repeat;
background: url("/static/images/private-icon.png") top right no-repeat, -webkit-gradient(linear, left top, left bottom, from(white), to(#f0f4fc));
background: url("/static/images/private-icon.png") top right no-repeat, -moz-linear-gradient(center top, white 0%, #f0f4fc 100%);
background: url("/static/images/private-icon.png") top right no-repeat, -moz-gradient(center top, white 0%, #f0f4fc 100%);
}
article.private-snipt.blog-post div.container header h1 a {
padding-right: 25px;
}
div.pagination {
margin: 0 15px 35px 15px;
@ -1100,7 +1118,7 @@ body.editing section.main div.inner section.snipts article.editing aside div.in
padding: 7px 9px;
width: 202px;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public {
body.editing section.main div.inner section.snipts article.editing aside div.in label.public, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post {
background: #EFEEEF;
border: 1px solid #DDDDDD;
cursor: pointer;
@ -1113,26 +1131,33 @@ body.editing section.main div.inner section.snipts article.editing aside div.in
border-radius: 5px;
background-clip: padding-box;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public input {
body.editing section.main div.inner section.snipts article.editing aside div.in label.public input, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post input {
display: inline-block;
margin: 4px 4px 0 4px;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public span {
body.editing section.main div.inner section.snipts article.editing aside div.in label.public input:focus, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post input:focus {
outline: none;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public span, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post span {
color: #7B7B79;
display: inline-block;
text-transform: none;
vertical-align: -3px;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-private {
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-private, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post.is-private {
background: #efeeef url("/static/images/private-icon-edit.png") 199px center no-repeat;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-public {
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-public, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post.is-public {
background: #F2DEDE;
border: 1px solid #EED3D7;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-public span {
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-public span, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post.is-public span {
color: #B94A48;
}
body.editing section.main div.inner section.snipts article.editing aside div.in label.public.is-blog-post, body.editing section.main div.inner section.snipts article.editing aside div.in label.blog-post.is-blog-post {
background: #DAE3EE;
border: 1px solid #C8D1DE;
}
body.error section.main div.inner {
color: #CCC;

31
media/css/style.scss
View File

@ -866,6 +866,14 @@ article.snipt {
}
}
}
&.blog-post {
div.container {
header {
@include vertical-gradient(#FFF, #F0F4FC);
@include inset-box-shadow(0, -1px, 0, #E3E9F5);
}
}
}
}
article.private-snipt {
div.container {
@ -879,6 +887,19 @@ article.private-snipt {
}
}
}
&.blog-post {
div.container {
header {
@include vertical-gradient-with-image(url('/static/images/private-icon.png') top right no-repeat, #FFF, #F0F4FC);
h1 {
a {
padding-right: 25px;
}
}
}
}
}
}
div.pagination {
margin: 0 15px 35px 15px;
@ -1240,7 +1261,7 @@ body.editing {
padding: 7px 9px;
width: 202px;
}
label.public {
label.public, label.blog-post {
background: #EFEEEF;
border: 1px solid #DDDDDD;
cursor: pointer;
@ -1251,6 +1272,10 @@ body.editing {
input {
display: inline-block;
margin: 4px 4px 0 4px;
&:focus {
outline: none;
}
}
span {
color: #7B7B79;
@ -1269,6 +1294,10 @@ body.editing {
color: #B94A48;
}
}
&.is-blog-post {
background: #DAE3EE;
border: 1px solid #C8D1DE;
}
}
}
}

26
media/js/src/modules/snipt.js
View File

@ -101,6 +101,19 @@
// Init chosen
$('select#id_lexer', window.site.$main_edit).chosen();
// Blog post
$('label.blog-post input', window.site.$main_edit).on('change', function() {
var $checkbox = $(this);
var $label = $checkbox.parent();
if ($checkbox.attr('checked')) {
$label.removeClass('is-not-blog-post').addClass('is-blog-post');
} else {
$label.addClass('is-not-blog-post').removeClass('is-blog-post');
}
return false;
}).trigger('change');
// Public / private
$('label.public input', window.site.$main_edit).on('change', function() {
var $checkbox = $(this);
@ -274,6 +287,12 @@
this.$el.html(this.template({snipt: this.model.toSafe()}));
this.initLocalVars();
if (this.model.get('blog_post') === true) {
this.$el.addClass('blog-post');
} else {
this.$el.removeClass('blog-post');
}
if (this.model.get('public') === true) {
this.$el.removeClass('private-snipt');
} else {
@ -311,6 +330,7 @@
'lexer': $('select[name="lexer"]').val(),
'lexer_name': $('select[name="lexer"] option:selected').text(),
'code': window.editor.getSession().getValue(),
'blog_post': $('label.blog-post input').is(':checked'),
'public': $('label.public input').is(':checked')
}, {'silent': true});
@ -371,8 +391,12 @@
var $created = $('li.created', $el);
var $h1 = $('header h1 a', $el);
var $public = $('div.public', $el);
var $blog_post = $('div.blog-post', $el);
var $user = $('li.author a', $el);
var is_public = $public.text() === 'True' ? true : false;
var is_blog_post = $blog_post.text() === 'True' ? true : false;
var tag_lis = $('section.tags li', $el);
var tags = [];
@ -409,6 +433,7 @@
}
};
data['public'] = is_public;
data['blog_post'] = is_blog_post;
var view = new Snipt.SniptView({
el: this,
@ -436,6 +461,7 @@
}
};
data['public'] = false;
data['blog_post'] = false;
var newSniptView = new Snipt.SniptView({
el: $('article#new-snipt'),

12
snipts/api.py
View File

@ -155,8 +155,8 @@ class PrivateSniptResource(ModelResource):
class Meta:
queryset = Snipt.objects.all().order_by('-created')
resource_name = 'snipt'
fields = ['id', 'title', 'slug', 'lexer', 'code', 'line_count',
'stylized', 'key', 'public', 'created', 'modified',]
fields = ['id', 'title', 'slug', 'lexer', 'code', 'line_count', 'stylized',
'key', 'public', 'blog_post', 'created', 'modified',]
validation = Validation()
include_absolute_url = True
detail_allowed_methods = ['get', 'patch', 'put', 'delete']
@ -177,6 +177,10 @@ class PrivateSniptResource(ModelResource):
def obj_create(self, bundle, request=None, **kwargs):
bundle.data['tags_list'] = bundle.data.get('tags')
bundle.data['tags'] = ''
if not request.user.is_staff:
bundle.data['blog_post'] = False
return super(PrivateSniptResource, self).obj_create(bundle, request,
user=request.user, **kwargs)
@ -187,6 +191,10 @@ class PrivateSniptResource(ModelResource):
else:
bundle.data['tags_list'] = ''
bundle.data['tags'] = ''
if not request.user.is_staff:
bundle.data['blog_post'] = False
return super(PrivateSniptResource, self).obj_update(bundle, request,
user=request.user, **kwargs)

99
snipts/migrations/0022_auto__add_field_snipt_blog_post.py Normal file
View File

@ -0,0 +1,99 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding field 'Snipt.blog_post'
db.add_column('snipts_snipt', 'blog_post', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
def backwards(self, orm):
# Deleting field 'Snipt.blog_post'
db.delete_column('snipts_snipt', 'blog_post')
models = {
'auth.group': {
'Meta': {'object_name': 'Group'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
'auth.permission': {
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
'snipts.favorite': {
'Meta': {'object_name': 'Favorite'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'snipt': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['snipts.Snipt']"}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
},
'snipts.snipt': {
'Meta': {'object_name': 'Snipt'},
'blog_post': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'code': ('django.db.models.fields.TextField', [], {}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'custom_slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
'embedded': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'key': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'lexer': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
'line_count': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}),
'stylized': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
},
'taggit.tag': {
'Meta': {'object_name': 'Tag'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100', 'db_index': 'True'})
},
'taggit.taggeditem': {
'Meta': {'object_name': 'TaggedItem'},
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_items'", 'to': "orm['taggit.Tag']"})
}
}
complete_apps = ['snipts']

21
snipts/models.py
View File

@ -21,24 +21,25 @@ site = Site.objects.all()[0]
class Snipt(models.Model):
"""An individual Snipt."""
user = models.ForeignKey(User, blank=True, null=True)
user = models.ForeignKey(User, blank=True, null=True)
title = models.CharField(max_length=255)
slug = models.SlugField(max_length=255, blank=True)
custom_slug = models.SlugField(max_length=255, blank=True)
tags = TaggableManager()
lexer = models.CharField(max_length=50)
code = models.TextField()
stylized = models.TextField(blank=True, null=True)
embedded = models.TextField(blank=True, null=True)
line_count = models.IntegerField(blank=True, null=True, default=None)
lexer = models.CharField(max_length=50)
code = models.TextField()
stylized = models.TextField(blank=True, null=True)
embedded = models.TextField(blank=True, null=True)
line_count = models.IntegerField(blank=True, null=True, default=None)
key = models.CharField(max_length=100, blank=True, null=True)
public = models.BooleanField(default=False)
key = models.CharField(max_length=100, blank=True, null=True)
public = models.BooleanField(default=False)
blog_post = models.BooleanField(default=False)
created = models.DateTimeField(auto_now_add=True, editable=False)
modified = models.DateTimeField(auto_now=True, editable=False)
created = models.DateTimeField(auto_now_add=True, editable=False)
modified = models.DateTimeField(auto_now=True, editable=False)
def save(self, *args, **kwargs):

10
snipts/templates/snipts/snipt-edit-js-template.html
View File

@ -50,6 +50,16 @@
<input type="checkbox" <% if (snipt.public) { %>checked="checked"<% } %> name="" value="" />
<span>Public</span>
</label>
{% endverbatim %}
{% if request.user.is_staff %}
{% verbatim %}
<label class="blog-post is-blog-post">
<input type="checkbox" <% if (snipt.blog_post) { %>checked="checked"<% } %> name="" value="" />
<span>Blog post</span>
</label>
{% endverbatim %}
{% endif %}
{% verbatim %}
<label class="tags">
<span>Tags</span>
<textarea><%= snipt.tags_list %></textarea>

3
snipts/templates/snipts/snipt-list.html
View File

@ -2,7 +2,7 @@
{% snipt_is_favorited_by_user as 'is_favorited' %}
<article id="snipt-{{ snipt.pk }}" class="snipt{% if not snipt.public %} private-snipt{% endif %}{% if snipt.line_count > 8 and not detail and user.username != 'blog' %} expandable{% endif %}{% if snipt.user == request.user %} editable{% endif %}{% if is_favorited %} favorited" data-favorite-id="{{ is_favorited }}"{% else %}"{% endif %}>
<article id="snipt-{{ snipt.pk }}" class="snipt {% if snipt.blog_post %}blog-post {% endif %}{% if not snipt.public %} private-snipt{% endif %}{% if snipt.line_count > 8 and not detail and user.username != 'blog' %} expandable{% endif %}{% if snipt.user == request.user %} editable{% endif %}{% if is_favorited %} favorited" data-favorite-id="{{ is_favorited }}"{% else %}"{% endif %}>
<div class="number">#{{ snipt.pk }}</div>
<div class="group">
<div class="container">
@ -104,6 +104,7 @@
<div class="hide line-count">{{ snipt.line_count }}</div>
<div class="hide modified">{{ snipt.modified|date:"Y-m-d\TH:i:s" }}</div>
<div class="hide public">{{ snipt.public }}</div>
<div class="hide blog-post">{{ snipt.blog_post }}</div>
{% if snipt.user == request.user %}
<div class="hide resource-uri">/api/private/snipt/{{ snipt.pk }}/</div>
{% else %}

2
templates/base.html
View File

@ -164,7 +164,7 @@
<div class="modal hide" id="keyboard-shortcuts">
<div class="modal-header">
<a href="#" class="close">×</a>
<h3>Keyboard shortcuts</h3>
<h3><span>Keyboard shortcuts</span></h3>
</div>
<div class="modal-body">
<table class="table table-striped table-bordered table-condensed">