From a4216b63fb107c511e16d58855748b5bc1c85e71 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 13 Jun 2019 03:41:03 +0200 Subject: [PATCH] Using song ID (again) and manually setting all titles --- _config.yml | 2 +- _includes/songlist.html | 2 +- _layouts/artist.html | 4 ++-- _layouts/default.html | 2 +- _layouts/song.html | 2 +- _plugins/data_page_generator.rb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index f8cc4e6..83042d7 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,7 @@ baseurl: /HiddenSounds page_gen: - data: songs template: song - name: sname + name: sid - data: artists template: artist name: sname diff --git a/_includes/songlist.html b/_includes/songlist.html index 117f8b2..f6e78f3 100644 --- a/_includes/songlist.html +++ b/_includes/songlist.html @@ -14,6 +14,6 @@ {{ artistName }} {%- endif -%} {%- endfor -%} - {% comment %} Space needed {% endcomment %} - {{ song.sname }} + {% comment %} Space needed {% endcomment %} - {{ song.sname }}

\ No newline at end of file diff --git a/_layouts/artist.html b/_layouts/artist.html index 9b16bda..6de1977 100644 --- a/_layouts/artist.html +++ b/_layouts/artist.html @@ -1,6 +1,6 @@ --- layout: default -title: page.name +title: '{{ page.sname }}' ptitle: '{{ page.sname }}' ---

{{ page.position }}

@@ -16,6 +16,6 @@ ptitle: '{{ page.sname }}' {% endif %} {% endfor %} {% if found == false %} {% continue %} {% endif %} -
  • {{ song.artists | join: ", " }} - {{ song.sname }}
    • +
  • {{ song.artists | join: ", " }} - {{ song.sname }}
    • {% endfor %} \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 2234593..3eb7494 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ - {{ page.title }} - HS Fanpage + {{ page.title | flatify }} - HS Fanpage diff --git a/_layouts/song.html b/_layouts/song.html index 4cf203e..c4fd578 100644 --- a/_layouts/song.html +++ b/_layouts/song.html @@ -1,5 +1,5 @@ --- layout: default -title: asd +title: '{{ page.sname }}' ptitle: '{{ page.artists | join: ", " }} - {{ page.sname }}' --- diff --git a/_plugins/data_page_generator.rb b/_plugins/data_page_generator.rb index 787ac3a..e93bdcf 100644 --- a/_plugins/data_page_generator.rb +++ b/_plugins/data_page_generator.rb @@ -49,7 +49,7 @@ module Jekyll self.process(@name) self.read_yaml(File.join(base, '_layouts'), template + ".html") - self.data['title'] = data[name] + # self.data['title'] = data[name] - EDITED # add all the information defined in _data for the current record to the # current page (so that we can access it with liquid tags) self.data.merge!(data)