Skip to content

Commit cd0e72f

Browse files
author
Eugene Bannykh
committed
Video work cleanup
1 parent 4de1754 commit cd0e72f

19 files changed

+42
-277
lines changed

‎_includes/breadcrumbs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% if url.size > 0 %}
33
<nav class="breadcrumbs">
44

5-
<a class="breadcrumb-item" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{site.baseurl}}{% else %}{{page.baseurl}}{% endif %}"><span>Home</span></a>
5+
<a class="breadcrumb-item" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{ site.baseurl }}/{% else %}{{ page.baseurl }}{% endif %}"><span>Home</span></a>
66

77
<ol class="breadcrumb list-unstyled" vocab="http://schema.org/" typeof="BreadcrumbList">
88

‎_includes/footer-scripts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
22
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
3-
<script src="{{ site.baseurl }}common/js/app.min.js"></script>
3+
<script src="{{ site.baseurl }}/common/js/app.min.js"></script>
44

55
<script type="text/javascript">
66
(function() {

‎_includes/header.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,700,600,300,800' rel='stylesheet' type='text/css'>
1313

14-
<link rel="stylesheet" href="{{ site.baseurl }}css/app.css" />
15-
<link rel="stylesheet" href="{{ site.baseurl }}css/print.css" media="print" />
14+
<link rel="stylesheet" href="{{ site.baseurl }}/css/app.css" />
15+
<link rel="stylesheet" href="{{ site.baseurl }}/css/print.css" media="print" />
1616
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1717

1818
<script>
@@ -38,17 +38,17 @@
3838

3939
<div class="container">
4040

41-
<a class="logo" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{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>
41+
<a class="logo" href="{% if page.guide_version == site.version or page.guide_version == nil %}{{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 version-switcher.html %}
4444

4545
{% include navigation.html %}
4646

4747
<div class="search-btn">
48-
<a class="search-trigger search-icon" href="{{site.baseurl}}search.html"></a>
48+
<a class="search-trigger search-icon" href="{{site.baseurl}}/search.html"></a>
4949
</div>
5050

51-
<form class="quick-search" action="{{site.baseurl}}search.html" method="get">
51+
<form class="quick-search" action="{{site.baseurl}}/search.html" method="get">
5252
<input type="search" name="q" placeholder="Search" />
5353
<a href="#" class="quick-search-close">&times;</a>
5454
</form>

‎_includes/home/videos.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2>Video Tutorials</h2>
66
<div class="videos">
77
{% assign sorted_videos = (site.videos | where: 'layout', 'video' | sort: 'date') | reverse %}
88
{% for video in sorted_videos limit:3 %}
9-
{% include video-preview.html %}
9+
{% include video/preview.html %}
1010
{% endfor %}
1111
</div>
1212

‎_includes/navigation.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<li class="leaf"><a href="{{page.baseurl}}config-guide/bk-config-guide.html">Configuration Guide</a></li>
1717
<li class="leaf"><a href="{{page.baseurl}}migration/bk-migration-guide.html">Migration Guide</a></li>
1818
<li class="leaf"><a href="{{page.baseurl}}cloud/bk-cloud.html">Enterprise Cloud Edition Guide</a></li>
19-
<li class="leaf"><a href="{{site.baseurl}}magento-release-information.html">Release Information</a></li>
19+
<li class="leaf"><a href="{{site.baseurl}}/magento-release-information.html">Release Information</a></li>
2020
</ul>
2121
</li>
2222

@@ -77,7 +77,7 @@
7777
</li>
7878

7979
<li>
80-
<a href="{{site.baseurl}}videos/">Videos</a>
80+
<a href="{{site.baseurl}}/videos/">Videos</a>
8181
</li>
8282
</ul>
8383
</div><!-- /.nav-main -->

‎_includes/page-author.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎_includes/page-tags.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎_includes/video-preview.html renamed to ‎_includes/video/preview.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@
66
</span>
77
<span class="title">{{ video.title }}</span>
88
</a>
9-
10-
<div class="author">{{ video.author }}</div>
119
</div>

‎_layouts/video.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<div class="sidebar-wrapper">
88

99
<ul>
10+
<li class="level-1"><a href="{{ site.baseurl }}/videos/">All Videos</a></li>
1011
<h4><span class="playlist-name">Playlist</span> {{ page.group }}</h4>
1112
{% assign videos = (site.videos | where: 'group', page.group | where: 'layout', 'video' | sort: 'menu_order' ) %}
1213

@@ -35,10 +36,8 @@ <h4><span class="playlist-name">Playlist</span> {{ page.group }}</h4>
3536
</div>
3637
</div>
3738

38-
<div class="page-meta">
39-
{% include page-author.html %}
40-
{% include page-tags.html %}
41-
</div>
39+
{{page.baseurl}}
40+
4241

4342
{{ content }}
4443

‎_layouts/videos.html

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="sidebar-wrapper">
88

99
<ul>
10-
<li class="level-1 {% if page.url == '/videos/' %}active{% endif %}"><a href="{{ site.baseurl }}videos/">All Videos</a></li>
10+
<li class="level-1 {% if page.url == '/videos/' %}active{% endif %}"><a href="{{ site.baseurl }}/videos/">All Videos</a></li>
1111

1212
<li class=""><span class="nav-header">Playlists</span></li>
1313

@@ -19,53 +19,21 @@
1919
{% assign url_parts_size = url_parts | size %}
2020
{% assign rm = url_parts[2] %}
2121

22-
<li class="level-1 {% if playlist.name == page.group %}active{% endif %}"><a href="{{site.baseurl}}videos/{{ rm }}/">{{ playlist.name }} <i class="item-count">{{ playlist.items.size }} videos</i></a></li>
22+
<li class="level-1 {% if playlist.name == page.group %}active{% endif %}"><a href="{{site.baseurl}}/videos/{{ rm }}/">{{ playlist.name }} <i class="item-count">{{ playlist.items.size }} videos</i></a></li>
2323
{% endif %}
2424
{% endfor %}
2525

26-
<!--
27-
<li class=""><span class="nav-header">Authors</span></li>
28-
{% assign authors = (site.videos | where: 'layout', 'video' | group_by: 'author' | sort: 'author') | reverse %}
29-
{% for author in authors %}
30-
{% if author.name.size > 0 %}
31-
{% assign auth = site.data.people[author.name] %}
32-
33-
<li class="level-1 {% if playlist.items[0].author == page.author %}active{% endif %}"><a href="{{ auth.url }}">{{ auth.name }} <i class="item-count">{{ author.items.size }} videos</i></a></li>
34-
{% endif %}
35-
{% endfor %}
36-
37-
38-
<!--
39-
<li class=""><span class="nav-header">Tags</span></li>
40-
<li class="tags">
41-
{% for tag in site.site_tags %}
42-
<a href="{{tag.url}}" class="tag tag-default">{{ tag.title }}</a>
43-
{% endfor %}
44-
</li>-->
45-
4626
</ul>
4727

4828
</div>
4929
</aside>
5030

51-
52-
5331
<section class="content">
5432
<div class="content-wrap">
5533

5634
{% include page-header.html %}
5735
{{ content }}
5836

59-
<!--
60-
<div class=" dropdown">
61-
<button class="btn dropdown-toggle" data-toggle="dropdown">Most Recent</button>
62-
<ul class="dropdown-menu dropdown-menu-left">
63-
<li><a class="dropdown-item" href="">Most Popular</a></li>
64-
<li><a class="dropdown-item" href="" >Most Recent</a></li>
65-
</ul>
66-
</div>-->
67-
68-
6937
{% assign sorted_videos = (site.videos | where: 'layout', 'video' | sort: 'date') | reverse %}
7038
{% if page.group != nil %}
7139
{% assign sorted_videos = (sorted_videos | where: 'group', page.group | sort: 'menu_order') %}
@@ -75,7 +43,7 @@
7543
{% endif %}
7644
<div class="videos">
7745
{% for video in sorted_videos %}
78-
{% include video-preview.html %}
46+
{% include video/preview.html %}
7947
{% endfor %}
8048
</div>
8149

0 commit comments

Comments
 (0)