Skip to content

fallback link where no id guidance & country code abbreviations #175

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

Merged
merged 9 commits into from
Jan 18, 2018
Merged

fallback link where no id guidance & country code abbreviations #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26888b6
fallback link where no id guidance
BobHarper1 Aug 18, 2017
7780d17
> @media width
BobHarper1 Aug 19, 2017
3b3155e
Use country code as abbreviation of full name
BobHarper1 Aug 20, 2017
35542bc
lookups context in list_details view
BobHarper1 Aug 20, 2017
cfa52b3
point preview message to 'org-id/register' repo, not app repo
BobHarper1 Sep 18, 2017
a2c04d2
Merge branch 'master' into master
Bjwebb Sep 27, 2017
f3fa0bd
Merge branch 'master' into fallback-link
Bjwebb Jan 18, 2018
ebe9cae
Tidy up template for list coverage
Bjwebb Jan 18, 2018
dccdd3f
Merge branch 'master' into fallback-link
Bjwebb Jan 18, 2018
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
4 changes: 3 additions & 1 deletion prefix_finder/frontend/templates/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h2>Description</h2>
<div class="single-content__block single-meta-info">
<ul class="single-meta-info__categories single-categories">
<li class="single-categories__item single-categories--coverage">
<p>Coverage: {% for x in org_list.coverage %}<span>{{ x }}{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
<p>Coverage: {% for code, title in org_list.coverage_codes_and_titles %}<span><abbr title="{{ title }}">{{ code }}</abbr>{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
</li>

{% if org_list.sector %}
Expand All @@ -70,6 +70,8 @@ <h3>Search options</h3>
<h3>Find and use identifiers</h3>
{% if org_list.access.guidanceOnLocatingIds %}
<p>{{ org_list.access.guidanceOnLocatingIds|urlize|linebreaks }}</p>
{% else %}
<p><a href="{{ org_list.url }}" target="_blank">Visit the website.</a></p>
{% endif %}
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion prefix_finder/frontend/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def add_titles(org_list):
coverage_codes = org_list.get('coverage')
if coverage_codes:
org_list['coverage_titles'] = [tup[1] for tup in lookups['coverage'] if tup[0] in coverage_codes]
org_list['coverage_codes_and_titles'] = [tup for tup in lookups['coverage'] if tup[0] in coverage_codes]
subnational_codes = org_list.get('subnationalCoverage')
if subnational_codes:
subnational_coverage = []
Expand Down Expand Up @@ -500,7 +501,7 @@ def list_details(request, prefix):

except KeyError:
raise Http404('Organization list {} does not exist'.format(prefix))
return render(request, 'list.html', context={'org_list': org_list, 'branch':use_branch})
return render(request, 'list.html', context={'org_list': org_list, 'lookups': lookups, 'branch':use_branch})


def _get_filename(use_branch='master'):
Expand Down