jekyll-zeta 0.2.2 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b9dbf62f231ca86fe64536b01115c609cd313c292538ca94ed2e0761720a7732
4
- data.tar.gz: 07d0db9c09878e5e34c057000774cf6aacf72bf55a3d90768cc6837aeb4d6078
3
+ metadata.gz: 9683fa4b37ae0f5306ed3c6bd8dc592f0085335201e433d897511c67e036bbdf
4
+ data.tar.gz: a6813f0ee9f521e83e88e432c81ef1390a83031017df823ca846ee4a7f00d02e
5
5
  SHA512:
6
- metadata.gz: 7c9abf354f1fc44b07047a407f1a5f50bba3fd9b6fe21443940f90bf53b36de99edd829bc83a3a5dfbf894eccf144cddf0ca2533dcf28e8798d0fadbc9c2fdc5
7
- data.tar.gz: a0d198d7edf174c235cda5d5c830e92670721e96ea15b42d399d2241916bad99ce0071752cf767f5185179beacc6af054a58b7db15e15cd330e5c6b448760933
6
+ metadata.gz: 56afd836f18efc248946fa07ef2032d6749dabeb8293ab80eea26d9939ae753705fe55f45428febba6615e31d5c71c2d0b6e75a551dd4192e63417cfc35b38ef
7
+ data.tar.gz: 18028b9de68fe329bf52ecbed64483dd4baa61e6f3e724cf4ff497fad318d84912ba2c659355c141db9e82f342ad4299b4b6a1b997be8ab4906447fb3671346e
data/_config.yml CHANGED
@@ -29,15 +29,17 @@ theme_config:
29
29
  archive_title_date_format: "%m-%d"
30
30
  tags_layout_style: 'auto' # flat auto list
31
31
  combine_css_html: false
32
- show_more_text: 'Show more...'
32
+ show_more_text: 'show more ...'
33
+ next_page_title: "next"
34
+ previous_page_title: "previous"
33
35
  menu:
34
- - title: 主页
36
+ - title: Home
35
37
  url: /
36
- - title: 归档
38
+ - title: Achive
37
39
  url: /archive.html
38
- - title: 标签
40
+ - title: Tags
39
41
  url: /tags.html
40
- - title: 关于
42
+ - title: About
41
43
  url: /about.html
42
44
 
43
45
  #
@@ -45,10 +47,12 @@ theme_config:
45
47
 
46
48
 
47
49
 
48
-
50
+ paginate: 7
51
+ paginate_path: "/pages/p:num/"
49
52
 
50
53
  plugins:
51
54
  - no-style-please2-plugins
55
+ - jekyll-paginate
52
56
  # - jekyll-seo-tag
53
57
 
54
58
 
@@ -0,0 +1,31 @@
1
+
2
+ {%-assign posts = include.collection -%}
3
+ {%- if posts.size > 0 -%}
4
+
5
+ {% assign ymPre = "" %}
6
+ {% assign archive_date_format = site.theme_config.archive_date_format | default: "%Y" %}
7
+
8
+ {% assign archive_date_titleformat = site.theme_config.archive_title_date_format | default: "%m-%d" %}
9
+
10
+ <ul class="postlistul">
11
+ {%- for post in posts limit: include.limit -%}
12
+ {% assign ymCur = post.date | date: archive_date_format %}
13
+ {% if ymCur != ymPre %}
14
+ {% if ymPre != "" %}
15
+ </ul>
16
+ {% endif %}
17
+ <li class="postlistli"><h2>{{ymCur}}</h2></li>
18
+ <ul class="postlistul">
19
+ {% endif %}
20
+ {% assign ymPre = ymCur %}
21
+
22
+ <li class="postlistli">
23
+ <a href="{{ post.url | relative_url }}">{{ post.title | downcase }}</a>
24
+ <date datetime="{{post.date}}">{{- post.date | date: archive_date_titleformat }}</date>
25
+ </li>
26
+
27
+ {%- endfor -%}
28
+ </ul>
29
+ {%- endif -%}
30
+
31
+
@@ -1,5 +1,5 @@
1
- {%-if include.category-%}
2
- {%-assign posts = site.categories[include.category]-%}
1
+ {%-if include.collection-%}
2
+ {%-assign posts = include.collection-%}
3
3
  {%-else-%}
