Skip to content

Commit 73165b8

Browse files
didi
authored
Fix project detail sidebar issues. (#16746)
* Meta details should not be vertical tabs * Remove inline style and per-link checks * Update translations
1 parent 888e1b6 commit 73165b8

File tree

3 files changed

+44
-54
lines changed

3 files changed

+44
-54
lines changed

‎warehouse/locale/messages.pot

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2806,103 +2806,100 @@ msgstr ""
28062806
msgid "Members"
28072807
msgstr ""
28082808

2809-
#: warehouse/templates/includes/packaging/project-data.html:16
2809+
#: warehouse/templates/includes/packaging/project-data.html:17
28102810
msgid "Verified details"
28112811
msgstr ""
28122812

28132813
#: warehouse/templates/includes/packaging/project-data.html:18
2814-
msgid "(What is this?)"
2814+
#, python-format
2815+
msgid "Verified by PyPI on %(release_date)s"
28152816
msgstr ""
28162817

28172818
#: warehouse/templates/includes/packaging/project-data.html:21
2818-
msgid "These details have been verified by PyPI"
2819+
#, python-format
2820+
msgid "These details have been <a href=\"%(href)s\">verified by PyPI</a>"
28192821
msgstr ""
28202822

28212823
#: warehouse/templates/includes/packaging/project-data.html:23
2822-
#: warehouse/templates/includes/packaging/project-data.html:140
2824+
#: warehouse/templates/includes/packaging/project-data.html:139
28232825
msgid "Project links"
28242826
msgstr ""
28252827

2826-
#: warehouse/templates/includes/packaging/project-data.html:31
2827-
#, python-format
2828-
msgid "URL verified by PyPI on %(release_date)s"
2829-
msgstr ""
2830-
2831-
#: warehouse/templates/includes/packaging/project-data.html:51
2828+
#: warehouse/templates/includes/packaging/project-data.html:50
28322829
msgid "GitHub Statistics"
28332830
msgstr ""
28342831

2835-
#: warehouse/templates/includes/packaging/project-data.html:57
2832+
#: warehouse/templates/includes/packaging/project-data.html:56
28362833
msgid "Repository"
28372834
msgstr ""
28382835

2839-
#: warehouse/templates/includes/packaging/project-data.html:64
2836+
#: warehouse/templates/includes/packaging/project-data.html:63
28402837
msgid "Stars:"
28412838
msgstr ""
28422839

2843-
#: warehouse/templates/includes/packaging/project-data.html:72
2840+
#: warehouse/templates/includes/packaging/project-data.html:71
28442841
msgid "Forks:"
28452842
msgstr ""
28462843

2847-
#: warehouse/templates/includes/packaging/project-data.html:80
2844+
#: warehouse/templates/includes/packaging/project-data.html:79
28482845
msgid "Open issues:"
28492846
msgstr ""
28502847

2851-
#: warehouse/templates/includes/packaging/project-data.html:88
2848+
#: warehouse/templates/includes/packaging/project-data.html:87
28522849
msgid "Open PRs:"
28532850
msgstr ""
28542851

2855-
#: warehouse/templates/includes/packaging/project-data.html:96
2852+
#: warehouse/templates/includes/packaging/project-data.html:95
28562853
msgid "Maintainers"
28572854
msgstr ""
28582855

2859-
#: warehouse/templates/includes/packaging/project-data.html:98
2856+
#: warehouse/templates/includes/packaging/project-data.html:97
28602857
msgid "Avatar for {username} from gravatar.com"
28612858
msgstr ""
28622859

2863-
#: warehouse/templates/includes/packaging/project-data.html:113
2864-
#: warehouse/templates/includes/packaging/project-data.html:156
2860+
#: warehouse/templates/includes/packaging/project-data.html:112
2861+
#: warehouse/templates/includes/packaging/project-data.html:155
28652862
msgid "Meta"
28662863
msgstr ""
28672864

2868-
#: warehouse/templates/includes/packaging/project-data.html:118
2869-
#: warehouse/templates/includes/packaging/project-data.html:168
2870-
#: warehouse/templates/includes/packaging/project-data.html:174
2865+
#: warehouse/templates/includes/packaging/project-data.html:117
2866+
#: warehouse/templates/includes/packaging/project-data.html:167
2867+
#: warehouse/templates/includes/packaging/project-data.html:173
28712868
msgid "Author:"
28722869
msgstr ""
28732870

2874-
#: warehouse/templates/includes/packaging/project-data.html:126
2875-
#: warehouse/templates/includes/packaging/project-data.html:181
2876-
#: warehouse/templates/includes/packaging/project-data.html:187
2871+
#: warehouse/templates/includes/packaging/project-data.html:125
2872+
#: warehouse/templates/includes/packaging/project-data.html:180
2873+
#: warehouse/templates/includes/packaging/project-data.html:186
28772874
#: warehouse/templates/pages/help.html:620
28782875
msgid "Maintainer:"
28792876
msgstr ""
28802877

2881-
#: warehouse/templates/includes/packaging/project-data.html:137
2878+
#: warehouse/templates/includes/packaging/project-data.html:136
28822879
msgid "Unverified details"
28832880
msgstr ""
28842881

2885-
#: warehouse/templates/includes/packaging/project-data.html:138
2882+
#: warehouse/templates/includes/packaging/project-data.html:137
28862883
msgid "These details have <b>not</b> been verified by PyPI"
28872884
msgstr ""
28882885

2889-
#: warehouse/templates/includes/packaging/project-data.html:161
2886+
#: warehouse/templates/includes/packaging/project-data.html:160
28902887
msgid "License:"
28912888
msgstr ""
28922889

2893-
#: warehouse/templates/includes/packaging/project-data.html:195
2890+
#: warehouse/templates/includes/packaging/project-data.html:194
28942891
msgid "Tags"
28952892
msgstr ""
28962893

2897-
#: warehouse/templates/includes/packaging/project-data.html:207
2894+
#: warehouse/templates/includes/packaging/project-data.html:206
28982895
msgid "Requires:"
28992896
msgstr ""
29002897

2901-
#: warehouse/templates/includes/packaging/project-data.html:214
2898+
#: warehouse/templates/includes/packaging/project-data.html:213
29022899
msgid "Provides-Extra:"
29032900
msgstr ""
29042901

2905-
#: warehouse/templates/includes/packaging/project-data.html:224
2902+
#: warehouse/templates/includes/packaging/project-data.html:223
29062903
#: warehouse/templates/pages/classifiers.html:16
29072904
#: warehouse/templates/pages/classifiers.html:21
29082905
#: warehouse/templates/pages/sitemap.html:39

‎warehouse/static/sass/blocks/_verified.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
padding-top: 0;
2424
}
2525

