Skip to content

Commit aca19ac

Browse files
committed
Update docs and deb
1 parent 41834db commit aca19ac

File tree

8 files changed

+154
-131
lines changed

8 files changed

+154
-131
lines changed

.debmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
TARGET="usr/share/lightdm-webkit/themes/luminosity"
1+
TARGET="usr/share/web-greeter/themes/luminosity"
22
HOMEPAGE="https://github.com/rda0/web-greeter-theme-luminosity.git"
3-
DEPENDS="lightdm-webkit2-greeter"
4-
PREDEPENDS="python3, graphicsmagick-imagemagick-compat | imagemagick-6.q16"
3+
DEPENDS="web-greeter"
4+
PREDEPENDS="python3, graphicsmagick"
55
SUGGESTS="light-locker"
66
DESCRIPTION_SHORT="Customizable LightDM Web Greeter theme"
77
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"
88
SECTION="x11"
9-
VERSION="0.8.7"
9+
VERSION="1.0.0"

.debmake.changelog

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
lightdm-webkit2-greeter-theme-luminosity (0.8.7-1) bionic; urgency=medium
1+
web-greeter-theme-luminosity (1.0.0-1) jammy; urgency=medium
2+
3+
* Adapt for web-greeter 3.4.0.
4+
5+
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Tue, 05 Apr 2022 14:44:00 +0200
6+
7+
web-greeter-theme-luminosity (0.8.7-1) bionic; urgency=medium
28

39
* New upstream release.
410

511
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Fri, 06 Sep 2019 10:47:48 +0200
612

7-
lightdm-webkit2-greeter-theme-luminosity (0.8.6-2) bionic; urgency=medium
13+
web-greeter-theme-luminosity (0.8.6-2) bionic; urgency=medium
814

915
* Fix package dependencies.
1016

1117
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Wed, 05 Dec 2018 12:44:26 +0100
1218

13-
lightdm-webkit2-greeter-theme-luminosity (0.8.6-1) bionic; urgency=medium
19+
web-greeter-theme-luminosity (0.8.6-1) bionic; urgency=medium
1420

1521
* Add exception handling.
1622
* Fix race condition with async config loading.
@@ -22,43 +28,43 @@ lightdm-webkit2-greeter-theme-luminosity (0.8.6-1) bionic; urgency=medium
2228

2329
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Wed, 05 Dec 2018 12:18:40 +0100
2430

25-
lightdm-webkit2-greeter-theme-luminosity (0.8.5-1) bionic; urgency=medium
31+
web-greeter-theme-luminosity (0.8.5-1) bionic; urgency=medium
2632

2733
* Fix theme loading bug.
2834

2935
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Fri, 30 Nov 2018 13:30:22 +0100
3036

31-
lightdm-webkit2-greeter-theme-luminosity (0.8.4-1) bionic; urgency=medium
37+
web-greeter-theme-luminosity (0.8.4-1) bionic; urgency=medium
3238

3339
* Add greeter error handling.
3440

3541
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Fri, 30 Nov 2018 12:03:58 +0100
3642

37-
lightdm-webkit2-greeter-theme-luminosity (0.8.3-1) bionic; urgency=medium
43+
web-greeter-theme-luminosity (0.8.3-1) bionic; urgency=medium
3844

3945
* New upstream release.
4046

4147
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Thu, 12 Jul 2018 16:50:12 +0200
4248

43-
lightdm-webkit2-greeter-theme-luminosity (0.8.2-1) bionic; urgency=medium
49+
web-greeter-theme-luminosity (0.8.2-1) bionic; urgency=medium
4450

4551
* New upstream release.
4652

4753
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Tue, 10 Jul 2018 16:10:09 +0200
4854

49-
lightdm-webkit2-greeter-theme-luminosity (0.8.1-2) bionic; urgency=medium
55+
web-greeter-theme-luminosity (0.8.1-2) bionic; urgency=medium
5056

5157
* Add missing config file background.json.
5258

5359
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Mon, 09 Jul 2018 15:59:13 +0200
5460

55-
lightdm-webkit2-greeter-theme-luminosity (0.8.1-1) bionic; urgency=medium
61+
web-greeter-theme-luminosity (0.8.1-1) bionic; urgency=medium
5662

5763
* New upstream release.
5864

5965
-- Sven Mäder (rda) <maeder@phys.ethz.ch> Fri, 29 Jun 2018 14:03:24 +0200
6066

61-
lightdm-webkit2-greeter-theme-luminosity (0.8.0-1) bionic; urgency=medium
67+
web-greeter-theme-luminosity (0.8.0-1) bionic; urgency=medium
6268

6369
* Initial release.
6470

