Message ID | 20211224173448.saiun645pxymukbl@pelzflorian.localdomain |
---|---|
State | Accepted |
Headers | show |
Series | [bug#52596,guix-artwork] website: Relabel stable/latest to release/current. | expand |
Context | Check | Description |
---|---|---|
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
Hi Florian, On Fri, 24 Dec 2021 at 18:34, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote: > Sorry for not having pushed yet. (Actually I had somehow assumed you > had commit access ...). Sorry for the delay. Indeed, I do not have commit access. :-) > On Sun, Dec 19, 2021 at 10:21:29AM +0100, zimoun wrote: >> Well, maybe ’standard / latest’? Or something else than latest as >> development, current, or whatever else. > > Actually yes. Thanks for the follow up. > I would like to push the attached patch > "website: Relabel stable/latest to standard/latest." LGTM, thanks for the various fixes. > - The sum of your changes grants copyright IMHO, so I added copyright > headers for you for all changed files. > Note that Luis Felipe opted for > ;;; Public domain 2021 Luis Felipe López Acevedo > instead of > ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> > so I better ask first which you prefer. All is fine. Since I considered it was trivial changes, I appeared to me not necessary for the Copyright line. :-) Thanks for taking care of all that. > - Also changing Help/GNU Guix Manual (stable) > to Help/GNU Guix Manual 1.3.0 as you proposed. With fresh eyes, maybe “Guix Manual” is enough here. > From: zimoun <zimon.toutoune@gmail.com> > Date: Sat, 18 Dec 2021 11:40:38 +0100 > Subject: [PATCH] website: Relabel stable/latest to standard/latest. > > * website/apps/base/templates/components.scm (navbar): Relabel. > * website/apps/base/templates/help.scm (help-t): Relabel. > * website/apps/download/templates/download-latest.scm (download-latest-t): > Relabel. > > Signed-off-by: Florian Pelz <pelzflorian@pelzflorian.de> > --- > website/apps/base/templates/components.scm | 12 +++++++----- > website/apps/base/templates/help.scm | 7 ++++--- > website/apps/download/templates/download-latest.scm | 10 ++++++---- > 3 files changed, 17 insertions(+), 12 deletions(-) LGTM. Cheers, simon
On Wed, Dec 29, 2021 at 05:40:45PM +0100, zimoun wrote: > On Fri, 24 Dec 2021 at 18:34, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote: > > - Also changing Help/GNU Guix Manual (stable) > > to Help/GNU Guix Manual 1.3.0 as you proposed. > > With fresh eyes, maybe “Guix Manual” is enough here. I have pushed as-is (commit 2f5793cf543edc6fee4fe1351b9b30dfce116dea), because the Help/All page calls it GNU Guix Manual 1.3.0 too. Also I think it is good now. The 1.3.0 makes clear the difference to latest. The only downside to naming it 1.3.0 that I see is that the guix.gnu.org/manual URL will change away from 1.3.0 on the next release. Thank you Simon! Regards, Florian
On Wed, Dec 29, 2021 at 08:42:57PM +0100, pelzflorian (Florian Pelz) wrote: > On Wed, Dec 29, 2021 at 05:40:45PM +0100, zimoun wrote: > > On Fri, 24 Dec 2021 at 18:34, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote: > > > - Also changing Help/GNU Guix Manual (stable) > > > to Help/GNU Guix Manual 1.3.0 as you proposed. > > > > With fresh eyes, maybe “Guix Manual” is enough here. > > I have pushed as-is (commit 2f5793cf543edc6fee4fe1351b9b30dfce116dea), > because the Help/All page calls it GNU Guix Manual 1.3.0 too. > > Also I think it is good now. The 1.3.0 makes clear the difference to > latest. The only downside to naming it 1.3.0 that I see is that the > guix.gnu.org/manual URL will change away from 1.3.0 on the next > release. Maybe we can paremeterize the responsible code so that it's updated automatically?
Hi Florian, On Wed, 29 Dec 2021 at 20:42, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote: > On Wed, Dec 29, 2021 at 05:40:45PM +0100, zimoun wrote: >> On Fri, 24 Dec 2021 at 18:34, "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> wrote: >> > - Also changing Help/GNU Guix Manual (stable) >> > to Help/GNU Guix Manual 1.3.0 as you proposed. >> >> With fresh eyes, maybe “Guix Manual” is enough here. > > I have pushed as-is (commit 2f5793cf543edc6fee4fe1351b9b30dfce116dea), > because the Help/All page calls it GNU Guix Manual 1.3.0 too. Cool! Well, I think “GNU Guix Manual“ is superfluous in the Help navbar. “Manual“ seems enough, IMHO. Similarly for “Guix Reference Card”, I would be weird that this reference card points to something else. For instance, it is only “Cookbook“ and not “GNU Guix Cookbook”, in the Help navbar. Then, the webpage “mentioning GNU Guix …” is fine. > Also I think it is good now. The 1.3.0 makes clear the difference to > latest. The only downside to naming it 1.3.0 that I see is that the > guix.gnu.org/manual URL will change away from 1.3.0 on the next > release. Personally, I prefer light and straight navigation bar than one with too many redundant information. But all tastes are around. ;-) Cheers, simon
On Wed, Dec 29, 2021 at 03:07:10PM -0500, Leo Famulari wrote: > On Wed, Dec 29, 2021 at 08:42:57PM +0100, pelzflorian (Florian Pelz) wrote: > > The only downside to naming it 1.3.0 that I see is that the > > guix.gnu.org/manual URL will change away from 1.3.0 on the next > > release. > Maybe we can paremeterize the responsible code so that it's updated > automatically? Leo, we could create https://guix.gnu.org/manual/1.3.0/ and make the navbar’s Help/GNU Guix Manual 1.3.0 point to https://guix.gnu.org/manual/1.3.0/ so the meaning of the URL will not change in the future. This is what I meant; I had expressed myself badly so I’m unsure now if you really mean that. It is all unnecessary, I think; IMHO we do not even need both https://guix.gnu.org/manual/ and https://guix.gnu.org/manual/devel/, except when users manually change /etc/config.scm without guix pull. Or do foreign distro users need the old manual to install? But why? The label Help/GNU Guix Manual 1.3.0 already uses (define latest-guix-version (make-parameter "1.3.0")) so the label will automatically become Help/GNU Guix Manual 1.4.0 or whatever the next release will be called. Regards, Florian
Hi Florian, I am still seeing the old version, even after refreshing. All is it ok? Cheers, simon
On Thu, Dec 30, 2021 at 04:49:21PM +0100, zimoun wrote: > Hi Florian, > > I am still seeing the old version, even after refreshing. All is it ok? > > > Cheers, > simon I don’t know about builds on berlin. A local build of the de_DE website was successful. Regards, Florian
diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm index e2a74d3..b354d48 100644 --- a/website/apps/base/templates/components.scm +++ b/website/apps/base/templates/components.scm @@ -1,5 +1,6 @@ ;;; GNU Guix web site ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> +;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Initially written by sirgazil who waives all ;;; copyright interest on this file. @@ -399,7 +400,7 @@ manual. #:items (list (C_ "website menu" - (menu-item #:label "Stable" + (menu-item #:label "Standard" #:active-item active-item #:url (guix-url "download/"))) (C_ "website menu" @@ -416,10 +417,11 @@ manual. (menu-item #:label "All" #:active-item active-item #:url (guix-url "help/"))) - (C_ "website menu" - (menu-item #:label "GNU Guix Manual (stable)" - #:active-item active-item - #:url (guix-url "manual/"))) + (menu-item #:label (C_ "website menu" + (string-append "GNU Guix Manual " + (latest-guix-version) "")) + #:active-item active-item + #:url (guix-url "manual/")) (C_ "website menu" (menu-item #:label "GNU Guix Manual (latest)" #:active-item active-item diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm index 3d54ae1..98bba39 100644 --- a/website/apps/base/templates/help.scm +++ b/website/apps/base/templates/help.scm @@ -1,5 +1,6 @@ ;;; GNU Guix web site ;;; Public domain 2021 Luis Felipe López Acevedo +;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Initially written by sirgazil who waives all ;;; copyright interest on this file. @@ -51,7 +52,8 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) online. You may also find more information about Guix by running " ,(G_ `(code "info guix")) ".")) (p - ,(link-more #:label (G_ "Read stable manual") + ,(link-more #:label (G_ (string-append "Read manual " + (latest-guix-version) "")) #:url (guix-url "manual/en" #:localize #f))) (p (a (@ (href ,(guix-url "manual/de" #:localize #f))) "Deutsch") " | " @@ -76,8 +78,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) `(p "This version of the manual is updated frequently to include the latest changes from Guix's source files. It is - more up-to-date than the manual for the stable release of - Guix.")) + more up-to-date than the manual for the release of Guix.")) (p ,(link-more #:label (G_ "Read latest manual") #:url (guix-url "manual/devel/" #:localize #f)))) diff --git a/website/apps/download/templates/download-latest.scm b/website/apps/download/templates/download-latest.scm index 17eaadf..cdcecb7 100644 --- a/website/apps/download/templates/download-latest.scm +++ b/website/apps/download/templates/download-latest.scm @@ -1,4 +1,5 @@ ;;; GNU Guix web site +;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Initially written by sirgazil who waives all ;;; copyright interest on this file. ;;; @@ -145,8 +146,8 @@ (theme #:title (C_ "webpage title" '("Download latest")) #:description - (G_ "Download latest GNU Guix System images built by the Cuirass continuous -integration system.") + (G_ "Download latest development GNU Guix System images built +by the Cuirass continuous integration system.") #:keywords (string-split ;TRANSLATORS: |-separated list of webpage keywords (G_ "GNU|Linux|Unix|Free software|Libre software|Operating \ @@ -163,7 +164,7 @@ Package manager") #\|) `(main (section (@ (class "page")) - ,(G_ `(h2 "Download latest images")) + ,(G_ `(h2 "Download latest development images")) ;; TRANSLATORS: Continuous Integration is a section name ;; in the English (en) manual. ,(G_ @@ -175,7 +176,8 @@ Package manager") #\|) " continuous integration system at " (a (@ (href ,ci-url)) "ci.guix.gnu.org") ". These images are " ,(G_ `(b "development snapshots")) - ", you might prefer to use stable images that can be found " + ", you might prefer to use well-tested released images +that can be found " ,(G_ `(a (@ (href ,(guix-url "download/"))) "here.")))) (div (@ (class "centered-block limit-width"))