Merge branch 'release/ce-0.14.0' into release/ce-0.14.0

Kong · May 30, 2018 · 784c0fa · 784c0fa
2 parents 318b14c + 72df825
commit 784c0fa
Show file tree

Hide file tree

Showing 72 changed files with 21,103 additions and 471 deletions.
diff --git a/app/_assets/javascripts/app.js b/app/_assets/javascripts/app.js
@@ -36,6 +36,22 @@ $(function () {
     })
   }
 
+  // Cookie Policy
+  // Check for cookie
+  if (!document.cookie.split(';').filter(function (item) {
+    return item.indexOf('cookie-policy=') >= 0
+  }).length) {
+    $('.cookie-policy-container').addClass('show')
+  }
+
+  // Hide banner on "I accept" and set cookie
+  $('.cookie-policy-accept').on('click', function (e) {
+    e.preventDefault()
+
+    $('.cookie-policy-container').removeClass('show')
+    document.cookie = 'cookie-policy=; expires=2147483647'
+  })
+
   // Page section on contribute page
 
   $('.toggle-page-section').on('click', function (e) {

diff --git a/app/_assets/stylesheets/header.less b/app/_assets/stylesheets/header.less
@@ -99,6 +99,25 @@
       }
     }
   }
+  .cookie-policy-container {
+    &.show {
+      display: block;
+    }
+    display: none;
+    padding: 8px;
+    color: rgba(255,255,255,.7);
+    .font-source-sans-sc();
+    font-size: 13px;
+    text-align: center;
+    text-transform: uppercase;
+    background-color: black;
+    p {
+      margin-bottom: 0;
+    }
+    button {
+      margin-left: 5px;
+    }
+  }
 }
 
 .navbar {

diff --git a/app/_assets/stylesheets/page.less b/app/_assets/stylesheets/page.less
@@ -321,7 +321,6 @@
 
     td {
       padding: 10px;
-
       &:first-child {
         text-align: right;
         white-space: nowrap;
@@ -339,6 +338,12 @@
           }
         }
       }
+      &:nth-child(2) {
+        word-wrap: break-word;
+        code {
+          white-space: normal;
+        }
+      }
     }
   }
 

diff --git a/app/_data/docs_nav_0.14.x.yml b/app/_data/docs_nav_0.14.x.yml
@@ -140,27 +140,6 @@
         - text: Delete Route
           url: /admin-api/#delete-route
 
-    - text: API Object routes
-      url: /admin-api/#api-object
-      items:
-        - text: Add API
-          url: /admin-api/#add-api
-
-        - text: Retrieve API
-          url: /admin-api/#retrieve-api
-
-        - text: List APIs
-          url: /admin-api/#list-apis
-
-        - text: Update API
-          url: /admin-api/#update-api
-
-        - text: Update or create API
-          url: /admin-api/#update-or-create-api
-
-        - text: Delete API
-          url: /admin-api/#delete-api
-
     - text: Consumer Object routes
       url: /admin-api/#consumer-object
       items:

diff --git a/app/_data/docs_nav_ee_0.31-x.yml b/app/_data/docs_nav_ee_0.31-x.yml
@@ -23,16 +23,18 @@
       url: /installation/centos
     - text: Amazon Linux
       url: /installation/amazon-linux
+    - text: Ubuntu
+      url: /installation/ubuntu
 
 - title: APIs and Plugins
   items:
-    - text: Canary Release Plugin
+    - text: Canary Release
       url: /plugins/canary-release
-    - text: Rate Limiting Plugin
+    - text: Rate Limiting Advanced
       url: /plugins/rate-limiting
-    - text: Request Transformer Plugin
+    - text: Request Transformer Advanced
       url: /plugins/request-transformer
-    - text: OAuth2 Introspection Plugin
+    - text: OAuth2 Introspection
       url: /plugins/oauth2-introspection
     - text: OpenID Connect Plugin
       url: /plugins/openid-connect
@@ -62,13 +64,15 @@
 
 - title: Guides &amp; References
   items:
-    - text: Kong Implementation Checklist
-      url: /kong-implementation-checklist
-    - text: Changelog
+    - text: Kong Enterprise Changelog
       url: /docs/enterprise/changelog
       absolute_url: true
     - text: Architecture Overview
       url: /kong-architecture-overview
+    - text: Architecture Patterns
+      url: /kong-architecture-patterns
+    - text: Implementation Checklist
+      url: /kong-implementation-checklist
     - text: Accessing Admin GUI
       url: /admin-gui
     - text: Kong Vitals

