Skip to content

Commit 0992fc5

Browse files
author
stevjohnson
committed
Site maintenance (updates from Eugene), add site variables to app.css, and
install guide tweaks
1 parent dd425c3 commit 0992fc5

File tree

7 files changed

+61
-66
lines changed

7 files changed

+61
-66
lines changed

Diff for: ‎_includes/footer.html

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
1+
22
</div>
33
</div>
44
</div>
5-
5+
66

77
</div>
88
<!-- -->
@@ -15,26 +15,26 @@
1515
<div class="span3 footer-menu" id="magento-sites">
1616
<h4>OUR SITES</h4>
1717
<ul class="menu nav">
18-
<li class="first leaf"><a href="http://www.magento.com" title="Magento&#039;s Corporate Site" class="active">Magento</a><span class="description">Magento's Corporate Site</span></li>
18+
<li class="first leaf"><a href="http://magento.com/" title="Magento&#039;s Corporate Site" class="active">Magento</a><span class="description">Magento's Corporate Site</span></li>
1919
<li class="leaf"><a href="http://enterprise.magento.com" title="Enterprise-Class Platform">Enterprise Edition</a><span class="description">Enterprise-Class Platform</span></li>
2020
<li class="leaf"><a href="http://go.magento.com/" title="Small Business Storefront">Magento Go</a><span class="description">Small Business Storefront</span></li>
2121
<li class="leaf"><a href="http://www.magentocommerce.com/magento-connect/" title="Extensions Marketplace">Connect</a><span class="description">Extensions Marketplace</span></li>
22-
<li class="leaf"><a href="http://www.magento.com/resources/technical" title="Resources for Developers">Developers</a><span class="description">Resources for Developers</span></li>
23-
<li class="leaf"><a href="http://www.magento.com/partners/overview" title="Resources for Partners">Partners</a><span class="description">Resources for Partners</span></li>
24-
<li class="leaf"><a href="http://www.magento.com/training/overview" title="Courses and Developer Certification">Training</a><span class="description">Courses and Developer Certification</span></li>
22+
<li class="leaf"><a href="http://magento.com/resources/technical" title="Resources for Developers">Developers</a><span class="description">Resources for Developers</span></li>
23+
<li class="leaf"><a href="http://magento.com/partners/overview" title="Resources for Partners">Partners</a><span class="description">Resources for Partners</span></li>
24+
<li class="leaf"><a href="http://magento.com/training/overview" title="Courses and Developer Certification">Training</a><span class="description">Courses and Developer Certification</span></li>
2525
<li class="last leaf"><a href="http://imagine2015.magento.com/" title="Annual Conference">Imagine</a><span class="description">Annual Conference</span></li>
2626
</ul>
2727
</div>
28-
28+
2929
<div class="span8 offset1" id="magento-com">
3030
<div class="intro-paragraph">
31-
<a href="#"><img src="{{ site.baseurl }}i/logo-gl-footer.png" id="logo" alt="Magento an ebay inc company"></a>
31+
<a href="http://magento.com/"><img src="/i/logo-gl-footer.png" id="logo" alt="Magento an ebay inc company"></a>
3232
<h3>eCommerce platform, solutions and services<br /> to help grow your business.</h3>
3333
</div>
3434
<div class="row-fluid">
3535
<div class="span3">
3636
<h4>LEARN MORE</h4>
37-
<ul class="menu nav"><li class="first leaf"><a href="/company/overview" title="">Company</a></li><li class="leaf"><a href="/company/careers" title="">Careers</a></li><li class="leaf"><a href="http://www.magentocommerce.com/company/press-releases" title="">Press Room</a></li><li class="last leaf"><a href="/sitemap" title="">Site Map</a></li></ul> <div id="social-network">
37+
<ul class="menu nav"><li class="first leaf"><a href="http://magento.com/company/overview" title="">Company</a></li><li class="leaf"><a href="http://magento.com/company/careers" title="">Careers</a></li><li class="leaf"><a href="http://www.magentocommerce.com/company/press-releases" title="">Press Room</a></li><li class="last leaf"><a href="http://magento.com/sitemap" title="">Site Map</a></li></ul> <div id="social-network">
3838
<h4>Connect</h4>
3939
<ul>
4040
<li><a href="http://www.facebook.com/magento" target="_blank" class="btn-facebook">Magento Facebook</a></li>
@@ -90,26 +90,21 @@ <h4>GET THE LATEST NEWS</h4>
9090
</div>
9191
</div>
9292
<!-- /#footer-wrap -->
93+
9394