.debmake.postinst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
SCRIPT="/usr/share/lightdm-webkit/themes/luminosity/generate-images.py"
5+
SCRIPT="/usr/share/web-greeter/themes/luminosity/generate-images.py"
66

77
[ -x ${SCRIPT} ] && ${SCRIPT}
88

README.md

Lines changed: 11 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Many thanks to the following guys for their support on this project.
2828
- Shows useful static information
2929
- Short feedback after authenticating (success/failure)
3030
- Drop-down list for session selection
31-
- Wallpaper changer (todo)
31+
- Wallpaper changer
3232

3333
## Screenshots
3434

@@ -74,13 +74,13 @@ To select luminosity as default theme just change the `greeter.theme` property i
7474

7575
```
7676
greeter:
77-
debug_mode: False
78-
detect_theme_errors: True
79-
screensaver_timeout: 300
80-
secure_mode: True
81-
theme: luminosity
82-
icon_theme:
83-
time_language:
77+
debug_mode: False
78+
detect_theme_errors: True
79+
screensaver_timeout: 300
80+
secure_mode: True
81+
theme: luminosity
82+
icon_theme:
83+
time_language:
8484
```
8585

8686
Now restart `lightdm`:
@@ -89,73 +89,7 @@ Now restart `lightdm`:
8989
systemctl restart lightdm.service
9090
```
9191

92-
## Configuration
93-
94-
The theme configuration is read from `branding.theme` (optional), example:
95-
96-
```yaml
97-
branding:
98-
background_images_dir: /usr/share/backgrounds
99-
logo_image: /usr/share/web-greeter/themes/default/img/antergos-logo-user.png
100-
user_image: /usr/share/web-greeter/themes/default/img/antergos.png
101-
theme:
102-
username_area:
103-
title: Authentication
104-
title_locked: Authentication
105-
comment: Enter your Account name to sign in
106-
comment_locked: Enter your Account name to unlock / sign in
107-
password_area:
108-
comment: Please enter your Password
109-
active_sessions_label: Locked Sessions
110-
info_top:
111-
- label: OS Version
112-
value: Ubuntu 22.04 Jammy
113-
- label: Authorized Users
114-
value: Student
115-
- label: Managed by
116-
value: ISG DPHYS
117-
info_bottom:
118-
- label: Documentation
119-
value: readme.phys.ethz.ch
120-
- label: Announcements
121-
value: isg.phys.ethz.ch
122-
- label: Chat
123-
value: chat.phys.ethz.ch
124-
- label: Mail
125-
value: isg@phys.ethz.ch
126-
- label: Tel
127-
value: '+41 44 633 26 68'
128-
banner: dphys
129-
logo: ethz
130-
styles:
131-
panel:
132-
position: 'absolute'
133-
width: '450px'
134-
top: '50%'
135-
left: '50%'
136-
transform: 'translate(-50%, -50%)'
137-
content:
138-
height: '541px'
139-
panels_shadow:
140-
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)'
141-
panels_color:
142-
background: 'rgba(0,0,0,.7)'
143-
color: '#fff'
144-
status_panel:
145-
background: 'rgba(143,0,17,.6)'
146-
color: '#fff'
147-
status_panel_granted:
148-
background: 'rgba(66,133,244,.6)'
149-
status_panel_granted_green:
150-
background: 'rgba(66,244,95,.6)'
151-
status_panel_denied:
152-
background: 'rgba(143,0,17,.6)'
153-
contentFooter:
154-
paddingTop: '0px'
155-
background:
156-
backgroundPosition: 'center'
157-
backgroundSize: 'cover'
158-
```
92+
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`).
15993

16094
## Using light-locker
16195

