From 432ee1a16905e3e652727733a4b98d1931a0a7e8 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 16 Apr 2016 17:10:09 -0700 Subject: [PATCH] Update getting started --- plugins/active_link.rb | 6 +- plugins/linkable_title.rb | 2 +- sass/custom/_paulus.scss | 79 ------ .../asides/getting_started_navigation.html | 40 +++ source/_includes/custom/navigation.html | 22 +- source/_includes/edit_github.html | 5 +- source/_includes/site/sidebar.html | 2 + source/_layouts/page.html | 8 +- source/getting-started/android.markdown | 2 +- source/getting-started/automation.markdown | 2 +- .../getting-started/autostart-macos.markdown | 31 ++ .../autostart-synology.markdown | 49 ++++ .../autostart-systemd.markdown | 70 +++++ .../autostart-upstart.markdown | 31 ++ source/getting-started/autostart.markdown | 174 ------------ source/getting-started/configuration.markdown | 2 +- source/getting-started/devices.markdown | 2 +- source/getting-started/index.markdown | 265 +----------------- .../installation-docker.markdown | 34 +++ .../installation-raspberry-pi.markdown | 50 ++++ .../installation-synology.markdown | 223 +++++++++++++++ .../installation-virtualenv.markdown | 126 +++++++++ .../presence-detection.markdown | 2 +- .../troubleshooting-configuration.markdown | 2 +- .../getting-started/troubleshooting.markdown | 2 +- 25 files changed, 691 insertions(+), 540 deletions(-) create mode 100644 source/_includes/asides/getting_started_navigation.html create mode 100644 source/getting-started/autostart-macos.markdown create mode 100644 source/getting-started/autostart-synology.markdown create mode 100644 source/getting-started/autostart-systemd.markdown create mode 100644 source/getting-started/autostart-upstart.markdown delete mode 100644 source/getting-started/autostart.markdown create mode 100644 source/getting-started/installation-docker.markdown create mode 100644 source/getting-started/installation-raspberry-pi.markdown create mode 100644 source/getting-started/installation-synology.markdown create mode 100644 source/getting-started/installation-virtualenv.markdown diff --git a/plugins/active_link.rb b/plugins/active_link.rb index 15dd8273c24..bd5853f7022 100644 --- a/plugins/active_link.rb +++ b/plugins/active_link.rb @@ -1,5 +1,3 @@ -require 'pry' - module Jekyll class ActiveLinkTag < Liquid::Tag def initialize(tag_name, text, token) @@ -10,8 +8,10 @@ module Jekyll end def render(context) + href = Liquid::Template.parse(@href).render context + title = Liquid::Template.parse(@title).render context cls = @href == context.registers[:page]["url"] ? "class='active'" : '' - "#{@title}" + "#{title}" end end end diff --git a/plugins/linkable_title.rb b/plugins/linkable_title.rb index 784ca99bcd1..7a5ba4c2b0f 100644 --- a/plugins/linkable_title.rb +++ b/plugins/linkable_title.rb @@ -6,7 +6,7 @@ module Jekyll end def render(context) - title = Liquid::Template.parse(@markup).render context + title = Liquid::Template.parse(@title).render context slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '') " #{title}" end diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss index 807d70631b9..f2904767113 100644 --- a/sass/custom/_paulus.scss +++ b/sass/custom/_paulus.scss @@ -204,85 +204,6 @@ p.note { } } -.install-instructions-container { - #normal-install, #raspberry-install, #docker-install, #synology-install, .install-instructions { - display: none; - } - - label.menu-selector { - display: inline-block; - text-align: center; - padding: 20px; - white-space: nowrap; - border-bottom: 5px solid $grayLight; - transition: border-bottom-color .5s; - } - - label.menu-selector + label.menu-selector { - margin-left: 10px; - } - - #normal-install:checked ~ .menu-selector.normal, - #raspberry-install:checked ~ .menu-selector.raspberry, - #docker-install:checked ~ .menu-selector.docker, - #synology-install:checked ~ .menu-selector.synology - { - border-bottom-color: $blue; - } - - #normal-install:checked ~ .install-instructions.normal, - #raspberry-install:checked ~ .install-instructions.raspberry, - #docker-install:checked ~ .install-instructions.docker, - #synology-install:checked ~ .install-instructions.synology - { - display: block; - } - - .install-instructions { - margin-top: 30px; - } -} - -.advanced-installs-container { - - #upstart-install, #systemd-install, #osx-install, #synology-install, .advanced-installs { - display: none; - } - - label.menu-selector { - display: inline-block; - text-align: center; - padding: 20px; - white-space: nowrap; - border-bottom: 5px solid $grayLight; - transition: border-bottom-color .5s; - } - - label.menu-selector + label.menu-selector { - margin-left: 10px; - } - - #upstart-install:checked ~ .menu-selector.upstart, - #systemd-install:checked ~ .menu-selector.systemd, - #osx-install:checked ~ .menu-selector.osx, - #synology-install:checked ~ .menu-selector.synology - { - border-bottom-color: $blue; - } - - #upstart-install:checked ~ .advanced-installs.upstart, - #systemd-install:checked ~ .advanced-installs.systemd, - #osx-install:checked ~ .advanced-installs.osx, - #synology-install:checked ~ .advanced-installs.synology - { - display: block; - } - - .advanced-installs { - margin-top: 30px; - } -} - #components-page { .isotope-item { z-index: 2; diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html new file mode 100644 index 00000000000..bd4a989e720 --- /dev/null +++ b/source/_includes/asides/getting_started_navigation.html @@ -0,0 +1,40 @@ +
+ {% include edit_github.html %} + +
+

Getting Started Guide

+
    +
  • + {% active_link /getting-started/ Installation %} +
      +
    • {% active_link /getting-started/installation-raspberry-pi/ Raspberry Pi %}
      • +
    • {% active_link /getting-started/installation-docker/ Docker %}
      • +
    • {% active_link /getting-started/installation-synology/ Synology NAS %}
      • +
    • {% active_link /getting-started/installation-virtualenv/ Virtual Environment %}
      • +
    • {% active_link /getting-started/troubleshooting/ Troubleshooting %}
      • +
    +
    • +
  • + Configuration +
      +
    • {% active_link /getting-started/configuration/ Configuration.yaml %}
      • +
    • {% active_link /getting-started/devices/ Setting up devices %}
      • +
    • {% active_link /getting-started/presence-detection/ Presence Detection %}
      • +
    • {% active_link /getting-started/automation/ Automation %}
      • +
    • {% active_link /getting-started/troubleshooting-configuration/ Troubleshooting configuration.yaml %}
      • +
    +
    • +
  • + Auto-start Home Assistant +
      +
    • {% active_link /getting-started/autostart-systemd/ Linux - SystemD %}
      • +
    • {% active_link /getting-started/autostart-upstart/ Linux - Upstart %}
      • +
    • {% active_link /getting-started/autostart-macos/ macOS %}
      • +
    • {% active_link /getting-started/autostart-synology/ Synology NAS %}
      • +
    +
    • +
  • Advanced Topics
    • +
  • {% active_link /getting-started/android/ Add to Android Homescreen %}
    • +
+
+
diff --git a/source/_includes/custom/navigation.html b/source/_includes/custom/navigation.html index 02c0394a6ee..33d52b98af3 100644 --- a/source/_includes/custom/navigation.html +++ b/source/_includes/custom/navigation.html @@ -1,15 +1,15 @@