Mercurial > sat_legacy_website

changeset 33:73c6333fd124

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change overview.html, move the previous content to principles.html
author souliane <souliane@mailoo.org>
date Tue, 27 Jan 2015 08:07:15 +0100
parents 876ae5e23690
children 9d553570cc61
files sat_website/views.py static/css/sat_website.css static/images/screenshots/libervia/libervia_overview.png templates/sat_website/base.html templates/sat_website/finance.html templates/sat_website/overview.html templates/sat_website/principles.html
diffstat 7 files changed, 201 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/sat_website/views.py	Tue Jan 27 07:54:43 2015 +0100
+++ b/sat_website/views.py	Tue Jan 27 08:07:15 2015 +0100
@@ -55,19 +55,19 @@
     return render_to_response('sat_website/overview.html')
 
 def generic_cat(request, category):
-    latest_dl_path, latest_version = utils.get_latest_sat()
     context = {
                "available_languages": ['fr', 'en'],
                "categories": CATEGORIES,
                "categories_right": CATEGORIES_RIGHT,
                "category": category,
-               "latest_dl_path": latest_dl_path,
-               "latest_version": latest_version,
               }
+               "libervia_demo_url": utils.get_libervia_demo_url(),
+               "subscription_amounts": utils.get_asso_subscr_amounts(),
 
     context.update(csrf(request))
 
     if not category or category == "overview":
+        context.update(utils.get_asso_finance_status())
         return render_to_response('sat_website/overview.html', context)
     elif category == "screenshots":
         context["screenshots"] = screenshots.screenshots
@@ -75,6 +75,10 @@
         context["screenshots"] = screenshots.screenshots_tech
     elif category == "social_contract":
         context["SOCIAL_CONTRACT"] = social_contract.get_social_contract()
+    elif category == "downloads":
+        latest_dl_path, latest_version = utils.get_latest_sat()
+        context["latest_dl_path"] = latest_dl_path
+        context["latest_version"] = latest_version
 
     def all_keys(cats):
         subcats = [value[1].keys() for value in cats.values() if isinstance(value, tuple)]
--- a/static/css/sat_website.css	Tue Jan 27 07:54:43 2015 +0100
+++ b/static/css/sat_website.css	Tue Jan 27 08:07:15 2015 +0100
@@ -21,7 +21,8 @@
 
 
 body {
-    padding-top: 60px;
+  padding-top: 70px;
+  padding-bottom: 30px;
 }
 
 header {
@@ -88,13 +89,12 @@
 
 #sat_logo {
     float: left;
-    margin-right: 5px;
-    margin-top: 5px;
+    padding: 5px;
 }
 
 #overview_logo {
 	vertical-align: middle;
-	margin-top: -25px;
+	margin-top: -20px;
 	margin-right: 15px;
 }
 
@@ -165,3 +165,12 @@
     padding-top: 12px;
     padding-bottom: 12px;
 }
+
+.overview_spacer {
+    height: 30px;
+}
+
+.progress-bar-left {
+    background-color: lightgray;
+    color: gray;
+}
Binary file static/images/screenshots/libervia/libervia_overview.png has changed
--- a/templates/sat_website/base.html	Tue Jan 27 07:54:43 2015 +0100
+++ b/templates/sat_website/base.html	Tue Jan 27 08:07:15 2015 +0100
@@ -29,11 +29,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="{% static "bootstrap/css/bootstrap.min.css" %}">
+    <link rel="stylesheet" href="{% static "bootstrap/css/bootstrap-theme.min.css" %}">
     <link rel="stylesheet" href="{% static "css/sat_website.css" %}">
     <link rel="icon" type="image/png" href="{% static "images/sat_logo_32.png" %}">
     <title>{% block title %}{% trans "Salut à Toi: the multi-frontends, multi-purposes communication tool" %}{% endblock %}</title>
 </head>
-<body>
+<body role="document">
     <nav class="navbar navbar-inverse navbar-fixed-top">
         <div class="container">
             <div class="navbar-header" id="navbar-header">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/sat_website/finance.html	Tue Jan 27 08:07:15 2015 +0100
