Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 8207450

Browse files
author
Eugene Bannykh
committed
Home page 2.0 and + logo now links to correct version of home page
1 parent ebc233c commit 8207450

5 files changed

Lines changed: 97 additions & 101 deletions

File tree

‎_config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ baseurl: "/"
1111

1212
markdown_ext: "markdown,mkdown,mkdn,mkd,md"
1313

14-
# Version Switcher
15-
version: 2.1
14+
# Version Switcher. Version numbers should be STRING
15+
version: "2.1"
1616
versions:
1717
-
18-
name: 2.0
18+
name: "2.0"
1919
url: guides/v2.0/
2020
-
21-
name: 2.1
21+
name: "2.1"
2222
url: guides/v2.1/
2323

2424
# GitHub variables

‎_includes/header.html‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,16 @@
3838

3939
<div class="container">
4040

41-
<a class="logo" href="{{ site.baseurl }}"><img src="{{ site.baseurl }}i/m-logo.svg" alt=""><img src="{{ site.baseurl }}i/magento-logo.svg" alt="Magento" class="magento-logo" /><img src="{{ site.baseurl }}i/devdocs-logo.svg" alt="Devdocs" class="devdocs-logo" /></a>
41+
<a class="logo" href="{% if page.guide_version == site.version %}{{site.baseurl}}{% else %}{{page.baseurl}}{% endif %}"><img src="{{site.baseurl}}i/m-logo.svg" alt=""><img src="{{site.baseurl}}i/magento-logo.svg" alt="Magento" class="magento-logo" /><img src="{{site.baseurl}}i/devdocs-logo.svg" alt="Devdocs" class="devdocs-logo" /></a>
4242

4343
{% include navigation.html %}
4444

45-
<div class="search-btn"><a class="search-trigger search-icon" href="{{site.baseurl}}search.html"></a></div>
45+
<div class="search-btn">
46+
<a class="search-trigger search-icon" href="{{site.baseurl}}search.html"></a>
47+
<form class="quick-search" action="{{site.baseurl}}search.html" method="get">
48+
<input type="search" name="q" placeholder="search" />
49+
</form>
50+
</div>
4651

4752
{% include version-switcher.html %}
4853

‎_includes/home/intro.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<section class="home-intro">
2+
<div class="container">
3+
<h1>Welcome to Magento 2 Documentation</h2>
4+
<p>Everything you need to build and manage a customized Magento store.</p>
5+
6+
<div class="search-form">
7+
<form class="input-group" action="{{site.baseurl}}search.html" method="get">
8+
<input type="search" name="q" placeholder="Looking for something specific?" class="form-control search-field" />
9+
<i class="search-icon"></i>
10+
<div class="input-group-btn">
11+
<button type="submit" class="btn btn-primary btn-large search-submit">Search</button>
12+
</div>
13+
</form>
14+
</div>
15+
16+
</div>
17+
</section><!-- END home-intro -->

‎guides/v2.0/index.html‎

Lines changed: 68 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,75 @@
22
layout: home
33
---
44

5-
<section class="page-intro">
6-
<div class="container">
7-
<h2 class="page-heading">Magento 2 Developer Documentation</h2>
8-
</div>
9-
</section>
10-
<!-- NEWS -->
11-
<section class="home-section">
12-
<div class="container">
13-
<h2 class="no-padding">Get Started with Magento</h2>
14-
<h3><a href="{{page.baseurl}}architecture/bk-architecture.html">Magento Architecture</a></h3>
15-
<p>What is Magento? How the Magento platform is organized, overview of modules, file system, and database.</p>
16-
<h3><a href="{{page.baseurl}}release-notes/bk-release-notes.html">Release Information</a></h3>
17-
<p>New features, enhancements, and behavior changes in Magento 2.</p>
18-
<div class="panel-separator"></div>
19-
</div>
20-
</section>
5+
{% include home/intro.html %}
216

