]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Fix httpWriteResponse state values after a 0-length response.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 21 Oct 2013 21:41:21 +0000 (21:41 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 21 Oct 2013 21:41:21 +0000 (21:41 +0000)
Fix text/css MIME type rules (so css files don't get mistaken for C source)

New web interface templates and stylesheet that works better on mobile
browsers like the iPhone.

Touch icon for mobile bookmarks.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11349 a1ca3aef-8c08-0410-bb20-df032aa958be

61 files changed:
conf/mime.types
cups/http.c
doc/Makefile
doc/apple-touch-icon.opacity [new file with mode: 0644]
doc/apple-touch-icon.png [new file with mode: 0644]
doc/cups.css
doc/index.html.in
scheduler/client.c
templates/add-class.tmpl
templates/add-printer.tmpl
templates/admin.tmpl
templates/choose-device.tmpl
templates/choose-make.tmpl
templates/choose-model.tmpl
templates/choose-serial.tmpl
templates/choose-uri.tmpl
templates/class-added.tmpl
templates/class-confirm.tmpl
templates/class-deleted.tmpl
templates/class-jobs-header.tmpl
templates/class-modified.tmpl
templates/class.tmpl
templates/command.tmpl
templates/edit-config.tmpl
templates/error-op.tmpl
templates/error.tmpl
templates/header.tmpl.in
templates/help-header.tmpl
templates/help-trailer.tmpl
templates/job-cancel.tmpl
templates/job-hold.tmpl
templates/job-move.tmpl
templates/job-moved.tmpl
templates/job-release.tmpl
templates/job-restart.tmpl
templates/jobs-header.tmpl
templates/list-available-printers.tmpl
templates/modify-class.tmpl
templates/modify-printer.tmpl
templates/norestart.tmpl
templates/printer-accept.tmpl
templates/printer-added.tmpl
templates/printer-configured.tmpl
templates/printer-confirm.tmpl
templates/printer-default.tmpl
templates/printer-deleted.tmpl
templates/printer-jobs-header.tmpl
templates/printer-modified.tmpl
templates/printer-purge.tmpl
templates/printer-reject.tmpl
templates/printer-start.tmpl
templates/printer-stop.tmpl
templates/printer.tmpl
templates/restart.tmpl
templates/set-printer-options-header.tmpl
templates/set-printer-options-trailer.tmpl
templates/subscription-added.tmpl
templates/subscription-canceled.tmpl
templates/test-page.tmpl
templates/trailer.tmpl
templates/users.tmpl

index 3e07408b9cb28d43df71317a32f02b759b47a809..e462f6282245e090746b89ca7949538441dca1d1 100644 (file)
@@ -124,7 +124,7 @@ application/x-shell         sh printable(0,1024) + string(0,#!) +\
                                (contains(2,80,/bash) contains(2,80,/ksh)\
                                 contains(2,80,/sh) contains(2,80,/zsh))
 application/x-csource          c cxx cpp cc C h hpp \
-                               printable(0,1024) + \
+                               printable(0,1024) + ! css + \
                                (string(0,/*) string(0,//)
                                 string(0,#include) contains(0,1024,<0a>#include) \
                                 string(0,#define) contains(0,1024,<0a>#define))
index 6e532c76b9699281dbf7e40b7aa09458ec6111a5..1881d50270814efd44277be0ea69d21cfbf104ea 100644 (file)
@@ -3453,7 +3453,8 @@ httpWrite2(http_t     *http,              /* I - HTTP connection */
 
     if (http->state == HTTP_STATE_POST_RECV)
       http->state ++;
-    else if (http->state == HTTP_STATE_POST_SEND)
+    else if (http->state == HTTP_STATE_POST_SEND ||
+             http->state == HTTP_STATE_GET_SEND)
       http->state = HTTP_STATE_WAITING;
     else
       http->state = HTTP_STATE_STATUS;
@@ -3647,6 +3648,14 @@ httpWriteResponse(http_t        *http,   /* I - HTTP connection */
 
     http_set_length(http);
 
+    if (http->data_encoding == HTTP_ENCODING_LENGTH && http->data_remaining == 0)
+    {
+      DEBUG_printf(("1httpWriteResponse: Resetting state to HTTP_STATE_WAITING, "
+                    "was %s.", httpStateString(http->state)));
+      http->state = HTTP_STATE_WAITING;
+      return (0);
+    }
+
 #ifdef HAVE_LIBZ
    /*
     * Then start any content encoding...
@@ -3656,6 +3665,7 @@ httpWriteResponse(http_t        *http,    /* I - HTTP connection */
     http_content_coding_start(http,
                              httpGetField(http, HTTP_FIELD_CONTENT_ENCODING));
 #endif /* HAVE_LIBZ */
+
   }
 
   return (0);
index 620ad128c1e449da92ff8a72138b42011a230a37..c59d12e964f7a814edaaf30fba380f8653d52091 100644 (file)
@@ -20,6 +20,7 @@ include ../Makedefs
 #
 
 WEBPAGES       =       \
+                       apple-touch-icon.png \
                        cups.css \
                        cups-printable.css \
                        index.html \
diff --git a/doc/apple-touch-icon.opacity b/doc/apple-touch-icon.opacity
new file mode 100644 (file)
index 0000000..a1d742d
Binary files /dev/null and b/doc/apple-touch-icon.opacity differ
diff --git a/doc/apple-touch-icon.png b/doc/apple-touch-icon.png
new file mode 100644 (file)
index 0000000..e4d8f81
Binary files /dev/null and b/doc/apple-touch-icon.png differ
index 815c193c3f53431333a209a580c7bf3fc57193ae..95cf597c3f1d3c06d87cd567e14359b81d9a80dc 100644 (file)
@@ -1,7 +1,105 @@
+/* Layout CSS */
+.header {
+  background: #333333;
+  color: white;
+  float: left;
+  left: 0;
+  margin-bottom: 20px;
+  padding: 0px;
+  position: relative;
+  right: 0;
+  width: 100%;
+}
+.header ul {
+  list-style: none;
+  -webkit-margin-before: 0;
+  -webkit-margin-after: 0;
+  -webkit-margin-start: 0;
+  -webkit-margin-end: 5px;
+  -webkit-padding-start: 0;
+}
+.header ul li {
+  float: left;
+}
+.header a {
+  display: block;
+  padding: 5px 10px !important;
+}
+.header a:link, .header a:visited {
+  color: white !important;
+  text-decoration: none !important;
+}
+.header a:hover {
+  background: #cccccc !important;
+  color: #333333 !important;
+  text-decoration: none !important;
+}
+.header a.active {
+  background: white !important;
+  color: black !important;
+  text-decoration: none !important;
+}
+
+.body {
+  padding: 20px 20px 40px;
+}
+
+.footer {
+  background: #333333;
+  bottom: 0;
+  color: #cccccc;
+  font-size: 10px;
+  height: 20px;
+  left: 0;
+  padding: 10px 10px 3px;
+  position: fixed;
+  width: 100%;
+}
+.footer a:link, footer a:hover, .footer a:visited {
+  color: white !important;
+  text-decoration: none !important;
+}
+
+.row {
+  width: 100%;
+  *zoom: 1;
+}
+.row:after {
+  clear: both;
+}
+
+.row .thirds {
+  float: left;
+  margin-left: 0.5%;
+  margin-right: 0;
+  width: 33%;
+}
+.row .thirds:first-child {
+  margin-left: 0;
+}
+
+.row .halves {
+  float: left;
+  margin-left: 0.5%;
+  margin-right: 0;
+  width: 49.75%;
+}
+.row .halves:first-child {
+  margin-left: 0;
+}
+.mobile {
+  display: none;
+}
+.no-mobile {
+  display: inherit;
+}
+
+/* Appearance CSS */
 BODY {
   background: white;
   color: black;
   font-family: lucida grande, geneva, helvetica, arial, sans-serif;
+  margin: 0;
 }
 
 H1, H2, H3, H4, H5, H6, P, TD, TH {
@@ -255,7 +353,7 @@ H2.title, H3.title {
   border-bottom: solid 1pt #999999;
 }
 
-DIV.indent, TABLE.indent {
+TABLE.indent {
   margin-top: 2em;
   margin-left: auto;
   margin-right: auto;
@@ -460,3 +558,57 @@ div.body dt {
 div.body dd {
   margin-bottom: 0.5em;
 }
+/* iPhone/iPod touch overrides */
+@media only screen and (min-device-width: 320px) and (max-device-width: 480px),
+       only screen and (min-device-width: 320px) and (max-device-width: 568px) {
+  .mobile {
+    display: inherit;
+  }
+  .no-mobile {
+    display: none;
+  }
+
+  .footer {
+    font-size: 10px;
+    height: auto;
+    position: relative;
+  }
+
+  .row .thirds, .row .halves {
+    float: none;
+    margin: 0;
+    width: 100%;
+  }
+
+  DIV.sidebar {
+    float: none;
+    margin-left: 0;
+    max-width: 100%;
+    min-width: 100%;
+    width: 100%;
+  }
+
+  BLOCKQUOTE {
+    margin: 0;
+  }
+
+  P.example {
+    margin-left: 0;
+  }
+
+  PRE.command, PRE.example {
+    margin-left: 0;
+    white-space: pre-wrap;
+  }
+}
+
+/* iPad overrides */
+@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
+
+  .mobile {
+    display: inherit;
+  }
+  .no-mobile {
+    display: none;
+  }
+}
index 857a4304906a23ff23e9ba0098b2df03f861488c..03b173f46ca9665e2be4574f99ec99e8e0fbf3dc 100644 (file)
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
-</HEAD>
-<BODY>
-<TABLE CLASS="page" SUMMARY="{title}">
-<TR><TD CLASS="body">
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR HEIGHT="36">
-<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
-SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
-<TD CLASS="sel"><A HREF="/">&nbsp;&nbsp;Home&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Administration&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Online&nbsp;Help&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Jobs&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Printers&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
-TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
-AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
-<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
-</TR>
-</TABLE>
-
-<TABLE CLASS="indent" SUMMARY="">
-<TR><TD STYLE="padding-right: 20px;">
-
-<H1>CUPS @CUPS_VERSION@</H1>
-
-<P>CUPS is the standards-based, open source printing system developed by
-<A HREF="http://www.apple.com/">Apple Inc.</A> for OS<SUP>&reg;</SUP> X and
-other UNIX<SUP>&reg;</SUP>-like operating systems.</P>
-
-</TD>
-<TD><A HREF="http://www.cups.org/"><IMG SRC="images/cups-icon.png" WIDTH="128"
-HEIGHT="128" ALT="CUPS"></A></TD>
-</TR>
-</TABLE>
-
-<TABLE CLASS="indent" SUMMARY="">
-<TR><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-right: 20px;">
-
-<H2>CUPS for Users</H2>
-
-<P><A HREF="help/overview.html">Overview of CUPS</A></P>
-
-<P><A HREF="help/options.html">Command-Line Printing and Options</A></P>
-
-<P><A HREF="help/whatsnew.html">What's New in CUPS 1.7</A></P>
-
-<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">User Forum</A></P>
-
-</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
-
-<H2>CUPS for Administrators</H2>
-
-<P><A HREF="admin">Adding Printers and Classes</A></P>
-
-<P><A HREF="help/policies.html">Managing Operation Policies</A></P>
-
-<P><A HREF="help/accounting.html">Printer Accounting Basics</A></P>
-
-<P><A HREF="help/security.html">Server Security</A></P>
-
-<P><A HREF="help/kerberos.html">Using Kerberos Authentication</A></P>
-
-<P><A HREF="help/network.html">Using Network Printers</A></P>
-
-<P><A HREF="help/ref-cupsd-conf.html">cupsd.conf Reference</A></P>
-
-<P><A HREF="http://www.cups.org/ppd.php">Find Printer Drivers</A></P>
-
-</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
-
-<H2>CUPS for Developers</H2>
-
-<P><A HREF="help/api-overview.html">Introduction to CUPS Programming</A></P>
-
-<P><A HREF="help/api-cups.html">CUPS API</A></P>
-
-<P><A HREF="help/api-filter.html">Filter and Backend Programming</A></P>
-
-<P><A HREF="help/api-httpipp.html">HTTP and IPP APIs</A></P>
-
-<P><A HREF="help/api-ppd.html">PPD API</A></P>
-
-<P><A HREF="help/api-raster.html">Raster API</A></P>
-
-<P><A HREF="help/ref-ppdcfile.html">PPD Compiler Driver Information File Reference</A></P>
-
-<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Developer Forum</A></P>
-
-</TD></TR>
-</TABLE>
-
-</TD></TR>
-<TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
-<A HREF="http://www.apple.com">Apple Inc.</A> Copyright 2007-2013 Apple
-Inc. All rights reserved.</TD></TR>
-</TABLE>
-</BODY>
-</HTML>
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <link rel="stylesheet" href="/cups.css" type="text/css">
+    <link rel="shortcut icon" href="/apple-touch-icon.png" type="image/png">
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=9">
+    <meta name="viewport" content="width=device-width">
+    <title>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</title>
+  </head>
+  <body>
+    <div class="header">
+      <ul>
+       <li><a href="http://www.cups.org/" target="_blank">cups.org</a></li>
+       <li><a class="active" href="/">Home</a></li>
+       <li><a href="/admin">Administration</a></li>
+       <li><a href="/classes/">Classes</a></li>
+       <li><a href="/help/">Help</a></li>
+       <li><a href="/jobs/">Jobs</a></li>
+       <li><a href="/printers/">Printers</a></li>
+      </ul>
+    </div>
+    <div class="body">
+      <div class="row">
+       <h1>CUPS @CUPS_VERSION@</h1>
+       <p>CUPS is the standards-based, open source printing system developed by <a href="http://www.apple.com/">Apple Inc.</a> for OS<sup>&reg;</sup> X and other UNIX<sup>&reg;</sup>-like operating systems.</p>
+      </div>
+      <div class="row">
+       <div class="thirds">
+         <h2>CUPS for Users</h2>
+         <p><a href="help/overview.html">Overview of CUPS</a></p>
+         <p><a href="help/options.html">Command-Line Printing and Options</a></p>
+         <p><a href="help/whatsnew.html">What's New in CUPS 1.7</a></p>
+         <p><a href="http://www.cups.org/lists.php?LIST=cups">User Forum</a></p>
+       </div>
+       <div class="thirds">
+         <h2>CUPS for Administrators</h2>
+         <p><a href="admin">Adding Printers and Classes</a></p>
+         <p><a href="help/policies.html">Managing Operation Policies</a></p>
+         <p><a href="help/accounting.html">Printer Accounting Basics</a></p>
+         <p><a href="help/security.html">Server Security</a></p>
+         <p><a href="help/kerberos.html">Using Kerberos Authentication</a></p>
+         <p><a href="help/network.html">Using Network Printers</a></p>
+         <p><a href="help/ref-cupsd-conf.html">cupsd.conf Reference</a></p>
+         <p><a href="http://www.cups.org/ppd.php">Find Printer Drivers</a></p>
+       </div>
+       <div class="thirds">
+         <h2>CUPS for Developers</h2>
+         <p><a href="help/api-overview.html">Introduction to CUPS Programming</a></p>
+         <p><a href="help/api-cups.html">CUPS API</a></p>
+         <p><a href="help/api-filter.html">Filter and Backend Programming</a></p>
+         <p><a href="help/api-httpipp.html">HTTP and IPP APIs</a></p>
+         <p><a href="help/api-ppd.html">PPD API</a></p>
+         <p><a href="help/api-raster.html">Raster API</a></p>
+         <p><a href="help/ref-ppdcfile.html">PPD Compiler Driver Information File Reference</a></p>
+         <p><a href="http://www.cups.org/lists.php?LIST=cups-devel">Developer Forum</a></p>
+       </div>
+      </div>
+    </div>
+    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright 2007-2013 Apple
+Inc. All rights reserved.</div>
+  </body>
+</html>
index f1b2dcc77a5f38df38991a1bee9d4ec7a250292b..8011f872c98a1ba33873036538d9ef7241acfd74 100644 (file)
@@ -835,6 +835,8 @@ cupsdReadClient(cupsd_client_t *con)        /* I - Client to read from */
   * Handle new transfers...
   */
 
+  cupsdLogClient(con, CUPSD_LOG_DEBUG, "Read: status=%d", status);
+
   if (status == HTTP_STATUS_OK)
   {
     if (httpGetField(con->http, HTTP_FIELD_ACCEPT_LANGUAGE)[0])
@@ -1061,6 +1063,8 @@ cupsdReadClient(cupsd_client_t *con)      /* I - Client to read from */
       switch (httpGetState(con->http))
       {
        case HTTP_STATE_GET_SEND :
+            cupsdLogClient(con, CUPSD_LOG_DEBUG, "Processing GET %s", con->uri);
+
             if ((!strncmp(con->uri, "/ppd/", 5) ||
                 !strncmp(con->uri, "/printers/", 10) ||
                 !strncmp(con->uri, "/classes/", 9)) &&
@@ -1311,6 +1315,8 @@ cupsdReadClient(cupsd_client_t *con)      /* I - Client to read from */
 
              type = mimeFileType(MimeDatabase, filename, NULL, NULL);
 
+              cupsdLogClient(con, CUPSD_LOG_DEBUG, "filename=\"%s\", type=%s/%s", filename, type ? type->super : "", type ? type->type : "");
+
               if (is_cgi(con, filename, &filestats, type))
              {
               /*
@@ -2719,10 +2725,10 @@ cupsdWriteClient(cupsd_client_t *con)   /* I - Client connection */
     {
       cupsdLogRequest(con, HTTP_STATUS_OK);
 
-      httpFlushWrite(con->http);
-
       if (httpIsChunked(con->http) && (!con->pipe_pid || con->sent_header == 1))
       {
+        cupsdLogClient(con, CUPSD_LOG_DEBUG, "Sending 0-length chunk.");
+
        if (httpWrite2(con->http, "", 0) < 0)
        {
          cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing for error %d (%s)",
@@ -2731,6 +2737,10 @@ cupsdWriteClient(cupsd_client_t *con)    /* I - Client connection */
          return;
        }
       }
+
+      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Flushing write buffer.");
+      httpFlushWrite(con->http);
+      cupsdLogClient(con, CUPSD_LOG_DEBUG, "New state is %s", httpStateString(httpGetState(con->http)));
     }
 
     cupsdAddSelect(httpGetFd(con->http), (cupsd_selfunc_t)cupsdReadClient, NULL, con);
@@ -3947,7 +3957,8 @@ write_file(cupsd_client_t *con,           /* I - Client connection */
 
   fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
 
-  con->pipe_pid = 0;
+  con->pipe_pid    = 0;
+  con->sent_header = 1;
 
   httpClearFields(con->http);
 
index eaf52d73dcc8f3ffdfa16d96f52a68ab2df80f4d..3deaf26c000b43c76bf5e976d4394882660e1767 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Add Class</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
@@ -37,4 +35,3 @@
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index 361958b67474c56685100ac5ea3ad048702cfb4e..14d4eb6f1a42fa756e5b830e1bd3dd7579d3dc31 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Add Printer</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
@@ -44,4 +42,3 @@ Share This Printer</TD>
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index ee6b5af9daeb6fd6896a29d26270c11b07c477e8..101f960173b2371db02e542fffb045fef47f4f61 100644 (file)
-<TABLE CLASS="indent" SUMMARY="Administration Tasks">
-<TR><TD VALIGN="TOP">
-
-<H2 CLASS="title">Printers</H2>
-
-<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>
-<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>
-<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM>
-{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></FORM>:}
-</P>
-
-<H2 CLASS="title">Classes</H2>
-
-<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>
-
-<P>
-<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Jobs"></FORM>
-</P>
-
-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
-
-<H2 CLASS="title">Server</H2>
-
-<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>
-<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Access Log"></FORM>
-<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Error Log"></FORM>
-<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Page Log"></FORM>
-</P>
-
-{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
-<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
-
-<FORM METHOD="POST" ACTION="/admin">
-<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
-
-{ADVANCEDSETTINGS?<P><B>Server Settings\:</B></P>
-
-<P><A HREF="/admin/">Advanced <SMALL>&#x25bc;</SMALL></A><BR>
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max clients\:
-<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Advertise web interface<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
-<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preserve job history<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximum jobs (0 for no limit)\:
-<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retain Metadata\:
-<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retain Documents\:
-<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max log file size\:
-<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
-
-:<P><B>Server Settings:</B></P>
-
-<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Advanced <SMALL>&#x25b6;</SMALL></A><BR>
-<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
-<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
-<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR>
-{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
-<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
-<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting</P>
-
-}
-<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Change Settings"></P>
-
-</FORM>}
-
-</TD></TR>
-</TABLE>
-
-<DIV CLASS="indent">
-
-<H2 CLASS="title">RSS Subscriptions</H2>
-
-<P>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM>
-</P>
-
-</DIV>
-
-{notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subscriptions">
-<THEAD><TR><TH>Name</TH><TH>Events</TH><TH>Queue Name</TH></TR></THEAD>
-<TBODY>{[notify_subscription_id]
-<TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
-</TBODY>
-</TABLE>:}
+<div class="row">
+  <div class="halves">
+    <H2 CLASS="title">Printers</H2>
+
+    <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>
+    <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>
+    <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM>
+    {have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></FORM>:}
+    </P>
+
+    <H2 CLASS="title">Classes</H2>
+
+    <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>
+
+    <P>
+    <FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Jobs"></FORM>
+    </P>
+  </div>
+  <div class="halves">
+    <H2 CLASS="title">Server</H2>
+
+    <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>
+    <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Access Log"></FORM>
+    <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Error Log"></FORM>
+    <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Page Log"></FORM>
+    </P>
+
+    {SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+    <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+    <FORM METHOD="POST" ACTION="/admin">
+    <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+
+    {ADVANCEDSETTINGS?<P><B>Server Settings\:</B></P>
+
+    <P><A HREF="/admin/">Advanced <SMALL>&#x25bc;</SMALL></A><BR>
+    <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+    <INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+    <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max clients\:
+    <INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Advertise web interface<BR>
+    <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR>
+    {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+    <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
+    <INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preserve job history<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Maximum jobs (0 for no limit)\:
+    <INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retain Metadata\:
+    <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retain Documents\:
+    <INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
+    <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max log file size\:
+    <INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+    :<P><B>Server Settings:</B></P>
+
+    <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Advanced <SMALL>&#x25b6;</SMALL></A><BR>
+    <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+    <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Share printers connected to this system<BR>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
+    <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Allow remote administration<BR>
+    {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Use Kerberos authentication (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+    <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Allow users to cancel any job (not just their own)<BR>
+    <INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Save debugging information for troubleshooting</P>
+
+    }
+    <P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Change Settings"></P>
+
+    </FORM>}
+  </div>
+</div>
+
+<div class="row">
+  <H2 CLASS="title">RSS Subscriptions</H2>
+
+  <P>
+  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM>
+  </P>
+
+  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subscriptions">
+  <THEAD><TR><TH>Name</TH><TH>Events</TH><TH>Queue Name</TH></TR></THEAD>
+  <TBODY>{[notify_subscription_id]
+  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
+  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
+  </TBODY>
+  </TABLE>:}
+</div>
\ No newline at end of file
index c5ab251b5478799ba9252e21965688ec88df0a88..5f46939628d6dc47eaa35b31ec71140cdaf604a7 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
 
 {CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
@@ -49,5 +47,3 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 
 </FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
 ALT="Busy Indicator"> Looking for printers...</P>}
-
-</DIV>
index 65096ad9a6773f9544922ead29448e253efcdff1..a5c80aafee28bd3397687e2952e1a2d4aa034b4f 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
 
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
@@ -61,4 +59,3 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index 992cd01fd6806286702a809f22d4de3990580c02..ee9338cc5c9f5cab52996409c57fa933d38ebb15 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
 
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
@@ -57,4 +55,3 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index 56a14a4cbfef1e954183a19031ef753dc55b9674..89a5eaf09673ea0b875c2e225f3b6887b43a84c5 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
@@ -49,4 +47,3 @@
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index 45d84de194b0d856a0e4bb7524c1dcecc365ba81..0c7f4548247e840ba9bfda428a58b447852ef14b 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
@@ -41,4 +39,3 @@ Printers"</A> for the correct URI to use with your printer.</P>
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index c062a16d5ad2d996784ea8f3c02bc93f51d5167e..6afd30295dee494059885bc7d88b66faed56f542 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Add Class</H2>
 
 <P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> has been added
 successfully.
-
-</DIV>
index 5f0277cb51387ed170b9dcd04db87a5c2a2d40b7..e5643791b5903b52a28d58935f0eb59af14ad6a6 100644 (file)
@@ -1,10 +1,6 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Delete Class {printer_name}</H2>
 
 <P><B>Warning:</B> Are you sure you want to delete class
 {printer_name}?</P>
 
 <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Class"></FORM></P>
-
-</DIV>
index a4ad46a0ad5382cd75b78f9da80aebb9331f9ea4..6c444680c54f39b50fbf30db9943a8ec45dc8476 100644 (file)
@@ -1,7 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Delete Class {printer_name}</H2>
 
 <P>Class {printer_name} has been deleted successfully.
-
-</DIV>
\ No newline at end of file
index ba46f10260905e1c3a03c17659b20620a18017c4..61e5151d24b1c2a7bed7c76d294c99d9928cf0c8 100644 (file)
@@ -1,3 +1 @@
-<DIV CLASS="indent">
 <H3 CLASS="title">Jobs</H3>
-</DIV>
index fe42c907bb2744b8fe749c0c0d61963bcf41cfba..02b98954607405b93dd0114826a089a5e27c2ef4 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Modify Class {printer_name}</H2>
 
 <P>Class <A HREF="/classes/{printer_name}">{printer_name}</A> has been
 modified successfully.
-
-</DIV>
\ No newline at end of file
index 477e0e8edb0b0cb7934b6614580c3024162dd623..0afb0d39f01e80422c47181fdcf1a7a6d9169ca3 100644 (file)
@@ -1,4 +1,3 @@
-<DIV CLASS="indent">
 <H2 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},
@@ -40,5 +39,3 @@
 media={media_default?{media_default}:unknown}
 {sides_default?sides={sides_default}:}</TD></TR>
 </TABLE>
-
-</DIV>
index 9a87439ca5dc86cd94b91acb05ba71bcad8d6839..a8dc6ffb9636103207376aec02e37f0d6174a703 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{title} On {printer_name}</H2>
 
 <P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
@@ -8,5 +6,3 @@ ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Printer command job
 {job_state=5?processing:{job_state=6?stopped:
 {job_state=7?canceled:{job_state=8?aborted:completed}}}}}}{job_state=9?:{job_printer_state_message?,
 <EM>"{job_printer_state_message}"</EM>:}}</P>
-
-</DIV>
index 8947382b19b89f5ea1d9d16e826615221c74f679..d8f9bb17de08b673e58d82bf30e9b9ca22649e3d 100644 (file)
@@ -5,8 +5,6 @@ function reset_config()
 }
 </SCRIPT>
 
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Edit Configuration File</H2>
 
 <FORM NAME="cups" METHOD="POST" ACTION="/admin/">
@@ -20,5 +18,3 @@ function reset_config()
 onClick="reset_config();"></P>
 
 </FORM>
-
-</DIV>
index feaed0f9040d605c8552358a5514a4fef606d274..652537b98193bcd8291e3f5ffbb7ffbe5de9815d 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{?title} {?printer_name} Error</H2>
 
 <P>Error:</P>
 
 <BLOCKQUOTE>Unknown operation "{op}"!</BLOCKQUOTE>
-
-</DIV>
index 86235732e10964a9d202cf38d847fbc3d04feb93..2ac1b8ff32734d9e0535b2783a6b51200736e491 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{?title} {?printer_name} Error</H2>
 
 <P>{?message?{message}:Error}:</P>
 
 <BLOCKQUOTE>{error}</BLOCKQUOTE>
-
-</DIV>
index 8aaf89c1828a7a8ba7ba7f50dd15373bf2ec0d93..ce9fa6b9a3d324d60a34b8a5854ea8ed02d9c56e 100644 (file)
@@ -1,38 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-       <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
-       <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
-       <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
-       {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
-       <SCRIPT TYPE="text/javascript"><!--
-       /* Show an error if cookies are disabled */
-       function check_cookies() {
-         if (!navigator.cookieEnabled) {
-               document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
-         }
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <link rel="stylesheet" href="/cups.css" type="text/css">
+    <link rel="shortcut icon" href="/apple-touch-icon.png" type="image/png">
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    {refresh_page?<meta http-equiv="refresh" content="{refresh_page}">:}
+    <meta http-equiv="X-UA-Compatible" content="IE=9">
+    <meta name="viewport" content="width=device-width">
+    <script type="text/javascript"><!--
+      /* Show an error if cookies are disabled */
+      function check_cookies() {
+       if (!navigator.cookieEnabled) {
+             document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
        }
-       --></SCRIPT>
-</HEAD>
-<BODY ONLOAD="check_cookies();">
-<TABLE CLASS="page" SUMMARY="{title}">
-<TR><TD CLASS="body">
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
-<TR HEIGHT="36">
-<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
-SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
-<TD CLASS="unsel"><A HREF="/">&nbsp;&nbsp;Home&nbsp;&nbsp;</A></TD>
-<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Administration&nbsp;&nbsp;</A></TD>
-<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
-<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Online&nbsp;Help&nbsp;&nbsp;</A></TD>
-<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;Jobs&nbsp;&nbsp;</A></TD>
-<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Printers&nbsp;&nbsp;</A></TD>
-<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
-TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
-VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
-<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
-</TR>
-<TR><TD COLSPAN="9">&nbsp;</TD></TR>
-</TABLE>
-<DIV ID="body">
+      }
+    --></SCRIPT>
+    <title>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</title>
+  </head>
+  <body onload="check_cookies();">
+    <div class="header">
+      <ul>
+       <li><a href="http://www.cups.org/" target="_blank">cups.org</a></li>
+       <li><a href="/">Home</a></li>
+       <li><a {SECTION=admin?class="active" :}href="/admin">Administration</a></li>
+       <li><a {SECTION=classes?class="active" :}href="/classes/">Classes</a></li>
+       <li><a {SECTION=help?class="active" :}href="/help/">Help</a></li>
+       <li><a {SECTION=jobs?class="active" :}href="/jobs/">Jobs</a></li>
+       <li><a {SECTION=printers?class="active" :}href="/printers/">Printers</a></li>
+      </ul>
+    </div>
+    <div class="body">
+      <div class="row">
+       <h1>{title}</h1>
index 09741b54f496b6bc7093676eb856da4a666c669d..b528f865e7c3540f53762ed746c1d785b49e06bc 100644 (file)
@@ -1,4 +1,3 @@
-<DIV CLASS="indent">
 <FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
 {TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
 
@@ -31,8 +30,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">
 {QTEXT?</UL>:}
 :<P>No matches found.</P>}
 <HR NOSHADE>:}
-{HELPTITLE?<H1>{HELPTITLE}</H1>
-<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="View Printable Version"></FORM>:
+{HELPTITLE?<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="View Printable Version"></FORM>:
 
 <H1>Online Help</H1>
 
index 4c1ebed851d90d155e4f3deeeb6be25d5feef4e1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-</DIV>
index 3e8fd4dadf95fcb55efe00d030f1469e0ece6386..0b0106ee94cffa41248e09267264994499938ff1 100644 (file)
@@ -1,7 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Cancel Job {job_id}</H2>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been canceled.
-
-</DIV>
index 58ce97fc91df1121ae1759d2040c819ba6742a36..3b5cd6a65d83396b190334b07d371c2570c923a6 100644 (file)
@@ -1,7 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Hold Job {job_id}</H2>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been held from printing.
-
-</DIV>
index 6ef0ff12e1ed31a1e148c1536b18dffeabb34bf9..c2f70469c0999d324a034ec69ba7b16f5927a4dc 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -23,5 +21,3 @@
 </TABLE>
 
 </FORM>
-
-</DIV>
index c4db0969680e49cf7e0eacf2354157cc0590b074..4893e24acaa7090844670dc8a1e3133ae4efd53a 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">{job_id?Move Job {job_id}:Move All Jobs}</H2>
 
 <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>
-
-</DIV>
index 8eb9a9667560592bd6024cfb15266b8ff097ec05..fe9379303c49da9e4c980bb22100aa5b6afc7ef7 100644 (file)
@@ -1,7 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Release Job {job_id}</H2>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been released for printing.
-
-</DIV>
index b91ced92635825d3acc155243a90b42ed98d470a..b5dfd958e86c67d92c65edeed0c864f4472cd319 100644 (file)
@@ -1,7 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Reprint Job {job_id}</H2>
 
 <P><A HREF="{job_printer_uri}">Job {job_id}</A> has been restarted.
-
-</DIV>
index e7547ba7bba4f45e40049e103690078e83f60290..a8a365b2db4f55fc2d734058151a621c73a89ff9 100644 (file)
@@ -1,5 +1,5 @@
-<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Show Active Jobs"></FORM>}
+{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Show Active Jobs"></FORM>}
 {?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Show Completed Jobs"></FORM>}
-{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Show All Jobs"></FORM>}</DIV>
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Show All Jobs"></FORM>}
 
 <P ALIGN="CENTER">{total=0?No jobs:Showing {#job_id} of {total} {?which_jobs=?active:{which_jobs=all?:completed}} job{total=1?:s}}.</P>
index a594439ee3b68e3cf4bc02c9830f6aa84e87af7b..9fe7b12dd184da9a549133920d4b0b0b1dfd08f5 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Available Printers</H2>
 
 {#device_uri=0?<P>No printers found.</P>
@@ -7,5 +5,3 @@
 <LI><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="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Add This Printer"></FORM>
 {device_make_and_model} ({device_info})</LI>
 }</UL>}
-
-</DIV>
index 31f7b9ce3c9fd02506f0cb911f3e88aba7c18914..1aa4fe63181a0fbba8d2049af0370800691ab1af 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Modify Class {printer_name}</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
@@ -31,4 +29,3 @@
 </TABLE>
 
 </FORM>
-</DIV>
\ No newline at end of file
index bdf3df60421d5dd58f9a46c5c2c4b7c46cb327da..72b4bc5e20f46d489ab51d7f418d20b4dff252f1 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Modify {printer_name}</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
@@ -39,4 +37,3 @@ Share This Printer</TD>
 </TABLE>
 
 </FORM>
-</DIV>
index 6b3120337cd6413103ab0039530f82c086e4cdfb..70bf3d33e880ffcd9e208cb26fb4e64e7fd9c76f 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Change Settings</H2>
 
 <P>The server was not restarted because no changes were made to
 the configuration...</P>
-
-</DIV>
index 3e987ce64f2342ba88154338b53e3684393468ba..db5d8dad5849356d0da8d2cf34f611ff5771b787 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Accept Jobs On {is_class?Class:Printer} {printer_name}</H2>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 is now accepting jobs.</P>
-
-</DIV>
index 9a6e798e9aa6d7c49592ebe50c3f2dc4276f7f50..0ccf6d3eed5085ce210a905145e823102ce23373 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Add Printer</H2>
 
 <P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been added
 successfully.
-
-</DIV>
index 6f8104e2310cabe7e55bcc094c2dfdb92395a68e..7bce3f908cf7059968573b1f20bc0017ea34be34 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Set Default Options for {printer_name}</H2>
 
 <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.
-
-</DIV>
index fce9e3494bca56376292bf61073f8d815e300079..c1b2b1706fe343ad8a3c13858936ac724ad96b7d 100644 (file)
@@ -1,10 +1,6 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Delete Printer {printer_name}</H2>
 
 <P><B>Warning:</B> Are you sure you want to delete printer
 {printer_name}?</P>
 
 <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Printer"></FORM></P>
-
-</DIV>
index 72a7b5ea8c546d786c26b30171a37381a88b3130..af21dcacd7f127ff812c2b6ef6f312f2fae90d72 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Set {is_class?Class:Printer} {printer_name} As Default</H2>
 
 <P>{is_class?Class:Printer} <A
@@ -9,5 +7,3 @@ has been made the default printer on the server.</P>
 <BLOCKQUOTE><B>Note:</B> Any user default that has been set via
 the <TT>lpoptions</TT> command will override this default
 setting.</BLOCKQUOTE>
-
-</DIV>
index d8a31ae6153489746b7a4efc855227eeb8750f1a..ea462cee4a5eaba2d55f2e07b8ab14e4d7eb22ef 100644 (file)
@@ -1,7 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Delete Printer {printer_name}</H2>
 
 <P>Printer {printer_name} has been deleted successfully.
-
-</DIV>
index ba46f10260905e1c3a03c17659b20620a18017c4..61e5151d24b1c2a7bed7c76d294c99d9928cf0c8 100644 (file)
@@ -1,3 +1 @@
-<DIV CLASS="indent">
 <H3 CLASS="title">Jobs</H3>
-</DIV>
index b61e8e34a2b79e2859348e0fb15578897faf7a46..1193a48d8741526168f03333b75320d49978dad1 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Modify Printer {printer_name}</H2>
 
 <P>Printer <A HREF="/printers/{printer_name}">{printer_name}</A> has been
 modified successfully.
-
-</DIV>
\ No newline at end of file
index 8cf7c1461766f5a0c45908127d8816e6292da9b0..00819bc841024e8e594c368b9ee6d687c21e925f 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Purge Jobs On {is_class?Class:Printer} {printer_name}</H2>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been purged of all jobs.</P>
-
-</DIV>
\ No newline at end of file
index 5f1c79195b4f61e5fb51ebff44cc3fbf4bf2a556..823c7e5070363bd2a8630faf63348501d6a7bacb 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Reject Jobs On {is_class?Class:Printer} {printer_name}</H2>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 is no longer accepting jobs.</P>
-
-</DIV>
index 3eaed13d17486ae6cd2359fb0eb65d6b0addf08e..76d44ed810efd7c18ad365f124d877c72fd20ded 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Resume {is_class?Class:Printer} {printer_name}</H2>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been resumed.</P>
-
-</DIV>
\ No newline at end of file
index b74e87135d968e1c6bb39418c9dc5c368eae9da6..8c264b21ea0a617ebecff89995449762bfc9f27f 100644 (file)
@@ -1,9 +1,5 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Pause {is_class?Class:Printer} {printer_name}</H2>
 
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 has been paused.</P>
-
-</DIV>
\ No newline at end of file
index 78fc08beae30bb7a03275597afe45dd7bd67c190..b364d34a1bcff5189c371b55b05c7be37bb401a1 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 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},
@@ -43,5 +41,3 @@
 media={media_default?{media_default}:unknown}
 {sides_default?sides={sides_default}:}</TD></TR>
 </TABLE>
-
-</DIV>
\ No newline at end of file
index bdfca876fb398c608f5edbc1e93258d2abf655de..6455652f8977adc9509489bbe9494688c077ac88 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Change Settings</H2>
 
 <P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
 ALT="Busy Indicator"> Please stand by while the server restarts...</P>
-
-</DIV>
index 3e7db4669c8effb54fb7f8fc09d1ee257a6efcf9..91e0981aa51b99dec99bb5d8b192d260b8837bfa 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Set Default Options for {printer_name}</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
index 11adc7012522eb3598c8389955d66de5ed2a48cf..b92988a7f015b8e502f9c150542e7357233630f6 100644 (file)
@@ -12,5 +12,3 @@ for (var i = 0; i < paramtables.length; i++)
 }
 --></SCRIPT>
 </FORM>
-
-</DIV>
index c288b3649b04898f4a2b5c6bfa1f0b280a0b069a..6153d79504859e55e1c1dec32aa59e0ececc874e 100644 (file)
@@ -1,5 +1 @@
-<DIV CLASS="indent">
-
 <P>Subscription {subscription_name} has been added successfully.</P>
-
-</DIV>
index 86f2c1069126ee4b4f1132ae36f831920a697ff2..46662ccdb2480da93fba3f9c013dbbf393b1e1af 100644 (file)
@@ -1,5 +1 @@
-<DIV CLASS="indent">
-
 <P>Subscription #{notify_subscription_id} has been canceled.</P>
-
-</DIV>
index 59e314a8d4618091249ad1ab570207f16d921157..44a74f288a63c11903794e8190dfb409fe1e62f7 100644 (file)
@@ -1,8 +1,4 @@
-<DIV CLASS="indent">
-
 <H2 CLASS="title">Print Test Page On {printer_name}</H2>
 
 <P>Test page sent; job ID is <A HREF="/{SECTION}/{printer_name}">
 {printer_name}-{job_id}</A>.</P>
-
-</DIV>
index 12217d7f51c2f7bc47822bc0b7dd0bf3d72e3b61..d2713646b66b004edd42912e430093f242018c19 100644 (file)
@@ -1,8 +1,6 @@
-</DIV></TD></TR>
-<TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
-<A HREF="http://www.apple.com">Apple Inc.</A> Copyright 2007-2013 Apple
-Inc. All rights reserved.</TD></TR>
-</TABLE>
-</BODY>
-</HTML>
+      </div>
+    </div>
+    <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright 2007-2013 Apple
+Inc. All rights reserved.</div>
+  </body>
+</html>
index 0889f3f31ecd8e824081482b11157ecaa8439594..c88e033133add147342119bb8318c4814ae6dc5a 100644 (file)
@@ -1,5 +1,3 @@
-<DIV CLASS="indent">
-
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
@@ -27,4 +25,3 @@
 </TABLE>
 
 </FORM>
-</DIV>