limestone/editorsdesk/__init__.py
limestone/editorsdesk/models.py
limestone/editorsdesk/templatetags/__init__.py
limestone/editorsdesk/templatetags/smart_if.py
limestone/editorsdesk/urls.py
limestone/editorsdesk/views.py
limestone/media/templates/n21alpha/images/photo.png
limestone/partner/templatetags/__init__.html
limestone/partner/templatetags/smart_if.py
limestone/plaintext/admin.py
limestone/templates/n21alpha/admin/base_site.html
limestone/templates/n21alpha/editorsdesk/base.html
limestone/templates/n21alpha/editorsdesk/dashboard.html
limestone/templates/n21alpha/partner/base.html
limestone/templates/n21alpha/partner/dashboard.html
limestone/utils/EXIF.py
@@ -6,3 +6,5 @@ eggs/*
parts/*
.installed.cfg
.DS_Store
+limestone/media/ik_cache/*
+limestone/media/uploads/*
.gitignore
@@ -33,6 +33,11 @@ since the migrations (south) are included in code just make sure db config is co
bin/django syncdb
bin/django migrate
+photologue is used for image processing
+... configure the default settings (don't worry you can change them in the admin if you mess up)
+
+ bin/django plinit
+
that should be it,
... runserver and test it
README
@@ -15,6 +15,7 @@ from limestone.main.models import Profile, ProfileForm
from limestone.newsroom.models import Newsroom
from limestone.partner.models import Partner, PartnerForm
from limestone.story.models import MetaStory
+from limestone.multimedia.models import Media
def home(request):
return render_to_response("main/home.html", {}, context_instance=RequestContext(request))
@@ -27,14 +28,22 @@ def terms(request):
@login_required
def dashboard(request):
- # check to see if user is associated with newsroom or partner ...
+ # first if the user is an editor if so send them to editor's desk
+ if request.user.is_staff:
+ return HttpResponseRedirect(reverse('editorsdesk_dashboard'))
+
+ # check to see if user is associated with newsroom or partner ... if neither ... send to association page
n_count = Newsroom.objects.filter(members=request.user).distinct().count()
p_count = Partner.objects.filter(members=request.user).distinct().count()
- if n_count == 0 & p_count == 0:
+ if n_count == 0 and p_count == 0:
return HttpResponseRedirect(reverse('user_association'))
+ # if user is part of a partner ... send to seperate dashboard
+ if p_count > 0:
+ return HttpResponseRedirect(reverse('partner_dashboard'))
+
stories = MetaStory.objects.filter(created_by=request.user)
- entries = MetaStory.objects.filter(created_by=request.user)
+ entries = Media.children.filter(authors=request.user)
return render_to_response("main/dashboard.html", {'stories':stories,'entries':entries}, context_instance=RequestContext(request))
limestone/main/views.py
@@ -75,9 +75,9 @@ a:hover{color:#6F6F6F;text-decoration:underline}
.icon-package {float: left;padding-right:5px;margin:0px 0px 0px 5px;background:url('../images/page_white_stack.png') no-repeat;display:block;width:16px;height:16px;}
.icon-story {float: left;padding-right:5px;margin:0px 0px 0px 5px;background:url('../images/page_white.png') no-repeat;display:block;width:16px;height:16px;}
.icon-plaintext {float: left;padding-right:5px;margin:0px 0px 0px 5px;background:url('../images/page_white_text.png') no-repeat;display:block;width:16px;height:16px;}
+.icon-photo {float: left;padding-right:5px;margin:0px 0px 0px 5px;background:url('../images/photo.png') no-repeat;display:block;width:16px;height:16px;}
-
-.sidebar-right-listing { height:18px; padding-top: 4px; padding-left:5px; }
+.sidebar-right-listing { padding-top: 4px; padding-left:5px; }
.alternating-row-event { }
limestone/media/templates/n21alpha/css/layout.css
@@ -1,5 +1,7 @@
from django.db import models
import django.contrib.auth.models as auth
+from django.template.defaultfilters import slugify
+from datetime import datetime
from tagging.fields import TagField
from tagging.models import Tag
@@ -36,6 +38,14 @@ class Media(ParentModel):
def __str__(self):
return self.title
+ def save(self):
+ if self.slug is None:
+ self.slug = slugify(self.headline)
+ if self.created_at == None:
+ self.created_at = datetime.now()
+ self.updated_at = datetime.now()
+ super(Media, self).save()
+
def _set_tags(self, tags):
Tag.objects.update_tags(self, tags)
limestone/multimedia/models.py
@@ -1,7 +1,7 @@
from django.db import models
import django.contrib.auth.models as auth
from django.forms import ModelForm
-
+from datetime import datetime
class Partner(models.Model):
name = models.CharField(max_length=150,verbose_name="Media Outlet Name")
@@ -13,7 +13,19 @@ class Partner(models.Model):
created_at = models.DateTimeField(editable=False)
updated_by = models.ForeignKey(auth.User, related_name="partner_updated_by")
updated_at = models.DateTimeField(editable=False)
+
+ def __unicode__(self):
+ return unicode(self.name)
+
+ def __str__(self):
+ return self.name
+ def save(self):
+ if self.created_at == None:
+ self.created_at = datetime.now()
+ self.updated_at = datetime.now()
+ super(Partner, self).save()
+
class PartnerForm(ModelForm):
class Meta:
model = Partner
limestone/partner/models.py
@@ -4,5 +4,6 @@ from django.conf.urls.defaults import *
urlpatterns = patterns ('',
url(r'member/add/$','limestone.partner.views.create_partner_member',name='partner_create_member',),
-
+ url(r'dashboard/$','limestone.partner.views.dashboard',name='partner_dashboard',),
+
)
limestone/partner/urls.py
@@ -16,4 +16,27 @@ from limestone.partner.models import Partner, PartnerForm
@login_required
def create_partner_member(request):
- return render_to_response("main/terms.html", {}, context_instance=RequestContext(request))
\ No newline at end of file
+ if request.method == 'POST':
+ partner = Partner(created_by = request.user, updated_by = request.user)
+
+ form = PartnerForm(request.POST,instance=partner)
+
+ if form.is_valid():
+ form.save()
+
+ partner.members.add(request.user)
+
+ request.user.message_set.create(message="1|Your partner info was saved successfully.")
+
+ return HttpResponseRedirect( reverse('partner_dashboard') )
+ else:
+ request.user.message_set.create(message="0|An error has occured.")
+ newsrooms = Newsroom.objects.all()
+
+ return render_to_response( "main/association.html", {'newsrooms':newsrooms,'form':form}, context_instance=RequestContext(request))
+ else:
+ return HttpResponseRedirect( settings.LOGIN_REDIRECT_URL )
+
+@login_required
+def dashboard(request):
+ return render_to_response( "partner/dashboard.html", {}, context_instance=RequestContext(request))
\ No newline at end of file
limestone/partner/views.py
@@ -11,8 +11,6 @@ class Migration:
db.create_table('photos_photo', (
('media_ptr', models.OneToOneField(orm['multimedia.Media'])),
('image', models.ForeignKey(orm.Image)),
- ('created_by', models.ForeignKey(orm['auth.User'], related_name="photos_created")),
- ('modified_by', models.ForeignKey(orm['auth.User'], related_name="photos_modified")),
))
db.send_create_signal('photos', ['Photo'])
@@ -86,10 +84,8 @@ class Migration:
},
'photos.photo': {
'Meta': {'_bases': ['limestone.multimedia.models.Media']},
- 'created_by': ('models.ForeignKey', ["orm['auth.User']"], {'related_name': '"photos_created"'}),
'image': ('models.ForeignKey', ["orm['photos.Image']"], {}),
- 'media_ptr': ('models.OneToOneField', ["orm['multimedia.Media']"], {}),
- 'modified_by': ('models.ForeignKey', ["orm['auth.User']"], {'related_name': '"photos_modified"'})
+ 'media_ptr': ('models.OneToOneField', ["orm['multimedia.Media']"], {})
},
'multimedia.media': {
'_stub': True,
limestone/photos/migrations/0001_initial.py
@@ -17,6 +17,7 @@ from imagekit.models import ImageModel
from imagekit.lib import Image
from limestone.multimedia.models import Media, MediaManager
+from limestone.utils import EXIF
# Modify image file buffer size.
PHOTOS_IMAGEKIT_SPEC = getattr(settings, 'PHOTOS_IMAGEKIT_SPEC', 'limestone.photos.ik_specs')
@@ -155,8 +156,16 @@ class Image(ImageModel):
view_count = models.PositiveIntegerField(default=0, editable=False)
created = models.DateTimeField(auto_now_add=True)
modified = models.DateTimeField(auto_now=True)
-
-
+
+ def EXIF(self):
+ #try:
+ return EXIF.process_file(open(self.image.path, 'rb'))
+ #except:
+ # try:
+ # return EXIF.process_file(open(self.image.path, 'rb'), details=False)
+ # except:
+ # return {}
+
def __unicode__(self):
return self.image.name
@@ -173,7 +182,7 @@ class Photo(Media):
image = models.ForeignKey(Image)
objects = PhotoManager()
-
+
def get_previous_in_gallery(self, gallery):
try:
return self.get_previous_by_date_added(
@@ -194,6 +203,9 @@ class Photo(Media):
def get_thumbnail_width(self):
return self.image.mediumthumb.get_width()
+ def get_thumbnail_height(self):
+ return self.image.mediumthumb.get_height()
+
def get_original_url(self):
return self.image.image.url
@@ -205,3 +217,6 @@ class Photo(Media):
def get_height(self):
return self.image.image.height
+
+ def get_info(self):
+ return self.image.EXIF()
\ No newline at end of file
limestone/photos/models.py
@@ -4,8 +4,8 @@ from django.conf.urls.defaults import *
urlpatterns = patterns ('limestone.photos.views',
url(r'^$','new_photo',name='photo_new'),
- #url(r'^create/$','save_photo',name='photo_create'),
- #url(r'^(?P<multimedia_id>\d+)/$','edit_photo',name='photo_edit'),
- #url(r'^(?P<multimedia_id>\d+)/update/$','save_photo',name='photo_update'),
+ url(r'^create/$','save_photo',name='photo_create'),
+ url(r'^(?P<multimedia_id>\d+)/$','edit_photo',name='photo_edit'),
+ url(r'^(?P<multimedia_id>\d+)/update/$','save_photo',name='photo_update'),
)
\ No newline at end of file
limestone/photos/urls.py
@@ -16,11 +16,12 @@ from limestone.photos.models import Photo
@login_required
def new_photo(request,metastory_id,story_id):
+
metastory = get_object_or_404(MetaStory, pk=metastory_id)
story = get_object_or_404(Story, pk=story_id, metastory=metastory)
form = PhotoForm()
upload_form = ImageForm()
-
+
inherited_tags = []
inherited_tag_ids = []
for newsroom in metastory.newsrooms.all():
@@ -37,7 +38,37 @@ def new_photo(request,metastory_id,story_id):
members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} , {'title':'New Photo','url':reverse('photo_new', args=[metastory_id,story_id])} ]
- return render_to_response("multimedia/photo.html", {'breadcrumb':breadcrumb,'form':form,'upload_form':upload_form,'inherited_tags':inherited_tags,'tags':tags,'newsrooms_members':members,'form_url':reverse('plaintext_create', args=[metastory_id,story_id])}, context_instance=RequestContext(request))
+ return render_to_response("multimedia/photo.html", {'breadcrumb':breadcrumb,'form':form,'image':'','upload_form':upload_form,'inherited_tags':inherited_tags,'tags':tags,'newsrooms_members':members,'form_url':'','upload_form_url':reverse('photo_create', args=[metastory_id,story_id])}, context_instance=RequestContext(request))
+
+
+@login_required
+def edit_photo(request,metastory_id,story_id,multimedia_id):
+
+ metastory = get_object_or_404(MetaStory, pk=metastory_id)
+ story = get_object_or_404(Story, pk=story_id, metastory=metastory)
+ multimedia = get_object_or_404(Photo, pk=multimedia_id, story=story)
+ form = PhotoForm(instance=multimedia)
+ upload_form = ImageForm()
+ authors = multimedia.authors.all()
+
+ inherited_tags = []
+ inherited_tag_ids = []
+ for newsroom in metastory.newsrooms.all():
+ for tag in newsroom.get_tags():
+ inherited_tags.append(tag)
+ inherited_tag_ids.append(tag.id)
+ for mtag in metastory._get_tags():
+ inherited_tags.append(mtag)
+ inherited_tag_ids.append(mtag.id)
+ for stag in story._get_tags():
+ inherited_tags.append(stag)
+ inherited_tag_ids.append(stag.id)
+ tags = Tag.objects.exclude(id__in=inherited_tag_ids)
+ used_tags = multimedia._get_tags()
+
+ members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
+ breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} , {'title':multimedia,'url':reverse('photo_edit', args=[metastory_id,story_id,multimedia.id])} ]
+ return render_to_response("multimedia/photo.html", {'breadcrumb':breadcrumb,'form':form,'image':multimedia,'authors':authors,'upload_form':upload_form,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'newsrooms_members':members,'form_url':reverse('photo_update', args=[metastory_id,story_id,multimedia.id]),'upload_form_url':''}, context_instance=RequestContext(request))
@login_required
@@ -45,42 +76,64 @@ def save_photo(request,metastory_id,story_id,multimedia_id=None):
if request.method == 'POST':
metastory= get_object_or_404(MetaStory, pk=metastory_id)
story = get_object_or_404(Story, pk=story_id, metastory=metastory)
- if multimedia_id:
- multimedia = get_object_or_404(PlainText, pk=multimedia_id, story=story)
- else:
- multimedia = Photo(created_by = request.user, story=story, created_at = datetime.now())
- multimedia.updated_by = request.user
- multimedia.updated_at = datetime.now()
- form = PhotoForm(request.POST,instance=multimedia)
- upload_form = ImageForm(request.POST,instance=multimedia.image)
-
- upload_valid = true
+ form = PhotoForm()
+ upload_form = ImageForm(request.POST, request.FILES)
+ upload_valid = True
if not multimedia_id:
if upload_form.is_valid():
- image = upload_form.save(commit=False)
- image.save()
+ multimedia = Photo(created_by = request.user, story=story, created_at = datetime.now())
+ image = upload_form.save()
+
+ multimedia.updated_by = request.user
+ multimedia.updated_at = datetime.now()
+ multimedia.title = image.EXIF().get('Image DocumentName',image.image.name)
+ multimedia.summary = image.EXIF().get('Image ImageDescription',image.image.name)
+ multimedia.image = image
+ multimedia.save()
+
+ form = PhotoForm(instance=multimedia)
else:
- request.user.message_set.create(message="0|An file is required for upload.")
- upload_valid = false
+ request.user.message_set.create(message="0|A file is required for upload.")
+ return HttpResponseRedirect( reverse('photo_edit', args=[metastory_id,story_id,multimedia.id]) )
+ else:
+ multimedia = get_object_or_404(Photo, pk=multimedia_id, story=story)
+ image_url = multimedia.image.image.name
+ multimedia.updated_by = request.user
+ multimedia.updated_at = datetime.now()
+ multimedia.authors = request.POST.getlist('authors')
+ form = PhotoForm(request.POST,instance=multimedia)
- if form.is_valid() and upload_valid:
- form.image = image
- form.save()
- request.user.message_set.create(message="1|Your photo asset was saved successfully.")
+ if form.is_valid():
+ form.save()
+ request.user.message_set.create(message="1|Your photo asset was saved successfully.")
- stags = ''
- for tag in Tag.objects.all():
- if request.POST.__contains__('tag_%d' % tag.id):
- stags += ' '+tag.name
- multimedia._set_tags(stags)
-
- return HttpResponseRedirect( reverse('photo_edit', args=[metastory_id,story_id,multimedia.id]) )
- else:
- if upload_valid:
+ stags = ''
+ for tag in Tag.objects.all():
+ if request.POST.__contains__('tag_%d' % tag.id):
+ stags += ' '+tag.name
+ multimedia._set_tags(stags)
+ else:
request.user.message_set.create(message="0|An error has occured.")
+
+ authors = multimedia.authors.all()
+ inherited_tags = []
+ inherited_tag_ids = []
+ for newsroom in metastory.newsrooms.all():
+ for tag in newsroom.get_tags():
+ inherited_tags.append(tag)
+ inherited_tag_ids.append(tag.id)
+ for mtag in metastory._get_tags():
+ inherited_tags.append(mtag)
+ inherited_tag_ids.append(mtag.id)
+ for stag in story._get_tags():
+ inherited_tags.append(stag)
+ inherited_tag_ids.append(stag.id)
+ tags = Tag.objects.exclude(id__in=inherited_tag_ids)
+ used_tags = multimedia._get_tags()
- tags = Tag.objects.all()
- return render_to_response( "multimedia/photo.html", {'form':form,'tags':tags}, context_instance=RequestContext(request))
+ members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
+ breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} , {'title':multimedia,'url':reverse('photo_edit', args=[metastory_id,story_id,multimedia.id])} ]
+ return render_to_response("multimedia/photo.html", {'breadcrumb':breadcrumb,'form':form,'image':multimedia,'upload_form':upload_form,'authors':authors,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'newsrooms_members':members,'form_url':reverse('photo_update', args=[metastory_id,story_id,multimedia.id]),'upload_form_url':''}, context_instance=RequestContext(request))
else:
return HttpResponseRedirect( settings.LOGIN_REDIRECT_URL )
\ No newline at end of file
limestone/photos/views.py
@@ -4,4 +4,4 @@ from limestone.plaintext.models import PlainText
class PlainTextForm(forms.ModelForm):
class Meta:
model = PlainText
- exclude = ('story','status','attribution','license','pub_date','authors','created_at','created_by','updated_at','updated_by')
\ No newline at end of file
+ exclude = ('story','status','attribution','license','pub_date','authors','created_at','created_by','updated_at','updated_by','tags')
\ No newline at end of file
limestone/plaintext/forms.py
@@ -48,6 +48,7 @@ def edit_plaintext(request,metastory_id,story_id,multimedia_id):
multimedia = get_object_or_404(PlainText, pk=multimedia_id, story=story)
form = PlainTextForm(instance=multimedia)
members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
+ authors = multimedia.authors.all()
inherited_tags = []
inherited_tag_ids = []
@@ -65,7 +66,7 @@ def edit_plaintext(request,metastory_id,story_id,multimedia_id):
used_tags = multimedia._get_tags()
breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} , {'title':multimedia,'url':reverse('plaintext_edit', args=[metastory_id,story_id,multimedia_id])} ]
- return render_to_response("multimedia/plaintext.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'status':multimedia.status,'form_url':reverse('plaintext_update', args=[metastory_id,story_id,multimedia_id])}, context_instance=RequestContext(request))
+ return render_to_response("multimedia/plaintext.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'status':multimedia.status,'form_url':reverse('plaintext_update', args=[metastory_id,story_id,multimedia_id])}, context_instance=RequestContext(request))
@login_required
@@ -78,6 +79,7 @@ def save_plaintext(request,metastory_id,story_id,multimedia_id=None):
else:
multimedia = PlainText(created_by = request.user, story=story, created_at = datetime.now())
+
multimedia.updated_by = request.user
multimedia.updated_at = datetime.now()
form = PlainTextForm(request.POST,instance=multimedia)
@@ -86,6 +88,8 @@ def save_plaintext(request,metastory_id,story_id,multimedia_id=None):
form.save()
request.user.message_set.create(message="1|Your plaintext asset was saved successfully.")
+ multimedia.authors = request.POST.getlist('authors')
+
stags = ''
for tag in Tag.objects.all():
if request.POST.__contains__('tag_%d' % tag.id):
@@ -95,8 +99,26 @@ def save_plaintext(request,metastory_id,story_id,multimedia_id=None):
return HttpResponseRedirect( reverse('plaintext_edit', args=[metastory_id,story_id,multimedia.id]) )
else:
request.user.message_set.create(message="0|An error has occured.")
+ members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
+ authors = multimedia.authors.all()
+
+ inherited_tags = []
+ inherited_tag_ids = []
+ for newsroom in metastory.newsrooms.all():
+ for tag in newsroom.get_tags():
+ inherited_tags.append(tag)
+ inherited_tag_ids.append(tag.id)
+ for mtag in metastory._get_tags():
+ inherited_tags.append(mtag)
+ inherited_tag_ids.append(mtag.id)
+ for stag in story._get_tags():
+ inherited_tags.append(stag)
+ inherited_tag_ids.append(stag.id)
+ tags = Tag.objects.exclude(id__in=inherited_tag_ids)
+ used_tags = multimedia._get_tags()
+
+ breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} , {'title':multimedia,'url':reverse('plaintext_edit', args=[metastory_id,story_id,multimedia_id])} ]
+ return render_to_response("multimedia/plaintext.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'status':multimedia.status,'form_url':reverse('plaintext_update', args=[metastory_id,story_id,multimedia_id])}, context_instance=RequestContext(request))
- tags = Tag.objects.all()
- return render_to_response( "multimedia/plaintext.html", {'form':form,'tags':tags}, context_instance=RequestContext(request))
else:
return HttpResponseRedirect( settings.LOGIN_REDIRECT_URL )
\ No newline at end of file
limestone/plaintext/views.py
@@ -62,6 +62,7 @@ INSTALLED_APPS = (
'django_authopenid',
'imagekit',
#
+ 'limestone.editorsdesk',
'limestone.main',
'limestone.newsroom',
'limestone.partner',
limestone/settings.py
@@ -70,7 +70,10 @@ class Story(models.Model):
def save(self):
if self.slug is None:
- self.slug = slugify(self.headline)
+ if len(slugify(self.headline)) < 50:
+ self.slug = slugify(self.headline)
+ else:
+ self.slug = slugify(self.headline)[:50]
if self.created_at == None:
self.created_at = datetime.now()
self.updated_at = datetime.now()
limestone/story/models.py
@@ -96,6 +96,8 @@ def edit_story(request,metastory_id,story_id):
form = StoryForm(instance=story)
assets = Media.children.filter(story=story)
members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
+ authors = story.authors.all()
+ photos = story.authors.all()
inherited_tags = []
inherited_tag_ids = []
@@ -110,7 +112,7 @@ def edit_story(request,metastory_id,story_id):
used_tags = story._get_tags()
breadcrumb = [ {'title':story.metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} ]
- return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'media_assets':assets,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id}, context_instance=RequestContext(request))
+ return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'media_assets':assets,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id}, context_instance=RequestContext(request))
@login_required
@@ -123,6 +125,7 @@ def save_story(request,metastory_id,story_id=None):
story = Story(created_by = request.user, metastory=metastory)
#story.metastory=metastory
+ story.authors = request.POST.getlist('authors')
story.updated_by = request.user
form = StoryForm(request.POST,instance=story)
@@ -142,6 +145,7 @@ def save_story(request,metastory_id,story_id=None):
assets = Media.children.filter(story=story)
members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct()
+ authors = story.authors.all()
inherited_tags = []
inherited_tag_ids = []
@@ -159,6 +163,6 @@ def save_story(request,metastory_id,story_id=None):
used_tags.append(tag)
breadcrumb = [ {'title':story.metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} ]
- return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'media_assets':assets,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id,'inherited_tags':inherited_tags}, context_instance=RequestContext(request))
+ return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'media_assets':assets,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id,'inherited_tags':inherited_tags}, context_instance=RequestContext(request))
else:
return HttpResponseRedirect( settings.LOGIN_REDIRECT_URL )
\ No newline at end of file
limestone/story/views.py
@@ -19,6 +19,10 @@
{% block extra_styles %}{% endblock %}
{% block head %}{% endblock %}
+
+ <style type="text/css" media="screen">
+ {% block inline_styles %}}{% endblock %}
+ </style>
{% block feeds %}{% endblock %}
</head>
limestone/templates/n21alpha/base.html
@@ -6,25 +6,35 @@
{% block content %}
+<div class="grid_16 genericForm">
<h3>Create Your Account Association</h3>
+</div>
+<div class="grid_16 genericForm">
<h4>Are you part of one of our newsrooms?</h4>
-<div>If so, click that newsroom's name to create your newsroom account.
+If so, click that newsroom's name to create your newsroom account.
<br/><br/>
{% for newsroom in newsrooms %}
<div>
<a href="/newsroom/{{newsroom.id}}/member/add/">{{ newsroom }}</a>
</div>
{% endfor %}
+<br/><br/>
</div>
-<br/>
+
+
+<div class="grid_16 genericForm">
<h4>Or ... Are you a partner who would like access to our content?</h4>
-<div>Fill out the following fields and we will create your partner account.
+Fill out the following fields and we will create your partner account.
<br/><br/>
<form action="/partner/member/add/" method="post">
-{{ form }}
-<input type="submit" value="Create" />
+{{ form.as_p }}
+
+<div class="clear"></div>
+<div class="inputSubmit">
+ <input type="submit" value="Create →">
+</div>
</form>
</div>
limestone/templates/n21alpha/main/association.html
@@ -1,7 +1,32 @@
{% extends "base.html" %}
+
+{% load smart_if %}
+
+
{% block extra_scripts %}
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/prototype/1.6.1.0/prototype.js"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/scriptaculous/1.8.2/scriptaculous.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}templates/n21alpha/js/lightbox.js"></script>
{% endblock %}
+
+
+{% block hightlight_error %}
+ {% if messages %}
+ <div class="grid_16">
+ {% for message in messages %}
+ <div class="ui-widget">
+ {% if message|slice:"0:1" == "1" %}
+ <div class="ui-state-highlight ui-corner-all" style="padding:2px 5px 2px 5px; margin:10px 0px 10px 0px;">
+ <span class="ui-icon ui-icon-info" style="float: left; margin-right:5px;"></span> <strong>Success</strong> : {{ message|slice:"2:" }}
+ </div>
+ {% else %}
+ <div class="ui-state-error ui-corner-all" style="padding:2px 5px 2px 5px; margin:10px 0px 10px 0px;">
+ <span class="ui-icon ui-icon-alert" style="float: left; margin-right:5px;"></span> <strong>Alert</strong> : {{ message|slice:"2:" }}
+ </div>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
+ {% endif %}
+{% endblock %}
\ No newline at end of file
limestone/templates/n21alpha/main/base_main.html
@@ -14,7 +14,7 @@
<h4>Recent Activity</h4>
{% for entry in entries %}
<div>
- <a href="#">{{ entry }}</a>
+ <span class="icon-{% if entry.status == "Approved" %}accept{% else %}exclamation{% endif %}"></span> {{ entry.status }} <a href="#">{{ entry }}</a> {{ entry.updated_at|date }} {{ entry.updated_by }}
</div>
{% endfor %}
limestone/templates/n21alpha/main/dashboard.html
@@ -7,8 +7,17 @@
{% block content %}
-<div class="grid_16 genericForm">
- <form action="{{ form_url }}" method="post" enctype="multipart/form-data">
+{% if not image %}
+<div id="upload_dialog" class="upload_dialog" title="Upload Photo">
+ <form action="{{ upload_form_url }}" name="upload_form" id="upload_form" method="post" enctype="multipart/form-data">
+ {{ upload_form.as_p }}
+ </form>
+</div>
+{% endif %}
+
+
+<div class="grid_10 genericForm">
+ <form action="{{ form_url }}" method="post">
<h4>Photo Info</h4>
{% if status.length %}
<p>
@@ -16,12 +25,11 @@
</p>
{% endif %}
{{ form.as_p }}
- {{ upload_form.as_p }}
<p>
<label for="id_authors">Authors:</label>
<select name="authors" id="id_authors" multiple size="8">
{% for member in newsrooms_members %}
- <option value="{{member}}">{{ member }} ( {%for newsroom in member.newsroom_members.all%} {{ newsroom }} {% endfor %} ) </option>
+ <option {% for author in authors %} {% if member == author %} selected {% endif %} {% endfor %} value="{{member.id}}">{{ member }} ( {%for newsroom in member.newsroom_members.all%} {{ newsroom }} {% endfor %} ) </option>
{% endfor %}
</select>
</p>
@@ -34,18 +42,57 @@
<label>Tags:</label>
<span class="inputDiv">
{% for tag in tags %}
- <input type="checkbox" name="tag_{{tag.id}}" value="{{tag}}" id="tag_{{tag.id}}"> {{tag}}
+ <input type="checkbox" name="tag_{{tag.id}}" value="{{tag}}" id="tag_{{tag.id}}" {% for used_tag in used_tags %} {% if tag.id == used_tag.id %} checked {% endif %} {% endfor %} > {{tag}}
{% if forloop.counter|divisibleby:4 %}<br/>{% endif %}
{% endfor %}
</span>
</p>
<div class="clear"></div>
<div class="inputSubmit">
+ {% if image %}
<input type="submit" value="Continue →">
+ {% endif %}
</div>
</form>
</div>
+<div class="grid_6">
+ {% if image %}
+ <h4>Metadata & URLs</h4>
+ <img src="{{ image.get_thumbnail_url }}" />
+ <div>Original Image:
+ <ul>
+ <li style="list-style-type:none;">Width : {{ image.get_width }}</li>
+ <li style="list-style-type:none;">Height : {{ image.get_height }}</li>
+ <li style="list-style-type:none;">URL : <a href="{{ image.get_original_url }}" target="_blank">{{ image.get_original_url }}</a></li>
+ <li style="list-style-type:none;">::METADATA::</li>
+ {% for key,value in image.get_info.items %}
+ <li style="list-style-type:none;">{{ key }} : {{ value }}</li>
+ {% endfor %}
+ </ul>
+ </div>
+ {% endif %}
+</div>
+
<div class="clear"></div>
+{% endblock %}
+
+{% block inline_styles %}
+ .ui-dialog-titlebar-close { display: none; }
+{% endblock %}
+
+{% block inline_scripts %}
+ {% if not image %}
+ $(function() {
+ $("#upload_dialog").dialog({
+ bgiframe: true,
+ modal: true,
+ closeOnEscape : false,
+ resizable : false,
+ buttons: { "Upload": function() { $("#upload_form").submit(); } }
+ });
+
+ });
+ {% endif %}
{% endblock %}
\ No newline at end of file
limestone/templates/n21alpha/multimedia/photo.html
@@ -18,9 +18,9 @@
{{ form.as_p }}
<p>
<label for="id_authors">Authors:</label>
- <select name="authors" id="id_authors" multiple size="8">
+ <select name="authors" id="id_authors" multiple="multiple" size="8">
{% for member in newsrooms_members %}
- <option value="{{member}}">{{ member }} ( {%for newsroom in member.newsroom_members.all%} {{ newsroom }} {% endfor %} ) </option>
+ <option {% for author in authors %} {% if member == author %} selected {% endif %} {% endfor %} value="{{member.id}}">{{ member }} ( {%for newsroom in member.newsroom_members.all%} {{ newsroom }} {% endfor %} ) </option>
{% endfor %}
</select>
</p>
@@ -33,7 +33,7 @@
<label>Tags:</label>
<span class="inputDiv">
{% for tag in tags %}
- <input type="checkbox" name="tag_{{tag.id}}" value="{{tag}}" id="tag_{{tag.id}}"> {{tag}}
+ <input type="checkbox" name="tag_{{tag.id}}" value="{{tag}}" id="tag_{{tag.id}}" {% for used_tag in used_tags %} {% if tag.id == used_tag.id %} checked {% endif %} {% endfor %} > {{tag}}
{% if forloop.counter|divisibleby:4 %}<br/>{% endif %}
{% endfor %}
</span>
limestone/templates/n21alpha/multimedia/plaintext.html
@@ -12,9 +12,9 @@
{{ form.as_p }}
<p>
<label for="id_authors">Authors:</label>
- <select name="authors" id="id_authors" multiple size="8">
+ <select name="authors" id="id_authors" multiple="true" size="8">
{% for member in newsrooms_members %}
- <option value="{{member}}">{{ member }} ( {%for newsroom in member.newsroom_members.all%} {{ newsroom }} {% endfor %} ) </option>
+ <option {% for author in authors %} {% if member == author %} selected {% endif %} {% endfor %} value="{{member.id}}">{{ member }} ( {%for newsroom in member.newsroom_members.all%} {{ newsroom }} {% endfor %} ) </option>
{% endfor %}
</select>
</p>
@@ -53,8 +53,13 @@
<div>You have not created any media assets yet.</div>
{% endif %}
{% for asset in media_assets %}
- <div>
- <a href="{% url plaintext_edit metastory_id story_id asset.id %}">{{ asset }}</a>
+ <div class="sidebar-right-listing alternating-row-{% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}">
+ {% if asset.get_child_name == "photo" %}
+ <span class="icon-photo"></span><a href="{% url photo_edit metastory_id story_id asset.id %}">{{ asset }}</a>
+ {% endif %}
+ {% if asset.get_child_name == "plaintext" %}
+ <span class="icon-plaintext"></span><a href="{% url plaintext_edit metastory_id story_id asset.id %}">{{ asset }}</a>
+ {% endif %}
<br/>
<span class="icon-{% if asset.status == "Approved" %}accept{% else %}exclamation{% endif %}"></span> {{ asset.status }}
</div>
limestone/templates/n21alpha/story/story.html
@@ -19,6 +19,7 @@ urlpatterns = patterns(
url(r'^privacy/', 'limestone.main.views.privacy', name='privacy'),
url(r'^terms/', 'limestone.main.views.terms', name='terms'),
+ (r'^editorsdesk/',include('limestone.editorsdesk.urls')),
(r'^newsroom/',include('limestone.newsroom.urls')),
(r'^partner/',include('limestone.partner.urls')),
(r'^builder/',include('limestone.story.urls')),
limestone/urls.py
limestone/photos/migrations/0002_removed_save_audit.py
limestone/photos/templatetags/.svn/all-wcprops
limestone/photos/templatetags/.svn/entries
limestone/photos/templatetags/.svn/format
limestone/photos/templatetags/.svn/text-base/__init__.py.svn-base
limestone/photos/templatetags/.svn/text-base/photos_tags.py.svn-base
limestone/photos/templatetags/__init__.py
limestone/photos/templatetags/photos_tags.py
a1667100822685cef362d0bb38ee177a68906fb9
bhalle
bhalle@jrn368.dhcp.asu.edu
http://github.com/bhalle/limestone/commit/d164980f5559fd34b7a514317cccc45e75efd45f
d164980f5559fd34b7a514317cccc45e75efd45f
2009-11-03T15:59:41-08:00
2009-11-03T15:59:41-08:00
finalized photo asset, created editors desk, partner association
bd4cabc213b5e4f8d66f458834c9bf810bb59495
bhalle
bhalle@jrn368.dhcp.asu.edu