Permalink
Browse files

Merge branch 'master' of github.com:xsf/xmpp.org

  • Loading branch information...
2 parents 586c6b5 + ffdbe45 commit ec4a09c364536cfefb7c9a418652e5e76d9c046e @lloydwatkin lloydwatkin committed May 18, 2016
View
@@ -1,31 +1,9 @@
language: python
cache: apt
-branches:
- only:
- - master
notifications:
email: false
-addons:
- apt:
- packages:
- - xsltproc
- - texlive-xetex
- - texlive-base
- - texlive-xetex
- - texlive-fonts-extra
- - texlive-fonts-recommended
- - texlive-latex-base
- - texlive-latex-extra
- - texlive-latex-recommended
- - tipa
-before_install:
- - sudo apt-get install tipa
- - wget http://mirror.pnl.gov/macports/distfiles/texml/texml-2.0.2.tar.gz && tar xfzv texml-2.0.2.tar.gz && cd texml-2.0.2 && sudo python setup.py install && sudo ln -s /usr/local/bin/texml /usr/bin/texml && cd ..
install:
- pip install pelican ghp-import markdown
script:
- export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/dist-packages
- - make github
-env:
- global:
- secure: cbcSKjgyE15JRufgwi+UYO7OCa70SZr9zN3tw9dzzdlCfoYpwEqV3tyQSF2voqZUL8qd0JV7EBPQa7SEpqBgvtSJUPewfm0n8yLJJ5mPDyS3UCRhLJHeVnsQtDGAuLg/Pl1skCUKZxU8CuKPXBij/zvwMEL5aS/wWI+RVrtXMGM=
+ - make html
View
@@ -30,7 +30,7 @@ Site generation
## Gentle introduction to Pelican
-Pelican's [QUICKSTART](http://docs.getpelican.com/en/latest/quickstart.html/) page is a good place to learn about the basics of Pelican (installation, project skeleton, development cycle, etc.).
+Pelican's [QUICKSTART](http://docs.getpelican.com/en/latest/quickstart.html) page is a good place to learn about the basics of Pelican (installation, project skeleton, development cycle, etc.).
### Installation instructions
```bash
@@ -2,7 +2,7 @@
Title: About XMPP
Url: about
Save_as: about/index.html
-Menu_name: About
+Menu_name: About XMPP
Top_menu_show: true
Top_menu_order: 1
Dropdown_menu_show: true
@@ -8,7 +8,7 @@ Top_Menu_order: -1
Dropdown_menu_show: false
Footer_show: false
Sidebar_menu_show: true
-Sidebar_menu_title: About the XSF
+Sidebar_menu_title: About XMPP
Sidebar_menu_size: 7
Sidebar_menu_elem_name_1: History
Sidebar_menu_elem_url_1: about/history
@@ -39,32 +39,32 @@
<meta name="footer_show" content="left"/>
<meta name="footer_order" content="1"/>
<meta name="content_layout" content="wide"/>
+ <meta name="template" content="extensions"/>
</head>
<body>
<script src='/scripts/sorttable.js' type='text/javascript'></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript" ></script>
<div id="content">
- <p style="margin: 0 80px 20px 80px">
+ <p>
The core specifications for XMPP are developed at the Internet Engineering Task Force (IETF) - see
<a href='https://datatracker.ietf.org/doc/rfc6120/'>RFC 6120</a>,
<a href='https://datatracker.ietf.org/doc/rfc6121/'>RFC 6121</a>, and
<a href='https://datatracker.ietf.org/doc/rfc7622/'>RFC 7622</a>
(along with the WebSocket binding defined in
<a href='https://datatracker.ietf.org/doc/rfc7395/'>RFC 7395</a>).
</p>
- <p style="margin: 0 80px 20px 80px">
+ <p>
The XMPP Standards Foundation develops extensions to XMPP in its XEP series. This page lists Draft and Final XEPs as well as experimental proposals that are currently under consideration. A
<a href="http://xmpp.org/extensions/all.shtml">list of all XEPs</a>
(including retracted, rejected, deprecated, and obsolete XEPs) is also available. Good places for developers to start are the
<a href="http://xmpp.org/extensions/xep-0242.html">client compliance</a> and
<a href="http://xmpp.org/extensions/xep-0243.html">server compliance</a> definitions, as well as the
<a href="http://xmpp.org/about-xmpp/technology-overview/">technology overview pages</a>.
</p>
- </div>
-<p class="jsSupport" style="margin: 0 80px 20px 80px">
+<p class="jsSupport">
<em>Note: The following table is sortable, just click on the headers (click twice to reverse the sort order).</em>
</p>
-<p class="jsSupport" style="margin: 0 80px 20px 80px">
+<p class="jsSupport">
<em>Note: You can change show/hide the various types of XEPs by checking/unchecking the checkboxes below.</em>
</p>
<form action="#">
@@ -89,7 +89,7 @@
$(".jsSupport").fadeIn("normal");
});
</script>
-<p id="status-selector" class="jsSupport" style="margin: 0 80px 20px 80px">
+<p id="status-selector" class="jsSupport">
<input type="checkbox" id="Active" name="Active" checked="checked" /><label for="Active">Active</label>
<input type="checkbox" id="Deferred" name="Deferred" /><label for="Deferred">Deferred</label>
<input type="checkbox" id="Deprecated" name="Deprecated" /><label for="Deprecated">Deprecated</label>
@@ -6,28 +6,24 @@ Menu_name: Software
Top_menu_show: true
Top_menu_order: 3
Dropdown_menu_show: true
-Dropdown_menu_size: 4
+Dropdown_menu_size: 3
Dropdown_menu_elem_name_1: Clients
Dropdown_menu_elem_url_1: clients
Dropdown_menu_elem_name_2: Servers
Dropdown_menu_elem_url_2: servers
Dropdown_menu_elem_name_3: Libraries
Dropdown_menu_elem_url_3: libraries
-Dropdown_menu_elem_name_4: Projects
-Dropdown_menu_elem_url_4: projects
Footer_show: left
Footer_order: 3
Sidebar_menu_show: true
-Sidebar_menu_size: 4
+Sidebar_menu_size: 3
Sidebar_menu_title: XMPP Software
Sidebar_menu_elem_name_1: Clients
Sidebar_menu_elem_url_1: software/clients
Sidebar_menu_elem_name_2: Servers
Sidebar_menu_elem_url_2: software/servers
Sidebar_menu_elem_name_3: Libraries
Sidebar_menu_elem_url_3: software/libraries
-Sidebar_menu_elem_name_4: Projects
-Sidebar_menu_elem_url_4: software/projects
Content_layout: multiple-columns
---
@@ -38,6 +34,5 @@ Please note that the software we list on these pages was not developed by the XM
- [XMPP Servers](/software/servers)
- [XMPP Clients](/software/clients)
- [XMPP Libraries](/software/libraries)
-- [XMPP Projects](/software/projects)
We are keen to keep these pages up to date so, if you know of something we’ve missed, then please [submit a pull request](https://github.com/xsf/xmpp.org).
@@ -8,16 +8,14 @@ Top_Menu_order: -1
Dropdown_menu_show: false
Footer_show: false
Sidebar_menu_show: true
-Sidebar_menu_size: 4
+Sidebar_menu_size: 3
Sidebar_menu_title: XMPP Software
Sidebar_menu_elem_name_1: Clients
Sidebar_menu_elem_url_1: software/clients
Sidebar_menu_elem_name_2: Servers
Sidebar_menu_elem_url_2: software/servers
Sidebar_menu_elem_name_3: Libraries
Sidebar_menu_elem_url_3: software/libraries
-Sidebar_menu_elem_name_4: Projects
-Sidebar_menu_elem_url_4: software/projects
Content_layout: multiple-columns
---
@@ -8,16 +8,14 @@ Top_Menu_order: -1
Dropdown_menu_show: false
Footer_show: false
Sidebar_menu_show: true
-Sidebar_menu_size: 4
+Sidebar_menu_size: 3
Sidebar_menu_title: XMPP Software
Sidebar_menu_elem_name_1: Clients
Sidebar_menu_elem_url_1: software/clients
Sidebar_menu_elem_name_2: Servers
Sidebar_menu_elem_url_2: software/servers
Sidebar_menu_elem_name_3: Libraries
Sidebar_menu_elem_url_3: software/libraries
-Sidebar_menu_elem_name_4: Projects
-Sidebar_menu_elem_url_4: software/projects
Content_layout: multiple-columns
---
@@ -1,34 +0,0 @@
----
-Title: XMPP Projects
-Url: software/projects
-Save_as: software/projects.html
-Parent_id: software
-Top_menu_show: false
-Top_Menu_order: -1
-Dropdown_menu_show: false
-Footer_show: false
-Sidebar_menu_show: true
-Sidebar_menu_size: 4
-Sidebar_menu_title: XMPP Software
-Sidebar_menu_elem_name_1: Clients
-Sidebar_menu_elem_url_1: software/clients
-Sidebar_menu_elem_name_2: Servers
-Sidebar_menu_elem_url_2: software/servers
-Sidebar_menu_elem_name_3: Libraries
-Sidebar_menu_elem_url_3: software/libraries
-Sidebar_menu_elem_name_4: Projects
-Sidebar_menu_elem_url_4: software/projects
-Content_layout: multiple-columns
----
-
-Does your project use XMPP? Please [submit a pull request](https://github.com/xsf/xmpp.org) and add your project's info to this page.
-
-And don't forget to also submit a pull request to add your organization as an [XMPP user](/about/who-uses-xmpp).
-
-| Users | Company | Use | Description |
-|--------------|-----------------|---------------|----------------------------------------|
-| ~1.5 billion | [Google](https://google.com) | Push Notifications | Google provides an [XMPP Interface](https://developers.google.com/cloud-messaging/server) to their push notification service. It's also been rumoured that push notifications are delivered to the device via a propriatary binary XMPP protocol. |
-| ~800 million | [WhatsApp](http://whatsapp.com) | Chat | WhatApp uses a [variation of XMPP](https://github.com/WHAnonymous/Chat-API/wiki/FunXMPP-Protocol) for its popular chat service |
-| ~500 million | [Apple](http://apple.com) | Push Notifications | Apple uses [XMPP to deliver push notifications](https://www.quora.com/What-technology-does-the-iOS-Apple-Push-Notification-Service-APNS-use-to-maintain-a-persistent-connection-with-each-device-to-receive-such-fast-push-notifications) to client devices.
-| ~200 million | [Nimbuzz](http://nimbuzz.com) | Instant Messaging | Nimbuzz is an XMPP-based instant messaging community.
-| N/A | [Catapush](http://catapush.com) | Push Notifications | Reliable and traceable Push Notification service on dedicated XMPP channel for Android/iOS/Windows.
@@ -8,16 +8,14 @@ Top_Menu_order: -1
Dropdown_menu_show: false
Footer_show: false
Sidebar_menu_show: true
-Sidebar_menu_size: 4
+Sidebar_menu_size: 3
Sidebar_menu_title: XMPP Software
Sidebar_menu_elem_name_1: Clients
Sidebar_menu_elem_url_1: software/clients
Sidebar_menu_elem_name_2: Servers
Sidebar_menu_elem_url_2: software/servers
Sidebar_menu_elem_name_3: Libraries
Sidebar_menu_elem_url_3: software/libraries
-Sidebar_menu_elem_name_4: Projects
-Sidebar_menu_elem_url_4: software/projects
Content_layout: multiple-columns
---
@@ -27,3 +27,11 @@ All of the existing XMPP servers, clients, and programming libraries support the
Because user expectations for messaging apps continue to change over time, the XMPP community always works to define and implement XMPP extensions for new features. Whereas five or ten years ago such features included [chat state notifications](/extensions/xep-0085.html) and [HTML messages](/extensions/xep-0071.html), now they include things like [push notifications](/extensions/xep-0357.html), [message archives](/extensions/xep-0313.html), and [improved multi-device support](/extensions/xep-0280.html).
+## Projects using XMPP-based Instant Messaging
+
+There are many projects that have created an XMPP-based Instant Messaging network.
+
+| Users | Company | Description |
+|--------------|---------------------------------|----------------------------------------|
+| ~800 million | [WhatsApp](http://whatsapp.com) | WhatApp uses a [variation of XMPP](https://github.com/WHAnonymous/Chat-API/wiki/FunXMPP-Protocol) for its popular chat service |
+| ~200 million | [Nimbuzz](http://nimbuzz.com) | Nimbuzz is an XMPP-based instant messaging community. |
@@ -35,12 +35,14 @@ Finally XMPP's publish-subscribe constructs make a great foundation for building
## Projects using XMPP Social
-There are many people pairing WebRTC with XMPP.
-
-The [Buddycloud Core](http://buddycloud.com/core) messaging stack is a set of social services that include help developers build a complete social application and includes user-onboarding, content recommendation and media sharing features.
-
-[Jappix](https://jappix.org) a Javascript XMPP client with social features.
-
-[Movim](https://movim.eu/) is a PHP based distributed social networking platform.
-
-[Salut à Toi](http://salut-a-toi.org) a Python based multi-frontends XMPP client featuring (micro)blogging, file sharing, games, etc. [Libervia](https://libervia.org) is its web frontend.
+All of these projects make use of XMPP to enhance their social networking functionality.
+
+| Users | Company | Use | Description |
+|--------------|----------------------------------------------|--------------------|----------------------------------------|
+| ~1.5 billion | [Google](https://google.com) | Push Notifications | Google provides an [XMPP Interface](https://developers.google.com/cloud-messaging/server) to their push notification service. It's also been rumoured that push notifications are delivered to the device via a propriatary binary XMPP protocol. |
+| ~500 million | [Apple](http://apple.com) | Push Notifications | Apple uses [XMPP to deliver push notifications](https://www.quora.com/What-technology-does-the-iOS-Apple-Push-Notification-Service-APNS-use-to-maintain-a-persistent-connection-with-each-device-to-receive-such-fast-push-notifications) to client devices. |
+| | [Catapush](http://catapush.com) | Push Notifications | Reliable and traceable Push Notification service on dedicated XMPP channel for Android/iOS/Windows. |
+| | [Buddycloud Core](http://buddycloud.com/core)| | The [Buddycloud Core](http://buddycloud.com/core) messaging stack is a set of social services that include help developers build a complete social application and includes user-onboarding, content recommendation and media sharing features. |
+| | [Jappix](https://jappix.org) | | [Jappix](https://jappix.org) a Javascript XMPP client with social features. |
+| | [Movim](https://movim.eu/) | | [Movim](https://movim.eu/) is a PHP based distributed social networking platform. |
+| | [Salut à Toi](http://salut-a-toi.org) | | [Salut à Toi](http://salut-a-toi.org) a Python based multi-frontends XMPP client featuring (micro)blogging, file sharing, games, etc. [Libervia](https://libervia.org) is its web frontend. |
@@ -7,7 +7,6 @@
<link rel="shortcut icon" href="{{ SITE_URL }}/theme/images/xmpp-logo.png" />
<link rel="stylesheet" href="{{ SITE_URL }}/theme/css/app.css" type="text/css" />
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Exo+2:700,400|Merriweather:300italic,300,700" type="text/css" />
- {% if active_page_is_blog|default("false") == "true" %}<link rel="alternate" href="/feeds/all.atom.xml" type="application/atom+xml" name="Blog feed" />{% endif %}
<link href="/favicon.ico" rel="icon" />
<link rel="apple-touch-icon" sizes="57x57" href="/icons/apple-icon-57x57.png" />
@@ -27,6 +26,9 @@
<meta name="msapplication-TileColor" content="#ffffff" />
<meta name="msapplication-TileImage" content="/icons/ms-icon-144x144.png" />
<meta name="theme-color" content="#ffffff" />
+ {% if active_page_is_blog|default("false") == "true" %}<link rel="alternate" href="/feeds/all.atom.xml" type="application/atom+xml" name="Blog feed" />{% endif %}
+ {% block head %}
+ {% endblock %}
</head>
<body class="{{ active_page }}" style="overflow-y: scroll;">
{% include 'top_menu.html' %}
@@ -0,0 +1,55 @@
+{% extends "base.html" %}
+{% block head %}
+<style type="text/css">
+ div#content {
+ margin-top: 4%;
+ margin-left: 5%;
+ margin-right: 5%;
+ }
+</style>
+{% endblock %}
+
+{% set active_page_url = page.url|replace(" ", "") %}
+{% set active_page = page.parent_id|default(active_page_url) %}
+{% set active_page_title = page.title %}
+{% set active_page_is_blog = page.is_blog %}
+{% set content_layout = page.content_layout|default("single-column") %}
+
+{% block content %}
+ {{ page.content }}
+{% endblock %}
+
+{% block related_content %}
+ {% if page.sidebar_menu_show|default(boolean=True) %}
+ {% set links = [] %}
+ {% set menu_title = [] %}
+ {% if page.sidebar_menu_title and menu_title.append(page.sidebar_menu_title) %}{% endif %}
+ {% set parts = page.url.split("/") %}
+ {% set depth = parts|length if page.inherit_sidebar|default(boolean=True) else 1 %}
+ {% for i in range(0, depth) %}
+ {% set P_URL = parts|join("/") %}
+ {% for parent in PAGES|selectattr("url", "equalto", P_URL) %}
+ {% if parent.sidebar_menu_size|default(false) %}
+ {% if menu_title.append(parent.sidebar_menu_title) %}{% endif %}
+ {% set size = parent.sidebar_menu_size|int %}
+ {% for i in range(1, size + 1) %}
+ {% set E_URL = parent|attr('sidebar_menu_elem_url_'~(i|string)) %}
+ {% set E_NAME = parent|attr('sidebar_menu_elem_name_'~(i|string)) %}
+ {% if E_URL[-1] != '/' %}
+ {% set E_URL = E_URL + ".html" %}
+ {% endif %}
+ {% if links.append(( SITE_URL + "/" + E_URL, E_NAME )) %}{% endif %}
+ {% endfor %}
+ {% endif %}
+ {% endfor %}
+ {% set parts = parts[:-1] %}
+ {% endfor %}
+ {% set menu_title = menu_title[0] %}
+ <h4>{{ menu_title }}</h4>
+ <ul>
+ {% for item in links %}
+ <li><a href="{{ item[0] }}">{{ item[1] }}</a></li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endblock %}
@@ -1,5 +1,5 @@
<div class="footer-sponsors">
- <h4>The XSF is generously sponsored by:</h4>
+ <h4>The <a href="/about/xmpp-standards-foundation.html">XSF</a> is generously sponsored by:</h4>
<ul>
<li><a href="/sponsors/coversant"><img src="/images/logos/coversant.png" alt="Coversant"></a></li>
<li><a href="/sponsors/erlang-solutions"><img src="/images/logos/erlang-solutions.png" alt="Erlang Solutions"></a></li>

0 comments on commit ec4a09c

Please sign in to comment.