hosting category and refactored category usage

8 years ago · 8e5091bde2
46 changed files with 79 additions and 48 deletions
--- a/_articles/account/change-your-email.md
+++ b/_articles/account/change-your-email.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Change your email
-categories: [Getting Started, Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [account, email]
--- a/_articles/account/change-your-master-password.md
+++ b/_articles/account/change-your-master-password.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Change your master password
-categories: [Getting Started, Account Management]
+categories: [getting-started, account-management]
 featured: false
 popular: false
 tags: [password, account]
--- a/_articles/account/delete-your-account.md
+++ b/_articles/account/delete-your-account.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Delete your account
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [account, delete]
--- a/_articles/account/export-your-data.md
+++ b/_articles/account/export-your-data.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Export your vault data
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [export, accounts, csv]
--- a/_articles/account/forgot-master-password.md
+++ b/_articles/account/forgot-master-password.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: I forgot my master password
-categories: [Account Management]
+categories: [account-management]
 featured: true
 popular: false
 tags: [master password, account]
--- a/_articles/account/lost-two-step-device.md
+++ b/_articles/account/lost-two-step-device.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: I lost my two-step login (2FA) device
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account]
--- a/_articles/account/setup-two-step-login-authenticator.md
+++ b/_articles/account/setup-two-step-login-authenticator.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Set up two-step login with an authenticator app
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account, google authenticator, authy, totp]
--- a/_articles/account/setup-two-step-login-duo.md
+++ b/_articles/account/setup-two-step-login-duo.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Set up two-step login with Duo Security
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account, duo, sms]
--- a/_articles/account/setup-two-step-login-email.md
+++ b/_articles/account/setup-two-step-login-email.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Set up two-step login with email
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account, email, totp]
--- a/_articles/account/setup-two-step-login-u2f.md
+++ b/_articles/account/setup-two-step-login-u2f.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Set up two-step login with FIDO U2F
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account, u2f, fido]
--- a/_articles/account/setup-two-step-login-yubikey.md
+++ b/_articles/account/setup-two-step-login-yubikey.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Set up two-step login with YubiKey
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [two-step login, 2fa, two factor authentication, account, yubikey, yubi, yubico]
--- a/_articles/account/setup-two-step-login.md
+++ b/_articles/account/setup-two-step-login.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Set up two-step login (2FA)
-categories: [Getting Started, Account Management]
+categories: [getting-started, account-management]
 featured: false
 popular: true
 tags: [two-step login, 2fa, two factor authentication, account]
--- a/_articles/account/update-encryption-key.md
+++ b/_articles/account/update-encryption-key.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Updating an old encryption key
-categories: [Account Management]
+categories: [account-management]
 featured: false
 popular: false
 tags: [encryption key, account]
--- a/_articles/directory-connector/azure-active-directory.md
+++ b/_articles/directory-connector/azure-active-directory.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Configuring directory sync with Azure Active Directory
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 hidden: true
--- a/_articles/directory-connector/directory-sync.md
+++ b/_articles/directory-connector/directory-sync.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Syncing users and groups with a directory
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 tags: []
--- a/_articles/directory-connector/gsuite-directory.md
+++ b/_articles/directory-connector/gsuite-directory.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Configuring directory sync with G Suite (Google)
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 hidden: false
--- a/_articles/directory-connector/ldap-directory.md
+++ b/_articles/directory-connector/ldap-directory.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Configuring directory sync with Active Directory or other LDAP servers
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 tags: []
--- a/_articles/directory-connector/user-group-filters.md
+++ b/_articles/directory-connector/user-group-filters.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Configuring user and group sync filters
-categories: [Organizations]
+categories: [organizations]
 featured: false
 popular: false
 hidden: false
