Merge branch 'master' of github.com:nigelm/exim-website

diff --git a/templates/web/common.css b/templates/web/common.css
index 71e8666b2de9fc4990f590226560d9c69875704c..2aa1c13e8af8d6143086842396de9ac9b1b4a67e 100644 (file)
--- a/templates/web/common.css
+++ b/templates/web/common.css
@@ -172,6 +172,8 @@ html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acron
   .nav li a:visited { color: #aaf; }
   .nav li a:visited:hover { color: #fff; } 
 
+  .nav li.img { padding-top: 0.1em; position:relative;top:0.3em;}
+
   #outer > #nav_float {
     position:     fixed;
     top:        0;

diff --git a/templates/web/i/gplus-32.png b/templates/web/i/gplus-32.png
new file mode 100644 (file)
index 0000000..c42eab7
Binary files /dev/null and b/templates/web/i/gplus-32.png differ

diff --git a/templates/wrapper.xsl b/templates/wrapper.xsl
index ecd810e4c31b6df1f807f82c0d020ce6353511be..22052f97a9e0e0f5a973fcc310922fa278490ec6 100644 (file)
--- a/templates/wrapper.xsl
+++ b/templates/wrapper.xsl
@@ -66,10 +66,16 @@
                             <li> <a href="http://www.exim.org/bugzilla/">Bugs</a> </li>
                             <li> <a href="{$docroot}/credits.html">Credits</a> </li>
 
+                            <li class="img">
+                               <a href="https://plus.google.com/101257968735428844827/?prsrc=3" title="Google+">
+                                      <img src="{$docroot}/i/gplus-32.png" width="16" height="16" alt="G+"/>
+                               </a>
+                            </li>
+
                             <!-- Search Field -->
 
                                <li class="search">
-                                  <form action="http://www.google.com/search" method="get">
+                                  <form action="https://encrypted.google.com/search" method="get">
                                      <span class="search_field_container">
                                         <input type="search" name="q" placeholder="Search Docs" class="search_field"/>
                                      </span>
@@ -109,8 +115,8 @@
                          <xsl:copy-of select="$html.body.outer.append"/>
                    </div>
 
-                <!-- Load latest version of jQuery 1.4 from the Google CDN -->
-                   <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+                <!-- Load latest version of jQuery 1.6 from the Google CDN -->
+                   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
 
                 <!-- Local JavaScript -->
                    <script type="text/javascript" src="{$docroot}/common.js"></script>