From 97d7f0413ea1b068af20a21a6fa1002b286c8ba5 Mon Sep 17 00:00:00 2001 From: Matt Rude Date: Mon, 5 Feb 2018 02:25:45 -0600 Subject: Updates --- _config.yml | 2 + _includes/footer.html | 2 + _includes/guide-download.html | 29 ------------- _includes/guide-register.html | 95 ------------------------------------------- _includes/header.html | 3 +- _includes/menu.html | 9 ++-- _includes/new_user_guide.html | 41 ++++++++----------- _includes/nug-connect.html | 0 _includes/nug-download.html | 29 +++++++++++++ _includes/nug-register.html | 95 +++++++++++++++++++++++++++++++++++++++++++ _sass/site.scss | 15 +++++++ creating-account.html | 4 +- index.html | 4 ++ nug.html | 7 ++++ 14 files changed, 178 insertions(+), 157 deletions(-) delete mode 100644 _includes/guide-download.html delete mode 100644 _includes/guide-register.html create mode 100644 _includes/nug-connect.html create mode 100644 _includes/nug-download.html create mode 100644 _includes/nug-register.html create mode 100644 nug.html diff --git a/_config.yml b/_config.yml index 693c924..64ecf46 100644 --- a/_config.yml +++ b/_config.yml @@ -8,6 +8,8 @@ baseurl: "soderparr.com" destination: "/var/www/im.soderparr.com" prosody-version: "0.10" register-web: 2 +password-reset: 1 +user-guide: 0 color: "#9FCF6C" #color: "#c3950d" recaptcha_public_key: "6LdJkzUUAAAAAFj3M0bgNhwzoPuPoiYdlbVaWBf-" diff --git a/_includes/footer.html b/_includes/footer.html index dc6195a..def36ab 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -12,7 +12,9 @@ + {% if page.url == "/files/register_web/register.html" %} {% endif %}{% if page.url == "/" and site.register-web >= 1 %} {% endif %} diff --git a/_includes/guide-download.html b/_includes/guide-download.html deleted file mode 100644 index 89e7eee..0000000 --- a/_includes/guide-download.html +++ /dev/null @@ -1,29 +0,0 @@ - {% for type in site.data.clienttypes %} -
-

{{ type.name }}

-
-
- {% for client in site.data.clients %} - {% if client.type == type.slug %} -
-
- {% if client.img %} - - {% endif %} -
-

{{ client.name }}

-
    -
  • Platform: {{ client.platform }}
    • -
  • Encryption: {{ client.encryption }}
    • -
  • Website: {{ client.domain }}
    • - {% if client.text %}
  • {{ client.text }}
    • {% endif %} -
-
-
-
- {% endif %} - {% endfor %} -
-
-
- {% endfor %} diff --git a/_includes/guide-register.html b/_includes/guide-register.html deleted file mode 100644 index 9a53aa2..0000000 --- a/_includes/guide-register.html +++ /dev/null @@ -1,95 +0,0 @@ - - {% if site.register-web == 1 %} -
-

Register an Account on the Local Server

-
-
- {% if site.register-web == 2 %} -
-
-

Registration Form

-
-
-
-
- -
- -
- @{hostname} -
-
Your username is required.
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
Your email address is required.
-
-
-
- {captcha} -
-
-
- - -
-
-
-
-
- {% endif %} -

You will need to go to the Register page. -

- - - - -
-

Register an Account on a Diffrent Server

-
- - {% endif %} -

This list of servrs may

- - - -

List of Servers

