Skip to content

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

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 6 commits into from
Sep 27, 2017
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 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
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
2 changes: 1 addition & 1 deletion prefix_finder/frontend/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ fieldset {
display: flex;
flex-direction: column;
}
@media (min-width: 40em) {
@media (min-width: 100em) {
.homepage {
height: 100vh;
}
Expand Down
2 changes: 1 addition & 1 deletion prefix_finder/frontend/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<p class="ribbon-alert"><i class="material-icons">error_outline</i> You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
{% if branch and branch != "master" %}
<p class="ribbon-alert"><i class="material-icons">error_outline</i> You are currently previewing branch {{ branch }}. <a href="/_preview_branch/master">Return to master</a> or <a href="https://github.com/OpenDataServices/org-ids/compare/{{ branch }}">view on GitHub</a></p>
<p class="ribbon-alert"><i class="material-icons">error_outline</i> You are currently previewing branch {{ branch }}. <a href="/_preview_branch/master">Return to master</a> or <a href="https://github.com/org-id/register/compare/{{ branch }}">view on GitHub</a></p>
{% endif %}

{% block main %}{% endblock %}
Expand Down
10 changes: 7 additions & 3 deletions prefix_finder/frontend/templates/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>{{ org_list.name.en }} <span>({{ org_list.code }})</span></h1>
</div>

<div class="single-sidebar__block single-sidebar--dark">
<p>The code for this list is <br/><code>{{ org_list.code }}</code>. When you can located the organization you wish to identify in this list, you should either:</p>
<p>The code for this list is <br/><code>{{ org_list.code }}</code>. When you have located the organization you wish to identify in this list, you should either:</p>
<p>Enter it in an identifier database field prefixed with <code>{{ org_list.code }}</code>.</p>
<h2>Example</h2>
<pre>
Expand All @@ -40,7 +40,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 x in org_list.coverage %}<span><abbr title="{% for key, value in lookups.coverage %}{% if key == x %}{{ value }}{% endif %}{% endfor %}">{{ x }}</abbr>{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
</li>

{% if org_list.sector %}
Expand All @@ -52,7 +52,11 @@ <h2>Description</h2>

<div class="single-meta-info__instructions">
<h3>To find identifiers</h3>
<p>{{ org_list.access.guidanceOnLocatingIds|urlize|linebreaks}}</p>
{% 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
2 changes: 1 addition & 1 deletion prefix_finder/frontend/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,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