94-
95-
<script src="http://code.jquery.com/jquery-1.7.1.js"></script>
95+
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
9696

9797
<!-- Magento.com scripts -->
9898
<script src="{{ site.baseurl }}js/js_IkgOrrVZK1UTp2HktvFi5vo1g7b25Muyr5GoySikuic.js"></script>
9999
<script src="{{ site.baseurl }}js/js_m-zV5Ek4Owkee3MVRMcqkTW8aki0DvIJIFma7yS1xM0.js"></script>
100100
<script src="{{ site.baseurl }}js/js_Z5NZormFXt4exRfF6jg2O0wNC5okceOt7B3Hn2hqoFc.js"></script>
101101
<script src="{{ site.baseurl }}js/js_O6lYvuZQJUPSnK699QFEAm_UI3AJznTbKmq3JNA4Z-M.js"></script>
102-
<script src="{{ site.baseurl }}js/js_xPIm45Yu7K82fSuatvdEsOmXU71DqQGS-vh5dkLvpro.js"></script>
102+
<!--<script src="{{ site.baseurl }}js/js_xPIm45Yu7K82fSuatvdEsOmXU71DqQGS-vh5dkLvpro.js"></script>-->
103103

104104

105105
<!-- Docs scripts (just in case) -->
106106
<script src="{{ site.baseurl }}js/app-min.js"></script>
107107

108108

109-
<script>
110-
new UISlideform( document.getElementById( 'sb-email' ), 'email' );
111-
new UISlideform( document.getElementById( 'sb-search' ), 'search' );
112-
</script>
113-
114109
</body>
115110
</html>

Diff for: ‎_includes/header.html

+20-17
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,700,600,300,800' rel='stylesheet' type='text/css'>
1212

1313
<link rel="stylesheet" href="{{ site.baseurl }}css/app.css" />
14-
<link rel="stylesheet" href="{{ site.baseurl }}common/css/override.css" />
1514
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1615

17-
</head>
16+
</head>
1817
<body>
1918

2019
<header id="nav-main" class="nav-main">
@@ -24,24 +23,24 @@
2423
<div class="menu-btn">
2524
<a class="menu-trigger menu-icon" href="#"></a>
2625
</div>
27-
26+
2827
<div id="global-nav">
2928
<div class="main-site-name">
30-
<a class="logo pull-left" href="{{ site.baseurl }}"> </a>
31-
<div class="sub-site-name">
32-
<a href="{{ site.baseurl }}"><span>Developer Documentation</span></a>
29+
<a class="logo pull-left" href="/"> </a>
30+
<div class="sub-site-name">
31+
<a href="/"><span>Developer Documentation</span></a>
3332
</div>
3433
</div>
35-
34+
3635
<div class="right-header">
3736
<!--
3837
<div class="sales-login">
3938
<ul class="menu nav">
4039
<li class="first last leaf"><a href="https://www.magentocommerce.com/products/customer/account/login">My Account</a></li>
4140
</ul>
4241
</div>
43-
44-
42+
43+
4544
<div class="head-search" id="head-search">
4645
<div id="sb-search" class="sb-search">
4746
<form action="http://www.magentocommerce.com/search/results/">
@@ -50,20 +49,20 @@
5049
<span class="sb-search-submit btn btn-search"></span>
5150
</form>
5251
</div>
53-
</div><!-- #head-search -->
54-
52+
</div><!-- #head-search -->
53+
5554
</div>
56-
55+
5756
</div><!-- #global-nav -->
5857
</nav>
5958

6059
{% include navigation.html %}
61-
62-
</header>
60+
61+
</header>
6362

