Skip to content

Commit 788f5db

Browse files
michaelrsweetmichaelrsweet
committed
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...
1 parent f695cb5 commit 788f5db

28 files changed

Lines changed: 138 additions & 59 deletions

‎CHANGES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD)
7070
`--client-name` options.
7171
- Updated `cupsEnumDests` and `cupsGetDests` to support printer browsing and
7272
filtering options in client.conf (Issue #1180)
73+
- Updated the CUPS web interface to make administrative tasks more discoverable
74+
(Issue #1207)
7375
- Deprecated the "page-border" Job Template attribute (Issue #1020)
7476
- Removed the `cups-config` utility (use `pkg-config` instead)
7577
- Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error

‎doc/cups.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
width: 100%;
1313
}
1414
.cups-header ul {
15+
font-size: 20px;
1516
list-style: none;
1617
margin: 0;
1718
-webkit-margin-before: 0;
@@ -25,7 +26,10 @@
2526
}
2627
.cups-header a {
2728
display: block;
28-
padding: 5px 10px !important;
29+
padding: 18px 30px !important;
30+
}
31+
.cups-header a.img {
32+
padding: 12px 24px !important;
2933
}
3034
.cups-header a:link, .cups-header a:visited {
3135
color: white !important;
@@ -44,6 +48,7 @@
4448
}
4549

4650
.cups-body {
51+
margin-top: 40px;
4752
padding: 40px 20px;
4853
}
4954
.row .cups-body {

‎doc/da/index.html.in‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<div class="cups-header">
1414
<ul>
15-
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
15+
<li><a class="img" href="https://openprinting.github.io/cups/" target="_blank"><img src="/images/cups.png" width="32" height="32" alt="OpenPrinting CUPS"></a></li>
1616
<li><a class="active" href="/">Hjem</a></li>
1717
<li><a href="/admin">Administration</a></li>
1818
<li><a href="/classes/">Klasser</a></li>
@@ -26,27 +26,35 @@
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> til Linux® og andre UNIX<sup>&reg;</sup>-lignende styresystemer. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</p>
2828
</div>
29+
<div class="row">
30+
<h2 class="title">Server</h2>
31+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="add-printer"><input type="submit" value="Tilføj printer"></form>
32+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="find-new-printers"><input type="submit" value="Find nye printere"></form>
33+
<form action="/jobs/" method="GET"><input type="submit" value="Håndter jobs"></form>
34+
<form action="/printers/" method="GET"><input type="submit" value="Håndter printere"></form>
35+
<form action="/admin/" method="GET"><input type="submit" value="Skift indstillinger"></form>
36+
</div>
2937
<div class="row">
3038
<div class="thirds">
31-
<h2>CUPS for brugere</h2>
39+
<h2 class="title">CUPS for brugere</h2>
3240
<p><a href="help/overview.html">Overblik over CUPS</a></p>
3341
<p><a href="help/options.html">Kommandolinjeudskrivning og tilvalg</a></p>
3442
</div>
3543
<div class="thirds">
36-
<h2>CUPS for administratorer</h2>
44+
<h2 class="title">CUPS for administratorer</h2>
3745
<p><a href="help/admin.html">Tilføjelse af printere og klasser</a></p>
3846
<p><a href="help/policies.html">Håndtering af driftspolitikker</a></p>
3947
<p><a href="help/network.html">Brug af netværksprintere</a></p>
4048
<p><a href="help/firewalls.html">Firewalls</a></p>
4149
<p><a href="help/man-cupsd.conf.html">cupsd.conf-reference</a></p>
4250
</div>
4351
<div class="thirds">
44-
<h2>CUPS for udviklere</h2>
52+
<h2 class="title">CUPS for udviklere</h2>
4553
<p><a href="help/cupspm.html">CUPS-programmeringsmanual</a></p>
4654
<p><a href="help/api-filter.html">Filter- og backendprogrammering</a></p>
4755
</div>
4856
</div>
4957
</div>
50-
<div class="cups-footer">Ophavsret &copy; 2021-2023 OpenPrinting. Alle rettigheder forbeholdt.</div>
58+
<div class="cups-footer">Ophavsret &copy; 2021-2025 OpenPrinting. Alle rettigheder forbeholdt.</div>
5159
</body>
5260
</html>

‎doc/de/index.html.in‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<div class="cups-header">
1414
<ul>
15-
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
15+
<li><a class="img" href="https://openprinting.github.io/cups/" target="_blank"><img src="/images/cups.png" width="32" height="32" alt="OpenPrinting CUPS"></a></li>
1616
<li><a class="active" href="/">Startseite</a></li>
1717
<li><a href="/admin">Verwaltung</a></li>
1818
<li><a href="/classes/">Klassen</a></li>
@@ -26,27 +26,35 @@
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> zur Unterstützung lokaler und Netzwerkdrucker.</p>
2828
</div>
29+
<div class="row">
30+
<h2 class="title">Server</h2>
31+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="add-printer"><input type="submit" value="Drucker hinzufügen"></form>
32+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="find-new-printers"><input type="submit" value="Neue Drucker suchen"></form>
33+
<form action="/jobs/" method="GET"><input type="submit" value="Aufträge verwalten"></form>
34+
<form action="/printers/" method="GET"><input type="submit" value="Drucker verwalten"></form>
35+
<form action="/admin/" method="GET"><input type="submit" value="Einstellungen ändern"></form>
36+
</div>
2937
<div class="row">
3038
<div class="thirds">
31-
<h2>CUPS für Benutzer</h2>
39+
<h2 class="title">CUPS für Benutzer</h2>
3240
<p><a href="help/overview.html">Überblick über CUPS</a></p>
3341
<p><a href="help/options.html">Befehlszeilen-Druck und Optionen</a></p>
3442
</div>
3543
<div class="thirds">
36-
<h2>CUPS für Administratoren</h2>
44+
<h2 class="title">CUPS für Administratoren</h2>
3745
<p><a href="help/admin.html">Drucker und Klassen hinzufügen</a></p>
3846
<p><a href="help/policies.html">Betriebs-Richtlinie festlegen</a></p>
3947
<p><a href="help/network.html">Benutzung von Netzwerk-Druckern</a></p>
4048
<p><a href="help/firewalls.html">Firewalls</a></p>
4149
<p><a href="help/man-cupsd.conf.html">cupsd.conf Referenz</a></p>
4250
</div>
4351
<div class="thirds">
44-
<h2>CUPS für Entwickler</h2>
52+
<h2 class="title">CUPS für Entwickler</h2>
4553
<p><a href="help/cupspm.html">CUPS Programming Manual</a></p>
4654
<p><a href="help/api-filter.html">Filter und Backend Programmierung</a></p>
4755
</div>
4856
</div>
4957
</div>
50-
<div class="cups-footer">Copyright &copy; 2021-2023 OpenPrinting. Alle Rechte vorbehalten.</div>
58+
<div class="cups-footer">Copyright &copy; 2021-2025 OpenPrinting. Alle Rechte vorbehalten.</div>
5159
</body>
5260
</html>

‎doc/es/index.html.in‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<div class="cups-header">
1414
<ul>
15-
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
15+
<li><a class="img" href="https://openprinting.github.io/cups/" target="_blank"><img src="/images/cups.png" width="32" height="32" alt="OpenPrinting CUPS"></a></li>
1616
<li><a class="active" href="/">Inicio</a></li>
1717
<li><a href="/admin">Administraci&oacute;n</a></li>
1818
<li><a href="/classes/">Clases</a></li>
@@ -26,27 +26,35 @@
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS es el sistema de impresi&oacute;n de c&oacute;digo abierto basado en est&aacute;ndares desarrollado por <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para macOS<sup>&reg;</sup> y otros sistemas operativos tipo UNIX<sup>&reg;</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
2828
</div>
29+
<div class="row">
30+
<h2 class="title">Servidor</h2>
31+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="add-printer"><input type="submit" value="A&ntilde;adir impresora"></form>
32+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="find-new-printers"><input type="submit" value="Encontrar nuevas impresoras"></form>
33+
<form action="/jobs/" method="GET"><input type="submit" value="Administrar trabajos"></form>
34+
<form action="/printers/" method="GET"><input type="submit" value="Administrar impresoras"></form>
35+
<form action="/admin/" method="GET"><input type="submit" value="Cambiar configuraci&oacute;n"></form>
36+
</div>
2937
<div class="row">
3038
<div class="thirds">
31-
<h2>CUPS para usuarios</h2>
39+
<h2 class="title">CUPS para usuarios</h2>
3240
<p><a href="help/overview.html">Descripci&oacute;n de CUPS</a></p>
3341
<p><a href="help/options.html">Impresi&oacute;n desde la l&iacute;nea de comandos y opciones</a></p>
3442
</div>
3543
<div class="thirds">
36-
<h2>CUPS para administradores</h2>
44+
<h2 class="title">CUPS para administradores</h2>
3745
<p><a href="help/admin.html">A&ntilde;adir impresoras y clases</a></p>
3846
<p><a href="help/policies.html">Gesti&oacute;n de pol&iacute;ticas de funcionamiento</a></p>
3947
<p><a href="help/network.html">Uso de impresoras de red</a></p>
4048
<p><a href="help/firewalls.html">Firewalls</a></p>
4149
<p><a href="help/man-cupsd.conf.html">Referencia de cupsd.conf</a></p>
4250
</div>
4351
<div class="thirds">
44-
<h2>CUPS para desarrolladores</h2>
52+
<h2 class="title">CUPS para desarrolladores</h2>
4553
<p><a href="help/cupspm.html">CUPS Programming Manual</a></p>
4654
<p><a href="help/api-filter.html">Programaci&oacute;n de filtros y programas de conexi&oacute;n</a></p>
4755
</div>
4856
</div>
4957
</div>
50-
<div class="cups-footer">Derechos de autor &copy; 2021-2023 OpenPrinting. Todos los derechos reservados.</div>
58+
<div class="cups-footer">Derechos de autor &copy; 2021-2025 OpenPrinting. Todos los derechos reservados.</div>
5159
</body>
5260
</html>

‎doc/fr/index.html.in‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<div class="cups-header">
1414
<ul>
15-
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
15+
<li><a class="img" href="https://openprinting.github.io/cups/" target="_blank"><img src="/images/cups.png" width="32" height="32" alt="OpenPrinting CUPS"></a></li>
1616
<li><a class="active" href="/">Home</a></li>
1717
<li><a href="/admin">Administration</a></li>
1818
<li><a href="/classes/">Classes</a></li>
@@ -26,27 +26,35 @@
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<p>Le système d'impression open source basé sur des normes, développé par <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> pour prendre en charge l'impression vers des imprimantes locales et de réseau.</p>
2828
</div>
29+
<div class="row">
30+
<h2 class="title">Serveur</h2>
31+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="add-printer"><input type="submit" value="Ajouter une imprimante"></form>
32+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="find-new-printers"><input type="submit" value="Trouver de nouvelles imprimantes"></form>
33+
<form action="/jobs/" method="GET"><input type="submit" value="G&eacute;rer les t&acirc;ches"></form>
34+
<form action="/printers/" method="GET"><input type="submit" value="G&eacute;rer les imprimantes"></form>
35+
<form action="/admin/" method="GET"><input type="submit" value="Modifier les param&egrave;tres"></form>
36+
</div>
2937
<div class="row">
3038
<div class="thirds">
31-
<h2>CUPS pour les utilisateurs</h2>
39+
<h2 class="title">CUPS pour les utilisateurs</h2>
3240
<p><a href="help/overview.html">Overview of CUPS</a></p>
3341
<p><a href="help/options.html">Command-Line Printing and Options</a></p>
3442
</div>
3543
<div class="thirds">
36-
<h2>CUPS pour les administrateurs</h2>
44+
<h2 class="title">CUPS pour les administrateurs</h2>
3745
<p><a href="help/admin.html">Adding Printers and Classes</a></p>
3846
<p><a href="help/policies.html">Managing Operation Policies</a></p>
3947
<p><a href="help/network.html">Using Network Printers</a></p>
4048
<p><a href="help/firewalls.html">Firewalls</a></p>
4149
<p><a href="help/man-cupsd.conf.html">cupsd.conf Reference</a></p>
4250
</div>
4351
<div class="thirds">
44-
<h2>CUPS pour les développeurs</h2>
52+
<h2 class="title">CUPS pour les développeurs</h2>
4553
<p><a href="help/cupspm.html">Manuel de programmation CUPS</a></p>
4654
<p><a href="help/api-filter.html">Filter and Backend Programming</a></p>
4755
</div>
4856
</div>
4957
</div>
50-
<div class="cups-footer">Copyright &copy; 2021-2023 OpenPrinting. All rights reserved.</div>
58+
<div class="cups-footer">Copyright &copy; 2021-2025 OpenPrinting. All rights reserved.</div>
5159
</body>
5260
</html>

‎doc/index.html.in‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<div class="cups-header">
1414
<ul>
15-
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
15+
<li><a class="img" href="https://openprinting.github.io/cups/" target="_blank"><img src="/images/cups.png" width="32" height="32" alt="OpenPrinting CUPS"></a></li>
1616
<li><a class="active" href="/">Home</a></li>
1717
<li><a href="/admin">Administration</a></li>
1818
<li><a href="/classes/">Classes</a></li>
@@ -26,22 +26,30 @@
2626
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
2727
<p>The standards-based, open source printing system developed by <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
2828
</div>
29+
<div class="row">
30+
<h2 class="title">This System</h2>
31+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="add-printer"><input type="submit" value="Add Printer"></form>
32+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="find-new-printers"><input type="submit" value="Find New Printers"></form>
33+
<form action="/jobs/" method="GET"><input type="submit" value="Manage Jobs"></form>
34+
<form action="/printers/" method="GET"><input type="submit" value="Manage Printers"></form>
35+
<form action="/admin/" method="GET"><input type="submit" value="Manage System Settings"></form>
36+
</div>
2937
<div class="row">
3038
<div class="thirds">
31-
<h2>CUPS for Users</h2>
39+
<h2 class="title">Help for Users</h2>
3240
<p><a href="help/overview.html">Overview of CUPS</a></p>
3341
<p><a href="help/options.html">Command-Line Printing and Options</a></p>
3442
</div>
3543
<div class="thirds">
36-
<h2>CUPS for Administrators</h2>
44+
<h2 class="title">Help for Administrators</h2>
3745
<p><a href="help/admin.html">Adding Printers and Classes</a></p>
3846
<p><a href="help/policies.html">Managing Operation Policies</a></p>
3947
<p><a href="help/network.html">Using Network Printers</a></p>
4048
<p><a href="help/firewalls.html">Firewalls</a></p>
4149
<p><a href="help/man-cupsd.conf.html">cupsd.conf Reference</a></p>
4250
</div>
4351
<div class="thirds">
44-
<h2>CUPS for Developers</h2>
52+
<h2 class="title">Help for Developers</h2>
4553
<p><a href="help/cupspm.html">CUPS Programming Manual</a></p>
4654
<p><a href="help/api-filter.html">Filter and Backend Programming</a></p>
4755
</div>

‎doc/ja/index.html.in‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<div class="cups-header">
1414
<ul>
15-
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
15+
<li><a class="img" href="https://openprinting.github.io/cups/" target="_blank"><img src="/images/cups.png" width="32" height="32" alt="OpenPrinting CUPS"></a></li>
1616
<li><a class="active" href="/">ホーム</a></li>
1717
<li><a href="/admin">管理</a></li>
1818
<li><a href="/classes/">クラス</a></li>
@@ -26,27 +26,35 @@
2626
<h1>CUPS @CUPS_VERSION@</h1>
2727
<p>CUPS は、macOS<sup>&reg;</sup> およびその他の UNIX <SUP>&reg;</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p>
2828
</div>
29+
<div class="row">
30+
<h2 class="title">サーバー</h2>
31+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="add-printer"><input type="submit" value="プリンターの追加"></form>
32+
<form action="/admin/" method="POST"><input type="hidden" name="org.cups.sid" value="{$org.cups.sid}"><input type="hidden" name="OP" value="find-new-printers"><input type="submit" value="新しいプリンターの検索"></form>
33+
<form action="/jobs/" method="GET"><input type="submit" value="ジョブの管理"></form>
34+
<form action="/printers/" method="GET"><input type="submit" value="プリンターの管理"></form>
35+
<form action="/admin/" method="GET"><input type="submit" value="設定の変更"></form>
36+
</div>
2937
<div class="row">
3038
<div class="thirds">
31-
<h2>CUPS ユーザー向け</h2>
39+
<h2 class="title">CUPS ユーザー向け</h2>
3240
<p><a href="help/overview.html">CUPS の概要</a></p>
3341
<p><a href="help/options.html">コマンドラインからの印刷とオプション</a></p>
3442
</div>
3543
<div class="thirds">
36-
<h2>CUPS 管理者向け</h2>
44+
<h2 class="title">CUPS 管理者向け</h2>
3745
<p><a href="help/admin.html">プリンターとクラスの追加</a></p>
3846
<p><a href="help/policies.html">操作ポリシーの管理</a></p>
3947
<p><a href="help/network.html">ネットワークプリンターの使い方</a></p>
4048
<p><a href="help/firewalls.html">Firewalls</a></p>
4149
<p><a href="help/man-cupsd.conf.html">ネットワークプリンターの使い方</a></p>
4250
</div>
4351
<div class="thirds">
44-
<h2>CUPS 開発者向け</h2>
52+
<h2 class="title">CUPS 開発者向け</h2>
4553
<p><a href="help/cupspm.html">CUPS Programming Manual</a></p>
4654
<p><a href="help/api-filter.html">フィルタとバックエンドのプログラミング</a></p>
4755
</div>
4856
</div>
4957
</div>
50-
<div class="cups-footer">Copyright &copy; 2021-2023 OpenPrinting. All rights reserved.</div>
58+
<div class="cups-footer">Copyright &copy; 2021-2025 OpenPrinting. All rights reserved.</div>
5159
</body>
5260
</html>

0 commit comments

Comments
 (0)