Skip to content

Commit aa88077

Browse files
borsbors
committed
Auto merge of #2050 - Turbo87:app-wrapper, r=locks
Disable `application-template-wrapper` feature This is one of the requirements to enable the "Octane" mode of Ember.js. It moves the implicit application template wrapper element into the `application` template and thus makes it optional for those applications that don't need it. Since we set a max width on this element we do currently still need it though. r? @locks
2 parents 55ed127 + 0efc422 commit aa88077

File tree

4 files changed

+421
-131
lines changed

4 files changed

+421
-131
lines changed

‎app/templates/application.hbs

+133-131
Original file line numberDiff line numberDiff line change
@@ -3,150 +3,152 @@
33
{{title "crates.io: Rust Package Registry" separator=' - ' prepend=true}}
44
<GoogleJsapi />
55

6-
<nav id="header">
7-
<LinkTo @route="index" @tabindex="-1">
8-
<img src="/assets/Cargo-Logo-Small.png" id="logo"
9-
height="100" width="100" alt="Cargo Logo">
10-
</LinkTo>
11-
<LinkTo @route="index">
12-
<h1>
13-
crates.io
14-
<span class="subtitle">Rust Package Registry</span>
15-
</h1>
16-
</LinkTo>
17-
18-
<form class='search' action='/search' {{ action "search" on="submit" }} data-test-search-form>
19-
<input
20-
type="text"
21-
class="search"
22-
name="q"
23-
id="cargo-desktop-search"
24-
placeholder="Click or press 'S' to search..."
25-
value={{this.searchQuery}}
26-
oninput={{action (mut this.searchQuery) value="target.value"}}
27-
autocorrect="off"
28-
autocapitalize="off"
29-
autofocus="autofocus"
30-
spellcheck="false"
31-
required
32-
data-test-search-input
33-
>
34-
<label for="cargo-desktop-search">Search</label>
35-
</form>
36-
37-
<div class='nav'>
38-
<LinkTo @route="crates" @query={{hash letter=null page=1}} data-test-all-crates-link>
39-
Browse All Crates
6+
<div>
7+
<nav id="header">
8+
<LinkTo @route="index" @tabindex="-1">
9+
<img src="/assets/Cargo-Logo-Small.png" id="logo"
10+
height="100" width="100" alt="Cargo Logo">
11+
</LinkTo>
12+
<LinkTo @route="index">
13+
<h1>
14+
crates.io
15+
<span class="subtitle">Rust Package Registry</span>
16+
</h1>
4017
</LinkTo>
41-
<span class="sep">|</span>
42-
<RlDropdownContainer class="dropdown-container">
43-
<RlDropdownToggle class="dropdown">
44-
Docs
45-
<span class='arrow'></span>
46-
</RlDropdownToggle>
4718

