From 2c117a6994b3cf814638e2b98cb78203539ec11a Mon Sep 17 00:00:00 2001 From: Matt Rude Date: Sun, 4 Feb 2018 20:22:30 -0600 Subject: Updates --- Gemfile.lock | 2 +- _data/nug-sections.yml | 16 ++++++++++ _includes/menu.html | 6 ++++ _includes/new_user_guide.html | 68 +++++++++++++++++++++++++++++++++++++++++++ _includes/password-reset.html | 44 ++++++++++++++++++++++++++++ _includes/registration.html | 10 +++++-- _sass/site.scss | 55 ++++++++++++++++++++++++++++++---- index.html | 8 ++++- password-reset.html | 47 ++++++++++++++++++++++++++++++ register_web/register.html | 6 +++- 10 files changed, 252 insertions(+), 10 deletions(-) create mode 100644 _data/nug-sections.yml create mode 100644 _includes/new_user_guide.html create mode 100644 _includes/password-reset.html create mode 100644 password-reset.html diff --git a/Gemfile.lock b/Gemfile.lock index f9d4654..aa26b4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM ref thor (0.20.0) thread_safe (0.3.6) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) diff --git a/_data/nug-sections.yml b/_data/nug-sections.yml new file mode 100644 index 0000000..b4f293e --- /dev/null +++ b/_data/nug-sections.yml @@ -0,0 +1,16 @@ +- name: Download a Client + slug: nug-download + glyph: fa fa-cloud-download + color: 9FCF6C + file: nug-download.html + +- name: Register an Account + slug: nug-register + glyph: fa fa-user + file: nug-register.html + +- name: Connect your Account + slug: nug-connect + glyph: fa fa-mobile + color: E66E20 + file: nug-connect.html diff --git a/_includes/menu.html b/_includes/menu.html index e9092ff..091b95f 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -14,6 +14,12 @@ {{ section.name }} {% endfor %} +
  • User Guide
    • +
  • About
    • {% endif %} {% if site.register-web == 2 and page.url != "/" %} diff --git a/_includes/new_user_guide.html b/_includes/new_user_guide.html new file mode 100644 index 0000000..4c3a88e --- /dev/null +++ b/_includes/new_user_guide.html @@ -0,0 +1,68 @@ +
    +
    +
    +
    +
    +
    + +

    New User Guide

    +
    +
    +
    +
    +
    +

    +
    +
    +
    +
    + + +
    + + {% for section in site.data.nug-sections %} +
    +
    +
    +
    + +

    {{ section.name }}

    +
    +
    +
    +
    +

    {{ section.text }}

    + {% for feature in site.data.features %} + {% if feature.section == section.slug %} +
    +

    {{ feature.name }}

    +

    {{ feature.text }}

    +
    + {% endif %} + {% endfor %} +
    +
    +
    +
    + {% endfor %} +
    + + + +
    + +
    + + + +
    +
    diff --git a/_includes/password-reset.html b/_includes/password-reset.html new file mode 100644 index 0000000..c549bbd --- /dev/null +++ b/_includes/password-reset.html @@ -0,0 +1,44 @@ + diff --git a/_includes/registration.html b/_includes/registration.html index 8e55171..26014fa 100644 --- a/_includes/registration.html +++ b/_includes/registration.html @@ -111,7 +111,13 @@ + - - + + + + + {% include password-reset.html %} diff --git a/_sass/site.scss b/_sass/site.scss index 3a3aadd..95b18c5 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -28,6 +28,7 @@ body { position: relative; } + // Links a { @@ -208,6 +209,55 @@ pre { } // New User Guide +#nug { + #nug-content { + padding: unset; + } + #nug-opening { + min-height:400px; + width: 100%; + span { + font-size: 100px; + } + } + .nug-feature-section { + } + #nug-nav-body { + width: 100%; + } + .index-section { + margin-right: -20%; + padding-right: 20%; + } +} + +#nug-index { + background-color: rgba(0, 0, 0, 0.2); + z-index: 1; + padding: 0; + #navbar-main { + padding: 80px 0 0 0; + margin-top: -80px; + background: transparent!important; + } + #nav-body { + color: black; + background: transparent!important; + width: 100% + } + .nav-pills .nav-link { + border-radius: 0; + } + .nav-pills .nav-link.active, .nav-pills .show>.nav-link { + color: #fff; + background-color: rgba(0, 0, 0, 0.2); + } + a { + color:black; + margin: unset!important; + } +} + .section-header-nug { padding-top: 60px; } @@ -338,11 +388,6 @@ td.FAILED { padding-top: 60px; } -.nav-item a { - padding: 0 10px; - color: #fff; -} - @media (max-width: 990px) { .contact-list { font-size: 1.7em; diff --git a/index.html b/index.html index 599838f..0247dff 100644 --- a/index.html +++ b/index.html @@ -51,6 +51,7 @@ permalink: /
  • File Uploads: {{ site.xmpp-upload-url }}
    • {% endif %}
    check.messaging.one server score
    + @@ -68,7 +69,6 @@ permalink: / {% endif %} -
    @@ -155,6 +155,12 @@ permalink: /
    + + +{% include new_user_guide.html %} + + +
    diff --git a/password-reset.html b/password-reset.html new file mode 100644 index 0000000..54732ef --- /dev/null +++ b/password-reset.html @@ -0,0 +1,47 @@ +--- +layout: default +title: Password Reset +permalink: /password-reset/ +--- + +
    +
    + +

    Password Reset Form

    +
    +
    + +
    + +
    + + +
    +

    +
    + +
    + +
    + @{{ site.xmpp-url }} +
    +
    Your JID (username) is required.
    +
    +
    +
    + +
    + +
    Your email address is required.
    +
    +
    + + + +

    After submitting, a link will be sent to the email address that appears on your vCard.

    +
    + + +
    +
    +
    diff --git a/register_web/register.html b/register_web/register.html index 091707b..24c498d 100644 --- a/register_web/register.html +++ b/register_web/register.html @@ -96,7 +96,11 @@ permalink: /files/register_web/register.html
    + - + + {% include password-reset.html %} -- cgit v1.2.3-59-ga6da