Skip to content

Commit 393c865

Browse files
alvagantealvagante
committed
Fixing and cleaning up
1 parent 9680795 commit 393c865

21 files changed

+78
-160
lines changed

‎_includes/analytics.html‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +0,0 @@
1-
<script>
2-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
3-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
4-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
5-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
6-
7-
ga('create', 'UA-70745135-1', 'auto');
8-
ga('set', 'anonymizeIp', true);
9-
ga('send', 'pageview');
10-
11-
</script>
12-
<script type="application/ld+json">
13-
{
14-
"@context": "http://schema.org",
15-
"@type": "Organization",
16-
"url": "https://www.example42.com/",
17-
"logo": "https://www.example.com/img/logo_square.png",
18-
"name": "example42",
19-
"alternateName": "example42",
20-
"description": "Puppet & DevOps Training and consulting.",
21-
"sameAs": [
22-
"https://www.facebook.com/Example42PuppetModules/",
23-
"https://github.com/example42",
24-
"https://www.linkedin.com/company/example42",
25-
"https://www.xing.com/companies/example42",
26-
"https://plus.google.com/+Example42/posts"
27-
]
28-
}
29-
</script>

‎_includes/analytics_orig.html‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<script>
2+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
3+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
4+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
5+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
6+
7+
ga('create', 'UA-70745135-1', 'auto');
8+
ga('set', 'anonymizeIp', true);
9+
ga('send', 'pageview');
10+
11+
</script>
12+
<script type="application/ld+json">
13+
{
14+
"@context": "http://schema.org",
15+
"@type": "Organization",
16+
"url": "https://www.example42.com/",
17+
"logo": "https://www.example.com/img/logo_square.png",
18+
"name": "example42",
19+
"alternateName": "example42",
20+
"description": "Puppet & DevOps Training and consulting.",
21+
"sameAs": [
22+
"https://www.facebook.com/Example42PuppetModules/",
23+
"https://github.com/example42",
24+
"https://www.linkedin.com/company/example42",
25+
"https://www.xing.com/companies/example42",
26+
"https://plus.google.com/+Example42/posts"
27+
]
28+
}
29+
</script>

‎_includes/bloglist.html‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1-
<p>
2-
{% for post in site.posts %}
3-
{% if post.language != "de" %}
4-
{{ post.date | date: "%Y-%m-%d" }} - <a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></br>
5-
{% endif %}
6-
{% endfor %}
7-
</p>
1+
<section id="blog">
2+
<div class="content-section-a">
3+
4+
<div class="container">
5+
6+
<div class="row">
7+
<div>
8+
<div class="lead">
9+
<ul class="posts">
10+
{% for post in site.posts %}
11+
<li>
12+
{{ post.date | date: "%Y-%m-%d" }} - <a href="{{ site.url }}{{ post.url }}" target="_parent">{{ post.title }}</a>
13+
</li>
14+
{% endfor %}
15+
</ul>
16+
</div>
17+
</div>
18+
</div>
19+
20+
</div>
21+
22+
</section>

‎_includes/bloglist42.html‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎_includes/bloglistde.html‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎_includes/bloglistit.html‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎_includes/header_home.html‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,13 @@
1919
<a class="page-scroll" href="#about">About</a>
2020
</li>
2121
<li>
22-
<a class="page-scroll" href="#why">Why</a>
23-
</li>
24-
<li>
25-
<a class="page-scroll" href="#products">Products</a>
26-
</li>
27-
<li>
2822
<a class="page-scroll" href="#services">Services</a>
2923
</li>
3024
<li>
31-
<a class="page-scroll" href="#training">Training</a>
32-
</li>
33-
<li>
34-
<a class="page-scroll" href="#events">Events</a>
25+
<a class="page-scroll" href="#blog">Blog</a>
3526
</li>
3627
<li>
37-
<a class="page-scroll" href="#blog">Blog</a>
28+
<a class="page-scroll" href="#opensource">Open Source</a>
3829
</li>
3930
<li>
4031
<a class="page-scroll" href="#contact">Contact</a>