- - - - - - - - - - - - -{% for service in site.data.server-compliance %} - - - - - - {% if service.xep-375 == 1 %}{% else %}{% endif %} - {% if service.xep-368 == 1 %}{% else %}{% endif %} - -{% endfor %} - -
Service Name
Registration Method
Website
Language
Service
Price
XEP-0375 complientXEP-0368 complient
{{ service.name }}
{% if service.registration-url %}{{ service.registration }}{% elsif service.registration %}{{ service.registration}}{% else %}Unknown{% endif %}
{{ service.language }}
{% if service.price %}{{ service.price }}{% else %}Free{% endif %}
Yes
No
Yes
No
diff --git a/_includes/header.html b/_includes/header.html index 7967d26..4510a46 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,7 +9,8 @@ - + + diff --git a/_includes/menu.html b/_includes/menu.html index 091b95f..a266aaa 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -13,19 +13,16 @@ {% for section in site.data.sections %} {{ section.name }} {% endfor %} - + {% if site.user-guide == 1 %}
  • User Guide
    • + {% endif %}
  • About
    • {% endif %} - {% if site.register-web == 2 and page.url != "/" %} - Register - {% endif %} - {% if site.register-web == 1 %} + {% if site.register-web >= 2 %} Register {% endif %} diff --git a/_includes/new_user_guide.html b/_includes/new_user_guide.html index 4c3a88e..4b24a33 100644 --- a/_includes/new_user_guide.html +++ b/_includes/new_user_guide.html @@ -1,21 +1,21 @@
    -
    -
    -
    -
    - -

    New User Guide

    -
    -
    -
    -
    -
    -

    -
    -
    +
    +
    +
    +
    + +

    New User Guide

    +
    +
    +
    +
    +
    +

    +
    +
    @@ -32,14 +32,7 @@

    {{ section.text }}

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

    {{ feature.name }}

    -

    {{ feature.text }}

    -
    - {% endif %} - {% endfor %} + {% include {{ section.file }} %}
    @@ -53,11 +46,11 @@
    diff --git a/_includes/nug-connect.html b/_includes/nug-connect.html new file mode 100644 index 0000000..e69de29 diff --git a/_includes/nug-download.html b/_includes/nug-download.html new file mode 100644 index 0000000..89e7eee --- /dev/null +++ b/_includes/nug-download.html @@ -0,0 +1,29 @@ + {% for type in site.data.clienttypes %} +
    +

    {{ type.name }}

    +
    +
    + {% for client in site.data.clients %} + {% if client.type == type.slug %} +
    +
    + {% if client.img %} + + {% endif %} +
    +

    {{ client.name }}

    +
      +
    • Platform: {{ client.platform }}
      • +
    • Encryption: {{ client.encryption }}
      • +
    • Website: {{ client.domain }}
      • + {% if client.text %}
    • {{ client.text }}
      • {% endif %} +
    +
    +
    +
    + {% endif %} + {% endfor %} +
    +
    +
    + {% endfor %} diff --git a/_includes/nug-register.html b/_includes/nug-register.html new file mode 100644 index 0000000..9a53aa2 --- /dev/null +++ b/_includes/nug-register.html @@ -0,0 +1,95 @@ + + {% if site.register-web == 1 %} +
    +

    Register an Account on the Local Server

    +
    +
    + {% if site.register-web == 2 %} +
    +
    +

    Registration Form

    +
    +
    +
    +
    + +
    + +
    + @{hostname} +
    +
    Your username is required.
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    Your email address is required.
    +
    +
    +
    + {captcha} +
    +
    +
    + + +
    +
    +
    +
    +
    + {% endif %} +

    You will need to go to the Register page. +

    + + + + +
    +

    Register an Account on a Diffrent Server

    +
    + + {% endif %} +

    This list of servrs may

    + + + +

    List of Servers

    + + + + + + + + + + + + +{% for service in site.data.server-compliance %} + + + + + + {% if service.xep-375 == 1 %}{% else %}{% endif %} + {% if service.xep-368 == 1 %}{% else %}{% endif %} + +{% endfor %} + +
    Service Name
    Registration Method
    Website
    Language
    Service
    Price
    		XEP-0375 complientXEP-0368 complient
    {{ service.name }}
    {% if service.registration-url %}{{ service.registration }}{% elsif service.registration %}{{ service.registration}}{% else %}Unknown{% endif %}
    {{ service.language }}
    {% if service.price %}{{ service.price }}{% else %}Free{% endif %}
    Yes
    No
    Yes
    No
    diff --git a/_sass/site.scss b/_sass/site.scss index 95b18c5..07100a9 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -26,9 +26,14 @@ html { body { position: relative; + font-family: 'Encode Sans Expanded', sans-serif; } +h1, h2, h3, h4, h5, h6 { + font-family: 'Ubuntu', sans-serif; +} + // Links a { @@ -216,6 +221,7 @@ pre { #nug-opening { min-height:400px; width: 100%; + padding-top: 80px; span { font-size: 100px; } @@ -229,6 +235,15 @@ pre { margin-right: -20%; padding-right: 20%; } + .card { + background-color: rgba(0,0,0,0.2); + a { + color: #fff; + } + } + .list-group-item { + background-color: unset; + } } #nug-index { diff --git a/creating-account.html b/creating-account.html index c63dc26..6863b90 100644 --- a/creating-account.html +++ b/creating-account.html @@ -65,14 +65,14 @@ permalink: /new-user-guide/

    Step 1: Download a Client

    - {% include guide-download.html %} + {% include nug-download.html %}

    Step 2: Choose a Server and Register an Account

    - {% include guide-register.html %} + {% include nug-register.html %}
    diff --git a/index.html b/index.html index 0247dff..99de662 100644 --- a/index.html +++ b/index.html @@ -155,12 +155,16 @@ permalink: /
    +{% if site.user-guide == 1 %} + {% include new_user_guide.html %} +{% endif %} +
    diff --git a/nug.html b/nug.html new file mode 100644 index 0000000..e886c0c --- /dev/null +++ b/nug.html @@ -0,0 +1,7 @@ +--- +layout: welcome +title: New User Guide +permalink: /nug/ +--- + +{% include new_user_guide.html %} -- cgit v1.2.3-59-ga6da