Updates

author: Matt Rude <[email protected]> 2018-02-09 20:21:11 -0600
committer: Matt Rude <[email protected]> 2018-02-09 20:21:11 -0600
commit: 9051be6066ecb670c20ea40f0b8b069c44101799 (patch)
tree: 3eabba663ee65fa6cf6985990afa0053bd7b3f58
parent: 5afe82787aee805ebc41351be9450c75d390f4a5 (diff)
download: xmpp-site-lite-9051be6066ecb670c20ea40f0b8b069c44101799.tar.gz
xmpp-site-lite-9051be6066ecb670c20ea40f0b8b069c44101799.tar.bz2
xmpp-site-lite-9051be6066ecb670c20ea40f0b8b069c44101799.zip
8 files changed, 134 insertions, 119 deletions
diff --git a/404.html b/404.html
index 08c81ab..29f63c4 100644
--- a/404.html
+++ b/404.html
@@ -1,21 +1,14 @@
 ---
-layout: default
+layout: welcome
 sitemap: false
 permalink: /404.html
 ---
 
-<br />
-<br />
-<br />
-<br />
-<br />
-<center><h1>Error: 404 <small>Page not found!</small></h1></center>
-<center><p>Im sorry but the page you are looking for can not be found at this time.</p></center>
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
+<div id="error-container" class="container d-flex h-100">
+ <div id="error-text" class="justify-content-center align-self-center">
+ <h1><i class="fa fa-exclamation-triangle"></i></h1>
+ <h1>Error: 404</h1>
+ <h3>Page not found!</h3>
+ <p>Im sorry but the page you are looking for can not be found at this time.</p>
+ </div>
+</div>
diff --git a/500.html b/500.html
new file mode 100644
index 0000000..da484ce
--- /dev/null
+++ b/500.html
@@ -0,0 +1,14 @@
+---
+layout: welcome
+sitemap: false
+permalink: /500.html
+---
+
+<div id="error-container" class="container d-flex h-100">
+ <div id="error-text" class="justify-content-center align-self-center">
+ <h1><i class="fa fa-exclamation-triangle"></i></h1>
+ <h1>Error: 500</h1>
+ <h3>Internal Server Error</h3>
+ <p>This code indicates that the server encountered an unexpected condition that prevented it from fulfilling the request.</p>
+ </div>
+</div>
diff --git a/502.html b/502.html
new file mode 100644
index 0000000..5395606
--- /dev/null
+++ b/502.html
@@ -0,0 +1,14 @@
+---
+layout: welcome
+sitemap: false
+permalink: /502.html
+---
+
+<div id="error-container" class="container d-flex h-100">
+ <div id="error-text" class="justify-content-center align-self-center">
+ <h1><i class="fa fa-exclamation-triangle"></i></h1>
+ <h1>Error: 502</h1>
+ <h3>Bad Gateway</h3>
+ <p>This server (nginx) received an invalid response from the upstream server (ejabberd).</p>
+ </div>
+</div>
diff --git a/_includes/footer.html b/_includes/footer.html
index def36ab..f257a60 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,5 @@
 <footer class="footer">
- <div class="container offsetanchor" style="padding:30px 0 20px 0;" id="features">
+ <div class="container offsetanchor" id="features">
 <div id="footer"><!-- Starting Footer Section -->
 <div class="pull-left">
 <p><a href="https://status.im.mattrude.com/{{ site.xmpp-url }}">Status</a> | <a href="{{ site.url }}/certificates/">Certificates</a></p>
diff --git a/_includes/nug-register.html b/_includes/nug-register.html
index 9a53aa2..a78db42 100644
--- a/_includes/nug-register.html
+++ b/_includes/nug-register.html
@@ -1,95 +1,45 @@
 