26-
li {
27-
a {
28-
display: inline;
29-
}
30-
}
31-
3226
h3 {
3327
padding-bottom: 0;
3428
}

‎warehouse/templates/includes/packaging/project-data.html

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
-#}
1414

1515
<div class="sidebar-section verified">
16-
<h3 class="sidebar-section__title">{% trans %}Verified details{% endtrans %}&nbsp;
17-
<a href="https://docs.pypi.org/project_metadata/#verified-details">
18-
<small><i>{% trans %}(What is this?){% endtrans %}</i></small>
19-
</a>
20-
</h3>
21-
<small><i>{% trans %}These details have been verified by PyPI{% endtrans %}</i></small>
16+
<h3 class="sidebar-section__title">
17+
{% trans %}Verified details{% endtrans %}
18+
<i class="fa fa-circle-check check" title="{% trans release_date=release.created.date() %}Verified by PyPI on {{ release_date }}
19+
{% endtrans %}"></i>
20+
</h3>
21+
<small><i>{% trans href="https://docs.pypi.org/project_metadata/#verified-details" %}These details have been <a href="{{ href }}">verified by PyPI</a>{% endtrans %}</i></small>
2222
{% if release.urls_by_verify_status(verified=True).values() | contains_valid_uris %}
2323
<h6>{% trans %}Project links{% endtrans %}</h6>
2424
<ul class="vertical-tabs__list">
@@ -28,7 +28,6 @@ <h6>{% trans %}Project links{% endtrans %}</h6>
2828
<a class="vertical-tabs__tab vertical-tabs__tab--with-icon vertical-tabs__tab--condensed" href="{{ url }}" rel="nofollow">
2929
{{ url_icon(name, url) }}{{ name }}
3030
</a>
31-
<i class="fa fa-circle-check check" title="{% trans release_date=release.created.date() %}URL verified by PyPI on {{ release_date }}{% endtrans %}"></i>
3231
</li>
3332
{% endif %}
3433
{% endfor %}
@@ -111,7 +110,7 @@ <h6>{% trans %}Maintainers{% endtrans %}</h6>
111110
{% if release.has_meta and (release.author_email_verified or release.maintainer_email_verified) %}
112111
<div class="sidebar-section verified">
113112
<h6>{% trans %}Meta{% endtrans %}</h6>
114-
<ul class="vertical-tabs__list">
113+
<ul>
115114
{% if release.author_email and release.author_email_verified %}
116115
<li>
117116
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
@@ -154,43 +153,43 @@ <h6>{% trans %}Project links{% endtrans %}</h6>
154153
{% if release.has_meta %}
155154
<div class="sidebar-section unverified">
156155
<h6>{% trans %}Meta{% endtrans %}</h6>
157-
<ul class="vertical-tabs__list">
156+
<ul>
158157
{% if license %}
159158
<li>
160-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
159+
<span>
161160
<strong>{% trans %}License:{% endtrans %}</strong> {{ license }}
162161
</span>
163162
</li>
164163
{% endif %}
165164
{% if release.author_email and not release.author_email_verified %}
166165
<li>
167-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
166+
<span>
168167
<strong>{% trans %}Author:{% endtrans %}</strong> <a href="mailto:{{ release.author_email|format_email|last }}">{{ release.author or release.author_email|format_email|first }}</a>
169168
</span>
170169
</li>
171170
{% elif release.author %}
172171
<li>
173-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
172+
<span>
174173
<strong>{% trans %}Author:{% endtrans %}</strong> {{ release.author }}
175174
</span>
176175
</li>
177176
{% endif %}
178177
{% if release.maintainer_email and not release.maintainer_email_verified%}
179178
<li>
180-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
179+
<span>
181180
<strong>{% trans %}Maintainer:{% endtrans %}</strong> <a href="mailto:{{ release.maintainer_email|format_email|last }}">{{ release.maintainer or release.maintainer_email|format_email|first }}</a>
182181
</span>
183182
</li>
184183
{% elif release.maintainer %}
185184
<li>
186-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
185+
<span>
187186
<strong>{% trans %}Maintainer:{% endtrans %}</strong> {{ release.maintainer }}
188187
</span>
189188
</li>
190189
{% endif %}
191190
{% if release.keywords %}
192191
<li class="tags">
193-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
192+
<span>
194193
<i class="fa fa-tags" aria-hidden="true"></i>
195194
<span class="sr-only">{% trans %}Tags{% endtrans %}</span>
196195
{% for keyword in release.keywords | format_tags %}
@@ -203,7 +202,7 @@ <h6>{% trans %}Meta{% endtrans %}</h6>
203202
{% endif %}
204203
{% if release.requires_python %}
205204
<li>
206-
<span class="vertical-tabs__tab vertical-tabs__tab--condensed">
205+
<span>
207206
<strong>{% trans %}Requires:{% endtrans %}</strong> Python {{ release.requires_python|replace(',', ', ') }}
208207
</span>
209208
</li>

0 commit comments

Comments
 (0)