Merge branch 'master' into 6093-refresh-docs

[arvados.git] / doc / _layouts / default.html.liquid

diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index 732b2addda86672ca8f5a35daaeebc1949212261..ed232c67734f700a6d686352ed26b7e7a314b021 100644 (file)
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -11,6 +11,10 @@
     <link href="{{ site.baseurl }}/css/bootstrap.css" rel="stylesheet">
     <link href="{{ site.baseurl }}/css/nav-list.css" rel="stylesheet">
     <link href="{{ site.baseurl }}/css/badges.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/code.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/font-awesome.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/carousel-override.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/button-override.css" rel="stylesheet">
     <style>
       html {
       height:100%;
@@ -52,15 +56,12 @@
       text-align: center;
       margin-bottom: 1em;
       }
-      .userinput {
-      color: #d14;
-      }
       :target {
       padding-top: 61px;
       margin-top: -61px;
       }
     </style>
-    <link href="{{ site.baseurl }}/css/bootstrap-responsive.min.css" rel="stylesheet">
+
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
         <script src="../assets/js/html5shiv.js"></script>
@@ -77,7 +78,9 @@
       <div class="row">
         {% include 'navbar_left' %}
         <div class="col-sm-9">
+          <h1>{{ page.title }}</h1>
           {{ content }}
+          {% include 'webring' %}
         </div>
       </div>
 
@@ -98,12 +101,17 @@
 
     </script>
 
-<p style="text-align: center">
-The content of this documentation is licensed under a
-<a href="https://creativecommons.org/licenses/by-sa/3.0/us/">Creative
-  Commons Attribution-Share Alike 3.0 United States</a> licence.
+{% if page.no_nav_left %}
+{% else %}
+<p style="text-align: center"><small>
+The content of this documentation is licensed under the
+<a href="{{ site.baseurl }}/user/copying/by-sa-3.0.html">Creative
+  Commons Attribution-Share Alike 3.0 United States</a> licence.<br>
+Code samples in this documentation are licensed under the
+<a href="{{ site.baseurl }}/user/copying/LICENSE-2.0.html">Apache License, Version 2.0.</a></small>
 </p>
+{% endif %}
+
 
   </body>
 </html>
-