cleanup & add newest fixes
This commit is contained in:
parent
ed3e763673
commit
3e0aa30b2a
20 changed files with 76 additions and 89 deletions
|
@ -24,7 +24,7 @@ html, body {
|
|||
}
|
||||
|
||||
.below-nav {
|
||||
margin-top: 68px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
.carousel-adjust {
|
||||
|
|
|
@ -3,3 +3,13 @@
|
|||
{% block center %}
|
||||
{% include "/html/includes/groups.inc" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block right %}
|
||||
<p> </p>
|
||||
{% include "/html/custom/sites.inc" %}
|
||||
<p> </p>
|
||||
{% include "/html/includes/post-latest.inc" %}
|
||||
<p> </p>
|
||||
{% include "/html/includes/post-tags.inc" %}
|
||||
<p> </p>
|
||||
{% endblock %}
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
<title>{{title}}{% block subtitle %}{% endblock %}</title>
|
||||
|
||||
|
||||
{% style "/css/bootstrap.min.css" %}
|
||||
{% style "/css/fonts/fontawesome/fontawesome.css" %}
|
||||
{% style "/css/bootstrap.min.css" %}
|
||||
{% style "/css/fonts/fontawesome/fontawesome.css" %}
|
||||
{% style "/css/custom.css" %}
|
||||
{% block additional_styles %}
|
||||
{% endblock %}
|
||||
|
@ -22,7 +22,10 @@
|
|||
{% include "/html/custom/topper.inc" %}
|
||||
</div>
|
||||
<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>
|
||||
</button>
|
||||
<a class="navbar-brand" href="/">
|
||||
|
@ -34,27 +37,14 @@
|
|||
<li {%ifequal page.uri home-page.uri %} class="nav-item active" {% endifequal %}
|
||||
{%ifunequal page.uri home-page.uri %} class="nav-item" {% endifunequal %}>
|
||||
<a class="nav-link" href="/">
|
||||
{% with latest=latest-posts|first %}
|
||||
{%ifequal page.title latest.title %}
|
||||
home
|
||||
{% else %}
|
||||
{{home-page.title}}
|
||||
{% endifequal %}
|
||||
{% endwith %}
|
||||
home
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<!--
|
||||
{% if latest-posts %}
|
||||
{% with latest=latest-posts|first %}
|
||||
<li {%ifequal page.uri latest.uri %} class="nav-item active" {% endifequal %}
|
||||
{%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 class="nav-item{% if archives %} active{% endif %}" >
|
||||
<a class="nav-link" href="{{archives-uri}}">blogs</a>
|
||||
</li>
|
||||
{% for nav-page in pages|filter-navbar %}
|
||||
<li {%ifequal page.uri nav-page.uri %} class="nav-item active" {% endifequal %}
|
||||
{%ifunequal page.uri nav-page.uri %} class="nav-item" {% endifunequal %}>
|
||||
{% with nav-children=nav-page.children|filter-navbar %}
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
<div class="container">
|
||||
<footer>
|
||||
<p class="float-right"><a href="#">Back to top</a></p>
|
||||
<p>© 2019 meissa GmbH · <a href="/pages/privacy">Datenschutzerklärung</a> · <a href="/pages/impressum">Impressum</a></p>
|
||||
<p>© 2020 acme · <a href="/pages/privacy">privacy</a> · <a href="/pages/impressum">imprint</a></p>
|
||||
</footer>
|
||||
</div>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<div class="logo" style="display: inline-block;">
|
||||
<img src="/img/meissa/Logo_Meissa_small.png">
|
||||
<font>meissa GmbH</font>
|
||||
<img src="/img/theme/acme_auto_1906_logo.jpg">
|
||||
<font>acme</font>
|
||||
</div>
|
|
@ -1,13 +1,17 @@
|
|||
<!-- Link Social Media
|
||||
<!-- Link Social Media -->
|
||||
{% style "css/social/bootstrap-social.css" %}
|
||||
{% style "css/social/assets/css/font-awesome.css" %}
|
||||
-->
|
||||
|
||||
<!--
|
||||
<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 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>
|
||||
<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 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>
|
||||
<a title="GitHub" href="..." rel="external">
|
||||
<span class="fab fa-github text-white"></span></a>
|
||||
<a title="Mastodon" href="..." rel="external">
|
||||
<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>
|
||||
-->
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<p> </p>
|
||||
{% include "/html/custom/site-navigation.inc" %}
|
||||
{% include "/html/custom/sites.inc" %}
|
||||
<p> </p>
|
||||
{% include "/html/includes/post-latest.inc" %}
|
||||
<p> </p>
|
||||
{% include "/html/custom/partner.inc" %}
|
||||
{% include "/html/custom/site-partner.inc" %}
|
||||
<p> </p>
|
||||
<p> </p>
|
||||
{% include "/html/custom/we-support.inc" %}
|
||||
{% include "/html/custom/site-we-support.inc" %}
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
<h3>We have partners</h3>
|
||||
...
|
|
@ -0,0 +1,2 @@
|
|||
<h3>We support</h3>
|
||||
...
|
|
@ -0,0 +1 @@
|
|||
maybe the link to an other site ?
|
|
@ -1,25 +1,2 @@
|
|||
<!-- Piwik - meissa -->
|
||||
<script type="text/javascript">
|
||||
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 -->
|
||||
<!-- put your tracking code here -->
|
||||
<!-- pls respect privacy and do not use google / facebook et al -->
|
||||
|
|
|
@ -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>
|
||||
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -4,8 +4,7 @@
|
|||
|
||||
{% block content %}
|
||||
{% block off-container-header %}
|
||||
<div class="container below-nav">
|
||||
</div>
|
||||
{% include "/html/custom/content-header.inc" %}
|
||||
{% endblock %}
|
||||
<div class="container">
|
||||
{% block header %}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
{% block content %}
|
||||
{% block off-container-header %}
|
||||
{% include "/html/custom/content-header.inc" %}
|
||||
{% endblock %}
|
||||
<div class="container">
|
||||
|
||||
|
@ -19,7 +20,9 @@
|
|||
{% endblock %}
|
||||
</div>
|
||||
<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>
|
||||
|
||||
|
|
|
@ -4,8 +4,7 @@
|
|||
|
||||
{% block content %}
|
||||
{% block off-container-header %}
|
||||
<div class="container below-nav">
|
||||
</div>
|
||||
{% include "/html/custom/content-header.inc" %}
|
||||
{% endblock %}
|
||||
<div class="container">
|
||||
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 33 KiB |
Loading…
Reference in a new issue