More web interface cleanup (Issue #1207)

diff --git a/doc/cups.css b/doc/cups.css
index 6064733e103885f374c0ae8f2d9c70cf361d9308..b29e547717b587d19947100cd9ff0049fe8be50d 100644 (file)
--- a/doc/cups.css
+++ b/doc/cups.css
@@ -1,3 +1,6 @@
+/* Base styles */
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&family=Source+Code+Pro&display=swap');
+
 /* Layout CSS */
 .cups-header {
   background: rgba(46,46,46,.9);
@@ -48,8 +51,9 @@
 }
 
 .cups-body {
-  margin-top: 40px;
-  padding: 40px 20px;
+  margin-bottom: 20px;
+  margin-top: 65px;
+  padding: 20px;
 }
 .row .cups-body {
   padding: 0;
@@ -101,6 +105,11 @@
 .row .halves:first-child {
   margin-left: 0;
 }
+
+.row .thirds h1, .row .halves h1 {
+  margin-top: 0;
+}
+
 .mobile {
   display: none;
 }
@@ -112,12 +121,13 @@
 body {
   background: white;
   color: black;
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
+  font-family: 'Open Sans', sans-serif;
+  font-size: 16px;
   margin: 0;
 }
 
 h1, h2, h3, h4, h5, h6, p, td, th {
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
+  font-family: 'Open Sans', sans-serif;
 }
 
 h1 { font-size: 2em; }
@@ -125,14 +135,17 @@ h2 { font-size: 1.75em; }
 h3 { font-size: 1.5em; }
 h4 { font-size: 1.25em; }
 
+code, kbd, pre, tt, input[type=text], p.command, p.summary, p code, li code, p.code, ul.code li, textarea {
+  font-family: 'Source Code Pro', monospace;
+}
+
 kbd {
   color: #006600;
-  font-family: monaco, courier, monospace;
   font-weight: bold;
 }
 
 pre {
-  font-family: monaco, courier, monospace;
+  white-space: pre-wrap;
 }
 
 blockquote {
@@ -169,12 +182,10 @@ pre.man {
 
 pre.command EM, pre.example EM {
   color: #3f0000;
-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
 }
 
 p.command {
   color: #7f0000;
-  font-family: monaco, courier, monospace;
   margin-left: 36pt;
 }
 
@@ -196,12 +207,12 @@ a:link:hover img {
 a:link, a:visited {
   font-weight: inherit;
   text-decoration: none;
-  color: #000099;
+  color: #317BFF;
 }
 
 a:link:hover, a:visited:hover, a:active {
   text-decoration: underline;
-  color: #990099;
+  color: #4C80BF;
 }
 
 table.page {
@@ -234,8 +245,47 @@ form {
   display: inline;
 }
 
-input[type="text"], textarea {
-  font-family: monaco, courier, monospace;
+button, input[type=button], input[type=submit], select {
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  font-family: inherit;
+  font-size: 14px;
+  font-weight: normal;
+  padding: 4px 8px;
+  text-decoration: none;
+  white-space: nowrap;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+}
+button, input[type=button], input[type=file], input[type=submit] {
+  background: #317BFF;
+  color: #FFF;
+}
+button:hover, input[type=button]:hover, input[type=file]:hover, input[type=submit]:hover {
+  background: #65ABFF;
+  color: #FFF;
+}
+button:active, input[type=button]:active, input[type=file]:active, input[type=submit]:active {
+  background: #317BFF;
+  color: #FFF;
+}
+input[type=search] {
+  -webkit-appearance: textfield;
+}
+input[type=search], input[type=text] {
+  padding: 4px 8px;
+}
+select {
+  background: #ccc url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23000000' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
+  color: black;
+  padding: 4px 32px 4px 8px;
+}
+select:hover {
+  background: #ddd url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23000000' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
+}
+textarea {
+  width: 100%;
 }
 
 input[type="image"] {
@@ -342,11 +392,7 @@ th.conflict {
   text-align: right;
 }
 
-h1.title {
-  display: none;
-}
-
-h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
+h1.title, h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
   border-bottom: solid 2pt black;
 }
 
@@ -470,7 +516,6 @@ dl.category dt {
 
 p.summary {
   margin-left: 36pt;
-  font-family: monaco, courier, monospace;
 }
 
 div.summary table {
@@ -578,7 +623,6 @@ 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;
   -webkit-hyphens: manual;
@@ -693,10 +737,10 @@ ul.contents li ul.code, ul.contents li ul.subcontents {
     color: #ccc;
   }
   a:link, a:visited, table.list th a {
-    color: #6666ff;
+    color: #4C80BF;
   }
   a:link:hover, a:visited:hover, a:active, table.list th a {
-    color: #ff66ff;
+    color: #65ABFF;
   }
   hr {
     color: #666;
@@ -713,4 +757,28 @@ ul.contents li ul.code, ul.contents li ul.subcontents {
   table.list th {
     color: #666;
   }
+  button, input[type=button], input[type=file], input[type=submit] {
+    background: #255CBF;
+    color: #DDD;
+  }
+  button:hover, input[type=button]:hover, input[type=file]:hover, input[type=submit]:hover {
+    background: #4C80BF;
+    color: #EEE;
+  }
+  button:active, input[type=button]:active, input[type=file]:active, input[type=submit]:active {
+    background: #255CBF;
+    color: #DDD;
+  }
+  input[type=search], input[type=text], textarea {
+    background: #333;
+    color: #ccc;
+  }
+  select {
+    background: #333 url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23CCCCCC' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
+    color: #ccc;
+    padding: 4px 32px 4px 8px;
+  }
+  select:hover {
+    background: #444 url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23DDDDDD' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
+  }
 }

diff --git a/templates/add-class.tmpl b/templates/add-class.tmpl
index 3deaf26c000b43c76bf5e976d4394882660e1767..8fd06c5ebaffdc444e212e47a073cf63e04993af 100644 (file)
--- a/templates/add-class.tmpl
+++ b/templates/add-class.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Add Class</H2>
+<H1 CLASS="title">Add Class</H1>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/add-printer.tmpl b/templates/add-printer.tmpl
index 7e4f559aa8e8c187cfd1a7f3951517d5e4500e43..1b53c04c1248aa8f6f55cfb062788cfce635cd4d 100644 (file)
--- a/templates/add-printer.tmpl
+++ b/templates/add-printer.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Add Printer</H2>
+<H1 CLASS="title">Add Printer</H1>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/admin.tmpl b/templates/admin.tmpl
index a954f2b7f9c88a83d8cf0a32b6bb988fc9a7e28b..47e641acdfcb0a5084b5c978103866da80573a70 100644 (file)
--- a/templates/admin.tmpl
+++ b/templates/admin.tmpl
@@ -1,6 +1,5 @@
-<div class="row">
   <div class="halves">
-    <H2 CLASS="title">Printers</H2>
+    <H1 CLASS="title">Printers</H1>
 
     <P>
     <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>
@@ -8,21 +7,21 @@
     <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM>
     </P>
 
-    <H2 CLASS="title">Classes</H2>
+    <H1 CLASS="title">Classes</H1>
 
     <P>
     <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Add Class"></FORM>
     <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Classes"></FORM>
     </P>
 
-    <H2 CLASS="title">Jobs</H2>
+    <H1>Jobs</H1>
 
     <P>
     <FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Jobs"></FORM>
     </P>
   </div>
   <div class="halves">
-    <H2 CLASS="title">Server</H2>
+    <H1 CLASS="title">Server</H1>
 
     <P>
     <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Edit Configuration File"></FORM>
@@ -74,4 +73,3 @@
 
     </FORM>}
   </div>
-</div>

diff --git a/templates/choose-device.tmpl b/templates/choose-device.tmpl
index 6ce77340a3c9cd5233f5c5d50c6cbfc95cca0f1b..d118dc3b989403082e3930f5aa7e53ae70179980 100644 (file)
--- a/templates/choose-device.tmpl
+++ b/templates/choose-device.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+<H1 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H1>
 
 {CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/choose-make.tmpl b/templates/choose-make.tmpl
index 80708ea45918354824211f5b9fb91b46d53ec2b4..eb085e86a53a9624cdf2b3680692fef52982d140 100644 (file)
--- a/templates/choose-make.tmpl
+++ b/templates/choose-make.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+<H1 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H1>
 
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/choose-model.tmpl b/templates/choose-model.tmpl
index 96c8cd7da0a6f451d7a26779a1dcccf1fd17be15..a1904f55604105eaeef805347080546eb3953a30 100644 (file)
--- a/templates/choose-model.tmpl
+++ b/templates/choose-model.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+<H1 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H1>
 
 <SCRIPT TYPE="text/javascript"><!--
 function filterItems(el) {

diff --git a/templates/choose-serial.tmpl b/templates/choose-serial.tmpl
index 89a5eaf09673ea0b875c2e225f3b6887b43a84c5..7e5eecef34ff0936b7478b51be8ad51d7006f061 100644 (file)
--- a/templates/choose-serial.tmpl
+++ b/templates/choose-serial.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+<H1 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H1>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/choose-uri.tmpl b/templates/choose-uri.tmpl
index 0c7f4548247e840ba9bfda428a58b447852ef14b..1e01a0b02a919c207e6a6e2f248064df7347cb3d 100644 (file)
--- a/templates/choose-uri.tmpl
+++ b/templates/choose-uri.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+<H1 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H1>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/class-added.tmpl b/templates/class-added.tmpl
index 6afd30295dee494059885bc7d88b66faed56f542..be7afc5be20bd9e4c55d4647816d39d94685c460 100644 (file)
--- a/templates/class-added.tmpl
+++ b/templates/class-added.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Add Class</H2>
+<H1 CLASS="title">Add Class</H1>
 
 <P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> has been added
 successfully.

diff --git a/templates/class-confirm.tmpl b/templates/class-confirm.tmpl
index e5643791b5903b52a28d58935f0eb59af14ad6a6..e0c562f80008ea54df48bd263fd7b574229af075 100644 (file)
--- a/templates/class-confirm.tmpl
+++ b/templates/class-confirm.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Delete Class {printer_name}</H2>
+<H1 CLASS="title">Delete Class {printer_name}</H1>
 
 <P><B>Warning:</B> Are you sure you want to delete class
 {printer_name}?</P>

diff --git a/templates/class-deleted.tmpl b/templates/class-deleted.tmpl
index 6c444680c54f39b50fbf30db9943a8ec45dc8476..15e728e07e3ec7af2b664a8dca49a75fce2783ee 100644 (file)
--- a/templates/class-deleted.tmpl
+++ b/templates/class-deleted.tmpl
@@ -1,3 +1,3 @@
-<H2 CLASS="title">Delete Class {printer_name}</H2>
+<H1 CLASS="title">Delete Class {printer_name}</H1>
 
 <P>Class {printer_name} has been deleted successfully.

diff --git a/templates/class-jobs-header.tmpl b/templates/class-jobs-header.tmpl
index 61e5151d24b1c2a7bed7c76d294c99d9928cf0c8..6d04411da45b43d7952f25c39c3d5f67aa5d52a8 100644 (file)
--- a/templates/class-jobs-header.tmpl
+++ b/templates/class-jobs-header.tmpl
@@ -1 +1 @@
-<H3 CLASS="title">Jobs</H3>
+<H1>Jobs</H1>

diff --git a/templates/class-modified.tmpl b/templates/class-modified.tmpl
index 02b98954607405b93dd0114826a089a5e27c2ef4..a292727169497bb7256e2b5f001491d19dcae102 100644 (file)
--- a/templates/class-modified.tmpl
+++ b/templates/class-modified.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Modify Class {printer_name}</H2>
+<H1 CLASS="title">Modify Class {printer_name}</H1>
 
 <P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> has been
 modified successfully.

diff --git a/templates/class.tmpl b/templates/class.tmpl
index 630c342ec2ea804f2935a1a4dc367e06a0cf46ab..de876e124891c366323830e04b9de16834567f56 100644 (file)
--- a/templates/class.tmpl
+++ b/templates/class.tmpl
@@ -1,7 +1,7 @@
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+<H1 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
 ({printer_state=3?Idle:{printer_state=4?Processing:Paused}},
 {printer_is_accepting_jobs=0?Rejecting Jobs:Accepting Jobs},
-{server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})</H2>
+{server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})</H1>
 
 <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/command.tmpl b/templates/command.tmpl
index a8dc6ffb9636103207376aec02e37f0d6174a703..00ff3840820371fc87fa23b850e3d31374063222 100644 (file)
--- a/templates/command.tmpl
+++ b/templates/command.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{title} On {printer_name}</H2>
+<H1 CLASS="title">{title} On {printer_name}</H1>
 
 <P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
 ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Printer command job

diff --git a/templates/da/header.tmpl.in b/templates/da/header.tmpl.in
index 2512b052657b18112faefd3854fcca09a7e1ae0a..e2dd37138febf88d042c79fcfed92964fb99ed73 100644 (file)
--- a/templates/da/header.tmpl.in
+++ b/templates/da/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/de/header.tmpl.in b/templates/de/header.tmpl.in
index eb6e00c070df17fee39d8ce8eb15f90100bb150c..3a40093d3fc632c1c1cf1a373d64135aa8841a2c 100644 (file)
--- a/templates/de/header.tmpl.in
+++ b/templates/de/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/edit-config.tmpl b/templates/edit-config.tmpl
index d8f9bb17de08b673e58d82bf30e9b9ca22649e3d..c10b088096c45ee7a81fd146a89ff9b31d479846 100644 (file)
--- a/templates/edit-config.tmpl
+++ b/templates/edit-config.tmpl
@@ -5,7 +5,7 @@ function reset_config()
 }
 </SCRIPT>
 
-<H2 CLASS="title">Edit Configuration File</H2>
+<H1>Edit Configuration File</H1>
 
 <FORM NAME="cups" METHOD="POST" ACTION="/admin/">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/error-op.tmpl b/templates/error-op.tmpl
index 652537b98193bcd8291e3f5ffbb7ffbe5de9815d..947724ecebba6c730edd89f26cff11b13fbe274f 100644 (file)
--- a/templates/error-op.tmpl
+++ b/templates/error-op.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{?title} {?printer_name} Error</H2>
+<H1 CLASS="title">{?title} {?printer_name} Error</H1>
 
 <P>Error:</P>
 

diff --git a/templates/error.tmpl b/templates/error.tmpl
index 2ac1b8ff32734d9e0535b2783a6b51200736e491..74a3aa39b0bfde888e778664bd89c4c91ff89c57 100644 (file)
--- a/templates/error.tmpl
+++ b/templates/error.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{?title} {?printer_name} Error</H2>
+<H1 CLASS="title">{?title} {?printer_name} Error</H1>
 
 <P>{?message?{message}:Error}:</P>
 

diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl.in
index 769340e897e9c4af7130372057db9997a2ae0188..e71ea9f3d1ce72ac14e78fa01342a1ed668c6bd9 100644 (file)
--- a/templates/es/header.tmpl.in
+++ b/templates/es/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl.in
index 4d42a60b84ce0499b65fb8a22300c27aae5321f4..9012cedbf409dea004b2c46a619b360dd1b76062 100644 (file)
--- a/templates/fr/header.tmpl.in
+++ b/templates/fr/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/header.tmpl.in b/templates/header.tmpl.in
index 4f46807eb2119ecc1f7531e23e0a519b43fc6143..71883fa29eee7235bc7b2527387ee1c503fe8c26 100644 (file)
--- a/templates/header.tmpl.in
+++ b/templates/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/help-header.tmpl b/templates/help-header.tmpl
index bda3e454b69d5c14d72148d7c3e7f0694c4a2e0d..f4819e29db53688999414fd6374ec569951c5af1 100644 (file)
--- a/templates/help-header.tmpl
+++ b/templates/help-header.tmpl
@@ -14,7 +14,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">
 <DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Contents">
 <TR><TD>
 
-<H3 CLASS="title">Online Help Documents</H3>
+<H1>Online Help Documents</H1>
 
 <P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">All Documents</A></P>
 <HR>

diff --git a/templates/ja/header.tmpl.in b/templates/ja/header.tmpl.in
index 29f7e958ac4f6937c2899c2ec48c6f73003e8ea3..3513e538e68f785abf5c71de905c9b4e31225115 100644 (file)
--- a/templates/ja/header.tmpl.in
+++ b/templates/ja/header.tmpl.in
@@ -32,4 +32,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/job-cancel.tmpl b/templates/job-cancel.tmpl
index 0b0106ee94cffa41248e09267264994499938ff1..054992845407b2a8cde4d1efd48c6e64eb576fff 100644 (file)
--- a/templates/job-cancel.tmpl
+++ b/templates/job-cancel.tmpl
@@ -1,3 +1,3 @@
-<H2 CLASS="title">Cancel Job {job_id}</H2>
+<H1 CLASS="title">Cancel Job {job_id}</H1>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been canceled.

diff --git a/templates/job-hold.tmpl b/templates/job-hold.tmpl
index 3b5cd6a65d83396b190334b07d371c2570c923a6..b0a7984f33aa7fa66c562cccab6c11707855e1d7 100644 (file)
--- a/templates/job-hold.tmpl
+++ b/templates/job-hold.tmpl
@@ -1,3 +1,3 @@
-<H2 CLASS="title">Hold Job {job_id}</H2>
+<H1 CLASS="title">Hold Job {job_id}</H1>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been held from printing.

diff --git a/templates/job-move.tmpl b/templates/job-move.tmpl
index c2f70469c0999d324a034ec69ba7b16f5927a4dc..edc07786f435b5d1c5e952cfaf4bda4a49c0940d 100644 (file)
--- a/templates/job-move.tmpl
+++ b/templates/job-move.tmpl
@@ -3,7 +3,7 @@
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
 {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
 
-<H2 CLASS="title">{job_id?Move Job {job_id}:Move All Jobs}</H2>
+<H1 CLASS="title">{job_id?Move Job {job_id}:Move All Jobs}</H1>
 
 <TABLE>
 <TR>

diff --git a/templates/job-moved.tmpl b/templates/job-moved.tmpl
index 4893e24acaa7090844670dc8a1e3133ae4efd53a..765c44cb1aedff0af43e796bfb8399b14ef324e6 100644 (file)
--- a/templates/job-moved.tmpl
+++ b/templates/job-moved.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">{job_id?Move Job {job_id}:Move All Jobs}</H2>
+<H1 CLASS="title">{job_id?Move Job {job_id}:Move All Jobs}</H1>
 
 <P>{job_id?<A HREF="/jobs/{job_id}">Job {job_id}</A>:All jobs} moved to
 <A HREF="/{is_class?classes:printers}/{job_printer_name}">{job_printer_name}</A>.</P>

diff --git a/templates/job-release.tmpl b/templates/job-release.tmpl
index fe9379303c49da9e4c980bb22100aa5b6afc7ef7..51f4493c0ca8c31caeb64a9ca2ac29a19aa76d0d 100644 (file)
--- a/templates/job-release.tmpl
+++ b/templates/job-release.tmpl
@@ -1,3 +1,3 @@
-<H2 CLASS="title">Release Job {job_id}</H2>
+<H1 CLASS="title">Release Job {job_id}</H1>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been released for printing.

diff --git a/templates/job-restart.tmpl b/templates/job-restart.tmpl
index b5dfd958e86c67d92c65edeed0c864f4472cd319..a680a20a86b26e355c0bed71eeaeb94cc6536d95 100644 (file)
--- a/templates/job-restart.tmpl
+++ b/templates/job-restart.tmpl
@@ -1,3 +1,3 @@
-<H2 CLASS="title">Reprint Job {job_id}</H2>
+<H1 CLASS="title">Reprint Job {job_id}</H1>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been restarted.

diff --git a/templates/list-available-printers.tmpl b/templates/list-available-printers.tmpl
index 9fe7b12dd184da9a549133920d4b0b0b1dfd08f5..ab1284f1b109958f5235e71638e8e2b8bf7b14f8 100644 (file)
--- a/templates/list-available-printers.tmpl
+++ b/templates/list-available-printers.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Available Printers</H2>
+<H1 CLASS="title">Available Printers</H1>
 
 {#device_uri=0?<P>No printers found.</P>
 :<UL>{[device_uri]

diff --git a/templates/modify-class.tmpl b/templates/modify-class.tmpl
index 1aa4fe63181a0fbba8d2049af0370800691ab1af..25d4bae7706adc264ee3dd9e8b94676c4597879d 100644 (file)
--- a/templates/modify-class.tmpl
+++ b/templates/modify-class.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Modify Class {printer_name}</H2>
+<H1 CLASS="title">Modify Class {printer_name}</H1>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/modify-printer.tmpl b/templates/modify-printer.tmpl
index ef4d094b9743f7c9f063d591dc3614c128c5233f..bb6b5f978bcd366a0a77b3e3b5d15d66aedf51cb 100644 (file)
--- a/templates/modify-printer.tmpl
+++ b/templates/modify-printer.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Modify {printer_name}</H2>
+<H1 CLASS="title">Modify {printer_name}</H1>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">

diff --git a/templates/norestart.tmpl b/templates/norestart.tmpl
index 70bf3d33e880ffcd9e208cb26fb4e64e7fd9c76f..6bc18f61b63b1f3ed4a26e1ac041dfcb5dde2430 100644 (file)
--- a/templates/norestart.tmpl
+++ b/templates/norestart.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Change Settings</H2>
+<H1 CLASS="title">Change Settings</H1>
 
 <P>The server was not restarted because no changes were made to
-the configuration...</P>
+the configuration.</P>

diff --git a/templates/option-header.tmpl b/templates/option-header.tmpl
index 464726a50ba840c2ed85d4652712e5d4e57bbd36..ada460e6b861be12bfc724a9b8c62574ab2ff61c 100644 (file)
--- a/templates/option-header.tmpl
+++ b/templates/option-header.tmpl
@@ -1,5 +1,5 @@
 <DIV CLASS="tab" ID="{group_id}">
 
-<H3 ALIGN="CENTER">{group}</H3>
+<H2 ALIGN="CENTER">{group}</H1>
 
 <TABLE WIDTH="100%">

diff --git a/templates/pl/header.tmpl.in b/templates/pl/header.tmpl.in
index 5b7a24d08d153fcc0737c880a4ffebbfefc6f5d4..1565a56c7ced65f9ae5644b74f5dc3342405e14e 100644 (file)
--- a/templates/pl/header.tmpl.in
+++ b/templates/pl/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/printer-accept.tmpl b/templates/printer-accept.tmpl
index db5d8dad5849356d0da8d2cf34f611ff5771b787..612e7e88d11f50bc68612f76f44143d99003b02a 100644 (file)
--- a/templates/printer-accept.tmpl
+++ b/templates/printer-accept.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Accept Jobs On {is_class?Class:Printer} {printer_name}</H2>
+<H1 CLASS="title">Accept Jobs On {is_class?Class:Printer} {printer_name}</H1>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>

diff --git a/templates/printer-added.tmpl b/templates/printer-added.tmpl
index 01c4263167c87d9559c11d7bcedbd91217755a92..e3d36e185c6a7726ee02b8725759ac7dedbd24bf 100644 (file)
--- a/templates/printer-added.tmpl
+++ b/templates/printer-added.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Add Printer {printer_name}</H2>
+<H1 CLASS="title">Add Printer {printer_name}</H1>
 
 <P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been added
 successfully.

diff --git a/templates/printer-cancel-jobs.tmpl b/templates/printer-cancel-jobs.tmpl
index 4376646a45be74e3c233d2a9af11dc92295752d7..c93ecf6cf4def56638e97583dc26f6bb0d570be8 100644 (file)
--- a/templates/printer-cancel-jobs.tmpl
+++ b/templates/printer-cancel-jobs.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Cancel Jobs On {is_class?Class:Printer} {printer_name}</H2>
+<H1 CLASS="title">Cancel Jobs On {is_class?Class:Printer} {printer_name}</H1>
 
 <P>All jobs on {is_class?class:printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>

diff --git a/templates/printer-configured.tmpl b/templates/printer-configured.tmpl
index 7bce3f908cf7059968573b1f20bc0017ea34be34..f9e6e838d9e14797a02113b08c4fe40b42ae58e2 100644 (file)
--- a/templates/printer-configured.tmpl
+++ b/templates/printer-configured.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Set Default Options for {printer_name}</H2>
+<H1 CLASS="title">Set Default Options for {printer_name}</H1>
 
 <P>{OP=set-class-options?Class <A HREF="/classes/{printer_name}">:Printer <A HREF="/printers/{printer_name}">}{printer_name}</A>
 default options have been set successfully.

diff --git a/templates/printer-confirm.tmpl b/templates/printer-confirm.tmpl
index c1b2b1706fe343ad8a3c13858936ac724ad96b7d..a0de0a0d23e203fee8362b86a4da9204497b85a0 100644 (file)
--- a/templates/printer-confirm.tmpl
+++ b/templates/printer-confirm.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Delete Printer {printer_name}</H2>
+<H1 CLASS="title">Delete Printer {printer_name}</H1>
 
 <P><B>Warning:</B> Are you sure you want to delete printer
 {printer_name}?</P>

diff --git a/templates/printer-default.tmpl b/templates/printer-default.tmpl
index af21dcacd7f127ff812c2b6ef6f312f2fae90d72..e797ea1c36d70ee552c09962fafac5cbaae2c668 100644 (file)
--- a/templates/printer-default.tmpl
+++ b/templates/printer-default.tmpl
@@ -1,4 +1,4 @@
-<H2 CLASS="title">Set {is_class?Class:Printer} {printer_name} As Default</H2>
+<H1>Set {is_class?Class:Printer} {printer_name} As Default</H1>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>

diff --git a/templates/pt_BR/header.tmpl.in b/templates/pt_BR/header.tmpl.in
index 2de6bbb0e801ebf3f7b4c05d241a09dc1cd70933..e9027427d5130d69f47e6c346726d3baed2242d1 100644 (file)
--- a/templates/pt_BR/header.tmpl.in
+++ b/templates/pt_BR/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl.in
index 42b8a4095c24814bdd6a279713ec9ff8f23b1dba..ccb9d9d9a455318ff56665e794e703c45a922748 100644 (file)
--- a/templates/ru/header.tmpl.in
+++ b/templates/ru/header.tmpl.in
@@ -40,4 +40,3 @@
     </div>
     <div class="cups-body">
       <div class="row">
-       <h1>{title}</h1>

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