Skip to content

Commit 689a012

Browse files
s-paquettes-paquette
authored
Merge pull request #1538 from ImagingDataCommons/release-50-sp
-> #1525
2 parents 0dca178 + 5d9e316 commit 689a012

2 files changed

Lines changed: 29 additions & 68 deletions

File tree

‎static/css/bootstrap-idc.css‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,6 @@
7474
display: none !important;
7575
}
7676

77-
.ar-collex-set {
78-
list-style-type: circle;
79-
}
80-
81-
.ar-collex-set li {
82-
list-style-type: circle;
83-
margin-left: 20px;
84-
}
85-
86-
.ar-collex-set li a {
87-
margin-left: -5px;
88-
}
89-
9077
.show-more, .show-less {
9178
cursor: pointer;
9279
font-weight: bold;
@@ -110,4 +97,9 @@
11097
.doi-list .fa-li i {
11198
font-size: 12px;
11299
vertical-align: middle;
100+
}
101+
102+
.doi-list.ar-collex-set {
103+
margin-left: var(--fa-li-margin,0.75em);
104+
margin-bottom: 1em;
113105
}

‎templates/collections/collection_details.html‎

Lines changed: 24 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -94,66 +94,35 @@ <h4>Details</h4>
9494
<b>Supporting Data: </b>{{ supporting_data }}
9595
</p>
9696
{% endif %}
97-
{% if collections != "" %}
98-
<p class="collex-divider"></p>
99-
<p>
100-
<b>Collections</b>
101-
{% with col_count=collections|length %}
102-
{% if col_count > 5 %}
103-
<p>
104-
<a class="show-more show-sib" data-toggle-target=".ar-collex-set"><i class="fa-solid fa-plus-circle"></i> show more</a>
105-
<a class="show-less show-sib is-hidden" data-toggle-target=".ar-collex-set"><i class="fa-solid fa-minus-circle"></i> show less</a>
106-
</p>
107-
{% endif %}
108-
<ul class="ar-collex-set">
109-
{% for col in collections %}
110-
<li class="ar-collex{% if forloop.counter > 5 %} extra-values is-hidden{% endif %}"><a href="{% url 'collection_details' col.collection_id %}">{{ col.collection_name }}</a></li>
111-
{% if forloop.counter == 6 %}
112-
<span class="show-more-count">... {{ col_count|add:-5 }} more collections</span>
113-
{% endif %}
114-
{% endfor %}
115-
</ul>
116-
{% endwith %}
117-
</p>
118-
{% endif %}
119-
{% if analysis_results != "" %}
120-
<p class="collex-divider"></p>
121-
<p>
122-
<b>Analysis Results</b>
123-
{% with col_count=analysis_results|length %}
124-
{% if col_count > 5 %}
125-
<p>
126-
<a class="show-more show-sib" data-toggle-target=".ar-collex-set"><i class="fa-solid fa-plus-circle"></i> show more</a>
127-
<a class="show-less show-sib is-hidden" data-toggle-target=".ar-collex-set"><i class="fa-solid fa-minus-circle"></i> show less</a>
128-
</p>
129-
{% endif %}
130-
<ul class="ar-collex-set">
131-
{% for col in analysis_results %}
132-
<li class="ar-collex{% if forloop.counter > 5 %} extra-values is-hidden{% endif %}"><a href="{% url 'collection_details' col.collection_id %}">{{ col.collection_id }}</a></li>
133-
{% if forloop.counter == 6 %}
134-
<span class="show-more-count">... {{ col_count|add:-5 }} more analysis results</span>
135-
{% endif %}
136-
{% endfor %}
137-
</ul>
138-
{% endwith %}
139-
</p>
140-
{% endif %}
14197
<p class="collex-divider"></p>
14298
<p><b>DOIs</b></p>
14399
{% if collection_type == "Analysis Result" %}
144100
<p>
145101
<i class="fa-solid fa-globe"></i> {{ collection_id }} <a href="https://doi.org/{{ doi }}" target="_blank" rel="nofollow noreferrer">{{ doi }}</a>
146102
</p>
147-
<p>
148-
<span class="doi-section-title">Collections analyzed:</span>
149-
<ul class="doi-list fa-ul">
150-
{% for col in collections %}
151-
<li><span class="fa-li"><i class="fa-solid fa-globe"></i></span>{{ col.collection_name }}
152-
{% for doi in col.doi %} <a href="https://doi.org/{{ doi }}" target="_blank" rel="nofollow noreferrer">{{ doi }}</a>{% endfor %}
153-
</li>
154-
{% endfor %}
155-
</ul></p>
156-
</p>
103+
<span class="doi-section-title">Collections analyzed:</span>
104+
{% with col_count=collections|length %}
105+
{% if col_count > 5 %}
106+
<p>
107+
<a class="show-more show-sib" data-toggle-target=".ar-collex-set"><i class="fa-solid fa-plus-circle"></i> show more</a>
108+
<a class="show-less show-sib is-hidden" data-toggle-target=".ar-collex-set"><i class="fa-solid fa-minus-circle"></i> show less</a>
109+
</p>
110+
{% endif %}
111+
<ul class="ar-collex-set doi-list fa-ul">
112+
{% for col in collections %}
113+
<li class="ar-collex{% if forloop.counter > 5 %} extra-values is-hidden{% endif %}">
114+
<span class="fa-li"><i class="fa-solid fa-globe"></i></span>
115+
<a href="{% url 'collection_details' col.collection_id %}">{{ col.collection_name }}</a><br />
116+
{% for doi in col.doi %}
117+
<a href="https://doi.org/{{ doi }}" target="_blank" rel="nofollow noreferrer"> {{ doi }}</a><br />
118+
{% endfor %}
119+
</li>
120+
{% if forloop.counter == 6 %}
121+
<span class="show-more-count">... {{ col_count|add:-5 }} more collections</span>
122+
{% endif %}
123+
{% endfor %}
124+
</ul>
125+
{% endwith %}
157126
{% endif %}
158127
{% if collection_type == "Collection" %}
159128
<p>
@@ -170,7 +139,7 @@ <h4>Details</h4>
170139
<span class="doi-section-title">Analysis Results:</span>
171140
<ul class="doi-list fa-ul">
172141
{% for ar in analysis_results %}
173-
<li><span class="fa-li"><i class="fa-solid fa-globe"></i></span>{{ ar.collection_id }} <a href="https://doi.org/{{ ar.doi }}" target="_blank" rel="nofollow noreferrer">{{ ar.doi }}</a></li>
142+
<li><span class="fa-li"><i class="fa-solid fa-globe"></i></span>{{ ar.collection_id }}<br /> <a href="https://doi.org/{{ ar.doi }}" target="_blank" rel="nofollow noreferrer">{{ ar.doi }}</a></li>
174143
{% endfor %}
175144
</ul></p>
176145
{% endif %}

0 commit comments

Comments
 (0)