major updates across the theme to make it more user-centered

This commit is contained in:
Tom Johnson
2015-05-05 14:06:11 -07:00
parent a44149986a
commit 18e31994f2
67 changed files with 1048 additions and 683 deletions

4
_includes/alerts.html Normal file
View File

@ -0,0 +1,4 @@
{% capture tip %}<div class="alert alert-success" role="alert"><i class="fa fa-check-square-o"></i> <b>Tip: </b>{% endcapture %}
{% capture note %}<div class="alert alert-info" role="alert"><i class="fa fa-info-circle"></i> <b>Note: </b>{% endcapture %}
{% capture important %}<div class="alert alert-warning" role="alert"><i class="fa fa-warning"></i> <b>Important: </b>{% endcapture %}
{% capture warning %}<div class="alert alert-danger" role="alert"><i class="fa fa-exclamation-circle"></i> <b>Warning: </b>{% endcapture %}{% capture end %}</div>{% endcapture %}

9
_includes/callouts.html Normal file
View File

@ -0,0 +1,9 @@
{% capture callout_danger %}<div class="bs-callout bs-callout-danger">{% endcapture %}
{% capture callout_default %}<div class="bs-callout bs-callout-default">{% endcapture %}
{% capture callout_primary %}<div class="bs-callout bs-callout-primary">{% endcapture %}
{% capture callout_success %}<div class="bs-callout bs-callout-success">{% endcapture %}
{% capture callout_info %}<div class="bs-callout bs-callout-info">{% endcapture %}
{% capture callout_warning %}<div class="bs-callout bs-callout-warning">{% endcapture %}
{% capture hr_faded %}<hr class="faded"/> {%endcapture %}
{% capture hr_shaded %}<hr class="shaded"/> {%endcapture %}

View File

@ -0,0 +1,39 @@
{% comment %}<!-- OVERVIEW -->{% endcomment %}
{% capture overview %}<a href="{{"/overview" | prepend: site.baseurl}}/index.html">Overview</a>{% endcapture %}
{% capture access %}<a href="{{"/access" | prepend: site.baseurl}}/index.html">Access</a>{% endcapture %}
{% capture changepassword %}<a href="{{"/changepassword" | prepend: site.baseurl}}/index.html">Change Password</a>{% endcapture %}
{% capture architecture%}<a href="{{"/architecture" | prepend: site.baseurl}}/index.html">Architecture</a>{% endcapture %}
{% capture performance %}<a href="{{"/performance" | prepend: site.baseurl}}/index.html">Performance</a>{% endcapture %}
{% capture deployment_process_overview %}<a href="{{"/deployment_process_overview" | prepend: site.baseurl}}/index.html">Deployment Process Overview </a>{% endcapture %}
{% capture delivery_models %}<a href="{{"/delivery_models" | prepend: site.baseurl}}/index.html">Delivery Models</a>{% endcapture %}
{% comment %}<!-- TOP NAV -->{% endcomment %}
{% capture faq %}<a href="{{"/faq" | prepend: site.baseurl}}/index.html">FAQ</a>{% endcapture %}
{% capture glossary %}<a href="{{"/glossary" | prepend: site.baseurl}}/index.html">Glossary</a>{% endcapture %}
{% comment %}<!-- MANAGE USERS AND CUSTOMERS-->{% endcomment %}
{% capture managing_users %}<a href="{{"/managing_users" | prepend: site.baseurl}}/index.html">Managing Users</a>{% endcapture %}
{% capture managing_customers %}<a href="{{"/managing_customers" | prepend: site.baseurl}}/index.html">Managing Customers</a>{% endcapture %}
{% comment %}<!-- FULL DI SETUP -->{% endcomment %}
{% capture workflow_setup_full %}<a href="{{"/workflow_setup_full" | prepend: site.baseurl}}/index.html">Workflow for Setting Up DI Cloud</a>{% endcapture %}
{% capture configure_clientjs %}<a href="{{"/configure_clientjs" | prepend: site.baseurl}}/index.html">1. Configure Settings on the client.js Tab</a>{% endcapture %}
{% capture configure_recipes %}<a href="{{"/configure_recipes" | prepend: site.baseurl}}/index.html">2. Configure the DeviceInsight Recipes</a>{% endcapture %}
{% capture copy_installation_scripts %}<a href="{{"/copy_installation_scripts" | prepend: site.baseurl}}/index.html">3. Copy the Installation Scripts</a>{% endcapture %}
{% comment %}<!-- JSC HOST ONLY SETUP -->{% endcomment %}
{% capture setup_jsc_only %}<a href="{{"/setup_jsc_only" | prepend: site.baseurl}}/index.html">Setting Up JSC Hosting Only</a>{% endcapture %}
{% capture workflow_jsc %}<a href="{{"/workflow_jsc" | prepend: site.baseurl}}/index.html">Workflow for JSC Hosting Only</a>{% endcapture %}
{% comment %}<!-- LOGS -->{% endcomment %}
{% capture viewing_logs %}<a href="{{"/viewing_logs" | prepend: site.baseurl}}/index.html">Viewing Logs</a>{% endcapture %}

