Skip to content

Commit 85a4c63

Browse files
jarofgreenjarofgreen
authored
Merge pull request #280 from OpenDataServices/next
Merge next branch into live
2 parents 9951f56 + 26f9298 commit 85a4c63

7 files changed

Lines changed: 237 additions & 232 deletions

File tree

‎prefix_finder/frontend/static/css/main.css‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,10 @@ fieldset {
538538
background-color: #C02942;
539539
}
540540

541+
.card--deprecated header {
542+
background-color: rgba(0, 0, 0, 0.7);;
543+
}
544+
541545
.topbar {
542546
position: relative;
543547
background-color: rgba(0, 0, 0, 0.05);
@@ -876,6 +880,9 @@ fieldset {
876880
.list-group--fallback h1 {
877881
background-color: #C02942;
878882
}
883+
.list-group--deprecated h1 {
884+
background-color:rgba(0, 0, 0, 0.7);
885+
}
879886

880887
.single-content {
881888
margin-left: auto;
@@ -919,6 +926,7 @@ fieldset {
919926
font-weight: 400;
920927
}
921928
}
929+
922930
.single-content__header {
923931
background-color: #00a6ab;
924932
}
@@ -940,6 +948,11 @@ fieldset {
940948
.single-content__header .button {
941949
float: right;
942950
}
951+
952+
.single-content__header_warning {
953+
background-color: lightcoral;
954+
}
955+
943956
@media (min-width: 64em) {
944957
.single-content__main {
945958
float: left;
@@ -998,7 +1011,6 @@ fieldset {
9981011

9991012
.single-categories__item {
10001013
padding: 15px;
1001-
background-color: rgba(0, 0, 0, 0.1);
10021014
}
10031015
@media (min-width: 64em) {
10041016
.single-categories__item {
@@ -1019,12 +1031,6 @@ fieldset {
10191031
.single-categories__item p span {
10201032
font-weight: 100;
10211033
}
1022-
.single-categories--coverage {
1023-
background-color: rgba(0, 166, 171, 0.1);
1024-
}
1025-
.single-categories--sectors {
1026-
background-color: rgba(227, 168, 48, 0.1);
1027-
}
10281034

10291035
.single-suggest {
10301036
padding: 20px;
@@ -1086,25 +1092,28 @@ fieldset {
10861092
.single-sidebar__block p:last-child {
10871093
padding-bottom: 20px;
10881094
}
1089-
.single-sidebar--dark {
1095+
.single-content--dark {
10901096
background-color: rgba(0, 0, 0, 0.7);
1097+
padding: 5px 20px;
10911098
}
1092-
.single-sidebar--dark h2, .single-sidebar--dark p {
1099+
.single-content--dark h2, .single-content--dark p {
10931100
color: white;
10941101
}
1095-
.single-sidebar--dark code {
1102+
.single-content--dark code {
10961103
padding: 4px;
10971104
background-color: rgba(255, 255, 255, 0.1);
10981105
font-family: "Lucida Console", "Courier New", monospace;
10991106
color: white;
11001107
}
1101-
.single-sidebar--dark pre {
1108+
.single-content--dark pre {
11021109
background-color: rgba(255, 255, 255, 0.1);
11031110
padding-top: 20px;
11041111
padding-bottom: 5px;
1112+
padding-left: 10px;
1113+
padding-right: 10px;
11051114
margin-bottom: 20px;
11061115
}
1107-
.single-sidebar--dark pre code {
1116+
.single-content--dark pre code {
11081117
background-color: transparent;
11091118
}
11101119

@@ -1301,20 +1310,6 @@ fieldset {
13011310
padding: 5px 10px;
13021311
color: white;
13031312
}
1304-
.about-page__half--left {
1305-
display: inline-block;
1306-
vertical-align: top;
1307-
width: 50%;
1308-
margin-right: -5px;
1309-
padding-right: 10px;
1310-
1311-
}
1312-
.about-page__half--right {
1313-
display: inline-block;
1314-
vertical-align: top;
1315-
width: 50%;
1316-
padding-left: 10px;
1317-
}
13181313
.about-page__code {
13191314
background-color: #e0e0e0;
13201315
margin-bottom: 20px;
@@ -1402,3 +1397,6 @@ fieldset {
14021397
.sidebar .chosen-drop {
14031398
width: 100%;
14041399
}
1400+
.align-right {
1401+
text-align: right;
1402+
}

‎prefix_finder/frontend/templates/about.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
{% load i18n %}
33
{% block main %}
44
<main class="main-wrapper" role="main">
5-
{% include "sidebar.html" %}
5+
{% include "sidebar.html" with sidebar_show_about_link=False %}
66
<div class="main-content single-content about-page">
77
<div>
88
<h1 class="about-page__header">{% trans "About" %}</h1>
99
</div>
1010

11-
<div class="about-page__half--left">
11+
<div>
1212
<h2>What?</h2>
1313
<p><strong>org-id.guide is the easiest, quickest and most accurate way to locate organization identifiers.</strong></p>
1414
<p>We maintain a register of organization lists. Those lists, in turn, provide unique identifiers for companies, charities, government agencies and other kinds of organizations.</p>
1515
<p>We provide a code for each list, so that with the code, plus the identifier, you should be able to uniquely and unambiguously identify any organization in the world.</p>
1616
<p>Many of the lists in our register are official identifier sources (such as a country company register); other lists may be maintained by third-parties. When we can, we link out to websites where you can look up a specific organization, although we also include codes for lists that don't provide a public search service.</p>
1717
<p>We welcome new additions or updates to the register. We don't pre-judge the kinds of lists that should be included - but we do make sure the register includes good meta-data. We use that meta-data to provide a quality score that indicates how accessible and stable identifiers from the list are likely to be.</p>
1818
</div>
19-
<div class="about-page__half--right">
19+
<div>
2020
<h2>Why?</h2>
2121
<p>org-id.guide has been created by a partnership of open data standards groups in order to provide a robust, shared approach to the use of <strong>open</strong>, <strong>interoperable</strong> and <strong>unambiguous</strong> organization identifers.</p>
2222
<p>It is a collaborative project designed to fill a gap in our shared data infrastructure.</p>
@@ -35,7 +35,7 @@ <h2>Why?</h2>
3535
<div>
3636
<h1 class="about-page__header">How do I use it?</h1>
3737
</div>
38-
<div class="about-page__half--left">
38+
<div>
3939
<h2 id="data-creators">Data creators</h2>
4040
<p>Are you collecting or publishing data about organizations? </p>
4141
<p><strong>First</strong>, make sure you are collecting an identifier for each organization, as well as a name. You can lookup the best identifier list to use based on the country, organization type, or sector you are managing data for.</p>
@@ -51,7 +51,7 @@ <h2 id="data-creators">Data creators</h2>
5151
}</code></pre>
5252

5353
</div>
54-
<div class="about-page__half--right">
54+
<div>
5555

5656
<h2 id="data-users">Data users</h2>
5757
<p>If you’ve come across an organization identifier, you can use org-id.guide to find out more about it and where to locate related open data.</p>

‎prefix_finder/frontend/templates/list.html‎

Lines changed: 114 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,83 +5,145 @@
55

66
{% block main %}
77
<main class="main-wrapper" role="main">
8-
{% include "sidebar.html" %}
8+
{% include "sidebar.html" with sidebar_show_download_links=False %}
99

1010
<div class="main-content single-content">
11-
<header class="single-content__header">
11+
12+
<header class="single-content__header {% if org_list.deprecated %}single-content__header_warning{% endif %}">
1213
<a href="{{ org_list.url }}" class="button" target="_blank"><i class="material-icons" title="Visit website for this list">launch</i></a>
1314
<h1>{{ org_list.name.en }} <span>({{ org_list.code }})</span></h1>
15+
16+
{% if org_list.deprecated %}
17+
<h1>This record is deprecated and should only be used for interpreting older datasets.</h1>
18+
{% endif %}
1419
</header>
1520

16-
<div class="single-content__sidebar single-sidebar">
17-
<div class="single-sidebar__block quality-chart quality-chart--high" data-chart="{{ org_list.quality }}">
18-
<div id="quality-chart-container"></div>
21+
22+
<div class="single-content__block single-description">
23+
<h2>Description</h2>
24+
<p>{{ org_list.description.en|urlize|linebreaks }}</p>
25+
</div>
26+
27+
{% if not org_list.deprecated %}
28+
<div class="single-meta-info__instructions">
29+
{% if org_list.access.onlineAccessDetails %}
30+
<h3>Search options</h3>
31+
<p>{{ org_list.access.onlineAccessDetails|urlize|linebreaks }}</p>
32+
{% endif %}
33+
<h3>Find and use identifiers</h3>
34+
{% if org_list.access.guidanceOnLocatingIds %}
35+
<p>{{ org_list.access.guidanceOnLocatingIds|urlize|linebreaks }}</p>
36+
{% endif %}
37+
{% if org_list.access.publicDatabase %}
38+
<p class="align-right">
39+
<a href="{{ org_list.access.publicDatabase }}" target="_blank" class="button button--main-color">
40+
Search the list here <i class="material-icons" title="Visit website for this list">launch</i>
41+
</a>
42+
</p>
43+
{% elif org_list.url %}
44+
<p class="align-right">
45+
<a href="{{ org_list.url }}" target="_blank" class="button button--main-color">
46+
Visit the website <i class="material-icons" title="Visit website for this list">launch</i>
47+
</a>
48+
</p>
49+
{% endif %}
1950
</div>
20-
<div class="quality-chart__list-type quality-chart--high">
21-
<p>List Type: <span>{{ org_list.listType }}</span></p>
22-
</div>
2351

24-
<div class="single-sidebar__block single-sidebar--dark">
52+
<div class="single-content__block single-content--dark">
2553
<h2>How to use</h2>
26-
<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>
54+
<p>The code for this list is <code>{{ org_list.code }}</code>.</p>
55+
<p>When you have located the organization you wish to identify in this list, you should either:</p>
2756
<p>Enter it in an identifier database field prefixed with <code>{{ org_list.code }}</code>.</p>
2857
<pre>
2958
<code>{{ org_list.code }}-[ IDENTIFIER ]</code>
3059
</pre>
3160
{% if org_list.access.exampleIdentifiers|length >= 1 %}
32-
{% if org_list.access.exampleIdentifiers|length == 1 %}
33-
<h2>Example</h2>
34-
{% else %}
35-
<h2>Examples</h2>
36-
{% endif %}
37-
<pre>
38-
{% for x in org_list.access.exampleIdentifiers|split_examples:","|slice:":3" %}
61+
{% if org_list.access.exampleIdentifiers|length == 1 %}
62+
<h2>Example</h2>
63+
{% else %}
64+
<h2>Examples</h2>
65+
{% endif %}
66+
<pre>
67+
{% for x in org_list.access.exampleIdentifiers|split_examples:","|slice:":3" %}
3968
<code>{{ org_list.code }}-{{ x }}</code>
40-
{% endfor %}
41-
</pre>
69+
{% endfor %}
70+
</pre>
4271
{% endif %}
4372
<p>Alternatively, use it within a two-part identifier, with <code>{{ org_list.code }}</code> as the 'scheme', and the identifier you have located as the 'identifier' field. </p>
4473
</div>
45-
</div>
74+
{% endif %}
4675

47-
<div class="single-content__main">
4876

49-
<div class="single-content__block single-description">
50-
<h2>Description</h2>
51-
<p>{{ org_list.description.en|urlize|linebreaks }}</p>
52-
</div>
77+
<div class="single-content__block single-meta-info">
78+
<ul class="single-meta-info__categories single-categories">
79+
<li class="single-categories__item">
80+
<p>Coverage: {% for code, title, disabled in org_list.coverage_codes_and_titles %}<span><abbr title="{{ title }}">{{ code }}</abbr>{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
81+
</li>
82+
{% if org_list.subnationalCoverage %}
83+
<li class="single-categories__item">
84+
<p>Subnational jurisdiction: {% for code in org_list.subnationalCoverage %}<span>{{ code }}{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
85+
</li>
86+
{% endif %}
5387

54-
<div class="single-content__block single-meta-info">
55-
<ul class="single-meta-info__categories single-categories">
56-
<li class="single-categories__item single-categories--coverage">
57-
<p>Coverage: {% for code, title, disabled in org_list.coverage_codes_and_titles %}<span><abbr title="{{ title }}">{{ code }}</abbr>{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
88+
{% if org_list.structure %}
89+
<li class="single-categories__item">
90+
<p>Legal structure: {% for code in org_list.structure %}<span>{{ code }}{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
5891
</li>
92+
{% endif %}
5993

60-
{% if org_list.sector %}
61-
<li class="single-categories__item single-categories--sectors">
62-
<p>Sectors: {% for x in org_list.sector %}<span>{{ x }}{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
63-
</li>
64-
{% endif %}
65-
</ul>
94+
{% if org_list.sector %}
95+
<li class="single-categories__item">
96+
<p>Sectors: {% for x in org_list.sector %}<span>{{ x }}{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
97+
</li>
98+
{% endif %}
6699

67-
<div class="single-meta-info__instructions">
68-
{% if org_list.access.onlineAccessDetails %}
69-
<h3>Search options</h3>
70-
<p>{{ org_list.access.onlineAccessDetails|urlize|linebreaks }}</p>
71-
{% endif %}
72-
<h3>Find and use identifiers</h3>
73-
{% if org_list.access.guidanceOnLocatingIds %}
74-
<p>{{ org_list.access.guidanceOnLocatingIds|urlize|linebreaks }}</p>
75-
{% else %}
76-
<p><a href="{{ org_list.url }}" target="_blank">Visit the website.</a></p>
77-
{% endif %}
78-
</div>
79-
</div>
100+
<li class="single-categories__item">
101+
<p>List Type: <span>{{ org_list.listType }}</span></p>
102+
</li>
80103

81-
<div class="single-content__block single-suggest">
82-
<p>You can suggest an edit to our information about this list by <a href="https://github.com/org-id/register/issues/new">posting an issue</a> or <a href="https://github.com/org-id/register/edit/{{ branch }}/lists/{{ org_list.code|lower|split_on:"-"|first }}/{{ org_list.code|lower }}.json">submitting a pull request</a>.</p>
83-
<p>The <a href="http://docs.org-id.guide/en/latest/contribute/#proposing-a-correction-or-update" target="_blank">contributors handbook</a> details how to propose changes to an existing list, and how you can request or propose a new list.</p>
84-
</div>
104+
<!-- access_availableOnline Access - Available online? boolean View -->
105+
<!-- access_onlineAccessDetails Access - Online access details string View -->
106+
<!-- access_publicDatabase Access - List URL string View -->
107+
<!-- access_guidanceOnLocatingIds Access - How to locate identifiers string View -->
108+
<!-- access_exampleIdentifiers Access - Example identifiers string View -->
109+
<!-- access_languages Access - Languages list-strings View -->
110+
111+
<!-- data_availability Dataset access - Data availability list-strings View -->
112+
<!-- data_dataAccessDetails Dataset access - Data access details string View -->
113+
<!-- data_features Dataset access - Dataset features list-strings View -->
114+
<!-- data_licenseStatus Dataset access - License status string View -->
115+
<!-- data_licenseDetails Dataset access - License details string View -->
116+
117+
<!-- meta_source Meta - Source string View -->
118+
<!-- meta_lastUpdated Meta - Last updated string View -->
119+
120+
121+
{% if org_list.links.opencorporates %}
122+
<li class="single-categories__item">
123+
<p>Open Corporates Link: <span><a href="{{ org_list.links.opencorporates }}">{{ org_list.links.opencorporates }}</a></span></p>
124+
</li>
125+
{% endif %}
126+
127+
{% if org_list.links.wikipedia %}
128+
<li class="single-categories__item">
129+
<p>Wikipedia page: <span><a href="{{ org_list.links.wikipedia }}">{{ org_list.links.wikipedia }}</a></span></p>
130+
</li>
131+
{% endif %}
132+
133+
{% if org_list.formerPrefixes %}
134+
<li class="single-categories__item">
135+
<p>Former list codes: {% for x in org_list.formerPrefixes %}<span>{{ x }}{% if not forloop.last %},{% endif %} </span>{% endfor %}</p>
136+
</li>
137+
{% endif %}
138+
139+
140+
</ul>
141+
142+
</div>
143+
144+
<div class="single-content__block single-suggest">
145+
<p>You can suggest an edit to our information about this list by <a href="https://github.com/org-id/register/issues/new">posting an issue</a> or <a href="https://github.com/org-id/register/edit/{{ branch }}/lists/{{ org_list.code|lower|split_on:"-"|first }}/{{ org_list.code|lower }}.json">submitting a pull request</a>.</p>
146+
<p>The <a href="http://docs.org-id.guide/en/latest/contribute/#proposing-a-correction-or-update" target="_blank">contributors handbook</a> details how to propose changes to an existing list, and how you can request or propose a new list.</p>
85147
</div>
86148
</div>
87149
</main>

0 commit comments

Comments
 (0)