fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Librarian in regular requirements.
[redakcja.git]
/
apps
/
catalogue
/
templates
/
catalogue
/
book_list
/
book.html
diff --git
a/apps/catalogue/templates/catalogue/book_list/book.html
b/apps/catalogue/templates/catalogue/book_list/book.html
index
1e025e3
..
f6a0fcd
100755
(executable)
--- a/
apps/catalogue/templates/catalogue/book_list/book.html
+++ b/
apps/catalogue/templates/catalogue/book_list/book.html
@@
-1,30
+1,32
@@
{% load i18n %}
{% load i18n %}
+{% load username from common_tags %}
{% if book.single %}
{% with book.0 as chunk %}
<tr>
<td><input type="checkbox" name="select_book" value="{{book.id}}" data-chunk-id="{{chunk.id}}"/></td>
{% if book.single %}
{% with book.0 as chunk %}
<tr>
<td><input type="checkbox" name="select_book" value="{{book.id}}" data-chunk-id="{{chunk.id}}"/></td>
- <td><a href="{% url
catalogue_book
book.slug %}" title='{% trans "Book settings" %}'>[B]</a></td>
- <td><a href="{% url
catalogue_chunk_edit
book.slug chunk.slug %}" title='{% trans "Chunk settings" %}'>[c]</a></td>
+ <td><a href="{% url
'catalogue_book'
book.slug %}" title='{% trans "Book settings" %}'>[B]</a></td>
+ <td><a href="{% url
'catalogue_chunk_edit'
book.slug chunk.slug %}" title='{% trans "Chunk settings" %}'>[c]</a></td>
<td><a target="_blank"
<td><a target="_blank"
- href="{% url
wiki_editor
book.slug %}">
+ href="{% url
'wiki_editor'
book.slug %}">
{{ book.title }}</a></td>
<td>{% if chunk.stage %}
{{ chunk.stage }}
{% else %}–
{% endif %}</td>
{{ book.title }}</a></td>
<td>{% if chunk.stage %}
{{ chunk.stage }}
{% else %}–
{% endif %}</td>
- <td class='user-column'>{% if chunk.user %}<a href="{% url
catalogue_user chunk.user.username %}">{{ chunk.user.first_name }} {{ chunk.user.last_
name }}</a>{% endif %}</td>
+ <td class='user-column'>{% if chunk.user %}<a href="{% url
'catalogue_user' chunk.user.username %}">{{ chunk.user|user
name }}</a>{% endif %}</td>
<td>
{% if chunk.published %}P{% endif %}
{% if book.new_publishable %}p{% endif %}
{% if chunk.changed %}+{% endif %}
</td>
<td>
{% if chunk.published %}P{% endif %}
{% if book.new_publishable %}p{% endif %}
{% if chunk.changed %}+{% endif %}
</td>
+ <td>{{ book.project.name }}</td>
</tr>
{% endwith %}
{% else %}
<tr>
<td><input type="checkbox" name="select_book" value="{{book.id}}"/></td>
</tr>
{% endwith %}
{% else %}
<tr>
<td><input type="checkbox" name="select_book" value="{{book.id}}"/></td>
- <td class='book-settings-link'><a href="{% url
catalogue_book
book.slug %}" title='{% trans "Book settings" %}'>[B]</a></td>
+ <td class='book-settings-link'><a href="{% url
'catalogue_book'
book.slug %}" title='{% trans "Book settings" %}'>[B]</a></td>
<td></td>
<td>{{ book.title }}</td>
<td></td>
<td></td>
<td>{{ book.title }}</td>
<td></td>
@@
-33,5
+35,6
@@
{% if book.published %}P{% endif %}
{% if book.new_publishable %}p{% endif %}
</td>
{% if book.published %}P{% endif %}
{% if book.new_publishable %}p{% endif %}
</td>
+ <td>{{ book.project.name }}</td>
</tr>
{% endif %}
</tr>
{% endif %}