From cf9e9d9652d5c35b49f589d1bfda59fe49832512 Mon Sep 17 00:00:00 2001
From: Aleksey Chichenkov <a.chichenkov@initi.ru>
Date: Fri, 15 Mar 2019 10:50:42 +0300
Subject: [PATCH] small design and bug fixes

---
 conf.json                                       | 8 ++++----
 templates/initi/publish.js                      | 4 ++++
 templates/initi/search_inheritance.js           | 9 +++++++--
 templates/initi/static/styles/common.css        | 1 -
 templates/initi/static/styles/jsdoc-default.css | 7 ++++++-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/conf.json b/conf.json
index fec636f..0e6ed26 100644
--- a/conf.json
+++ b/conf.json
@@ -5,9 +5,9 @@
     "recurseDepth": 10,
     "source": {
         "include": ["docfiles"],
-        "include_2": ["../develop/first/gui/js/providers"],
-        "include_3": ["../develop/first/gui/js"],
-        "core": ["../develop/first/core"],
+        "include_2": ["../../develop/first/gui/js/providers"],
+        "include_3": ["../../develop/first/gui/js"],
+        "core": ["../../develop/first/core"],
         "includePattern": ".+\\.js(doc|x)?$",
         "excludePattern": "(^|\\/|\\\\)_"
     },
@@ -16,7 +16,7 @@
         "encoding": "utf8",
         "readme": "",
         "recurse": true,  
-        "destination": "../documentation/"
+        "destination": "../../documentation/"
     },
     "plugins": [
         "plugins/markdown"
diff --git a/templates/initi/publish.js b/templates/initi/publish.js
index b7622ae..a002517 100644
--- a/templates/initi/publish.js
+++ b/templates/initi/publish.js
@@ -23,7 +23,9 @@ var hasOwnProp = Object.prototype.hasOwnProperty;
 var data;
 var view;
 
+console.log(env.opts.destination)
 var outdir = path.normalize(env.opts.destination);
+console.log(outdir)
 
 function find(spec) {
     return helper.find(data, spec);
@@ -239,6 +241,8 @@ function generate(title, docs, filename, resolveLinks) {
     };
 
     outpath = path.join(outdir, filename);
+    // console.log("outdir:", outdir, "outpath:", outpath, "filename:", filename)
+
     // console.log(docData)
     html = view.render('container.tmpl', docData);
 
diff --git a/templates/initi/search_inheritance.js b/templates/initi/search_inheritance.js
index 25dfd21..47750d3 100644
--- a/templates/initi/search_inheritance.js
+++ b/templates/initi/search_inheritance.js
@@ -195,10 +195,12 @@ var generate_files = function(){
 
 
         var name = node.path.split("/").splice(6).join("_");
+        // console.log("out_name:", name)
+
         var out_path = output + "/" + name + ".html";
         node.link = name + ".html";
 
-        // console.log(node.link, node.name);
+        // console.log(node.link, node.name, node.path);
 
         try {
             var source = {
@@ -210,7 +212,10 @@ var generate_files = function(){
             logger.error('Error while generating source file %s: %s', name, e.message);
         }
 
-        generate('Source: ' + node.name, [source], out_path, false);
+
+        // out_path = out_path.replace("//", "/");
+        // console.log("out_path:", out_path);
+        generate('Source: ' + node.name, [source], node.link, false);
 
     }
 };
diff --git a/templates/initi/static/styles/common.css b/templates/initi/static/styles/common.css
index 471d74f..2b5da0f 100644
--- a/templates/initi/static/styles/common.css
+++ b/templates/initi/static/styles/common.css
@@ -172,7 +172,6 @@ h4, h4 a
 {
     font-size: 18px;
     letter-spacing: -0.33px;
-    color: #4d4e53;
 }
 .compact-method .param > .name:before {
     content: " ";
diff --git a/templates/initi/static/styles/jsdoc-default.css b/templates/initi/static/styles/jsdoc-default.css
index 131fd05..0535e3f 100644
--- a/templates/initi/static/styles/jsdoc-default.css
+++ b/templates/initi/static/styles/jsdoc-default.css
@@ -43,8 +43,13 @@ body
     background-color: white;
 }
 
-a, a:visited, a:active {
+a {
+    text-decoration: none;
     color: #0095dd;
+}
+
+a:visited, a:active {
+    color: #004fdd;
     text-decoration: none;
 }