‎_includes/links.html‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
<div class="row">
22
<div class="col-md-12">
33
<h4><a href="https://github.com/example42">GitHub</a></h4>
4-
<a href="http://www.example42.com/ubersicht/">GitHub Ubersicht</a>
54
<h4><a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></h4>
6-
<h4><a href="https://groups.google.com/forum/#!forum/example42-puppet-modules" target="_blank" rel="external nofollow">Google Group</a></h4>
7-
<h4><a href="https://plus.google.com/+Example42" rel="publisher">Google+</a></h4>
8-
<h4><a href="https://www.facebook.com/Example42PuppetModules" target="_blank" rel="external nofollow">Facebook Page</a></h4>
95
<h4><a href="https://www.slideshare.net/alvagante" target="_blank" rel="external nofollow">Slideshare</a></h4>
106
<h4><a href="https://www.linkedin.com/pub/alessandro-franceschi/0/84b/229" target="_blank" rel="external nofollow">Linkedin</a></h4>
11-
<hr /><a href="http://bit.ly/extendingpuppet" target="_blank" rel="external nofollow"><img src="/img/ExtendingPuppet.png" border§="0"/></a>
12-
<p>The missing Puppet book.<p><a href="http://amzn.to/1nenFti">Read some reviews...</a></p>
13-
147
</div>
158
</div>

‎_includes/online_consulting.html‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<section id="online">
22
<div class="content-section-a">
3-
43
<div class="container">
5-
64
<div class="row">
75
<div class="col-lg-6 col-sm-6">
86
<div class="clearfix"></div>
97
<h2 class="section-heading">Remote Puppet Services</h2>
108
<div class="lead">
11-
We have more than 10 years of experience on Puppet and have used it in hundreds of different places.</br>
9+
We have more than 16 years of experience on Puppet and have used it in hundreds of different places.</br>
1210
Our customers have used our Remote Puppet Service for:</br>
1311
<ul>
1412
<li>Synchronous Q&A, troubleshooting, consulting: Any question, our answer</li>
@@ -18,21 +16,11 @@ <h2 class="section-heading">Remote Puppet Services</h2>
1816
<li>Code review, optimisation, upgrade, migrations</li>
1917
<li>Features requests for our OSS Puppet projects</li>
2018
</ul>
21-
We offer these services in time based packages: you buy a certain amout of our time and use it when you need (service time is valid for 12 months).</br>
19+
We offer these services in time based packages: you buy a certain amount of our time and use it when you need (service time is valid for 12 months).</br>
2220
<h3>Special OSS discount</h3>
2321
For all the activities related to our public OSS projects on <a href="https://github.com/example42">GitHub</a> we offer <b>double time!</b> (2 hours are counted as 1).</br></br>
2422
</div>
2523
</div>
26-
<div class="col-lg-4 col-lg-offset-2 col-sm-6">
27-
<img class="img-responsive" src="{{ site.url }}/img/imm-2.png" alt="">
28-
<h3 class="section-heading">Pay with PayPal</h3>
29-
Use this form for Credit Card payments via PayPal.</br>
30-
Besides PayPal receipt, we will send an invoice (we will ask you for your company data)</br>
31-
VAT is not included in the price. German customers should <a href="mailto:current@lab42.it?subject=Puppet Service request">get in contact with us</a>.</br>
32-
{% include paypal.html %}
33-
</div>
3424
</div>
35-
3625
</div>
37-
3826
</section>

‎_includes/opensource.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
<div class="clearfix"></div>
77
<h2 class="section-heading">Open Source</h2>
88
<div class="lead">
9-
We share ideas, discussions and code also in these places.
10-
<h4>Code:</br> <a href="https://github.com/example42">GitHub</a> - <a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></br>
9+
Our Open Source projects are on <a href="https://github.com/example42">GitHub</a>:</br>
1110
<a href="https://github.com/example42/psick">PSICK</a> - <a href="http://www.tiny-puppet.com/">Tiny Puppet</a></h4>
12-
<h4>Documentation:</br> <a href="https://www.example42.com/tutorials/PuppetTutorial" target="_blank">Puppet Tutorial</a> - <a href="/guide" target="_blank">The [DevOps] Guide To Puppet</a></h4>
13-
<h4>Discussion:</br> <a href="https://groups.google.com/forum/#!forum/example42-puppet-modules" target="_blank" rel="external nofollow">Google Group</a> - <a href="https://plus.google.com/+Example42" rel="publisher">Google+</a> - <a href="https://www.facebook.com/Example42PuppetModules" target="_blank" rel="external nofollow">Facebook Page</a> - <a href="https://www.twitter.com/example42" target="_blank" rel="external nofollow">Twitter</a></h4>
14-
<h4>Presentations:</br> <a href="https://www.slideshare.net/alvagante" target="_blank" rel="external nofollow">Alessandro</a> - <a href="https://www.slideshare.net/tuxmea" target="_blank" rel="external nofollow">Martin</a></h4>
11+
<a href="https://github.com/example42/psick">PSICK</a></br>
12+
Check our modules on the <a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></br>
1513
</div>
1614
</div>
1715
<div class="col-lg-4 col-sm-pull-6 col-sm-6">

0 commit comments

Comments
 (0)