updates for 6.0 release start here. see the release notes for all the details in 6.0

This commit is contained in:
tomjohnson1492
2016-07-04 23:41:16 -07:00
parent a468f26a3f
commit 2b60b63e25
140 changed files with 11559 additions and 12124 deletions

View File

@ -10,9 +10,6 @@
{% elsif page.sidebar == "mydoc_sidebar" %}
{% assign sidebar = site.data.sidebars.mydoc_sidebar.entries %}
{% elsif page.sidebar == "tags_sidebar" %}
{% assign sidebar = site.data.sidebars.tags_sidebar.entries %}
{% else %}
{% assign sidebar = site.data.sidebars.home_sidebar.entries %}
{% endif %}

View File

@ -1,15 +1,14 @@
<div id="userMap">
<div class="content"><a href="{{site.data.urls.p2_sample1.url}}"><div class="box box1">Connect to ADB</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="{{site.data.urls.p2_sample2.url}}"><div class="box box2">Download and Build the Starter Kit</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="{{site.data.urls.p2_sample3.url}}"><div class="box box3">Take a Tour</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="{{site.data.urls.p2_sample4.url}}"><div class="box box4">Load Your Widgets</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="{{site.data.urls.p2_sample5.url}}"><div class="box box5">Query for Something</div></a></div>
<div class="content"><a href="p2_sample1.html"><div class="box box1">Connect to ADB</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="p2_sample2.html"><div class="box box2">Download and Build the Starter Kit</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="p2_sample3.html"><div class="box box3">Take a Tour</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="p2_sample4.html"><div class="box box4">Load Your Widgets</div></a></div>
<div class="arrow"></div>
<div class="content"><a href="p2_sample5.html"><div class="box box5">Query for Something</div></a></div>
<div class="clearfix"></div>
</div>

View File

@ -15,9 +15,9 @@
<p>This is just dummy text ... Your first steps should be to get started. You will need to do the following:</p>
<ul>
<li>{{site.data.urls.p2_sample6.link}}</li>
<li>{{site.data.urls.p2_sample7.link}}</li>
<li>{{site.data.urls.p2_sample8.link}}</li>
<li><a href="p2_sample6.html">Sample 6</a></li>
<li><a href="p2_sample7.html">Sample 7</a></li>
<li><a href="p2_sample8.html">Sample 8</a></li>
</ul>
<p>If you run into any of these setup issues, you must solve them before you can continue on.</p>
@ -45,9 +45,9 @@
<p>In order to configure your widgets, you will need to follow these topics:</p>
<ul>
<li>{{site.data.urls.p2_sample9.link}}</li>
<li>{{site.data.urls.p2_sample10.link}}</li>
<li>{{site.data.urls.p2_sample11.link}}</li>
<li><a href="p2_sample9.html">Sample 9</a></li>
<li><a href="p2_sample10.html">Sample 10</a></li>
<li><a href="p2_sample11.html">Sample 11</a></li>
</ul>
</div>
<div class="modal-footer">
@ -73,9 +73,9 @@
<p>After you've configured all the necessary components to build your space transformer, you need to publish your app. Of course this content is also just dummy text. Pay no particular attention to the content but rather the format and placement of the map.</p>
<p>To publish your app, see the following:
<ul>
<li>{{site.data.urls.p2_sample12.link}}</li>
<li>{{site.data.urls.p2_sample13.link}}</li>
<li>{{site.data.urls.p2_sample14.link}}</li>
<li><a href="p2_sample12.html">Sample 12</a></li>
<li><a href="p2_sample13.html">Sample 13</a></li>
<li><a href="p2_sample14.html">Sample 14</a></li>
</ul>
</div>
<div class="modal-footer">

View File

@ -3,7 +3,7 @@
<div class="col-lg-12 footer">
&copy;{{ site.time | date: "%Y" }} {{site.company_name}}. All rights reserved. <br />
{% if page.last_updated %}<p>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y" }} <br />
<p><img src="{{ "/images/company_logo.png" | prepend: site.baseurl }}" alt="Company logo"/></p>
<p><img src="{{ "images/company_logo.png" }}" alt="Company logo"/></p>
</div>
</div>
</footer>
</footer>

View File

