You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/04/15 23:26:25 UTC

[02/42] isis git commit: Documentation for configuring IntelliJ; aciidoc template stuff.

http://git-wip-us.apache.org/repos/asf/isis/blob/de4b83f4/adocs/template/document.html.erb
----------------------------------------------------------------------
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index 93e808c..d47dc14 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -35,22 +35,10 @@
 
 <link rel="shortcut icon" href="<%= (attr :sitebasedir) %>/images/favicon.ico">
 
-<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-
-<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
-<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-<!--
-<link href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.4/flatly/bootstrap.min.css" rel="stylesheet">
--->
-
-<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-<!--
-<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
-<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
-<link href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css" rel="stylesheet" >
--->
-
+<script type="text/javascript" src="<%= (attr :_basedir) %>js/jquery/2.1.3/jquery.min.js"></script>
+<link href="<%= (attr :_basedir) %>css/bootstrap/3.3.4/bootstrap.min.css" rel="stylesheet">
+<script src="<%= (attr :_basedir) %>js/bootstrap/3.3.4/bootstrap.min.js"></script>
+<link href="<%= (attr :_basedir) %>css/font-awesome/4.3.0/font-awesome.min.css" rel="stylesheet">
 
 
 <style type="text/css">
@@ -125,33 +113,42 @@ body {
 }
 
 div#toc li {
-    padding-left: 5px;
-    list-style-type: disc;
+    list-style-type: none;
 }
 
 div#toc li a.active {
     color: red;
 }
 
-div#toc li.active-region {
-    border-left: solid;
-    border-left-color: lightgrey;
-}
-
 div#toc li.active-region li.active-region {
     border-left: none;
 }
 
+div#toc ul {
+    -webkit-padding-start: 20px;
+}
+
+.imageblock .title {
+    padding-bottom: 30px;
+}
+
 div#toc {
     position: fixed;
-    top: 120px;
-    right: 25%;
+    top: 20px;
+    height: 2000px;
+    background-color: #eee;
+    padding-top: 120px;
+    padding-right: 10px;
 }
 
-div#doc-content {
-    width: 75%;
+h4 {
+    font-size: 22px;
 }
 
+h5 {
+    font-size: 20px;
+    font-style: italic;
+}
 </style>
 
     <!-- courtesy of http://codepo8.github.io/css-fork-on-github-ribbon/ -->
@@ -242,24 +239,29 @@ div#doc-content {
   
 
   <div class="container">
+
     <div class="row">
-      <div class="span12">
+      <div class="col-md-12">
         <div class="page-title">
           <h1><%= document.name %></h1>
         </div>
-
-        <div id="toc" class="<%= attr 'toc-class', 'toc' %>">
-            <%= converter.convert_with_options @document, 'outline', :toclevels => 4  %>
-        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-8">
         <div id="doc-content">
           <%= document.content %>
         </div>
-
+      </div>
+      <div class="col-md-4">
+        <div id="toc" class="<%= attr 'toc-class', 'toc' %>">
+          <%= converter.convert_with_options @document, 'outline', :toclevels => 4  %>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12">
         <hr>
-
-        <div id="log"></div>
-
-
         <footer>
           <p>
           Copyright &copy; 2010~2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
@@ -320,7 +322,7 @@ $(  window ).scroll(function(){
 
    console.log("id = " + id + ", lastId = "  + lastId);  
    
-   if (lastId !== id) {
+   if (lastId !== id && id) {
        lastId = id;
        // Set/remove active class
        menuItems
@@ -331,7 +333,6 @@ $(  window ).scroll(function(){
          .removeClass("active-region");
          
        menuItems
-         //.parents().removeClass("visible");
          .parents("ul").hide();
        
        menuItems