Mercurial > sat_legacy_website
changeset 44:d721c8ffa22a
misc updates:
- check for different passwords in registration form
- update overview.html and features.html
- add missing pages (to be completed)
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Tue, 27 Jan 2015 18:28:06 +0100 |
| parents | c86737a3af94 |
| children | 62c23067e86e |
| files | locale/fr/LC_MESSAGES/django.po sat_website/forms.py templates/sat_website/adhesion_form.html templates/sat_website/association.html templates/sat_website/features.html templates/sat_website/links.html templates/sat_website/overview.html templates/sat_website/specifications.html |
| diffstat | 8 files changed, 282 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/locale/fr/LC_MESSAGES/django.po Tue Feb 03 15:17:07 2015 +0100 +++ b/locale/fr/LC_MESSAGES/django.po Tue Jan 27 18:28:06 2015 +0100 @@ -390,7 +390,7 @@ msgid "Follow the development, learn" msgstr "Suivre le développement, apprendre" -#: templates/sat_website/community.html:44 +#: templates/sat_website/community.html:46 #, python-format msgid "" "In the blog of the main developer you'll have recent informations/"
--- a/sat_website/forms.py Tue Feb 03 15:17:07 2015 +0100 +++ b/sat_website/forms.py Tue Jan 27 18:28:06 2015 +0100 @@ -130,6 +130,15 @@ current_section.append(field) return sections + def clean(self): + cleaned_data = super(RegistrationForm, self).clean() + email = cleaned_data.get("email") + email_confirmation = cleaned_data.get("email_confirmation") + + if email and email_confirmation and email != email_confirmation: + msg = _(u"Passwords don't match.") + self.add_error('email_confirmation', msg) + def results(self, user_readable=True): """Get the results submitted by the user as a list of couple. Keep the
--- a/templates/sat_website/adhesion_form.html Tue Feb 03 15:17:07 2015 +0100 +++ b/templates/sat_website/adhesion_form.html Tue Jan 27 18:28:06 2015 +0100 @@ -27,7 +27,7 @@ {% block headline %}{% trans "Join the association" %}{% endblock %} {% block main_container %} -<form class="form-signin" action="adhesion_form" method="post"> +<form class="form-signin" action="adhesion_form.html" method="post"> {% csrf_token %} <fieldset> <legend>{% trans "Please complete this form" %}</legend>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/sat_website/association.html Tue Jan 27 18:28:06 2015 +0100 @@ -0,0 +1,39 @@ +{% extends "sat_website/category.html" %} + +{% comment %} +SàT website: Salut à Toi's presentation website +Copyright (C) 2012 Jérôme Poisson (goffi@goffi.org) + +This file is part of SàT website. + +SàT website is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Foobar is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with Foobar. If not, see <http://www.gnu.org/licenses/>. +{% endcomment %} + +{% load i18n %} +{% load staticfiles %} + +{% block headline %}{% trans "The association" %}{% endblock %} +{% block subtext %}{% trans "subtext" %}{% endblock %} +{% block main_container %} + +<div class="row"> + <h5 class="alert alert-success"> + {% trans "Subtitle 1" %} + </h5> + <div class="info"> + <p>{% blocktrans %}dummy{% endblocktrans %}</p> + </div> +</div> + +{% endblock %}
--- a/templates/sat_website/features.html Tue Feb 03 15:17:07 2015 +0100 +++ b/templates/sat_website/features.html Tue Jan 27 18:28:06 2015 +0100 @@ -30,26 +30,10 @@ <div class="row"> <div class="col-md-2"> - <a href="frontends">{% trans "Multi-frontends" %}</a> + <strong>{% trans "Blogging" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}SàT is multi-frontends: the heart of the software is independant from its display, that means that you can have different interfaces adapted to specific usages.{% endblocktrans %} - </div> - </div> - <div class="row"> - <div class="col-md-2"> - <strong>{% trans "Microblogging" %}</strong> - </div> - <div class="col-md-7 feature"> - {% blocktrans %}Share your thought either publicly or privately (see below), thanks to the microblogging feature. With the decentralised nature of XMPP, you don't have to rely on one specific server, so you can stay master of your data, and avoir censorship.{% endblocktrans %} - </div> - </div> - <div class="row"> - <div class="col-md-2"> - <strong>{% trans "Group permissions" %}</strong> - </div> - <div class="col-md-7 feature"> - {% blocktrans %}Keep access to private data only for the people you choose. SàT uses groups to manage your permissions, and avoid your coworker to see your party pictures.{% endblocktrans %} + {% blocktrans %}Share your thought with microblogs or write longer articles with rich text blog messages. Together with a picture manager (not available yet, but you can still link external pictures), this combines many of the most popular usecases of the Internet nowaday. The big difference with other popular services is that you can easily decide who will be able to read your messages and you can keep the full control over your data. Better host it yourself, or let it done by an entity you really trust.{% endblocktrans %} </div> </div> <div class="row"> @@ -57,41 +41,25 @@ <strong>{% trans "Advanced chat and group chat" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}XMPP is one of the best (and probably the best) instant messaging protocol ever made. There are plenty of things you can do, far too much to detail everything here. In addition, you can join muli-user rooms, and discuss with tons of people.{% endblocktrans %} - </div> - </div> - <div class="row"> - <div class="col-md-2"> - <strong>{% trans "Heavy messaging" %}</strong> - </div> - <div class="col-md-7 feature"> - {% blocktrans %}With XMPP, you are not limited to chat or short messages: you have no size limit, and if you want to write essays or to highly detail your last holidays, you can. SàT also handles rich text syntaxes like XHTML and Markdown.{% endblocktrans %} + {% blocktrans %}SàT is build above several bricks that together compose one of the richest chat system ever imagined. You can talk with one person or follow a group discussion, invite people... Most of the time you will like to record your communication history, but you can also encrypt it to ensure that the one and only one person you chose will be able to read it.{% endblocktrans %} </div> </div> <div class="row"> <div class="col-md-2"> - <strong>{% trans "Gateways" %}</strong> - </div> - <div class="col-md-7 feature"> - {% blocktrans %}Communicate with other networks using different protocols. With SàT and XMPP, you'll not stay behind closed walls.{% endblocktrans %} - </div> - </div> - <div class="row"> - <div class="col-md-2"> - <strong>{% trans "File sharing" %}</strong> + <strong>{% trans "Activities" %}</strong> </div> <div class="col-md-7 feature"> - {% blocktrans %}Easily send file to your friends.{% endblocktrans %} + {% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same window with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allow you to share some music with your friends and hear it at the same time.{% endblocktrans %} </div> </div> - <div class="row"> - <div class="col-md-2"> - <strong>{% trans "Games" %}</strong> - </div> - <div class="col-md-7 feature"> - {% blocktrans %}Play with your friends or other people.{% endblocktrans %} - </div> - </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "File sharing and stream transmissions" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Easily send file to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralized file sharing system so you could create a private Bitorrent-like file sharing system within a group a friends.{% endblocktrans %} + </div> + </div> <div class="row"> <div class="col-md-2"> {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/01/18/Recevez-et-envoyez-vos-messages-XMPP/Jabber-avec-votre-lecteur-de-courriel-gr%C3%A2ce-%C3%A0-Salut-%C3%A0-Toi-%21">E-mail clients interactions</a>{% endblocktrans %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/sat_website/links.html Tue Jan 27 18:28:06 2015 +0100 @@ -0,0 +1,39 @@ +{% extends "sat_website/category.html" %} + +{% comment %} +SàT website: Salut à Toi's presentation website +Copyright (C) 2012 Jérôme Poisson (goffi@goffi.org) + +This file is part of SàT website. + +SàT website is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Foobar is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with Foobar. If not, see <http://www.gnu.org/licenses/>. +{% endcomment %} + +{% load i18n %} +{% load staticfiles %} + +{% block headline %}{% trans "Links and friendly projects" %}{% endblock %} +{% block subtext %}{% trans "subtext" %}{% endblock %} +{% block main_container %} + +<div class="row"> + <h5 class="alert alert-success"> + {% trans "Subtitle 1" %} + </h5> + <div class="info"> + <p>{% blocktrans %}dummy{% endblocktrans %}</p> + </div> +</div> + +{% endblock %}
--- a/templates/sat_website/overview.html Tue Feb 03 15:17:07 2015 +0100 +++ b/templates/sat_website/overview.html Tue Jan 27 18:28:06 2015 +0100 @@ -26,21 +26,32 @@ {% block content %} <div class="container" role="main"> - <header id="overview" class="subhead"> - <h1><img id="overview_logo" src="{% static "images/sat_logo_64.png" %}" >Salut à Toi (SàT) is currently in development.</h1> - <p class="lead">{% blocktrans %}Multi-purposes, multi-frontends, libre and decentralised communication tool.{% endblocktrans %}</p> + <h1> + <div class="row"> + <div class="col-md-1"> + <img id="overview_logo" src="{% static "images/sat_logo_64.png" %}" > + </div> + <div class="col-md-11"> + Salut à Toi (SàT) is currently under development. + <div class="lead">{% blocktrans %}Multi-purposes, multi-frontends, libre and decentralised communication tool.{% endblocktrans %}</div> + </div> + </div> + </h1> </header> - <div class="well"> - <h4>{% trans "The association" %}</h4> - <p>{% blocktrans %}Salut à Toi and Libervia are developed by a non-profit and self-managed association. We are fighting against the hold-up of the Internet by private corporations and its abusive governmental control. Do you want to help us? The adhesion is open to everybody and the amount of the cotisation is up to you, from 0 to 100€. To join for free means something to us, it's a moral support! {% endblocktrans %}</p> - {% include "sat_website/finance.html" %} - <p> - <a class="btn btn-default" href="adhesion.html" role="button">{% trans "Adhesion" %}</a> + <div class="overview_spacer"></div> + + <div> + <p class="text-center">{% trans "SàT includes several sub-projects. Libervia, a web interface to discuss and blog with the persons of your choice, is one of them:" %}</p> + <img class="thumbnail img-thumbnail" src="{% static "images/screenshots/libervia/libervia_overview.png" %}" > + <p class="text-center"> + <a class="btn btn-primary btn-lg" href="{{ libervia_demo_url }}" target="#" role="button">{% trans "Libervia demo version" %}</a> </p> </div> + <div class="overview_spacer"></div> + <div class="row"> <div class="col-md-6"> <h3>{% trans "Multi-purposes" %}</h3> @@ -82,11 +93,12 @@ <div class="overview_spacer"></div> - <div> - <p>{% trans "SàT includes several sub-projects. Libervia, a web interface to discuss and blog with the persons of your choice, is one of them:" %}</p> - <img class="thumbnail img-thumbnail" src="{% static "images/screenshots/libervia/libervia_overview.png" %}" > - <p class="text-center"> - <a class="btn btn-primary btn-lg" href="{{ libervia_demo_url }}" target="#" role="button">{% trans "Libervia demo version" %}</a> + <div class="well"> + <h4>{% trans "The association" %}</h4> + <p>{% blocktrans %}Salut à Toi and Libervia are developed by a non-profit and self-managed association. We are fighting against the hold-up of the Internet by private corporations and its abusive governmental control. Do you want to help us? The adhesion is open to everybody and the amount of the cotisation is up to you, from 0 to 100€. To join for free means something to us, it's a moral support! {% endblocktrans %}</p> + {% include "sat_website/finance.html" %} + <p> + <a class="btn btn-default" href="adhesion.html" role="button">{% trans "Adhesion" %}</a> </p> </div> @@ -94,7 +106,7 @@ <div class="well"> <h4>{% trans "Run it yourself!" %}</h4> - <p>{% trans "If you enjoyed testing our demonstration version of Libervia and if you have the technical knowledge to do it, you can download the software and run it at home. Even better, you can host a Libervia server instance with your association and help the decentralisation! Our goal is not to host every account on our server... we don't want your data!" %}</p> + <p>{% trans "If you enjoyed testing our demonstration version of Libervia and if you have the technical knowledge to do it, you can download the software and run it on your own machine. Even better, you can host a permanent Libervia server instance, at home or with via an association, and help the decentralisation! Our goal is not to host every account on our server... we don't want your data!" %}</p> <p><a class="btn btn-default" href="downloads.html" role="button">{% trans "Downloads" %}</a></p> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/sat_website/specifications.html Tue Jan 27 18:28:06 2015 +0100 @@ -0,0 +1,153 @@ +{% extends "sat_website/category.html" %} + +{% comment %} +SàT website: Salut à Toi's presentation website +Copyright (C) 2012 Jérôme Poisson (goffi@goffi.org) + +This file is part of SàT website. + +SàT website is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Foobar is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with Foobar. If not, see <http://www.gnu.org/licenses/>. +{% endcomment %} + +{% load i18n %} +{% load staticfiles %} + +{% block headline %}{% trans "Salut à Toi's features" %}{% endblock %} +{% block subtext %}{% trans "SàT is a feature rich XMPP client, here is a round up of them." %}{% endblock %} +{% block extra %}<span class="label label-success">{% trans "Click on the feature name to have a more detailed description" %}</span>{% endblock %} + +{% block main_container %} + + <div class="row"> + <div class="col-md-2"> + <a href="frontends">{% trans "Multi-frontends" %}</a> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}SàT is multi-frontends: the heart of the software is independant from its display, that means that you can have different interfaces adapted to specific usages.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Microblogging" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Share your thought either publicly or privately (see below), thanks to the microblogging feature. With the decentralised nature of XMPP, you don't have to rely on one specific server, so you can stay master of your data, and avoir censorship.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Group permissions" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Keep access to private data only for the people you choose. SàT uses groups to manage your permissions, and avoid your coworker to see your party pictures.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Advanced chat and group chat" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}XMPP is one of the best (and probably the best) instant messaging protocol ever made. There are plenty of things you can do, far too much to detail everything here. In addition, you can join muli-user rooms, and discuss with tons of people.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Heavy messaging" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}With XMPP, you are not limited to chat or short messages: you have no size limit, and if you want to write essays or to highly detail your last holidays, you can. SàT also handles rich text syntaxes like XHTML and Markdown.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Gateways" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Communicate with other networks using different protocols. With SàT and XMPP, you'll not stay behind closed walls.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "File sharing" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Easily send file to your friends.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Games" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Play with your friends or other people.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/01/18/Recevez-et-envoyez-vos-messages-XMPP/Jabber-avec-votre-lecteur-de-courriel-gr%C3%A2ce-%C3%A0-Salut-%C3%A0-Toi-%21">E-mail clients interactions</a>{% endblocktrans %} + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Thanks to it's IMAP/SMTP plugin, you can use any e-mail client to communicate through SàT. Combinate this with the gateway feature, and you can send message with it to any network (including traditional e-mail network). One of the goal of SàT is to allow easy transition to Jabber as an alternative to classical e-mail network, with a better protection against SPAM and identity spoofing.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2011/10/07/Shell%3A-pipe-you-commands-out-via-XMPP-with-S%C3%A0T">Pipe over XMPP</a>{% endblocktrans %} + </div> + <div class="col-md-7 feature"> + {% blocktrans %}This is a feature for power-user: SàT allows to send command-line tools' stdout to your contacts. This actually is as easy as knowing the name of your contact.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2013/02/22/Export-command-to-a-contact-%28with-video%29">Export Unix commands</a>{% endblocktrans %} + </div> + <div class="col-md-7 feature"> + {% blocktrans %}An other feature for power-user: you can export input/outputs of an Unix CLI command to any contact (using any XMPP client or even other protocols through gateways).{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + {% blocktrans context "Url need to point to the localised one" %}<a href="http://blog.goffi.org/post/2014/02/18/A-universal-remote-for-your-softwares">Ad-Hoc commands</a>{% endblocktrans %} + </div> + <div class="col-md-7 feature"> + {% blocktrans %}You can remotely control your XMPP entities and all the softwares that offer DBus services. {% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + {% blocktrans context "Url need to point to the localised one" %}<a href="http://www.goffi.org/post/2012/02/02/Collective-radio-%28with-video%29">Collective radio</a>{% endblocktrans %} + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Experiment music with your friends: in a multi-user room, you share a playlist; everybody can add songs to it, and everybody listens the same music at the same time. Good way to share your taste and discover new songs.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <strong>{% trans "Multi-platforms" %}</strong> + </div> + <div class="col-md-7 feature"> + {% blocktrans %}Since its begining, the SàT project was made with other platforms in mind. It's only avaible on Gnu/Linux so far (except of course Libervia, the web interface, which is available from every javascript powered browser), but other platforms are planed.{% endblocktrans %} + </div> + </div> + <div class="row"> + <div class="col-md-2"> + <a href="social_contract.html">{% trans "Social contract" %}</a> + </div> + <div class="col-md-7 feature"> + {% blocktrans with social_prefix="<a href=\"social_contract\">" social_suffix="</a>" %}Not exactly a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written as a moral engagement around the project. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %} + </div> + </div> + +{% endblock %}