Skip to content

Refactor-sidebar #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 5, 2025
Merged

Refactor-sidebar #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05f0d05
Move related articles logic to separate file
jtemporal Oct 5, 2025
7a770ed
removes duplicate code from sidebar.html
jtemporal Oct 5, 2025
16222e1
Moves book sidebar widget to separate file
jtemporal Oct 5, 2025
78d5774
removes duplicate book-widget code from sidebar.html
jtemporal Oct 5, 2025
195f550
moves author note to its own file
jtemporal Oct 5, 2025
c6de5e1
removes duplicate author note widget code from sidebar.html
jtemporal Oct 5, 2025
e2dca88
Adds series widget
jtemporal Oct 5, 2025
470e1c9
fix identation on sidebar.html
jtemporal Oct 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions _includes/author-note-widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% include language-detection.html %}
{% assign author_note_title = site.languages[current_lang].text.author_note_title %}
<div class="mt10 recent">
<h3>{{author_note_title}}</h3>
<p><a href='{{ page.author_note_link }}'>{{ page.author_note_text }}</a></p>
</div>
13 changes: 13 additions & 0 deletions _includes/book-widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% include language-detection.html %}
{% assign knw_btn = site.languages[current_lang].text.know_more_button %}
{% assign buy = site.languages[current_lang].text.buy_button %}

<!--sidebar book announcement-->
<div class="mt10 recent">
<a href="{{site.banner_books[current_lang].book.page}}"><img src="{{ site.banner_books[current_lang].book.cover }}" alt="Book '{{ site.books[current_lang].book.title }}' Cover being displayed on an ipad"/></a>
<h3><a href="{{site.banner_books[current_lang].book.page}}" style="text-decoration: none;">{{ site.banner_books[current_lang].book.title }}</a></h3>
<p>{{ site.banner_books[current_lang].book.short_description }}</p>
<a href="{{site.banner_books[current_lang].book.gumroad}}"><button class="buy">{{buy}} Gumroad</button></a>
<a href="{{site.banner_books[current_lang].book.amazon}}"><button class="buy">{{buy}} Amazon</button></a>
<br><a href="{{site.banner_books[current_lang].book.page}}"><button class="buy">{{knw_btn}}</button></a>
</div>
32 changes: 32 additions & 0 deletions _includes/related-articles-widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{% include language-detection.html %}
{% assign recent_articles_title = site.languages[current_lang].text.recent_articles_title %}
{% assign related_articles_title = site.languages[current_lang].text.related_articles_title %}
{% if page.related %}
<div class="mt10 recent">
<h2>{{related_articles_title}}</h2>
{% assign related_post_list = page.posts_list | join: ',' | split: ',' %}
{% for related_post in related_post_list %}
{% assign related_post_url = related_post | prepend: "/" | append: "/" %}
{% for post in site.posts %}
{% if post.url == related_post_url %}
<ul>
<li>
<p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
</li>
</ul>
{% endif %}
{% endfor %}
{% endfor %}
</div>
{% else %}
<div class="mt10 recent">
<h2>{{recent_articles_title}}</h2>
<ul>
{% for post in site.posts limit:3 %}
<li>
<p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
22 changes: 22 additions & 0 deletions _includes/series-widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{% include language-detection.html %}
{% assign series_posts = site.posts | where: "series", page.series | sort: "series_order" %}
{% if series_posts.size > 1 %}
<div class="mt10 recent">
{% if current_lang == "en" %}
<h4>📚 Series: {{ page.series }}</h4>
{% else %}
<h4>📚 Série: {{ page.series }}</h4>
{% endif %}
<ol>
{% for post in series_posts %}
<li>
{% if post.url == page.url %}
<p><strong>{{ post.title }}</strong></p>
{% else %}
<p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a></p>
{% endif %}
</li>
{% endfor %}
</ol>
</div>
{% endif %}
86 changes: 22 additions & 64 deletions _includes/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,26 @@
{% include language-detection.html %}
{% assign knw_btn = site.languages[current_lang].text.know_more_button %}
{% assign buy = site.languages[current_lang].text.buy_button %}
{% assign recent_articles_title = site.languages[current_lang].text.recent_articles_title %}
{% assign related_articles_title = site.languages[current_lang].text.related_articles_title %}
{% assign author_note_title = site.languages[current_lang].text.author_note_title %}
<div class="col-md-4 mt20">
<div class="post-img">
{% if page.image %}
{% if page.image contains "http" %}
<img width="100%" style="border-radius: 3%;" src="{{page.image}}" alt="{{page.title}}">
{% else %}
<img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{page.image}}" alt="{{page.title}}">
{% endif %}
{% else %}
<img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{site.default-image}}" alt="{{page.title}}">
{% endif %}
</div>
<div class="post-img">
{% if page.image %}
{% if page.image contains "http" %}
<img width="100%" style="border-radius: 3%;" src="{{page.image}}" alt="{{page.title}}">
{% else %}
<img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{page.image}}" alt="{{page.title}}">
{% endif %}
{% else %}
<img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{site.default-image}}" alt="{{page.title}}">
{% endif %}
</div>

{% if page.author_note == true %}
<div class="mt10 recent">
<h3>{{author_note_title}}</h3>
<p><a href='{{ page.author_note_link }}'>{{ page.author_note_text }}</a></p>
</div>
{% endif %}
{% if page.author_note == true %}
{% include author-note-widget.html %}
{% endif %}

<!--sidebar book announcement-->
<div class="mt10 recent">
<a href="{{site.banner_books[current_lang].book.page}}"><img src="{{ site.banner_books[current_lang].book.cover }}" alt="Book '{{ site.books[current_lang].book.title }}' Cover being displayed on an ipad"/></a>
<h3><a href="{{site.banner_books[current_lang].book.page}}" style="text-decoration: none;">{{ site.banner_books[current_lang].book.title }}</a></h3>
<p>{{ site.banner_books[current_lang].book.short_description }}</p>
<a href="{{site.banner_books[current_lang].book.gumroad}}"><button class="buy">{{buy}} Gumroad</button></a>
<a href="{{site.banner_books[current_lang].book.amazon}}"><button class="buy">{{buy}} Amazon</button></a>
<br><a href="{{site.banner_books[current_lang].book.page}}"><button class="buy">{{knw_btn}}</button></a>
</div>
{% if page.layout == "post" %}
{% if page.related %}
<div class="mt10 recent">
<h2>{{related_articles_title}}</h2>
{% assign related_post_list = page.posts_list | join: ',' | split: ',' %}
{% for related_post in related_post_list %}
{% assign related_post_url = related_post | prepend: "/" | append: "/" %}
{% for post in site.posts %}
{% if post.url == related_post_url %}
<ul>
<li>
<p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
</li>
</ul>
{% endif %}
{% endfor %}
{% endfor %}
</div>
{% else %}
<div class="mt10 recent">
<h2>{{recent_articles_title}}</h2>
<ul>
{% for post in site.related_posts limit:3 %}
<li>
<p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endif %}
<br>
{% if page.layout == "post" %}
{% if page.series %}
{% include series-widget.html %}
{% endif %}
{% include related-articles-widget.html %}
{% include book-widget.html %}
{% endif %}
<br>
</div>