aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules6
m---------Flex0
-rw-r--r--Just-Read/templates/article.html35
-rw-r--r--Just-Read/templates/base.html38
m---------bold0
m---------brutalist0
-rw-r--r--mnmlist/templates/index.html10
-rw-r--r--notmyidea-cms/templates/twitter.html4
-rw-r--r--pelican-bootstrap3/README.md16
-rw-r--r--pelican-bootstrap3/templates/includes/comments.html28
10 files changed, 91 insertions, 46 deletions
diff --git a/.gitmodules b/.gitmodules
index 1afb19d..ebbb6d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -247,3 +247,9 @@
[submodule "pelican-fh5co-marble"]
path = pelican-fh5co-marble
url = https://github.com/claudio-walser/pelican-fh5co-marble.git
+[submodule "grid-focus"]
+ path = grid-focus
+ url = https://github.com/oulenz/pelican-grid-focus.git
+[submodule "brutalist"]
+ path = brutalist
+ url = https://github.com/mamcmanus/brutalist.git
diff --git a/Flex b/Flex
-Subproject 5bc235cf579cb03bcc8f54b6029ff74493a0cb4
+Subproject b3bd59002a3e85803332c35702d90e1e19ef39b
diff --git a/Just-Read/templates/article.html b/Just-Read/templates/article.html
index c68487c..038eb3b 100644
--- a/Just-Read/templates/article.html
+++ b/Just-Read/templates/article.html
@@ -6,26 +6,31 @@
<div class="post wrapper">
<h1>{{ article.title }}</h1>
{{ article.content }}
-
+
<a href="https://twitter.com/share" class="twitter-share-button" data-via="{{ TWITTER_USERNAME }}" data-lang="en" data-size="large" data-related="{{ TWITTER_USERNAME }}">Tweet</a>
- <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-
+ <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
{% if DISQUS_SITENAME %}
<div class="comments">
- <h2>Comments !</h2>
- <div id="disqus_thread"></div>
- <script type="text/javascript">
- var disqus_identifier = "{{ article.url }}";
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
- dsq.src = 'https://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
- })();
- </script>
+ <h2>Comments !</h2>
+ <div id="disqus_thread"></div>
+ <script>
+ var disqus_config = function () {
+ this.page.url = "{{ SITEURL }}/{{ article.url }}";
+ this.page.identifier = "{{ article.slug }}";
+ this.page.title = "{{ article.title }}";
+ };
+ (function() {
+ var d = document,
+ s = d.createElement('script');
+ s.src = 'https://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+ s.setAttribute('data-timestamp', +new Date());
+ (d.head || d.body).appendChild(s);
+ })();
+ </script>
+ <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
</div>
- {% endif %}
+ {% endif %}
</div>
-
{% include 'metadata.html' %}
</article>
</div>
diff --git a/Just-Read/templates/base.html b/Just-Read/templates/base.html
index a61b22b..8b980b5 100644
--- a/Just-Read/templates/base.html
+++ b/Just-Read/templates/base.html
@@ -14,9 +14,7 @@
<meta name="author" content="{{ AUTHOR }}" />
<meta name="copyright" content="{{ AUTHOR }}" />
{% endif %}
-
<meta property="og:site_name" content="{{SITENAME}}" />
-
{% if GOOGLE_PLUS_PROFILE_URL %}
<link rel="author" href={{GOOGLE_PLUS_PROFILE_URL}} />
{% endif %}
@@ -24,9 +22,8 @@
<meta name="twitter:site" content="@{{TWITTER_USERNAME}}" />
<meta name="twitter:creator" content="@{{TWITTER_USERNAME}}" />
{% endif %}
-
- {%if article %}
<meta name="twitter:card" content="summary" />
+ {%if article %}
<meta name="twitter:title" content="{{article.title}}" />
<meta name="date" content="{{article.date}}" />
<meta property="og:type" content="article" />
@@ -34,7 +31,7 @@
<meta property="og:published_time" content="{{article.date}}" />
<meta property="og:title" content="{{article.title}}" />
<meta property="og:url" content="{{SITEURL}}/{{ article.url }}" />
- {% if article.featured_image %}
+ {% if article.featured_image %}
<meta property="og:image" content="{{ article.featured_image }}" />
{% endif %}
{%if DESCRIPTION %}
@@ -47,8 +44,37 @@
{%if FACEBOOK_PROFILE_URL %}
<meta property="article:author" content="{{FACEBOOK_PROFILE_URL}}" />
{% endif %}
+ {% elif page %}
+ <meta name="twitter:title" content="{{page.title}}" />
+ <meta name="date" content="{{page.date}}" />
+ <meta property="og:type" content="website" />
+ <meta property="og:locale" content="{{page.lang}}" />
+ <meta property="og:published_time" content="{{page.date}}" />
+ <meta property="og:title" content="{{page.title}}" />
+ <meta property="og:url" content="{{SITEURL}}/{{ page.url }}" />
+ {% if page.featured_image %}
+ <meta property="og:image" content="{{ page.featured_image }}" />
+ {% endif %}
+ {%if DESCRIPTION %}
+ <meta property="og:description" content="{{DESCRIPTION}} " />
+ <meta name="description" content="{{DESCRIPTION}}" />
+ {%else %}
+ <meta property="og:description" content="{{page.summary|striptags}}" />
+ <meta name="description" content="{{page.summary|striptags}}" />
+ {% endif %}
+ {% else %}
+ <meta name="twitter:title" content="{{SITENAME}}" />
+ <meta property="og:type" content="website" />
+ {% if DEFAULT_LANG %}
+ <meta property="og:locale" content="{{DEFAULT_LANG}}" />
+ {% endif %}
+ <meta property="og:title" content="{{SITENAME}}" />
+ <meta property="og:url" content="{{SITEURL}}/{{ output_file }}" />
+ {%if DESCRIPTION %}
+ <meta property="og:description" content="{{DESCRIPTION}} " />
+ <meta name="description" content="{{DESCRIPTION}}" />
+ {% endif %}
{% endif %}
-
<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0" />
diff --git a/bold b/bold
-Subproject 039335bf79107eebbd2f281442a9dafb056ac58
+Subproject b27e6056b530b4a9df863e074503e11dc353d70
diff --git a/brutalist b/brutalist
new file mode 160000
+Subproject 121f4dff2bdcf8ddb80ab04003ea30d162f07a3
diff --git a/mnmlist/templates/index.html b/mnmlist/templates/index.html
index d29eb44..d79c90a 100644
--- a/mnmlist/templates/index.html
+++ b/mnmlist/templates/index.html
@@ -23,11 +23,11 @@
{% else %}
<li><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></li>
{% endif %}
-{% endfor %}
- {% if loop.length > 1 %}
- </ol>
- </section><!-- #article-list -->
-{% endif %}
+ {% if loop.length > 1 %}
+ </ol>
+ </section><!-- #article-list -->
+ {% endif %}
+ {% endfor %}
{% else %}
No posts found.
{% endif %}
diff --git a/notmyidea-cms/templates/twitter.html b/notmyidea-cms/templates/twitter.html
index c6b159f..bf78c32 100644
--- a/notmyidea-cms/templates/twitter.html
+++ b/notmyidea-cms/templates/twitter.html
@@ -1,3 +1,3 @@
{% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-{% endif %} \ No newline at end of file
+<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
+{% endif %}
diff --git a/pelican-bootstrap3/README.md b/pelican-bootstrap3/README.md
index 27b9d7a..d990004 100644
--- a/pelican-bootstrap3/README.md
+++ b/pelican-bootstrap3/README.md
@@ -40,12 +40,14 @@ plugin:
If you are using
[`i18n_subsites`](https://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites)
-and you are not using English as your default language, make sure to
-also correctly specify the default language of the theme. Otherwise
-the translations will not be used on your default site.
+and you are not using English as default language (`DEFAULT_LANG`) for your
+site, make sure to also correctly specify the default language of the theme
+(English):
`I18N_TEMPLATES_LANG = 'en'`
+Otherwise the translations will not be used on your default site.
+
## Usage
This theme honors the following standard Pelican settings:
@@ -316,9 +318,11 @@ For example, if you want to use the WTFPL license, you can set:
The theme can show your most recently active GitHub repos in the sidebar. To enable, provide a `GITHUB_USER`. Appearance and behaviour can be controlled using the following variables:
-* `GITHUB_REPO_COUNT`
-* `GITHUB_SKIP_FORK`
-* `GITHUB_SHOW_USER_LINK`
+* `GITHUB_REPO_COUNT`: An integer representing the number of repos to display (sorted by modification date, descending)
+* `GITHUB_SKIP_FORK`: Either `'false'` [default] or `'true'`. If `'true'`, exclude forked repositories from display in the sidebar.
+* `GITHUB_SHOW_USER_LINK`: If undefined [default], don't show a link to the `GITHUB_USER`'s user page. If defined, show it.
+
+NOTE: Boolean values will _not_ work here! They will be interpreted as literal strings by JS, so instead use `'true'` and `'false'`
### Facebook Open Graph
diff --git a/pelican-bootstrap3/templates/includes/comments.html b/pelican-bootstrap3/templates/includes/comments.html
index b37e2bf..4fe6406 100644
--- a/pelican-bootstrap3/templates/includes/comments.html
+++ b/pelican-bootstrap3/templates/includes/comments.html
@@ -8,20 +8,24 @@
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname
- {% if article %}
- {% if not DISQUS_NO_ID %}
- var disqus_identifier = '{{ article.date|strftime('%Y-%m-') ~ article.slug if DISQUS_ID_PREFIX_SLUG else article.slug }}';
- {% endif %}
- var disqus_url = '{{ SITEURL }}/{{ article.url }}';
- {% elif page %}
- {% if not DISQUS_NO_ID %}
- var disqus_identifier = 'page-{{ page.slug }}';
- {% endif %}
- var disqus_url = '{{ SITEURL }}/{{ page.url }}';
- {% endif %}
-
var disqus_config = function () {
this.language = "{{ DEFAULT_LANG }}";
+
+ {% if article %}
+ {% if not DISQUS_NO_ID %}
+ this.page.identifier = '{{ article.date|strftime('%Y-%m-%d-') ~ article.slug }}';
+ {% endif %}
+ {% if SITEURL %}
+ this.page.url = '{{ SITEURL }}/{{ article.url }}';
+ {% endif %}
+ {% elif page %}
+ {% if not DISQUS_NO_ID %}
+ this.page.identifier = 'page-{{ page.slug }}';
+ {% endif %}
+ {% if SITEURL %}
+ this.page.url = '{{ SITEURL }}/{{ page.url }}';
+ {% endif %}
+ {% endif %}
};
/* * * DON'T EDIT BELOW THIS LINE * * */
generated by cgit (git 2.34.1) at 2024-11-18 22:24:44 +0000