View File

@ -1,12 +1,9 @@
{% include linkrefs.html %}
<footer>
<footer>
<div class="row">
<div class="col-lg-12 footer">
{{hr_shaded}}
&copy;2015 Company Name. All rights reserved. <br />
<a href="{{ "/copyright" | prepend: site.baseurl }}">&copy;2015 AdTruth</a>. All rights reserved. <br />
<p>Site last generated: {{ site.time | date: "%b %-d, %Y" }} <br />
<p><a href="{{ "/about_your_company/index.html" | prepend: site.baseurl }}"><img src="{{ "/images/jekyll.png" | prepend: site.baseurl }}"/></a></p>
<p><img src="{{ "/41stlogo.jpeg" | prepend: site.baseurl }}"/></p>
</div>
</div>
</footer>
</footer>

View File

@ -1,9 +1,9 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='//fonts.googleapis.com/css?family=Montserrat:700,400' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Merriweather:400,400italic,700,700italic' rel='stylesheet' type='text/css'>
<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.title %}{{ page.title }} | {% endif %}{{ site.title }}</title>
<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend:site.baseurl }}" type='text/css'>
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
@ -11,6 +11,7 @@
<link rel="stylesheet" href="{{ "/css/lavish-bootstrap.css" | prepend:site.baseurl }}" type='text/css'>
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="stylesheet" href="{{ "/css/customstyles.css" | prepend:site.baseurl }}" type='text/css'>
<link rel="stylesheet" href="{{ "/css/projectstyles.css" | prepend:site.baseurl }}" type='text/css'>
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
@ -19,8 +20,8 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="{{ "/js/toc.js" | prepend:site.baseurl }}"></script>
<script src="{{ "/js/customscripts.js" | prepend:site.baseurl }}"></script>
<link rel="shortcut icon" href="{{ "/images/favicon.ico" | prepend:site.baseurl }}" type="image/x-icon">
<link rel="icon" href="{{ "/images/favicon.ico" | prepend:site.baseurl }}" type="image/x-icon">
<link rel="shortcut icon" href="{{ "/favicon.ico" | prepend:site.baseurl }}" type="image/x-icon">
<link rel="icon" href="{{ "/favicon.ico" | prepend:site.baseurl }}" type="image/x-icon">
<!-- 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:// -->
<!--[if lt IE 9]>
@ -28,6 +29,6 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

View File

