From 5187eb9ca9305a4784a1b1173169b0d7784923b2 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Wed, 17 Mar 2021 22:34:24 +0100 Subject: [PATCH 1/2] Start page: Add download links for 3.7.0 This replaces the SourceForge link to platform-specific direct links on Github for better usability. This requires text changes. To avoid delaying the release further, it was decided to not run those texts through translators again. This could still be updated post-release, of course. This required CSS changes because the styling was previously specified for a single link identified by an id=. This obviously breaks with multiple links. As variable expansion is not possible in front matter, the variables are reorganized. Fixes #359. --- 1-de-index.html | 3 ++- 1-es-index.html | 4 ++-- 1-fr-index.html | 3 ++- 1-index.html | 3 ++- 1-it-index.html | 3 ++- _config.yml | 1 + _layouts/mainhomepage.html | 2 +- assets/css/home.css | 8 ++++---- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/1-de-index.html b/1-de-index.html index 9695e0b1c..cb8991764 100644 --- a/1-de-index.html +++ b/1-de-index.html @@ -10,7 +10,8 @@ mAltProgIcon: "Jamulus Icon" mTSlogan: "Musiziere online. Mit deinen Freunden. Kostenlos." mTGetStartedNow: "Jetzt Starten!" -mHTMLDownloadNow: 'Erweitert: sofort herunterladen' +mTDownloadNow: 'Sofort herunterladen für' +mTOtherPlatforms: 'weitere Plattformen' ---
diff --git a/1-es-index.html b/1-es-index.html index 820dc7177..18ea190ed 100644 --- a/1-es-index.html +++ b/1-es-index.html @@ -10,8 +10,8 @@ mAltProgIcon: "Jamulus icon" mTSlogan: "Toca música online. Con amig@s. Gratis." mTGetStartedNow: "¡Empieza ya!" -mHTMLDownloadNow: 'Avanzado: descarga ahora' +mTDownloadNow: 'Download now for' +mTOtherPlatforms: 'other platforms' ---
diff --git a/1-fr-index.html b/1-fr-index.html index 9979529ec..b12f12471 100644 --- a/1-fr-index.html +++ b/1-fr-index.html @@ -10,7 +10,8 @@ mAltProgIcon: "Icône de Jamulus" mTSlogan: "Jouez de la musique en ligne. Avec vos amis. Librement et gratuitement." mTGetStartedNow: "Commencer maintenant !" -mHTMLDownloadNow: 'Avancé : télécharger directement' +mTDownloadNow: 'Download now for' +mTOtherPlatforms: 'other platforms' ---
diff --git a/1-index.html b/1-index.html index dff6994ae..5226888c6 100644 --- a/1-index.html +++ b/1-index.html @@ -10,7 +10,8 @@ mAltProgIcon: "Jamulus icon" mTSlogan: "Play music online. With friends. For free." mTGetStartedNow: "Get started now!" -mHTMLDownloadNow: 'Advanced: download now' +mTDownloadNow: 'Download now for' +mTOtherPlatforms: 'other platforms' ---
diff --git a/1-it-index.html b/1-it-index.html index ddf3f2ab9..241988ef2 100644 --- a/1-it-index.html +++ b/1-it-index.html @@ -10,7 +10,8 @@ mAltProgIcon: "Jamulus icon" mTSlogan: "Suonare Online. Tra Amici. In libertà." mTGetStartedNow: "Comincia a Suonare!" -mHTMLDownloadNow: 'Cominciamo: Scarica Ora' +mTDownloadNow: 'Download now for' +mTOtherPlatforms: 'other platforms' ---
diff --git a/_config.yml b/_config.yml index 27b85a269..bd29e4722 100644 --- a/_config.yml +++ b/_config.yml @@ -16,6 +16,7 @@ download_file_names: windows: "jamulus_3.7.0_win.exe" mac: "jamulus_3.7.0_mac.dmg" android: "jamulus_3.7.0_android.apk" +download_overview_link: "https://github.com/jamulussoftware/jamulus/releases/latest" githubrepoeditbase: "https://github.com/jamulussoftware/jamuluswebsite/edit/changes" kbnewpage: 'https://github.com/jamulussoftware/jamuluswebsite/new/changes/_posts/?value=---%0Alayout%3A%20post%0Atitle%3A%20%22Your%20Title%22%0Alang%3A%20%22en%22%0Aauthor%3A%20%22YourName%22%0Aheading%3A%20%22Heading%22%0A---%0AName%20this%20file%20and%20edit%20the%20parameters%20above%21&message=New%20post' diff --git a/_layouts/mainhomepage.html b/_layouts/mainhomepage.html index 6ff053dc0..cc07227a1 100644 --- a/_layouts/mainhomepage.html +++ b/_layouts/mainhomepage.html @@ -45,7 +45,7 @@

Jamulus

{{ page.mTGetStartedNow }}
- {{ page.mHTMLDownloadNow }} + {{ page.mTDownloadNow }} Windows, Mac, Debian/Ubuntu or {{{ page.mTOtherPlatforms }}.'
diff --git a/assets/css/home.css b/assets/css/home.css index b25ace456..cf191e700 100644 --- a/assets/css/home.css +++ b/assets/css/home.css @@ -47,12 +47,12 @@ header { margin: .5em 0 0 0; } -#dld_frm_sf { +#dl_frm_sf_container a { color: #ffffff; text-decoration: none; } -#dld_frm_sf:hover { +#dl_frm_sf_container a:hover { text-decoration: underline; } @@ -75,12 +75,12 @@ header { margin: .5em 0 0 0; } -#dld_frm_sf { +#dl_frm_sf_container a { color: #ffffff; text-decoration: none; } -#dld_frm_sf:hover { +#dl_frm_sf_container a:hover { text-decoration: underline; } From 793acdaad533800fdb863c768c8d86dd99cc2182 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Wed, 17 Mar 2021 22:38:15 +0100 Subject: [PATCH 2/2] CSS: Remove duplicated definitions --- assets/css/home.css | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/assets/css/home.css b/assets/css/home.css index cf191e700..c2809b27f 100644 --- a/assets/css/home.css +++ b/assets/css/home.css @@ -70,31 +70,3 @@ header { transition: 0.4s; opacity: 0.9; } - -#dl_frm_sf_container { - margin: .5em 0 0 0; -} - -#dl_frm_sf_container a { - color: #ffffff; - text-decoration: none; -} - -#dl_frm_sf_container a:hover { - text-decoration: underline; -} - -#bannercontainer { - margin-top: 10px; -} - -#jamulusbanner { - width: 100%; - transition: 0.4s; - opacity: 1; -} - -#jamulusbanner:hover { - transition: 0.4s; - opacity: 0.9; -}