aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--backdrop/templates/footer.html2
-rw-r--r--backdrop/templates/sample.html4
m---------genus0
-rw-r--r--martyalchin/templates/base.html2
-rw-r--r--pelican-bootstrap3/EXAMPLES.md11
-rw-r--r--pelican-bootstrap3/README.md4
-rw-r--r--pelican-bootstrap3/templates/includes/cc-license.html4
-rw-r--r--pelican-bootstrap3/templates/includes/twitter_timeline.html7
-rw-r--r--photowall/templates/base.html2
10 files changed, 18 insertions, 21 deletions
diff --git a/.gitmodules b/.gitmodules
index ead540f..21e7060 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -220,3 +220,6 @@
[submodule "eevee"]
path = eevee
url = https://github.com/kura/eevee.git
+[submodule "genus"]
+ path = genus
+ url = https://github.com/vaiski/genus.git
diff --git a/backdrop/templates/footer.html b/backdrop/templates/footer.html
index b5db695..d57bb34 100644
--- a/backdrop/templates/footer.html
+++ b/backdrop/templates/footer.html
@@ -35,7 +35,7 @@
<div class="small-12 medium-6 columns">
<p class="small-text-center medium-text-left">
&copy; {{ YEAR }} {{ AUTHOR }} {{ LICENSE }}
- <!-- <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="cc.png" /></a>-->
+ <!-- <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="cc.png" /></a>-->
</p>
</div>
<div class="small-12 medium-6 columns">
diff --git a/backdrop/templates/sample.html b/backdrop/templates/sample.html
index 8ed4640..4514f61 100644
--- a/backdrop/templates/sample.html
+++ b/backdrop/templates/sample.html
@@ -89,7 +89,7 @@
<hr>
<div class="small-12 medium-6 columns">
<p class="small-text-center medium-text-left">&copy; 2015 Chris MacMackin
- <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="cc.png" /></a></p>
+ <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="cc.png" /></a></p>
</div>
<div class="small-12 medium-6 columns">
<p class="small-text-center medium-text-right">Proudly powered by
@@ -176,7 +176,7 @@
<hr>
<div class="small-12 medium-6 columns">
<p class="small-text-center medium-text-left">&copy; 2015 Chris MacMackin
- <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="cc.png" /></a></p>
+ <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="cc.png" /></a></p>
</div>
<div class="small-12 medium-6 columns">
<p class="small-text-center medium-text-right">Proudly powered by
diff --git a/genus b/genus
new file mode 160000
+Subproject 5defe62ab86976b640b9d3042cb4c2896b32a75
diff --git a/martyalchin/templates/base.html b/martyalchin/templates/base.html
index eea18f9..43aa15d 100644
--- a/martyalchin/templates/base.html
+++ b/martyalchin/templates/base.html
@@ -10,6 +10,6 @@
{% block content %} {% endblock %}
<div class="copyright info vcard">Design by <a class="fn url"
- href="http://martyalchin.com">Marty Alchin</a>, <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">some rights reserved</a>. Powered by <a href="http://alexis.notomyidea.org/pelican/">pelican</a></div>
+ href="http://martyalchin.com">Marty Alchin</a>, <a rel="license" href="https://creativecommons.org/licenses/by-sa/3.0/us/">some rights reserved</a>. Powered by <a href="http://alexis.notomyidea.org/pelican/">pelican</a></div>
</body>
</html>
diff --git a/pelican-bootstrap3/EXAMPLES.md b/pelican-bootstrap3/EXAMPLES.md
index f30b903..717a461 100644
--- a/pelican-bootstrap3/EXAMPLES.md
+++ b/pelican-bootstrap3/EXAMPLES.md
@@ -17,10 +17,12 @@ If your website is listed here, but you don't want it to be, let me know and I'l
[Christine Doig](http://chdoig.github.io/) by [chdoig](https://github.com/chdoig) - Barely recognizable anymore as pelican-boostrap3, but it is in fact [based on this theme](http://chdoig.github.io/create-pelican-blog.html). The Twitter widget has been contributed back to pelican-bootstrap3
-[Rebecca Weiss](http://www.rebeccaweiss.info/) by [rjweiss](https://github.com/rjweiss)
+[Rebecca Weiss](https://rjweiss.github.io/) by [rjweiss](https://github.com/rjweiss)
[Theory And Practice](http://theoryandpractice.org/) by [cranmer](https://github.com/cranmer) - Nice customization of the frontpage, using widgets.
+[Camerata Musica](https://colinbrislawn.github.io/CamerataMusica/) by [Colin Brislawn](https://www.github.com/colinbrislawn) - Showcases past and present seasons for a performance arts group.
+
[The official ncf website](http://www.ncf.io/) by [Normation](https://github.com/Normation)
[Lappland. Inside Out.](http://lappland.io/) by [hlapp](https://github.com/hlapp)
@@ -33,9 +35,7 @@ If your website is listed here, but you don't want it to be, let me know and I'l
[Toni Mueller](http://www.tonimueller.org/) by [muellert](https://github.com/muellert)
-[Caffeinated Engineering](http://caffeinatedengineering.com/) by [mattyjones](https://github.com/mattyjones)
-
-[Duncan Murdock](http://www.duncanmurdock.name/) by [damurdock](https://github.com/damurdock)
+[Caffeinated Engineering](https://caffeinatedengineering.github.io/) by [mattyjones](https://github.com/mattyjones)
[Ryan Gregory James](http://csc.ucdavis.edu/~rgjames/) by [Autoplectic](https://github.com/Autoplectic)
@@ -51,11 +51,8 @@ If your website is listed here, but you don't want it to be, let me know and I'l
[Landscape.io blog](https://blog.landscape.io/)
-[Eldelshell](http://www.eldelshell.com/)
-
[For The Science - a blog about scientific programming](http://forthescience.org/blog/)
[Podsnap](http://blog.podsnap.com/)
[The Digital Cat](http://lgiordani.com/) by [lgiordani](https://github.com/lgiordani)
-
diff --git a/pelican-bootstrap3/README.md b/pelican-bootstrap3/README.md
index cdb9b02..00ed5d3 100644
--- a/pelican-bootstrap3/README.md
+++ b/pelican-bootstrap3/README.md
@@ -252,7 +252,7 @@ If you're using reStructuredText for writing articles and pages, you can include
### Content license
-You can optionally declare a [Creative Commons license](http://creativecommons.org) for the content of your site. It will appear in the site's footer. To enable, use one of the following two ways for configuration.
+You can optionally declare a [Creative Commons license](https://creativecommons.org) for the content of your site. It will appear in the site's footer. To enable, use one of the following two ways for configuration.
* To choose the license by name, set `CC_LICENSE` to the common abbreviated name of the license: `"CC-BY"` (require attribution), `"CC-BY-SA"` (require ShareAlike), `"CC-BY-ND"` (NoDerivatives) , `"CC-BY-NC"` (require attribution, no commercial reuse), `"CC-BY-NC-SA"` (require ShareAlike, no commercial reuse), or `"CC-BY-NC-ND"` (NoDerivatives, no commercial reuse).
* Alternatively, choose the licence by features:
@@ -260,7 +260,7 @@ You can optionally declare a [Creative Commons license](http://creativecommons.o
* `CC_LICENSE_COMMERCIAL` - `"yes"` if commercial reuse is permitted, and `"no"` otherwise.
* Optionally, you can include attribution markup in the license mark by setting `CC_ATTR_MARKUP` to _True_.
-The license choice mirrors the [Creative Commons License Chooser](http://creativecommons.org/choose/). Source for the macro that renders the mark is at http://github.com/hlapp/cc-tools.
+The license choice mirrors the [Creative Commons License Chooser](https://creativecommons.org/choose/). Source for the macro that renders the mark is at http://github.com/hlapp/cc-tools.
Alternatively, if you want to use another license type, you can instead use the `CUSTOM_LICENSE` property to set a license string that will be showed at the bottom of every page.
Raw HTML is allowed.
diff --git a/pelican-bootstrap3/templates/includes/cc-license.html b/pelican-bootstrap3/templates/includes/cc-license.html
index c64f265..a1592e6 100644
--- a/pelican-bootstrap3/templates/includes/cc-license.html
+++ b/pelican-bootstrap3/templates/includes/cc-license.html
@@ -24,7 +24,7 @@
{# specifying how under which title, to which creator, and #}
{# to which URL to attribute the work #}
{# The parameters all mirror the Creative Commone license chooser: #}
-{# http://creativecommons.org/choose/ #}
+{# https://creativecommons.org/choose/ #}
{# ------------------------------------------------------------------------ #}
{# Copyright (c) 1994 Hilmar Lapp, hlapp@drycafe.net. #}
{# Licensed under the terms of the MIT License. #}
@@ -53,7 +53,7 @@
{% set cc_title_suffix = cc_title_suffix ~ "-ShareAlike" %}
{% endif %}
{% endif %}
- {% set cc_title, cc_uri, cc_icon = ("Creative Commons AttributionCCSUFFIX 4.0 International License","http://creativecommons.org/licenses/CCNAME/4.0/","//i.creativecommons.org/l/CCNAME/4.0/80x15.png") %}
+ {% set cc_title, cc_uri, cc_icon = ("Creative Commons AttributionCCSUFFIX 4.0 International License","https://creativecommons.org/licenses/CCNAME/4.0/","//i.creativecommons.org/l/CCNAME/4.0/80x15.png") %}
<a rel="license" href="{{ cc_uri|replace('CCNAME',cc_name) }}"><img alt="Creative Commons License" style="border-width:0" src="{{ cc_icon|replace('CCNAME',cc_name) }}" /></a>
{% if br_after_img %}<br/>{% endif %}
{% if attr_markup %}
diff --git a/pelican-bootstrap3/templates/includes/twitter_timeline.html b/pelican-bootstrap3/templates/includes/twitter_timeline.html
index ad1ce5d..395468c 100644
--- a/pelican-bootstrap3/templates/includes/twitter_timeline.html
+++ b/pelican-bootstrap3/templates/includes/twitter_timeline.html
@@ -2,9 +2,6 @@
<li class="list-group-item"><h4><i class="fa fa-twitter fa-lg"></i><span class="icon-label">Latest Tweets</span></h4></li>
<div id="twitter_timeline">
- <a class="twitter-timeline" data-chrome="noheader" href="https://twitter.com/{{ TWITTER_USERNAME }}" data-widget-id="{{TWITTER_WIDGET_ID}}">Tweets by {{TWITTER_USERNAME}}</a>
+ <a class="twitter-timeline" data-width="250" data-height="300" data-dnt="true" data-theme="light" href="https://twitter.com/{{TWITTER_USERNAME}}">Tweets by {{TWITTER_USERNAME}}</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
</div>
-
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-
-{% endif %} \ No newline at end of file
+{% endif %}
diff --git a/photowall/templates/base.html b/photowall/templates/base.html
index f5c01eb..ed1707a 100644
--- a/photowall/templates/base.html
+++ b/photowall/templates/base.html
@@ -74,7 +74,7 @@ function greyon(img)
</section><!-- /#extras -->
<footer id="contentinfo" class="body">
- <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
+ <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
</footer><!-- /#contentinfo -->
{% include 'analytics.html' %}
generated by cgit (git 2.34.1) at 2024-11-19 01:23:15 +0000