Fixing and cleaning up

example42 · Dec 26, 2024 · 393c865 · 393c865
1 parent 9680795
commit 393c865
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 160 deletions.
diff --git a/_includes/analytics.html b/_includes/analytics.html
@@ -1,29 +0,0 @@
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-70745135-1', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
-
-</script>
-<script type="application/ld+json">
-{
-  "@context": "http://schema.org",
-  "@type": "Organization",
-  "url": "https://www.example42.com/",
-  "logo": "https://www.example.com/img/logo_square.png",
-  "name": "example42",
-  "alternateName": "example42",
-  "description": "Puppet & DevOps Training and consulting.",
-  "sameAs": [
-    "https://www.facebook.com/Example42PuppetModules/",
-    "https://github.com/example42",
-    "https://www.linkedin.com/company/example42",
-    "https://www.xing.com/companies/example42",
-    "https://plus.google.com/+Example42/posts"
-  ]
-}
-</script>

diff --git a/_includes/analytics_orig.html b/_includes/analytics_orig.html
@@ -0,0 +1,29 @@
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-70745135-1', 'auto');
+  ga('set', 'anonymizeIp', true);
+  ga('send', 'pageview');
+
+</script>
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "Organization",
+  "url": "https://www.example42.com/",
+  "logo": "https://www.example.com/img/logo_square.png",
+  "name": "example42",
+  "alternateName": "example42",
+  "description": "Puppet & DevOps Training and consulting.",
+  "sameAs": [
+    "https://www.facebook.com/Example42PuppetModules/",
+    "https://github.com/example42",
+    "https://www.linkedin.com/company/example42",
+    "https://www.xing.com/companies/example42",
+    "https://plus.google.com/+Example42/posts"
+  ]
+}
+</script>
diff --git a/_includes/bloglist.html b/_includes/bloglist.html
@@ -1,7 +1,22 @@
-<p>
-{% for post in site.posts %}
-{% if post.language != "de" %}
-{{ post.date | date: "%Y-%m-%d" }} - <a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></br>
-{% endif %}
-{% endfor %}
-</p>
+<section id="blog">
+    <div class="content-section-a">
+
+        <div class="container">
+
+            <div class="row">
+                <div>
+                    <div class="lead">
+                    <ul class="posts">
+                    {% for post in site.posts %}
+                      <li>
+                      {{ post.date | date: "%Y-%m-%d" }} - <a href="{{ site.url }}{{ post.url }}" target="_parent">{{ post.title }}</a>
+                      </li>
+                    {% endfor %}
+                    </ul>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+</section>
diff --git a/_includes/bloglist42.html b/_includes/bloglist42.html
diff --git a/_includes/bloglistde.html b/_includes/bloglistde.html
diff --git a/_includes/bloglistit.html b/_includes/bloglistit.html
diff --git a/_includes/header_home.html b/_includes/header_home.html
@@ -19,22 +19,13 @@
                 <a class="page-scroll" href="#about">About</a>
                 </li>
                 <li>
-                <a class="page-scroll" href="#why">Why</a>
-                </li>
-                <li>
-                <a class="page-scroll" href="#products">Products</a>
-                </li>
-                <li>
                 <a class="page-scroll" href="#services">Services</a>
                 </li>
                 <li>
-                <a class="page-scroll" href="#training">Training</a>
-                </li>
-                <li>
-                <a class="page-scroll" href="#events">Events</a>
+                <a class="page-scroll" href="#blog">Blog</a>
                 </li>
                 <li>
-                <a class="page-scroll" href="#blog">Blog</a>
+                <a class="page-scroll" href="#opensource">Open Source</a>
                 </li>
                 <li>
                 <a class="page-scroll" href="#contact">Contact</a>

diff --git a/_includes/links.html b/_includes/links.html
@@ -1,15 +1,8 @@
           <div class="row">
             <div class="col-md-12">
               <h4><a href="https://github.com/example42">GitHub</a></h4>
-              <a href="http://www.example42.com/ubersicht/">GitHub Ubersicht</a>
               <h4><a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></h4>
-              <h4><a href="https://groups.google.com/forum/#!forum/example42-puppet-modules" target="_blank" rel="external nofollow">Google Group</a></h4>
-              <h4><a href="https://plus.google.com/+Example42" rel="publisher">Google+</a></h4>
-              <h4><a href="https://www.facebook.com/Example42PuppetModules" target="_blank" rel="external nofollow">Facebook Page</a></h4>
               <h4><a href="https://www.slideshare.net/alvagante" target="_blank" rel="external nofollow">Slideshare</a></h4>
               <h4><a href="https://www.linkedin.com/pub/alessandro-franceschi/0/84b/229" target="_blank" rel="external nofollow">Linkedin</a></h4>
-              <hr /><a href="http://bit.ly/extendingpuppet" target="_blank" rel="external nofollow"><img src="/img/ExtendingPuppet.png" border§="0"/></a>
-              <p>The missing Puppet book.<p><a href="http://amzn.to/1nenFti">Read some reviews...</a></p>
-
             </div>
           </div>
diff --git a/_includes/online_consulting.html b/_includes/online_consulting.html
@@ -1,14 +1,12 @@
 <section id="online">
     <div class="content-section-a">
-
         <div class="container">
-
             <div class="row">
                 <div class="col-lg-6 col-sm-6">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">Remote Puppet Services</h2>
                     <div class="lead">
