Mercurial > sat_legacy_website

changeset 48:3b4ba14d1e26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update features.html + other small changes
author souliane <souliane@mailoo.org>
date Sun, 03 May 2015 22:39:02 +0200
parents 3e460ca969d2
children 6cf0808b8275
files static/css/sat_website.css templates/sat_website/community.html templates/sat_website/developers.html templates/sat_website/downloads.html templates/sat_website/features.html templates/sat_website/frontends.html templates/sat_website/overview.html
diffstat 7 files changed, 94 insertions(+), 78 deletions(-) [+]
line wrap: on
line diff
--- a/static/css/sat_website.css	Sun May 03 22:36:27 2015 +0200
+++ b/static/css/sat_website.css	Sun May 03 22:39:02 2015 +0200
@@ -126,7 +126,7 @@
 }
 
 .info {
-	margin: 10px 5px 60px 5px;
+	margin: 10px 5px 30px 5px;
 }
 
 .feature {
--- a/templates/sat_website/community.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/community.html	Sun May 03 22:39:02 2015 +0200
@@ -29,10 +29,10 @@
 
 <div class="row">
     <h5 class="alert alert-success">
-    {% trans "Join us on Jabber :)" %}
+    {% trans "Enter the chat room" %}
     </h5>
     <div class="info">
-        <p>{% blocktrans with sat_muc="<a href=\"xmpp:sat@chat.jabberfr.org?join\">sat@chat.jabberfr.org</a>" %}Salut à Toi's MUC room is <strong>*the*</strong> place to discuss about the project: {{ sat_muc }}{% endblocktrans %}</p>
+        <p>{% blocktrans with sat_muc="<a href=\"xmpp:sat@chat.jabberfr.org?join\">sat@chat.jabberfr.org</a>" %}Salut à Toi's multi-user chat room is <strong>*the*</strong> place to discuss about the project: {{ sat_muc }}{% endblocktrans %}</p>
     </div>
 </div>
 
--- a/templates/sat_website/developers.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/developers.html	Sun May 03 22:39:02 2015 +0200
@@ -24,7 +24,7 @@
 {% load staticfiles %}
 
 {% block headline %}{% trans "Salut à Toi: contributing" %}{% endblock %}
-{% block subtext %}{% trans "Here are some informations on how to develop the Salut à Toi project" %}{% endblock %}
+{% block subtext %}{% trans "Some information for people willing to help the development" %}{% endblock %}
 {% block main_container %}
 
 <div class="row">
--- a/templates/sat_website/downloads.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/downloads.html	Sun May 03 22:39:02 2015 +0200
@@ -63,8 +63,10 @@
     <div class="info">
         <p>{% trans "To ease the procedure, you can also install the last SàT packages from PyPI, the Python Package Index." %}</p>
         <p><a class="btn btn-default" target="#" href="https://pypi.python.org/pypi/sat" role="button">{% trans "Visit PyPI" %}</a></p>
-        <p>{% trans "Thanks to the maintainers of SàT packages, you might even find some really easy to install packages in your distribution repositories!" %}</p>
+        <p>{% trans "Thanks to the maintainers of SàT packages, you might even find some really-easy-to-install packages in your distribution repositories!" %}</p>
         <p><a class="btn btn-default" target="#" href="https://packages.debian.org/source/sid/salutatoi" role="button">{% trans "Packages in Debian sid" %}</a></p>
+        <p>{% trans "But after all... the easiest is probably to run the Docker images :-)" %}</p>
+        <p><a class="btn btn-default" target="#" href="http://wiki.goffi.org/wiki/Docker/en" role="button">{% trans "Docker installation" %}</a></p>
         <p>{% trans "Some complementary information are given on the wiki." %}</p>
 		<p><a class="btn btn-default" target="#" href="http://wiki.goffi.org/wiki/Salut_%C3%A0_Toi/en#Latest_release" role="button">{% trans "Visit the wiki" %}</a></p>
         </p>
--- a/templates/sat_website/features.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/features.html	Sun May 03 22:39:02 2015 +0200
@@ -24,65 +24,80 @@
 {% 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">
-            <strong>{% trans "Blogging" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% 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 covers some of the most popular Internet usecases. 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 class="row">
+    <h5 class="alert alert-success">
+        <a name="screenshots">{% trans "Short overview" %}</a>
+    </h5>
+    <div class="info">
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% trans "Blogging" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% 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 covers some of the most popular Internet usecases. 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">
+	        <div class="col-md-2">
+	            <strong>{% trans "Chat" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% 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, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %}
+	        </div>
+	    </div>
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% trans "Activities" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows 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 "File sharing" %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}Easily send files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %}
+	        </div>
+	    </div>
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% blocktrans %}Email interaction{% endblocktrans %}</strong>
+	        </div>
+	        <div class="col-md-7 feature">
+	            {% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %}
+	        </div>
+	    </div>
+	    <div class="row">
+	        <div class="col-md-2">
+	            <strong>{% trans "Multiplatform" %}</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 any modern browser), but other platforms are planned.{% 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 really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
+	        </div>
+	    </div>
     </div>
-    <div class="row">
-		<div class="col-md-2">
-			<strong>{% trans "Chat" %}</strong>
-		</div>
-		<div class="col-md-7 feature">
-			{% 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, record your communication history... If you need to exchange sensitive information - like a password - you can encrypt your messages to ensure that nobody but the person you chose will be able to read it.{% endblocktrans %}
-		</div>
-	</div>
-    <div class="row">
-		<div class="col-md-2">
-			<strong>{% trans "Activities" %}</strong>
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}On top of the multi-user chat, you can play games and participate to activities. This is done in the same interface with nothing extra to install. For now we only offer a French card game (tarot) and an online radio system that allows 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 "File sharing" %}</strong>
-        </div>
-        <div class="col-md-7 feature">
-            {% blocktrans %}Easily send files to your contacts. For media content that support it, you can also stream them. Later we would like to implement a decentralised file sharing system so you could create a private Bitorrent-like network within a group a friends.{% endblocktrans %}
-        </div>
+</div>
+
+<div class="row">
+    <h5 class="alert alert-success">
+        <a name="screenshots">{% trans "Details and advanced features" %}</a>
+    </h5>
+    <div class="info">
+	    <p>{% trans "For a complete listing of the features implemented by SàT, please visit the technical area." %}
+	    <p><a class="btn btn-default" href="specifications.html" role="button">{% trans "Specifications" %}</a></p>
     </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">Email interaction</a>{% endblocktrans %}