6463

6564
<div id="gl-wrapper">
66-
65+
6766
<!-- #sidemenu -->
6867
<div id="sidemenu" style="display:none;">
6968
<a class="menu-trigger menu-close" href="#" title=""></a>
@@ -80,9 +79,13 @@
8079
</ul>
8180
</div>
8281
<!-- /#sidemenu -->
83-
82+
8483
<!-- /.main-container -->
8584
<div id="gl-container" class="main-container">
8685
<a id="main-content"></a>
8786
<div class="pane-content">
88-
<div class="node node-panel">
87+
<div class="node node-panel">
88+
89+
90+
91+

Diff for: ‎_includes/navigation.html

+14-20
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,46 @@
22
<div id="subnav-wrap">
33
<div id="subnav">
44
<ul class="menu nav">
5-
<!--
6-
<li class="first expanded">
7-
<a href="{{ site.gdeurl }}release-notes/bk-release-notes.html">Get Started</a>
5+
<li class="first expanded">
6+
<a href="article-side.html">Get Started</a>
87
<ul class="menu nav">
98
<li class="first leaf"><a href="{{ site.gdeurl }}release-notes/bk-release-notes.html">Release Notes</a></li>
10-
<!~~ <li class="leaf"><a href="{{ site.gdeurl }}architecture/bk-architecture.html">Magento Architecture</a></li> ~~>
9+
<li class="leaf"><a href="{{ site.gdeurl }}architecture/bk-architecture.html">Magento Architecture</a></li>
1110
</ul>
1211
</li>
13-
-->
1412
<li class="first expanded">
15-
<a href="{{ site.gdeurl }}install-gde/bk-install-guide.html">System Administrator</a>
13+
<a href="article-side.html">System Administrator</a>
1614
<ul class="menu nav">
17-
<li class="first leaf"><a href="{{ site.gdeurl }}install-gde/m2instgde-overview.html">Installation Guide</a></li>
18-
<!-- <li class="leaf"><a href="{{ site.gdeurl }}config-guide/bk-config-guide.html"">Configuration and Integration Guide</a></li> -->
15+
<li class="first leaf"><a href="{{ site.gdeurl }}install-gde/m2instgde-overview.html">Installation and Upgrade Guide</a></li>
16+
<li class="leaf"><a href="{{ site.gdeurl }}config-guide/bk-config-guide.html"">Configuration and Integration Guide</a></li>
1917
</ul>
2018
</li>
2119
<li class="expanded">
22-
<a href="{{ site.gdeurl }}/frontend-dev-guide/bk-frontend-dev-guide.html">Frontend Developer</a>
20+
<a href="{{ site.gdeurl }}/m2fedg/">Frontend Developer</a>
2321
<ul class="menu nav">
2422
<li class="first leaf"><a href="{{ site.gdeurl }}frontend-dev-guide/bk-frontend-dev-guide.html">Frontend Developer Guide</a></li>
2523
<li class="leaf"><a href="{{ site.gdeurl }}coding-standards/bk-coding-standards.html">Coding Standards</a></li>
2624
</ul>
2725
</li>
28-
<!--
29-
<li class="first expanded">
26+
<li class="first expanded">
3027
<a href="article-side.html">System Integrator</a>
3128
<ul class="menu nav">
3229
<li class="first leaf"><a href="{{ site.gdeurl }}config-guide/bk-config-guide.html"">Configuration and Integration Guide</a></li>
3330
</ul>
3431
</li>
35-
-->
3632
<li class="expanded">
37-
<a href="{{ site.gdeurl }}dev-guide-devbeta/bk-dev-guide.html">Extension Developer</a>
33+
<a href="article-side.html">Extension Developer</a>
3834
<ul class="menu nav">
39-
<li class="first leaf"><a href="{{ site.gdeurl }}get-started/bk-get-started-api.html">Get Started with Magento Web APIs</a></li>
40-
<li class="leaf"><a href="{{ site.gdeurl }}dev-guide-devbeta/bk-dev-guide.html">Developer Guide</a></li>
35+
<li class="first leaf"><a href="{{ site.gdeurl }}get-started/bk-get-started-api.html">Get Started with Magento APIs</a></li>
36+
<li class="leaf"><a href="{{ site.gdeurl }}extension-dev-guide/bk-extension-dev-guide.html">Extension Developer Guide</a></li>
4137
<li class="leaf"><a href="{{ site.gdeurl }}coding-standards/bk-coding-standards.html">Coding Standards</a></li>
42-
<!--
43-
<li class="leaf"><a href="{{ site.baseurl }}article-side.html">PHP API Reference</a></li>
38+
<li class="leaf"><a href="{{ site.baseurl }}article-side.html">PHP API Reference</a></li>
4439
<li class="leaf"><a href="{{ site.baseurl }}article-side.html">REST API Reference</a></li>
45-
-->
46-
<!-- <li class="leaf"><a href="{{ site.baseurl }}article-side.html">SOAP API Reference</a></li> -->
40+
<li class="leaf"><a href="{{ site.baseurl }}article-side.html">SOAP API Reference</a></li>
4741
</ul>
4842
</li>
4943

