limestone/templates/n21alpha/partner/stories.html limestone/templates/n21alpha/story/budget.html @@ -83,4 +83,6 @@ a:hover{color:#6F6F6F;text-decoration:underline} .alternating-row-event { } .alternating-row-odd { background-color:#F5F5F5; } -.tag {-moz-border-radius-bottomleft:5px; -moz-border-radius-bottomright:5px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px; background-color:#EFF2F7; border:1px solid #CCD5E4; color:#000000; cursor:default; float:left; font-size:11px; height:auto !important; margin:3px; overflow:hidden; padding:1px 3px;} \ No newline at end of file +.tag {-moz-border-radius-bottomleft:5px; -moz-border-radius-bottomright:5px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px; background-color:#EFF2F7; border:1px solid #CCD5E4; color:#000000; cursor:default; float:left; font-size:11px; height:auto !important; margin:3px; overflow:hidden; padding:1px 3px;} +.tag a, a:link{color:#6F6F6F;text-decoration:none} +.tag a:hover{color:#6F6F6F;text-decoration:underline} \ No newline at end of file limestone/media/templates/n21alpha/css/layout.css @@ -5,6 +5,10 @@ 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',), - url(r'stories/(?P<tag_name>\s+)/$','limestone.partner.views.stories_by_tag',name='partner_stories_by_tag',), - + url(r'stories/newsroom/(?P<newsroom_id>\d+)/$','limestone.partner.views.filter_stories_by_newsroom',name='partner_filter_stories_by_newsroom',), + url(r'stories/reporter/(?P<reporter_id>\d+)/$','limestone.partner.views.filter_stories_by_reporter',name='partner_filter_stories_by_reporter',), + url(r'stories/tag/(?P<tag_name>.+)/$','limestone.partner.views.filter_stories_by_tag',name='partner_filter_stories_by_tag',), + url(r'stories/year/(?P<year>\d+)/$','limestone.partner.views.filter_stories_by_year',name='partner_filter_stories_by_year',), + url(r'stories/budget/(?P<story_id>\d+)/$','limestone.partner.views.story_budget',name='partner_story_budget',), + ) limestone/partner/urls.py @@ -15,7 +15,8 @@ import django.contrib.auth.models as auth from limestone.main.models import Profile, ProfileForm from limestone.newsroom.models import Newsroom from limestone.partner.models import Partner, PartnerForm -from tagging.models import Tag +from limestone.story.models import Story +from tagging.models import Tag, TaggedItem @login_required def create_partner_member(request): @@ -42,11 +43,39 @@ def create_partner_member(request): @login_required def dashboard(request): - n = Tag.objects.usage_for_model(Newsroom) - t = Tag.objects.exclude(name__in=n) + n = Newsroom.objects.all() + t = Tag.objects.exclude(name__in=Tag.objects.usage_for_model(Newsroom)) u = auth.User.objects.filter(newsroom_members__in=Newsroom.objects.values_list('id',flat=True)).distinct() return render_to_response( "partner/dashboard.html", {'newsrooms':n,'reporters':u,'categories':t}, context_instance=RequestContext(request)) @login_required -def stories_by_tag(request): - \ No newline at end of file +def filter_stories_by_newsroom(request,newsroom_id): + flabel = Newsroom.objects.get(pk=newsroom_id) + stories = Story.objects.filter(metastory__newsrooms=newsroom_id) + breadcrumb = [ {'title':'Filter by Year','url':''} ] + return render_to_response( "partner/stories.html", {'breadcrumb':breadcrumb,'filter':flabel,'stories':stories}, context_instance=RequestContext(request)) + +@login_required +def filter_stories_by_reporter(request,reporter_id): + flabel = auth.User.objects.get(pk=reporter_id) + stories = Story.objects.filter(authors=reporter_id) + breadcrumb = [ {'title':'Filter by Reporter','url':''} ] + return render_to_response( "partner/stories.html", {'breadcrumb':breadcrumb,'filter':flabel,'stories':stories}, context_instance=RequestContext(request)) + +@login_required +def filter_stories_by_tag(request,tag_name): + flabel = tag_name + stories = TaggedItem.objects.get_by_model(Story,tag_name) + breadcrumb = [ {'title':'Filter by Category','url':''} ] + return render_to_response( "partner/stories.html", {'breadcrumb':breadcrumb,'filter':flabel,'stories':stories}, context_instance=RequestContext(request)) + +@login_required +def filter_stories_by_year(request,year): + flabel = str(year) + stories = Story.objects.filter(created_at__year=year) + return render_to_response( "partner/stories.html", {'filter':flabel,'stories':stories}, context_instance=RequestContext(request)) + +@login_required +def story_budget(request,story_id): + story = Story.objects.get(pk=story_id) + return render_to_response( "story/budget.html", {'story':story}, context_instance=RequestContext(request)) \ No newline at end of file limestone/partner/views.py @@ -12,30 +12,30 @@ <div class="grid_16"> <h4>Newsrooms</h4> {% for ntags in newsrooms %} - <span class="tag">{{ ntags }}</span> + <span class="tag"><a href="{% url partner_filter_stories_by_newsroom ntags.id %}">{{ ntags }}</a></span> {% endfor %} </div> <div class="grid_16"> <h4>Reporters</h4> {% for reporter in reporters %} - <span class="tag">{{ reporter }}</span> + <span class="tag"><a href="{% url partner_filter_stories_by_reporter reporter.id %}">{{ reporter }}</a></span> {% endfor %} </div> <div class="grid_16"> <h4>Categories</h4> {% for category in categories %} - <span class="tag">{{ category }}</span> + <span class="tag"><a href="{% url partner_filter_stories_by_tag category %}">{{ category.name }}</a></span> {% endfor %} </div> <div class="grid_16"> <h4>Year Published</h4> - <span class="tag">2006</span> - <span class="tag">2007</span> - <span class="tag">2008</span> - <span class="tag">2009</span> + <span class="tag"><a href="{% url partner_filter_stories_by_year 2006 %}">2006</a></span> + <span class="tag"><a href="{% url partner_filter_stories_by_year 2007 %}">2007</a></span> + <span class="tag"><a href="{% url partner_filter_stories_by_year 2008 %}">2008</a></span> + <span class="tag"><a href="{% url partner_filter_stories_by_year 2009 %}">2009</a></span> </div> {% endblock %} \ No newline at end of file limestone/templates/n21alpha/partner/dashboard.html 475cae12989f76ba90cab9e59341803bdbf0b04a bhalle bhalle@jrn368.dhcp.asu.edu http://github.com/bhalle/limestone/commit/879b45149cd3b18d581946b06909e3110337da5b 879b45149cd3b18d581946b06909e3110337da5b 2009-11-05T12:50:07-08:00 2009-11-05T12:50:07-08:00 added partner story filters and initial budget page b5d03413b998c1804d6e1639ee6522bacd18aa96 bhalle bhalle@jrn368.dhcp.asu.edu