limestone/multimedia/migrations/0002_remove_slug_from_multimedia.py limestone/multimedia/migrations/0003_adjusted_pubdate_default.py limestone/multimedia/templatetags/__init__.py limestone/multimedia/templatetags/smart_if.py limestone/multimedia/urls.py limestone/plaintext/forms.py limestone/plaintext/urls.py limestone/templates/n21alpha/multimedia/base.html limestone/templates/n21alpha/multimedia/plaintext.html limestone/templates/n21alpha/story/base.html @@ -1,5 +1,4 @@ from django.db import models -import datetime import django.contrib.auth.models as auth from limestone.utils.model_inheritance import ParentModel,ChildManager from limestone.multimedia.constants import LICENSE_CHOICES, LICENSE_DEFAULT @@ -16,18 +15,29 @@ class Media(ParentModel): authors = models.ManyToManyField(auth.User, related_name="media_authors") attribution = models.TextField(blank=True) license = models.CharField(max_length=100, choices = LICENSE_CHOICES, default=LICENSE_DEFAULT,) - slug = models.SlugField() - pub_date = models.DateTimeField(default=datetime.datetime.now) + pub_date = models.DateTimeField(editable=False,null=True) created_by = models.ForeignKey(auth.User, related_name="media_created_by") - created_at = models.DateTimeField(editable=False, default=datetime.datetime.now) + created_at = models.DateTimeField(editable=False) updated_by = models.ForeignKey(auth.User, related_name="media_updated_by") - updated_at = models.DateTimeField(editable=False, default=datetime.datetime.now) + updated_at = models.DateTimeField(editable=False) objects = MediaManager() children = ChildManager() + def __unicode__(self): + return unicode(self.title) + + def __str__(self): + return self.title + def _set_tags(self, tags): Tag.objects.update_tags(self, tags) def _get_tags(self): - return Tag.objects.get_for_object(self) \ No newline at end of file + return Tag.objects.get_for_object(self) + + def get_parent_model(self): + """ + Helper method for inheritance + """ + return Media \ No newline at end of file limestone/multimedia/models.py @@ -1 +1,65 @@ -# Create your views here. +# -*- coding: utf-8 -*- +from django.shortcuts import render_to_response +from django.template import RequestContext +from django.http import HttpResponseRedirect, HttpResponse +from django.core.urlresolvers import reverse +from django.conf import settings +from django.contrib.auth.decorators import login_required +from django.shortcuts import get_object_or_404 +import django.contrib.auth.models as auth +from datetime import datetime + +from limestone.plaintext.forms import PlainTextForm +from limestone.plaintext.models import PlainText +from limestone.multimedia.models import Media +from limestone.story.models import MetaStory, Story +from tagging.models import Tag + + +@login_required +def new_plaintext(request,metastory_id,story_id): + tags = Tag.objects.all() + metastory = get_object_or_404(MetaStory, pk=metastory_id) + story = get_object_or_404(Story, pk=story_id, metastory=metastory) + form = PlainTextForm() + breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} , {'title':'New PlainText','url':reverse('plaintext_new', args=[metastory_id,story_id])} ] + return render_to_response("multimedia/plaintext.html", {'breadcrumb':breadcrumb,'form':form,'tags':tags,'form_url':reverse('plaintext_create', args=[metastory_id,story_id])}, context_instance=RequestContext(request)) + + +@login_required +def edit_plaintext(request,metastory_id,story_id,multimedia_id): + tags = Tag.objects.all() + 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(PlainText, pk=multimedia_id, story=story) + form = PlainTextForm(instance=multimedia) + 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,'tags':tags,'form_url':reverse('plaintext_update', args=[metastory_id,story_id,multimedia_id])}, context_instance=RequestContext(request)) + + +@login_required +def save_plaintext(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 = 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) + + if form.is_valid(): + form.save() + request.user.message_set.create(message="1|Your plaintext asset was saved successfully.") + + return HttpResponseRedirect( reverse('plaintext_edit', args=[metastory_id,story_id,multimedia.id]) ) + else: + request.user.message_set.create(message="0|An error has occured.") + + 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 @@ -3,14 +3,15 @@ from django.conf.urls.defaults import * urlpatterns = patterns ('limestone.story.views', - url(r'^meta/$','new_metastory',name='metastory_new'), - url(r'^meta/create/$','save_metastory',name='metastory_create'), - url(r'^meta/(?P<metastory_id>\d+)/$','edit_metastory',name='metastory_edit'), - url(r'^meta/(?P<metastory_id>\d+)/update/$','save_metastory',name='metastory_update'), + url(r'^package/$','new_metastory',name='metastory_new'), + url(r'^package/create/$','save_metastory',name='metastory_create'), + url(r'^package/(?P<metastory_id>\d+)/$','edit_metastory',name='metastory_edit'), + url(r'^package/(?P<metastory_id>\d+)/update/$','save_metastory',name='metastory_update'), - url(r'^meta/(?P<metastory_id>\d+)/story/$','new_story',name='story_new'), - url(r'^meta/(?P<metastory_id>\d+)/story/create/$','save_story',name='story_create'), - url(r'^meta/(?P<metastory_id>\d+)/story/(?P<story_id>\d+)/$','edit_story',name='story_edit'), - url(r'^meta/(?P<metastory_id>\d+)/story/(?P<story_id>\d+)/update/$','save_story',name='story_update'), + url(r'^package/(?P<metastory_id>\d+)/story/$','new_story',name='story_new'), + url(r'^package/(?P<metastory_id>\d+)/story/create/$','save_story',name='story_create'), + url(r'^package/(?P<metastory_id>\d+)/story/(?P<story_id>\d+)/$','edit_story',name='story_edit'), + url(r'^package/(?P<metastory_id>\d+)/story/(?P<story_id>\d+)/update/$','save_story',name='story_update'), + (r'^package/(?P<metastory_id>\d+)/story/(?P<story_id>\d+)/assets/',include('limestone.multimedia.urls')), ) limestone/story/urls.py @@ -11,6 +11,7 @@ import django.contrib.auth.models as auth from limestone.newsroom.models import Newsroom from limestone.story.models import MetaStory, Story from limestone.story.forms import MetaStoryForm, StoryForm +from limestone.multimedia.models import Media from tagging.models import Tag @@ -74,9 +75,10 @@ def edit_story(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 = StoryForm(instance=story) + assets = Media.children.filter(story=story) members = Newsroom.objects.filter(members__in=metastory.newsrooms.values_list('id',flat=True)) 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,'tags':tags,'form_url':reverse('story_update', args=[metastory_id,story_id])}, context_instance=RequestContext(request)) + return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'media_assets':assets,'tags':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 @@ -86,9 +88,9 @@ def save_story(request,metastory_id,story_id=None): if story_id: story = get_object_or_404(Story, pk=story_id, metastory=metastory) else: - story = Story(created_by = request.user) + story = Story(created_by = request.user, metastory=metastory) - story.metastory=metastory + #story.metastory=metastory story.updated_by = request.user form = StoryForm(request.POST,instance=story) limestone/story/views.py @@ -1,4 +1,4 @@ -{% extends "story/base_story.html" %} +{% extends "story/base.html" %} {% load i18n %} limestone/templates/n21alpha/story/metastory.html @@ -1,7 +1,8 @@ -{% extends "story/base_story.html" %} +{% extends "story/base.html" %} {% load i18n %} +{% load smart_if %} {% block content %} @@ -30,7 +31,20 @@ </div> <div class="grid_6"> - <h4>Story Media</h4> + <h4>Story Assets</h4> + {% if story_id %} + <div>Add: <a href="{% url plaintext_new metastory_id story_id %}">Plain Text</a> | <a href="">Video</a> | <a href="">Image</a> | <a href="">Audio</a></div> + {% else %} + <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> + {% endfor %} + {% if media_assets.count == 0 %} + <div>You have not created any media assets yet.</div> + {% endif %} </div> <div class="clear"></div> limestone/templates/n21alpha/story/story.html @@ -20,7 +20,7 @@ urlpatterns = patterns( (r'^newsroom/',include('limestone.newsroom.urls')), (r'^partner/',include('limestone.partner.urls')), - (r'^story/',include('limestone.story.urls')), + (r'^builder/',include('limestone.story.urls')), ) if settings.DEBUG: limestone/urls.py limestone/templates/n21alpha/story/base_story.html 0e723373f40126ae6ffefcbbfa29c2506d58f8d6 bhalle bhalle@jrn368.dhcp.asu.edu http://github.com/bhalle/limestone/commit/8ca2d879d21aea06d04a114233fa22a5a271dcf8 8ca2d879d21aea06d04a114233fa22a5a271dcf8 2009-10-27T15:56:19-07:00 2009-10-27T15:56:19-07:00 added plaintext multimedia type 7917478e277efacf304ee0e0f5e4168a7e74c6bc bhalle bhalle@jrn368.dhcp.asu.edu