# HG changeset patch # User souliane # Date 1430305455 -7200 # Node ID a18800261cf6f7a98626f1cafa2cf2c89d07ab9d # Parent 62c23067e86eabd99c752a404d71b914d3ae148d change some texts, add a couple of screenshots, set metadata version and year to the medias diff -r 62c23067e86e -r a18800261cf6 sat_website/screenshots.py --- a/sat_website/screenshots.py Mon Apr 27 16:21:45 2015 +0200 +++ b/sat_website/screenshots.py Wed Apr 29 13:04:15 2015 +0200 @@ -22,27 +22,47 @@ from django.utils.translation import ugettext_lazy as _ from collections import namedtuple -ImageDesc = namedtuple("ImageDesc","path description") -VideoDesc = namedtuple("VideoDesc", "path description poster lang subtitles") +ImageDesc = namedtuple("ImageDesc", "path description data") +VideoDesc = namedtuple("VideoDesc", "path description poster data") #list the pictures screenshots = [ - ImageDesc("images/screenshots/libervia/libervia_login.png", _(u"Libervia's login page")), - ImageDesc("images/screenshots/libervia/libervia_discussions.png", _(u"Libervia's main view")), - ImageDesc("images/screenshots/primitivus/primitivus_tarot.png", _(u"Primitivus showing a french Tarot play")), - ImageDesc("images/screenshots/jp/jp.png", _(u"cowsay sent in conversation through jp")), - ImageDesc("images/screenshots/wix/wix_tarot.png", _(u"Wix showing a french Tarot play")), - VideoDesc("videos/screencasts/présentation_SàT.webm", _(u"The first video show wix, primitivus and jp"), "videos/screencasts/posters/présentation_SàT.jpg", 'fr', ''), - VideoDesc("videos/screencasts/présentation_SàT_2.webm", _(u"This video show french Tarot game, and how to use Thunderbird with SàT"), "videos/screencasts/posters/présentation_SàT_2.jpg", 'fr', ''), - VideoDesc("videos/screencasts/présentation_SàT_3.webm", _(u"This video focuses on Libervia. The UI is really outdated, but we can see some features"), "videos/screencasts/posters/présentation_SàT_3.jpg", 'fr', ''), - VideoDesc("videos/screencasts/présentation_SàT_5_radio_collective.webm", _(u"Demo of the new Libervia UI, and of the collective radio feature"), "videos/screencasts/posters/radiocol.jpg", 'fr', ''), + ImageDesc("images/screenshots/0.5/overview_libervia.png", _(u"Overview"), + {_(u"frontend"): "libervia", _(u"version"): "0.5", _(u"year"): "2014"}), + ImageDesc("images/screenshots/0.4/sat_wysiwyg.png", _(u"Rich text editor"), + {_(u"frontend"): "libervia", _(u"version"): "0.4", _(u"year"): "2014"}), + VideoDesc("videos/screencasts/présentation_SàT_5_radio_collective.webm", _(u"Demo of the new Libervia UI, and of the collective radio feature"), "videos/screencasts/posters/radiocol.jpg", + {_(u"frontend"): "libervia", _(u"version"): "0.3D", _(u"year"): "2012", _(u"language"): "fr"}), + ImageDesc("images/screenshots/libervia/libervia_login.png", _(u"Libervia's login page"), + {_(u"frontend"): "libervia", _(u"version"): "0.3D", _(u"year"): "2011"}), + ImageDesc("images/screenshots/libervia/libervia_discussions.png", _(u"Libervia's main view"), + {_(u"frontend"): "libervia", _(u"version"): "0.3D", _(u"year"): "2011"}), + ImageDesc("images/screenshots/primitivus/primitivus_tarot.png", _(u"Primitivus showing a french Tarot play"), + {_(u"frontend"): "primitivus", _(u"version"): "0.2", _(u"year"): "2011"}), + ImageDesc("images/screenshots/wix/wix_tarot.png", _(u"Wix showing a french Tarot play"), + {_(u"frontend"): "wix", _(u"version"): "0.2", _(u"year"): "2011"}), + VideoDesc("videos/screencasts/présentation_SàT_3.webm", _(u"This video focuses on Libervia. The UI is really outdated, but we can see some features"), "videos/screencasts/posters/présentation_SàT_3.jpg", + {_(u"frontend"): "libervia", _(u"version"): "0.2", _(u"year"): "2011", _(u"language"): "fr"}), + VideoDesc("videos/screencasts/présentation_SàT.webm", _(u"The first video shows wix, primitivus and jp"), "videos/screencasts/posters/présentation_SàT.jpg", + {_(u"version"): "0.2", _(u"year"): "2011", _(u"language"): "fr"}), ] screenshots_tech = [ - VideoDesc("videos/screencasts/présentation_SàT_7_télécommande_universelle.webm", _(u"Use ad-hoc commands to control a VLC player from Libervia"), "videos/screencasts/posters/présentation_SàT_7_télécommande_universelle.png", 'fr', ''), - VideoDesc("videos/screencasts/présentation_SàT_6_export_commande.webm", _(u"Exporting a command: an FTP client is exported to a Gajim contact"), "videos/screencasts/posters/présentation_SàT_6_export_commande.jpg", 'fr', ''), - VideoDesc("videos/screencasts/présentation_SàT_4_copie_et_pipe.webm", _(u"How to copy and pipe streams over XMPP"), "videos/screencasts/posters/présentation_SàT_4.jpg", 'fr', ''), + ImageDesc("images/screenshots/0.5/adhoc_administration.png", _(u"Server administration from the web frontend Libervia."), + {_(u"frontend"): "libervia", _(u"version"): "0.5", _(u"year"): "2014"}), + ImageDesc("images/screenshots/0.5/http_unsecure_warning.png", _(u"Optional security check"), + {_(u"frontend"): "libervia", _(u"version"): "0.5", _(u"year"): "2014"}), + VideoDesc("videos/screencasts/présentation_SàT_7_télécommande_universelle.webm", _(u"Use ad-hoc commands to control a VLC player from Libervia"), "videos/screencasts/posters/présentation_SàT_7_télécommande_universelle.png", + {_(u"version"): "0.4", _(u"year"): "2014", _(u"language"): "fr"}), + VideoDesc("videos/screencasts/présentation_SàT_6_export_commande.webm", _(u"Exporting a command: an FTP client is exported to a Gajim contact"), "videos/screencasts/posters/présentation_SàT_6_export_commande.jpg", + {_(u"version"): "0.4D", _(u"year"): "2013", _(u"language"): "fr"}), + VideoDesc("videos/screencasts/présentation_SàT_4_copie_et_pipe.webm", _(u"How to copy and pipe streams over XMPP"), "videos/screencasts/posters/présentation_SàT_4.jpg", + {_(u"version"): "0.3D", _(u"year"): "2011", _(u"language"): "fr"}), + ImageDesc("images/screenshots/jp/jp.png", _(u"Cowsay sent in conversation through jp"), + {_(u"version"): "0.2", _(u"year"): "2011"}), + VideoDesc("videos/screencasts/présentation_SàT_2.webm", _(u"This video shows french Tarot game, and how to use Thunderbird with SàT"), "videos/screencasts/posters/présentation_SàT_2.jpg", + {_(u"version"): "0.2", _(u"year"): "2011", _(u"language"): "fr"}), ] diff -r 62c23067e86e -r a18800261cf6 sat_website/templatetags/utils.py --- a/sat_website/templatetags/utils.py Mon Apr 27 16:21:45 2015 +0200 +++ b/sat_website/templatetags/utils.py Wed Apr 29 13:04:15 2015 +0200 @@ -1,5 +1,6 @@ from django import template from django.forms import RadioSelect, CheckboxInput +from django.utils.translation import get_language, ugettext_lazy register = template.Library() @register.filter @@ -67,3 +68,17 @@ result.append(value[index:index + n]) index += n return result + +@register.filter +def metadata(data): + """Return a string representation of a metadata dict. + + @param data (dict{__proxy__: unicode}): metadata dictionnary + @return: unicode + """ + if not data: + return "" + lang = get_language() + sep = ugettext_lazy(': ') + items = ["%s%s%s" % (key.translate(lang), sep, value) for key, value in data.iteritems()] + return "(%s)" % ', '.join(items) diff -r 62c23067e86e -r a18800261cf6 static/images/screenshots/0.4/sat_wysiwyg.png Binary file static/images/screenshots/0.4/sat_wysiwyg.png has changed diff -r 62c23067e86e -r a18800261cf6 static/images/screenshots/0.5/adhoc_administration.png Binary file static/images/screenshots/0.5/adhoc_administration.png has changed diff -r 62c23067e86e -r a18800261cf6 static/images/screenshots/0.5/http_unsecure_warning.png Binary file static/images/screenshots/0.5/http_unsecure_warning.png has changed diff -r 62c23067e86e -r a18800261cf6 static/images/screenshots/0.5/overview_libervia.png Binary file static/images/screenshots/0.5/overview_libervia.png has changed diff -r 62c23067e86e -r a18800261cf6 templates/sat_website/features.html --- a/templates/sat_website/features.html Mon Apr 27 16:21:45 2015 +0200 +++ b/templates/sat_website/features.html Wed Apr 29 13:04:15 2015 +0200 @@ -28,76 +28,44 @@ {% block extra %}{% trans "Click on the feature name to have a more detailed description" %}{% endblock %} {% block main_container %} -
+
+
+ {% trans "Blogging" %} +
+
+ {% 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 %} +
+
+
- {% trans "Blogging" %} + {% trans "Chat" %}
- {% 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 %} + {% 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 %}
-
-
- {% trans "Advanced chat and group chat" %} -
-
- {% 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 %} -
-
-
+
{% trans "Activities" %}
- {% 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 %} + {% 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 %}
- {% trans "File sharing and stream transmissions" %} + {% trans "File sharing" %}
- {% 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 %} + {% 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 %}
- {% blocktrans context "Url need to point to the localised one" %}E-mail clients interactions{% endblocktrans %} -
-
- {% 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 %} -
-
-
-
- {% blocktrans context "Url need to point to the localised one" %}Pipe over XMPP{% endblocktrans %} + {% blocktrans context "Url need to point to the localised one" %}Email interaction{% endblocktrans %}
- {% 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 %} -
-
-
-
- {% blocktrans context "Url need to point to the localised one" %}Export Unix commands{% endblocktrans %} -
-
- {% 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 %} -
-
-
-
- {% blocktrans context "Url need to point to the localised one" %}Ad-Hoc commands{% endblocktrans %} -
-
- {% blocktrans %}You can remotely control your XMPP entities and all the softwares that offer DBus services. {% endblocktrans %} -
-
-
-
- {% blocktrans context "Url need to point to the localised one" %}Collective radio{% endblocktrans %} -
-
- {% 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 %} + {% 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 %}
@@ -105,7 +73,7 @@ {% trans "Multiplatform" %}
- {% 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 %} + {% 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 %}
@@ -113,7 +81,7 @@ {% trans "Social contract" %}
- {% blocktrans with social_prefix="" social_suffix="" %}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 %} + {% blocktrans with social_prefix="" social_suffix="" %}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 %}
diff -r 62c23067e86e -r a18800261cf6 templates/sat_website/gallery.html --- a/templates/sat_website/gallery.html Mon Apr 27 16:21:45 2015 +0200 +++ b/templates/sat_website/gallery.html Wed Apr 29 13:04:15 2015 +0200 @@ -37,7 +37,7 @@
{% if screenshot.poster %} {% else %} @@ -79,21 +79,14 @@
{% if screenshot.poster %} {% else %} {% endif %}
- {{ screenshot.description }} - {% if screenshot.lang and screenshot.subtitles %} - ({% trans "language:" %} {{ screenshot.lang }}, - {% trans "subtitles:" %} {{ screenshot.subtitles }}) - {% elif screenshot.lang %} - ({% trans "language:" %} {{ screenshot.lang }}) - {% elif screenshot.subtitles %} - ({% trans "subtitles:" %} {{ screenshot.subtitles }}) - {% endif %} + {{ screenshot.description }}
+ {{ screenshot.data|metadata }}
{% endfor %} diff -r 62c23067e86e -r a18800261cf6 templates/sat_website/overview.html --- a/templates/sat_website/overview.html Mon Apr 27 16:21:45 2015 +0200 +++ b/templates/sat_website/overview.html Wed Apr 29 13:04:15 2015 +0200 @@ -73,7 +73,7 @@
  • {% blocktrans %}inside a console user interface{% endblocktrans %}
  • {% blocktrans %}through a command line{% endblocktrans %}
    • - {% blocktrans %}Other frontends are planned (telephones, desktop).{% endblocktrans %} +

    {% blocktrans %}Other frontends are planned (telephones, desktop).{% endblocktrans %}

    {% trans "Frontends" %}

    @@ -106,7 +106,7 @@

    {% trans "Run it yourself!" %}

    -

    {% 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!" %}

    +

    {% 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 public Libervia server and help the decentralisation! Our goal is not to host every account on our server... we don't want your data!" %}

    {% trans "Downloads" %}

    diff -r 62c23067e86e -r a18800261cf6 templates/sat_website/principles.html --- a/templates/sat_website/principles.html Mon Apr 27 16:21:45 2015 +0200 +++ b/templates/sat_website/principles.html Wed Apr 29 13:04:15 2015 +0200 @@ -23,7 +23,7 @@ {% load i18n %} {% block headline %}{% trans "Principles" %}{% endblock %} -{% block subtext %}{% trans "Some technical words to explain the project" %}{% endblock %} +{% block subtext %}{% trans "Some technical words to explain the project." %}{% endblock %} {% block main_container %}