[Gruppo-web] [Git][ubuntu-it-web/www][develop] 5 commits: aggiornato elenco download derivate

Mattia Rizzolo gitlab a code.ubuntu-it.org
Mar 26 Maggio 2020 13:43:30 BST



Mattia Rizzolo pushed to branch develop at Gruppo Web / Nuovo sito


Commits:
64d239be by Alessandro Viprati at 2020-05-25T23:18:11+02:00
aggiornato elenco download derivate

- - - - -
30c3b398 by Alessandro Viprati at 2020-05-25T23:23:25+02:00
corretto background ubuntu kylin

- - - - -
652bc667 by Alessandro Viprati at 2020-05-25T23:41:18+02:00
modifiche alla pagina grazie

- - - - -
4fa3b076 by Alessandro Viprati at 2020-05-26T07:53:18+02:00
piccola correzione pagina download

- - - - -
654ade03 by Mattia Rizzolo at 2020-05-26T14:43:12+02:00
Merge branch 'download-nuovo' of code.ubuntu-it.org:ubuntu-it-web/www into develop

MR: https://code.ubuntu-it.org/ubuntu-it-web/www/-/merge_requests/30
Signed-off-by: Mattia Rizzolo <mapreri a ubuntu.com>

- - - - -


6 changed files:

- assets/scss/www.scss
- uitwww/data/downloads.toml
- uitwww/templates/download/index.html
- uitwww/templates/download/thanks.html
- uitwww/templates/pages/derivate/index.html
- uitwww/templates/pages/derivate/ubuntu-kylin.html


Changes:

=====================================
assets/scss/www.scss
=====================================
@@ -10,7 +10,7 @@ div.page div.row.background-wallpaper {
     }
 
     &.ubuntu, &.desktop, &.kubuntu, &.lubuntu, &.xubuntu, &.ubuntu-mate,
