Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed clickable title #71

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Removed clickable title #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions infoscience_exports/exports/migrations/0010_remove_export_show_linkable_titles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
),
]
1 change: 0 additions & 1 deletion infoscience_exports/exports/models/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion infoscience_exports/exports/static/js/export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion infoscience_exports/exports/templates/exports/export_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ <h4>{% trans "Thumbnail" %}</h4>
<h4>{% trans "Links" %}</h4>
</div>
<div class="col-12 col-sm-6">
<div>{{ form.show_linkable_titles }} {% trans "Clickable titles" %}</div>
<div>{{ form.show_linkable_authors }} {% trans "Clickable authors" %}</div>
<div>{{ form.show_links_for_printing }} {% trans "Format links for printing" %}</div>
</div>
Expand Down
7 changes: 1 addition & 6 deletions infoscience_exports/exports/templates/exports/export_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,7 @@ <h2 class="infoscience_header2">{{ article.title }}</h2>
{% endif %}

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
.
</span>
<span><strong>{{ article.Title }}</strong> .</span>
{% endif %}

{% if article.Publication_Date %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/templates/exports/include_doctype/article_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if article.Publisher %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
7 changes: 1 addition & 6 deletions infoscience_exports/exports/templates/exports/include_doctype/book_chapter_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@
{% endif %}

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
;
</span>
<span><strong>{{ article.Title }}</strong> ;</span>
{% endif %}

{% if article.Publisher %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/templates/exports/include_doctype/book_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if article.Publication_Location or article.Publication_Institution %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/templates/exports/include_doctype/conference_paper_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if options.adv_conf_paper_journal_name and article.Publisher %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
2 changes: 0 additions & 2 deletions ...cience_exports/exports/templates/exports/include_doctype/conference_proceeding_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if article.Publisher %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/templates/exports/include_doctype/patent_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if article.Patent %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/templates/exports/include_doctype/poster_and_talks_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if article.Conference_Meeting_Name or Conference_Meeting_Location or Conference_Meeting_Date %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
6 changes: 1 addition & 5 deletions ...nce_exports/exports/templates/exports/include_doctype/report_and_working_paper_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
{% endif %}

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>.
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
</span>
<span><strong>{{ article.Title }}</strong>.</span>
{% endif %}

{% if article.Publication_Date %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/templates/exports/include_doctype/student_project_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
{% if article.Publication_Date %} ; {% else %} . {% endif %}
</span>
{% endif %}
Expand Down
6 changes: 1 addition & 5 deletions infoscience_exports/exports/templates/exports/include_doctype/thesis_short.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
{% endif %}

{% if article.Title %}
<span>
{% if options.link_title and article.ELA_URL %}<a href="{{ article.ELA_URL }}" target="_blank">{% endif %}
<strong>{{ article.Title }}</strong>.
{% if options.link_title and article.ELA_URL %}</a>{% endif %}
</span>
<span><strong>{{ article.Title }}</strong>.</span>
{% endif %}

{% if article.Publication_Location %}
Expand Down
2 changes: 0 additions & 2 deletions infoscience_exports/exports/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion staticfiles/js/export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down