Updates

author: Matt Rude <[email protected]> 2016-08-14 16:41:11 -0500
committer: Matt Rude <[email protected]> 2016-08-14 16:41:11 -0500
commit: b867699a06dd2a21a36b21822dcc2cb46af14870 (patch)
tree: 7b0e9c9ff18ae010c5180688f78233d690a689f0
parent: e5a2f7151f9c7ebb3e8ece256e5ba6dacfeafb97 (diff)
download: xmpp-site-b867699a06dd2a21a36b21822dcc2cb46af14870.tar.gz
xmpp-site-b867699a06dd2a21a36b21822dcc2cb46af14870.tar.bz2
xmpp-site-b867699a06dd2a21a36b21822dcc2cb46af14870.zip
12 files changed, 55 insertions, 29 deletions
diff --git a/_includes/menu.html b/_includes/menu.html
index 9eb41dd..edaf2b1 100644
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -14,7 +14,7 @@
 <a href="{{ site.url }}/help/"><strong>Help:</strong></a> |
 <a href="{{ site.url }}/help/client-list/">Clients list</a> | 
 <a href="{{ site.url }}/help/definitions/">Definitions</a> | 
- <a href="{{ site.url }}/help/generic-configuration/">Generic Configuration</a> | 
- <a href="{{ site.url }}/help/using-conferences/">Conferences</a> | 
+ <a href="{{ site.url }}/help/generic-configuration/">Generic Configuration</a> | {% if site.xmpp-conference-url and site.xep-0045 == 1 %}
+ <a href="{{ site.url }}/help/using-conferences/">Conferences</a> | {% endif %}
 <a href="{{ site.url }}/help/web-presence/">Web Presence</a>
 </div>{% endif %}
