Allineamento template delle due pagine.

This commit is contained in:
Emiliano Vavassori 2021-12-01 21:19:22 +01:00
parent b919b80140
commit afed6a1854
2 changed files with 100 additions and 100 deletions

View File

@ -41,7 +41,6 @@
{% endblock %} {% endblock %}
<script src="https://kit.fontawesome.com/0a2f7dbe4a.js" crossorigin="anonymous"></script> <script src="https://kit.fontawesome.com/0a2f7dbe4a.js" crossorigin="anonymous"></script>
<script src="/js/jquery-3.5.1.min.js" crossorigin="anonymous"></script> <script src="/js/jquery-3.5.1.min.js" crossorigin="anonymous"></script>
<script type="text/javascript"> <script type="text/javascript">
function mobileMenu() { function mobileMenu() {
$( "nav.nav" ).toggle(); $( "nav.nav" ).toggle();
@ -90,48 +89,46 @@
{% endif %} {% endif %}
<nav class="nav"> <nav class="nav">
<ul class="list-bare"> <ul class="list-bare">
{% for name, link, blank in MENUITEMS %} {% for name, link, blank in MENUITEMS %}
{% if blank %} {% if blank %}
<li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}" target="_blank">{{ name }}</a></li> <li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}" target="_blank">{{ name }}</a></li>
{% else %} {% else %}
<li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}">{{ name }}</a></li> <li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}">{{ name }}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if DISPLAY_PAGES_ON_MENU and pages %}{% for p in pages %} {% if DISPLAY_PAGES_ON_MENU and pages %}{% for p in pages %}
<li><a class="nav__link" href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li> <li><a class="nav__link" href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}{% endif %} {% endfor %}{% endif %}
<li class="mobile-only"><a class="nav__link" href="/partners" title="Partners">Partners</a></li> <li class="mobile-only"><a class="nav__link" href="/partners" title="Partners">Partners</a></li>
<li class="mobile-only"><a class="nav__link" href="/social" title="Social Media">Social Media</a></li> <li class="mobile-only"><a class="nav__link" href="/social" title="Social Media">Social Media</a></li>
<li class="mobile-only"><a class="nav__link" href="/colophon" title="Colophon">Colophon</a></li> <li class="mobile-only"><a class="nav__link" href="/colophon" title="Colophon">Colophon</a></li>
</ul>
<script src="/js/livepointers.js" type="text/javascript"></script>
</ul>
<script src="/js/livepointers.js" type="text/javascript"></script>
</nav> </nav>
{% if DISPLAY_CATEGORIES_ON_MENU and categories %} {% if DISPLAY_CATEGORIES_ON_MENU and categories %}
<div class="categories"> <div class="categories">
<h2>Categories</h2> <h2>Categories</h2>
<ul class="navbar"> <ul class="navbar">
{% for cat, null in categories %} {% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}><a <li{% if cat == category %} class="active"{% endif %}><a
href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% if LINKS %} {% if LINKS %}
<div class="links"> <div class="links">
<h2 class="blog_roll_link"><br/>BLOGROLLS</h2> <h2 class="blog_roll_link"><br/>BLOGROLLS</h2>
<ul class="navbar"> <ul class="navbar">
{% for name, link in LINKS %} {% for name, link in LINKS %}
<li><a href="{{ link }}">{{ name }}</a></li> <li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
@ -148,28 +145,28 @@
<!-- Footer --> <!-- Footer -->
{% if DISPLAY_FOOTER or DISPLAY_FOOTER is not defined %} {% if DISPLAY_FOOTER or DISPLAY_FOOTER is not defined %}
<footer> <footer>
<p>I contenuti del sito sono tutti rilasciati con licenza <a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0">CC BY 3.0</a><br/> <p>I contenuti del sito sono tutti rilasciati con licenza <a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0">CC BY 3.0</a><br/>
<a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0"><img src="https://i0.wp.com/www.libreitalia.org/wp-content/uploads/2017/11/by.png?fit=249%2C87&amp;ssl=1" alt="Creative Commons BY Logo" /></a> <a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0"><img src="https://i0.wp.com/www.libreitalia.org/wp-content/uploads/2017/11/by.png?fit=249%2C87&amp;ssl=1" alt="Creative Commons BY Logo" /></a>
</p> </p>
</footer> </footer>
{% endif %} {% endif %}
{% if GOOGLE_ANALYTICS %} {% if GOOGLE_ANALYTICS %}
<!-- Analytics --> <!-- Analytics -->
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']); _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement('script');
ga.type = 'text/javascript'; ga.type = 'text/javascript';
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
{% endif %} {% endif %}
</body> </body>