4
4
  {%-assign posts = site.posts-%}
5
5
  {%-endif-%}
@@ -19,7 +19,7 @@
19
19
  </li>
20
20
  {%- endfor -%}
21
21
  {%- if include.show_more and limit_exceeded -%}
22
- <li class="postlistli"><a href="{{ include.show_more_url }}">{{ include.show_more_text | default: "Show more..." }}</a></li>
22
+ <li class="postlistli"><a href="{{ include.show_more_url | relative_url }}">{{ include.show_more_text | default: "Show more..." }}</a></li>
23
23
  {%- endif -%}
24
24
  </ul>
25
25
  {%- endif -%}
@@ -4,35 +4,14 @@ layout: default
4
4
 
5
5
  {%-include back_link.html-%}
6
6
 
7
- <h1>{{ page.title }}</h1>
7
+ <h2>{{ page.title }}</h2>
8
8
 
9
9
 
10
10
  {%-assign posts = site.posts-%}
11
11
  {%- if posts.size > 0 -%}
12
-
13
- {% assign ymPre = "" %}
14
- {% capture archive_date_format %} {{ site.theme_config.archive_date_format | default: "%Y"}}{% endcapture %}
15
-
16
- {% capture archive_date_titleformat %} {{ site.theme_config.archive_title_date_format | default: "%m-%d"}}{% endcapture %}
17
- <ul class="postlistul">
18
- {%- for post in posts limit: include.limit -%}
19
- {% capture ymCur %} {{post.date | date: archive_date_format}} {% endcapture %}
20
- {% if ymCur != ymPre %}
21
- {% if ymPre != "" %}
22
- </ul>
23
- {% endif %}
24
- <li class="postlistli"><h2>{{ymCur}}</h2></li>
25
- <ul class="postlistul">
26
- {% endif %}
27
- {% assign ymPre = ymCur %}
28
-
29
- <li class="postlistli">
30
- <a href="{{ post.url | relative_url }}">{{ post.title | downcase }}</a>
31
- <date datetime="{{post.date}}">{{- post.date | date: archive_date_titleformat }}</date>
32
- </li>
33
-
34
- {%- endfor -%}
35
- </ul>
12
+ {% include archive_list.html
13
+ collection=posts
14
+ %}
36
15
  {%- endif -%}
37
16
 
38
17
 
data/_layouts/home.html CHANGED
@@ -2,14 +2,16 @@
2
2
  layout: default
3
3
  ---
4
4
 
5
- <h1>{{ page.title }}</h1>
5
+ <h2>{{ page.title }}</h2>
6
+
7
+ {%-assign nextPage = site.paginate_path | replace: ':num', '2' -%}
6
8
 
7
9
  {%
8
10
  include post_list.html
9
- limit=10
11
+ limit=site.paginate
10
12
  show_more=true
11
13
  show_more_text=site.theme_config.show_more_text
12
- show_more_url="archive.html"
14
+ show_more_url= nextPage
13
15
  -%}
14
16
 
15
17
  {{ content }}
data/_layouts/page.html CHANGED
@@ -4,6 +4,6 @@ layout: default
4
4
 
5
5
  {%-include back_link.html-%}
6
6
 
7
- <h1>{{ page.title }}</h1>
7
+ <h2>{{ page.title }}</h2>
8
8
 
9
9
  {{ content }}
