Skip to content

Commit

Permalink
add encrypt function
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamling committed Sep 23, 2016
1 parent 0751527 commit aaba26c
Show file tree
Hide file tree
Showing 19 changed files with 225 additions and 113 deletions.
16 changes: 7 additions & 9 deletions _config.yml
Expand Up @@ -58,10 +58,10 @@ post_widgets:
- ds_hot
- ds_recent_comments
- links

# TODO fetch widgets use ajax, widgets e.g. tag, archive, is sample in all pages.
# used ajax to get widget_xxx contents dynamicly to avoid change all pages.
#
#
post_widgets_ajax: true
post_widgets_show_count: true
post_widgets_recent_count: 5
Expand Down Expand Up @@ -95,11 +95,10 @@ toc:
page: true
# donate
donate:
data_url: http://ot.ieclipse.cn/ot/index.php/Home/Donate/index
enable: true # whether enable page donate

# github removed see hexo-generator-github.

##评论功能设置,目前支持disqus、多说和友言
comments:
enable: true
Expand All @@ -125,12 +124,12 @@ share:
uid: 2064663
## 站点分析统计代码功能组件,本主题提供了google统计和baidu统计
analytics:
enable: false #
enable: false #
using: baidu
baidu:
baidu:
id: d028209965ae024527844754f50cbd94
google:
id:
id:

## search
search:
Expand Down Expand Up @@ -164,4 +163,3 @@ layout:
d: #donates
main: col-sx-12 col-sm-8 col-md-9 col-lg-9
top: col-sx-6 col-sm-4 col-md-3 col-lg-3

3 changes: 3 additions & 0 deletions languages/en.yml
Expand Up @@ -25,6 +25,9 @@ page:
blog: Blog
language: Language
written_on: 'Post at: '
visits: 'Site Visits: '
password_tip: 'Please input password to view this page'
password_error: 'Error password, you have no right to view the content!'

article:
views: Views
Expand Down
11 changes: 7 additions & 4 deletions languages/zh.yml
Expand Up @@ -25,6 +25,9 @@ page:
blog: 文章
language: 语言
written_on: 发表于
visits: '本站访问数:'
password_tip: '本页面需要输入密码才能访问'
password_error: '密码错误,无法访问!'

article:
views: 次阅读
Expand Down Expand Up @@ -52,7 +55,7 @@ category:
label: *category.name
empty: 暂无分类
loading: 分类加载中...

archive:
name: &archive.name 归档
empty: 暂无文章
Expand All @@ -72,7 +75,7 @@ widget:
ajax:
loading: 正在载入...
error: 加载失败

hljs:
left: 代码
right: '如下:'
Expand All @@ -86,7 +89,7 @@ menu:
archive: *archive.name
about: 关于
donate: 捐赠墙

donate:
name: 捐赠
page: # page / post / article
Expand Down Expand Up @@ -114,4 +117,4 @@ hexo-theme-nova:
layouts: 布局
helpers: 辅助函数
front-matter: Front-matter
plugins: 插件
plugins: 插件
48 changes: 10 additions & 38 deletions layout/index.swig
@@ -1,38 +1,10 @@
<div class="container container-fluid">
<div class="row">
<div class="{{theme.layout.index.main}}">
{% if is_home() %}
{{ partial('post/index') }}
{% elseif is_archive() || is_category() || is_tag() %}
{{ partial('post/archive') }}
{% elseif is_post() %}
{% set show_toc = theme.toc.post || page.toc %}
{{ partial('post/post', {post: page}) }}
{% endif %}
</div>
<!-- aside -->
<div class="{{theme.layout.index.widgets}}">
<aside>
{%- if show_toc %}
<!-- toc -->
{% else %}
{% for widget in theme.post_widgets %}
{{ partial('post/widget_' + widget) }}
{% endfor %}
{%- endif %}
</aside>
</div>
</div>
</div>
<!--多说js加载开始,一个页面只需要加载一次 -->
<script type="text/javascript">
var duoshuoQuery = {short_name:"{{theme.comments.duoshuo.short_name}}"};
(function() {
var ds = document.createElement('script');
ds.type = 'text/javascript';ds.async = true;
ds.src = 'http://static.duoshuo.com/embed.js';
ds.charset = 'UTF-8';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ds);
})();
</script>
<!--多说js加载结束,一个页面只需要加载一次 -->
{%- extends 'post.swig' %}
{%- block page-widget %}
{%- for widget in theme.post_widgets %}
{{ partial('post/widget_' + widget) }}
{%- endfor %}
{%- endblock %}

