From fbc46791703d341789780acea3c3096177d4747f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 3 Nov 2018 13:03:33 +0100 Subject: [PATCH] mcss.mosra.cz is HTTPS now. Other parts of mosra.cz not yet, as I don't want to bother with broken design due to the outdated theme right now. --- CONTRIBUTING.rst | 6 +++--- README.rst | 12 ++++++------ doc/pelican/theme.rst | 2 +- doc/plugins/links.rst | 4 ++-- doxygen/dox2html5.py | 2 +- doxygen/templates/base.html | 2 +- doxygen/test/layout_generated_doxyfile/index.html | 2 +- doxygen/test/layout_minimal/index.html | 2 +- pelican-plugins/m/test/link/page.html | 4 ++-- pelican-plugins/m/test/link/page.rst | 4 ++-- .../m/test/metadata/author-an-author.html | 2 +- .../m/test/metadata/authors/an-author.rst | 2 +- .../m/test/metadata/categories/a-category.rst | 2 +- .../m/test/metadata/category-a-category.html | 2 +- pelican-plugins/m/test/metadata/tag-a-tag.html | 2 +- pelican-plugins/m/test/metadata/tags/a-tag.rst | 2 +- pelican-theme/templates/base.html | 2 +- .../test/layout_disable_blog_links/index.html | 2 +- .../test/layout_global_social_meta/archives.html | 2 +- .../test/layout_global_social_meta/index.html | 2 +- pelican-theme/test/layout_minimal/index.html | 2 +- site/publishconf.py | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 906c7808..f03804c5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -15,7 +15,7 @@ Code contribution ================= - Setting up and using m.css for your own project is described in the - `documentation `_. + `documentation `_. - Documentation and the website is essential part of the project and every larger Pelican theme, plugin code or CSS contribution should be reflected there. Documentation and website content is written in reStructuredText and @@ -125,12 +125,12 @@ case of Doxygen, comment-out the line that removes the ``html`` directory in The project is built on Travis CI on Linux with Python 3.4, 3.5 and 3.6; Doxygen theme is tested only on 3.6 and math rendering is disabled as it's impossible to get it working on the old Ubuntu 14.04 LTS. Build status is over -at http://mcss.mosra.cz/build-status/. +at https://mcss.mosra.cz/build-status/. Contact ======= -- Website --- http://mcss.mosra.cz +- Website --- https://mcss.mosra.cz - GitHub --- https://github.com/mosra/m.css - Gitter --- https://gitter.im/mosra/m.css - Twitter --- https://twitter.com/czmosra diff --git a/README.rst b/README.rst index d71a3a3b..b27a6a11 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ you want to write beautiful content but *can't* because the usual CMS tools make your blood boil and so you rather stay silent? Well, I have something for you. -Project website: http://mcss.mosra.cz +Project website: https://mcss.mosra.cz Pure CSS and HTML ================= @@ -27,7 +27,7 @@ Everything you need is a few kilobytes of compressed CSS. This framework has exactly 0 bytes of JavaScript because *nobody actually needs it*. Even for responsive websites. -`Get the CSS `_ +`Get the CSS `_ Designed for content ==================== @@ -36,7 +36,7 @@ If you just want to write content with beautiful typography, you don't need forms, progressbars, popups, dropdowns or other cruft. You want fast iteration times. -`Use it with Pelican `_ +`Use it with Pelican `_ Authoring made easy =================== @@ -45,11 +45,11 @@ Code snippets, math, linking to docs, presenting photography in a beautiful way? Or making a complex page without even needing to touch HTML? Everything is possible. -`Get Pelican plugins `_ +`Get Pelican plugins `_ ------- -*Still not convinced?* Head over to a `detailed explanation `_ +*Still not convinced?* Head over to a `detailed explanation `_ of this project goals and design decisions. CONTRIBUTING @@ -64,7 +64,7 @@ CONTACT Want to learn more about m.css? Found a bug or want to share an awesome idea? Feel free to visit the project website or contact the author at: -- Website --- http://mcss.mosra.cz +- Website --- https://mcss.mosra.cz - GitHub --- https://github.com/mosra/m.css - Gitter --- https://gitter.im/mosra/m.css - Twitter --- https://twitter.com/czmosra diff --git a/doc/pelican/theme.rst b/doc/pelican/theme.rst index 046fa107..d1c0d9bc 100644 --- a/doc/pelican/theme.rst +++ b/doc/pelican/theme.rst @@ -211,7 +211,7 @@ specified, the theme will use the following instead. Set .. code:: py M_FINE_PRINT = SITENAME + """. Powered by `Pelican `_ - and `m.css `_.""" + and `m.css `_.""" If :py:`M_FINE_PRINT` is set to :py:`None` and none of :py:`M_LINKS_FOOTER1`, :py:`M_LINKS_FOOTER2`, :py:`M_LINKS_FOOTER3`, :py:`M_LINKS_FOOTER4` is set, the diff --git a/doc/plugins/links.rst b/doc/plugins/links.rst index de607ca2..3f124408 100644 --- a/doc/plugins/links.rst +++ b/doc/plugins/links.rst @@ -72,12 +72,12 @@ additional CSS classes. At the moment the plugin knows only external URLs. .. role:: link-flat-big(link) :class: m-flat m-text m-big - :link-flat-big:`Look here, this is great! ` + :link-flat-big:`Look here, this is great! ` .. role:: link-flat-big(link) :class: m-flat m-text m-big - :link-flat-big:`Look here, this is great! ` + :link-flat-big:`Look here, this is great! ` `GitHub`_ ========= diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py index d4987bef..4bc3b16b 100755 --- a/doxygen/dox2html5.py +++ b/doxygen/dox2html5.py @@ -2083,7 +2083,7 @@ def build_search_data(state: State, merge_subtrees=True, add_lookahead_barriers= return serialize_search_data(trie, map, symbol_count, merge_subtrees=merge_subtrees, merge_prefixes=merge_prefixes) def base85encode_search_data(data: bytearray) -> bytearray: - return (b"/* Generated by http://mcss.mosra.cz/doxygen/. Do not edit. */\n" + + return (b"/* Generated by https://mcss.mosra.cz/doxygen/. Do not edit. */\n" + b"Search.load('" + base64.b85encode(data, True) + b"');\n") def parse_xml(state: State, xml: str): diff --git a/doxygen/templates/base.html b/doxygen/templates/base.html index 4820545a..3049820b 100644 --- a/doxygen/templates/base.html +++ b/doxygen/templates/base.html @@ -147,7 +147,7 @@
{% if M_PAGE_FINE_PRINT == '[default]' %} -