@@ -0,0 +1,26 @@
+{% 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 %}
+
+<div class="progress">
+    <div class="progress-bar progress-bar-success progress-bar-striped" style="width: {{ asso_members_perc }}%">{% blocktrans with members_actual=asso_members_actual %}{{members_actual}} members{% endblocktrans %}</div>
+    <div class="progress-bar progress-bar-left progress-bar-striped active" style="width: {{ asso_members_perc_left }}%">{% blocktrans with members_left=asso_members_left %}{{members_left}} left{% endblocktrans %}</div>
+</div>
--- a/templates/sat_website/overview.html	Tue Jan 27 07:54:43 2015 +0100
+++ b/templates/sat_website/overview.html	Tue Jan 27 08:07:15 2015 +0100
@@ -23,57 +23,80 @@
 {% load i18n %}
 {% load staticfiles %}
 
-    {% block content %}
-	<div class="container">
-		<div class="jumbotron">
-				<h1><img id="overview_logo" src="{% static "images/sat_logo_128.png" %}" >Salut à Toi</h1>
-				<h3>{% blocktrans %}The multi-frontends multi-purposes communication tool{% endblocktrans %}</h3>
-				<p>{% blocktrans %}Libre, Decentralised, Standard and Federated{% endblocktrans %}</p>
-		</div>
-		<div class="row">
-			<div class="col-md-6">
-				<h2>{% trans "Multi-frontends" %}</h2>
-				{% blocktrans with frontends_prefix="<a href=\"frontends.html\">" frontends_suffix="</a>"%}SàT can be used with {{ frontends_prefix }}different interfaces{{ frontends_suffix }}, the heart of the software is independent. That means that you can use SàT:{% endblocktrans %}
-				<ul>
-					<li>{% blocktrans %}with a browser though the <strong>web</strong> interface{% endblocktrans %}</li>
-					<li>{% blocktrans %}on your <strong>desktop</strong>, with the power of a native, integrated application{% endblocktrans %}</li>
-					<li>{% blocktrans %}inside a <strong>console</strong> user interface{% endblocktrans %}</li>
-					<li>{% blocktrans %}through a <strong>command line</strong>{% endblocktrans %}</li> 
-					<li>{% blocktrans %}other frontends are planed (e.g.: small screens), and it's always possible to adapt one to fit your needs{% endblocktrans %}</li>
-				</ul>
-			</div>
-			<div class="col-md-6">
-				<h2>{% trans "Multi-purposes" %}</h2>
-				{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" features_prefix="<a href=\"features.html\">" features_suffix="</a>" %} Based on the powerful  {{ xmpp }} standard, SàT can do instant messaging of course, but also many other things (and still counting). Here are some of the {{ features_prefix }}features{{ features_suffix }}:{% endblocktrans %}
-				<ul>
-					<li>{% blocktrans %}Microblogging: share your thoughts instantaneously{% endblocktrans %}</li>
-					<li>{% blocktrans %}Group permissions: share what you want with only the people you want{% endblocktrans %}</li>
-					<li>{% blocktrans %}File Sharing{% endblocktrans %}</li>
-					<li>{% blocktrans %}Games{% endblocktrans %}</li>
-					<li>{% blocktrans %}Interaction with other networks: talk to your friends on IRC, StatusNet, other XMPP networks, or potentially any network{% endblocktrans %}</li>
-					<li>{% blocktrans with mua="<abbr title=\"Mail User Agent\">MUA</abbr>" %}Email client access: connect directly with any email client ({{ mua }}) like KMail or Thunderbird, and send message on any supported network{% endblocktrans %}</li>
-					<li>{% blocktrans %}and many, many other features (it's extensible!){% endblocktrans %}</li>
-				</ul>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-md-3">
-				<h2>{% trans "Libre" %}</h2>
-				{% blocktrans %}Salut à Toi is Libre (free as in freedom), that means that it follows the free software philosophy, not only because it's the best way to develop a software, but also for the share and freedom spirit.{% endblocktrans %}<br>
-				{% blocktrans %}In addition, Salut à Toi follows a <strong>social contract</strong>: a moral engagment with the user.{% endblocktrans %} 
-			</div>
-			<div class="col-md-3">
-				<h2>{% trans "Decentralised" %}</h2>
-				{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}By being based on {{ xmpp }}, SàT is naturally decentralised. That means that there is not one big server somewhere where all the data are stored. That's the only good way to fight against censorship, and to keep control of your data (you don't want to have your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?).{% endblocktrans %}
-			</div>
-			<div class="col-md-3">
-				<h2>{% trans "Standard" %}</h2>
-				{% blocktrans with xsf="<abbr title=\"XMPP Standards Foundation\">XSF</abbr>" xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}Using a standard protocol is a key point: it's robust, widely used and tested, well documented. Every change is discussed publicly, there are debates on the best way to do things, and the {{ xsf }} is the guarantor of the evolution and stability of the protocol. That means that SàT can communicate easily with other {{xmpp}} projects: the way it "talks" to others is fully documented.{% endblocktrans %}
-			</div>
-			<div class="col-md3">
-   				<h2>{% trans "Federated" %}</h2>
-				{% blocktrans %}Federation means that SàT is open to the world: it can communicate on the global Jabber network. You can of course make your own private network if you wants, but with SàT you have the ability to send messages to somebody on an other server, using a different client. That's at the opposite of some proprietary and commercial networks which tend to lock their users up. Open your borders!{% endblocktrans %} 
-			</div>
-		</div>
-	</div>
+{% 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>
+        </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>
+            </p>
+        </div>
+
+        <div class="row">
+            <div class="col-md-6">
+                <h3>{% trans "Multi-purposes" %}</h3>
+                SàT covers a large spectrum of the Internet usages:
+                <ul>
+                    <li>{%blocktrans %}<strong>chat</strong> with one or many contacts, in public or private rooms{% endblocktrans %}</li>
+                    <li>{% blocktrans %}organize <strong>contact groups</strong> and restrict your messages visibility{% endblocktrans %}</li>
+                    <li>{% blocktrans %}end-to-end <strong>encryption</strong> makes your communications really private{% endblocktrans %}</li>
+                    <li>{% blocktrans %}<strong>blogging</strong> system to share instant thoughs or write longer articles{% endblocktrans %}</li>
+                    <li>{% blocktrans %}file sharing, games, interaction with other networks and much more{% endblocktrans %}</li>
+                </ul>
+                <p><a class="btn btn-default" href="features.html" role="button">{% trans "Features" %}</a></p>
+            </div>
+            <div class="col-md-6">
+                <h3>{% trans "Multi-frontends" %}</h3>
+                {% blocktrans %}SàT can be used with different interfaces, each of them being a sub-project, but the heart of the software stays the same. You can use SàT:{% endblocktrans %}
+                <ul>
+                    <li>{% blocktrans %}with a browser through the <strong>web</strong> interface Libervia{% endblocktrans %}</li>
+                    <li>{% blocktrans %}inside a <strong>console</strong> user interface{% endblocktrans %}</li>
+                    <li>{% blocktrans %}through a <strong>command line</strong>{% endblocktrans %}</li> 
+                    <li>{% blocktrans %}other frontends are planed (telephones, desktop){% endblocktrans %}</li>
+                </ul>
+                <p><a class="btn btn-default" href="frontends.html" role="button">{% trans "Frontends" %}</a></p>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-6">
+                <h3>{% trans "Libre" %}</h3>
+                <p>{% blocktrans %}SàT is not only open source, it's Libre and follows the free software philosophy (free as in freedom). Not only because it's the best way to develop a software, but also for the sharing and freedom spirit. In addition, SàT follows a social contract: a moral engagment with the user.{% endblocktrans %}</p>
+                <p><a class="btn btn-default" href="social_contract.html" role="button">{% trans "Social contract" %}</a></p>
+            </div>
+            <div class="col-md-6">
+                <h3>{% trans "Decentralised" %}</h3>
+                <p>{% blocktrans %}SàT is fully decentralised. There is no big server where all the data are stored. That's the only way to fight against censorship, to hinder governmental surveillance and to keep control of your data - you don't want your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?{% endblocktrans %}</p>
+                <p><a class="btn btn-default" href="principles.html" role="button">{% trans "Principles" %}</a></p>
+            </div>
+        </div>
+
+        <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>
+            </p>
+        </div>
+        
+        <div class="overview_spacer"></div>
+
+        <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><a class="btn btn-default" href="downloads.html" role="button">{% trans "Downloads" %}</a></p>
+         </div>
+    </div>
+
 {% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/sat_website/principles.html	Tue Jan 27 08:07:15 2015 +0100
@@ -0,0 +1,77 @@
+{% 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 %}
+
+{% block headline %}{% trans "Principles" %}{% endblock %}
+{% block subtext %}{% trans "Some technical words to explain the project" %}{% endblock %}
+{% block main_container %}
+
+	<div class="row">
+		<div class="col-md-6">
+			<h2>{% trans "Multi-purposes" %}</h2>
+			{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" features_prefix="<a href=\"features.html\">" features_suffix="</a>" %} Based on the powerful  {{ xmpp }} standard, SàT can do instant messaging of course, but also many other things (and still counting). Here are some of the {{ features_prefix }}features{{ features_suffix }}:{% endblocktrans %}
+			<ul>
+				<li>{% blocktrans %}Microblogging: share your thoughts instantaneously{% endblocktrans %}</li>
+				<li>{% blocktrans %}Group permissions: share what you want with only the people you want{% endblocktrans %}</li>
+				<li>{% blocktrans %}File Sharing{% endblocktrans %}</li>
+				<li>{% blocktrans %}Games{% endblocktrans %}</li>
+				<li>{% blocktrans %}Interaction with other networks: talk to your friends on IRC, StatusNet, other XMPP networks, or potentially any network{% endblocktrans %}</li>
+				<li>{% blocktrans with mua="<abbr title=\"Mail User Agent\">MUA</abbr>" %}Email client access: connect directly with any email client ({{ mua }}) like KMail or Thunderbird, and send message on any supported network{% endblocktrans %}</li>
+				<li>{% blocktrans %}and many, many other features (it's extensible!){% endblocktrans %}</li>
+			</ul>
+            <p><a class="btn btn-default" href="features.html" role="button">{% trans "Tell me more" %}</a></p>
+		</div>
+        <div class="col-md-6">
+            <h2>{% trans "Multi-frontends" %}</h2>
+            {% blocktrans with frontends_prefix="<a href=\"frontends.html\">" frontends_suffix="</a>"%}SàT can be used with {{ frontends_prefix }}different interfaces{{ frontends_suffix }}, the heart of the software is independent. That means that you can use SàT:{% endblocktrans %}
+            <ul>
+                <li>{% blocktrans %}with a browser though the <strong>web</strong> interface{% endblocktrans %}</li>
+                <li>{% blocktrans %}on your <strong>desktop</strong>, with the power of a native, integrated application{% endblocktrans %}</li>
+                <li>{% blocktrans %}inside a <strong>console</strong> user interface{% endblocktrans %}</li>
+                <li>{% blocktrans %}through a <strong>command line</strong>{% endblocktrans %}</li> 
+                <li>{% blocktrans %}other frontends are planed (e.g.: small screens), and it's always possible to adapt one to fit your needs{% endblocktrans %}</li>
+            </ul>
+            <p><a class="btn btn-default" href="frontends.html" role="button">{% trans "Tell me more" %}</a></p>
+        </div>
+	</div>
+	<div class="row">
+		<div class="col-md-3">
+			<h3>{% trans "Libre" %}</h3>
+			{% blocktrans %}Salut à Toi is Libre (free as in freedom), that means that it follows the free software philosophy, not only because it's the best way to develop a software, but also for the share and freedom spirit.{% endblocktrans %}<br>
+			{% blocktrans %}In addition, Salut à Toi follows a <strong>social contract</strong>: a moral engagment with the user.{% endblocktrans %} 
+		</div>
+		<div class="col-md-3">
+			<h3>{% trans "Decentralised" %}</h3>
+			{% blocktrans with xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}By being based on {{ xmpp }}, SàT is naturally decentralised. That means that there is not one big server somewhere where all the data are stored. That's the only good way to fight against censorship, and to keep control of your data (you don't want to have your private pictures or intimate messages to be in the hands of an untrusted commercial company, do you?).{% endblocktrans %}
+		</div>
+		<div class="col-md-3">
+			<h3>{% trans "Standard" %}</h3>
+			{% blocktrans with xsf="<abbr title=\"XMPP Standards Foundation\">XSF</abbr>" xmpp="<abbr title=\"eXtensible Messaging and Presence Protocol\">XMPP</abbr>" %}Using a standard protocol is a key point: it's robust, widely used and tested, well documented. Every change is discussed publicly, there are debates on the best way to do things, and the {{ xsf }} is the guarantor of the evolution and stability of the protocol. That means that SàT can communicate easily with other {{xmpp}} projects: the way it "talks" to others is fully documented.{% endblocktrans %}
+		</div>
+		<div class="col-md3">
+   				<h3>{% trans "Federated" %}</h3>
+			{% blocktrans %}Federation means that SàT is open to the world: it can communicate on the global Jabber network. You can of course make your own private network if you wants, but with SàT you have the ability to send messages to somebody on an other server, using a different client. That's at the opposite of some proprietary and commercial networks which tend to lock their users up. Open your borders!{% endblocktrans %} 
+		</div>
+	</div>
+
+{% endblock %}