From b69e11e0a4f8e59fed631eacaced8a8bef9606cd Mon Sep 17 00:00:00 2001 From: Jacob Hammons Date: Mon, 14 Sep 2015 16:43:51 -0600 Subject: [PATCH] made 2014.7 an archived release minor doc site updates --- doc/_themes/saltstack2/layout.html | 24 +++++++++++------- ....min_v1.4.1.css => webhelp.min_v1.4.2.css} | 13 +++++----- .../images/saltStack_enterprise_350x125.jpg | Bin 22331 -> 0 bytes .../images/saltStack_events_300x300.jpg | Bin 0 -> 20870 bytes ...lp.min_v1.4.1.js => webhelp.min_v1.4.2.js} | 4 +-- doc/conf.py | 17 ++++++++----- 6 files changed, 35 insertions(+), 23 deletions(-) rename doc/_themes/saltstack2/static/css/{webhelp.min_v1.4.1.css => webhelp.min_v1.4.2.css} (97%) delete mode 100644 doc/_themes/saltstack2/static/images/saltStack_enterprise_350x125.jpg create mode 100644 doc/_themes/saltstack2/static/images/saltStack_events_300x300.jpg rename doc/_themes/saltstack2/static/js/{webhelp.min_v1.4.1.js => webhelp.min_v1.4.2.js} (99%) diff --git a/doc/_themes/saltstack2/layout.html b/doc/_themes/saltstack2/layout.html index 8da3f67a10..a38e81f139 100644 --- a/doc/_themes/saltstack2/layout.html +++ b/doc/_themes/saltstack2/layout.html @@ -21,12 +21,12 @@ {% set script_files = [ '_static/js/core.min.js', - '_static/js/webhelp.min_v1.4.1.js', + '_static/js/webhelp.min_v1.4.2.js', ] %} {% set css_files = [ '_static/css/core.min.css', - '_static/css/webhelp.min_v1.4.1.css', + '_static/css/webhelp.min_v1.4.2.css', ] %} {%- macro relbar() %} @@ -160,6 +160,12 @@ {% endif %} + {% if build_type == "inactive" and on_saltstack %} +
+ +
+ {% endif %} + {%- block document %}
{% block body %} {% endblock %} @@ -192,8 +198,11 @@ {% elif build_type == "previous" %}

You are viewing docs for the previous stable release, {{ previous_release }}. Switch to docs for the latest stable release, {{ latest_release }}, or to a recent doc build from the develop branch.

+ {% elif build_type == "inactive" %} +

You are viewing docs for an inactive release, {{ previous_release }}. Switch to docs for the latest stable release, {{ latest_release }}, or to a recent doc build from the develop branch.

+ {% elif build_type == "develop" %} -

You are viewing docs built from a recent snapshot of the develop branch. Switch to docs for the latest stable release, {{ latest_release }}, or to docs for the previous stable release, {{ previous_release }}.

+

You are viewing docs built from a recent snapshot of the develop branch. Switch to docs for the latest stable release, {{ latest_release }}.

{% endif %}
@@ -203,12 +212,9 @@
- + -

-

SaltStack Training

-

Now offering remote attendee training!

{% endif %} @@ -224,9 +230,9 @@ {% if on_saltstack %} -
+