22-
<!-- ADMINS -->
23-
<section class="home-section">
24-
<div class="container">
25-
<h2 class="no-padding">System Administrators</h2>
26-
<!-- <p>Install and configure Magento.</p> -->
27-
<h3><a href="{{page.baseurl}}install-gde/bk-install-guide.html">Installation Guide</a></h3>
28-
<p>How to install the Magento software and components.</p>
29-
<h3><a href="{{page.baseurl}}comp-mgr/bk-compman-upgrade-guide.html">Component Manager and Upgrade Guide</a></h3>
30-
<p>How to manage Magento components (extensions, language packages, and themes).</p>
31-
<h3><a href="{{page.baseurl}}config-guide/bk-config-guide.html">Configuration Guide</a></h3>
32-
<p>Learn how to configure Magento and integrate third-party software with Magento.</p>
33-
<h3><a href="{{page.baseurl}}migration/bk-migration-guide.html">Migration Guide</a></h3>
34-
<p>Migrate data from Magento 1.x to Magento 2.0.</p>
35-
<h3><a href="{{page.baseurl}}cloud/bk-cloud.html">Magento Enterprise Cloud Guide</a></h3>
36-
<p>Spin up and maintain Magento Enterprise Edition in a cloud environment.</p>
37-
<div class="panel-separator"></div>
38-
</div>
39-
</section>
40-
<!-- DEVELOPERS -->
41-
<section class="home-section">
42-
<div class="container">
43-
<h2 class="no-padding">Developers</h2>
44-
<h3><a href="{{page.baseurl}}contributor-guide/contributing.html">Contributor Guide</a></h3>
45-
<p>How to contribute to the Magento 2 codebase and to Magento 2 documentation.</p>
46-
<h3><a href="{{page.baseurl}}frontend-dev-guide/bk-frontend-dev-guide.html">Frontend Developer Guide</a></h3>
47-
<p>Customize your storefront.</p>
48-
<h3><a href="{{page.baseurl}}ui-components/ui-component.html">UI Components</a></h3>
49-
<p>How to use grids, forms, and other elements of the Magento UI Components.</p>
50-
<h3><a href="{{page.baseurl}}javascript-dev-guide/bk-javascript-dev-guide.html">JavaScript Developer Guide</a></h3>
51-
<p>Everything you need to know about Magento and JavaScript.</p>
52-
<h3><a href="{{page.baseurl}}extension-dev-guide/bk-extension-dev-guide.html">PHP Developer Guide</a></h3>
53-
<p>What is Magento? How the Magento platform is organized, overview of modules, file system, and database.</p>
54-
<p>What is an extension? A module service contract? Create or customize, and test and package extensions.</p>
55-
<h3><a href="{{page.baseurl}}ext-best-practices/bk-ext-best-practices.html">Extension Developer Best Practices Guide</a></h3>
56-
<p>Learn how to design your component so it behaves correctly with the Magento-provided components and other third-party components.</p>
57-
<h3><a href="{{page.baseurl}}howdoi/mtf/mtf.html">Magento Testing Guide</a></h3>
58-
<p>Start using the Magento testing frameworks: unit, integration, and functional.</p>
59-
<h3><a href="{{page.baseurl}}coding-standards/bk-coding-standards.html">Coding Standards</a></h3>
60-
<p>Which standards should I follow when I code extensions or customize my storefront?</p>
7+
<section class="home-features">
8+
<div class="container">
619

62-
<h3><a href="{{page.baseurl}}get-started/bk-get-started-api.html">Get Started with Magento Web APIs</a></h3>
63-
<p>What are the web APIs? How can I call the REST and SOAP web APIs?</p>
10+
<div class="feature">
11+
<img src="{{site.baseurl}}i/icons/install.svg" alt="" />
12+
<h2 class="title">Setup and Deployment</h2>
13+
<ul>
14+
<li><a href="{{site.baseurl}}magento-system-requirements.html">System Requirements</a></li>
15+
<li><a href="{{page.baseurl}}install-gde/bk-install-guide.html">Installation Guide</a></li>
16+
<li><a href="{{page.baseurl}}config-guide/bk-config-guide.html">Configuration Guide</a></li>
17+
</ul>
18+
</div>
6419

65-
<h3><a href="{{page.baseurl}}rest/bk-rest.html">REST API Reference</a></h3>
66-
<p>Provides reference information for REST.</p>
67-
<h3><a href="{{page.baseurl}}soap/bk-soap.html">SOAP Reference</a></h3>
68-
<p>Provides reference information for SOAP.</p>
20+
<div class="feature">
21+
<img src="{{site.baseurl}}i/icons/backend.svg" alt="" />
22+
<h2 class="title">Development</h2>
23+
<ul>
24+
<li><a href="{{page.baseurl}}extension-dev-guide/bk-extension-dev-guide.html">PHP Developer Guide</a></li>
25+
<li><a href="{{page.baseurl}}ext-best-practices/bk-ext-best-practices.html">Extensions Best Practices</a></li>
26+
<li><a href="{{page.baseurl}}coding-standards/bk-coding-standards.html">Coding Standards</a></li>
27+
</ul>
28+
</div>
6929

