From: Michael R Sweet Date: Sun, 30 Mar 2025 13:00:34 +0000 (-0400) Subject: Update the web interface templates for better usability/discoverability X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=788f5dbced09c6576d03958ef3d7113e1456cb54;p=thirdparty%2Fcups.git Update the web interface templates for better usability/discoverability (Issue #1207) - Made the navbar larger with more space around the link/title content. - Now use the OpenPrinting CUPS logo rather than the text in the navbar. - Added proper section titles and links to common admin functions on the home page. - Translations copied from the admin template, may require some tweaking... --- diff --git a/CHANGES.md b/CHANGES.md index 72aa7c48a4..e55ef187d6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -70,6 +70,8 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD) `--client-name` options. - Updated `cupsEnumDests` and `cupsGetDests` to support printer browsing and filtering options in client.conf (Issue #1180) +- Updated the CUPS web interface to make administrative tasks more discoverable + (Issue #1207) - Deprecated the "page-border" Job Template attribute (Issue #1020) - Removed the `cups-config` utility (use `pkg-config` instead) - Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error diff --git a/doc/cups.css b/doc/cups.css index a51d123bfc..6064733e10 100644 --- a/doc/cups.css +++ b/doc/cups.css @@ -12,6 +12,7 @@ width: 100%; } .cups-header ul { + font-size: 20px; list-style: none; margin: 0; -webkit-margin-before: 0; @@ -25,7 +26,10 @@ } .cups-header a { display: block; - padding: 5px 10px !important; + padding: 18px 30px !important; +} +.cups-header a.img { + padding: 12px 24px !important; } .cups-header a:link, .cups-header a:visited { color: white !important; @@ -44,6 +48,7 @@ } .cups-body { + margin-top: 40px; padding: 40px 20px; } .row .cups-body { diff --git a/doc/da/index.html.in b/doc/da/index.html.in index 4708c1422b..e7ae9f6690 100644 --- a/doc/da/index.html.in +++ b/doc/da/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Hjem
Administration
Klasser

CUPS @CUPS_VERSION@

CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af OpenPrinting til LinuxÂ® og andre UNIX^®-lignende styresystemer. CUPS uses IPP Everywhereâ¢ to support printing to local and network printers

Server

+ + + + + +

CUPS for brugere

Overblik over CUPS

Kommandolinjeudskrivning og tilvalg

CUPS for administratorer

TilfÃ¸jelse af printere og klasser

HÃ¥ndtering af driftspolitikker

Brug af netvÃ¦rksprintere

@@ -41,12 +49,12 @@

cupsd.conf-reference

CUPS for udviklere

CUPS-programmeringsmanual

Filter- og backendprogrammering

- + diff --git a/doc/de/index.html.in b/doc/de/index.html.in index d208608bea..10faa7fe91 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Startseite
Verwaltung
Klassen

OpenPrinting CUPS @CUPS_VERSION@

CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch OpenPrinting fÃ¼r LinuxÂ® und andere UNIXÂ®-artige Betriebssysteme. CUPS benutzt IPP Everywhereâ¢ zur UnterstÃ¼tzung lokaler und Netzwerkdrucker.

Server

+ + + + + +

CUPS fÃ¼r Benutzer

Ãberblick Ã¼ber CUPS

Befehlszeilen-Druck und Optionen

CUPS fÃ¼r Administratoren

Drucker und Klassen hinzufÃ¼gen

Betriebs-Richtlinie festlegen

Benutzung von Netzwerk-Druckern

@@ -41,12 +49,12 @@

cupsd.conf Referenz

CUPS fÃ¼r Entwickler

CUPS Programming Manual

Filter und Backend Programmierung

- + diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 8794f263d2..955c7f37ca 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Inicio
Administración
Clases

CUPS @CUPS_VERSION@

CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por OpenPrinting para macOS^® y otros sistemas operativos tipo UNIX^®. CUPS uses IPP Everywhereâ¢ to support printing to local and network printers.

Servidor

+ + + + + +

CUPS para usuarios

Descripción de CUPS

Impresión desde la línea de comandos y opciones

CUPS para administradores

Añadir impresoras y clases

Gestión de políticas de funcionamiento

Uso de impresoras de red

@@ -41,12 +49,12 @@

Referencia de cupsd.conf

CUPS para desarrolladores

CUPS Programming Manual

Programación de filtros y programas de conexión

- + diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in index ccc5f332fa..98b770586f 100644 --- a/doc/fr/index.html.in +++ b/doc/fr/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Home
Administration
Classes

OpenPrinting CUPS @CUPS_VERSION@

Le systÃ¨me d'impression open source basÃ© sur des normes, dÃ©veloppÃ© par OpenPrinting for LinuxÂ® and other UnixÂ®-like operating systems. CUPS uses IPP Everywhereâ¢ pour prendre en charge l'impression vers des imprimantes locales et de rÃ©seau.

Serveur

+ + + + + +

CUPS pour les utilisateurs

Overview of CUPS

Command-Line Printing and Options

CUPS pour les administrateurs

Adding Printers and Classes

Managing Operation Policies

Using Network Printers

@@ -41,12 +49,12 @@

cupsd.conf Reference

CUPS pour les dÃ©veloppeurs

Manuel de programmation CUPS

Filter and Backend Programming

- + diff --git a/doc/index.html.in b/doc/index.html.in index 25e6e28be0..a29a847d98 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Home
Administration
Classes

OpenPrinting CUPS @CUPS_VERSION@

The standards-based, open source printing system developed by OpenPrinting for LinuxÂ® and other UnixÂ®-like operating systems. CUPS uses IPP Everywhereâ¢ to support printing to local and network printers.

This System

+ + + + + +

CUPS for Users

Help for Users

Overview of CUPS

Command-Line Printing and Options

CUPS for Administrators

Help for Administrators

Adding Printers and Classes

Managing Operation Policies

Using Network Printers

@@ -41,7 +49,7 @@

cupsd.conf Reference

CUPS for Developers

Help for Developers

CUPS Programming Manual

Filter and Backend Programming

diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index e506d5f387..1780bb4a04 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
ãã¼ã
ç®¡ç
ã¯ã©ã¹

CUPS @CUPS_VERSION@

CUPS ã¯ãmacOS^® ããã³ãã®ä»ã® UNIX ^® ç³» OS ã®ããã«ãApple Inc. ã«ãã£ã¦éçºãããæ¨æºãã¼ã¹ã®ãªã¼ãã³ã½ã¼ã¹å°å·ã·ã¹ãã ã§ãã

ãµã¼ãã¼

+ + + + + +

CUPS ã¦ã¼ã¶ã¼åã

CUPS ã®æ¦è¦

ã³ãã³ãã©ã¤ã³ããã®å°å·ã¨ãªãã·ã§ã³

CUPS ç®¡çèåã

ããªã³ã¿ã¼ã¨ã¯ã©ã¹ã®è¿½å

æä½ããªã·ã¼ã®ç®¡ç

ãããã¯ã¼ã¯ããªã³ã¿ã¼ã®ä½¿ãæ¹

@@ -41,12 +49,12 @@

ãããã¯ã¼ã¯ããªã³ã¿ã¼ã®ä½¿ãæ¹

CUPS éçºèåã

CUPS Programming Manual

ãã£ã«ã¿ã¨ããã¯ã¨ã³ãã®ããã°ã©ãã³ã°

- + diff --git a/doc/pl/index.html.in b/doc/pl/index.html.in index 66b014fff5..d9d041fb4c 100644 --- a/doc/pl/index.html.in +++ b/doc/pl/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Start
Administracja
Klasy

OpenPrinting CUPS @CUPS_VERSION@

Oparty na standardach i otwartych ÅºrÃ³dÅach system wydruku stworzony przez OpenPrinting na LinuxÂ® i inne systemy typu UnixÂ®. CUPS uÅ¼ywa IPP Everywhereâ¢ do drukowania na lokalnych i sieciowych drukarkach.

Serwer

+ + + + + +

CUPS dla uÅ¼ytkownikÃ³w

PrzeglÄd CUPS

Drukowanie i ustawienia z linii poleceÅ

CUPS dla administratorÃ³w

Dodawanie drukarek i klas

ZarzÄdzanie politykami operacyjnymi

UÅ¼ytkowanie drukarek sieciowych

@@ -41,12 +49,12 @@

Skrypt cupsd.conf

CUPS dla programistÃ³w

PodrÄcznik programowania CUPS

Programowanie filtrÃ³w i zadaÅ serwera

- + diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index 35090ac0be..0fedb81802 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
Início
AdministraÃ§Ã£o
Classes

CUPS @CUPS_VERSION@

CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela OpenPrinting para LinuxÂ® e outros sistemas operacionais similares ao UNIX^®. CUPS uses IPP Everywhereâ¢ to support printing to local and network printers.

Servidor

+ + + + + +

CUPS para usuários

Visão geral do CUPS

Impressão e opções em linha de comando

CUPS para administradores

Adicionar impressoras e classes

Gerenciar políticas de operação

Usar impressoras de rede

@@ -41,12 +49,12 @@

Referência para o cupsd.conf

CUPS para desenvolvedores

CUPS Programming Manual

Programação de filtros e backend

- + diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index c4e32da096..8f3ad10498 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -12,7 +12,7 @@

OpenPrinting CUPS
ÐÐ°ÑÐ°Ð»Ð¾
ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ
ÐÑÑÐ¿Ð¿Ñ

OpenPrinting CUPS @CUPS_VERSION@

Ð¡ÐµÑÐ²ÐµÑ

+ + + + + +

CUPS Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹

@@ -47,6 +55,6 @@

- + diff --git a/templates/da/header.tmpl.in b/templates/da/header.tmpl.in index 44110e5a43..2512b05265 100644 --- a/templates/da/header.tmpl.in +++ b/templates/da/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Hjem
Administration
Klasser

- + diff --git a/templates/de/header.tmpl.in b/templates/de/header.tmpl.in index 508ae3d8a8..eb6e00c070 100644 --- a/templates/de/header.tmpl.in +++ b/templates/de/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Startseite
Verwaltung
Klassen

- + diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl.in index 4ddc39a094..769340e897 100644 --- a/templates/es/header.tmpl.in +++ b/templates/es/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Inicio
Administración
Clases

- + diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl.in index 8bea68a373..4d42a60b84 100644 --- a/templates/fr/header.tmpl.in +++ b/templates/fr/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Home
Administration
Classes

- + diff --git a/templates/header.tmpl.in b/templates/header.tmpl.in index a3ab8f29e9..4f46807eb2 100644 --- a/templates/header.tmpl.in +++ b/templates/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Home
Administration
Classes

OpenPrinting CUPS
ãã¼ã
ç®¡ç
ã¯ã©ã¹

- + diff --git a/templates/pl/header.tmpl.in b/templates/pl/header.tmpl.in index b077d90749..5b7a24d08d 100644 --- a/templates/pl/header.tmpl.in +++ b/templates/pl/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Start
Administracja
Klasy

- + diff --git a/templates/pt_BR/header.tmpl.in b/templates/pt_BR/header.tmpl.in index df5f2c9c77..2de6bbb0e8 100644 --- a/templates/pt_BR/header.tmpl.in +++ b/templates/pt_BR/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
Início
AdministraÃ§Ã£o
Classes

- + diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl.in index 7cf4400907..42b8a4095c 100644 --- a/templates/ru/header.tmpl.in +++ b/templates/ru/header.tmpl.in @@ -29,7 +29,7 @@

OpenPrinting CUPS
ÐÐ°ÑÐ°Ð»Ð¾
ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ
ÐÑÑÐ¿Ð¿Ñ

- +

CUPS @CUPS_VERSION@

Server

CUPS for brugere

CUPS for brugere

CUPS for administratorer

CUPS for administratorer

CUPS for udviklere

CUPS for udviklere

OpenPrinting CUPS @CUPS_VERSION@

Server

CUPS fÃ¼r Benutzer

CUPS fÃ¼r Benutzer

CUPS fÃ¼r Administratoren

CUPS fÃ¼r Administratoren

CUPS fÃ¼r Entwickler

CUPS fÃ¼r Entwickler

CUPS @CUPS_VERSION@

Servidor

CUPS para usuarios

CUPS para usuarios

CUPS para administradores

CUPS para administradores

CUPS para desarrolladores

CUPS para desarrolladores

OpenPrinting CUPS @CUPS_VERSION@

Serveur

CUPS pour les utilisateurs

CUPS pour les utilisateurs

CUPS pour les administrateurs

CUPS pour les administrateurs

CUPS pour les dÃ©veloppeurs

CUPS pour les dÃ©veloppeurs

OpenPrinting CUPS @CUPS_VERSION@

This System

CUPS for Users

Help for Users

CUPS for Administrators

Help for Administrators

CUPS for Developers

Help for Developers

CUPS @CUPS_VERSION@

ãµã¼ãã¼

CUPS ã¦ã¼ã¶ã¼åã

CUPS ã¦ã¼ã¶ã¼åã

CUPS ç®¡çè åã

CUPS ç®¡çè åã

CUPS éçºè åã

CUPS éçºè åã

OpenPrinting CUPS @CUPS_VERSION@

Serwer

CUPS dla uÅ¼ytkownikÃ³w

CUPS dla uÅ¼ytkownikÃ³w

CUPS dla administratorÃ³w

CUPS dla administratorÃ³w

CUPS dla programistÃ³w

CUPS dla programistÃ³w

CUPS @CUPS_VERSION@

Servidor

CUPS para usuários

CUPS para usuários

CUPS para administradores

CUPS para administradores

CUPS para desenvolvedores

CUPS para desenvolvedores

OpenPrinting CUPS @CUPS_VERSION@

Ð¡ÐµÑÐ²ÐµÑ

CUPS Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹

ãµã¼ãã¼

CUPS ã¦ã¼ã¶ã¼åã

CUPS ã¦ã¼ã¶ã¼åã

CUPS ç®¡çèåã

CUPS ç®¡çèåã

CUPS éçºèåã

CUPS éçºèåã

Ð¡ÐµÑÐ²ÐµÑ

CUPS Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