@ -1,65 +1,3 @@
{% comment %}<!-- OVERVIEW -->{% endcomment %}
{% capture name %}<a href="{{"/name" | prepend: site.baseurl}}">Name</a>{% endcapture %}
{% comment %}<!-- OVERVIEW --> {% endcomment %}
{% capture getting_started %}<a href="{{"/getting_started" | prepend: site.baseurl}}">Getting Started</a>{% endcapture %}
{% capture supported_features %}<a href="{{"/supported_features" | prepend: site.baseurl}}">Supported Features</a>{% endcapture %}
{% capture troubleshooting %}<a href="{{"/troubleshooting" | prepend: site.baseurl}}">Troubleshooting</a>{% endcapture %}
{% comment %}<!-- FORMATTING --> {% endcomment %}
{% capture pages %}<a href="{{"/pages" | prepend: site.baseurl}}">Pages</a>{% endcapture %}
{% capture alerts %}<a href="{{"/alerts" | prepend: site.baseurl}}">Alerts</a>{% endcapture %}
{% capture images %}<a href="{{"/images" | prepend: site.baseurl}}">Images</a>{% endcapture %}
{% capture links %}<a href="{{"/links" | prepend: site.baseurl}}">Links</a>{% endcapture %}
{% capture syntax_highlighting %}<a href="{{"/syntax_highlighting" | prepend: site.baseurl}}">Syntax Highlighting</a>{% endcapture %}
{% capture videos %}<a href="{{"/videos" | prepend: site.baseurl}}">Videos</a>{% endcapture %}
{% capture labels %}<a href="{{"/labels" | prepend: site.baseurl}}">Labels</a>{% endcapture %}
{% capture icons %}<a href="{{"/icons" | prepend: site.baseurl}}">Icons</a>{% endcapture %}
{% capture tables %}<a href="{{"/tables" | prepend: site.baseurl}}">Tables</a>{% endcapture %}
{% comment %}<!-- TAG ARCHIVES --> {% endcomment %}
{% capture tag-overview %}<a href="{{"/tag-overview" | prepend: site.baseurl}}">Overview pages</a>{% endcapture %}
{% capture tag-getting-started %}<a href="{{"/tag-getting-started" | prepend: site.baseurl}}">Getting started pages</a>{% endcapture %}
{% capture tag-single-sourcing %}<a href="{{"/tag-single-sourcing" | prepend: site.baseurl}}">Single-sourcing pages</a>{% endcapture %}
{% capture tag-publishing %}<a href="{{"/tag-publishing" | prepend: site.baseurl}}">Publishing pages</a>{% endcapture %}
{% capture tag-formatting %}<a href="{{"/tag-formatting" | prepend: site.baseurl}}">Formatting pages</a>{% endcapture %}
{% comment %}<!-- SINGLE SOURCING --> {% endcomment %}
{% capture conditional_logic %}<a href="{{"/conditional_logic" | prepend: site.baseurl}}">Conditional logic</a>{% endcapture %}
{% capture content_reuse %}<a href="{{"/content_reuse" | prepend: site.baseurl}}">Content re-use</a>{% endcapture %}
{% capture excluding_files %}<a href="{{"/ excluding_files" | prepend: site.baseurl}}">Excluding files</a>{% endcapture %}
{% comment %}<!-- PUBLISHING --> {% endcomment %}
{% capture build_arguments %}<a href="{{"/build_arguments" | prepend: site.baseurl}}">Build arguments</a>{% endcapture %}
{% capture create_pdf %}<a href="{{"/create_pdf" | prepend: site.baseurl}}">Creating PDFs</a>{% endcapture %}
{% capture help_api %}<a href="{{"/help_api" | prepend: site.baseurl}}">Creating a Help API</a>{% endcapture %}
{% comment %}<!-- NAVIGATION --> {% endcomment %}
{% capture navigation %}<a href="{{"/navigation" | prepend: site.baseurl}}">Creating navigation</a>{% endcapture %}
{% capture tags %}<a href="{{"/tags" | prepend: site.baseurl}}">Creating tags</a>{% endcapture %}
{% comment %}<!-- ALERTS --> {% endcomment %}
{% capture tip %}<div class="alert alert-success" role="alert"><i class="fa fa-check-square-o"></i> <b>Tip: </b>{% endcapture %}
{% capture note %}<div class="alert alert-info" role="alert"><i class="fa fa-info-circle"></i> <b>Note: </b>{% endcapture %}
{% capture important %}<div class="alert alert-warning" role="alert"><i class="fa fa-warning"></i> <b>Important: </b>{% endcapture %}
{% capture warning %}<div class="alert alert-danger" role="alert"><i class="fa fa-exclamation-circle"></i> <b>Warning: </b>{% endcapture %}
{% capture end %}</div>{% endcapture %}
{% comment %}<!-- CALLOUTS --> {% endcomment %}
{% capture callout_danger %}<div class="bs-callout bs-callout-danger">{% endcapture %}
{% capture callout_default %}<div class="bs-callout bs-callout-default">{% endcapture %}
{% capture callout_primary %}<div class="bs-callout bs-callout-primary">{% endcapture %}
{% capture callout_success %}<div class="bs-callout bs-callout-success">{% endcapture %}
{% capture callout_info %}<div class="bs-callout bs-callout-info">{% endcapture %}
{% capture callout_warning %}<div class="bs-callout bs-callout-warning">{% endcapture %}
{% capture hr_faded %}<hr class="faded"/> {%endcapture %}
{% capture hr_shaded %}<hr class="shaded"/> {%endcapture %}
{% include custom/links.html %}
{% include alerts.html %}
{% include callouts.html %}

