Skip to content

Commit 30576b7

Browse files
zhwangartzhwangart
authored
Merge pull request #47 from zhwangart/develop
MIIT ICP/IP/DOMAIN
2 parents fb40f89 + bbbe718 commit 30576b7

22 files changed

Lines changed: 204 additions & 192 deletions

‎LICENSE‎

100644100755
File mode changed.

‎_config.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ ocean:
2121
# Content
2222
excerpt_link: Read More...
2323

24+
# MIIT ICP/IP/DOMAIN
25+
beian:
26+
enable: true
27+
number: 京ICP备17054916号-2
28+
url: https://beian.miit.gov.cn/
29+
2430
# Tags
2531
show_count: false
2632

‎layout/_partial/after-footer.ejs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
<%- js('/js/lazyload.min') %>
44
<%- js('/js/busuanzi-2.3.pure.min') %>
55
<% if (theme.fancybox){ %>
6-
<%- js('fancybox/jquery.fancybox.min') %>
6+
<%- js('fancybox/jquery.fancybox.min') %>
77
<% } %>
88

99
<% if (theme.toc && is_post()){ %>
10-
<%- js('/js/tocbot.min') %>
11-
<script>
12-
// Tocbot_v4.7.0 http://tscanlin.github.io/tocbot/
13-
tocbot.init({
14-
tocSelector: '.tocbot',
15-
contentSelector: '.article-entry',
16-
headingSelector: 'h1, h2, h3, h4, h5, h6',
17-
hasInnerContainers: true,
18-
scrollSmooth: true,
19-
positionFixedSelector: '.tocbot',
20-
positionFixedClass: 'is-position-fixed',
21-
fixedSidebarOffset: 'auto',
22-
});
23-
</script>
10+
<%- js('/js/tocbot.min') %>
11+
<script>
12+
// Tocbot_v4.7.0 http://tscanlin.github.io/tocbot/
13+
tocbot.init({
14+
tocSelector: '.tocbot',
15+
contentSelector: '.article-entry',
16+
headingSelector: 'h1, h2, h3, h4, h5, h6',
17+
hasInnerContainers: true,
18+
scrollSmooth: true,
19+
positionFixedSelector: '.tocbot',
20+
positionFixedClass: 'is-position-fixed',
21+
fixedSidebarOffset: 'auto',
22+
});
23+
</script>
2424
<% } %>
2525

26-
<%- js('js/ocean') %>
26+
<%- js('js/ocean') %>

‎layout/_partial/archive-post.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<%- partial('post/title', {class_name: 'archive-article-title'}) %>
66
</header>
77
<% if(page.category){ %>
8-
<%- partial('post/category') %>
8+
<%- partial('post/category') %>
99
<% } %>
1010
<% if(page.tag){ %>
11-
<%- partial('post/tag') %>
11+
<%- partial('post/tag') %>
1212
<% } %>
1313
</div>
1414
</article>