48-
<RlDropdown @tagName="ul" @id="doc-links" class="dropdown">
49-
<li><a href='https://doc.rust-lang.org/cargo/getting-started/'>Getting Started</a></li>
50-
<li><a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a></li>
51-
<li><a href='https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html'>Specifying Dependencies</a></li>
52-
<li><a href='https://doc.rust-lang.org/cargo/reference/publishing.html'>Publishing on crates.io</a></li>
53-
<li><a href='https://doc.rust-lang.org/cargo/faq.html'>FAQ</a></li>
54-
<li><a href='https://doc.rust-lang.org/cargo/reference/manifest.html'>Cargo.toml Format</a></li>
55-
<li><a href='https://doc.rust-lang.org/cargo/reference/build-scripts.html'>Build Scripts</a></li>
56-
<li><a href='https://doc.rust-lang.org/cargo/reference/config.html'>Configuration</a></li>
57-
<li><a href='https://doc.rust-lang.org/cargo/reference/pkgid-spec.html'>Package ID specs</a></li>
58-
<li><a href='https://doc.rust-lang.org/cargo/reference/environment-variables.html'>Environment Variables</a></li>
59-
<li><a href='https://doc.rust-lang.org/cargo/reference/source-replacement.html'>Source Replacement</a></li>
60-
<li><a href='https://doc.rust-lang.org/cargo/reference/external-tools.html'>External Tools</a></li>
61-
<li><LinkTo @route="policies">Policies</LinkTo></li>
62-
<li><LinkTo @route="category-slugs">List of category slugs</LinkTo></li>
63-
</RlDropdown>
64-
</RlDropdownContainer>
65-
<span class="sep">|</span>
66-
{{#if this.session.currentUser}}
19+
<form class='search' action='/search' {{ action "search" on="submit" }} data-test-search-form>
20+
<input
21+
type="text"
22+
class="search"
23+
name="q"
24+
id="cargo-desktop-search"
25+
placeholder="Click or press 'S' to search..."
26+
value={{this.searchQuery}}
27+
oninput={{action (mut this.searchQuery) value="target.value"}}
28+
autocorrect="off"
29+
autocapitalize="off"
30+
autofocus="autofocus"
31+
spellcheck="false"
32+
required
33+
data-test-search-input
34+
>
35+
<label for="cargo-desktop-search">Search</label>
36+
</form>
37+
38+
<div class='nav'>
39+
<LinkTo @route="crates" @query={{hash letter=null page=1}} data-test-all-crates-link>
40+
Browse All Crates
41+
</LinkTo>
42+
<span class="sep">|</span>
6743
<RlDropdownContainer class="dropdown-container">
6844
<RlDropdownToggle class="dropdown">
69-
<UserAvatar @user={{this.session.currentUser}} @size="small" />
70-
{{ this.session.currentUser.name }}
45+
Docs
7146
<span class='arrow'></span>
7247
</RlDropdownToggle>
7348

74-
<RlDropdown @tagName="ul" class="dropdown current-user-links">
75-
<li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
76-
<li><LinkTo @route="me">Account Settings</LinkTo></li>
77-
<li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
78-
<li class='last'><LinkTo @route="logout">Sign Out</LinkTo></li>
49+
<RlDropdown @tagName="ul" @id="doc-links" class="dropdown">
50+
<li><a href='https://doc.rust-lang.org/cargo/getting-started/'>Getting Started</a></li>
51+
<li><a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a></li>
52+
<li><a href='https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html'>Specifying Dependencies</a></li>
53+
<li><a href='https://doc.rust-lang.org/cargo/reference/publishing.html'>Publishing on crates.io</a></li>
54+
<li><a href='https://doc.rust-lang.org/cargo/faq.html'>FAQ</a></li>
55+
<li><a href='https://doc.rust-lang.org/cargo/reference/manifest.html'>Cargo.toml Format</a></li>
56+
<li><a href='https://doc.rust-lang.org/cargo/reference/build-scripts.html'>Build Scripts</a></li>
57+
<li><a href='https://doc.rust-lang.org/cargo/reference/config.html'>Configuration</a></li>
58+
<li><a href='https://doc.rust-lang.org/cargo/reference/pkgid-spec.html'>Package ID specs</a></li>
59+
<li><a href='https://doc.rust-lang.org/cargo/reference/environment-variables.html'>Environment Variables</a></li>
60+
<li><a href='https://doc.rust-lang.org/cargo/reference/source-replacement.html'>Source Replacement</a></li>
61+
<li><a href='https://doc.rust-lang.org/cargo/reference/external-tools.html'>External Tools</a></li>
62+
<li><LinkTo @route="policies">Policies</LinkTo></li>
63+
<li><LinkTo @route="category-slugs">List of category slugs</LinkTo></li>
7964
</RlDropdown>
8065
</RlDropdownContainer>
81-
{{else}}
82-
<LinkTo @route="login" data-test-login-link>
83-
{{svg-jar "lock"}}
84-
Log in with GitHub
85-
</LinkTo>
86-
{{/if}}
87-
</div>
66+
<span class="sep">|</span>
67+
{{#if this.session.currentUser}}
68+
<RlDropdownContainer class="dropdown-container">
69+
<RlDropdownToggle class="dropdown">
70+
<UserAvatar @user={{this.session.currentUser}} @size="small" />
71+
{{ this.session.currentUser.name }}
72+
<span class='arrow'></span>
73+
</RlDropdownToggle>
8874

89-
<div class='menu'>
90-
<RlDropdownContainer class="dropdown-container">
91-
<RlDropdownToggle class="dropdown">
92-
Menu
93-
<span class='arrow'></span>
94-
</RlDropdownToggle>
95-
<RlDropdown @tagName="ul" class="dropdown current-user-links">
96-
<li><LinkTo @route="crates">Browse All Crates</LinkTo></li>
97-
{{#if this.session.currentUser}}
98-
<li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
99-
<li><LinkTo @route="me">Account Settings</LinkTo></li>
100-
<li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
101-
<li class='last'><LinkTo @route="logout">Sign Out</LinkTo></li>
102-
{{else}}
103-
<li><LinkTo @route="login">Log in with GitHub</LinkTo></li>
104-
{{/if}}
105-
</RlDropdown>
106-
</RlDropdownContainer>
107-
</div>
75+
<RlDropdown @tagName="ul" class="dropdown current-user-links">
76+
<li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
77+
<li><LinkTo @route="me">Account Settings</LinkTo></li>
78+
<li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
79+
<li class='last'><LinkTo @route="logout">Sign Out</LinkTo></li>
80+
</RlDropdown>
81+
</RlDropdownContainer>
82+
{{else}}
83+
<LinkTo @route="login" data-test-login-link>
84+
{{svg-jar "lock"}}
85+
Log in with GitHub
86+
</LinkTo>
87+
{{/if}}
88+
</div>
10889

109-
<div class='links'>
110-
</div>
111-
</nav>
90+
<div class='menu'>
91+
<RlDropdownContainer class="dropdown-container">
92+
<RlDropdownToggle class="dropdown">
93+
Menu
94+
<span class='arrow'></span>
95+
</RlDropdownToggle>
96+
<RlDropdown @tagName="ul" class="dropdown current-user-links">
97+
<li><LinkTo @route="crates">Browse All Crates</LinkTo></li>
98+
{{#if this.session.currentUser}}
99+
<li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
100+
<li><LinkTo @route="me">Account Settings</LinkTo></li>
101+
<li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
102+
<li class='last'><LinkTo @route="logout">Sign Out</LinkTo></li>
103+
{{else}}
104+
<li><LinkTo @route="login">Log in with GitHub</LinkTo></li>
105+
{{/if}}
106+
</RlDropdown>
107+
</RlDropdownContainer>
108+
</div>
112109

113-
<form id='mobile-search' class='search' action='/search' {{ action "search" on="submit" }} >
114-
<input
115-
type="text"
116-
class="search"
117-
name="q"
118-
id="cargo-mobile-search"
119-
placeholder="Search"
120-
value={{this.searchQuery}}
121-
oninput={{action (mut this.searchQuery) value="target.value"}}
122-
autocorrect="off"
123-
required
124-
>
125-
<label for="cargo-mobile-search">Search</label>
126-
</form>
110+
<div class='links'>
111+
</div>
112+
</nav>
127113

128-
<main id="main" class='inner-content'>
129-
<FlashMessage />
114+
<form id='mobile-search' class='search' action='/search' {{ action "search" on="submit" }} >
115+
<input
116+
type="text"
117+
class="search"
118+
name="q"
119+
id="cargo-mobile-search"
120+
placeholder="Search"
121+
value={{this.searchQuery}}
122+
oninput={{action (mut this.searchQuery) value="target.value"}}
123+
autocorrect="off"
124+
required
125+
>
126+
<label for="cargo-mobile-search">Search</label>
127+
</form>
130128

131-
{{outlet}}
132-
</main>
129+
<main id="main" class='inner-content'>
130+
<FlashMessage />
133131

134-
<footer class='after-main-links'>
135-
<a href='https://doc.rust-lang.org/cargo/getting-started/installation.html'>Install</a>
136-
<span class="sep">|</span>
137-
<a href='https://doc.rust-lang.org/cargo/'>Getting Started</a>
138-
<span class="sep">|</span>
139-
<a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a>
140-
<span class="sep">|</span>
141-
<a href='mailto:[email protected]'>Send us an email</a>
142-
<span class="sep">|</span>
143-
<a href='https://www.rust-lang.org/policies/security'>Report a security issue</a>
144-
<span class="sep">|</span>
145-
<a href='https://www.rust-lang.org/policies/privacy'>Privacy notice</a>
146-
<span class="sep">|</span>
147-
<LinkTo @route="policies">Policies</LinkTo>
148-
</footer>
132+
{{outlet}}
133+
</main>
134+
135+
<footer class='after-main-links'>
136+
<a href='https://doc.rust-lang.org/cargo/getting-started/installation.html'>Install</a>
137+
<span class="sep">|</span>
138+
<a href='https://doc.rust-lang.org/cargo/'>Getting Started</a>
139+
<span class="sep">|</span>
140+
<a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a>
141+
<span class="sep">|</span>
142+
<a href='mailto:[email protected]'>Send us an email</a>
143+
<span class="sep">|</span>
144+
<a href='https://www.rust-lang.org/policies/security'>Report a security issue</a>
145+
<span class="sep">|</span>
146+
<a href='https://www.rust-lang.org/policies/privacy'>Privacy notice</a>
147+
<span class="sep">|</span>
148+
<LinkTo @route="policies">Policies</LinkTo>
149+
</footer>
149150

150-
<a href='https://github.com/rust-lang/crates.io' class='fork-me'>
151-
<img src='/assets/forkme.png' alt="Fork me on GitHub">
152-
</a>
151+
<a href='https://github.com/rust-lang/crates.io' class='fork-me'>
152+
<img src='/assets/forkme.png' alt="Fork me on GitHub">
153+
</a>
154+
</div>

‎config/optional-features.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"application-template-wrapper": false
3+
}

0 commit comments

Comments
 (0)