[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: website: main: Update screenshots.
|
From: |
Ludovic Courtès |
|
Subject: |
04/05: website: main: Update screenshots. |
|
Date: |
Thu, 14 May 2015 12:09:43 +0000 |
civodul pushed a commit to branch master
in repository guix-artwork.
commit d742e4a14dc238f96ed07faa674e52eb28c14c69
Author: Ludovic Courtès <address@hidden>
Date: Thu May 14 13:42:45 2015 +0200
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.
---
.../img/screenshots/emacs-ui-generations-thumb.png | Bin 70851 -> 0 bytes
.../img/screenshots/emacs-ui-packages-thumb.png | Bin 47960 -> 0 bytes
.../base/img/screenshots/grub-menu-thumb.png | Bin 33536 -> 0 bytes
website/static/base/img/screenshots/slim-thumb.png | Bin 70304 -> 0 bytes
.../base/img/screenshots/thumbs/guix-screenie.png | Bin 0 -> 56958 bytes
.../base/img/screenshots/thumbs/guixsd-grub.png | Bin 0 -> 31270 bytes
.../base/img/screenshots/thumbs/guixsd-slim.png | Bin 0 -> 34368 bytes
.../img/screenshots/thumbs/guixsd-xfce-emacs.png | Bin 0 -> 32120 bytes
.../thumbs/guixsd-xfce-icecat-emacs.png | Bin 0 -> 50290 bytes
.../img/screenshots/thumbs/guixsd-xfce-mines.png | Bin 0 -> 36589 bytes
.../base/img/screenshots/user-interfaces-thumb.png | Bin 63154 -> 0 bytes
.../windowmaker+icecat+inkscape-thumb.png | Bin 63772 -> 0 bytes
website/www.scm | 47 ++++++++++----------
website/www/utils.scm | 2 +-
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
deleted file mode 100644
index c11c611..0000000
Binary files
a/website/static/base/img/screenshots/emacs-ui-generations-thumb.png and
/dev/null differ
diff --git a/website/static/base/img/screenshots/emacs-ui-packages-thumb.png
b/website/static/base/img/screenshots/emacs-ui-packages-thumb.png
deleted file mode 100644
index e1632ab..0000000
Binary files a/website/static/base/img/screenshots/emacs-ui-packages-thumb.png
and /dev/null differ
diff --git a/website/static/base/img/screenshots/grub-menu-thumb.png
b/website/static/base/img/screenshots/grub-menu-thumb.png
deleted file mode 100644
index 41ade6b..0000000
Binary files a/website/static/base/img/screenshots/grub-menu-thumb.png and
/dev/null differ
diff --git a/website/static/base/img/screenshots/slim-thumb.png
b/website/static/base/img/screenshots/slim-thumb.png
deleted file mode 100644
index 9be13d3..0000000
Binary files a/website/static/base/img/screenshots/slim-thumb.png and /dev/null
differ
diff --git a/website/static/base/img/screenshots/thumbs/guix-screenie.png
b/website/static/base/img/screenshots/thumbs/guix-screenie.png
new file mode 100644
index 0000000..0686d36
Binary files /dev/null and
b/website/static/base/img/screenshots/thumbs/guix-screenie.png differ
diff --git a/website/static/base/img/screenshots/thumbs/guixsd-grub.png
b/website/static/base/img/screenshots/thumbs/guixsd-grub.png
new file mode 100644
index 0000000..7696bd3
Binary files /dev/null and
b/website/static/base/img/screenshots/thumbs/guixsd-grub.png differ
diff --git a/website/static/base/img/screenshots/thumbs/guixsd-slim.png
b/website/static/base/img/screenshots/thumbs/guixsd-slim.png
new file mode 100644
index 0000000..02d3da6
Binary files /dev/null and
b/website/static/base/img/screenshots/thumbs/guixsd-slim.png differ
diff --git a/website/static/base/img/screenshots/thumbs/guixsd-xfce-emacs.png
b/website/static/base/img/screenshots/thumbs/guixsd-xfce-emacs.png
new file mode 100644
index 0000000..b3950e0
Binary files /dev/null and
b/website/static/base/img/screenshots/thumbs/guixsd-xfce-emacs.png differ
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
new file mode 100644
index 0000000..9ec9caf
Binary files /dev/null and
b/website/static/base/img/screenshots/thumbs/guixsd-xfce-icecat-emacs.png differ
diff --git a/website/static/base/img/screenshots/thumbs/guixsd-xfce-mines.png
b/website/static/base/img/screenshots/thumbs/guixsd-xfce-mines.png
new file mode 100644
index 0000000..020ace2
Binary files /dev/null and
b/website/static/base/img/screenshots/thumbs/guixsd-xfce-mines.png differ
diff --git a/website/static/base/img/screenshots/user-interfaces-thumb.png
b/website/static/base/img/screenshots/user-interfaces-thumb.png
deleted file mode 100644
index 1a06db3..0000000
Binary files a/website/static/base/img/screenshots/user-interfaces-thumb.png
and /dev/null differ
diff --git
a/website/static/base/img/screenshots/windowmaker+icecat+inkscape-thumb.png
b/website/static/base/img/screenshots/windowmaker+icecat+inkscape-thumb.png
deleted file mode 100644
index 200bca5..0000000
Binary files
a/website/static/base/img/screenshots/windowmaker+icecat+inkscape-thumb.png and
/dev/null differ
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))