‎layout/_partial/archive.ejs‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<section class="outer">
2-
<article class="articles">
3-
<%
2+
<article class="articles">
3+
<%
44
var title = '';
55
if (page.category) title = page.category;
66
if (page.tag) title = "#" + "&nbsp" + page.tag;
@@ -9,41 +9,42 @@
99
else title = __('archive_a');
1010
}
1111
%>
12-
<h1 class="page-type-title"><%- title %></h1>
13-
<% if (pagination == 2){ %>
14-
<% page.posts.each(function(post){ %>
15-
<%- partial('article', {post: post, index: true}) %>
16-
<% }) %>
17-
</article>
18-
<% } else { %>
19-
<% var last; %>
20-
<% page.posts.each(function(post, i){ %>
21-
<% var year = post.date.year(); %>
22-
<% if (last != year){ %>
23-
<% if (last != null){ %>
24-
</div></div>
25-
<% } %>
26-
<% last = year; %>
27-
<div class="archives-wrap">
28-
<div class="archive-year-wrap">
29-
<a href="<%- url_for(config.archive_dir + '/' + year) %>" class="archive-year"><%= year %></a>
30-
</div>
31-
<div class="archives">
32-
<% } %>
33-
<%- partial('archive-post', {post: post, even: i % 2 == 0}) %>
34-
<% }) %>
35-
<% if (page.posts.length){ %>
36-
</div>
37-
</div>
12+
<h1 class="page-type-title"><%- title %></h1>
13+
<% if (pagination == 2){ %>
14+
<% page.posts.each(function(post){ %>
15+
<%- partial('article', {post: post, index: true}) %>
16+
<% }) %>
17+
</article>
18+
<% } else { %>
19+
<% var last; %>
20+
<% page.posts.each(function(post, i){ %>
21+
<% var year = post.date.year(); %>
22+
<% if (last != year){ %>
23+
<% if (last != null){ %>
24+
</div>
25+
</div>
26+
<% } %>
27+
<% last = year; %>
28+
<div class="archives-wrap">
29+
<div class="archive-year-wrap">
30+
<a href="<%- url_for(config.archive_dir + '/' + year) %>" class="archive-year"><%= year %></a>
31+
</div>
32+
<div class="archives">
3833
<% } %>
39-
<% } %>
40-
41-
<% if (page.total > 1){ %>
42-
<nav class="page-nav">
43-
<%- paginator({
34+
<%- partial('archive-post', {post: post, even: i % 2 == 0}) %>
35+
<% }) %>
36+
<% if (page.posts.length){ %>
37+
</div>
38+
</div>
39+
<% } %>
40+
<% } %>
41+
42+
<% if (page.total > 1){ %>
43+
<nav class="page-nav">
44+
<%- paginator({
4445
prev_text: __('prev'),
4546
next_text: __('next')
4647
}) %>
47-
</nav>
48-
<% } %>
49-
</section>
48+
</nav>
49+
<% } %>
50+
</section>

‎layout/_partial/footer.ejs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
<%- partial('post/busuanzi') %>
55
</div>
66
<ul class="list-inline">
7-
<li>&copy; <%= date(new Date(), 'YYYY') %> <%= config.title %></li>
7+
<li><%= config.title %> &copy; <%= date(new Date(), 'YYYY') %></li>
8+
<% if (theme.beian){ %>
9+
<li><%- theme.beian.number %></li>
10+
<% } %>
811
<li><%= __('powered_by') %> <a href="http://hexo.io/" target="_blank">Hexo</a></li>
9-
<li><%= __('Theme ') %> <a href="https://github.com/zhwangart/hexo-theme-ocean">Ocean</a></li>
12+
<li><%= __('theme ') %> <a href="https://github.com/zhwangart/hexo-theme-ocean">Ocean</a></li>
1013
</ul>
1114
</div>
12-
</footer>
15+
</footer>

‎layout/_partial/head.ejs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
34
<head>
45
<meta charset="utf-8">
56
<%
@@ -19,26 +20,26 @@
1920
}
2021
%>
2122
<% if (page.keywords){ %>
22-
<meta name="keywords" content="<%= page.keywords %>,<%= config.keywords %>">
23+
<meta name="keywords" content="<%= page.keywords %>,<%= config.keywords %>">
2324
<% } else if (config.keywords){ %>
24-
<meta name="keywords" content="<%= config.keywords %>">
25+
<meta name="keywords" content="<%= config.keywords %>">
2526
<% } %>
2627
<% if (page.description){ %>
27-
<meta name="description" content="<%= page.description %>">
28+
<meta name="description" content="<%= page.description %>">
2829
<% } else if (config.description){ %>
29-
<meta name="description" content="<%= config.description %>">
30+
<meta name="description" content="<%= config.description %>">
3031
<% } %>
3132
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
3233
<title>
3334
<% if (title){ %><%= title %> |
3435
<% } %>
3536
<%= config.title %></title>
3637
<% if (theme.favicon){ %>
37-
<link rel="shortcut icon" href="<%- theme.favicon %>">
38+
<link rel="shortcut icon" href="<%- theme.favicon %>">
3839
<% } %>
3940
<%- css('css/style') %>
4041
<% if (theme.fancybox){ %>
41-
<%- css('fancybox/jquery.fancybox.min') %>
42+
<%- css('fancybox/jquery.fancybox.min') %>
4243
<% } %>
4344
<%- js('/js/pace.min.js') %>
44-
</head>
45+
</head>

‎layout/_partial/ocean.ejs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<section class="jumbotron">
22
<div class="video">
33
<% if (theme.ocean.overlay) { %>
4-
<div class="video-frame">
5-
<img src="<%- theme.ocean.path %>overlay-hero.png" alt="Decorative image frame">
6-
</div>
4+
<div class="video-frame">
5+
<img src="<%- theme.ocean.path %>overlay-hero.png" alt="Decorative image frame">
6+
</div>
77
<% } %>
88
<div class="video-media">
9-
<video playsinline="" autoplay="" loop="" muted="" data-autoplay=""
10-
poster="<%- theme.ocean.path %>ocean.png" x5-video-player-type="h5">
9+
<video playsinline="" autoplay="" loop="" muted="" data-autoplay="" poster="<%- theme.ocean.path %>ocean.png"
10+
x5-video-player-type="h5">
1111
<source src="<%- theme.ocean.path %>ocean.mp4" type="video/mp4">
1212
<source src="<%- theme.ocean.path %>ocean.ogv" type="video/ogg">
1313
<source src="<%- theme.ocean.path %>ocean.webm" type="video/webm">
@@ -24,4 +24,4 @@
2424
<a class="anchor" href="#landingpage"><i class="fe fe-mouse"></i></a>
2525
</div>
2626
</div>
27-
</section>
27+
</section>

‎layout/_partial/post/albums.ejs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<% if (post.albums && post.albums.length){ %>
2-
<div class="article-albums">
3-
<ul class="article-albums-photos" id="basicExample">
4-
<% post.albums.forEach(function(photo){ %>
2+
<div class="article-albums">
3+
<ul class="article-albums-photos" id="basicExample">
4+
<% post.albums.forEach(function(photo){ %>
55
6-
<li class="article-albums-item" data-scroll-reveal>
7-
<a class="article-albums-img fancybox" data-fancybox="images" data-caption="<%- photo[1] %>" href="<%- url_for(photo[0]) %>" rel="gallery_<%= post._id %>" title="<%- photo[1] %>">
8-
<img class="lazy" data-original="<%- url_for(photo[0]) %>" itemprop="image" alt="<%- photo[1] %>">
9-
</a>
10-
<% if (photo && photo.length > 1){ %>
11-
<span class="article-albums-caption"> <%- photo[1] %> </span>
12-
<% } %>
13-
</li>
6+
<li class="article-albums-item" data-scroll-reveal>
7+
<a class="article-albums-img fancybox" data-fancybox="images" data-caption="<%- photo[1] %>"
8+
href="<%- url_for(photo[0]) %>" rel="gallery_<%= post._id %>" title="<%- photo[1] %>">
9+
<img class="lazy" data-original="<%- url_for(photo[0]) %>" itemprop="image" alt="<%- photo[1] %>">
10+
</a>
11+
<% if (photo && photo.length > 1){ %>
12+
<span class="article-albums-caption"> <%- photo[1] %> </span>
13+
<% } %>
14+
</li>
1415
15-
<% }) %>
16-
</ul>
17-
</div>
18-
<% } %>
16+
<% }) %>
17+
</ul>
18+
</div>
19+
<% } %>

‎layout/_partial/post/busuanzi.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ul class="list-inline">
22
<% if (is_home()) { %>
3-
<li><i class="fe fe-bar-chart"></i> <span id="busuanzi_value_site_pv"></span></li>
3+
<li><i class="fe fe-bar-chart"></i> <span id="busuanzi_value_site_pv"></span></li>
44
<%} %>
5-
<li><i class="fe fe-smile-alt"></i> <span id="busuanzi_value_site_uv"></span></li>
5+
<li><i class="fe fe-smile-alt"></i> <span id="busuanzi_value_site_uv"></span></li>
66
<% if (is_post()) { %>
7-
<li><i class="fe fe-bookmark"></i> <span id="busuanzi_value_page_pv"></span></li>
7+
<li><i class="fe fe-bookmark"></i> <span id="busuanzi_value_page_pv"></span></li>
88
<%} %>
99
</ul>

0 commit comments

Comments
 (0)