Skip to content

Commit

Permalink
update diag, fix media title
Browse files Browse the repository at this point in the history
  • Loading branch information
yomguy committed Jun 12, 2012
1 parent 48fcff1 commit 8f6d45e
Show file tree
Hide file tree
Showing 6 changed files with 433 additions and 459 deletions.
684 changes: 335 additions & 349 deletions doc/teleforma-all.dot

Large diffs are not rendered by default.

Binary file modified doc/teleforma-all.pdf
Binary file not shown.
201 changes: 95 additions & 106 deletions doc/teleforma.dot

Large diffs are not rendered by default.

Binary file modified doc/teleforma.pdf
Binary file not shown.
3 changes: 0 additions & 3 deletions teleforma/management/commands/teleforma-import-users-pb.py
Expand Up @@ -96,6 +96,3 @@ def handle(self, *args, **options):
for i in range(self.first_row, len(col)):
self.import_user(sheet.row(i))




4 changes: 3 additions & 1 deletion teleforma/templates/teleforma/inc/media_list.html
Expand Up @@ -9,7 +9,8 @@ <h3><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:
<table class="listing" width="100%">
<thead>
<tr>
<th class="highlight">{% trans "Session" %}</th>
<th class="highlight">{% trans "Title" %}</th>
<th>{% trans "Session" %}</th>
<th>{% trans "Professor" %}</th>
<th>{% trans "Begin date" %}</th>
<th>{% trans "Duration" %}</th>
Expand All @@ -19,6 +20,7 @@ <h3><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:
{% for media in course.media.all|from_course_type:type %}
{% if media.published or user.is_staff %}
<tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
<td><a href="{% url teleforma-media-detail media.id %}">{{ media.title }}</a></td>
<td><a href="{% url teleforma-media-detail media.id %}">{{ media.conference.session }}</a></td>
<td>{% if media.conference.professor.user %}<a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a>{% endif %}</td>
<td>{% if media.conference.date_begin %}<a href="{% url teleforma-media-detail media.id %}">{{ media.conference.date_begin }}</a>{% endif %}</td>
Expand Down

0 comments on commit 8f6d45e

Please sign in to comment.