# HG changeset patch # User souliane # Date 1430685387 -7200 # Node ID 3e460ca969d21109ba43d7c687d9fef8070d260d # Parent a18800261cf6f7a98626f1cafa2cf2c89d07ab9d delete screenshots_tech.html, display all screenshots in the same page using sections diff -r a18800261cf6 -r 3e460ca969d2 sat_website/screenshots.py --- a/sat_website/screenshots.py Wed Apr 29 13:04:15 2015 +0200 +++ b/sat_website/screenshots.py Sun May 03 22:36:27 2015 +0200 @@ -30,6 +30,8 @@ screenshots = [ ImageDesc("images/screenshots/0.5/overview_libervia.png", _(u"Overview"), {_(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"}), 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", @@ -38,21 +40,15 @@ {_(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 = [ 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", @@ -61,8 +57,12 @@ {_(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"}), + ImageDesc("images/screenshots/primitivus/primitivus_tarot.png", _(u"Primitivus showing a french Tarot play"), + {_(u"frontend"): "primitivus", _(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"}), + 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"}), ] diff -r a18800261cf6 -r 3e460ca969d2 sat_website/views.py --- a/sat_website/views.py Wed Apr 29 13:04:15 2015 +0200 +++ b/sat_website/views.py Sun May 03 22:36:27 2015 +0200 @@ -36,7 +36,6 @@ ('principles', (_(u"Technical area"), OrderedDict([("principles", _(u"Principles")), ("specifications", _(u"Specifications")), - ("screenshots_tech", _(u"Screenshots & Videos")), ("downloads", _(u"Downloads")), ("developers", _(u"Developers corner")), ]))), @@ -80,8 +79,7 @@ return render_to_response('sat_website/overview.html', context) elif category == "screenshots": context["screenshots"] = screenshots.screenshots - elif category == "screenshots_tech": - context["screenshots"] = screenshots.screenshots_tech + context["screenshots_tech"] = screenshots.screenshots_tech elif category == "social_contract": context["SOCIAL_CONTRACT"] = social_contract.get_social_contract() elif category == "downloads": diff -r a18800261cf6 -r 3e460ca969d2 templates/sat_website/screenshots.html --- a/templates/sat_website/screenshots.html Wed Apr 29 13:04:15 2015 +0200 +++ b/templates/sat_website/screenshots.html Sun May 03 22:36:27 2015 +0200 @@ -21,9 +21,27 @@ {% endcomment %} {% load i18n %} -{% block headline %}{% trans "Screenshots and videos..." %}{% endblock %} +{% block headline %}{% trans "Screenshots and videos" %}{% endblock %} {% block main_container %} -{% include "sat_website/gallery.html" %} +
+
+ {% trans "Basic usage" %} +
+
+ {% trans "These media concern the basic utilisation SàT through graphical frontends like Libervia." %} + {% include "sat_website/gallery.html" with screenshots=screenshots %} +
+
+ +
+
+ {% trans "Advanced usage" %} +
+
+ {% trans "These media concern the advanced utilisation and frontends of SàT, including administration tasks and experimental features." %} + {% include "sat_website/gallery.html" with screenshots=screenshots_tech %} +
+
{% endblock %} diff -r a18800261cf6 -r 3e460ca969d2 templates/sat_website/screenshots_tech.html --- a/templates/sat_website/screenshots_tech.html Wed Apr 29 13:04:15 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -{% 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 . -{% endcomment %} - -{% load i18n %} -{% block headline %}{% trans "Technical screenshots and videos..." %}{% endblock %} -{% block main_container %} - -{% include "sat_website/gallery.html" %} - -{% endblock %}