{%- block page-suffix %}
{% parent %}
{%- endblock %}
2 changes: 1 addition & 1 deletion layout/layout.swig
Expand Up @@ -42,4 +42,4 @@
{{ partial('partial/baidu_search_script') }}
{{ partial('partial/lc') }}
</body>
</html>
</html>
6 changes: 3 additions & 3 deletions layout/page.swig
Expand Up @@ -4,11 +4,11 @@
<div class="container container-fluid">
<div class="row">
<div class="{{theme.layout.page.main}}">
{{ partial('./page/article') }}
</div>
{{ partial('./page/article', {layout_type: 'page'}) }}
</div><!-- end main column -->
<div class="{{theme.layout.page.toc}}">
{{ partial('./partial/toc') }}
</div>
</div><!-- end aside -->
</div><!-- end row -->
</div>
{%- endif %}
8 changes: 5 additions & 3 deletions layout/page/article.swig
@@ -1,19 +1,21 @@
<article class="article page" itemscope="itemscope" itemtype="http://schema.org/Article">
{{ page_encrypt(page, {dom:'.article-content'}) }}
<article class="article {{layout_type}}" itemscope="itemscope" itemtype="http://schema.org/Article">
<header class="article-header">
{% block article-header %}
{%- block article-header %}
<h1 class="article-title" itemprop="name headline">
{{ page_title() }}
{%- if page.gh %}
<a href="{{ gh_edit(page.gh) }}" class="article-edit-link" title="{{ __('page.improve') }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
{%- endif %}
</h1>
{% endblock %}
{%- endblock %}
<meta content="{{ date_xml(page.date) }}" itemprop="datePublished">
</header>
<div class="article-content" itemprop="articleBody">
{% block content %}
{{ page.content }}
{% endblock %}
{{js('/js/decrypt.min.js')}}
</div>
<footer class="article-footer">
<time class="article-footer-updated" datetime="{{ date_xml(page.updated) }}" itemprop="dateModified">
Expand Down
4 changes: 4 additions & 0 deletions layout/page/resume.swig
@@ -1,6 +1,10 @@
{{ page_encrypt(page, {dom:'.page-body', src:'/js/encrypt.min.js'}) }}
<div class="page-body">
{% block content %}
{{ page.content }}
{% endblock %}
</div>
{{js('/js/decrypt.min.js')}}

<div class="container">
<div style="margin: 1em 0">
Expand Down
5 changes: 4 additions & 1 deletion layout/partial/footer.swig
Expand Up @@ -4,7 +4,10 @@
<div class="inner text-center">
<div id="footer-copyright">
&copy; {{ moment(Date.now()).year() }} <a href="{{ config.url }}" target="_blank">{{ config.author }}</a> powered by <a href="http://hexo.io" target="_blank">Hexo</a> Theme <a href="https://github.com/Jamling/hexo-theme-nova" target="_blank">Nova</a><br>
Documentation licensed under <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC BY 4.0</a>.
<!-- Documentation licensed under <a href="http://creativecommons.org/licenses/by/4.0/" target="_blank">CC BY 4.0</a>. -->
{%- if is_home() %}
{{__('page.visits')}}<span class="lc-count"></span>
{%- endif %}
</div>
<div>
<a href="http://www.miitbeian.gov.cn" target="_blank">{{theme.icp}}</a>
Expand Down
9 changes: 6 additions & 3 deletions layout/partial/lc.swig
Expand Up @@ -12,7 +12,7 @@
url : '{{page.permalink}}' || '{{page.path}}',
title : '{{page_title()}}'
};

var lc_table = '{{theme.lc.class}}' || 'Counter';

(function() {
Expand Down Expand Up @@ -67,9 +67,12 @@
console.log(error);
});
}