- {% if site.register-web == 1 %}
- <div id="register-local-server" class="section-header-nug">
- <center><h2>Register an Account on the Local Server</h2></center>
- </div>
- <div class="row">
- {% if site.register-web == 2 %}
- <div class="card" style="border-color:#9FCF6C;margin-left:25px;">
- <div class="panel-heading" style="background-color:#9FCF6C;border-color:transparent;color:rgb(52, 68, 35);">
- <div class="panel-title"><center><h4>Registration Form</h4></center></div>
- </div>
- <div class="panel-body" style="margin-bottom: 15px;">
- <form action="{{ site.url }}/register/" method="post" class="form-horizontal needs-validation" style="padding: 15px;" novalidate>
- <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;">@{hostname}</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-lock"></i></span>
- <div class="input-group">
- <input type="password" class="form-control" name="password" placeholder="Password" id="password" required />
- </div>
- </div>
- <div style="margin-bottom: 25px" class="input-group">
- <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
- <div class="input-group">
- <input type="password" class="form-control" name="confirm_password" placeholder="Confirm Password" id="confirm-password" required />
- </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>
- <div style="margin-bottom:25px;margin:0 auto;" class="input-group test">
- {captcha}
- </div>
- <div style="margin-top:15px;margin-bottom:0;" class="form-group">
- <div class="col-sm-12 controls">
- <input type="submit" value="Register" class="btn btn-success pull-right" />
- <input type="reset" value="Clear" class="btn btn-default pull-right" style="margin-right:15px" />
- </div>
- </div>
- </form>
- </div>
- </div>
- {% endif %}
- <p>You will need to go to the <a href="/register">Register</a> page.
- </div>
-
-
-
-
- <div id="register-diffrent-server" class="section-header-nug">
- <center><h2>Register an Account on a Diffrent Server</h2></center>
- </div>
-
- {% endif %}
-<p>This list of servrs may</p>
-
-<div class="alert alert-info" role="alert">Servers listed with the registraion method of "<i>In-band</i>", require you to register with a client. Servers with a "<i>Website</i>" require you to connect to the website and register via a form and generally will require you to provide an email and solve a captcha.</div>
-
-<h3>List of Servers</h3>
-<table class='table' style='width:100%'>
- <thead>
- <tr>
- <th>Service Name</th>
- <th><center>Registration Method</center></th>
- <th><center>Website<br />Language</center></th>
- <th><center>Service<br />Price</center></th>
- <th><a href='https://xmpp.org/extensions/xep-0375.html'>XEP-0375</a> complient</th>
- <th><a href='https://xmpp.org/extensions/xep-0368.html'>XEP-0368</a> complient</th>
- </tr>
- </thead>
- <tbody>
-{% for service in site.data.server-compliance %}
- <tr>
- <td style="min-width:150px;"><a href='{{ service.url }}'>{{ service.name }}</a></td>
- <td style="min-width:100px;"><center>{% if service.registration-url %}<a href="{{ service.registration-url }}">{{ service.registration }}</a>{% elsif service.registration %}{{ service.registration}}{% else %}<i>Unknown</i>{% endif %}</center></td>
- <td><center>{{ service.language }}</center></td>
- <td><center>{% if service.price %}{{ service.price }}{% else %}Free{% endif %}<center></td>
- {% if service.xep-375 == 1 %}<td class=PASSED style="width:75px;"><center>Yes</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}
- {% if service.xep-368 == 1 %}<td class=PASSED style="width:75px;"><center>Yes</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}
- </tr>
-{% endfor %}
- </tbody>
-</table>
+ {% if site.register-web >= 1 %}
+ <div id="register-local-server" class="section-header-nug">
+ <center><h2>Register an Account on the Local Server</h2></center>
+ </div>
+ {% if site.register-web == 2 %}
+ {% include registration.html %}
+ {% endif %}
+ {% else %}
+ <div id="register-diffrent-server" class="section-header-nug">
+ <center><h2>Register an Account on a Diffrent Server</h2></center>
+ </div>
+ <p>This list of servrs may</p>
+ <div class="alert alert-info" role="alert">
+ Servers listed with the registraion method of "<i>In-band</i>", require you to register with a client.
+ Servers with a "<i>Website</i>" require you to connect to the website and register via a form and generally
+ will require you to provide an email and solve a captcha.
+ </div>
+
+ <h3>List of Servers</h3>
+ <table class='table' style='width:100%'>
+ <thead>
+ <tr>
+ <th>Service Name</th>
+ <th><center>Registration Method</center></th>
+ <th><center>Website<br />Language</center></th>
+ <th><center>Service<br />Price</center></th>
+ <th><a href='https://xmpp.org/extensions/xep-0375.html'>XEP-0375</a> complient</th>
+ <th><a href='https://xmpp.org/extensions/xep-0368.html'>XEP-0368</a> complient</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for service in site.data.server-compliance %}
+ <tr>
+ <td style="min-width:150px;"><a href='{{ service.url }}'>{{ service.name }}</a></td>
+ <td style="min-width:100px;"><center>{% if service.registration-url %}<a href="{{ service.registration-url }}">{{ service.registration }}</a>{% elsif service.registration %}{{ service.registration}}{% else %}<i>Unknown</i>{% endif %}</center></td>
+ <td><center>{{ service.language }}</center></td>
+ <td><center>{% if service.price %}{{ service.price }}{% else %}Free{% endif %}<center></td>{% if service.xep-375 == 1 %}
+ <td class=PASSED style="width:75px;"><center>Yes</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}{% if service.xep-368 == 1 %}
+ <td class=PASSED style="width:75px;"><center>Yes</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% endif %}
diff --git a/_includes/registration-form.html b/_includes/registration-form.html
index 1aedcd9..902cffa 100644
--- a/_includes/registration-form.html
+++ b/_includes/registration-form.html
@@ -1,18 +1,17 @@
- <div id="register-window" class="mainbox">
+ <div id="register-window" class="mainbox col-md-4 col-sm-8 col-sx-offset-2">
 <div class="row">
 <div class="card">
 <div class="panel-heading">
 <div class="panel-title"><center><h4>Registration Form</h4></center></div>
 </div>
 <div class="panel-body" style="margin-bottom: 15px;">
