From aca19ac292b6a5ffb6d255772cc09a5dbc243d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20M=C3=A4der?= Date: Tue, 5 Apr 2022 15:24:20 +0200 Subject: [PATCH] Update docs and deb --- .debmake | 8 +- .debmake.changelog | 26 ++-- .debmake.postinst | 2 +- README.md | 88 ++------------ doc/etc/lightdm/lightdm-webkit2-greeter.conf | 35 ------ doc/etc/lightdm/lightdm.conf | 6 +- doc/etc/lightdm/web-greeter.yml | 118 +++++++++++++++++++ index.theme | 2 +- 8 files changed, 154 insertions(+), 131 deletions(-) delete mode 100644 doc/etc/lightdm/lightdm-webkit2-greeter.conf create mode 100644 doc/etc/lightdm/web-greeter.yml diff --git a/.debmake b/.debmake index 29f3cd4..7028252 100644 --- a/.debmake +++ b/.debmake @@ -1,9 +1,9 @@ -TARGET="usr/share/lightdm-webkit/themes/luminosity" +TARGET="usr/share/web-greeter/themes/luminosity" HOMEPAGE="https://github.com/rda0/web-greeter-theme-luminosity.git" -DEPENDS="lightdm-webkit2-greeter" -PREDEPENDS="python3, graphicsmagick-imagemagick-compat | imagemagick-6.q16" +DEPENDS="web-greeter" +PREDEPENDS="python3, graphicsmagick" SUGGESTS="light-locker" DESCRIPTION_SHORT="Customizable LightDM Web Greeter theme" DESCRIPTION_LONG="This dark theme was built for use on Linux Workstations at the Department of Physics ETH Zurich, because there was no suitable theme available that would allow us to use it in combination with a central authentication provider like LDAP or Kerberos. Other themes present a list of users to select from, as it is done with the default LightDM configuration, which does not scale with thousands of LDAP user accounts" SECTION="x11" -VERSION="0.8.7" +VERSION="1.0.0" diff --git a/.debmake.changelog b/.debmake.changelog index 931b70c..2daf9be 100644 --- a/.debmake.changelog +++ b/.debmake.changelog @@ -1,16 +1,22 @@ -lightdm-webkit2-greeter-theme-luminosity (0.8.7-1) bionic; urgency=medium +web-greeter-theme-luminosity (1.0.0-1) jammy; urgency=medium + + * Adapt for web-greeter 3.4.0. + + -- Sven Mäder (rda) Tue, 05 Apr 2022 14:44:00 +0200 + +web-greeter-theme-luminosity (0.8.7-1) bionic; urgency=medium * New upstream release. -- Sven Mäder (rda) Fri, 06 Sep 2019 10:47:48 +0200 -lightdm-webkit2-greeter-theme-luminosity (0.8.6-2) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.6-2) bionic; urgency=medium * Fix package dependencies. -- Sven Mäder (rda) Wed, 05 Dec 2018 12:44:26 +0100 -lightdm-webkit2-greeter-theme-luminosity (0.8.6-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.6-1) bionic; urgency=medium * Add exception handling. * Fix race condition with async config loading. @@ -22,43 +28,43 @@ lightdm-webkit2-greeter-theme-luminosity (0.8.6-1) bionic; urgency=medium -- Sven Mäder (rda) Wed, 05 Dec 2018 12:18:40 +0100 -lightdm-webkit2-greeter-theme-luminosity (0.8.5-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.5-1) bionic; urgency=medium * Fix theme loading bug. -- Sven Mäder (rda) Fri, 30 Nov 2018 13:30:22 +0100 -lightdm-webkit2-greeter-theme-luminosity (0.8.4-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.4-1) bionic; urgency=medium * Add greeter error handling. -- Sven Mäder (rda) Fri, 30 Nov 2018 12:03:58 +0100 -lightdm-webkit2-greeter-theme-luminosity (0.8.3-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.3-1) bionic; urgency=medium * New upstream release. -- Sven Mäder (rda) Thu, 12 Jul 2018 16:50:12 +0200 -lightdm-webkit2-greeter-theme-luminosity (0.8.2-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.2-1) bionic; urgency=medium * New upstream release. -- Sven Mäder (rda) Tue, 10 Jul 2018 16:10:09 +0200 -lightdm-webkit2-greeter-theme-luminosity (0.8.1-2) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.1-2) bionic; urgency=medium * Add missing config file background.json. -- Sven Mäder (rda) Mon, 09 Jul 2018 15:59:13 +0200 -lightdm-webkit2-greeter-theme-luminosity (0.8.1-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.1-1) bionic; urgency=medium * New upstream release. -- Sven Mäder (rda) Fri, 29 Jun 2018 14:03:24 +0200 -lightdm-webkit2-greeter-theme-luminosity (0.8.0-1) bionic; urgency=medium +web-greeter-theme-luminosity (0.8.0-1) bionic; urgency=medium * Initial release. diff --git a/.debmake.postinst b/.debmake.postinst index b0f46d0..cef50f0 100644 --- a/.debmake.postinst +++ b/.debmake.postinst @@ -2,7 +2,7 @@ set -e -SCRIPT="/usr/share/lightdm-webkit/themes/luminosity/generate-images.py" +SCRIPT="/usr/share/web-greeter/themes/luminosity/generate-images.py" [ -x ${SCRIPT} ] && ${SCRIPT} diff --git a/README.md b/README.md index dfe1a2c..cf4d946 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Many thanks to the following guys for their support on this project. - Shows useful static information - Short feedback after authenticating (success/failure) - Drop-down list for session selection -- Wallpaper changer (todo) +- Wallpaper changer ## Screenshots @@ -74,13 +74,13 @@ To select luminosity as default theme just change the `greeter.theme` property i ``` greeter: - debug_mode: False - detect_theme_errors: True - screensaver_timeout: 300 - secure_mode: True - theme: luminosity - icon_theme: - time_language: + debug_mode: False + detect_theme_errors: True + screensaver_timeout: 300 + secure_mode: True + theme: luminosity + icon_theme: + time_language: ``` Now restart `lightdm`: @@ -89,73 +89,7 @@ Now restart `lightdm`: systemctl restart lightdm.service ``` -## Configuration - -The theme configuration is read from `branding.theme` (optional), example: - -```yaml -branding: - background_images_dir: /usr/share/backgrounds - logo_image: /usr/share/web-greeter/themes/default/img/antergos-logo-user.png - user_image: /usr/share/web-greeter/themes/default/img/antergos.png - theme: - username_area: - title: Authentication - title_locked: Authentication - comment: Enter your Account name to sign in - comment_locked: Enter your Account name to unlock / sign in - password_area: - comment: Please enter your Password - active_sessions_label: Locked Sessions - info_top: - - label: OS Version - value: Ubuntu 22.04 Jammy - - label: Authorized Users - value: Student - - label: Managed by - value: ISG DPHYS - info_bottom: - - label: Documentation - value: readme.phys.ethz.ch - - label: Announcements - value: isg.phys.ethz.ch - - label: Chat - value: chat.phys.ethz.ch - - label: Mail - value: isg@phys.ethz.ch - - label: Tel - value: '+41 44 633 26 68' - banner: dphys - logo: ethz - styles: - panel: - position: 'absolute' - width: '450px' - top: '50%' - left: '50%' - transform: 'translate(-50%, -50%)' - content: - height: '541px' - panels_shadow: - boxShadow: '0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2)' - panels_color: - background: 'rgba(0,0,0,.7)' - color: '#fff' - status_panel: - background: 'rgba(143,0,17,.6)' - color: '#fff' - status_panel_granted: - background: 'rgba(66,133,244,.6)' - status_panel_granted_green: - background: 'rgba(66,244,95,.6)' - status_panel_denied: - background: 'rgba(143,0,17,.6)' - contentFooter: - paddingTop: '0px' - background: - backgroundPosition: 'center' - backgroundSize: 'cover' -``` +The theme can be customized in `branding.theme` (optional), see [docs](https://github.com/rda0/web-greeter-theme-luminosity/blob/master/doc/etc/lightdm/web-greeter.conf) for example. To generate thumbnails run `generate-images.py` (requires `graphicsmagick`). ## Using light-locker @@ -209,5 +143,5 @@ To uninstall, simply restore the `greeter-session` property of the `/etc/lightdm You may also want to: -- Remove the folder `luminosity` which was created in `/usr/share/lightdm-webkit/themes/` -- Restore the `webkit-theme` property of the `/etc/lightdm/lightdm-webkit-greeter.conf` file +- Remove the folder `luminosity` which was created in `/usr/share/web-greeter/themes/` +- Restore the `webkit-theme` property of the `/etc/lightdm/web-greeter.conf` file diff --git a/doc/etc/lightdm/lightdm-webkit2-greeter.conf b/doc/etc/lightdm/lightdm-webkit2-greeter.conf deleted file mode 100644 index c1ad6d7..0000000 --- a/doc/etc/lightdm/lightdm-webkit2-greeter.conf +++ /dev/null @@ -1,35 +0,0 @@ -# -# [greeter] -# debug_mode = Greeter theme debug mode. -# detect_theme_errors = Provide an option to load a fallback theme when theme errors are detected. -# screensaver_timeout = Blank the screen after this many seconds of inactivity. -# secure_mode = Don't allow themes to make remote http requests. -# time_format = A moment.js format string so the greeter can generate localized time for display. -# time_language = Language to use when displaying the time or "auto" to use the system's language. -# webkit_theme = Webkit theme to use. -# -# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format/ -# - -[greeter] -debug_mode = true -detect_theme_errors = true -screensaver_timeout = 1800 -secure_mode = true -time_format = LT -time_language = auto -webkit_theme = luminosity - -# -# [branding] -# background_images = Path to directory that contains background images for use by themes. -# logo = Path to logo image for use by greeter themes. -# user_image = Default user image/avatar. This is used by themes for users that have no .face image. -# -# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home) -# - -[branding] -background_images = /usr/share/backgrounds -logo = /usr/share/help/C/ubuntu-help/figures/ubuntu-logo.png -user_image = /usr/share/pixmaps/faces/sunset.jpg diff --git a/doc/etc/lightdm/lightdm.conf b/doc/etc/lightdm/lightdm.conf index b13dc6d..61a0924 100644 --- a/doc/etc/lightdm/lightdm.conf +++ b/doc/etc/lightdm/lightdm.conf @@ -1,7 +1,7 @@ -[SeatDefaults] -greeter-session=lightdm-webkit2-greeter +[Seat:*] +greeter-session=web-greeter greeter-show-manual-login=true greeter-hide-users=true -user-session=ubuntu +user-session=gnome allow-guest=false # display-setup-script=xrandr --output DP-0 --primary diff --git a/doc/etc/lightdm/web-greeter.yml b/doc/etc/lightdm/web-greeter.yml new file mode 100644 index 0000000..fe7ce62 --- /dev/null +++ b/doc/etc/lightdm/web-greeter.yml @@ -0,0 +1,118 @@ +# +# branding: +# background_images_dir: Path to directory that contains background images for use by themes. +# logo_image: Path to logo image for use by greeter themes. +# user_image: Default user image/avatar. This is used by themes when user has no .face image. +# +# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home) +# +branding: + background_images_dir: /usr/share/backgrounds + logo_image: /usr/share/web-greeter/themes/default/img/antergos-logo-user.png + user_image: /usr/share/web-greeter/themes/default/img/antergos.png + theme: + username_area: + title: Authentication + title_locked: Authentication + comment: Enter your Account name to sign in + comment_locked: Enter your Account name to unlock / sign in + password_area: + comment: Please enter your Password + active_sessions_label: Locked Sessions + info_top: + - label: OS Version + value: Ubuntu 22.04 Jammy + - label: Authorized Users + value: Student + - label: Managed by + value: ISG DPHYS + info_bottom: + - label: Documentation + value: readme.phys.ethz.ch + - label: Announcements + value: isg.phys.ethz.ch + - label: Chat + value: chat.phys.ethz.ch + - label: Mail + value: isg@phys.ethz.ch + - label: Tel + value: '+41 44 633 26 68' + banner: dphys + logo: ethz + styles: + panel: + position: 'absolute' + width: '450px' + top: '50%' + left: '50%' + transform: 'translate(-50%, -50%)' + content: + height: '541px' + panels_shadow: + boxShadow: '0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2)' + panels_color: + background: 'rgba(0,0,0,.7)' + color: '#fff' + status_panel: + background: 'rgba(143,0,17,.6)' + color: '#fff' + status_panel_granted: + background: 'rgba(66,133,244,.6)' + status_panel_granted_green: + background: 'rgba(66,244,95,.6)' + status_panel_denied: + background: 'rgba(143,0,17,.6)' + contentFooter: + paddingTop: '0px' + background: + backgroundPosition: 'center' + backgroundSize: 'cover' + +# +# greeter: +# debug_mode: Enable debug mode for the greeter as well as greeter themes. +# detect_theme_errors: Provide an option to load a fallback theme when theme errors are detected. +# screensaver_timeout: Blank the screen after this many seconds of inactivity. +# secure_mode: Don't allow themes to make remote http requests. +# theme: Greeter theme to use. +# icon_theme: Icon/cursor theme to use, located in /usr/share/icons/, i.e. "Adwaita". Set to None to use default icon theme. +# time_language: Language to use when displaying the date or time, i.e. "en-us", "es-419", "ko", "ja". Set to None to use system's language. +# +# NOTE: See IANA subtags registry for time_language options: https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry +# +greeter: + debug_mode: False + detect_theme_errors: True + screensaver_timeout: 300 + secure_mode: True + theme: luminosity + icon_theme: + time_language: + +# +# layouts A list of preferred layouts to use +# - us "en_us" xkb layout +# - latam "es_latam" xkb layout +# - gb dvorak "en_gb_dvorak" xkb layout +# +# NOTE: See "man xkeyboard-config" for posible layout values. Also, see posible layouts here: https://web.archive.org/web/20161203032703/http://pastebin.com/v2vCPHjs +# A layout value is composed in the main layout, like "us" or "latam", and its variant, like "dvorak", "colemak", "mac" or "mac_intl" +# +layouts: + - us + - latam + +# +# features: +# battery: Enable greeter and themes to get battery status. +# backlight: +# enabled: Enable greeter and themes to control display backlight. +# value: The amount to increase/decrease brightness by greeter. +# steps: How many steps are needed to do the change. 0 for instant change. +# +features: + battery: False + backlight: + enabled: False + value: 10 + steps: 0 diff --git a/index.theme b/index.theme index 6a7ef79..8da3cec 100644 --- a/index.theme +++ b/index.theme @@ -1,6 +1,6 @@ [theme] name=Luminosity description=Luminosity Theme -engine=lightdm-webkit2-greeter +engine=web-greeter url=index.html session=ubuntu