diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-05-14 13:42:45 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-14 14:08:38 +0200 |
commit | d742e4a14dc238f96ed07faa674e52eb28c14c69 (patch) | |
tree | 310fc423931c6f42dd90d5e46c05bb6f5c67c5b3 /website | |
parent | ef324da4120e4502e682dd2a8c5b01a0f7559233 (diff) | |
download | guix-artwork-d742e4a14dc238f96ed07faa674e52eb28c14c69.tar guix-artwork-d742e4a14dc238f96ed07faa674e52eb28c14c69.tar.gz |
website: main: Update screenshots.
* website/www.scm (screenshot): New procedure.
(main-page): Use it.
* website/www/utils.scm (thumb-url): Change.
* website/static/base/img/screenshots: Update files.
Diffstat (limited to 'website')
14 files changed, 24 insertions, 25 deletions
diff --git a/website/static/base/img/screenshots/emacs-ui-generations-thumb.png b/website/static/base/img/screenshots/emacs-ui-generations-thumb.png Binary files differdeleted file mode 100644 index c11c611..0000000 --- a/website/static/base/img/screenshots/emacs-ui-generations-thumb.png +++ /dev/null diff --git a/website/static/base/img/screenshots/emacs-ui-packages-thumb.png b/website/static/base/img/screenshots/emacs-ui-packages-thumb.png Binary files differdeleted file mode 100644 index e1632ab..0000000 --- a/website/static/base/img/screenshots/emacs-ui-packages-thumb.png +++ /dev/null diff --git a/website/static/base/img/screenshots/grub-menu-thumb.png b/website/static/base/img/screenshots/grub-menu-thumb.png Binary files differdeleted file mode 100644 index 41ade6b..0000000 --- a/website/static/base/img/screenshots/grub-menu-thumb.png +++ /dev/null diff --git a/website/static/base/img/screenshots/slim-thumb.png b/website/static/base/img/screenshots/slim-thumb.png Binary files differdeleted file mode 100644 index 9be13d3..0000000 --- a/website/static/base/img/screenshots/slim-thumb.png +++ /dev/null diff --git a/website/static/base/img/screenshots/thumbs/guix-screenie.png b/website/static/base/img/screenshots/thumbs/guix-screenie.png Binary files differnew file mode 100644 index 0000000..0686d36 --- /dev/null +++ b/website/static/base/img/screenshots/thumbs/guix-screenie.png diff --git a/website/static/base/img/screenshots/thumbs/guixsd-grub.png b/website/static/base/img/screenshots/thumbs/guixsd-grub.png Binary files differnew file mode 100644 index 0000000..7696bd3 --- /dev/null +++ b/website/static/base/img/screenshots/thumbs/guixsd-grub.png diff --git a/website/static/base/img/screenshots/thumbs/guixsd-slim.png b/website/static/base/img/screenshots/thumbs/guixsd-slim.png Binary files differnew file mode 100644 index 0000000..02d3da6 --- /dev/null +++ b/website/static/base/img/screenshots/thumbs/guixsd-slim.png diff --git a/website/static/base/img/screenshots/thumbs/guixsd-xfce-emacs.png b/website/static/base/img/screenshots/thumbs/guixsd-xfce-emacs.png Binary files differnew file mode 100644 index 0000000..b3950e0 --- /dev/null +++ b/website/static/base/img/screenshots/thumbs/guixsd-xfce-emacs.png diff --git a/website/static/base/img/screenshots/thumbs/guixsd-xfce-icecat-emacs.png b/website/static/base/img/screenshots/thumbs/guixsd-xfce-icecat-emacs.png Binary files differnew file mode 100644 index 0000000..9ec9caf --- /dev/null +++ b/website/static/base/img/screenshots/thumbs/guixsd-xfce-icecat-emacs.png diff --git a/website/static/base/img/screenshots/thumbs/guixsd-xfce-mines.png b/website/static/base/img/screenshots/thumbs/guixsd-xfce-mines.png Binary files differnew file mode 100644 index 0000000..020ace2 --- /dev/null +++ b/website/static/base/img/screenshots/thumbs/guixsd-xfce-mines.png diff --git a/website/static/base/img/screenshots/user-interfaces-thumb.png b/website/static/base/img/screenshots/user-interfaces-thumb.png Binary files differdeleted file mode 100644 index 1a06db3..0000000 --- a/website/static/base/img/screenshots/user-interfaces-thumb.png +++ /dev/null diff --git a/website/static/base/img/screenshots/windowmaker+icecat+inkscape-thumb.png b/website/static/base/img/screenshots/windowmaker+icecat+inkscape-thumb.png Binary files differdeleted file mode 100644 index 200bca5..0000000 --- a/website/static/base/img/screenshots/windowmaker+icecat+inkscape-thumb.png +++ /dev/null diff --git a/website/www.scm b/website/www.scm index e271a90..80a6bd7 100644 --- a/website/www.scm +++ b/website/www.scm @@ -105,6 +105,15 @@ character." 170) "…"))) +(define* (screenshot image + #:key + (directory (latest-guix-version)) + (alt "")) + `(a (@ (href ,(screenshot-url directory image))) + (img (@ (src ,(thumb-url image)) + (class "screenshot-thumb") + (alt ,alt))))) + (define (main-page) `(html (@ (lang "en")) ,(html-page-header "Home" #:css "index.css") @@ -199,30 +208,20 @@ packaging API. ") (class "h-separator") (alt ""))) (div (@ (id "screens-box")) - (a (@ (href ,(screenshot-url "0.8.2" "grub-menu.png"))) - (img (@ (src ,(thumb-url "grub-menu-thumb.png")) - (class "screenshot-thumb") - (alt "GRUB menu")))) - (a (@ (href ,(screenshot-url "0.8.2" "slim.png"))) - (img (@ (src ,(thumb-url "slim-thumb.png")) - (class "screenshot-thumb") - (alt "Slim login manager")))) - (a (@ (href ,(screenshot-url "0.8.2" "windowmaker+icecat+inkscape.png"))) - (img (@ (src ,(thumb-url "windowmaker+icecat+inkscape-thumb.png")) - (class "screenshot-thumb") - (alt "Windowmaker, Icecat, and Inkscape")))) - (a (@ (href ,(screenshot-url "0.8.2" "user-interfaces.png"))) - (img (@ (src ,(thumb-url "user-interfaces-thumb.png")) - (class "screenshot-thumb") - (alt "mplayer and xterm")))) - (a (@ (href ,(screenshot-url "0.8.2" "emacs-ui-packages.png"))) - (img (@ (src ,(thumb-url "emacs-ui-packages-thumb.png")) - (class "screenshot-thumb") - (alt "Emacs user interface to the package manager.")))) - (a (@ (href ,(screenshot-url "0.8.2" "emacs-ui-generations.png"))) - (img (@ (src ,(thumb-url "emacs-ui-generations-thumb.png")) - (class "screenshot-thumb") - (alt "Emacs user interface generations."))))) + ,@(map (lambda (file alt) + (screenshot file #:alt alt)) + '("guixsd-grub.png" + "guixsd-slim.png" + "guix-screenie.png" + ;; "guixsd-xfce-emacs.png" + "guixsd-xfce-icecat-emacs.png" + "guixsd-xfce-mines.png") + '("GRUB menu" + "Graphical log-in screen" + "Emacs, IceCat, and Evince" + ;; "Xfce and Emacs" + "Xfce, IceCat, and Emacs" + "Xfce and GNOME Mines"))) (p (a (@ (href ,(base-url "contribute") ) (class "hlink-yellow-boxed")) "Help us package more software →"))) diff --git a/website/www/utils.scm b/website/www/utils.scm index e12eabd..6cf1572 100644 --- a/website/www/utils.scm +++ b/website/www/utils.scm @@ -49,7 +49,7 @@ (string-append (static-base-url) "img/" file)) (define (thumb-url file) - (string-append (image-url "screenshots/") file)) + (string-append (image-url "screenshots/thumbs/") file)) (define (screenshot-url version file) (string-append (guix-url "screenshots/") version "/" file)) |