5044
</ul>
51-
45+
5246
</div>
5347
</div>

Diff for: ‎_includes/sidebar.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
{% assign n = 0 %}
2626
{% for parent in parents %}
27-
<li class=" {% if page.url == parent.url %} active {%endif%}"><a class="nav-header" href="{{parent.url}}">{% if parent.menu_title %}{{parent.menu_title}}{% else %}{{parent.title}}{% endif %}</a></li>
27+
<li class=" {% if page.url == parent.url %} active {%endif%}"><a class="nav-header" href="{{site.toc_baseurl}}{{parent.url}}">{% if parent.menu_title %}{{parent.menu_title}}{% else %}{{parent.title}}{% endif %}</a></li>
2828
{% assign n = 1 %}
2929
{% endfor %}
3030

@@ -37,7 +37,7 @@
3737

3838
{% for article in articles_sorted %}
3939

40-
<li class="level-2 {% if page.url == article.url %} active {%endif%}"><a href="{{article.url}}">{% if article.menu_title %}{{article.menu_title}}{% else %}{{article.title}}{% endif %}</a></li>
40+
<li class="level-2 {% if page.url == article.url %} active {%endif%}"><a href="{{site.toc_baseurl}}{{article.url}}">{% if article.menu_title %}{{article.menu_title}}{% else %}{{article.title}}{% endif %}</a></li>
4141

4242
{% endfor %}
4343

@@ -48,7 +48,7 @@
4848

4949
{% for article in articles_sorted %}
5050

51-
<li class="{% if page.url == article.url %} active {%endif%}"><a href="{{article.url}}">{% if article.menu_title %}{{article.menu_title}}{% else %}{{article.title}}{% endif %}</a></li>
51+
<li class="{% if page.url == article.url %} active {%endif%}"><a href="{{site.toc_baseurl}}{{article.url}}">{% if article.menu_title %}{{article.menu_title}}{% else %}{{article.title}}{% endif %}</a></li>
5252

5353
{% endfor %}
5454

Diff for: ‎_plugins/page.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Page
66

77
# Full URL of the page.
88
def full_url
9-
File.join(@dir, self.url)
9+
File.join(self.url)
1010
end
1111

1212

Diff for: ‎css/app.css

+10-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎guides/v1.0/install-gde/install/verify.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ When prompted, log in as a Magento Administrator.
2929

3030
The following figure shows a sample Magento Admin page. If it displays as follows, your installation was a success!
3131

32-
<p><img src="{{ site.baseurl }}common/images/install-success_admin.png" alt="Magento Admin which verifies a successful installation"></p>
32+
<p><img src="{{ site.baseurl }}common/images/install_success_admin.png" alt="Magento Admin which verifies a successful installation"></p>
3333

3434
If the page displays unconfigured (no styles, only text), see <a href="{{ site.gdeurl }}install-gde/trouble/tshoot_no-styles.html">After installing, images and stylesheets do not load; only text displays, no graphics</a>.
3535

0 commit comments

Comments
 (0)