Skip to content

Commit

Permalink
Merge pull request #45 from clarin-eric/dev
Browse files Browse the repository at this point in the history 
Place "NoCentre" SPs and OAI-PMH endpoints in their own row
  • Loading branch information
@andmor-
andmor- authored Jun 22, 2021
2 parents 8ca6a8a + 5c31208 commit 8cf3a6f
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 120 deletions.
135 changes: 60 additions & 75 deletions centre-registry-app/centre_registry/templates/UI/_oai_pmh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,101 +16,86 @@
</thead>
<tbody>
{% for centre in centre_endpoints_dict.keys %}
<tr>
{% if centre == 'NoCentre' %}
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
<tr>
<td>
<abbr title='{{ endpoint.note }}'>No centre</abbr>
</td>
<td>
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}'>{{ endpoint.uri }}</a>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% if set.set_spec %}
&emsp;<small>{{ set.set_spec }} ({{ set.set_type }})</small>
{% else %}
&emsp;<small> &lt;no spec&gt; ({{ set.set_type }})</small>
{% endif %}
{% empty %}
<br>
{% endfor %}
</td>
<td>
<a href='{{ endpoint.uri }}?verb=Identify'>Query ... </a>
</td>
<td>
<a href='{{ endpoint.uri }}?verb=ListMetadataFormats'>Query ... </a>
</td>
</tr>
{% endfor %}
{% else %}
<tr>
<td>
<abbr title='{{ oaipmh_endpoint.note }}'>No centre</abbr>
<a href='/centre/{{ centre.id }}'>{{ centre }}</a>
</td>
<td>
{% for oaipmh_endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ oaipmh_endpoint.uri }}'>{{ oaipmh_endpoint.uri }}</a>
{% for set in endpoint_sets_dict|get_value_from_dict:oaipmh_endpoint %}
<a href='{{ endpoint.uri }}'>{{ endpoint.uri }}</a>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% if set.set_spec %}
&emsp;<small>{{ set.set_spec }} ({{ set.set_type }})</small>
{% else %}
&emsp;<small> &lt;no spec&gt; ({{ set.set_type }})</small>
{% endif %}
{% empty %}
<br>
{% endfor %}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}?verb=Identify'>Query ... </a>
<br>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% endfor %}
{% endfor %}
</td>
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}?verb=ListMetadataFormats'>Query ... </a>
<br>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% endfor %}
{% endfor %}
</td>
{% else %}
<td>
<a href='/centre/{{ centre.id }}'>{{ centre }}</a>
</td>
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}'>{{ endpoint.uri }}</a>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% if set.set_spec %}
&emsp;<small>{{ set.set_spec }} ({{ set.set_type }})</small>
{% else %}
&emsp;<small> &lt;no spec&gt; ({{ set.set_type }})</small>
{% endif %}
{% endfor %}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}?verb=Identify'>Query ... </a>
<br>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
</td>
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}?verb=Identify'>Query ... </a>
<br>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% endfor %}
{% endfor %}
{% endfor %}
</td>
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}?verb=ListMetadataFormats'>Query ... </a>
<br>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
</td>
<td>
{% for endpoint in centre_endpoints_dict|get_value_from_dict:centre %}
{% if not forloop.first %}
<br>
{% endif %}
<a href='{{ endpoint.uri }}?verb=ListMetadataFormats'>Query ... </a>
<br>
{% for set in endpoint_sets_dict|get_value_from_dict:endpoint %}
<br>
{% endfor %}
{% endfor %}
{% endfor %}
</td>
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
Expand Down
92 changes: 47 additions & 45 deletions centre-registry-app/centre_registry/templates/UI/_spf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
</thead>
<tbody>
{% for centre in centre_saml_providers_dict.keys %}
<tr>
{% if centre == 'NoCentre' %}
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
<tr>
<td>
<abbr title='{{ saml_service_provider.note }}'>No centre</abbr>
</td>
Expand Down Expand Up @@ -66,54 +66,28 @@
{% endif %}
</td>
{% endfor %}
</tr>
{% endfor %}
{% else %}
<td>
<a href='/centre/{{ centre.id }}'>{{ centre }}</a>
</td>

<td class="dt-nowrap">
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{{ saml_service_provider.entity_id }}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>

<td class='non_textual'>
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{% if saml_service_provider.production_status %}
<span class='positive'><a
href='https://infra.clarin.eu/aai/sps_at_identity_federations/CLARIN%20IdP/{{ saml_service_provider.entity_id|urlencode:''|urlencode:'' }}.xml'>✓</a></span>
{% else %}
<span class='negative'>✗</span>
{% endif %}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>
<tr>
<td>
<a href='/centre/{{ centre.id }}'>{{ centre }}</a>
</td>

<td class='non_textual'>
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{% if saml_service_provider.status_url %}
<a href='{{ saml_service_provider.status_url }}'>⚙</a>
{% else %}
<em>none</em>
{% endif %}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>
<td class="dt-nowrap">
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{{ saml_service_provider.entity_id }}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>

{% for identity_federation, sps in processed_sps_across_id_feds.items %}
<td class='non_textual'>
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{% if saml_service_provider.entity_id in sps %}
<a href='https://infra.clarin.eu/aai/sps_at_identity_federations/{{ identity_federation|urlencode }}/{{ saml_service_provider.entity_id|urlencode:''|urlencode:'' }}.xml.diff'><span
class='positive'>Δ</span></a>
{% if saml_service_provider.production_status %}
<span class='positive'><a
href='https://infra.clarin.eu/aai/sps_at_identity_federations/CLARIN%20IdP/{{ saml_service_provider.entity_id|urlencode:''|urlencode:'' }}.xml'>✓</a></span>
{% else %}
<span class='negative'>✗</span>
{% endif %}
Expand All @@ -122,8 +96,36 @@
{% endif %}
{% endfor %}
</td>
{% endfor %}
</tr>

<td class='non_textual'>
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{% if saml_service_provider.status_url %}
<a href='{{ saml_service_provider.status_url }}'>⚙</a>
{% else %}
<em>none</em>
{% endif %}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>

{% for identity_federation, sps in processed_sps_across_id_feds.items %}
<td class='non_textual'>
{% for saml_service_provider in centre_saml_providers_dict|get_value_from_dict:centre %}
{% if saml_service_provider.entity_id in sps %}
<a href='https://infra.clarin.eu/aai/sps_at_identity_federations/{{ identity_federation|urlencode }}/{{ saml_service_provider.entity_id|urlencode:''|urlencode:'' }}.xml.diff'><span
class='positive'>Δ</span></a>
{% else %}
<span class='negative'>✗</span>
{% endif %}
{% if not forloop.last %}
<br>
{% endif %}
{% endfor %}
</td>
{% endfor %}
</tr>
{% endif %}
{% endfor %}
</tbody>
Expand Down

0 comments on commit 8cf3a6f

Please sign in to comment.