fnp
/
wolnelektury.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0528c9e
)
remove gazeta links - lektury.gazeta.pl is dead
author
Jan Szejko
<janek37@gmail.com>
Thu, 22 Feb 2018 10:12:24 +0000
(11:12 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Thu, 22 Feb 2018 10:12:24 +0000
(11:12 +0100)
src/catalogue/admin.py
patch
|
blob
|
history
src/catalogue/management/commands/report_dead_links.py
patch
|
blob
|
history
src/catalogue/templates/catalogue/book_detail.html
patch
|
blob
|
history
src/catalogue/templates/catalogue/picture_detail.html
patch
|
blob
|
history
src/catalogue/templates/catalogue/tagged_object_list.html
patch
|
blob
|
history
src/pdcounter/templates/pdcounter/author_detail.html
patch
|
blob
|
history
diff --git
a/src/catalogue/admin.py
b/src/catalogue/admin.py
index
51305e2
..
76d32dc
100644
(file)
--- a/
src/catalogue/admin.py
+++ b/
src/catalogue/admin.py
@@
-37,7
+37,7
@@
class BookAdmin(TaggableModelAdmin):
def change_view(self, request, object_id, extra_context=None):
if 'advanced' not in request.GET:
self.form = forms.ModelForm
def change_view(self, request, object_id, extra_context=None):
if 'advanced' not in request.GET:
self.form = forms.ModelForm
- self.fields = ('title', 'description', '
gazeta_link', '
wiki_link', 'recommended')
+ self.fields = ('title', 'description', 'wiki_link', 'recommended')
self.readonly_fields = ('title',)
else:
self.form = TaggableModelForm
self.readonly_fields = ('title',)
else:
self.form = TaggableModelForm
diff --git
a/src/catalogue/management/commands/report_dead_links.py
b/src/catalogue/management/commands/report_dead_links.py
index
508880e
..
1eb7312
100644
(file)
--- a/
src/catalogue/management/commands/report_dead_links.py
+++ b/
src/catalogue/management/commands/report_dead_links.py
@@
-23,7
+23,6
@@
class Command(BaseCommand):
(
Book,
[
(
Book,
[
- ('gazeta_link', lambda b: b.gazeta_link),
('wiki_link', lambda b: b.wiki_link),
('źródło', lambda b: b.extra_info.get('source_url')),
],
('wiki_link', lambda b: b.wiki_link),
('źródło', lambda b: b.extra_info.get('source_url')),
],
@@
-32,7
+31,6
@@
class Command(BaseCommand):
(
Picture,
[
(
Picture,
[
- ('gazeta_link', lambda p: p.culturepl_link),
('wiki_link', lambda p: p.wiki_link),
('źródło', lambda p: p.extra_info.get('source_url')),
],
('wiki_link', lambda p: p.wiki_link),
('źródło', lambda p: p.extra_info.get('source_url')),
],
diff --git
a/src/catalogue/templates/catalogue/book_detail.html
b/src/catalogue/templates/catalogue/book_detail.html
index
4f590ce
..
e3f4d73
100644
(file)
--- a/
src/catalogue/templates/catalogue/book_detail.html
+++ b/
src/catalogue/templates/catalogue/book_detail.html
@@
-66,11
+66,6
@@
{% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a>
</div>
{% endif %}
{% trans "Book on" %} <a href="{{ extra_info.about }}">{% trans "Editor's Platform" %}</a>
</div>
{% endif %}
- {% if book.gazeta_link %}
- <div class="white-box">
- <a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a>
- </div>
- {% endif %}
{% if book.wiki_link %}
<div class="white-box">
<a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a>
{% if book.wiki_link %}
<div class="white-box">
<a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a>
diff --git
a/src/catalogue/templates/catalogue/picture_detail.html
b/src/catalogue/templates/catalogue/picture_detail.html
index
5eeea7f
..
fb864f6
100644
(file)
--- a/
src/catalogue/templates/catalogue/picture_detail.html
+++ b/
src/catalogue/templates/catalogue/picture_detail.html
@@
-69,14
+69,6
@@
{% if picture.info.about and not hide_about %}
<li><a href="{{ picture.info.about }}">{% trans "Image on the Editor's Platform" %}</a></li>
{% endif %}
{% if picture.info.about and not hide_about %}
<li><a href="{{ picture.info.about }}">{% trans "Image on the Editor's Platform" %}</a></li>
{% endif %}
- {% comment %}
- {% if book.gazeta_link %}
- <li><a href="{{ book.gazeta_link }}">{% trans "Picture description on Lektury.Gazeta.pl" %}</a></li>
- {% endif %}
- {% if book.wiki_link %}
- <li><a href="{{ book.wiki_link }}">{% trans "Book description on Wikipedia" %}</a></li>
- {% endif %}
- {% endcomment %}
</ul>
<p><a href="{{ picture.xml_file.url }}">{% trans "View XML source" %}</a></p>
</div>
</ul>
<p><a href="{{ picture.xml_file.url }}">{% trans "View XML source" %}</a></p>
</div>
diff --git
a/src/catalogue/templates/catalogue/tagged_object_list.html
b/src/catalogue/templates/catalogue/tagged_object_list.html
index
f83c7d5
..
f4ba699
100644
(file)
--- a/
src/catalogue/templates/catalogue/tagged_object_list.html
+++ b/
src/catalogue/templates/catalogue/tagged_object_list.html
@@
-103,11
+103,6
@@
{% endif %}
</div>
{% endif %}
</div>
- {% if tag.gazeta_link %}
- <div class="white-box"><a href="{{ tag.gazeta_link }}">
- {{ tag }} {% trans "in Lektury.Gazeta.pl" %}
- </a></div>
- {% endif %}
{% if tag.wiki_link %}
<div class="white-box">
<a href="{{ tag.wiki_link }}">
{% if tag.wiki_link %}
<div class="white-box">
<a href="{{ tag.wiki_link }}">
diff --git
a/src/pdcounter/templates/pdcounter/author_detail.html
b/src/pdcounter/templates/pdcounter/author_detail.html
index
35d27e7
..
2c346ba
100644
(file)
--- a/
src/pdcounter/templates/pdcounter/author_detail.html
+++ b/
src/pdcounter/templates/pdcounter/author_detail.html
@@
-20,13
+20,6
@@
<div class="clearboth"></div>
<div id="toggle-description"><p></p></div>
{% endif %}
<div class="clearboth"></div>
<div id="toggle-description"><p></p></div>
{% endif %}
- {% if author.gazeta_link %}
- <p>
- <a href="{{ author.gazeta_link }}">
- {% trans "Read work's study of this author on Lektury.Gazeta.pl" %}
- </a>
- </p>
- {% endif %}
{% if author.wiki_link %}
<p>
<a href="{{ author.wiki_link }}">
{% if author.wiki_link %}
<p>
<a href="{{ author.wiki_link }}">