@ -3,28 +3,28 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{% if page.summary %}{{ page.summary | strip_html | strip_newlines | truncate: 160 }}{% endif %}">
<meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
<title>{% if page.homepage == true %} {{site.homepage_title}} {% elsif page.title %}{{ page.title }}{% endif %} | {{ site.site_title }}</title>
<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl }}">
<title>{{ page.title }} | {{ site.site_title }}</title>
<link rel="stylesheet" href="{{ "css/syntax.css" }}">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<!--<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">-->
<link rel="stylesheet" href="{{ "/css/modern-business.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/css/lavish-bootstrap.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/css/customstyles.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "/css/theme-blue.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ "css/modern-business.css" }}">
<link rel="stylesheet" href="{{ "css/lavish-bootstrap.css" }}">
<link rel="stylesheet" href="{{ "css/customstyles.css" }}">
<link rel="stylesheet" href="{{ "css/theme-blue.css" }}">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
<script src="{{ "/js/jquery.navgoco.min.js" | prepend: site.baseurl }}"></script>
<script src="{{ "js/jquery.navgoco.min.js" }}"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/2.0.0/anchor.min.js"></script>
<script src="{{ "/js/toc.js" | prepend: site.baseurl }}"></script>
<script src="{{ "/js/customscripts.js" | prepend: site.baseurl }}"></script>
<script src="{{ "js/toc.js" }}"></script>
<script src="{{ "js/customscripts.js" }}"></script>
<link rel="shortcut icon" href="{{ "/images/favicon.ico" | prepend: site.baseurl }}">
<link rel="shortcut icon" href="{{ "images/favicon.ico" }}">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -33,9 +33,4 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "feed.xml" | prepend: site.url }}">

View File

@ -1 +1 @@
<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" href="{{include.url}}">{% endif %}<img class="docimage" src="{{site.baseurl | prepend: site.url}}/images/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption></figure>{% endif %}
<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" href="{{include.url}}">{% endif %}<img class="docimage" src="../images/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption></figure>{% endif %}

View File

@ -1 +1 @@
<img class="inline" src="{{site.image_path}}/{{include.file}}{% if site.target == "hippo" %}._TTH_{% endif %}.{{include.type}}" alt="{{include.alt}}" />
<img class="inline" src="images/{{include.file}}" alt="{{include.alt}}" />

54
_includes/links.html Normal file
View File

@ -0,0 +1,54 @@
{% comment %}Get links from each sidebar, as listed in the _config.yml file under sidebars{% endcomment %}
{% for sidebar in site.sidebars %}
{% for entry in site.data.sidebars[sidebar].entries %}
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
[{{folderitem.url | remove: "/" }}]: {{folderitem.url | remove: "/" | append: ".html"}}
{% for subfolders in folderitem.subfolders %}
{% for subfolderitem in subfolders.subfolderitems %}
[{{subfolderitem.url | remove: "/" }}]: {{subfolderitem.url | remove: "/" | append: ".html"}}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
{% comment %} Get links from topnav {% endcomment %}
{% for entry in site.data.topnav.topnav %}
{% for item in entry.items %}
{% if item.external_url == null %}
[{{item.url | remove: "/" }}]: {{item.url | remove: "/" | append: ".html"}}
{% endif %}
{% endfor %}
{% endfor %}
{% comment %}Get links from topnav dropdowns {% endcomment %}
{% for entry in site.data.topnav.topnav_dropdowns %}
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
{% if folderitem.external_url == null %}
[{{folderitem.url | remove: "/" }}]: {{folderitem.url | remove: "/" | append: ".html"}}
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
{% comment %}Get links for otherlinks.yml file {% endcomment %}
{% for entry in site.data.otherlinks.entries %}
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
[{{folderitem.ref}}]: {{folderitem.exact_url}}
{% for subfolders in folderitem.subfolders %}
{% for subfolderitem in subfolders.subfolderitems %}
[{{subfolderitem.ref}}]: {{subfolderitem.exact_url}}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}

View File

