Fix some web interface issues:

- Transition web interface/stylesheet to use "cups-header", "cups-body", and
  "cups-footer" classes.
- Tweak background colors for documentation sidebar, block quotes, and code.

diff --git a/doc/cups.css b/doc/cups.css
index 670c1a4c6b63d8a695774386061e389bf74bf305..379489a174f973baf7479352e0ae33d44928c798 100644 (file)
--- a/doc/cups.css
+++ b/doc/cups.css
@@ -1,5 +1,5 @@
 /* Layout CSS */
-.header {
+.cups-header {
   background: rgba(46,46,46,.9);
   box-shadow: 0 2px 5px rgba(0,0,0,0.25);
   color: white;
@@ -11,7 +11,7 @@
   top: 0;
   width: 100%;
 }
-.header ul {
+.cups-header ul {
   list-style: none;
   margin: 0;
   -webkit-margin-before: 0;
@@ -20,37 +20,37 @@
   -webkit-margin-end: 5px;
   -webkit-padding-start: 0;
 }
-.header ul li {
+.cups-header ul li {
   float: left;
 }
-.header a {
+.cups-header a {
   display: block;
   padding: 5px 10px !important;
 }
-.header a:link, .header a:visited {
+.cups-header a:link, .cups-header a:visited {
   color: white !important;
   text-decoration: none !important;
 }
-.header a:hover {
+.cups-header a:hover {
   background: #cccccc !important;
   color: #333333 !important;
   text-decoration: none !important;
 }
-.header a.active {
+.cups-header a.active {
   background: white !important;
   box-shadow: rgba(0,0,0,0.1) 0 0 10px 0 inset;
   color: black !important;
   text-decoration: none !important;
 }
 
-.body {
+.cups-body {
   padding: 40px 20px;
 }
-.row .body {
+.row .cups-body {
   padding: 0;
 }
 
-.footer {
+.cups-footer {
   background: rgba(46,46,46,.9);
   bottom: 0;
   box-shadow: 0 -2px 5px rgba(0,0,0,0.25);
@@ -62,7 +62,7 @@
   position: fixed;
   width: 100%;
 }
-.footer a:link, footer a:hover, .footer a:visited {
+.cups-footer a:link, footer a:hover, .cups-footer a:visited {
   color: white !important;
   text-decoration: none !important;
 }
@@ -131,6 +131,7 @@ pre {
 }
 
 blockquote {
+  background: rgba(191,191,191,0.1);
   border-left: solid 2px #777;
   margin: 1em 0;
   padding: 10px;
@@ -207,7 +208,7 @@ table.page {
   width: 100%;
 }
 
-td.body {
+td.cups-body {
   height: 100%;
   vertical-align: top;
 }
@@ -365,7 +366,7 @@ h1.title {
   display: none;
 }
 
-h2.title, h3.title, .row .body h2, .row .body h3 {
+h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
   border-bottom: solid 2pt black;
 }
 
@@ -451,8 +452,8 @@ div.sidebar p.l2 {
 }
 
 table.inset {
-  background: rgba(191,191,191,0.15);
-  border: thin solid rgba(191,191,191,0.3);
+  background: #f4f4f4;
+  border: thin solid rgba(191,191,191,0.5);
   margin-top: 1em;
   padding: 0;
   width: 100%;
@@ -471,7 +472,7 @@ table.inset caption {
 }
 
 table.inset td {
-  padding: 2px;
+  padding: 2px 5px;
 }
 
 dt {
@@ -525,15 +526,15 @@ div.tab {
 }
 
 /* API documentation styles... */
-div.body h1 {
+div.cups-body h1 {
 }
-div.body h2 {
+div.cups-body h2 {
 }
-div.body h3 {
+div.cups-body h3 {
 }
-div.body h4 {
+div.cups-body h4 {
 }
-div.body h5 {
+div.cups-body h5 {
 }
 div.contents {
 }
@@ -589,9 +590,14 @@ h1, h2, h3, h4, h5, h6 {
 blockquote {
   page-break-inside: avoid;
 }
-p code, li code, p.code, pre, ul.code li {
-  background: rgba(127,127,127,0.1);
+p.code, pre, ul.code li {
   border-left: thin dotted gray;
+  background: rgba(191,191,191,0.1);
+}
+p code, li code {
+  background: rgba(191,191,191,0.3);
+}
+p code, li code, p.code, pre, ul.code li {
   font-family: monospace;
   hyphens: manual;
   margin: 18pt 0;
@@ -644,19 +650,19 @@ ul.contents li ul.code, ul.contents li ul.subcontents {
     display: none;
   }
 
-  .header {
+  .cups-header {
     margin: 0;
     position: relative;
   }
-  .header ul li {
+  .cups-header ul li {
     float: none;
   }
 
-  .body {
+  .cups-body {
     padding: 0;
   }
 
-  .footer {
+  .cups-footer {
     font-size: 10px;
     height: auto;
     position: relative;
@@ -715,6 +721,12 @@ ul.contents li ul.code, ul.contents li ul.subcontents {
   hr {
     color: #666;
   }
+  table.inset {
+    background: #1d1d1d;
+  }
+  h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
+    border-bottom: solid 2pt #ccc;
+  }
   div.table table td, table.list th {
     background: black;
   }

diff --git a/doc/da/index.html.in b/doc/da/index.html.in
index e7db89abcb98edafa780d13fd4efb3c33609da38..284cd451e4d080ec2c6e1a5b6fe42f4c2024b825 100644 (file)
--- a/doc/da/index.html.in
+++ b/doc/da/index.html.in
@@ -10,7 +10,7 @@
     <title>Hjem - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">Hjem</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Printere</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>CUPS @CUPS_VERSION@</h1>
        <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>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Ophavsret &copy; 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
+    <div class="cups-footer">Ophavsret &copy; 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
   </body>
 </html>

diff --git a/doc/de/index.html.in b/doc/de/index.html.in
index eb52203d7ee70587b62986743a6416c48add3bca..642079e6a96ecde5ba5d56aa77bf5f7fde4ea302 100644 (file)
--- a/doc/de/index.html.in
+++ b/doc/de/index.html.in
@@ -10,7 +10,7 @@
     <title>Startseite - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">Startseite</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Drucker</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
        <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>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Copyright &copy; 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
   </body>
 </html>

diff --git a/doc/es/index.html.in b/doc/es/index.html.in
index 78e8215472e87d6bc0badf31132321c7fa761140..15675a91a5b9c435418ea7a3a2d7ebf4277c8aae 100644 (file)
--- a/doc/es/index.html.in
+++ b/doc/es/index.html.in
@@ -10,7 +10,7 @@
     <title>Inicio - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">Inicio</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Impresoras</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>CUPS @CUPS_VERSION@</h1>
        <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>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Derechos de autor &copy; 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
+    <div class="cups-footer">Derechos de autor &copy; 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
   </body>
 </html>

diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in
index 0d7cdcc9cf5c10e31cb84c632fbc2000e10b565c..3081dd818b8a5a51010cec09d9721016c7c0e3c3 100644 (file)
--- a/doc/fr/index.html.in
+++ b/doc/fr/index.html.in
@@ -10,7 +10,7 @@
     <title>Home - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">Home</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Imprimantes</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
        <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>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
   </body>
 </html>

diff --git a/doc/index.html.in b/doc/index.html.in
index 6e2b9ef54799bdd41e6cec9fea5f66ce777c8e9b..d3dabd35aa822a7c37aea19b7aed90abfed5a37f 100644 (file)
--- a/doc/index.html.in
+++ b/doc/index.html.in
@@ -10,7 +10,7 @@
     <title>Home - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">Home</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Printers</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
        <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>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
   </body>
 </html>

diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in
index e88b1b3b28c42acf93d620b11b25efb36fae7f2d..36e98bf5b463faed2802f654d942d575a59c0309 100644 (file)
--- a/doc/ja/index.html.in
+++ b/doc/ja/index.html.in
@@ -10,7 +10,7 @@
     <title>ホーム - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">ホーム</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">プリンター</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>CUPS @CUPS_VERSION@</h1>
        <p>CUPS は、macOS<sup>&reg;</sup> およびその他の UNIX <SUP>&reg;</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
   </body>
 </html>

diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in
index 02a7c5dfaf3fcbc36660ebe5248ae2f1a0e1efaa..91553f58d04a00fd67a591562f510f3119b9ed51 100644 (file)
--- a/doc/pt_BR/index.html.in
+++ b/doc/pt_BR/index.html.in
@@ -10,7 +10,7 @@
     <title>In&iacute;cio - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">In&iacute;cio</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Impressoras</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>CUPS @CUPS_VERSION@</h1>
        <p>CUPS &eacute; o sistema de impress&atilde;o baseado em padr&otilde;es e de c&oacute;digo aberto desenvolvido pela <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para Linux® e outros sistemas operacionais similares ao 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>
@@ -47,6 +47,6 @@
        </div>
       </div>
     </div>
-    <div class="footer">Copyright &copy; 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
   </body>
 </html>

diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in
index c4767938a11ed669f25a2b010c11773932fd59a5..ca77abff19b3693b8b30fdd43def8787db3c33b5 100644 (file)
--- a/doc/ru/index.html.in
+++ b/doc/ru/index.html.in
@@ -10,7 +10,7 @@
        <title>Home - CUPS @CUPS_VERSION@</title>
   </head>
   <body>
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a class="active" href="/">Начало</a></li>
@@ -21,7 +21,7 @@
        <li><a href="/printers/">Принтеры</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
        <P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> для операционной системы Linux® и других 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>
@@ -47,6 +47,6 @@
 </div>
       </div>
     </div>
-    <div class="footer"> Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All Rights Reserved.</div>
   </body>
 </html>

diff --git a/templates/da/header.tmpl.in b/templates/da/header.tmpl.in
index 6af89c25a8db85e8992feb91c38e03fcb186b856..44110e5a4394690fc5566bf1da1eb4dd37ad7876 100644 (file)
--- a/templates/da/header.tmpl.in
+++ b/templates/da/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">Hjem</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Printere</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/da/trailer.tmpl b/templates/da/trailer.tmpl
index aede375c2d004d479814c50ed28bc1460f9f5840..4f509ec783294f4f5a8362bbf07a24a0f48a7d5f 100644 (file)
--- a/templates/da/trailer.tmpl
+++ b/templates/da/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS og CUPS-logoet er varemærker som tilhører <a href="http://www.apple.com">Apple Inc.</a> Ophavsret &copy; 2007-2019 Apple Inc. Alle rettigheder forbeholdt.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
   </body>
 </html>

diff --git a/templates/de/header.tmpl.in b/templates/de/header.tmpl.in
index 1a42e4fe701b2e740fdc62a6f707b441f7f682f3..508ae3d8a8eb956d94b3f9955477e4999c507db4 100644 (file)
--- a/templates/de/header.tmpl.in
+++ b/templates/de/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">Startseite</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Drucker</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl
index c1f5d38d81dbdd060b0d33298adb2c79e7694447..264136f9909ce448e038162659f773d5ff63776a 100644 (file)
--- a/templates/de/trailer.tmpl
+++ b/templates/de/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS und das CUPS-Logo sind Warenzeichen der <a href="https://www.apple.com/">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. Alle Rechte vorbehalten.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
   </body>
 </html>

diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl.in
index 01a78743b5b3b0369dce78001509d60d50ce4709..4ddc39a09436a82f1fbb216ab6c3f0e2ae6868c2 100644 (file)
--- a/templates/es/header.tmpl.in
+++ b/templates/es/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">Inicio</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Impresoras</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl
index c1cb58ff54f929b5e9036112fcaa3cb9ac07d5cb..b3686614c05981ac4cdc1e64cc8cce535be661de 100644 (file)
--- a/templates/es/trailer.tmpl
+++ b/templates/es/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor &copy; 2007-2019 Apple Inc. Todos los derechos reservados.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
   </body>
 </html>

diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl.in
index e3aa316110e403902433cd17183d5aeaf66b3b08..8bea68a373281de3db4b1dae4e6450d6f3916765 100644 (file)
--- a/templates/fr/header.tmpl.in
+++ b/templates/fr/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">Home</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Imprimantes</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl
index 6e9b8b1fea7cfc83f27d161d919a8ce422efc817..cf9b95be62e56f9487ca3fa61946397ccde98002 100644 (file)
--- a/templates/fr/trailer.tmpl
+++ b/templates/fr/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS et le logo CUPS sont des marques d&eacute;pos&eacute;es de <a href="http://www.apple.com">Apple Inc.</a> CUPS est sous copyright 2007-2019 Apple Inc. Tous droits r&eacute;serv&eacute;s.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Tous droits r&eacute;serv&eacute;s.</div>
   </body>
 </html>

diff --git a/templates/header.tmpl.in b/templates/header.tmpl.in
index 764b99edafdcc829de9c041adf292c575de82d64..a3ab8f29e9c586accea14cc20ffc4fb577bbbfa4 100644 (file)
--- a/templates/header.tmpl.in
+++ b/templates/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">Home</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Printers</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/ja/header.tmpl.in b/templates/ja/header.tmpl.in
index 10dbd578e7a9d4971c4e1b873ed4d061e411fb47..87f5263b0a701b1677a945fff1690c7493d38d4e 100644 (file)
--- a/templates/ja/header.tmpl.in
+++ b/templates/ja/header.tmpl.in
@@ -19,7 +19,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">ホーム</a></li>
@@ -30,6 +30,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">プリンター</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl
index a4f86b1a6843c78f9903e5c4f4b78df41c569cbb..a65356b075f257e636e3cccf28d5296b35dc79f4 100644 (file)
--- a/templates/ja/trailer.tmpl
+++ b/templates/ja/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. All rights reserved.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All Rights Reserved.</div>
   </body>
 </html>

diff --git a/templates/pt_BR/header.tmpl.in b/templates/pt_BR/header.tmpl.in
index d6fdf8a09308a3d1f61b33253f930b5049006f47..df5f2c9c777d156f5b584745c4b12698a9e60011 100644 (file)
--- a/templates/pt_BR/header.tmpl.in
+++ b/templates/pt_BR/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">In&iacute;cio</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Impressoras</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/pt_BR/trailer.tmpl b/templates/pt_BR/trailer.tmpl
index 673a5555732908b836237bb09c378cd8772a6197..cfaad91931c3d0a2e0efdf769e693989920b91da 100644 (file)
--- a/templates/pt_BR/trailer.tmpl
+++ b/templates/pt_BR/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS e sua logo s&atilde;o marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright &copy; 2007-2019 Apple Inc. Todos os direitos reservados.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
   </body>
 </html>

diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl.in
index 8d9d3abbb756fe5d449fe50f9dbc2d4b92703494..7cf44009074028a592f147147f94c386c482b2ec 100644 (file)
--- a/templates/ru/header.tmpl.in
+++ b/templates/ru/header.tmpl.in
@@ -27,7 +27,7 @@
     <title>{title} - CUPS @CUPS_VERSION@</title>
   </head>
   <body onload="check_cookies();">
-    <div class="header">
+    <div class="cups-header">
       <ul>
        <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
        <li><a href="/">Начало</a></li>
@@ -38,6 +38,6 @@
        <li><a {SECTION=printers?class="active" :}href="/printers/">Принтеры</a></li>
       </ul>
     </div>
-    <div class="body">
+    <div class="cups-body">
       <div class="row">
        <h1>{title}</h1>

diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl
index 260d0e9c2c5a3ff4a077deb9f054bcdf07418a34..a65356b075f257e636e3cccf28d5296b35dc79f4 100644 (file)
--- a/templates/ru/trailer.tmpl
+++ b/templates/ru/trailer.tmpl
@@ -1,6 +1,5 @@
       </div>
     </div>
-    <div class="footer">CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками
-<A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All Rights Reserved.</div>
   </body>
 </html>

diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl
index 240c56b5c67d26125f4c5f217bcbdcad451efeaa..c00daeca9fc152b9c9edbc2e6b90559a2ee7eb86 100644 (file)
--- a/templates/trailer.tmpl
+++ b/templates/trailer.tmpl
@@ -1,5 +1,5 @@
       </div>
     </div>
-    <div class="footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
+    <div class="cups-footer">Copyright &copy; 2021-2022 OpenPrinting. All rights reserved.</div>
   </body>
 </html>