Disroot-themes
/
grav-theme-disrootblog
6
2
Fork 2
Code Pull Requests Releases Activity

Update to theme 1.2.1 (#6) 

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: Disroot/grav-theme-disrootblog#6
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
This commit is contained in:
meaz 2021-12-29 09:47:50 +00:00
parent fd4d9b7d2f
commit 31f879dcdc
12 changed files with 74 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CHANGELOG.md
View File

@ -1,3 +1,18 @@
# v1.2.1
## 01/19/2021
1. [](#improved)
* Fixed autoescaping in preparation for Grav 1.7
# v1.2.0
## 03/21/2019
1. [](#new)
* Set Dependency of Grav 1.5.10+ which has support for new **Deferred Block** Twig extension
* Implement assets rendering using **Deferred Block** Twig extension
1. [](#improved)
* Added twig `t` filter for submit button translation in comments form
# v1.1.0 # v1.1.0
## 07/14/2016 ## 07/14/2016
@ -7,7 +22,7 @@
* Use https for Gravatar request as default * Use https for Gravatar request as default
1. [](#bugfix) 1. [](#bugfix)
* Fix setting the page language in the html tag * Fix setting the page language in the html tag
* Fixed pagination * Fixed pagination
* Use the correct parameter separator in the blog post template * Use the correct parameter separator in the blog post template
# v1.0.1 # v1.0.1

6
blueprints.yaml
View File

@ -1,5 +1,7 @@
name: disrootblog name: disrootblog
version: 1.1.0 slug: disrootblog
type: theme
version: 1.2.1
description: "A clean and simple theme for bloggers, with responsive design and beautiful typography." description: "A clean and simple theme for bloggers, with responsive design and beautiful typography."
icon: group icon: group
author: author:
@ -11,3 +13,5 @@ demo: http://demo.getgrav.org/lingonberry-skeleton
keywords: lingonberry, theme, onepage, modern, fast, responsive, html5, css3 keywords: lingonberry, theme, onepage, modern, fast, responsive, html5, css3
bugs: https://github.com/getgrav/grav-theme-lingonberry/issues bugs: https://github.com/getgrav/grav-theme-lingonberry/issues
license: GPL license: GPL
dependencies:
- { name: grav, version: '>=1.5.10' }

2
templates/blog.html.twig
View File

@ -14,7 +14,7 @@
{% block content %} {% block content %}
{{ page.content }} {{ page.content|raw }}
{% for child in collection %} {% for child in collection %}
{% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %} {% include 'partials/blog_item.html.twig' with {'page':child, 'truncate':true} %}
{% endfor %} {% endfor %}

2
templates/default.html.twig
View File

@ -7,7 +7,7 @@
<h2 class="post-title">{{ page.header.title }}</h2> <h2 class="post-title">{{ page.header.title }}</h2>
</div> </div>
<div class="post-content"> <div class="post-content">
{{ page.content }} {{ page.content|raw }}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

2
templates/error.html.twig
View File

@ -7,7 +7,7 @@
<h2 class="post-title">Error {{ page.header.http_response_code }}</h2> <h2 class="post-title">Error {{ page.header.http_response_code }}</h2>
</div> </div>
<div class="post-content"> <div class="post-content">
{{ page.content }} {{ page.content|raw }}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

2
templates/form.html.twig
View File

@ -7,7 +7,7 @@
<h2 class="post-title">{{ page.header.title }}</h2> <h2 class="post-title">{{ page.header.title }}</h2>
</div> </div>
<div class="post-content"> <div class="post-content">
{{ content }} {{ content|raw }}
</div> </div>
{% if config.plugins.form.enabled %} {% if config.plugins.form.enabled %}
{% include "forms/form.html.twig" %} {% include "forms/form.html.twig" %}

2
templates/formdata.html.twig
View File

@ -7,7 +7,7 @@
<h2 class="post-title">{{ form.message }}</h2> <h2 class="post-title">{{ form.message }}</h2>
</div> </div>
<div class="post-content"> <div class="post-content">
{{ content }} {{ content|raw }}
</div> </div>
{% if config.plugins.form.enabled %} {% if config.plugins.form.enabled %}
{% include "forms/data.html.twig" %} {% include "forms/data.html.twig" %}

70
templates/partials/base.html.twig
View File

@ -2,50 +2,53 @@
<html lang="{{ grav.language.getLanguage ?: 'en' }}"> <html lang="{{ grav.language.getLanguage ?: 'en' }}">
<head> <head>
{% block head %} {% block head %}
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>{% if header.title %}{{ header.title }} | {% endif %}{{ site.title }}</title> <title>{% if header.title %}{{ header.title }} | {% endif %}{{ site.title }}</title>
{% include 'partials/metadata.html.twig' %} {% include 'partials/metadata.html.twig' %}
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="icon" type="image/png" href="{{ theme_url }}/images/favicon.ico" /> <link rel="icon" type="image/png" href="{{ theme_url }}/images/favicon.ico" />
<!--link rel='stylesheet' id='lingonberry_googleFonts-css' href='//fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic%7CRaleway%3A600%2C500%2C400&#038;ver=4.3.1' type='text/css' media='all' /--> <!--link rel='stylesheet' id='lingonberry_googleFonts-css' href='//fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic%7CRaleway%3A600%2C500%2C400&#038;ver=4.3.1' type='text/css' media='all' /-->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">
{% block stylesheets %} {% block stylesheets %}
{% do assets.addCss('theme://css/widget.css') %} {% do assets.addCss('theme://css/widget.css') %}
{% do assets.addCss('theme://css/style.css') %} {% do assets.addCss('theme://css/style.css') %}
{% do assets.addCss('theme://css/media-queries.css') %} {% do assets.addCss('theme://css/media-queries.css') %}
{% do assets.addCss('theme://css/content.css') %} {% do assets.addCss('theme://css/content.css') %}
{% do assets.addCss('theme://css/sidebar.css') %} {% do assets.addCss('theme://css/sidebar.css') %}
{% do assets.addCss('theme://css/lightbox.css') %} {% do assets.addCss('theme://css/lightbox.css') %}
{% if browser.getBrowser == 'msie' and browser.getVersion >= 7 and browser.getVersion <= 8 %} {% if browser.getBrowser == 'msie' and browser.getVersion >= 7 and browser.getVersion <= 8 %}
{% do assets.addCss('theme://css/ie.css') %} {% do assets.addCss('theme://css/ie.css') %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{{ assets.css() }}
{% block javascripts %} {% block javascripts %}
{% do assets.add('jquery',101) %} {% do assets.add('jquery',101) %}
{% endblock %} {% endblock %}
{{ assets.js() }}
{% if site.calendar %} {% if site.calendar %}
<script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script> <script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
$( "#calendar_wrap" ).datepicker({ $( "#calendar_wrap" ).datepicker({
hideIfNoPrevNext: true hideIfNoPrevNext: true
});
}); });
</script> });
{% endif %} </script>
{% endif %}
{% block assets deferred %}
{{ assets.css()|raw }}
{{ assets.js()|raw }}
{% endblock %}
{% endblock head %} {% endblock head %}
</head> </head>
<body class="{{ page.header.body_classes }}"> <body class="{{ page.header.body_classes }}">
{% block navigation %} {% block navigation %}
{% include 'partials/navigation.html.twig' %} {% include 'partials/navigation.html.twig' %}
{% endblock %} {% endblock %}
{% block header %} {% block header %}
{% include 'partials/header.html.twig' %} {% include 'partials/header.html.twig' %}
@ -65,5 +68,8 @@
<script type='text/javascript' src='{{ theme_url }}/js/flexslider.min.js'></script> <script type='text/javascript' src='{{ theme_url }}/js/flexslider.min.js'></script>
<script type='text/javascript' src='{{ theme_url }}/js/global.js'></script> <script type='text/javascript' src='{{ theme_url }}/js/global.js'></script>
</body> {% block bottom %}
</html> {{ assets.js('bottom')|raw }}
{% endblock %}
</body>
</html>

14
templates/partials/blog_item.html.twig
View File

@ -53,7 +53,7 @@
<iframe width="100%" height="403" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/{{ page.header.soundcloud }}&amp;auto_play=false&amp;hide_related=true&amp;show_comments=true&amp;show_user=true&amp;show_reposts=false&amp;visual=true&amp;buying=false"></iframe> <iframe width="100%" height="403" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/{{ page.header.soundcloud }}&amp;auto_play=false&amp;hide_related=true&amp;show_comments=true&amp;show_user=true&amp;show_reposts=false&amp;visual=true&amp;buying=false"></iframe>
{% endif %} {% endif %}
{% if page.media.images|first and not page.header.slideshow %} {% if page.media.images|first and not page.header.slideshow %}
{{ page.media.images|first.cropZoom(750,422).html('','', 'thumb') }} {{ page.media.images|first.cropZoom(750,422).html('','', 'thumb')|raw }}
{% endif %} {% endif %}
{% if page.header.description %} {% if page.header.description %}
<div class="media-caption-container"> <div class="media-caption-container">
@ -100,7 +100,7 @@
<span class="date-sep"> / </span> <span class="date-sep"> / </span>
{% if page.taxonomy.tag %} {% if page.taxonomy.tag %}
{% for tag in page.taxonomy.tag %} {% for tag in page.taxonomy.tag %}
<a href="{{ base_url }}/tag:{{ tag }}" rel="tag">{{ tag }}{% if not loop.last %}, {% endif %}</a> <a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tag }}" rel="tag">{{ tag }}{% if not loop.last %}, {% endif %}</a>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div> </div>
@ -111,16 +111,16 @@
<div class="post-content"> <div class="post-content">
{% if page.header.type != 'quote' and page.header.type != 'video' and page.header.type != 'link' and page.header.type != 'chat' and page.header.type != 'aside' %} {% if page.header.type != 'quote' and page.header.type != 'video' and page.header.type != 'link' and page.header.type != 'chat' and page.header.type != 'aside' %}
{% if page.header.continue_link is sameas(false) %} {% if page.header.continue_link is sameas(false) %}
{{ page.content }} {{ page.content|raw }}
{% if not truncate %} {% if not truncate %}
{% set show_prev_next = true %} {% set show_prev_next = true %}
{% endif %} {% endif %}
{% elseif truncate and page.summary != page.content %} {% elseif truncate and page.summary != page.content %}
{{ page.summary }} {{ page.summary|raw }}
{% elseif truncate %} {% elseif truncate %}
{{ page.content|truncate(550) }} {{ page.content|truncate(550)|raw }}
{% else %} {% else %}
{{ page.content }} {{ page.content|raw }}
{% set show_prev_next = true %} {% set show_prev_next = true %}
{% endif %} {% endif %}
<p> <p>
@ -131,7 +131,7 @@
{% endif %} {% endif %}
</p> </p>
{% else %} {% else %}
{{ page.content }} {{ page.content|raw }}
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
templates/partials/comments.html.twig
View File

