Skip to content

Commit 60525c2

Browse files
GuillaumeGomezJoshua Nelson
GuillaumeGomez
authored and
Joshua Nelson
committed
Unify crate pages rendering
1 parent b5b8591 commit 60525c2

File tree

7 files changed

+91
-149
lines changed

7 files changed

+91
-149
lines changed

‎templates/base.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<body>
2727
{%- include "header/topbar.html" -%}
2828

29-
{%- block header %}{% endblock header -%}
30-
3129
{%- block body -%}{%- endblock body -%}
3230
</body>
3331

‎templates/crate/builds.html

Lines changed: 65 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -5,78 +5,82 @@
55
{{ macros::doc_title(name=metadata.name, version=metadata.version) }}
66
{%- endblock title -%}
77

8-
{%- block header -%}
9-
{{ navigation::package_navigation(metadata=metadata, active_tab="builds") }}
10-
{%- endblock header -%}
11-
128
{%- block body -%}
139
<div class="container">
14-
<div class="recent-releases-container">
15-
{# If there is a build log then show it #}
16-
{# TODO: When viewing a build log, show a back button or a hide button #}
17-
{%- if build_details -%}
18-
<div class="release">
19-
<strong>Build #{{ build_details.id }} {{ build_details.build_time | date(format="%+") }}</strong>
20-
</div>
10+
<div class="pure-g">
11+
<div class="pure-u-1 pure-u-sm-7-24 pure-u-md-5-24">
12+
{%- block header -%}
13+
{# Set the active tab to the `crate` tab #}
14+
{{ navigation::package_navigation(show_description=false, metadata=metadata, active_tab="builds") }}
15+
{%- endblock header -%}
16+
</div>
17+
<div class="pure-u-1 pure-u-sm-17-24 pure-u-md-19-24 recent-releases-container">
18+
{# If there is a build log then show it #}
19+
{# TODO: When viewing a build log, show a back button or a hide button #}
20+
{%- if build_details -%}
21+
<div class="release">
22+
<strong>Build #{{ build_details.id }} {{ build_details.build_time | date(format="%+") }}</strong>
23+
</div>
2124

22-
{%- filter dedent -%}
23-
<pre>
24-
# rustc version
25-
{{ build_details.rustc_version }}
26-
# docs.rs version
27-
{{ build_details.docsrs_version }}
25+
{%- filter dedent -%}
26+
<pre>
27+
# rustc version
28+
{{ build_details.rustc_version }}
29+
# docs.rs version
30+
{{ build_details.docsrs_version }}
2831

29-
# build log
30-
{{ build_details.output }}
31-
</pre>
32-
{%- endfilter -%}
33-
{%- endif -%}
32+
# build log
33+
{{ build_details.output }}
34+
</pre>
35+
{%- endfilter -%}
36+
{%- endif -%}
3437

35-
<div class="release">
36-
<strong>Builds</strong>
37-
</div>
38+
<div class="release">
39+
<strong>Builds</strong>
40+
</div>
3841

39-
<ul>
40-
{%- for build in builds -%}
41-
<li>
42-
<a href="/crate/{{ metadata.name }}/{{ metadata.version }}/builds/{{ build.id }}" class="release">
43-
<div class="pure-g">
44-
<div class="pure-u-1 pure-u-sm-1-24 build">
45-
{%- if build.build_status -%}
46-
{{ "check" | fas }}
47-
{%- else -%}
48-
{{ "times" | fas }}
49-
{%- endif -%}
42+
<ul>
43+
{%- for build in builds -%}
44+
<li>
45+
<a href="/crate/{{ metadata.name }}/{{ metadata.version }}/builds/{{ build.id }}" class="release">
46+
<div class="pure-g">
47+
<div class="pure-u-1 pure-u-sm-1-24 build">
48+
{%- if build.build_status -%}
49+
{{ "check" | fas }}
50+
{%- else -%}
51+
{{ "times" | fas }}
52+
{%- endif -%}
53+
</div>
54+
<div class="pure-u-1 pure-u-sm-10-24">{{ build.rustc_version }}</div>
55+
<div class="pure-u-1 pure-u-sm-10-24">{{ build.docsrs_version }}</div>
56+
<div class="pure-u-1 pure-u-sm-3-24 date">{{ build.build_time | timeformat(relative=true) }}</div>
5057
</div>
51-
<div class="pure-u-1 pure-u-sm-10-24">{{ build.rustc_version }}</div>
52-
<div class="pure-u-1 pure-u-sm-10-24">{{ build.docsrs_version }}</div>
53-
<div class="pure-u-1 pure-u-sm-3-24 date">{{ build.build_time | timeformat(relative=true) }}</div>
54-
</div>
55-
</a>
56-
</li>
57-
{%- endfor -%}
58-
</ul>
58+
</a>
59+
</li>
60+
{%- endfor -%}
61+
</ul>
5962

60-
<div class="about">
61-
{# BuildsPage.metadata is an `Option<MetaData>`, so accessing it can fail #}
62-
{%- if metadata -%}
63-
<h4>{{ metadata.name }}'s sandbox limits</h4>
64-
{%- else -%}
65-
<h4>Sandbox limits</h4>
66-
{%- endif -%}
63+
<div class="about">
64+
{# BuildsPage.metadata is an `Option<MetaData>`, so accessing it can fail #}
65+
{%- if metadata -%}
66+
<h4>{{ metadata.name }}'s sandbox limits</h4>
67+
{%- else -%}
68+
<h4>Sandbox limits</h4>
69+
{%- endif -%}
6770

68-
<p>
69-
All the builds on docs.rs are executed inside a sandbox with limited
70-
resources. The limits for this crate are the following:
71-
</p>
71+
<p>
72+
All the builds on docs.rs are executed inside a sandbox with limited
73+
resources. The limits for this crate are the following:
74+
</p>
7275

73-
{{ macros::crate_limits(limits=limits) }}
76+
{{ macros::crate_limits(limits=limits) }}
7477

75-
<p>
76-
If a build fails because it hit one of those limits please
77-
<a href="https://github.com/rust-lang/docs.rs/issues/new/choose">open an issue</a>
78-
to get them increased.
79-
</p>
78+
<p>
79+
If a build fails because it hit one of those limits please
80+
<a href="https://github.com/rust-lang/docs.rs/issues/new/choose">open an issue</a>
81+
to get them increased.
82+
</p>
83+
</div>
8084
</div>
8185
</div>
8286
</div>

‎templates/crate/details.html

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
{%- extends "base.html" -%}
22
{%- import "header/package_navigation.html" as navigation -%}
33

4-
{%- block title -%}
5-
{{ macros::doc_title(name=details.name, version=details.version) }}
6-
{%- endblock title -%}
7-
8-
{%- block header -%}
9-
{# Set the active tab to the `crate` tab #}
10-
{{ navigation::package_navigation(metadata=details.metadata, active_tab="crate") }}
11-
{%- endblock header -%}
12-
134
{%- block body -%}
145
<div class="container package-page-container">
156
<div class="pure-g">
167
<div class="pure-u-1 pure-u-sm-7-24 pure-u-md-5-24">
8+
{%- block header -%}
9+
{# Set the active tab to the `crate` tab #}
10+
{{ navigation::package_navigation(show_description=false, metadata=details.metadata, active_tab="crate") }}
11+
{%- endblock header -%}
1712
<div class="pure-menu package-menu">
1813
<ul class="pure-menu-list">
1914
{%- if details.documented_items and details.total_items -%}
@@ -122,6 +117,16 @@
122117
</div>
123118

124119
<div class="pure-u-1 pure-u-sm-17-24 pure-u-md-19-24 package-details" id="main">
120+
<div class="cratesfyi-package-container">
121+
<div class="container">
122+
{# Page title #}
123+
<h1>{{ details.metadata.name }} {{ details.metadata.version }}</h1>
124+
{%- if details.metadata.description -%}
125+
<div class="description" style="white-space: initial;">{{ details.metadata.description }}</div>
126+
{%- endif -%}
127+
</div>
128+
</div>
129+
125130
{# If the release is not a library #}
126131
{%- if not details.is_library -%}
127132
<div class="warning">

‎templates/crate/source.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
{{ macros::doc_title(name=file_list.metadata.name, version=file_list.metadata.version) }}
66
{%- endblock title -%}
77

8-
{%- block header -%}
9-
{# Set the active tab to the `source` tab #}
10-
{{ navigation::package_navigation(metadata=file_list.metadata, active_tab="source") }}
11-
{%- endblock header -%}
12-
138
{%- block body -%}
149
<div class="container package-page-container">
1510
<div class="pure-g">
16-
<div class="pure-u-1 {% if file_content %}pure-u-sm-7-24 pure-u-md-5-24{% endif %}">
11+
<div class="pure-u-1 pure-u-sm-7-24 pure-u-md-5-24">
12+
{%- block header -%}
13+
{# Set the active tab to the `source` tab #}
14+
{{ navigation::package_navigation(show_description=false, metadata=file_list.metadata, active_tab="source") }}
15+
{%- endblock header -%}
1716
<div class="pure-menu package-menu">
1817
<ul class="pure-menu-list">
1918
{# If this isn't the root folder, show a 'back' button #}

‎templates/header/package_navigation.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Note: `false` here is acting as a pseudo-null value since you can't directly construct null values
1313
and tera requires all parameters without defaults to be filled
1414
#}
15-
{% macro package_navigation(title=false, metadata, platforms=false, active_tab) %}
15+
{% macro package_navigation(title=false, metadata, show_description=true, platforms=false, active_tab) %}
1616
<div class="cratesfyi-package-container">
1717
<div class="container">
1818
{# Page title #}
@@ -26,13 +26,13 @@ <h1 id="crate-title">
2626
</h1>
2727

2828
{# Page description #}
29-
<div class="description">
30-
{%- if metadata.description -%}
31-
{{ metadata.description }}
29+
{%- if metadata.description -%}
30+
{%- if show_description -%}
31+
<div class="description">{{ metadata.description }}</div>
3232
{%- endif -%}
33-
</div>
33+
{%- endif -%}
3434

35-
<div class="pure-menu pure-menu-horizontal">
35+
<div class="pure-menu" {% if active_tab %} style="margin-top: 13px;"{% endif %}>
3636
{# If there are platforms, show a dropdown with them #}
3737
{%- if platforms -%}
3838
<ul class="pure-menu-list platforms-menu">

‎templates/releases/header.html

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -19,65 +19,6 @@ <h1 id="crate-title">{{ title }}</h1>
1919
<div class="description">{{ description | default(value="") }}</div>
2020

2121
{# This does double-duty as the search, so hide all tabs when we're searching something #}
22-
{%- if tab != "search" -%}
23-
<div class="pure-menu pure-menu-horizontal">
24-
<ul class="pure-menu-list">
25-
<li class="pure-menu-item">
26-
<a href="/releases" class="pure-menu-link{% if tab == 'recent' %} pure-menu-active{% endif %}">
27-
{{ "leaf" | fas(fw=true) }}
28-
<span class="title"> Recent</span>
29-
</a>
30-
</li>
31-
32-
<li class="pure-menu-item">
33-
<a href="/releases/stars" class="pure-menu-link{% if tab == 'stars' %} pure-menu-active{% endif %}">
34-
{{ "star" | fas(fw=true) }}
35-
<span class="title"> Stars</span>
36-
</a>
37-
</li>
38-
39-
<li class="pure-menu-item">
40-
<a href="/releases/recent-failures"
41-
class="pure-menu-link{% if tab == 'recent-failures' %} pure-menu-active{% endif %}">
42-
{{ "exclamation-triangle" | fas(fw=true) }}
43-
<span class="title"> Recent Failures</span>
44-
</a>
45-
</li>
46-
47-
<li class="pure-menu-item">
48-
<a href="/releases/failures"
49-
class="pure-menu-link{% if tab == 'failures' %} pure-menu-active{% endif %}">
50-
{{ "star" | far(fw=true) }}
51-
<span class="title"> Failures By Stars</span>
52-
</a>
53-
</li>
54-
55-
<li class="pure-menu-item">
56-
<a href="/releases/activity"
57-
class="pure-menu-link{% if tab == 'activity' %} pure-menu-active{% endif %}">
58-
{{ "chart-line" | fas(fw=true) }}
59-
<span class="title"> Activity</span>
60-
</a>
61-
</li>
62-
63-
<li class="pure-menu-item">
64-
<a href="/releases/queue" class="pure-menu-link{% if tab == 'queue' %} pure-menu-active{% endif %}">
65-
{{ "list" | fas(fw=true) }}
66-
<span class="title"> Queue</span>
67-
</a>
68-
</li>
69-
70-
{%- if author -%}
71-
<li class="pure-menu-item">
72-
<a href="#" class="pure-menu-link{% if tab == 'author' %} pure-menu-active{% endif %}">
73-
{{ "user" | fas(fw=true) }}
74-
<span class="title"> {{ author }}</span>
75-
</a>
76-
</li>
77-
{%- endif -%}
78-
</ul>
79-
</div>
80-
{%- endif -%}
8122
</div>
8223
</div>
8324
{% endmacro header %}

‎templates/style/base.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ div.package-page-container {
431431
pre {
432432
background-color: inherit;
433433
padding: 0;
434+
margin: 0;
434435

435436
code {
436437
white-space: pre;
@@ -486,12 +487,6 @@ div.cratesfyi-package-container {
486487
.pure-menu-active {
487488
color: $color-standard;
488489
background-color: #fff;
489-
border-top: 1px solid $color-border;
490-
border-left: 1px solid $color-border;
491-
border-right: 1px solid $color-border;
492-
border-top-left-radius: 4px;
493-
border-top-right-radius: 4px;
494-
border-bottom: 2px solid #fff;
495490
}
496491

497492
.pure-menu-active:hover {

0 commit comments

Comments
 (0)