diff --git a/doc/contact.md b/doc/contact.md
index 2d39447..16c5995 100644
--- a/doc/contact.md
+++ b/doc/contact.md
@@ -12,4 +12,4 @@ permalink: /contact/
 * **email:** [support@{{ site.xmpp-url }}](mailto://support@{{ site.xmpp-url }})
 * **xmpp:** [support@{{ site.xmpp-url }}](xmpp://support@{{ site.xmpp-url }}) - Status: <img src="{{ site.url }}/status/support">
 
-<span style="font-size:0.8em;">**Note:** <img alt="User is Online" height="10" width="10" src="{{ site.url }}/img/online.png"> = User is Online, <img alt="User is Offline" height="10" width="10" src="{{ site.url }}/img/offline.png"> = User is Offline.</span>
+<span style="font-size:0.8em;">**Note:** <img alt="User is Online" height="10" width="10" src="{{ site.url }}/img/status_online.png"> = User's current status is **online**, <img alt="User is Free to Chat" height="10" width="10" src="{{ site.url }}/img/status_chat.png"> = User's current status is **free to chat**, <img alt="User is away" height="10" width="10" src="{{ site.url }}/img/status_away.png"> = User's current status is **away**, <img alt="User is extended away" height="10" width="10" src="{{ site.url }}/img/status_xa.png"> = User's current status is **extended away**, <img alt="User is extended dnd" height="10" width="10" src="{{ site.url }}/img/status_dnd.png"> = User's current status is **dnd**, <img alt="User is extended offline" height="10" width="10" src="{{ site.url }}/img/status_offline.png"> = User's current status is **offline** </span>
diff --git a/help/help.md b/help/help.md
index ff4c355..f13fc6d 100644
--- a/help/help.md
+++ b/help/help.md
@@ -8,6 +8,6 @@ permalink: /help/
 
 * [Client List]({{ site.url }}/help/client-list/)
 * [Definitions]({{ site.url }}/help/definitions/)
-* [Generic Configuration]({{ site.url }}/help/generic-configuration/)
-* [Using Conferences]({{ site.url }}/help/using-conferences/)
+* [Generic Configuration]({{ site.url }}/help/generic-configuration/){% if site.xmpp-conference-url and site.xep-0045 == 1 %}
+* [Using Conferences]({{ site.url }}/help/using-conferences/){% endif %}
 * [Using Web Presence]({{ site.url }}/help/web-presence/)
diff --git a/help/using-conferences.md b/help/using-conferences.md
index 3bc12ea..1a7fe19 100644
--- a/help/using-conferences.md
+++ b/help/using-conferences.md
@@ -4,34 +4,51 @@ title: Using Conferences
 permalink: /help/using-conferences/
 ---
 
-{% if site.xmpp-conference-url %}
+{% if site.xmpp-conference-url and site.xep-0045 == 1 %}
 ## Connecting from a federated XMPP server
 
 By default the server will try to use [TLS]({{ site.url }}/help/definitions/#tls) if the other side supports it, and fall back to [dialback]({{ site.url }}/help/definitions/#dialback) if it does not or if the certificate is incorrect or not trusted.
 
+{% if site.fingerprints == 1 %}
 ## Certificate Fingerprints
 
 One of the benefits of communicating via XMPP is the level of security involved. To allow users to validate the servers they are connecting to, below is the current fingerprints for each domain name.
 
-<table style="width:100%;">
- <thead>
- <tr>
- <th>{{ site.xmpp-conference-url }}<small> - SHA1 Fingerprint</small></th>
- </tr>
- </thead>
- <tr>
- <td><code>{{ site.fingerprint-conference-sha1 }}</code></td>
- </tr>
- <thead>
- <tr>
- <th>{{ site.xmpp-conference-url }}<small> - SHA256 Fingerprint</small></th>
- </tr>
- </thead>
- <tr>
- <td><code>{{ site.fingerprint-conference-sha256 }}</code></td>
- </tr>
-
-</table>
+<div id="cert-table">
+{% if site.fingerprint-sha1 %}
+ <div class="cert-title">
+ <b>{{ site.baseurl }}<small> - SHA1 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-sha256 %}
+ <div class="cert-title">
+ <b>{{ site.baseurl }}<small> - SHA256 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-sha256 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-conference-sha1 %}
+ <div class="cert-title">
+ <b>{{ site.xmpp-conference-url }}<small> - SHA1 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-conference-sha1 }}</pre>
+ </div>
+{% endif %}
+{% if site.fingerprint-conference-sha256 %}
+ <div class="cert-title">
+ <b>{{ site.xmpp-conference-url }}<small> - SHA256 Fingerprint</small></b>
+ </div>
+ <div class="cert-content">
+ <pre>{{ site.fingerprint-conference-sha256 }}</pre>
+ </div>
+{% endif %}
+</div> <!-- Closing cert-table id div -->
+{% endif %}
 {% else %}
 This server dose not support conferences, sorry.
 {% endif %}
diff --git a/help/web-presence.md b/help/web-presence.md
index 4d9473e..cbf84ad 100644
--- a/help/web-presence.md
+++ b/help/web-presence.md
@@ -7,7 +7,7 @@ Web Presence provides the status of a user via a image URL. It is enabled by de
 
 ### Using Web Presence Image
 