function show(data) {
$(".post-share .nova-eye .count").html(data.get('views'));
$(".lc-count").html(data.get('views'));
}
function show_count(count) {
$(".lc-count").html(count);
}
})();
</script>
Expand Down
25 changes: 15 additions & 10 deletions layout/post.swig
Expand Up @@ -2,22 +2,27 @@
<div class="container container-fluid">
<div class="row">
<div class="{{theme.layout.index.main}}">
{% if is_home() %}
{%- block page-main %}
{%- if is_home() %}
{{ partial('post/index') }}
{% elseif is_archive() || is_category() || is_tag() %}
{%- elseif is_archive() || is_category() || is_tag() %}
{{ partial('post/archive') }}
{% elseif is_post() %}
{% set show_toc = theme.toc.post && page.toc %}
{{ partial('post/article', {post: page}) }}
{% endif %}
</div>
{%- elseif is_post() %}
{{ partial('post/article', {layout_type: 'post'}) }}
{%- endif %}
{%- endblock %}
</div> <!-- end main column -->
<!-- aside -->
<div class="{{theme.layout.index.widgets}}">
<aside>
{%- block page-widget %}
{%- if page_toc() %}
{{ partial('./partial/toc', {style: theme.layout.index.widgets}) }}
{%- endif %}
{%- endblock %}
</aside>
</div>
</div>
</div>
</div> <!-- end aside column -->
</div> <!-- end row -->
</div> <!-- end container -->
{%- block page-suffix %}
{%- endblock %}
40 changes: 7 additions & 33 deletions layout/post/article.swig
@@ -1,45 +1,19 @@
<article class="article post" itemscope="itemscope" itemtype="http://schema.org/Article">
<header class="article-header">
<div class="page-path"><span class="post-category">{{ page_path(post)}}</span></div>
{%- extends '../page/article.swig' %}
{%- block article-header %}
<div class="page-path"><span class="post-category">{{ page_path(page)}}</span></div>
<div class="divider"></div>
{%- if is_post() %}
<h1 class="article-title" itemprop="name">{{ post.title }}</h1>
{%- else %}
<h1>
<a href="{{ url_for_lang(post.path) }}" class="article-title" itemprop="name headline">{{ post.title }}</a>
</h1>
{%- endif %}
<h1 class="article-title" itemprop="name headline">{{ post.title }}</h1>
<div class="post-header clearfix">
<span class="post-date"><span class="hidden-xs icon nova-calendar">{{__('page.written_on')}}</span>
<time datetime="{{ date_xml(post.date) }}" itemprop="datePublished">{{ time_tag(post.date) }}</time>
<time datetime="{{ date_xml(page.date) }}" itemprop="datePublished">{{ time_tag(page.date) }}</time>
</span>
{{ post_tags(post) }}
<span class="post-share">
<a href="#share" class="icon nova-share"><span class="hidden-xs">{{__('sns.share')}}</span><span class="jiathis_counter_style"></span></a>
<a href="#comment" class="icon nova-bubbles"><span class="ds-thread-count" data-thread-key="{{page_uid()}}"></span><!-- <span class="hidden-xs">{{__('sns.comment')}}</span> --></a>
<a href="#like" class="icon nova-heart2-full"><span class="count"></span><span class="hidden-xs">{{__('sns.like')}}</span></a>
<a href="#" class="icon nova-eye"><span class="count"></span><span class="hidden-xs">{{__('article.views')}}</span></a>
<a href="#" class="icon nova-eye"><span class="count lc-count"></span><span class="hidden-xs">{{__('article.views')}}</span></a>
</span>
</div>
<div class="divider"></div>
</header>
<div class="article-content" itemprop="articleBody" id="post-content">
{{ post.content }}
</div>
<footer class="article-footer">
<time class="article-footer-updated" datetime="{{ date_xml(page.updated) }}" itemprop="dateModified">
{{__('page.last_updated', '') }} <span class="{%- if page_new() %}red-text{%- endif %}">{{date(page.updated)}}</span>
</time>
{{ partial('../partial/share_jiathis_footer') }}
</footer>
<span itemprop="author publisher" itemscope="itemscope" itemtype="http://schema.org/Organization">
<meta content="{{ config.url }}" itemprop="url">
<meta content="{{__('site.title')}}" itemprop="name">
<meta content="/image/logo.png" itemprop="logo">
</span>
</article>
<div>
<nav>{{ nova_paginator2({show_name: true}) }}</nav>
{{ partial('../partial/donate') }}
{{ partial('../partial/comment') }}
</div>
{%- endblock %}
23 changes: 19 additions & 4 deletions layout/post/index.swig
@@ -1,3 +1,4 @@

<div itemscope="itemscope" itemtype="http://schema.org/Blog" style="display: none;">
<meta content="{{__(site.name) }}" itemprop="name"/>
</div>
Expand All @@ -10,7 +11,7 @@
<div class="section post-header clearfix">
<!-- sub element must be span -->
<span class="post-date"><time class="icon nova-calendar" itemprop="datePublished" datetime="{{ date_xml(post.date) }}">{{ time_tag(post.date) }}</time></span>
{{ post_cates(post) }}
{{ post_cates(post) }}
{{ post_tags(post) }}
</div>
<div class="divider"></div>
Expand All @@ -24,9 +25,23 @@
<meta content="{{ date_xml(post.updated) }}" itemprop="dateModified">
</div>
{%- endfor %}


</main>
<nav> {{ nova_paginator({total:page.total, class:'pagination'}) }} </nav>

{{partial('index_share_jiathis')}}

{{partial('index_script_ds')}}
{{partial('index_script_lc')}}
{{partial('index_script_lc')}}

<!--多说js加载开始,一个页面只需要加载一次 -->
<script type="text/javascript">
var duoshuoQuery = {short_name:"{{theme.comments.duoshuo.short_name}}"};
(function() {
var ds = document.createElement('script');
ds.type = 'text/javascript';ds.async = true;
ds.src = 'http://static.duoshuo.com/embed.js';
ds.charset = 'UTF-8';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ds);
})();
</script>
<!--多说js加载结束,一个页面只需要加载一次 -->
2 changes: 1 addition & 1 deletion layout/post/index_action_ds.swig
Expand Up @@ -5,4 +5,4 @@
<a class="icon nova-heart2-full action-item fancybox.ajax" onclick="javascript:ds_vote(this, '.card-action', 1, '{{ url_for_lang(post.path) }}#comment')"><span class="count"></span><span class="hidden-xs">{{__('sns.like')}}</span></a>
<a class="icon nova-eye action-item" href="{{ url_for_lang(post.path) }}"><span class="count"></span><span class="hidden-xs">{{__('article.views')}}</span></a>
<a class="icon nova-hand-right action-item" href="{{ url_for_lang(post.path) }}" ><span>{{__('page.more')}}</span></a>
</div>
</div>

0 comments on commit aaba26c

Please sign in to comment.