70-
<div class="panel-separator"></div>
71-
</div>
72-
<!-- DESIGNERS -->
73-
<section class="home-section">
74-
<div class="container">
75-
<h2 class="no-padding">Designers</h2>
76-
<!-- <p>Install and configure Magento.</p> -->
77-
<h3><a href="{{page.baseurl}}pattern-library/bk-pattern.html">Admin Design Pattern Library</a></h3>
78-
<p>Reusable design patterns provide definitions, instructions and specifications.</p>
79-
<h3><a href="{{page.baseurl}}design-styleguide/bk-styleguide.html">Admin Style Guide</a></h3>
80-
<p>Includes guidance for creators of Magento components.
81-
</p>
82-
</div>
83-
</section>
30+
<div class="feature">
31+
<img src="{{site.baseurl}}i/icons/frontend.svg" alt="" />
32+
<h2 class="title">Frontend</h2>
33+
<ul>
34+
<li><a href="{{page.baseurl}}frontend-dev-guide/bk-frontend-dev-guide.html">Frontend Developer Guide</a></li>
35+
<li><a href="{{page.baseurl}}ui_comp_guide/bk-ui_comps.html">UI Components Guide</a></li>
36+
<li><a href="{{page.baseurl}}javascript-dev-guide/bk-javascript-dev-guide.html">JavaScript Developer Guide</a></li>
37+
<li><a href="{{page.baseurl}}pattern-library/bk-pattern.html">Admin Pattern Library</a></li>
38+
</ul>
39+
</div>
40+
41+
<div class="feature">
42+
<img src="{{site.baseurl}}i/icons/release.svg" alt="" />
43+
<h2 class="title">Release Information</h2>
44+
<ul>
45+
46+
<li><a href="{{site.baseurl}}magento-release-information.html">Release Information</a></li>
47+
<li><a href="{{site.baseurl}}magento-devdocs-whatsnew.html">What's New on DevDocs</a></li>
48+
<li><a href="{{site.baseurl}}guides/v2.0/release-notes/backward-incompatible-changes-2.1.html">Backward Incompatible Changes</a></li>
49+
<li><a href="{{site.baseurl}}magento-techbull.html">Technical Bulletins</a></li>
50+
</ul>
51+
</div>
52+
53+
<div class="feature">
54+
<img src="{{site.baseurl}}i/icons/api.svg" alt="" />
55+
<h2 class="title">Magento APIs</h2>
56+
<ul>
57+
<li><a href="{{page.baseurl}}get-started/bk-get-started-api.html">Get Started with Magento APIs</a></li>
58+
<li><a href="{{page.baseurl}}rest/bk-rest.html">REST API Reference (Static)</a></li>
59+
<li><a href="{{page.baseurl}}rest/generate-local.html">REST API Reference (Local)</a></li>
60+
</ul>
61+
</div>
62+
63+
<div class="feature">
64+
<img src="{{site.baseurl}}i/icons/community.svg" alt="" />
65+
<h2 class="title">Community</h2>
66+
<ul>
67+
<li><a href="">Community Resources</a></li>
68+
<li><a href="{{page.baseurl}}contributor-guide/contributing_dod.html">Magento Definition of Done</a></li>
69+
<li><a href="{{page.baseurl}}contributor-guide/contributing.html">Contributor Guide</a></li>
70+
</ul>
71+
</div>
72+
73+
</div>
74+
</section><!-- END home-features -->
75+
76+
{% include home/contributors.html %}

‎index.html‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,7 @@
33
redirect_from: /guides/v2.1/index.html
44
---
55

6-
<section class="home-intro">
7-
<div class="container">
8-
<h1>Welcome to Magento 2 Documentation</h2>
9-
<p>Everything you need to build and manage a customized Magento store.</p>
10-
11-
<div class="search-form">
12-
<form class="input-group" action="search.html" method="get">
13-
<input type="search" name="q" placeholder="Looking for something specific?" class="form-control search-field" />
14-
<i class="search-icon"></i>
15-
<div class="input-group-btn">
16-
<button type="submit" class="btn btn-primary btn-large search-submit">Search</button>
17-
</div>
18-
</form>
19-
</div>
20-
21-
</div>
22-
</section><!-- END home-intro -->
6+
{% include home/intro.html %}
237

248
<section class="home-features">
259
<div class="container">
@@ -60,7 +44,6 @@ <h2 class="title">Frontend</h2>
6044
<img src="{{ site.baseurl }}i/icons/release.svg" alt="" />
6145
<h2 class="title">Release Information</h2>
6246
<ul>
63-
6447
<li><a href="{{site.baseurl}}magento-release-information.html">Release Information</a></li>
6548
<li><a href="{{site.baseurl}}magento-devdocs-whatsnew.html">What's New on DevDocs</a></li>
6649
<li><a href="{{site.baseurl}}guides/v2.1/release-notes/backward-incompatible-changes-2.1.html">Backward Incompatible Changes</a></li>
@@ -78,8 +61,6 @@ <h2 class="title">Magento APIs</h2>
7861
</ul>
7962
</div>
8063

81-
82-
8364
<div class="feature">
8465
<img src="{{ site.baseurl }}i/icons/community.svg" alt="" />
8566
<h2 class="title">Community</h2>

0 commit comments

Comments
 (0)