10
_includes/pagination.html Normal file
View File

@ -0,0 +1,10 @@
<ul class="pagination">
{% assign thisSeries = page.series %}
{% for p in site.pages %}
{% if p.series == thisSeries and p.permalink == page.url %}
<li class="active"><a href="{{p.permalink | prepend: site.baseurl}}index.html">{{p.title}}</a></li>
{% else %}
<li><a href="{{p.permalink | prepend: site.baseurl}}index.html">{{p.title}}</a></li>
{% endif %}
{% endfor %}
</ul>

View File

@ -40,7 +40,7 @@ $(document).ready(function() {
</script>
{% include conditions.html %}
{% include custom/conditions.html %}
<ul id="mysidebar" class="nav">

View File

@ -7,7 +7,7 @@
{% if tag == thisTag %}
<tr><td><a href="{{ page.permalink | prepend: site.baseurl | append: "index.html" }}">{{page.title}}</a></td>
<td>{{ page.content | truncatewords: 50 | strip_html }}</td>
<td>{% if page.summary %} {{ page.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ page.content | truncatewords: 50 | strip_html }} {% endif %}</td>
</tr>
{% endif %}
{% endfor %}

View File

@ -1,3 +1,18 @@
<!-- Send feedback function -->
<script>
function SendLinkByMail(href) {
var subject= "{{site.title}} {{site.version}} documentation feedback";
var body = "I have some feedback about the {{page.title}} page: ";
body += window.location.href;
body += "";
var uri = "mailto:{{site.feedback_email}}?subject=";
uri += encodeURIComponent(subject);
uri += "&body=";
uri += encodeURIComponent(body);
window.location.href = uri;
}
</script>
<!-- Navigation -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container topnavlinks">
@ -8,13 +23,13 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="fa fa-home fa-lg navbar-brand" href="{{ "/index.html" | prepend: site.baseurl }}">&nbsp;<span class="projectTitle"> {{site.title}}</span></a>
<a class="fa fa-home fa-lg navbar-brand" href="{{ "/index.html" | prepend: site.baseurl }}">&nbsp;<span class="projectTitle"> {{site.title}} {{1.0}}</span></a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<!-- entries without drop-downs appear here -->
<!-- conditional logic to control which topnav appears for the audience defined in the configuration file.-->
{% include conditions.html %}
{% include custom/conditions.html %}
{% for entry in topnav %}
{% for subcategory in entry.subcategories %}
@ -22,13 +37,16 @@
{% if subcategory.external_url %}
<li><a href="{{subcategory.external_url}}" target="_blank">{{subcategory.title}}</a></li>
{% elsif page.url contains subcategory.url %}
<li class="active"><a href="{{subcategory.url | prepend: site.baseurl}}" class="active">{{subcategory.title}}</a></li>
<li class="active"><a href="{{subcategory.url | prepend: site.baseurl}}index.html" class="active">{{subcategory.title}}</a></li>
{% else %}
<li><a href="{{subcategory.url | prepend: site.baseurl}}">{{subcategory.title}}</a></li>
<li><a href="{{subcategory.url | prepend: site.baseurl}}index.html">{{subcategory.title}}</a></li>
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% if site.feedback_email %}<li><a class="fa fa-envelope-o mailto" href="javascript:(function()%7BSendLinkByMail()%3B%7D)()%3B"> Feedback</a></li>{% endif %}
<!-- entries with drop-downs appear here -->
<!-- conditional logic to control which topnav appears for the audience defined in the configuration file.-->
@ -44,9 +62,9 @@
{% if subitem.external_url %}
<li><a href="{{subitem.external_url}}" target="_blank">{{subitem.title}}</a></li>
{% elsif page.url contains subitem.url %}
<li class="dropdownActive"><a href="{{subitem.url | prepend: site.baseurl}}">{{subitem.title}}</a></li>
<li class="dropdownActive"><a href="{{subitem.url | prepend: site.baseurl}}index.html">{{subitem.title}}</a></li>
{% else %}
<li><a href="{{subitem.url | prepend: site.baseurl}}">{{subitem.title}}</a></li>
<li><a href="{{subitem.url | prepend: site.baseurl}}index.html">{{subitem.title}}</a></li>
{% endif %}
{% endif %}
{% endfor %}
@ -75,6 +93,8 @@
</script>
<!-- end search -->
</li>
</div>
<!-- /.container -->
</nav>