cleanup & add newest fixes

This commit is contained in:
jem 2020-02-22 13:38:41 +01:00
parent ed3e763673
commit 3e0aa30b2a
20 changed files with 76 additions and 89 deletions

View file

@ -24,7 +24,7 @@ html, body {
} }
.below-nav { .below-nav {
margin-top: 68px; margin-top: 0px;
} }
.carousel-adjust { .carousel-adjust {

View file

@ -3,3 +3,13 @@
{% block center %} {% block center %}
{% include "/html/includes/groups.inc" %} {% include "/html/includes/groups.inc" %}
{% endblock %} {% endblock %}
{% block right %}
<p>&nbsp;</p>
{% include "/html/custom/sites.inc" %}
<p>&nbsp;</p>
{% include "/html/includes/post-latest.inc" %}
<p>&nbsp;</p>
{% include "/html/includes/post-tags.inc" %}
<p>&nbsp;</p>
{% endblock %}

View file

@ -11,8 +11,8 @@
<title>{{title}}{% block subtitle %}{% endblock %}</title> <title>{{title}}{% block subtitle %}{% endblock %}</title>
{% style "/css/bootstrap.min.css" %} {% style "/css/bootstrap.min.css" %}
{% style "/css/fonts/fontawesome/fontawesome.css" %} {% style "/css/fonts/fontawesome/fontawesome.css" %}
{% style "/css/custom.css" %} {% style "/css/custom.css" %}
{% block additional_styles %} {% block additional_styles %}
{% endblock %} {% endblock %}
@ -22,7 +22,10 @@
{% include "/html/custom/topper.inc" %} {% include "/html/custom/topper.inc" %}
</div> </div>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler navbar-toggler-right" type="button"
data-toggle="collapse" data-target="#navbarNavDropdown"
aria-controls="navbarNavDropdown" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="/">
@ -34,27 +37,14 @@
<li {%ifequal page.uri home-page.uri %} class="nav-item active" {% endifequal %} <li {%ifequal page.uri home-page.uri %} class="nav-item active" {% endifequal %}
{%ifunequal page.uri home-page.uri %} class="nav-item" {% endifunequal %}> {%ifunequal page.uri home-page.uri %} class="nav-item" {% endifunequal %}>
<a class="nav-link" href="/"> <a class="nav-link" href="/">
{% with latest=latest-posts|first %} home
{%ifequal page.title latest.title %}
home
{% else %}
{{home-page.title}}
{% endifequal %}
{% endwith %}
</a> </a>
</li> </li>
{% endif %} {% endif %}
<!-- <li class="nav-item{% if archives %} active{% endif %}" >
{% if latest-posts %} <a class="nav-link" href="{{archives-uri}}">blogs</a>
{% with latest=latest-posts|first %} </li>
<li {%ifequal page.uri latest.uri %} class="nav-item active" {% endifequal %} {% for nav-page in pages|filter-navbar %}
{%ifunequal page.uri latest.uri %} class="nav-item" {% endifunequal %}>
<a class="nav-link" href="{{latest.uri}}">news</a>
</li>
{% endwith %}
{% endif %}
-->
{% for nav-page in pages|filter-navbar %}
<li {%ifequal page.uri nav-page.uri %} class="nav-item active" {% endifequal %} <li {%ifequal page.uri nav-page.uri %} class="nav-item active" {% endifequal %}
{%ifunequal page.uri nav-page.uri %} class="nav-item" {% endifunequal %}> {%ifunequal page.uri nav-page.uri %} class="nav-item" {% endifunequal %}>
{% with nav-children=nav-page.children|filter-navbar %} {% with nav-children=nav-page.children|filter-navbar %}

View file

@ -2,6 +2,6 @@
<div class="container"> <div class="container">
<footer> <footer>
<p class="float-right"><a href="#">Back to top</a></p> <p class="float-right"><a href="#">Back to top</a></p>
<p>&copy; 2019 meissa GmbH &middot; <a href="/pages/privacy">Datenschutzerklärung</a> &middot; <a href="/pages/impressum">Impressum</a></p> <p>&copy; 2020 acme &middot; <a href="/pages/privacy">privacy</a> &middot; <a href="/pages/impressum">imprint</a></p>
</footer> </footer>
</div> </div>

View file

@ -1,4 +1,4 @@
<div class="logo" style="display: inline-block;"> <div class="logo" style="display: inline-block;">
<img src="/img/meissa/Logo_Meissa_small.png"> <img src="/img/theme/acme_auto_1906_logo.jpg">
<font>meissa GmbH</font> <font>acme</font>
</div> </div>

View file

@ -1,13 +1,17 @@
<!-- Link Social Media <!-- Link Social Media -->
{% style "css/social/bootstrap-social.css" %} {% style "css/social/bootstrap-social.css" %}
{% style "css/social/assets/css/font-awesome.css" %} {% style "css/social/assets/css/font-awesome.css" %}
-->
<!--
<div class="social-buttons" style="display: inline-block; float: right;"> <div class="social-buttons" style="display: inline-block; float: right;">
<a href="https://github.com/DomainDrivenArchitecture" class="btn btn-social-icon btn-github" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-adn']);"><span class="fab fa-github"></span></a> <a title="GitHub" href="..." rel="external">
<a href="http://stackoverflow.com/users/3405078/jerger" class="btn btn-social-icon btn-bitbucket" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-bitbucket']);"><span class="fab fa-stack-overflow"></span></a> <span class="fab fa-github text-white"></span></a>
<a href="https://www.xing.com/profile/Michael_Jerger" class="btn btn-social-icon btn-dropbox" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-dropbox']);"><span class="fab fa-xing"></span></a> <a title="Mastodon" href="..." rel="external">
<a href="https://www.linkedin.com/in/michael-jerger-805432" class="btn btn-social-icon btn-linkedin" onclick="_gaq.push(['_trackEvent', 'btn-social-icon', 'click', 'btn-facebook']);"><span class="fab fa-linkedin"></span></a> <span class="fab fa-mastodon text-white"></span></a>
<a title="Stack Overflow" href="..." rel="external">
<span class="fab fa-stack-overflow text-white"></span></a>
<a title="Xing" href="..." rel="external">
<span class="fab fa-xing text-white"></span></a>
<a title="LinkedIn" href="..." rel="external">
<span class="fab fa-linkedin text-white"></span></a>
</div> </div>
-->

View file

@ -1,8 +1,8 @@
<p>&nbsp;</p> <p>&nbsp;</p>
{% include "/html/custom/site-navigation.inc" %} {% include "/html/custom/sites.inc" %}
<p>&nbsp;</p> <p>&nbsp;</p>
{% include "/html/includes/post-latest.inc" %}
<p>&nbsp;</p> <p>&nbsp;</p>
{% include "/html/custom/partner.inc" %} {% include "/html/custom/site-partner.inc" %}
<p>&nbsp;</p> <p>&nbsp;</p>
<p>&nbsp;</p> {% include "/html/custom/site-we-support.inc" %}
{% include "/html/custom/we-support.inc" %}

View file

@ -0,0 +1,2 @@
<h3>We have partners</h3>
...

View file

@ -0,0 +1,2 @@
<h3>We support</h3>
...

View file

@ -0,0 +1 @@
maybe the link to an other site ?

View file

@ -1,25 +1,2 @@
<!-- Piwik - meissa --> <!-- put your tracking code here -->
<script type="text/javascript"> <!-- pls respect privacy and do not use google / facebook et al -->
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setDoNotTrack", true]);
_paq.push(["disableCookies"]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.meissa-gmbh.de/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '25']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.meissa-gmbh.de/piwik.php?idsite=25&rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
<!-- End Piwik Code -->
<!-- Piwik Image Tracker - meissa global -->
<img src="//piwik.meissa-gmbh.de/piwik.php?idsite=28&rec=1" style="border:0" alt="" />
<!-- End Piwik -->

View file

@ -1,8 +0,0 @@
<ul>
{% for post in latest-posts %}
<li>
{{post.date|date:"MMM dd"}} - <a href="{{post.uri}}">{{post.title}}</a>
</li>
{% endfor %}
</ul>

View file

@ -0,0 +1,10 @@
{% if latest-posts|not-empty %}
<h3>Recent Posts</h3>
<ul>
{% for post in latest-posts %}
<li>
{{post.date|date:"MMM dd"}} - <a href="{{post.uri}}">{{post.title}}</a>
</li>
{% endfor %}
</ul>
{% endif %}

View file

@ -0,0 +1,10 @@
{% if tags|not-empty %}
<div id="tags">
<h3>Tags</h3>
<ul>
{% for tag in tags %}
<li><a href="{{tag.uri}}">{{tag.name}}</a></li>
{% endfor %}
</ul>
</div>
{% endif %}

View file

@ -1,12 +0,0 @@
{% block tags %}
{% if tags|not-empty %}
<div id="tags">
<h3>Tags</h3>
<ul>
{% for tag in tags %}
<li><a href="{{tag.uri}}">{{tag.name}}</a></li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endblock %}

View file

@ -4,9 +4,8 @@
{% block content %} {% block content %}
{% block off-container-header %} {% block off-container-header %}
<div class="container below-nav"> {% include "/html/custom/content-header.inc" %}
</div> {% endblock %}
{% endblock %}
<div class="container"> <div class="container">
{% block header %} {% block header %}
{% include "/html/includes/publishing-date.inc" %} {% include "/html/includes/publishing-date.inc" %}

View file

@ -4,6 +4,7 @@
{% block content %} {% block content %}
{% block off-container-header %} {% block off-container-header %}
{% include "/html/custom/content-header.inc" %}
{% endblock %} {% endblock %}
<div class="container"> <div class="container">
@ -19,7 +20,9 @@
{% endblock %} {% endblock %}
</div> </div>
<div class="col-lg-3 hidden-md-down"> <div class="col-lg-3 hidden-md-down">
{% include "/html/custom/site-navigation.inc" %} {% block right %}
{% include "/html/custom/site-navigation.inc" %}
{% endblock %}
</div> </div>
</div> </div>

View file

@ -4,8 +4,7 @@
{% block content %} {% block content %}
{% block off-container-header %} {% block off-container-header %}
<div class="container below-nav"> {% include "/html/custom/content-header.inc" %}
</div>
{% endblock %} {% endblock %}
<div class="container"> <div class="container">

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB