glpi-project · Naylin15 · Oct 8, 2018 · Sep 26, 2018 · Sep 26, 2018 · Sep 26, 2018
diff --git a/README.md b/README.md
@@ -2,4 +2,4 @@ Branch created with the intention of functioning as an introduction web site of
 
 Here you can find code examples and generated files, detailed information about the project, an installation guide, screen captures, a blog with the latest news and links to the documentation and contact information.
 
-Link to the web site: http://flyve.org/flyve-mdm-ios-inventory-agent/
+Link to the web site: http://flyve.org/ios-inventory-agent/
diff --git a/_data/whitelist_version.yml b/_data/whitelist_version.yml
diff --git a/_includes/head.html b/_includes/head.html
@@ -44,6 +44,9 @@
     <script src="{{ "/js/jazzy.js" | absolute_url }}" defer></script>
   {% endif %}
 
+  {% if page.layout == 'testReport' %}
+  <link rel="stylesheet" href="{{ "/css/testReport.css" | absolute_url }}">
+  {% endif %}
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | absolute_url }}">
 

diff --git a/_includes/header.html b/_includes/header.html
@@ -36,15 +36,78 @@
                             <a class="color-type-secondary" href="{{ '/screenshots' | absolute_url }}">Screenshots</a>
                         </li>
 
-                        <li class="dropdown" data-proofer-ignore>
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Development<i class="glyph glyph-chevron-down-2"></i></a>
+                        <li class="dropdown">
+                            <a
+                              href="#"
+                              class="dropdown-toggle"
+                              data-toggle="dropdown"
+                              role="button"
+                              aria-expanded="false"
+                              aria-label="Development"
+                            >
+                              Development <i class="glyph glyph-chevron-down-2"></i>
+                            </a>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ 'development/code-documentation/' | absolute_url }}">Code documentation</a></li>
-                                <li class="divider"></li>
-                                <li><a href="{{ 'development/coverage/' | absolute_url }}">Coverage</a></li>
-                                <li><a href="{{ 'development/test-reports/' | absolute_url }}">Test report</a></li>
+                              <li class="dropdown-submenu">
+                                <a
+                                  href="#"
+                                  class="dropdown-toggle"
+                                  data-toggle="dropdown"
+                                  aria-label="Code documentation"
+                                >
+                                  Code documentation <i class="glyph glyph-chevron-down-2"></i>
+                                </a>
+                                <ul class="dropdown-menu">
+                                  <li><a href="{{ '/development/code-documentation/develop' | absolute_url }}">Develop</a></li>
+                                  <li><a href="{{ '/development/code-documentation/master' | absolute_url }}">Master</a></li>
+                                  {% for version in site.data.whitelist_version %}
+                                    <li>
+                                      <a href="{{ 'development/code-documentation/support/' | absolute_url }}{{ version }}">{{ version }}</a>
+                                    </li>
+                                  {% endfor %}
+                                </ul>
+                              </li>
+                              <li class="divider"></li>
+                              <li class="dropdown-submenu">
+                                <a
+                                  href="#"
+                                  class="dropdown-toggle"
+                                  data-toggle="dropdown"
+                                  aria-label="Coverage"
+                                >
+                                  Coverage<i class="glyph glyph-chevron-down-2"></i>
+                                </a>
+                                <ul class="dropdown-menu">
+                                  <li><a href="{{ '/development/coverage/develop/' | absolute_url }}">Develop</a></li>
+                                    <li><a href="{{ '/development/coverage/master/' | absolute_url }}">Master</a></li>
+                                    {% for version in site.data.whitelist_version %}
+                                      <li>
+                                        <a href="{{ 'development/coverage/support/' | absolute_url }}">{{ version }}</a>
+                                      </li>
+                                    {% endfor %}
+                                </ul>
+                              </li>
+                              <li class="dropdown-submenu">
+                                <a
+                                  href="#"
+                                  class="dropdown-toggle"
+                                  data-toggle="dropdown"
+                                  aria-label="Coverage"
+                                >
+                                  Test Report<i class="glyph glyph-chevron-down-2"></i>
+                                </a>
+                                <ul class="dropdown-menu">
+                                  <li><a href="{{ '/development/test-report/develop/' | absolute_url }}">Develop</a></li>
+                                    <li><a href="{{ '/development/test-report/master/' | absolute_url }}">Master</a></li>
+                                    {% for version in site.data.whitelist_version %}
+                                      <li>
+                                        <a href="{{ 'development/test-report/support/' | absolute_url }}">{{ version }}</a>
+                                      </li>
+                                    {% endfor %}
+                                </ul>
+                              </li>
                             </ul>
-                        </li>
+                          </li>
 
                         <li>
                             <a class="color-type-secondary" href="{{ '/howtos' | absolute_url }}">How-tos</a>

diff --git a/_layouts/testReport.html b/_layouts/testReport.html
@@ -0,0 +1,13 @@
+---
+layout: container
+---
+
+<div class="test-report">
+
+    <script>
+        let changeDisplay = function (id) {
+        $(id).slideToggle()
+        }
+    </script>
+  {{ content }}
+</div>
diff --git a/_sass/_header.scss b/_sass/_header.scss
@@ -7,6 +7,30 @@ header {
     }
   }
 
+  .dropdown-submenu {
+    display: list-item;
+    position: relative;
+
+    &>.dropdown-menu {
+      left: 100%;
+      margin-top: -52px;
+      top: 0;
+    }
+
+    .pull-left {
+      float: none;
+
+      &>.dropdown-menu {
+        left: -100%;
+      }
+    }
+
+    i {
+      font-size: 6px;
+      line-height: 15px;
+    }
+  }
+
   @media (max-width: 1084px) {
     .logo {
       height: 30px;

diff --git a/ci/update_version_list.sh b/ci/update_version_list.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+COMMIT_MESSAGE=$(git log --pretty=oneline -n 1 $CIRCLE_SHA1)
+
+# only update list when documentation is updated
+if [[ $COMMIT_MESSAGE == *"ci(docs): generate documentation with jazzy for version"* && -z "$CIRCLE_PULL_REQUEST" ]]; then
+
+# check if support folder exists
+if [ -d "development/code-documentation/support" ]; then
+
+# remove list to create a new one and not duplicate folders
+rm ./_data/whitelist_version.yml
+
+# create fresh list
+touch ./_data/whitelist_version.yml
+
+# set path to directory where the versions folders are
+FOLDER_PATH="development/code-documentation/support"
+
+# get folders in release directory
+DIRS=`ls $FOLDER_PATH`
+
+# add version folders to list
+for DIR in $DIRS
+do
+echo  - ${DIR} >> ./_data/whitelist_version.yml
+done
+# if the list has changed commit and push changes
+  if [ -n "$(git status --porcelain _data/whitelist_version.yml)" ]; then
+
+    echo "Updating version list"
+
+    # configure git
+    git config --global user.email "[email protected]"
+    git config --global user.name "Teclib' bot"
+
+    # add new remote to push changes
+    git remote remove origin
+    git remote add origin https://$GITHUB_USER:[email protected]/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git
+
+    git add _data/whitelist_version.yml && git commit -m "ci(list): update version list"
+    git push origin gh-pages
+  fi
+fi
+
+fi
diff --git a/css/testReport.scss b/css/testReport.scss
@@ -0,0 +1,56 @@
+---
+---
+
+.test-report {
+
+    p {
+        padding: 10px;
+    }
+
+    .total {
+        h2 {
+            padding-top: 2px;
+        }
+    }
+
+    .test-suite {
+        cursor: pointer;
+        margin: 11.5px 0px;
+    }
+
+    .test-suite--failing {
+        h4 {
+            background-color: #FA4444;
+            padding: 4px 4px;
+            color: #000000;
+            overflow: auto;
+        }
+    }
+
+    .test-suite--passing {
+        h4 {
+          background-color: #6fba6f;
+          padding: 4px 4px;
+          color: #000000;
+          overflow: auto;
+        }
+    }
+
+    .test-case--passing {
+        margin-left: 0px;
+        margin-right: 0px;
+        border-bottom: groove;
+        border-width: 1px;
+        border-color: #6fba6f;
+        background-color: #eaeaea;
+    }
+
+    .test-case--failing {
+        margin-left: 0px;
+        margin-right: 0px;
+        border-bottom: groove;
+        border-width: 1px;
+        border-color: #FA4444;
+        background-color: #eaeaea;
+    }
+}
diff --git a/development/code-documentation/Classes.html → ...t/code-documentation/develop/Classes.html b/development/code-documentation/Classes.html → ...t/code-documentation/develop/Classes.html
diff --git a/...ocumentation/Classes/AboutController.html → ...tion/develop/Classes/AboutController.html b/...ocumentation/Classes/AboutController.html → ...tion/develop/Classes/AboutController.html
diff --git a/...tion/Classes/AgentSettingsController.html → ...elop/Classes/AgentSettingsController.html b/...tion/Classes/AgentSettingsController.html → ...elop/Classes/AgentSettingsController.html
diff --git a/...de-documentation/Classes/AppDelegate.html → ...entation/develop/Classes/AppDelegate.html b/...de-documentation/Classes/AppDelegate.html → ...entation/develop/Classes/AppDelegate.html
diff --git a/...ion/Classes/GlobalSettingsController.html → ...lop/Classes/GlobalSettingsController.html b/...ion/Classes/GlobalSettingsController.html → ...lop/Classes/GlobalSettingsController.html
diff --git a/...entation/Classes/InventoryController.html → .../develop/Classes/InventoryController.html b/...entation/Classes/InventoryController.html → .../develop/Classes/InventoryController.html
diff --git a/...nt/code-documentation/Classes/Logger.html → ...documentation/develop/Classes/Logger.html b/...nt/code-documentation/Classes/Logger.html → ...documentation/develop/Classes/Logger.html
diff --git a/development/code-documentation/Enums.html → ...ent/code-documentation/develop/Enums.html b/development/code-documentation/Enums.html → ...ent/code-documentation/develop/Enums.html
diff --git a/...nt/code-documentation/Enums/LogEvent.html → ...documentation/develop/Enums/LogEvent.html b/...nt/code-documentation/Enums/LogEvent.html → ...documentation/develop/Enums/LogEvent.html
diff --git a/...opment/code-documentation/Extensions.html → ...ode-documentation/develop/Extensions.html b/...opment/code-documentation/Extensions.html → ...ode-documentation/develop/Extensions.html
diff --git a/...t/code-documentation/Extensions/Date.html → ...ocumentation/develop/Extensions/Date.html b/...t/code-documentation/Extensions/Date.html → ...ocumentation/develop/Extensions/Date.html
diff --git a/...code-documentation/Extensions/String.html → ...umentation/develop/Extensions/String.html b/...code-documentation/Extensions/String.html → ...umentation/develop/Extensions/String.html
diff --git a/...lopment/code-documentation/Functions.html → ...code-documentation/develop/Functions.html b/...lopment/code-documentation/Functions.html → ...code-documentation/develop/Functions.html
diff --git a/.../code-documentation/Global Variables.html → ...cumentation/develop/Global Variables.html b/.../code-documentation/Global Variables.html → ...cumentation/develop/Global Variables.html
diff --git a/development/code-documentation/badge.svg → ...ment/code-documentation/develop/badge.svg b/development/code-documentation/badge.svg → ...ment/code-documentation/develop/badge.svg
diff --git a/development/code-documentation/img/carat.png → .../code-documentation/develop/img/carat.png b/development/code-documentation/img/carat.png → .../code-documentation/develop/img/carat.png
diff --git a/development/code-documentation/img/dash.png → ...t/code-documentation/develop/img/dash.png b/development/code-documentation/img/dash.png → ...t/code-documentation/develop/img/dash.png
diff --git a/development/code-documentation/img/gh.png → ...ent/code-documentation/develop/img/gh.png b/development/code-documentation/img/gh.png → ...ent/code-documentation/develop/img/gh.png
diff --git a/development/code-documentation/index.html → ...ent/code-documentation/develop/index.html b/development/code-documentation/index.html → ...ent/code-documentation/develop/index.html
diff --git a/development/code-documentation/search.json → ...nt/code-documentation/develop/search.json b/development/code-documentation/search.json → ...nt/code-documentation/develop/search.json
diff --git a/...ment/code-documentation/undocumented.json → ...e-documentation/develop/undocumented.json b/...ment/code-documentation/undocumented.json → ...e-documentation/develop/undocumented.json
diff --git a/development/code-documentation/master/index.html b/development/code-documentation/master/index.html
@@ -0,0 +1,3 @@
+---
+layout: jazzy
+---
diff --git a/development/coverage/index.html → development/coverage/develop/index.html b/development/coverage/index.html → development/coverage/develop/index.html
diff --git a/development/coverage/report.json → development/coverage/develop/report.json b/development/coverage/report.json → development/coverage/develop/report.json
diff --git a/development/coverage/master/index.html b/development/coverage/master/index.html
@@ -0,0 +1,5 @@
+---
+layout: coverage
+---
+
+<h2>Coming soon ...</h2>
diff --git a/development/test-report/develop/index.html b/development/test-report/develop/index.html
@@ -0,0 +1,92 @@
+---
+layout: testReport
+---
+
+<div class="total row">
+    <h2 class="col-sm-18">Test Results</h2>
+    <h2 class="col-sm-6 text-right">8 tests</h2>
+</div>
+
+<div>
+    <div class="test-suite row test-suite--passing" onclick="changeDisplay('#test-1')">
+        <h4 class="col-sm-20">FlyveMDMInventoryAgentUITests</h4>
+        <h4 class="col-sm-4 text-right">1 tests</h4>
+    </div>
+        <!-- Failing or passing class -->
+    <div id="test-1">
+        <div class="test-case--passing row">
+            <div class="col-sm-20">
+                <p>testTakeScreenshots</p>
+            </div>
+            <div class="col-sm-4 text-right">
+                <p>29.457s</p>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div>
+    <div class="test-suite row test-suite--passing" onclick="changeDisplay('#test-2')">
+        <h4 class="col-sm-20">FlyveMDMInventoryAgentTests</h4>
+        <h4 class="col-sm-4 text-right">7 tests</h4>
+    </div>
+    <div id="test-2">
+        <div class="test-case--passing row">    
+            <div class="col-sm-12">
+                <p>testAgentSettingsController</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.020s</p>
+            </div>
+        </div>
+        <div class="test-case--passing row">    
+            <div class="col-sm-12">
+                <p>testCreateInventory</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.045s</p>
+            </div>
+        </div>
+        <div class="test-case--passing row">     
+            <div class="col-sm-12">
+                <p>testFooterView</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.017s</p>
+            </div>
+        </div>
+        <div class="test-case--passing row">     
+            <div class="col-sm-12">
+                <p>testInventoryTableView</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.017s</p>
+            </div>
+        </div>
+        <div class="test-case--passing row">     
+            <div class="col-sm-12">
+                <p>testLoadingIndicatorView</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.022s</p>
+            </div>
+        </div>
+        <div class="test-case--passing row"> 
+            <div class="title col-sm-12">
+                <p>testMessageLabel</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.021s</p>
+            </div>
+        </div>
+        <div class="test-case--passing row">     
+            <div class="col-sm-12">
+                <p>testSendXMLInventory</p>
+            </div>
+            <div class="col-sm-12 text-right">
+                <p>0.053s</p>
+            </div>
+        </div>
+    </div>
+
+</div>
diff --git a/development/test-report/master/index.html b/development/test-report/master/index.html
@@ -0,0 +1,5 @@
+---
+layout: testReport
+---
+
+<h2>Coming soon...</h2>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ Branch created with the intention of functioning as an introduction web site of

		Here you can find code examples and generated files, detailed information about the project, an installation guide, screen captures, a blog with the latest news and links to the documentation and contact information.

		Link to the web site: http://flyve.org/flyve-mdm-ios-inventory-agent/
		Link to the web site: http://flyve.org/ios-inventory-agent/