@ -13,9 +13,9 @@
{% if folderitem.external_url %}
<li><a href="{{folderitem.external_url}}" target="_blank">{{folderitem.title}}</a></li>
{% elsif page.url == folderitem.url %}
<li class="active"><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
<li class="active"><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
{% else %}
<li><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
<li><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
{% endif %}
{% for subfolders in folderitem.subfolders %}
{% if subfolders.output contains "web" %}
@ -27,9 +27,9 @@
{% if subfolderitem.external_url %}
<li><a href="{{subfolderitem.external_url}}" target="_blank">{{subfolderitem.title}}</a></li>
{% elsif page.url == subfolderitem.url %}
<li class="active"><a href="{{subfolderitem.url | prepend: site.baseurl}}">{{subfolderitem.title}}</a></li>
<li class="active"><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}</a></li>
{% else %}
<li><a href="{{subfolderitem.url | prepend: site.baseurl}}">{{subfolderitem.title}}</a></li>
<li><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}"</a></li>
{% endif %}
{% endif %}
{% endfor %}
@ -53,4 +53,4 @@
</div>
<!-- this highlights the active parent class in the navgoco sidebar. this is critical so that the parent expands when you're viewing a page. This must appear below the sidebar code above. Otherwise, if placed inside customscripts.js, the script runs before the sidebar code runs and the class never gets inserted.-->
<script>$("li.active").parents('li').toggleClass("active");</script>
<script>$("li.active").parents('li').toggleClass("active");</script>

View File

@ -6,7 +6,7 @@
{% for tag in page.tags %}
{% if tag == thisTag %}
<tr><td><a href="{{ page.url | prepend: site.baseurl }}">{{page.title}}</a></td>
<tr><td><a href="{{ page.url | remove: "/"}}">{{page.title}}</a></td>
<td><span class="label label-default">Page</span></td>
<td>{% if page.summary %} {{ page.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ page.content | truncatewords: 50 | strip_html }} {% endif %}</td>
</tr>
@ -19,7 +19,7 @@
{% for tag in post.tags %}
{% if tag == thisTag %}
<tr><td><a href="{{ post.url | prepend: site.baseurl }}">{{post.title}}</a></td>
<tr><td><a href="{{ post.url | remove: "/"}}">{{post.title}}</a></td>
<td><span class="label label-primary">Post</span></td>
<td>{% if post.summary %} {{ post.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ post.content | truncatewords: 50 | strip_html }} {% endif %}</td>
</tr>

View File

@ -8,7 +8,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="fa fa-home fa-lg navbar-brand" href="{{site.baseurl}}/">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
<a class="fa fa-home fa-lg navbar-brand" href="index.html">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
@ -18,9 +18,9 @@
{% if item.external_url %}
<li><a href="{{item.external_url}}" target="_blank">{{item.title}}</a></li>
{% elsif page.url contains item.url %}
<li class="active"><a href="{{item.url | prepend: site.baseurl}}">{{item.title}}</a></li>
<li class="active"><a href="{{item.url | remove: "/" | append: ".html"}}">{{item.title}}</a></li>
{% else %}
<li><a href="{{item.url | prepend: site.baseurl }}">{{item.title}}</a></li>
<li><a href="{{item.url | remove: "/" | append: ".html"}}">{{item.title}}</a></li>
{% endif %}
{% endfor %}
{% endfor %}
@ -35,9 +35,9 @@
{% if folderitem.external_url %}
<li><a href="{{folderitem.external_url}}" target="_blank">{{folderitem.title}}</a></li>
{% elsif page.url contains folderitem.url %}
<li class="dropdownActive"><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
<li class="dropdownActive"><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
{% else %}
<li><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
<li><a href="{{folderitem.url | remove: "/" | append: ".html"}}">{{folderitem.title}}</a></li>
{% endif %}
{% endfor %}
</ul>
@ -54,12 +54,12 @@
<input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}">
<ul id="results-container"></ul>
</div>
<script src="{{ "/js/jekyll-search.js" | prepend: site.baseurl }}" type="text/javascript"></script>
<script src="{{ "js/jekyll-search.js"}}" type="text/javascript"></script>
<script type="text/javascript">
SimpleJekyllSearch.init({
searchInput: document.getElementById('search-input'),
resultsContainer: document.getElementById('results-container'),
dataSource: '{{ "/search.json" | prepend: site.baseurl }}',
dataSource: '{{ "../search.json" }}',
searchResultTemplate: '<li><a href="{url}" title="{{page.title | replace: "'", "\"}}">{title}</a></li>',
noResultsText: '{{site.data.strings.search_no_results_text}}',
limit: 10,
@ -72,4 +72,4 @@
</div>
</div>
<!-- /.container -->
</nav>
</nav>