-                      We have more than 10 years of experience on Puppet and have used it in hundreds of different places.</br>
+                      We have more than 16 years of experience on Puppet and have used it in hundreds of different places.</br>
                       Our customers have used our Remote Puppet Service for:</br>
                       <ul>
                       <li>Synchronous Q&A, troubleshooting, consulting: Any question, our answer</li>
@@ -18,21 +16,11 @@ <h2 class="section-heading">Remote Puppet Services</h2>
                       <li>Code review, optimisation, upgrade, migrations</li>
                       <li>Features requests for our OSS Puppet projects</li>
                       </ul>
-                      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>
+                      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>
                       <h3>Special OSS discount</h3>
                       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>
                     </div>
                 </div>
-                <div class="col-lg-4 col-lg-offset-2  col-sm-6">
-                  <img class="img-responsive" src="{{ site.url }}/img/imm-2.png" alt="">
-                    <h3 class="section-heading">Pay with PayPal</h3>
-                    Use this form for Credit Card payments via PayPal.</br>
-                    Besides PayPal receipt, we will send an invoice (we will ask you for your company data)</br>
-                    VAT is not included in the price. German customers should <a href="mailto:[email protected]?subject=Puppet Service request">get in contact with us</a>.</br>
-                    {% include paypal.html %}
-                </div>
             </div>
-
         </div>
-
 </section>
diff --git a/_includes/opensource.html b/_includes/opensource.html
@@ -6,12 +6,10 @@
                     <div class="clearfix"></div>
                     <h2 class="section-heading">Open Source</h2>
                     <div class="lead">
-                       We share ideas, discussions and code also in these places.
-                       <h4>Code:</br> <a href="https://github.com/example42">GitHub</a> - <a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></br>
+                       Our Open Source projects are on <a href="https://github.com/example42">GitHub</a>:</br>
                        <a href="https://github.com/example42/psick">PSICK</a> - <a href="http://www.tiny-puppet.com/">Tiny Puppet</a></h4>
-                       <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>
-                       <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>
-                       <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>
+                       <a href="https://github.com/example42/psick">PSICK</a></br>
+                       Check our modules on the <a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></br>
                    </div>
                 </div>
                 <div class="col-lg-4 col-sm-pull-6  col-sm-6">

diff --git a/_includes/thankyou.html b/_includes/thankyou.html
@@ -9,12 +9,12 @@
                     <h2 class="section-heading">Thank you!</h2>
                     <div class="lead">
                       We have received your contact request and we are going to reply as soon as possible.</br>
-                      In the meantime you can give a look to our Open Source projects and documentation:</br>
-                       <h4>Code:</br> <a href="https://github.com/example42">GitHub</a> - <a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></br>
-                       <a href="https://github.com/example42/psick">PSICK</a> - <a href="http://www.tiny-puppet.com/">Tiny Puppet</a></h4>
-                       <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>
-                       <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>
-                       <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>
+                      In the meantime you can give a look to our Open Source projects:</br>
+                       <a href="https://github.com/example42">GitHub</a></br>
+                       <a href="https://forge.puppetlabs.com/example42">Puppet Forge</a></br>
+                       <a href="https://github.com/example42/psick">PSICK</a></br>
+                       <a href="http://www.tiny-puppet.com/">Tiny Puppet</a></br>
+                       <a href="https://www.slideshare.net/alvagante" target="_blank" rel="external nofollow">Presentations</a></br>
                     </div>
                 </div>
                 <div class="col-lg-4 col-lg-offset-2  col-sm-6">

diff --git a/_includes/why_example42.html b/_includes/why_example42.html
@@ -20,7 +20,7 @@ <h2 class="section-heading">Why example42</h2>
                     </div>
 
                     <div class="lead">
-                      We are official partners and work closely with Puppet Inc.</br>
+                      We are official partners and work closely with Puppet by Perforce.</br>
                       <img src="../img/Service-Delivery-Silver-H.png" alt="PuppetLabs Service Delivery Partner - Silver" width="48%" heigth="auto">
 <img src="../img/Authorized-Training-H.png" alt="PuppetLabs Authorized Training Partner" width="48%" heigth="auto">
                     </div>

diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -1,3 +1,3 @@
-{% include wordpress_header.html %}
+{% include header.html %}
 {% include post_detail.html %}
 {% include wordpress_footer.html %}
diff --git a/_layouts/bloglist.html b/_layouts/bloglist.html
@@ -1,3 +1,12 @@
-{% include wordpress_header.html %}
-{% include bloglist.html %}
-{% include wordpress_footer.html %}
+<!DOCTYPE html>
+<html>
+	{% include head.html %}
+
+	<body>
+		{% include header.html %}
+		{% include bloglist.html %}
+		{% include footer.html %}
+		{% include js.html %}
+		{% include analytics.html %}
+	</body>
+</html>
diff --git a/_layouts/bloglist42.html b/_layouts/bloglist42.html
diff --git a/_layouts/bloglistde.html b/_layouts/bloglistde.html
diff --git a/_layouts/bloglistit.html b/_layouts/bloglistit.html
diff --git a/blog42/index.html b/blog42/index.html
diff --git a/de/index.html b/de/index.html
diff --git a/it/index.html b/it/index.html
diff --git a/js/jquery-1.11.0.js b/js/jquery-1.11.0.js