@ -41,7 +41,7 @@
<p class="form-submit"> <p class="form-submit">
{% for button in grav.config.plugins.comments.form.buttons %} {% for button in grav.config.plugins.comments.form.buttons %}
<button class="submit" type="{{ button.type|default('submit') }}">{{ button.value|default('Post Comment') }}</button> <button class="submit" type="{{ button.type|default('submit') }}">{{ button.value|t|default('Post Comment') }}</button>
{% endfor %} {% endfor %}
</p> </p>

2
templates/partials/relatedpages.html.twig
View File

@ -3,7 +3,7 @@
{% if related %} {% if related %}
<div class="item-img"> <div class="item-img">
{% if related.media.images|first %} {% if related.media.images|first %}
{{ related.media.images|first.forceResize(230,160).html }} {{ related.media.images|first.forceResize(230,160).html|raw }}
{% else %} {% else %}
<a href="{{ related.url }}" title="{{ related.title }}"> <a href="{{ related.url }}" title="{{ related.title }}">
<img src='' title="{{ related.title }}" alt="{{ related.title }}" style="width:222px;height:154px;"> <img src='' title="{{ related.title }}" alt="{{ related.title }}" style="width:222px;height:154px;">

2
templates/tagcloud.html.twig
View File

@ -20,7 +20,7 @@
{% elseif percent >= 50 and percent < 80 %} {% elseif percent >= 50 and percent < 80 %}
{% set class = 'large' %} {% set class = 'large' %}
{% endif %} {% endif %}
<span class="{{ class }}" title="{{ value }} posts"><a href="{{ base_url }}/tag{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a></span> <span class="{{ class }}" title="{{ value }} posts"><a href="{{ base_url }}/blog/tag{{ config.system.param_sep }}{{ tax|e('url') }}">{{ tax }}</a></span>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>