{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created by Doxygen {{ DOXYGEN_VERSION }} and m.css.

+

{{ PROJECT_NAME }}{% if PROJECT_BRIEF %} {{ PROJECT_BRIEF }}{% endif %}. Created by Doxygen {{ DOXYGEN_VERSION }} and m.css.

{% else %} {{ M_PAGE_FINE_PRINT|replace('{doxygen_version}', DOXYGEN_VERSION) }} {% endif %} diff --git a/doxygen/test/layout_generated_doxyfile/index.html b/doxygen/test/layout_generated_doxyfile/index.html index 7df6c6ce..58607ba7 100644 --- a/doxygen/test/layout_generated_doxyfile/index.html +++ b/doxygen/test/layout_generated_doxyfile/index.html @@ -83,7 +83,7 @@
-

My Project. Created by Doxygen 1.8.14 and m.css.

+

My Project. Created by Doxygen 1.8.14 and m.css.

diff --git a/doxygen/test/layout_minimal/index.html b/doxygen/test/layout_minimal/index.html index 7df6c6ce..58607ba7 100644 --- a/doxygen/test/layout_minimal/index.html +++ b/doxygen/test/layout_minimal/index.html @@ -83,7 +83,7 @@
-

My Project. Created by Doxygen 1.8.14 and m.css.

+

My Project. Created by Doxygen 1.8.14 and m.css.

diff --git a/pelican-plugins/m/test/link/page.html b/pelican-plugins/m/test/link/page.html index 4960f004..01980c98 100644 --- a/pelican-plugins/m/test/link/page.html +++ b/pelican-plugins/m/test/link/page.html @@ -24,8 +24,8 @@

m.link

diff --git a/pelican-plugins/m/test/link/page.rst b/pelican-plugins/m/test/link/page.rst index 5ca6a125..c10c4afa 100644 --- a/pelican-plugins/m/test/link/page.rst +++ b/pelican-plugins/m/test/link/page.rst @@ -4,6 +4,6 @@ m.link .. role:: link-flat(link) :class: m-flat m-text m-strong -- URL with no title: :link:`http://mcss.mosra.cz` -- URL with a title: :link:`m.css ` +- URL with no title: :link:`https://mcss.mosra.cz` +- URL with a title: :link:`m.css ` - Link with a class: :link-flat:`https://twitter.com/czmosra` diff --git a/pelican-plugins/m/test/metadata/author-an-author.html b/pelican-plugins/m/test/metadata/author-an-author.html index 46ddb13a..6e1949ee 100644 --- a/pelican-plugins/m/test/metadata/author-an-author.html +++ b/pelican-plugins/m/test/metadata/author-an-author.html @@ -39,7 +39,7 @@ An Author

Author name, displayed on top of the author page

Contents of author details, displayed on top of the author page. - Link.

+ Link.

diff --git a/pelican-plugins/m/test/metadata/authors/an-author.rst b/pelican-plugins/m/test/metadata/authors/an-author.rst index 2d21cc31..60b43bd6 100644 --- a/pelican-plugins/m/test/metadata/authors/an-author.rst +++ b/pelican-plugins/m/test/metadata/authors/an-author.rst @@ -10,4 +10,4 @@ Author name, displayed on top of the author page `Link to the author. <{author}an-author>`_ Contents of author details, displayed on top of the author page. -`Link. `_ +`Link. `_ diff --git a/pelican-plugins/m/test/metadata/categories/a-category.rst b/pelican-plugins/m/test/metadata/categories/a-category.rst index e178d4af..d092d7a2 100644 --- a/pelican-plugins/m/test/metadata/categories/a-category.rst +++ b/pelican-plugins/m/test/metadata/categories/a-category.rst @@ -8,4 +8,4 @@ A category name, displayed on top of the category badge/details `Link to the category. <{category}a-category>`_ Contents of category details, displayed on top of the category page. -`Link. `_ +`Link. `_ diff --git a/pelican-plugins/m/test/metadata/category-a-category.html b/pelican-plugins/m/test/metadata/category-a-category.html index 585ca496..d1e6b78a 100644 --- a/pelican-plugins/m/test/metadata/category-a-category.html +++ b/pelican-plugins/m/test/metadata/category-a-category.html @@ -37,7 +37,7 @@ A category

A category name, displayed on top of the category badge/details

Contents of category details, displayed on top of the category page. - Link.

+ Link.

diff --git a/pelican-plugins/m/test/metadata/tag-a-tag.html b/pelican-plugins/m/test/metadata/tag-a-tag.html index 33192f02..e8915e3b 100644 --- a/pelican-plugins/m/test/metadata/tag-a-tag.html +++ b/pelican-plugins/m/test/metadata/tag-a-tag.html @@ -34,7 +34,7 @@

Tag name, displayed on top of the tag page

Contents of tag details, displayed on top of the tag page. - Link.

+ Link.

diff --git a/pelican-plugins/m/test/metadata/tags/a-tag.rst b/pelican-plugins/m/test/metadata/tags/a-tag.rst index 2642ea36..ff451909 100644 --- a/pelican-plugins/m/test/metadata/tags/a-tag.rst +++ b/pelican-plugins/m/test/metadata/tags/a-tag.rst @@ -5,4 +5,4 @@ Tag name, displayed on top of the tag page :summary: Tag summary, used for the social tags. Contents of tag details, displayed on top of the tag page. -`Link. `_ +`Link. `_ diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html index de99b0de..89ca00eb 100644 --- a/pelican-theme/templates/base.html +++ b/pelican-theme/templates/base.html @@ -171,7 +171,7 @@ {% if not M_FINE_PRINT is defined or M_FINE_PRINT %}
- {{ (M_FINE_PRINT or SITENAME + ". Powered by `Pelican `_ and `m.css `_.")|render_rst|indent(8) }} + {{ (M_FINE_PRINT or SITENAME + ". Powered by `Pelican `_ and `m.css `_.")|render_rst|indent(8) }}
{% endif %} diff --git a/pelican-theme/test/layout_disable_blog_links/index.html b/pelican-theme/test/layout_disable_blog_links/index.html index a0c3c646..0a107406 100644 --- a/pelican-theme/test/layout_disable_blog_links/index.html +++ b/pelican-theme/test/layout_disable_blog_links/index.html @@ -51,7 +51,7 @@
-

A Pelican Blog. Powered by Pelican and m.css.

+

A Pelican Blog. Powered by Pelican and m.css.

diff --git a/pelican-theme/test/layout_global_social_meta/archives.html b/pelican-theme/test/layout_global_social_meta/archives.html index c2ed7db7..c148cb17 100644 --- a/pelican-theme/test/layout_global_social_meta/archives.html +++ b/pelican-theme/test/layout_global_social_meta/archives.html @@ -50,7 +50,7 @@
-

A Pelican Blog. Powered by Pelican and m.css.

+

A Pelican Blog. Powered by Pelican and m.css.

diff --git a/pelican-theme/test/layout_global_social_meta/index.html b/pelican-theme/test/layout_global_social_meta/index.html index 2d4ae2b4..ed10ae80 100644 --- a/pelican-theme/test/layout_global_social_meta/index.html +++ b/pelican-theme/test/layout_global_social_meta/index.html @@ -50,7 +50,7 @@
-

A Pelican Blog. Powered by Pelican and m.css.

+

A Pelican Blog. Powered by Pelican and m.css.

diff --git a/pelican-theme/test/layout_minimal/index.html b/pelican-theme/test/layout_minimal/index.html index ce3c41fa..5c624ed6 100644 --- a/pelican-theme/test/layout_minimal/index.html +++ b/pelican-theme/test/layout_minimal/index.html @@ -44,7 +44,7 @@
-

A Pelican Blog. Powered by Pelican and m.css.

+

A Pelican Blog. Powered by Pelican and m.css.

diff --git a/site/publishconf.py b/site/publishconf.py index 6f8b6ea2..30a309cf 100644 --- a/site/publishconf.py +++ b/site/publishconf.py @@ -27,7 +27,7 @@ import sys sys.path.append(os.curdir) from pelicanconf import * -SITEURL = 'http://mcss.mosra.cz' +SITEURL = 'https://mcss.mosra.cz' OUTPUT_PATH = 'published/' DELETE_OUTPUT_DIRECTORY = True -- 2.30.2