-    &.ubuntu-budgie, &.ubuntu-kylin, &.ubuntustudio, &.ubuntu-touch,
+    &.ubuntu-budgie, &.ubuntukylin, &.ubuntustudio, &.ubuntu-touch,
     &.nuovo-rilascio {
         color: #fff;
 
@@ -64,7 +64,7 @@ div.page div.row.background-wallpaper {
             url("images/wallpapers/ubuntu-budgie.jpg") 100% 50%;
     }
 
-    &.ubuntu-kylin {
+    &.ubuntukylin {
         background: url("images/wallpapers/ubuntu-kylin.jpg") 100% 50%;
     }
 


=====================================
uitwww/data/downloads.toml
=====================================
@@ -62,9 +62,9 @@ releases = ["latest", "lts"]
 archs = { amd64 = "cdimages-derivatives" }
 
 
-[distros.xubuntu]
-name = "Xubuntu"
-description = "La derivata di Ubuntu leggera ma personalizzabile, con desktop XFCE"
+[distros.lubuntu]
+name = "Lubuntu"
+description = "La derivata pi¨ leggera, con LXDE"
 lts-support-years = 3
 
 lts-only = true
@@ -72,9 +72,19 @@ releases = ["latest", "lts"]
 archs = { amd64 = "cdimages-derivatives" }
 
 
-[distros.lubuntu]
-name = "Lubuntu"
-description = "La derivata pi¨ leggera, con LXDE"
+[distros.ubuntu-budgie]
+name = "Ubuntu Budgie"
+description = "La potenza di Ubuntu e la leggerezza di Budgie"
+lts-support-years = 3
+
+lts-only = true
+releases = ["latest", "lts"]
+archs = { amd64 = "cdimages-derivatives" }
+
+
+[distros.ubuntukylin]
+name = "Ubuntu Kylin"
+description = "La derivata di Ubuntu con desktop UKUI"
 lts-support-years = 3
 
 lts-only = true
@@ -92,25 +102,24 @@ releases = ["latest", "lts"]
 archs = { amd64 = "cdimages-derivatives" }
 
 
-[distros.ubuntu-budgie]
-name = "Ubuntu Budgie"
-description = "La potenza di Ubuntu e la leggerezza di Budgie"
+[distros.ubuntustudio]
+name = "Ubuntu Studio"
+description = "La derivata di Ubuntu dedicata alla multimedialitÓ"
 lts-support-years = 3
 
 lts-only = true
 releases = ["latest", "lts"]
-archs = { amd64 = "cdimages-derivatives" }
+archs = { amd64 = "cdimages-studio" }
 
 
-#[distros.ubuntustudio]
-#name = "Ubuntu Studio"
-#description = "Ubuntu con tutti i programmi per lavorare con audio, video e immagini"
-#lts-support-years = 3
-#
-#lts-only = true
-#releases = ["lts"]
-#archs = { amd64 = "cdimages-studio", i386 = "cdimages-studio" }
+[distros.xubuntu]
+name = "Xubuntu"
+description = "La derivata di Ubuntu leggera ma personalizzabile, con desktop XFCE"
+lts-support-years = 3
 
+lts-only = true
+releases = ["latest", "lts"]
+archs = { amd64 = "cdimages-derivatives" }
 
 
 # Nomi delle architetture


=====================================
uitwww/templates/download/index.html
=====================================
@@ -1,5 +1,6 @@
 {# Source code of the Ubuntu-it website
  # Copyright (C) 2015  Pietro Albini <pietroalbini a ubuntu.com>
+ # Copyright (C) 2020  Alessandro Viprati <vipri.alessandro a gmail.com>
  #
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU Affero General Public License as published
@@ -38,7 +39,7 @@
                 </div>
                 <div class="col col-center col-quarter">
                     <a class="btn" href="{{ url_for("download.landing", distro = name) }}">
-                        Scaricala ora
+                        Scaricalo ora
                     </a>
                 </div>
             </div>


=====================================
uitwww/templates/download/thanks.html
=====================================
@@ -41,12 +41,12 @@
             <div class="col">
                 <h3>Come installare Ubuntu?</h3>
                 <p>
-                    ╚ la prima volta che installi Ubuntu o non ti ricordi tutti
-                    i passaggi? Non ti preoccupare! Ubuntu-it dispone di una
+                    ╚ la prima volta che installi Ubuntu o non ricordi tutti
+                    i passaggi? Non ti preoccupare, Ubuntu-it dispone di una
                     vasta documentazione con tutti i dettagli necessari!
                 </p>
 
-                <a class="btn" href="https://wiki.ubuntu-it.org/Installazione">
+                <a class="btn" href="https://wiki.ubuntu-it.org/Installazione/InstallareUbuntu">
                     Guida all'installazione
                 </a>
             </div>


=====================================
uitwww/templates/pages/derivate/index.html
=====================================
@@ -80,7 +80,7 @@
             <iframe src="https://www.youtube.com/embed/atBXTU0Sv5w" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
         </div>
     </div>
-    <div class="row background-wallpaper ubuntu-kylin">
+    <div class="row background-wallpaper ubuntukylin">
         <div class="col">
             <h1>Ubuntu Kylin</h1>
             <p>


=====================================
uitwww/templates/pages/derivate/ubuntu-kylin.html
=====================================
@@ -22,7 +22,7 @@
 {% block title %}Ubuntu Kylin{% endblock %}
 {% block content %}
 <div class="page">
-    <div class="row background-wallpaper ubuntu-kylin">
+    <div class="row background-wallpaper ubuntukylin">
         <div class="col">
             <h1 class="text-center">Ubuntu Kylin</h1>
             <p class="intro text-center"><a href="https://www.ubuntukylin.com/index.php?lang=en" target="_blank">Ubuntu Kylin</a> Ŕ la versione di Ubuntu basata sull'ambiente grafico <a href="https://www.ukui.org/" target="_blank">UKUI</a>.</p>



View it on GitLab: http://code.ubuntu-it.org/ubuntu-it-web/www/-/compare/bd1aaeed66b9143fcee08db2cabc770e39f8d6a2...654ade033150717406ac669bc865fe953ac37486

-- 
View it on GitLab: http://code.ubuntu-it.org/ubuntu-it-web/www/-/compare/bd1aaeed66b9143fcee08db2cabc770e39f8d6a2...654ade033150717406ac669bc865fe953ac37486
You're receiving this email because of your account on code.ubuntu-it.org..


-------------- parte successiva --------------
Un allegato HTML Ŕ stato rimosso...
URL: <http://liste.ubuntu-it.org/pipermail/gruppo-web/attachments/20200526/5f173633/attachment-0001.htm>


Maggiori informazioni sulla lista Gruppo-web