-To use web presence, just add the below image url to a site or email. The userid entry is your userid or the left part after the `@` sign of your JID. So if your JID is `odin@{{ site.xmpp-url }}` then your userid will be `odin`.
+To use web presence, just add the below image url to a site or email. The userid entry is your userid or the left part after the `@` sign of your [JID]({{ site.url }}/help/definitions/#jid). So if your JID is `odin@{{ site.xmpp-url }}` then your userid will be `odin`.
 
 <img src="{{ site.url }}/status/userid" />
 
diff --git a/img/status_away.png b/img/status_away.png
new file mode 100644
index 0000000..0de5c6a
--- /dev/null
+++ b/img/status_away.png
diff --git a/img/status_chat.png b/img/status_chat.png
new file mode 100644
index 0000000..324f40b
--- /dev/null
+++ b/img/status_chat.png
diff --git a/img/status_dnd.png b/img/status_dnd.png
new file mode 100644
index 0000000..015f3da
--- /dev/null
+++ b/img/status_dnd.png
diff --git a/img/status_offline.png b/img/status_offline.png
new file mode 100644
index 0000000..12db2af
--- /dev/null
+++ b/img/status_offline.png
diff --git a/img/status_online.png b/img/status_online.png
new file mode 100644
index 0000000..fb257c3
--- /dev/null
+++ b/img/status_online.png
diff --git a/img/status_xa.png b/img/status_xa.png
new file mode 100644
index 0000000..321d35b
--- /dev/null
+++ b/img/status_xa.png
diff --git a/index.md b/index.md
index eafdd29..3ac3703 100644
--- a/index.md
+++ b/index.md
@@ -58,10 +58,19 @@ Compression is enabled via [mod_compression](https://prosody.im/doc/modules/mod_
 {% if site.xep-0357 == 1 %}
 ### Push Notifications
 
+The purpose of push notifications ([XEP-0357](https://xmpp.org/extensions/xep-0357.html)) is to inform users of new messages or other pertinent information even when they have no XMPP clients online.
+
+Typically, these notifications are delivered to a user's mobile device, displaying a notice that can trigger opening an XMPP client to continue a conversation or answer a Jingle session request.
+
 {% endif %}
 
+{% if site.xep-0065 == 1 %}
 ### File Transfer
 
+File Transfer ([XEP-0065](https://xmpp.org/extensions/xep-0065.html)) allows the server to proxy file transfers between 2 clients that are behind NAT routers or firewalls, and otherwise wouldn't be able to transfer files.
+
+{% endif %}
+
 ### Web Presence
 
 Web Presence provides the status of a user via a image URL. Please see the page [Web Presence]({{ site.url }}/help/web-presence/) for more infromation on how to use the web presence service.
@@ -72,7 +81,7 @@ Web Presence provides the status of a user via a image URL. Please see the page
 * The backend is configured to store hashed and salted authentication data
 * Use Off-the-Record (OTR) in your chat client to have fully encrypted chats
 
-{% if site.fingerprints %}
+{% if site.fingerprints == 1 %}
 ### Certificates Fingerprints
 
 One of the benefits of communicating via XMPP is the level of security involved. To allow users to validate the servers they are connecting to, below is the current fingerprints for each domain name.
@@ -80,7 +89,7 @@ One of the benefits of communicating via XMPP is the level of security involved.
 <div id="cert-table">
 {% if site.fingerprint-sha1 %}
 <div class="cert-title">
- <b>{{ site.baseurl }}<small> - SHA1 Fingerprint</small></b>
+ <b>{{ site.xmpp-url }}<small> - SHA1 Fingerprint</small></b>
 </div>
 <div class="cert-content">
 <pre>{{ site.fingerprint-sha1 }}</pre>
@@ -88,7 +97,7 @@ One of the benefits of communicating via XMPP is the level of security involved.
 {% endif %}
 {% if site.fingerprint-sha256 %}
 <div class="cert-title">
- <b>{{ site.baseurl }}<small> - SHA256 Fingerprint</small></b>
+ <b>{{ site.xmpp-url }}<small> - SHA256 Fingerprint</small></b>
 </div>
 <div class="cert-content">
 <pre>{{ site.fingerprint-sha256 }}</pre>
author	Matt Rude <[email protected]>	2016-08-14 16:41:11 -0500
committer	Matt Rude <[email protected]>	2016-08-14 16:41:11 -0500
commit	b867699a06dd2a21a36b21822dcc2cb46af14870 (patch)
tree	7b0e9c9ff18ae010c5180688f78233d690a689f0
parent	e5a2f7151f9c7ebb3e8ece256e5ba6dacfeafb97 (diff)
download	xmpp-site-b867699a06dd2a21a36b21822dcc2cb46af14870.tar.gz xmpp-site-b867699a06dd2a21a36b21822dcc2cb46af14870.tar.bz2 xmpp-site-b867699a06dd2a21a36b21822dcc2cb46af14870.zip