Skip to content
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.

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

try to repair #726

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 41 additions & 18 deletions pelican-striped-html5up/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
<link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
{% endif %}
{% if CATEGORY_FEED_ATOM and category %}
<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
{% endif %}
{% if CATEGORY_FEED_RSS and category %}
<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
{% endif %}
{% if TAG_FEED_ATOM and tag %}
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM.format(slug=tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
{% endif %}
{% if TAG_FEED_RSS and tag %}
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS.format(slug=tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
{% endif %}
{% endblock head %}
<link rel="stylesheet" href="/theme/css/main.css" />
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/main.css" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!--[if lte IE 8]><script src="/theme/js/ie/html5shiv.js"></script><![endif]-->
<!--[if lte IE 8]><link rel="stylesheet" href="/theme/css/ie8.css" /><![endif]-->
<!--[if lte IE 8]><script src="{{ SITEURL }}/theme/js/ie/html5shiv.js"></script><![endif]-->
<!--[if lte IE 8]><link rel="stylesheet" href="{{ SITEURL }}/theme/css/ie8.css" /><![endif]-->
</head>

<body>
Expand All @@ -43,7 +43,7 @@ <h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong><
<div id="sidebar">

<!-- Logo -->
<h1 id="logo"><a href="/">{{ SITENAME }}</a></h1>
<h1 id="logo"><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
<!-- Text -->
<section class="box text-style1">
<div class="inner">
Expand Down Expand Up @@ -72,21 +72,42 @@ <h1 id="logo"><a href="/">{{ SITENAME }}</a></h1>



<!-- Recent Posts -->
<!-- Contact -->
<section class="box recent-posts">
{% if SOCIAL %}
<section class="box recent-posts">
<header>
<h2>Contact Me</h2>
</header>
<ul class="social-media">
{% for name, link, text in SOCIAL %}
<li><a class="icon fa-{{ name }}" href="{{ link }}">&nbsp{{ text }}</a></li>
{% endfor %}
</ul>
</section>
{% endif %}

<!-- Keep in touch -->
{% if FEED_ALL_ATOM or FEED_ALL_RSS %}
<section class="box recent-posts">
<header>
<h2>Contact Me</h2>
<h2>Keep in touch</h2>
</header>
<ul>
<li><a class="icon fa-envelope" href="#"> eMail</a></li>
<li><a class="icon fa-twitter" href="#"> Twitter</a></li>
<li><a class="icon fa-facebook" href="#"> Facebook</a></li>
<li><a class="icon fa-github" href="#"> Github</a></li>

<ul class="social-media">
{% if FEED_ALL_ATOM %}
<li><a href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}"
type="application/atom+xml" rel="alternate"><i class="fa fa-rss fa-lg"
aria-hidden="true"></i></a></li>
{% endif %}
{% if FEED_ALL_RSS %}
<li><a href="{{ FEED_DOMAIN }}/
{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}"
type="application/rss+xml" rel="alternate"><i class="fa fa-rss fa-lg" aria-hidden="true"></i></a>
</li>
{% endif %}
</ul>
</section>


{% endif %}

<!-- Copyright -->
<ul id="copyright">
Expand All @@ -102,3 +123,5 @@ <h2>Contact Me</h2>
<!-- /#contentinfo -->
</body>
</html>