@@ -0,0 +1,45 @@
1
+ ---
2
+ layout: default
3
+ ---
4
+
5
+
6
+ <h1>{{ page.title }}</h1>
7
+
8
+ {%-assign nextPage = site.paginate_path | replace: ':num', '2' -%}
9
+
10
+ {%
11
+ include archive_list.html
12
+ collection=paginator.posts
13
+ limit=site.paginate
14
+ -%}
15
+
16
+
17
+
18
+ {{ content }}
19
+
20
+
21
+ <div class="pagebar">
22
+
23
+ {% if paginator.previous_page %}
24
+ <a href="{{ paginator.previous_page_path | relative_url}}" class="previous">
25
+ {{ site.theme_config.previous_page_title | default: "Previous" }}
26
+ </a>
27
+ {% else %}
28
+ <span class="previous">
29
+ {{ site.theme_config.previous_page_title | default: "Previous" }}
30
+ </span>
31
+ {% endif %}
32
+ <span class="page_number ">
33
+ {{ paginator.page }}/{{ paginator.total_pages }}
34
+ </span>
35
+ {% if paginator.next_page %}
36
+ <a href="{{ paginator.next_page_path | relative_url }}" class="next">
37
+ {{ site.theme_config.next_page_title | default: "Next" }}
38
+ </a>
39
+ {% else %}
40
+ <span class="next ">
41
+ {{ site.theme_config.next_page_title | default: "Next" }}
42
+ </span>
43
+ {% endif %}
44
+ </div>
45
+
data/_layouts/post.html CHANGED
@@ -6,7 +6,7 @@ layout: default
6
6
  <article>
7
7
 
8
8
 
9
- <h1>{{ page.title }}</h1>
9
+ <h2>{{ page.title }}</h2>
10
10
  <time datetime="{{ page.date }}">{{ page.date | date: site.theme_config.post_date_format }}</time> &nbsp; &nbsp;
11
11
  {% for tag in page.tags %}
12
12
  {% capture tag_name %}{{ tag }}{% endcapture %}
@@ -2,7 +2,7 @@
2
2
  layout: default
3
3
  ---
4
4
  <ariticle>
5
- <h1>Tag: {{ page.tag }}</h1>
5
+ <h2>Tag: {{ page.tag }}</h2>
6
6
 
7
7
  <ul class="postlistul">
8
8
  {% for post in site.tags[page.tag] %}
@@ -12,10 +12,7 @@ layout: default
12
12
  </li>
13
13
  {% endfor %}
14
14
 
15
- {% if site.theme_config.tag_showall %}
16
- <li class="postlistli"><a href="{{ site.baseurl }}/{{site.theme_config.all_tags_path | default:'tags' }}"> {{site.theme_config.all_tags_title | default:'All Tags' }}</a>
17
- </li>
18
- {% endif %}
15
+
19
16
  </ul>
20
17
  </ariticle>
21
18
 
data/_layouts/tags.html CHANGED
@@ -3,8 +3,20 @@ layout: default
3
3
  ---
4
4
  {%-include back_link.html -%}
5
5
  <div class="post">
6
- <h1>{{page.title}}</h1>
6
+ <h2>{{page.title}}</h2>
7
7
  <article>
8
+ {% comment %}
9
+ sort tags by count
10
+ {% endcomment %}
11
+
12
+ {% capture tagsStr %}
13
+ {% for tag in site.tags %}
14
+ {{ tag[1].size | plus: 10000 }}#{{ tag[0] }}#{{ tag[1].size }}@@
15
+ {% endfor %}
16
+ {% endcapture %}
17
+
18
+ {% assign sortedtags = tagsStr | split:'@@' | sort %}
19
+
8
20
 
9
21
  {% assign layouttype = site.theme_config.tags_layout_style | default: "auto" %}
10
22
 
@@ -17,8 +29,10 @@ layout: default
17
29
  {% endif %}
18
30
  {% if layouttype == 'flat' %}
19
31
  {% assign counter = 0 %}
20
- {% for item in site.tags %}
21
- {% assign tagname = item[0] %}
32
+ {% for tag in sortedtags reversed %}
33
+ {% assign tagitems = tag | split: '#' %}
34
+ {% assign tagname = tagitems[1] %}
35
+ {% assign tagnameCount = tagitems[2] %}
22
36
  {% assign counter2 = counter | modulo: 4 %}
23
37
  {% if counter2 == 3 %}