- <h3 class="text-center text-danger" style="margin-top:0px;">{notice}</h3>
 <form action="{{ site.url }}/register/" method="post" class="form-horizontal needs-validation" style="padding: 15px;" novalidate>
 <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;">@{hostname}</span>
+ <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>
@@ -36,8 +35,29 @@
 <div class="invalid-feedback" style="width: 100%;">Your email address is required.</div>
 </div>
 </div>
- <div style="margin-bottom:25px;margin:0 auto;" class="input-group test">
- {captcha}
+ <div style="margin-bottom:25px;margin:0 auto;min-height:78px;" class="input-group test">
+ <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+ <div class="g-recaptcha" data-sitekey="{{ site.recaptcha_public_key }}" style="transform:scale(0.88);-webkit-transform:scale(0.88);transform-origin:0 0;-webkit-transform-origin:0 0;"></div>
+ <noscript>
+ <div style="width: 261px; height: 352px;">
+ <div style="width: 261px; height: 352px; position: relative;">
+ <div style="width: 261px; height: 352px; position: absolute;">
+ <iframe src="https://www.google.com/recaptcha/api/fallback?k={recaptcha_public_key}"
+ frameborder="0" scrolling="no"
+ style="width: 261px; height:352px; border-style: none;">
+ </iframe>
+ </div>
+ <div style="width: 250px; height: 80px; position: absolute; border-style: none;
+ bottom: 21px; left: 25px; margin: 0px; padding: 0px; right: 25px;">
+ <textarea id="g-recaptcha-response" name="g-recaptcha-response"
+ class="g-recaptcha-response"
+ style="width: 250px; height: 80px; border: 1px solid #c1c1c1;
+ margin: 0px; padding: 0px; resize: none;" value="">
+ </textarea>
+ </div>
+ </div>
+ </div>
+ </noscript>
 </div>
 <div style="margin-top:15px;margin-bottom:0;" class="form-group">
 <div class="col-sm-12 controls">
@@ -46,6 +66,12 @@
 </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>
+<!-- Before Password Reset -->
+ {% include password-reset.html %}
+<!-- After Password Reset -->
 </div>
diff --git a/_includes/registration.html b/_includes/registration.html
index 26014fa..0a29dae 100644
--- a/_includes/registration.html
+++ b/_includes/registration.html
@@ -119,5 +119,4 @@
 </div>
 </div>
 </div>
- </div>
 {% include password-reset.html %}
diff --git a/_sass/site.scss b/_sass/site.scss
index 07100a9..2a46b11 100644
--- a/_sass/site.scss
+++ b/_sass/site.scss
@@ -25,13 +25,15 @@ html {
 }
 
 body {
- position: relative;
 font-family: 'Encode Sans Expanded', sans-serif;
+ /* Margin bottom by footer height */
+ margin-bottom: 60px;
+// height: 100vh;
 }
 
 
 h1, h2, h3, h4, h5, h6 {
- font-family: 'Ubuntu', sans-serif;
+// font-family: 'Ubuntu', sans-serif;
 }
 
 // Links
@@ -315,6 +317,8 @@ pre {
 position: absolute;
 bottom: 0;
 width: 100%;
+ height: 60px;
+ line-height: 60px; /* Vertically center the text there */
 background-color: $site-color;
 a {
 color: #fff;
@@ -323,6 +327,21 @@ pre {
 color: darken($site-color, 40%);
 text-decoration: underline;
 }
+ p {
+ margin-bottom: 0;
+ }
+}
+
+#error-container {
+ margin-top: 100px;
+}
+
+#error-text {
+ text-align: center;
+ margin: 0 auto 0;
+ i {
+ color: red;
+ }
 }
 
 .index-section {
author	Matt Rude <[email protected]>	2018-02-09 20:21:11 -0600
committer	Matt Rude <[email protected]>	2018-02-09 20:21:11 -0600
commit	9051be6066ecb670c20ea40f0b8b069c44101799 (patch)
tree	3eabba663ee65fa6cf6985990afa0053bd7b3f58
parent	5afe82787aee805ebc41351be9450c75d390f4a5 (diff)
download	xmpp-site-lite-9051be6066ecb670c20ea40f0b8b069c44101799.tar.gz xmpp-site-lite-9051be6066ecb670c20ea40f0b8b069c44101799.tar.bz2 xmpp-site-lite-9051be6066ecb670c20ea40f0b8b069c44101799.zip