Browse files

Revert "separating plenum meeting protocols into sections"

This reverts commit f6396ae.
  • Loading branch information...
1 parent 96f50a6 commit 4af336fc2d6a4c907bbf0b5e92d08111835b6cf2 @OriHoch OriHoch committed Mar 17, 2013
Showing with 3 additions and 18 deletions.
  1. +0 −1 committees/views.py
  2. +1 −1 plenum/urls.py
  3. +0 −8 plenum/views.py
  4. +2 −8 templates/committees/committeemeeting_detail.html
View
1 committees/views.py
@@ -120,7 +120,6 @@ def get_context_data(self, *args, **kwargs):
for part in cm.parts.all():
parts_lengths[part.id] = len(part.body)
context['parts_lengths'] = json.dumps(parts_lengths)
- context['parts']=cm.parts.all()
context['paginate_by'] = COMMITTEE_PROTOCOL_PAGINATE_BY
if cm.committee.type=='plenum':
View
2 plenum/urls.py
@@ -7,6 +7,6 @@
plenumurlpatterns = patterns ('',
url(r'^plenum/$', PlenumView.as_view(), name='plenum'),
- url(r'^plenum/(?P<pk>\d+)/$', PlenumMeetingDetailView.as_view(), name='plenum-meeting'),
+ url(r'^plenum/(?P<pk>\d+)/$', MeetingDetailView.as_view(), name='plenum-meeting'),
url(r'^plenum/all_meetings/$', meetings_list , {'committee_id':0}, name='plenum-all-meetings'),
)
View
8 plenum/views.py
@@ -18,12 +18,4 @@ def get_queryset (self):
def get_context(self):
context = super(PlenumMeetingsListView, self).get_context()
context['committee_type'] = 'plenum'
- return context
-
-class PlenumMeetingDetailView(MeetingDetailView):
-
- def get_context_data(self, *args, **kwargs):
- context=super(PlenumMeetingDetailView, self).get_context_data(*args, **kwargs)
- context['parts']=context['object'].parts.filter(type='title')
- context['is_titles_only']=True
return context
View
10 templates/committees/committeemeeting_detail.html
@@ -107,6 +107,7 @@
</section>
{% endifnotequal %}
+ {% with object.parts.list as parts %}
{% autopaginate parts paginate_by %}
<div class="text-center">{% paginate %}</div>
<section class="card card-list">
@@ -163,31 +164,23 @@
{% endifnotequal %}
</div>
- {% if not is_titles_only %}
<div class="text-content span6" id="annotations-{{ speech_part.id }}_content">
<blockquote cite="{{ session.document_url }}" id="annotationtext_{{ speech_part.id }}" class="entry-content" style="background-color:{{colors|hash:speech_part.header}}">{{ speech_part.body|simple_formatting }}</blockquote>
</div>
- {% endif %}
<div class="span3">
<div style="display:none" class="annotationtoolbox annotating form-inline" id="annotationtoolbox-{{ speech_part.id }}">
- {% if not is_titles_only %}
<label for="markall-{{ speech_part.id }}">{% trans "View all" %}</label>
<input type="checkbox" class="markall" name="markall-{{ speech_part.id }}" id="markall-{{ speech_part.id }}"/>
- {% endif %}
</div>
<p class="tool-links">
- {% if not is_titles_only %}
<a href="#annotationform-{{ speech_part.id }}" class="annotationform-link annotating" id="selectable-{{ speech_part.id }}">{% trans "Annotate"%}</a>
- {% endif %}
</p>
<div class="annotating annotation-content" id="annotations-{{ speech_part.id }}">
- {% if not is_titles_only %}
{% with annotation_obj.annotations as annotations %}
{% for annotation in annotations %}
{% include "annotatetext/_annotation.html" %}
{% endfor %}
{% endwith %}
- {% endif %}
</div>
</div>
{% endwith %}
@@ -197,6 +190,7 @@
</div>
</section> <!-- protocol -->
<div class="text-center">{% paginate %}</div>
+ {% endwith %}
</div>
<div class="span3">

0 comments on commit 4af336f

Please sign in to comment.