24
38
  <p>
@@ -26,17 +40,22 @@ layout: default
26
40
  {% capture counter %}{% increment counter %} {% endcapture %}
27
41
 
28
42
 
29
- <text><a href ="{{'/tags'|relative_url}}/{{ tagname}}.html" >{{ tagname}}</a> <sup>{{ site.tags[tagname].size }}</sup></text> &nbsp; &nbsp;
43
+ <text><a href ="{{'/tags'|relative_url}}/{{ tagname}}.html" >{{ tagname}}</a> <sup>{{ tagnameCount }}</sup></text> &nbsp; &nbsp;
30
44
 
31
45
  {% endfor %}
32
46
  {% else %}
33
47
  <ul class="postlistul" >
34
- {% for item in site.tags %}
35
- {% assign tagname = item[0] %}
48
+
49
+
50
+ {% for tag in sortedtags reversed %}
51
+
52
+ {% assign tagitems = tag | split: '#' %}
53
+ {% assign tagname = tagitems[1] %}
54
+ {% assign tagnameCount = tagitems[2] %}
36
55
  <li class="postlistli">
37
56
  <text>
38
- <a href ="{{ site['baseurl']}}/tags/{{ item[0]}}.html" >{{ tagname}}</a>
39
- <sup> {{ site.tags[tagname].size }} </sup>
57
+ <a href ="{{'/tags'|relative_url}}/{{ tagname}}.html" >{{ tagname}}</a>
58
+ <sup> {{ tagnameCount }} </sup>
40
59
  </text> &nbsp;
41
60
  </li>
42
61
  {% endfor %}
data/assets/css/main.css CHANGED
@@ -101,4 +101,18 @@ li{
101
101
 
102
102
  date {
103
103
  color: #333;
104
+ }
105
+
106
+ .pagebar{
107
+ margin-top: 2rem;
108
+ display: flex;
109
+ float:right;
110
+ align-items:baseline;
111
+ }
112
+
113
+ .page_number{
114
+ color: #333;
115
+ padding-left: 10px;
116
+ padding-right: 10px;
117
+ text-align: center;
104
118
  }
data/index.html ADDED
@@ -0,0 +1,3 @@
1
+ ---
2
+ layout: paginate
3
+ ---
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-zeta
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - vitock
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-10-20 00:00:00.000000000 Z
11
+ date: 2022-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -24,20 +24,34 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.0.0
27
+ - !ruby/object:Gem::Dependency
28
+ name: jekyll-paginate
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: 1.0.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: 1.0.0
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: no-style-please2-plugins
29
43
  requirement: !ruby/object:Gem::Requirement
30
44
  requirements:
31
45
  - - "~>"
32
46
  - !ruby/object:Gem::Version
33
- version: 0.5.0
47
+ version: 0.6.0
34
48
  type: :runtime
35
49
  prerelease: false
36
50
  version_requirements: !ruby/object:Gem::Requirement
37
51
  requirements:
38
52
  - - "~>"
39
53
  - !ruby/object:Gem::Version
40
- version: 0.5.0
54
+ version: 0.6.0
41
55
  description:
42
56
  email:
43
57
  - r
@@ -48,6 +62,7 @@ files:
48
62
  - LICENSE.txt
49
63
  - README.md
50
64
  - _config.yml
65
+ - _includes/archive_list.html
51
66
  - _includes/back_link.html
52
67
  - _includes/collecttags.html
53
68
  - _includes/encrypted.html
@@ -61,11 +76,13 @@ files:
61
76
  - _layouts/default.html
62
77
  - _layouts/home.html
63
78
  - _layouts/page.html
79
+ - _layouts/paginate.html
64
80
  - _layouts/post.html
65
81
  - _layouts/tagpage.html
66
82
  - _layouts/tags.html
67
83
  - assets/css/main.css
68
84
  - assets/js/mouse_coords.js
85
+ - index.html
69
86
  homepage: https://github.com/vitock/jekyll-zeta
70
87
  licenses:
71
88
  - GPL