@@ -209,5 +143,5 @@ To uninstall, simply restore the `greeter-session` property of the `/etc/lightdm
209143

210144
You may also want to:
211145

212-
- Remove the folder `luminosity` which was created in `/usr/share/lightdm-webkit/themes/`
213-
- Restore the `webkit-theme` property of the `/etc/lightdm/lightdm-webkit-greeter.conf` file
146+
- Remove the folder `luminosity` which was created in `/usr/share/web-greeter/themes/`
147+
- Restore the `webkit-theme` property of the `/etc/lightdm/web-greeter.conf` file

doc/etc/lightdm/lightdm-webkit2-greeter.conf

Lines changed: 0 additions & 35 deletions
This file was deleted.

doc/etc/lightdm/lightdm.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[SeatDefaults]
2-
greeter-session=lightdm-webkit2-greeter
1+
[Seat:*]
2+
greeter-session=web-greeter
33
greeter-show-manual-login=true
44
greeter-hide-users=true
5-
user-session=ubuntu
5+
user-session=gnome
66
allow-guest=false
77
# display-setup-script=xrandr --output DP-0 --primary

doc/etc/lightdm/web-greeter.yml

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
#
2+
# branding:
3+
# background_images_dir: Path to directory that contains background images for use by themes.
4+
# logo_image: Path to logo image for use by greeter themes.
5+
# user_image: Default user image/avatar. This is used by themes when user has no .face image.
6+
#
7+
# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home)
8+
#
9+
branding:
10+
background_images_dir: /usr/share/backgrounds
11+
logo_image: /usr/share/web-greeter/themes/default/img/antergos-logo-user.png
12+
user_image: /usr/share/web-greeter/themes/default/img/antergos.png
13+
theme:
14+
username_area:
15+
title: Authentication
16+
title_locked: Authentication
17+
comment: Enter your Account name to sign in
18+
comment_locked: Enter your Account name to unlock / sign in
19+
password_area:
20+
comment: Please enter your Password
21+
active_sessions_label: Locked Sessions
22+
info_top:
23+
- label: OS Version
24+
value: Ubuntu 22.04 Jammy
25+
- label: Authorized Users
26+
value: Student
27+
- label: Managed by
28+
value: ISG DPHYS
29+
info_bottom:
30+
- label: Documentation
31+
value: readme.phys.ethz.ch
32+
- label: Announcements
33+
value: isg.phys.ethz.ch
34+
- label: Chat
35+
value: chat.phys.ethz.ch
36+
- label: Mail
37+
value: isg@phys.ethz.ch
38+
- label: Tel
39+
value: '+41 44 633 26 68'
40+
banner: dphys
41+
logo: ethz
42+
styles:
43+
panel:
44+
position: 'absolute'
45+
width: '450px'
46+
top: '50%'
47+
left: '50%'
48+
transform: 'translate(-50%, -50%)'
49+
content:
50+
height: '541px'
51+
panels_shadow:
52+
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)'
53+
panels_color:
54+
background: 'rgba(0,0,0,.7)'
55+
color: '#fff'
56+
status_panel:
57+
background: 'rgba(143,0,17,.6)'
58+
color: '#fff'
59+
status_panel_granted:
60+
background: 'rgba(66,133,244,.6)'
61+
status_panel_granted_green:
62+
background: 'rgba(66,244,95,.6)'
63+
status_panel_denied:
64+
background: 'rgba(143,0,17,.6)'
65+
contentFooter:
66+
paddingTop: '0px'
67+
background:
68+
backgroundPosition: 'center'
69+
backgroundSize: 'cover'
70+
71+
#
72+
# greeter:
73+
# debug_mode: Enable debug mode for the greeter as well as greeter themes.
74+
# detect_theme_errors: Provide an option to load a fallback theme when theme errors are detected.
75+
# screensaver_timeout: Blank the screen after this many seconds of inactivity.
76+
# secure_mode: Don't allow themes to make remote http requests.
77+
# theme: Greeter theme to use.
78+
# icon_theme: Icon/cursor theme to use, located in /usr/share/icons/, i.e. "Adwaita". Set to None to use default icon theme.
79+
# 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.
80+
#
81+
# NOTE: See IANA subtags registry for time_language options: https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
82+
#
83+
greeter:
84+
debug_mode: False
85+
detect_theme_errors: True
86+
screensaver_timeout: 300
87+
secure_mode: True
88+
theme: luminosity
89+
icon_theme:
90+
time_language:
91+
92+
#
93+
# layouts A list of preferred layouts to use
94+
# - us "en_us" xkb layout
95+
# - latam "es_latam" xkb layout
96+
# - gb dvorak "en_gb_dvorak" xkb layout
97+
#
98+
# NOTE: See "man xkeyboard-config" for posible layout values. Also, see posible layouts here: https://web.archive.org/web/20161203032703/http://pastebin.com/v2vCPHjs
99+
# A layout value is composed in the main layout, like "us" or "latam", and its variant, like "dvorak", "colemak", "mac" or "mac_intl"
100+
#
101+
layouts:
102+
- us
103+
- latam
104+
105+
#
106+
# features:
107+
# battery: Enable greeter and themes to get battery status.
108+
# backlight:
109+
# enabled: Enable greeter and themes to control display backlight.
110+
# value: The amount to increase/decrease brightness by greeter.
111+
# steps: How many steps are needed to do the change. 0 for instant change.
112+
#
113+
features:
114+
battery: False
115+
backlight:
116+
enabled: False
117+
value: 10
118+
steps: 0

index.theme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[theme]
22
name=Luminosity
33
description=Luminosity Theme
4-
engine=lightdm-webkit2-greeter
4+
engine=web-greeter
55
url=index.html
66
session=ubuntu

0 commit comments

Comments
 (0)