-		</div>
-		<div class="col-md-7 feature">
-			{% blocktrans %}SàT communicates with the email network, so you can use your favorite client to send or receive messages. One goal of SàT is to offer an alternative to the classical email network, with a better protection against SPAM and identity spoofing. Gateways can also be installed to send messages to any other network.{% endblocktrans %}
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-2">
-			<strong>{% trans "Multiplatform" %}</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 any modern browser), but other platforms are planned.{% 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 really a feature, but certainly one of the most important point: a {{ social_prefix }}social contract{{ social_suffix }} has been written, this is a moral engagement that we are due to follow - we also refer to it in the statutes of the association. SàT is not made for money or trap people, it's a project about freedom and sharing.{% endblocktrans %}
-		</div>
-	</div>
+</div>
 
 {% endblock %}
--- a/templates/sat_website/frontends.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/frontends.html	Sun May 03 22:39:02 2015 +0200
@@ -24,27 +24,27 @@
 {% load staticfiles %}
 
 {% block headline %}{% trans "Salut à Toi's frontends" %}{% endblock %}
-{% block subtext %}{% trans "SàT is multi frontend: use the one that best fits your needs" %}{% endblock %}
+{% block subtext %}{% trans "SàT is multi frontend: use the one that best fits your needs." %}{% endblock %}
 {% block main_container %}
 
 <div class="row">
+    <div class="col-md-4">
+    <h2>{% trans "Libervia" %} <small>{% trans "web frontend" %}</small></h2>
+        <a href="{% static "images/screenshots/0.5/overview_libervia.png" %}" target="#" class="thumbnail">
+            <img src="{% static "images/screenshots/0.5/overview_libervia.png" %}" alt="{% trans "Libervia's main view" %}">
+        </a>
+    </div>
+
 	<div class="col-md-4">
 	<h2>{% trans "Primitivus" %} <small>{% trans "console interface" %}</small></h2>
-		<a href="#" class="thumbnail">
+		<a href="{% static "images/screenshots/primitivus/primitivus_tarot.png" %}" target="#" class="thumbnail">
 			<img src="{% static "images/screenshots/primitivus/primitivus_tarot.png" %}" alt="{% trans "Primitivus showing a french Tarot play" %}">
 		</a>
 	</div>
 	
 	<div class="col-md-4">
-	<h2>{% trans "Libervia" %} <small>{% trans "web frontend" %}</small></h2>
-		<a href="#" class="thumbnail">
-			<img src="{% static "images/screenshots/libervia/libervia_discussions.png" %}" alt="{% trans "Libervia's main view" %}">
-		</a>
-	</div>
-	
-	<div class="col-md-4">
 	<h2>{% trans "Jp" %} <small>{% trans "command line" %}</small></h2>
-		<a href="#" class="thumbnail">
+		<a href="{% static "images/screenshots/jp/jp.png" %}" target="#" class="thumbnail">
 			<img src="{% static "images/screenshots/jp/jp.png" %}" alt="{% trans "cowsay on jp" %}">
 		</a>
 	</div>
@@ -58,17 +58,17 @@
         <p class="desc">{% blocktrans %}Bellaciao will be a full-featured desktop frontend that intends to be really flexible: you'll be able to adapt it to your taste.{% endblocktrans %}</p>
     </div>
 
-	<div class="col-md-4">
-		<p id="bigmark">?</p>
-		<h4 id="bigmark_subtext">{% trans "Your idea here" %}</h4>
-	</div>
-
     <div class="col-md-4">
         <h2>{% trans "Cagou" %} <small>{% trans "mobile devices" %}</small></h2>
         <h5 class="wip">{% trans "[PLANNED]" %}</h5>
         <p class="desc">{% blocktrans %}There are ideas about an application that would run on both destkop and mobile devices (phones and tablets).{% endblocktrans %}</p>
     </div>
 
+    <div class="col-md-4">
+        <p id="bigmark">?</p>
+        <h4 id="bigmark_subtext">{% trans "Your idea here" %}</h4>
+    </div>
+
 </div>
 
 {% endblock %}
--- a/templates/sat_website/overview.html	Sun May 03 22:36:27 2015 +0200
+++ b/templates/sat_website/overview.html	Sun May 03 22:39:02 2015 +0200
@@ -86,8 +86,7 @@
             </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 is kept. This is 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>
+                <p>{% blocktrans %}SàT has many similarities with the Email network. For instance, there is no big server where all the data is kept, but many servers managed by different entities. This is 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>
             </div>
         </div>