View File

@ -90,49 +90,52 @@
{% endif %} {% endif %}
<nav class="nav"> <nav class="nav">
<ul class="list-bare"> <ul class="list-bare">
{% for name, link, blank in MENUITEMS %} {% for name, link, blank in MENUITEMS %}
{% if blank %} {% if blank %}
<li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}" target="_blank">{{ name }}</a></li> <li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}" target="_blank">{{ name }}</a></li>
{% else %} {% else %}
<li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}">{{ name }}</a></li> <li><a id="nav_{{ name | lower() }}" class="nav__link" href="{{ link }}" title="{{ name|striptags }}">{{ name }}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<li class="mobile-only"><a class="nav__link" href="/partners" title="Partners">Partners</a></li>
<li class="mobile-only"><a class="nav__link" href="/social" title="Social Media">Social Media</a></li>
<li class="mobile-only"><a class="nav__link" href="/colophon" title="Colophon">Colophon</a></li>
{% if DISPLAY_PAGES_ON_MENU and pages %}{% for p in pages %} {% if DISPLAY_PAGES_ON_MENU and pages %}{% for p in pages %}
<li><a class="nav__link" href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li> <li><a class="nav__link" href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}{% endif %} {% endfor %}{% endif %}
<li class="mobile-only"><a class="nav__link" href="/partners" title="Partners">Partners</a></li>
</ul> <li class="mobile-only"><a class="nav__link" href="/social" title="Social Media">Social Media</a></li>
<li class="mobile-only"><a class="nav__link" href="/colophon" title="Colophon">Colophon</a></li>
</ul>
<script src="/js/livepointers.js" type="text/javascript"></script>
</nav> </nav>
{% if DISPLAY_CATEGORIES_ON_MENU and categories %} {% if DISPLAY_CATEGORIES_ON_MENU and categories %}
<h2>Categories</h2> <div class="categories">
<ul class="navbar"> <h2>Categories</h2>
{% for cat, null in categories %} <ul class="navbar">
<li{% if cat == category %} class="active"{% endif %}><a {% for cat, null in categories %}
href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> <li{% if cat == category %} class="active"{% endif %}><a
{% endfor %} href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
</ul> {% endfor %}
</ul>
</div>
{% endif %} {% endif %}
{% if LINKS %} {% if LINKS %}
<h2 class="blog_roll_link"><br/>BLOGROLLS</h2> <div class="links">
<ul class="navbar"> <h2 class="blog_roll_link"><br/>BLOGROLLS</h2>
{% for name, link in LINKS %} <ul class="navbar">
<li><a href="{{ link }}">{{ name }}</a></li> {% for name, link in LINKS %}
{% endfor %} <li><a href="{{ link }}">{{ name }}</a></li>
</ul> {% endfor %}
</ul>
</div>
{% endif %} {% endif %}
{% include "partners.html" %} {% include "partners.html" %}
{% include "social.html" %} {% include "social.html" %}
{% include "license.html" %} {% include "license.html" %}
</aside> </aside>
<!-- Content --> <!-- Content -->
@ -143,28 +146,28 @@
<!-- Footer --> <!-- Footer -->
{% if DISPLAY_FOOTER or DISPLAY_FOOTER is not defined %} {% if DISPLAY_FOOTER or DISPLAY_FOOTER is not defined %}
<footer> <footer>
<p>I contenuti del sito sono tutti rilasciati con licenza <a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0">CC BY 3.0</a><br/> <p>I contenuti del sito sono tutti rilasciati con licenza <a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0">CC BY 3.0</a><br/>
<a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0"><img src="https://i0.wp.com/www.libreitalia.org/wp-content/uploads/2017/11/by.png?fit=249%2C87&amp;ssl=1" alt="Creative Commons BY Logo" /></a> <a href="https://creativecommons.org/licenses/by/3.0/it/" title="Creative Commons - Attiribuzione 3.0"><img src="https://i0.wp.com/www.libreitalia.org/wp-content/uploads/2017/11/by.png?fit=249%2C87&amp;ssl=1" alt="Creative Commons BY Logo" /></a>
</p> </p>
</footer> </footer>
{% endif %} {% endif %}
{% if GOOGLE_ANALYTICS %} {% if GOOGLE_ANALYTICS %}
<!-- Analytics --> <!-- Analytics -->
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']); _gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']);
_gaq.push(['_trackPageview']); _gaq.push(['_trackPageview']);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement('script');
ga.type = 'text/javascript'; ga.type = 'text/javascript';
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
{% endif %} {% endif %}
</body> </body>