Skip to content

Commit 4909906

Browse files
author
Joshua Nelson
committed
Revert "Unify crate pages rendering"
This reverts commit 60525c2.
1 parent 2ce85ce commit 4909906

File tree

7 files changed

+149
-91
lines changed

7 files changed

+149
-91
lines changed

‎templates/base.html

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

29+
{%- block header %}{% endblock header -%}
30+
2931
{%- block body -%}{%- endblock body -%}
3032
</body>
3133

‎templates/crate/builds.html

Lines changed: 61 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -5,82 +5,78 @@
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+
812
{%- block body -%}
913
<div class="container">
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>
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>
2421

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

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

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

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>
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 -%}
5750
</div>
58-
</a>
59-
</li>
60-
{%- endfor -%}
61-
</ul>
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>
6259

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 -%}
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 -%}
7067

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>
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>
7572

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

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>
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>
8480
</div>
8581
</div>
8682
</div>

‎templates/crate/details.html

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
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+
413
{%- block body -%}
514
<div class="container package-page-container">
615
<div class="pure-g">
716
<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 -%}
1217
<div class="pure-menu package-menu">
1318
<ul class="pure-menu-list">
1419
{%- if details.documented_items and details.total_items -%}
@@ -117,16 +122,6 @@
117122
</div>
118123

119124
<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-
130125
{# If the release is not a library #}
131126
{%- if not details.is_library -%}
132127
<div class="warning">

‎templates/crate/source.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
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+
813
{%- block body -%}
914
<div class="container package-page-container">
1015
<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 `source` tab #}
14-
{{ navigation::package_navigation(show_description=false, metadata=file_list.metadata, active_tab="source") }}
15-
{%- endblock header -%}
16+
<div class="pure-u-1 {% if file_content %}pure-u-sm-7-24 pure-u-md-5-24{% endif %}">
1617
<div class="pure-menu package-menu">
1718
<ul class="pure-menu-list">
1819
{# 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, show_description=true, platforms=false, active_tab) %}
15+
{% macro package_navigation(title=false, metadata, 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-
{%- if metadata.description -%}
30-
{%- if show_description -%}
31-
<div class="description">{{ metadata.description }}</div>
29+
<div class="description">
30+
{%- if metadata.description -%}
31+
{{ metadata.description }}
3232
{%- endif -%}
33-
{%- endif -%}
33+
</div>
3434

35-
<div class="pure-menu" {% if active_tab %} style="margin-top: 13px;"{% endif %}>
35+
<div class="pure-menu pure-menu-horizontal">
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: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,65 @@ <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 -%}
2281
</div>
2382
</div>
2483
{% endmacro header %}

‎templates/style/base.scss

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

436435
code {
437436
white-space: pre;
@@ -487,6 +486,12 @@ div.cratesfyi-package-container {
487486
.pure-menu-active {
488487
color: $color-standard;
489488
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;
490495
}
491496

492497
.pure-menu-active:hover {

0 commit comments

Comments
 (0)