Merge branch 'master' of github.com:automotive-grade-linux/docs-agl into sandbox/nieutin

5 files changed, 103 insertions, 3 deletions

diff --git a/conf/_config.yml b/conf/_config.yml
index ecce84d..cb5cba3 100644
--- a/conf/_config.yml
+++ b/conf/_config.yml
@@ -15,7 +15,7 @@ baseurl:        "" # the subpath of the site, e.g. /blog; NOTE: no trailing slas
 docsurl:        "/docs" # docsearch entry point 
 rss_path:       /misc/feed.xml
 
-copyright_date: "2015-2016"
+copyright_date: "2015-2017"
 
 excerpt_separator: <!--more-->
 
diff --git a/content/tocs/devguides/toc_dev_en.yml b/content/tocs/devguides/toc_dev_en.yml
index e63af6d..00dcc39 100644
--- a/content/tocs/devguides/toc_dev_en.yml
+++ b/content/tocs/devguides/toc_dev_en.yml
@@ -124,11 +124,14 @@ children:
             name: xds-agent
             url: reference/xds/part-2/2_xds-agent.html
         -
-            name: xds-exec
-            url: reference/xds/part-2/3_xds-exec.html
+            name: xds-cli
+            url: reference/xds/part-2/3_xds-cli.html
         -
             name: xds-gdb
             url: reference/xds/part-2/4_xds-gdb.html
+        -
+            name: xds-exec
+            url: reference/xds/part-2/5_xds-exec.html
 -
     name: Guides
     children:
diff --git a/site/static/js/docs.js b/site/static/js/docs.js
index 1309525..9247cd3 100644
--- a/site/static/js/docs.js
+++ b/site/static/js/docs.js
@@ -139,4 +139,17 @@ $(document).ready(function () {
             element.innerText = '';
         }
     });
+
+    $('#page-toc-source').each(function(index, element) {
+        // Process section-xxx (eg. section-note or section-config) in order
+        // to apply right style (see webdocs-agl/site/static/styles/scss/_sections.scss )
+        ['section-note', 'section-config', 'section-warning', 'section-todo'].forEach(function (sec) {
+            try {
+                res = element.innerHTML.replace(new RegExp('<!--[ ]*end-' + sec + '[ ]*-->', 'g'), '</div>');
+                element.innerHTML = res.replace(new RegExp('<!--[ ]*' + sec + '[ ]*-->', 'g'), '<div class="' + sec +'">');
+            } catch(err) { }
+        });
+    });
+
+
 });
diff --git a/site/static/styles/scss/_sections.scss b/site/static/styles/scss/_sections.scss
new file mode 100644
index 0000000..889e12a
--- /dev/null
+++ b/site/static/styles/scss/_sections.scss
@@ -0,0 +1,83 @@
+
+/* section-note blocks */
+
+div.section-note {
+    background: #FCF8E3 none repeat scroll 0% 0%;
+    color: #4e4e4e;
+    padding: 15px;
+    margin-bottom: 10px;
+    border-bottom: 5px solid #DDD;
+    border-color: #FAEBCC;
+    page-break-inside: avoid;
+}
+div.section-note table {
+    background: white;
+}
+
+div.section-note p {
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+/* section-warning blocks */
+
+div.section-warning {
+    background: #FD9595 none repeat scroll 0% 0%;
+    color: #4e4e4e;
+    padding: 15px;
+    margin-bottom: 10px;
+    border-bottom: 5px solid #DDD;
+    border-color: #FF6B6B;
+    page-break-inside: avoid;
+}
+
+div.section-warning table {
+    background: white;
+}
+
+div.section-warning p {
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+/* section-config blocks */
+
+div.section-config {
+    background: #d2e2ee none repeat scroll 0% 0%;
+    color: #4e4e4e;
+    padding: 15px;
+    margin-bottom: 10px;
+    border-bottom: 5px solid #DDD;
+    border-color: #b5c5d1;
+    page-break-inside: avoid;
+}
+
+div.section-config table {
+    background: white;
+}
+
+div.section-config p {
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+
+/* section-todo blocks */
+
+div.section-todo {
+    background: #d3eed2 none repeat scroll 0% 0%;
+    color: #4e4e4e;
+    padding: 15px;
+    margin-bottom: 10px;
+    border-bottom: 5px solid #DDD;
+    border-color: #b1d5b0;
+    page-break-inside: avoid;
+}
+
+div.section-todo table {
+    background: white;
+}
+
+div.section-todo p {
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
diff --git a/site/static/styles/scss/webdocs.scss b/site/static/styles/scss/webdocs.scss
index ccd8572..ae3b6b0 100644
--- a/site/static/styles/scss/webdocs.scss
+++ b/site/static/styles/scss/webdocs.scss
@@ -242,3 +242,4 @@ code {
 @import '_contribute';
 @import '_contact';
 @import '_artwork';
+@import '_sections';