diff options
| author | Matt Rude <[email protected]> | 2018-02-04 20:22:30 -0600 |
|---|---|---|
| committer | Matt Rude <[email protected]> | 2018-02-04 20:22:30 -0600 |
| commit | 2c117a6994b3cf814638e2b98cb78203539ec11a (patch) | |
| tree | ef3ba31d1dfd2fce790feac037cf354b1b83d431 | |
| parent | e7c71a400ccf5d1f10d8554d446c6b0af2d13205 (diff) | |
| download | xmpp-site-lite-2c117a6994b3cf814638e2b98cb78203539ec11a.tar.gz xmpp-site-lite-2c117a6994b3cf814638e2b98cb78203539ec11a.tar.bz2 xmpp-site-lite-2c117a6994b3cf814638e2b98cb78203539ec11a.zip | |
Updates
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | _data/nug-sections.yml | 16 | ||||
| -rw-r--r-- | _includes/menu.html | 6 | ||||
| -rw-r--r-- | _includes/new_user_guide.html | 68 | ||||
| -rw-r--r-- | _includes/password-reset.html | 44 | ||||
| -rw-r--r-- | _includes/registration.html | 10 | ||||
| -rw-r--r-- | _sass/site.scss | 55 | ||||
| -rw-r--r-- | index.html | 8 | ||||
| -rw-r--r-- | password-reset.html | 47 | ||||
| -rw-r--r-- | register_web/register.html | 6 |
10 files changed, 252 insertions, 10 deletions
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 @@ <a class="nav-link ml-3 my-1" href="#{{ section.slug }}">{{ section.name }}</a> {% endfor %} </nav> + <li class="nav-item"><a class="nav-link" href="#nug-opening">User Guide</a></li> + <nav class="nav nav-pills flex-column" style="display:none;"> + {% for sectionnug in site.data.nug-sections %} + <a class="nav-link ml-3 my-1" href="#{{ sectionnug.slug }}">{{ sectionnug.name }}</a> + {% endfor %} + </nav> <li class="nav-item"><a class="nav-link" href="#about">About</a></li> </ul>{% 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 @@ +<div id="nug" class="container-fluid"> + <div class="row justify-content"> + <div id="nug-opening" class="feature-section"> + <div class="container offsetanchor"> + <div class="section-header" id="features-section"> + <center> + <span class="fa fa-user"aria-hidden="true"></span> + <h2>New User Guide</h2> + </center> + </div> + <div id="feature-heading-content"> + <hr class="my-4"> + <blockquote class="blockquote"> + <p class="mb-0"></p> + </blockquote> + </div> + </div> + </div> + + <!-- Starting the content section of the page --> + <div id="nug-content" class="col-sm-10"> + <!-- Site Features --> + {% for section in site.data.nug-sections %} + <div id="{{ section.slug }}" class="index-section nug-feature-section" style="background-color:#{{ section.color }};"> + <div class="container offsetanchor"> + <div id="nug-{{ section.slug }}" class="section-header"> + <center> + <span class="{{ section.glyph }}" style="font-size:100px;" aria-hidden="true"></span> + <h2>{{ section.name }}</h2> + </center> + </div> + <div class="feature-{{ section.slug }}"> + <div class="row"> + <p>{{ section.text }}</p> + {% for feature in site.data.features %} + {% if feature.section == section.slug %} + <div class="{% if section.col == 3 %}col-md-4{% else %}col-sm-6{% endif %}" style="min-height:280px;"> + <h3>{{ feature.name }}</h3> + <p>{{ feature.text }}</p> + </div> + {% endif %} + {% endfor %} + </div> + </div> + </div> + </div> + {% endfor %} + </div> + <!-- Ending the content section of the page --> + + <!-- Starting the page index nav menu --> + <div id="nug-index" class="col-2 hidden-sm-down"> + <nav id="navbar-main" class="sticky-top navbar navbar-light" style="padding-top:50px;margin-top:-50px;"> + <nav id="nug-nav-body" class="nav nav-pills flex-column"> + <a id="features-index" href="#nug-opening" style="color:#000;line-height:50px;text-align:center;font-size:1.3rem;"><b>User Guide</b></a> + {% for section in site.data.nug-sections %} + <nav class="nav nav-pills flex-column nav-item align-middle"> + <a class="nav-link ml-3 my-1" href="#{{ section.slug }}"><span id="nug-index-span">{{ section.name }}</span></a> + </nav> + {% endfor %} + </nav> + </nav> + </div> + <!-- Ending the page index nav menu --> + + + </div> <!-- Closing the row justify-content clases --> +</div> <!-- Closing the ID creating-account and the main container class --> 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 @@ +<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document" style="max-width:400px;"> + <div class="modal-content"> + <div class="modal-header"> + <h5 class="modal-title" id="exampleModalLabel">Reset your XMPP Account Password</h5> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + <div class="modal-body"> + + + <form action="{{ site.url }}:5281/resetpass/" method="post" class="form-horizontal needs-validation" style="padding: 15px;" novalidate=""> + <p class="error"></p> + <div style="margin-bottom: 25px" class="input-group"> + <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span> + <div class="input-group"> + <input type="text" class="form-control" name="username" placeholder="Username" id="username" required=""> + <div class="input-group-append"> + <span class="input-group-text" style="font-size:0.8em;font-weight:bold;">@{{ site.xmpp-url }}</span> + </div> + <div class="invalid-feedback" style="width: 100%;">Your username is required.</div> + </div> + </div> + <div style="margin-bottom: 25px" class="input-group"> + <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span> + <div class="input-group"> + <input type="email" class="form-control" name="email" placeholder="E-Mail" id="email" required=""> + <div class="invalid-feedback" style="width: 100%;">Your email address is required.</div> + </div> + </div> + + + + <p>After submitting, a link will be sent to the email address that appears on your vCard.</p> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> + <button id="button" type="submit" class="btn btn-primary">Submit</button> + </div> + </form> + </div> + </div> + </div> +</div> 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 @@ </div> </div> </form> + <div id="reset-password-link" style="float:right;padding:10px 30px 0 0;"> + <a href="#" data-toggle="modal" data-target="#exampleModal" class="float-right">Reset Password</a> + </div> </div> </div> - </div> - </div> + </div> + </div> + </div> + </div> + {% 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; @@ -51,6 +51,7 @@ permalink: / <li>File Uploads: <b>{{ site.xmpp-upload-url }}</b></li>{% endif %} </ul> <div style="padding-left:40px;"><a href="https://check.messaging.one/result.php?domain={{ site.xmpp-url }}&type=server" target="_blank"><img src="https://check.messaging.one/badge.php?domain={{ site.xmpp-url }}" alt="check.messaging.one server score"/></a></div> + </div> </div> </div> @@ -68,7 +69,6 @@ permalink: / </div> {% endif %} - <div id="server-features" class="container-fluid"> <div class="row justify-content"> <!-- Starting the page index nav menu --> @@ -155,6 +155,12 @@ permalink: / </div> <!-- Closing the row justify-content clases --> </div> <!-- Closing the ID creating-account and the main container class --> +<!-- New User Guide Section --> + +{% include new_user_guide.html %} + +<!-- End of New User Guide Section --> + <!-- About Section --> <div id="about" class="index-section" style="background-color:#eee;padding-bottom:80px;"> 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/ +--- + +<div class="section-header" id="features-section"> + <center> + <span class="fa fa-user" style="font-size:100px;" aria-hidden="true"></span> + <h2>Password Reset Form</h2> + </center> +</div> + +<hr class="my-4" style="max-width:370px;"> + + <div style="max-width:400px;margin:0 auto;"> + + + <form action="{{ site.url }}:5281/resetpass/" method="post" class="form-horizontal needs-validation" style="padding: 15px;" novalidate=""> + <p class="error"></p> + <div style="margin-bottom: 25px" class="input-group"> + <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span> + <div class="input-group"> + <input type="text" class="form-control" name="username" placeholder="JID (username)" id="username" required=""> + <div class="input-group-append"> + <span class="input-group-text" style="font-size:0.8em;font-weight:bold;">@{{ site.xmpp-url }}</span> + </div> + <div class="invalid-feedback" style="width: 100%;">Your JID (username) is required.</div> + </div> + </div> + <div style="margin-bottom: 25px" class="input-group"> + <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span> + <div class="input-group"> + <input type="email" class="form-control" name="email" placeholder="Email Address" id="email" required=""> + <div class="invalid-feedback" style="width: 100%;">Your email address is required.</div> + </div> + </div> + + + + <p>After submitting, a link will be sent to the email address that appears on your vCard.</p> + <div class="modal-footer"> + <button type="reset" value="Clear" class="btn btn-default pull-right" style="margin-right:15px">Clear</button> + <button id="button" type="submit" class="btn btn-primary">Submit</button> + </div> + </form> + </div> 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 </div> </div> </form> + <div id="reset-password-link" style="float:right;padding:10px 30px 0 0;"> + <a href="#" data-toggle="modal" data-target="#exampleModal" class="float-right">Reset Password</a> + </div> </div> </div> </div> - </div> + </div> + {% include password-reset.html %} |