diff options
-rw-r--r-- | _data/clients-compliance.yml | 182 | ||||
-rw-r--r-- | _data/clients.yml | 80 | ||||
-rw-r--r-- | _data/clienttypes.yml | 11 | ||||
-rw-r--r-- | _includes/guide-download.html | 29 | ||||
-rw-r--r-- | _includes/guide-register.html | 53 | ||||
-rw-r--r-- | _includes/registration.html | 58 | ||||
-rw-r--r-- | _sass/site.scss | 78 | ||||
-rw-r--r-- | assets/img/clients/messages_logo.png | bin | 4228 -> 0 bytes | |||
-rw-r--r-- | assets/img/clients/psi_logo.png | bin | 15980 -> 0 bytes | |||
-rw-r--r-- | assets/img/clients/spark_logo.png | bin | 9575 -> 0 bytes | |||
-rw-r--r-- | assets/img/clients/xabber_logo.png | bin | 55710 -> 0 bytes | |||
-rw-r--r-- | assets/img/clients/yaxim_logo.png | bin | 35324 -> 0 bytes | |||
-rw-r--r-- | creating-account.html | 76 | ||||
-rw-r--r-- | index.html | 3 |
14 files changed, 68 insertions, 502 deletions
diff --git a/_data/clients-compliance.yml b/_data/clients-compliance.yml deleted file mode 100644 index 24c4ac1..0000000 --- a/_data/clients-compliance.yml +++ /dev/null @@ -1,182 +0,0 @@ -- name: 5222.de - url: https://5222.de/ - xep-375: 1 - xep-368: 1 - tor: jtovcabr2vhflcqg.onion - language: German - location: Germany - registration: Website - registration-url: https://blog.5222.de/account/ - -- name: bommboo.de - url: https://bommboo.de/ - xep-375: 1 - xep-368: 1 - tor: ujvdniabz53upqfx.onion - language: German - location: Germany - registration: Website - registration-url: https://bommboo.de:5281/register/ - -- name: chatme.im - url: https://chatme.im/ - xep-375: 1 - xep-368: 0 - language: Italian - registration: In-band registration - -- name: chinwag.im - url: https://chinwag.im/ - registration: Website - registration-url: https://chat.chinwag.im/?accountnext/chinwag.im/ - xep-375: 1 - xep-368: 0 - language: English - -- name: conversations.im - url: https://account.conversations.im/ - registration: In-band registration - xep-375: 1 - xep-368: 1 - language: English - price: €12/year - -- name: creep.im - url: https://creep.im/ - xep-375: 1 - xep-368: 0 - tor: creep7nissfumwyx.onion - language: English - location: Moscow, Russia - registration: In-band registration - -- name: elaon.de - url: https://elaon.de/ - registration: Website - registration-url: https://elaon.de/info/services/xmpp.html - xep-375: 1 - xep-368: 0 - language: German - -- name: high-way.me - url: https://high-way.me/ - xep-375: 1 - xep-368: 1 - language: German - registration: Website - registration-url: https://high-way.me/login/ - -- name: im.apinc.org - url: https://chat.jabberfr.org/ - xep-375: 1 - xep-368: 1 - language: French - location: France - registration: In-band registration - -- name: jabber.cat - url: https://jabber.cat/english.shtml - xep-375: 1 - xep-368: 1 - language: Catalan - registration: <i>Closed</i> - tor: sybzodlxacch7st7.onion - -- name: jabber.fr - url: https://chat.jabberfr.org/ - xep-375: 1 - xep-368: 1 - language: French - location: France - registration: In-band registration - -- name: jabber-germany.de - url: https://jabber-germany.de/ - xep-375: 1 - xep-368: 1 - language: English - registration: In-band registration - tor: dbbrphko5tqcpar3.onion - -- name: jabber.hot-chilli.net - url: https://jabber.hot-chilli.net/ - xep-375: 1 - xep-368: 1 - language: English - location: Germany - registration: Website - registration-url: https://jabber.hot-chilli.net/account/create/ - -- name: rwth-aachen.de - url: https://jabber.rwth-aachen.de/ - xep-375: 1 - xep-368: 1 - language: English - location: Germany - registration: Website - registration-url: https://jabber.rwth-aachen.de/account/register/ - -- name: jabjab.de - url: https://jabjab.de/index.php?lang=gb - xep-375: 1 - xep-368: 1 - language: German - location: Germany - registration: Website - registration-url: https://jabjab.de/registrieren.php?lang=gb - -- name: mailbox.org - url: https://mailbox.org/en/ - xep-375: 1 - xep-368: 0 - language: German - location: Germany - price: €12/year - registration: Website - registration-url: https://mailbox.org/en/signup/ - -- name: mail.de - url: https://mail.de/ - xep-375: 1 - xep-368: 1 - language: German - location: Germany - price: €24/year - registration: Website - registration-url: https://registrierung.mail.de/ - -- name: pimux.de - url: https://pimux.de/ - xep-375: 1 - xep-368: 1 - language: German - location: Germany - registration: Website - registration-url: https://www.pimux.de/page/registrierung - tor: maspm2xs6xavmpo6.onion - -- name: riotcat.org - url: https://riotcat.org/ - registration: In-band registration - xep-375: 1 - xep-368: 1 - language: English - -- name: trashserver.net - url: https://trashserver.net/ - xep-375: 1 - xep-368: 1 - language: German - location: Kumhausen, Germany - registration: Website - registration-url: https://trashserver.net/registrieren/ - tor: m4c722bvc2r7brnn.onion - -- name: wiuwiu.de - url: https://wiuwiu.de/ - xep-375: 1 - xep-368: 1 - language: German - registration: Website - registration-url: https://wiuwiu.de/xmpp/ - tor: jrbiogs6dv5txt5s.onion diff --git a/_data/clients.yml b/_data/clients.yml deleted file mode 100644 index 25b392b..0000000 --- a/_data/clients.yml +++ /dev/null @@ -1,80 +0,0 @@ -- name: Conversations - type: mobile - platform: Mobile (Android) - encryption: TLS, OMEMO, OTR - domain: conversations.im - url: https://conversations.im/ - img: conversations_logo.png - text: Conversations is a Jabber/XMPP client for Android 4.0+ smartphones that has been optimized to provide a unique mobile experience. - -- name: ChatSecure - type: mobile - platform: Mobile (iOS) - encryption: TLS, OMEMO, OTR - domain: chatsecure.org - url: https://chatsecure.org/ - img: chatsecure_logo.png - text: ChatSecure is a free and open source messaging app that features OTR encryption over XMPP. - -- name: Xabber - type: mobile - platform: Mobile (Android) - encryption: TLS, OTR - domain: xabber.com - url: https://www.xabber.com/ - img: xabber_logo.png - text: Xabber is the most popular open-source XMPP client for Android. It supports multiple XEPs, Off-The-Record (OTR) chat encryption and is available in multiple languages. - -- name: Gajim - type: desktop - platform: Linux / Windows - encryption: TLS, OMEMO, OTR - domain: gajim.org - url: https://gajim.org/ - img: gajim_logo.png - text: Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. - -- name: Swift - type: desktop - platform: Linux / OSX / Windows - encryption: TLS - domain: swift.im - url: http://swift.im/ - img: swift_logo.svg - guide: spark - text: An elegant, secure, adaptable and intuitive XMPP Client. Available for free on Windows, Mac OSX and Linux. - -- name: Psi - type: desktop - platform: Linux / OSX / Windows - encryption: TLS - domain: psi-im.org - url: http://psi-im.org/ - img: psi_logo.png - text: Psi is a free instant messaging application designed for the XMPP network. Fast and lightweight, Psi is fully open-source and compatible with Windows, Linux, and Mac OS X. - -- name: Messages - type: desktop - platform: OSX - encryption: TLS - domain: apple.com - url: http://www.apple.com/osx/whats-new/features.html#messages - img: messages_logo.png - text: Messages is an instant messaging software application developed by Apple Inc. for its macOS. - -- name: Spark - type: desktop - platform: Linux / OSX / Windows - encryption: TLS, OTR - domain: igniterealtime.org - url: http://igniterealtime.org/projects/spark/index.jsp - img: spark_logo.png - text: Spark is an Open Source, cross-platform IM client optimized for businesses and organizations. It features built-in support for group chat, telephony integration, and strong security. It also offers a great end-user experience with features like in-line spell checking, group chat room bookmarks, and tabbed conversations. - -#- name: Profanity -# type: server -# platform: Console / Text-Mode -# encryption: TLS, OTR -# domain: profanity.im -# url: http://profanity.im/ -# text: Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi diff --git a/_data/clienttypes.yml b/_data/clienttypes.yml deleted file mode 100644 index e657ed5..0000000 --- a/_data/clienttypes.yml +++ /dev/null @@ -1,11 +0,0 @@ -- name: Mobile - slug: mobile - index: download-1 - -- name: Destop/Laptop - slug: desktop - index: download-2 - -#- name: Server -# slug: server -# index: download-3 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 %} - <div id="{{ type.slug }}"> - <center><h2 style="padding:60px 0;font-size:3em;">{{ type.name }}</h2></center> - <div class="client-{{ type.slug }}"> - <div class="row"> - {% for client in site.data.clients %} - {% if client.type == type.slug %} - <div class="col-md-6"> - <div class="card"> - {% if client.img %} - <img class="card-img-top" src="{{ site.url }}/assets/img/clients/{{ client.img }}"/> - {% endif %} - <div class="card-body"> - <h3 class="card-title">{{ client.name }}</h3> - <ul class="list-group-flush card-text" style="padding-left:unset;"> - <li class="list-group-item"><b>Platform:</b> {{ client.platform }}</li> - <li class="list-group-item"><b>Encryption:</b> {{ client.encryption }}</li> - <li class="list-group-item"><b>Website:</b> <a href="{{ client.url }}">{{ client.domain }}</a></li> - {% if client.text %}<li class="list-group-item">{{ client.text }}</li>{% endif %} - </ul> - </div><!-- end class card-body --> - </div><!-- end class card --> - </div><!-- end class col-md-4 --> - {% endif %} - {% endfor %} - </div><!-- end class row --> - </div><!-- end class client-{{ type.slug }} --> - </div> - {% endfor %} diff --git a/_includes/guide-register.html b/_includes/guide-register.html index 411d303..1a0a3f4 100644 --- a/_includes/guide-register.html +++ b/_includes/guide-register.html @@ -10,58 +10,11 @@ </div> <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordion"> <div class="card-body"> - <div class="row"> - <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> - </div> - </div> + {% include registration-form.html %} + </div> </div> </div> + </div> diff --git a/_includes/registration.html b/_includes/registration.html index 5219815..de1b191 100644 --- a/_includes/registration.html +++ b/_includes/registration.html @@ -41,58 +41,6 @@ </div> </div> </div> - <div id="loginbox" class="mainbox col-md-4 col-sm-8 col-sx-offset-2"> - <div class="row"> - <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;"> - <!-- - <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;">@{{ 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-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> - </div> - </div> - </div> + </div> + {% include registration-form.html %} + </div> diff --git a/_sass/site.scss b/_sass/site.scss index cdf494d..e97b527 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -1,5 +1,5 @@ $site-color: #9FCF6C; -$site-color: #c3950d; +//$site-color: #c3950d; html { position: relative; @@ -19,6 +19,49 @@ a:hover { text-decoration: underline; } +.btn-primary { + color: #fff; + background-color: darken($site-color, 10%); + border-color: darken($site-color, 15%); +} + +.btn-primary:hover { + color: darken($site-color, 5%); + background-color: darken($site-color, 25%); + border-color: transparent; +} + +.btn-primary:not(:disabled):not(.disabled).active, .btn-primary:not(:disabled):not(.disabled):active, .show>.btn-primary.dropdown-toggle { + color: adjust-color($site-color, $blue: 20); + background-color: adjust-color($site-color, $blue: 10); + border-color: transparent; +} + +.btn-success { + color: #fff; + background-color: darken($site-color, 20%); + border-color: darken($site-color, 25%); +} + +.btn-success:hover { + color: #fff; + background-color: darken($site-color, 10%); + border-color: darken($site-color, 15%);; +} + +.btn-link { + font-weight: 400; + color: darken($site-color, 10%); + background-color: transparent; +} + +.btn-link:hover { + color: darken($site-color, 30%); + text-decoration: underline; + background-color: transparent; + border-color: transparent; +} + .wrapper { margin-bottom: 120px; } @@ -29,7 +72,6 @@ a:hover { #register-window { .card { - border-color: $site-color; margin-left: 25px; min-height: unset; margin-bottom: unset; @@ -55,18 +97,12 @@ a:hover { } } -.btn-success { - color: #fff; - background-color: darken($site-color, 20%); - border-color: darken($site-color, 25%); -} - .alert-warning { color: darken($site-color, 30%); background-color: lighten($site-color, 20%); border-color: lighten($site-color, 15%); a { - color: darken($site-color, 40%); + color: darken($site-color, 45%); } } @@ -94,9 +130,13 @@ a:hover { padding-bottom: 40px; } -#accordion .card { - min-height: unset; - margin-bottom: unset; +#accordion { + .card { + min-height: unset; + margin-bottom: unset; + border-radius: unset; + border: lighten($site-color, 25%); + } } #creating-account { @@ -106,12 +146,12 @@ a:hover { #nav-body { background-color: lighten($site-color, 20%)!important; a { - color: darken($site-color, 20%); + color: darken($site-color, 15%); } } .nav-pills .nav-link.active, .nav-pills .show>.nav-link { - background-color: darken($site-color, 30%); - color: #fff; + color: lighten($site-color, 5%)!important; + background-color: darken($site-color, 10%)!important; } } @@ -124,6 +164,10 @@ a:hover { margin: 30px auto 0; } +.card-header { + background-color: lighten($site-color, 20%); +} + .contact-list { font-size:2em; text-align: center; @@ -139,10 +183,6 @@ td.FAILED { color: white; } -.h1, .h2, .h3, h1, h2, h3 { -/* padding-top: 60px; */ -} - #definitions h2 { padding-top: 60px; } diff --git a/assets/img/clients/messages_logo.png b/assets/img/clients/messages_logo.png Binary files differdeleted file mode 100644 index 7005089..0000000 --- a/assets/img/clients/messages_logo.png +++ /dev/null diff --git a/assets/img/clients/psi_logo.png b/assets/img/clients/psi_logo.png Binary files differdeleted file mode 100644 index ce28218..0000000 --- a/assets/img/clients/psi_logo.png +++ /dev/null diff --git a/assets/img/clients/spark_logo.png b/assets/img/clients/spark_logo.png Binary files differdeleted file mode 100644 index a5f5e01..0000000 --- a/assets/img/clients/spark_logo.png +++ /dev/null diff --git a/assets/img/clients/xabber_logo.png b/assets/img/clients/xabber_logo.png Binary files differdeleted file mode 100644 index e61cfc4..0000000 --- a/assets/img/clients/xabber_logo.png +++ /dev/null diff --git a/assets/img/clients/yaxim_logo.png b/assets/img/clients/yaxim_logo.png Binary files differdeleted file mode 100644 index 1c3a58d..0000000 --- a/assets/img/clients/yaxim_logo.png +++ /dev/null diff --git a/creating-account.html b/creating-account.html deleted file mode 100644 index ba1e2c8..0000000 --- a/creating-account.html +++ /dev/null @@ -1,76 +0,0 @@ ---- -layout: default -title: Creating a New Account -permalink: /new-user-guide/ ---- - -<div id="creating-account" class="container"> - <div class="row justify-content"> - - <!-- Starting the Top Jubotron of the page --> - <div class="jumbotron"> - <h1 class="display-4">New User Guide</h1> - <p class="lead">This page is here to help a new user, register an account, download the needed software, and log into the server.</p> - <hr class="my-4"> - <p>It uses utility classes for typography and spacing to space content out within the larger container.</p> - <p class="lead float-xs-right"> - <a class="btn btn-primary btn-lg" href="#download" role="button">Get Started</a> - </p> - </div> - <!-- Ending the Top Jubotron of the page --> - - <!-- Starting the page index nav menu --> - <div class="col-3" style="padding-left:0;"> - <nav id="navbar-main" class="sticky-top navbar navbar-light" style="padding-top:80px;padding-left:0;margin-top:-80px;"> - <a class="navbar-brand" href="#">Index</a> - <nav id="nav-body" class="nav nav-pills flex-column bg-light"> - <a class="nav-link" href="#overview">Overview</a> - <a class="nav-link" href="#download">Download a Client</a> - <nav class="nav nav-pills flex-column"> - <a class="nav-link ml-3 my-1" href="#mobile">Mobile</a> - <a class="nav-link ml-3 my-1" href="#desktop">Desktop</a> - </nav> - <a class="nav-link" href="#register">Register an Account</a> - <a class="nav-link" href="#connect">Connect your Account</a> - <nav class="nav nav-pills flex-column"> - <a class="nav-link ml-3 my-1" href="#item-3-1">Item 3-1</a> - <a class="nav-link ml-3 my-1" href="#item-3-2">Item 3-2</a> - </nav> - </nav> - </nav> - </div> - <!-- Ending the page index nav menu --> - - <!-- Starting the content section of the page --> - <div class="col-9"> - <!-- This is the Overview Section --> - <div id="overview" class="section-headder"> - <center><h1>Overview</h1></center> - </div> - - <p>It may look like there are a bunch of steps to get all setup, but it is really pretty easy and quick to do.</p> - - <p></p> - - <!-- This is the Download a Client Section --> - <div id="download" class="section-headder"> - <center><h1>Step 1: Download a Client</h1></center> - </div> - - {% include guide-download.html %} - - <!-- This is the Register an Account Section --> - <div id="register" class="section-headder"> - <center><h1>Step 2: Choose a XMPP Server and Register an Account</h1></center> - </div> - - {% include guide-register.html %} - - <!-- This is the Connect your Client Section --> - <div id="connect" class="section-headder"> - <center><h1>Step 3: Connect your Client to you New Account</h1></center> - </div> - </div> - <!-- Ending the content section of the page --> - </div> <!-- Closing the row justify-content clases --> -</div> <!-- Closing the ID creating-account and the main container class @@ -30,6 +30,9 @@ permalink: / <a href="https://xmpp.org/extensions/xep-0375.html">XEP-0375</a>. The XEP-0375 document specifies the 2016 compliance levels for XMPP clients and servers.</p> + <p>XMPP is an open standard for communication, mainly used for instant messaging. It is a secure battle-tested + protocol developed by an independent standards organization.</p> + <p>This service requires the use of a client to connect to the server with. Please see the <a href="{{ site.url }}/help/clients/">client list</a> for a small list of available clients that may be used. My personal preferred clients are <a href="https://gajim.org/">Gajim</a> or |