--- a/_articles/hosting/what-platforms-are-supported.md
+++ b/_articles/hosting/what-platforms-are-supported.md
@ -0,0 +1,12 @@
 ---
 layout: article
 title: What platforms can I host on?
 categories: [hosting]
 featured: false
 popular: false
 tags: [platforms, hosting]
 ---
 Bitwarden is a cross-platform application that is deployed using Docker Linux containers. This means that bitwarden can be hosted on Linux, macOS, and Windows machines.
 You can read more about Docker and container technologies at [https://www.docker.com/what-docker](https://www.docker.com/what-docker){:target="_blank"}.
--- a/_articles/importing/import-data.md
+++ b/_articles/importing/import-data.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import your data from another application
-categories: [Getting Started]
+categories: [getting-started]
 featured: true
 popular: true
 tags: [import]
--- a/_articles/importing/import-from-1password.md
+++ b/_articles/importing/import-from-1password.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import your data from 1Password
-categories: [Getting Started]
+categories: [getting-started]
 featured: true
 popular: true
 tags: [import, 1password]
--- a/_articles/importing/import-from-chrome.md
+++ b/_articles/importing/import-from-chrome.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import your data from Google Chrome
-categories: [Getting Started]
+categories: [getting-started]
 featured: true
 popular: false
 tags: [import, chrome, opera, vivaldi]
--- a/_articles/importing/import-from-lastpass.md
+++ b/_articles/importing/import-from-lastpass.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Import your data from LastPass
-categories: [Getting Started]
+categories: [getting-started]
 featured: true
 popular: true
 tags: [import, lastpass]
--- a/_articles/miscellaneous/auto-fill-android.md
+++ b/_articles/miscellaneous/auto-fill-android.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Auto-fill logins on Android
-categories: [Miscellaneous]
+categories: [miscellaneous]
 featured: false
 popular: false
 tags: [android, autofill, auto-fill]
--- a/_articles/miscellaneous/extension-wont-load-in-private-mode.md
+++ b/_articles/miscellaneous/extension-wont-load-in-private-mode.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Extension won't load in Firefox Private Browsing mode
-categories: [Miscellaneous]
+categories: [miscellaneous]
 featured: false
 popular: false
 tags: [firefox, extension, private mode, private browsing]
--- a/_articles/miscellaneous/localization.md
+++ b/_articles/miscellaneous/localization.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Help translate bitwarden to other languages
-categories: [Miscellaneous]
+categories: [miscellaneous]
 featured: false
 popular: false
 tags: [localize, l10n, translate, i18n, internationalization, language]
--- a/_articles/organizations/collections.md
+++ b/_articles/organizations/collections.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Collections
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 tags: []
--- a/_articles/organizations/groups.md
+++ b/_articles/organizations/groups.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: User groups
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 tags: []
--- a/_articles/organizations/managing-users.md
+++ b/_articles/organizations/managing-users.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Managing users for your organization
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 tags: []
--- a/_articles/organizations/what-is-an-organization.md
+++ b/_articles/organizations/what-is-an-organization.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: What are organizations?
-categories: [Organizations]
+categories: [organizations]
 featured: true
 popular: false
 tags: []
--- a/_articles/security/can-bitwarden-see-my-passwords.md
+++ b/_articles/security/can-bitwarden-see-my-passwords.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Can the bitwarden team see my passwords?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: []
--- a/_articles/security/cloud-server-security.md
+++ b/_articles/security/cloud-server-security.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: How do you keep the cloud servers secure?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: [cloud, azure]
--- a/_articles/security/how-is-data-securely-transmitted-and-stored.md
+++ b/_articles/security/how-is-data-securely-transmitted-and-stored.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: How is my data securely trasmitted and stored on bitwarden servers?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: [encryption]
--- a/_articles/security/password-salt-hash.md
+++ b/_articles/security/password-salt-hash.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Does bitwarden use a salted hash for my password?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: [encryption, hash]
--- a/_articles/security/what-encryption-is-used.md
+++ b/_articles/security/what-encryption-is-used.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: What encryption is being used?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: [encryption]
--- a/_articles/security/what-happens-if-bitwarden-is-hacked.md
+++ b/_articles/security/what-happens-if-bitwarden-is-hacked.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: What happens if bitwarden gets hacked?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: [hacked]
--- a/_articles/security/what-information-is-encrypted.md
+++ b/_articles/security/what-information-is-encrypted.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: What information is encrypted?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: []
--- a/_articles/security/where-is-data-stored-cloud.md
+++ b/_articles/security/where-is-data-stored-cloud.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Where is my data stored in the cloud?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: [cloud]
--- a/_articles/security/where-is-data-stored-computer.md
+++ b/_articles/security/where-is-data-stored-computer.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Where is my data stored on my computer/device?
-categories: [Security]
+categories: [security]
 featured: true
 popular: false
 tags: []
--- a/_articles/security/why-should-i-trust-bitwarden.md
+++ b/_articles/security/why-should-i-trust-bitwarden.md
@ -1,7 +1,7 @@
 ---
 layout: article
 title: Why should I trust bitwarden with my passwords?
-categories: [Security]
+categories: [security]
 featured: true
 popular: true
 tags: []
--- a/_categories/hosting.md
+++ b/_categories/hosting.md
@ -0,0 +1,5 @@
 ---
 layout: category
 title: On-premise Hosting
 featured: true
 ---
--- a/_layouts/article.html
+++ b/_layouts/article.html
@ -1,6 +1,8 @@
 ---
 layout: default
 ---
 {% assign catIteration = 0 %}
 {% assign catSize = page.categories | size %}
 <div class="container">
    <h1 class="page-header">
@ -8,9 +10,13 @@ layout: default
        {{page.title}}
    </h1>
    <div class="breadcrumb">
-        {{ page.categories | size | pluralize: 'Category', 'Categories' }}:
+        {{ catSize | pluralize: 'Category', 'Categories' }}:
-        {% for category in page.categories %}
+        {% for category in site.categories %}
-        <a href="/{{category | slugify}}">{{category}}</a>{% if forloop.last != true %}, {% endif %}
+        {% assign catFilename = category.path | filename %}
        {% if page.categories contains catFilename %}
        {% assign catIteration = catIteration | plus: 1 %}
        <a href="{{category.url}}">{{category.title}}</a>{% if catIteration != catSize %}, {% endif %}
        {% endif %}
        {% endfor %}
    </div>
    <div class="panel panel-default article">
--- a/_layouts/category.html
+++ b/_layouts/category.html
@ -12,7 +12,8 @@ layout: default
        <div class="col-md-8 articles">
            <ol>
                {% for article in sorted_articles %}
-                {% if article.categories contains page.title and article.hidden != true %}
+                {% assign pageFilename = page.path | filename %}
                {% if article.categories contains pageFilename and article.hidden != true %}
                <li><a href="{{article.url}}">{{article.title}}</a></li>
                {% endif %}
                {% endfor %}
--- a/_plugins/filename.rb
+++ b/_plugins/filename.rb
@ -0,0 +1,9 @@
 module FileName
    def filename(path)
        extn = File.extname path
        name = File.basename path, extn
        "#{name}"
    end
 end
 Liquid::Template.register_filter(FileName)
--- a/index.html
+++ b/index.html
@ -36,7 +36,8 @@ title: Help Center
                <div class="panel-body">
                    <ul class="fa-ul">
                        {% for article in sorted_articles %}
-                        {% if article.categories contains category.title and article.hidden != true %}
+                        {% assign catFilename = category.path | filename %}
                        {% if article.categories contains catFilename and article.hidden != true %}
                        <li>
                            <i class="fa-li fa fa-file-text-o"></i>
                            <a href="{{article.url}}">{{article.title}}</a>
--- a/search/index.html
+++ b/search/index.html
@ -21,10 +21,9 @@ title: Search Results
    {% if article.hidden != true %}
      "{{article.url | slugify}}": {
          "title": "{{article.title | xml_escape}}",
          "categories": "{{article.categories | join: ', ' | xml_escape}}",
          "tags": "{{article.tags | join: ', ' | xml_escape}}",
          "content": {{article.content | strip_html | strip_newlines | jsonify}},
-        "url": "{{article.url | xml_escape}}"
+          "url": "{{article.url | xml_escape}}"
      }
    {% unless forloop.last %},{% endunless %}
    {% endif %}
@ -75,7 +74,6 @@ title: Search Results
            var idx = lunr(function () {
                this.field('id');
                this.field('title', { boost: 20 });
                this.field('categories');
                this.field('tags', { boost: 10 });
                this.field('content');
            });
@ -84,7 +82,6 @@ title: Search Results
                idx.add({
                    'id': key,
                    'title': window.store[key].title,
                    'categories': window.store[key].categories,
                    'tags': window.store[key].tags,
                    'content': window.store[key].content
                });