diff --git a/app/_data/docs_nav_ee_0.32-x.yml b/app/_data/docs_nav_ee_0.32-x.yml
@@ -0,0 +1,100 @@
+- title: Getting Started
+  items:
+    - text: Introduction
+      url: /getting-started/introduction
+    - text: Five-minute quickstart
+      url: /getting-started/quickstart
+    - text: Adding your API
+      url: /getting-started/adding-your-api
+    - text: Enabling Plugins
+      url: /getting-started/enabling-plugins
+    - text: Adding Consumers
+      url: /getting-started/adding-consumers
+    - text: Licensing
+      url: /getting-started/licensing
+    - text: Accessing Your License
+      url: /getting-started/accessing-your-license
+
+- title: Installation
+  items:
+    - text: Docker
+      url: /installation/docker
+    - text: CentOS
+      url: /installation/centos
+    - text: Amazon Linux
+      url: /installation/amazon-linux
+
+- title: APIs and Plugins
+  items:
+    - text: Canary Release Plugin
+      url: /plugins/canary-release
+    - text: Rate Limiting Advanced Plugin
+      url: /plugins/rate-limiting-advanced
+    - text: Request Transformer Plugin
+      url: /plugins/request-transformer
+    - text: OAuth2 Introspection Plugin
+      url: /plugins/oauth2-introspection
+    - text: OpenID Connect Plugin
+      url: /plugins/openid-connect
+    - text: HTTP Proxy Caching
+      url: /plugins/http-proxy-caching
+    - text: Forward Proxy
+      url: /plugins/forward-proxy
+    - text: RBAC API
+      url: /plugins/rbac-api
+
+- title: Kong Developer Portal
+  items:
+    - text: Overview
+      url: /developer-portal/overview
+    - text: Glossary
+      url: /developer-portal/glossary
+    - text: Configuration
+      url: /developer-portal/configuration/getting-started
+      items:
+        - text: Getting Started
+          url: /developer-portal/configuration/getting-started
+        - text: Authentication
+          url: /developer-portal/configuration/authentication
+        - text: Networking
+          url: /developer-portal/configuration/networking
+        - text: Property Reference
+          url: /developer-portal/configuration/property-reference
+    - text: Managing Developers
+      url: /developer-portal/managing-developers
+    - text: Developer Access
+      url: /developer-portal/developer-access
+    - text: File Management
+      url: /developer-portal/file-management
+    - text: Customization
+      url: /developer-portal/customization
+    - text: FAQ
+      url: /developer-portal/faq
+
+- title: Guides &amp; References
+  items:
+    - text: Kong Enterprise Changelog
+      url: /docs/enterprise/changelog
+      absolute_url: true
+    - text: Architecture Overview
+      url: /kong-architecture-overview
+    - text: Architecture Patterns
+      url: /kong-architecture-patterns
+    - text: Accessing Admin GUI
+      url: /admin-gui
+    - text: Kong Vitals
+      url: /vitals
+    - text: Rate Limiting Library
+      url: /rate-limiting
+    - text: Setting Up Admin API RBAC
+      url: /setting-up-admin-api-rbac
+    - text: Kong Enterprise Edition Versioning
+      url: /edition-versioning
+    - text: Multiple Authentication Methods
+      url: /allowing-multiple-authentication-methods
+    - text: PostgreSQL on RedHat
+      url: /postgresql-redhat
+    - text: OpenID Connect with Google
+      url: /oidc-google
+    - text: OpenID Connect with Auth0
+      url: /oidc-auth0
diff --git a/app/_data/kong_versions.yml b/app/_data/kong_versions.yml
@@ -112,7 +112,17 @@
     postgres: "9.5+"
     openresty: "1.11.2.5"
   lua_doc: true
-
+-
+  release: "0.13.x"
+  version: "0.13.1"
+  luarocks_version: "0.13.1-0"
+  dependencies:
+    luajit: "2.1.0-beta2"
+    luarocks: "2.4.3"
+    cassandra: "3.x.x"
+    postgres: "9.5+"
+    openresty: "1.11.2.5"
+  lua_doc: true
 -
   release: "0.31-x"
   version: "0.31"
@@ -126,9 +136,10 @@
     openresty: "1.11.2.5"
   lua_doc: true
 -
-  release: "0.13.x"
-  version: "0.13.1"
-  luarocks_version: "0.13.1-0"
+  release: "0.32-x"
+  version: "0.32"
+  edition: "enterprise"
+  luarocks_version: "0.32.x"
   dependencies:
     luajit: "2.1.0-beta2"
     luarocks: "2.4.3"

diff --git a/app/_includes/nav.html b/app/_includes/nav.html
@@ -1,5 +1,9 @@
 <header class="site-header">
   <div class="enterprise">
+    <div class="cookie-policy-container">
+      <p>In order to give you better service we use cookies. By continuing to use our website, you agree to the use of cookies as described in our <a href=" https://konghq.com/cookie-policy/">Cookie Policy</a>
+      <button class="cookie-policy-accept button button-dark" type="submit">I agree</button>
+    </div>
     <div class="container">
       <nav class="enterprise-sites one-half column">
         <ul>

diff --git a/app/_layouts/docs.html b/app/_layouts/docs.html
@@ -23,7 +23,7 @@ <h1>{% if page.edition == 'enterprise' %}Enterprise Edition {% if page.has_versi
         <h1>{% if page.edition == 'community' %}Community Edition ({{page.kong_version}}){% endif %}</h1>
       </div>
 
-      {% if page.kong_versions.size > 1 and page.edition == 'community' %}
+      {% if page.kong_versions.size > 1 %}
         <div class="dropdown page-header-right">
           <button class="page-header-btn" id="version-dropdown" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Version {{page.kong_version}}
@@ -35,17 +35,19 @@ <h1>{% if page.edition == 'community' %}Community Edition ({{page.kong_version}}
             {% for ver in page.kong_versions reversed %}
               {% unless page.kong_version == ver.release %}
                 <li>
-                  <a href="/docs/{{ver.release}}"{% if ver.release == page.kong_version %} class="active"{% endif %}>
+                  <a href="/docs/{%if page.edition == 'enterprise' %}enterprise/{% endif %}{{ver.release}}"{% if ver.release == page.kong_version %} class="active"{% endif %}>
                     {{ver.release}}
                   </a>
                 </li>
               {% endunless %}
             {% endfor %}
           </ul>
+          {% if page.edition == 'community' %}
           <div id="getkong-algolia-search" class="search-input">
             <i class="fa fa-search"></i>
             <input type="text" placeholder="Search" id="getkong-algolia-search-input" />
           </div>
+          {% endif %}
         </div>
       {% endif %}
     </div>