diff --git a/infoscience_exports/exports/migrations/0010_remove_export_show_linkable_titles.py b/infoscience_exports/exports/migrations/0010_remove_export_show_linkable_titles.py new file mode 100644 index 00000000..e21c819d --- /dev/null +++ b/infoscience_exports/exports/migrations/0010_remove_export_show_linkable_titles.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.3 on 2018-03-21 07:50 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('exports', '0009_auto_20180315_0720'), + ] + + operations = [ + migrations.RemoveField( + model_name='export', + name='show_linkable_titles', + ), + ] diff --git a/infoscience_exports/exports/models/settings.py b/infoscience_exports/exports/models/settings.py index 230ebae9..5f5923f5 100644 --- a/infoscience_exports/exports/models/settings.py +++ b/infoscience_exports/exports/models/settings.py @@ -39,7 +39,6 @@ class Meta: class LinksSettings(BaseSettings): - show_linkable_titles = models.BooleanField(default=False) show_linkable_authors = models.BooleanField(default=False) show_links_for_printing = models.BooleanField(default=False) show_detailed = models.BooleanField(default=True) diff --git a/infoscience_exports/exports/static/js/export.js b/infoscience_exports/exports/static/js/export.js index 92a72cc2..d9eab27c 100644 --- a/infoscience_exports/exports/static/js/export.js +++ b/infoscience_exports/exports/static/js/export.js @@ -31,7 +31,6 @@ jQuery(function($) { params['groupsby_year'] = $("#id_groupsby_year").find(":selected").val(); params['groupsby_doc'] = $("#id_groupsby_doc").find(":selected").val(); params['pending_publications'] = $("#id_show_pending_publications").is(':checked'); - params['link_title'] = $("#id_show_linkable_titles").is(':checked'); params['link_authors'] = $("#id_show_linkable_authors").is(':checked'); params['link_print'] = $("#id_show_links_for_printing").is(':checked'); params['link_detailed'] = $("#id_show_detailed").is(':checked'); diff --git a/infoscience_exports/exports/templates/exports/export_form.html b/infoscience_exports/exports/templates/exports/export_form.html index aeba66ed..b25a112d 100644 --- a/infoscience_exports/exports/templates/exports/export_form.html +++ b/infoscience_exports/exports/templates/exports/export_form.html @@ -85,7 +85,6 @@

{% trans "Thumbnail" %}

{% trans "Links" %}

-
{{ form.show_linkable_titles }} {% trans "Clickable titles" %}
{{ form.show_linkable_authors }} {% trans "Clickable authors" %}
{{ form.show_links_for_printing }} {% trans "Format links for printing" %}
diff --git a/infoscience_exports/exports/templates/exports/export_short.html b/infoscience_exports/exports/templates/exports/export_short.html index ac269ac9..f981476f 100644 --- a/infoscience_exports/exports/templates/exports/export_short.html +++ b/infoscience_exports/exports/templates/exports/export_short.html @@ -54,12 +54,7 @@

{{ article.title }}

{% endif %} {% if article.Title %} - - {% if options.link_title and article.ELA_URL %}{% endif %} - {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} - . - + {{ article.Title }} . {% endif %} {% if article.Publication_Date %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/article_short.html b/infoscience_exports/exports/templates/exports/include_doctype/article_short.html index 51a06f07..754fd8f5 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/article_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/article_short.html @@ -10,9 +10,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if article.Publisher %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/book_chapter_short.html b/infoscience_exports/exports/templates/exports/include_doctype/book_chapter_short.html index 9aca0f5c..d4745154 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/book_chapter_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/book_chapter_short.html @@ -9,12 +9,7 @@ {% endif %} {% if article.Title %} - - {% if options.link_title and article.ELA_URL %}{% endif %} - {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} - ; - + {{ article.Title }} ; {% endif %} {% if article.Publisher %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/book_short.html b/infoscience_exports/exports/templates/exports/include_doctype/book_short.html index 2ce87fc3..5663fae2 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/book_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/book_short.html @@ -10,9 +10,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if article.Publication_Location or article.Publication_Institution %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/conference_paper_short.html b/infoscience_exports/exports/templates/exports/include_doctype/conference_paper_short.html index 6199843c..2be3ba89 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/conference_paper_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/conference_paper_short.html @@ -10,9 +10,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if options.adv_conf_paper_journal_name and article.Publisher %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/conference_proceeding_short.html b/infoscience_exports/exports/templates/exports/include_doctype/conference_proceeding_short.html index 59f1c68e..e13a0326 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/conference_proceeding_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/conference_proceeding_short.html @@ -10,9 +10,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if article.Publisher %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/patent_short.html b/infoscience_exports/exports/templates/exports/include_doctype/patent_short.html index 837d9619..715fe61d 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/patent_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/patent_short.html @@ -23,9 +23,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if article.Patent %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/poster_and_talks_short.html b/infoscience_exports/exports/templates/exports/include_doctype/poster_and_talks_short.html index 5273f9d4..a66ec0d0 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/poster_and_talks_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/poster_and_talks_short.html @@ -10,9 +10,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if article.Conference_Meeting_Name or Conference_Meeting_Location or Conference_Meeting_Date %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/report_and_working_paper_short.html b/infoscience_exports/exports/templates/exports/include_doctype/report_and_working_paper_short.html index 834ba2cd..c551c238 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/report_and_working_paper_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/report_and_working_paper_short.html @@ -9,11 +9,7 @@ {% endif %} {% if article.Title %} - - {% if options.link_title and article.ELA_URL %}{% endif %} - {{ article.Title }}. - {% if options.link_title and article.ELA_URL %}{% endif %} - + {{ article.Title }}. {% endif %} {% if article.Publication_Date %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/student_project_short.html b/infoscience_exports/exports/templates/exports/include_doctype/student_project_short.html index 4b105efb..2b4c99c6 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/student_project_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/student_project_short.html @@ -10,9 +10,7 @@ {% if article.Title %} - {% if options.link_title and article.ELA_URL %}{% endif %} {{ article.Title }} - {% if options.link_title and article.ELA_URL %}{% endif %} {% if article.Publication_Date %} ; {% else %} . {% endif %} {% endif %} diff --git a/infoscience_exports/exports/templates/exports/include_doctype/thesis_short.html b/infoscience_exports/exports/templates/exports/include_doctype/thesis_short.html index bdfb9110..1c0580a6 100644 --- a/infoscience_exports/exports/templates/exports/include_doctype/thesis_short.html +++ b/infoscience_exports/exports/templates/exports/include_doctype/thesis_short.html @@ -18,11 +18,7 @@ {% endif %} {% if article.Title %} - - {% if options.link_title and article.ELA_URL %}{% endif %} - {{ article.Title }}. - {% if options.link_title and article.ELA_URL %}{% endif %} - + {{ article.Title }}. {% endif %} {% if article.Publication_Location %} diff --git a/infoscience_exports/exports/views.py b/infoscience_exports/exports/views.py index 70d660c4..e9b65c1c 100644 --- a/infoscience_exports/exports/views.py +++ b/infoscience_exports/exports/views.py @@ -103,7 +103,6 @@ def get_context_data(self, *args, **kwargs): options['format'] = 'SHORT' # self.object.formats_type options['bullet'] = self.object.bullets_type options['thumb'] = self.object.show_thumbnail - options['link_title'] = self.object.show_linkable_titles options['link_authors'] = self.object.show_linkable_authors options['link_print'] = self.object.show_links_for_printing options['link_detailed'] = self.object.show_detailed @@ -142,7 +141,6 @@ def preview(request): options['format'] = 'SHORT' # params['params[format]'] options['bullet'] = params['params[bullet]'] options['thumb'] = params['params[thumb]'] == 'true' - options['link_title'] = params['params[link_title]'] == 'true' options['link_authors'] = params['params[link_authors]'] == 'true' options['link_print'] = params['params[link_print]'] == 'true' options['link_detailed'] = params['params[link_detailed]'] == 'true' diff --git a/staticfiles/js/export.js b/staticfiles/js/export.js index 92a72cc2..d9eab27c 100644 --- a/staticfiles/js/export.js +++ b/staticfiles/js/export.js @@ -31,7 +31,6 @@ jQuery(function($) { params['groupsby_year'] = $("#id_groupsby_year").find(":selected").val(); params['groupsby_doc'] = $("#id_groupsby_doc").find(":selected").val(); params['pending_publications'] = $("#id_show_pending_publications").is(':checked'); - params['link_title'] = $("#id_show_linkable_titles").is(':checked'); params['link_authors'] = $("#id_show_linkable_authors").is(':checked'); params['link_print'] = $("#id_show_links_for_printing").is(':checked'); params['link_detailed'] = $("#id_show_detailed").is(':checked');