]> git.donarmstrong.com Git - debbugs.git/commitdiff
add spacefun theme to debbugs Signed-off-by: Martin Zobel-Helas <zobel@debian.org> spacefun.zobel
authorMartin Zobel-Helas <zobel@debian.org>
Fri, 23 Mar 2012 21:08:49 +0000 (22:08 +0100)
committerDon Armstrong <don@donarmstrong.com>
Fri, 23 Mar 2012 21:26:21 +0000 (14:26 -0700)
html/debian-bugs.css [new file with mode: 0644]
html/debian.css [new file with mode: 0644]
templates/en_US/cgi/bugreport.tmpl
templates/en_US/cgi/bugreport_buginfo.tmpl
templates/en_US/cgi/bugreport_pkginfo.tmpl
templates/en_US/html/post_title.tmpl

diff --git a/html/debian-bugs.css b/html/debian-bugs.css
new file mode 100644 (file)
index 0000000..1cc68a7
--- /dev/null
@@ -0,0 +1,101 @@
+/*
+ * © 2011, David Paleino <dapal@debian.org>
+ *
+ * Copyleft : This work is free, you can copy, spread, and modify it under
+ * the terms of the Free Art License http://artlibre.org/licence/lal/en/
+ *
+ *      Font size table
+ *      ---------------
+ *      Browser default 16px
+ *
+ *      14px   87.5%           body    
+ *      24px   1.714em
+ *      20px   1.429em
+ *      18px   1.286em
+ *      16px   1.143em
+ *      12px   0.857em
+ *      11px   0.786em
+ *      8px    0.57em
+
+ */
+
+p {
+       margin: 0;
+}
+address {
+       font-size: 0.786em;
+}
+hr {
+       margin: 0;
+}
+div.infobox {
+       position: relative;
+       float: right;
+       border: 1px dashed;
+       margin-right: 50px;
+}
+.versiongraph {
+       float: right;
+       #border-left: 1px solid #d2d3d7;
+       padding: 5px;
+}
+.versiongraph:hover {
+       background-color: #eee;
+}
+.pkginfo .buginfo p {
+       margin: 0;
+       padding: 0;
+       line-height: 1.2em;
+}
+.infmessage {
+       display: none;
+       color: #686868;
+       font-size: 0.786em;
+}
+.msgreceived {
+       color: #686868;
+       font-size: 0.786em;
+}
+#toggleuseless {
+       font-size: 0.786em;
+}
+pre {
+       font-family: monospace;
+       overflow: visible;
+       margin: 0;
+}
+pre.headers {
+       line-height: 1.2em;
+       background-color: #f5f6f7;
+       border: #a7a7a7 1px solid;
+}
+pre.mime {
+       margin: 0.5em;
+}
+h2.outstanding {
+}
+ul.bugs {
+       list-style: none;
+       padding:0;
+}
+#navbar ul {
+       clear: left;
+}
+#spamlink {
+       margin: 20 0 20 0;
+       font-size: 0.786em;
+}
+#spamlink:before {
+       content: url("/Pics/admon-important.png");
+       margin-left: 0.5em;
+       margin-right: 0.5em;
+       vertical-align: -50%;
+}
+div#body {
+       padding:0 10px 0 52px;
+}
+code {
+       color: #686868;
+       font-family: inherit;
+       
+}
diff --git a/html/debian.css b/html/debian.css
new file mode 100644 (file)
index 0000000..47c0dda
--- /dev/null
@@ -0,0 +1,871 @@
+/*
+       http://www.debian.org Stylesheet
+
+       Copyright 2011 Kalle Söderman
+
+       This stylesheet is free software; you can redistribute it and/or modify it
+       under the terms of the GNU General Public License, version 2, as published by
+       the Free Software Foundation.
+
+       This program is distributed in the hope that it will be useful, but WITHOUT ANY
+       WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+       PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License along with
+       this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+       Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+       The license text can also be found at http://www.gnu.org/copyleft/gpl.html and
+       /usr/share/common-licenses/GPL-2 on Debian GNU/Linux.  
+*/
+       
+/*     
+       Font size table (Browser default 16px)
+
+       pixels      relative
+       --------------------
+       36px        2.25em
+       31px        0.5161em
+       24px        1.5em
+       21px        1.3125em
+       18px        1.125em
+       16px        1em
+       14px        0.875em
+       12px        0.75em
+       11px        0.6875em
+       10px        0.625em
+       9px         0.5625em
+       --------------------
+*/
+
+/* Reset */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p,
+blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em,
+font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl,
+dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody,
+tfoot, thead, tr, th, td { 
+       margin: 0;
+       padding: 0;
+       border: 0;
+       outline: 0;
+       font-weight: inherit;
+       font-style: inherit;
+       font-size: 100%;
+       font-family: inherit;
+       vertical-align: baseline;
+}
+
+body            { line-height: 1; color: black; background: white; }
+ol, ul          { list-style: none; }
+table           { border-collapse: separate; border-spacing: 0; }
+blockquote, q   { quotes: "" ""; }
+html            { background-color: transparent; }
+:focus          { outline: 1px dotted grey; }
+caption, th, td { text-align: left; font-weight: normal; }
+blockquote:before, blockquote:after, q:before, q:after { content: ""; }
+
+/* Main */
+
+body {
+       margin: 0;
+       font: normal 100% sans-serif;
+       line-height: 1.5;
+       color: #222;
+       background-color: white;
+       background-image:url('http://www.debian.org/Pics/gradient.png');
+       background-position: 0 0;
+       background-repeat: repeat-x;
+       /* Uncomment to show baseline grid 
+       background-image: url('24grid.png');
+       background-position: 30px 9px; 
+       */
+}
+#content {
+       margin: 0 10px 0 52px;
+}
+#inner {
+       position: relative;
+}
+#maincol {
+       margin: 0 15em 1.5em 0;
+}
+
+/* Header */
+
+#header {
+       margin:0;
+       padding:0 10px 0 52px; 
+}
+#header a:link
+, #header a:visited
+, #second-nav a:link
+, #second-nav a:visited {
+       text-decoration: none;
+}
+#header a:hover
+, #second-nav a:hover {
+       text-decoration: underline;
+}
+#breadcrumbs {
+       margin:0;
+       font-size: 0.75em;
+       text-transform: lowercase;
+       line-height: 2;
+       background-color: transparent;
+       background-color: #f5f6f7;
+       border-bottom: 1px solid #d2d3d7 ;
+       min-height: 20px;
+}
+#breadcrumbs:before {
+       content: "/";
+       margin-left: 0.5em;
+       margin-right: 0.5em;
+}
+p.section {
+       margin: 0;
+       padding: 0 5px 0 5px;
+       font-family:monospace;
+       line-height: 16px;
+       color:white;
+       text-transform: uppercase;
+       letter-spacing: 0.08em;
+       position:absolute;
+       top: 0px;
+       left:52px;
+       background-color: #c70036;
+}
+p.section a {
+       color: white;
+       text-decoration: none;
+}
+p.section a:hover {
+       color:white;
+       text-decoration: underline;
+}
+#navbar {
+       background-color: transparent;
+       list-style:none;
+       display:block;
+       border-bottom:1px solid #c70036;
+       text-indent:0;
+       padding: 0;
+       margin-top:0;
+       margin-bottom:0;
+}
+#navbar ul {
+       margin: 0;
+       padding: 0;
+       clear: both;
+       overflow: hidden;
+       min-height: 45px;
+}
+#navbar li {
+       list-style: none;
+       float: left;
+       padding: 0;
+       margin: 0;
+}
+#navbar a:link
+, #navbar a:visited {
+       padding: 1.75em 0.5em 0.25em 0.5em;
+       border-left: 1px solid transparent;
+       border-right: 1px solid transparent;
+       display: block;
+       text-decoration: none;
+}
+#navbar a:visited {
+       color: #54638c;
+}
+#navbar a:hover
+, #navbar a:visited:hover {
+       background-color: #f5f6f7;
+       border-left: 1px solid  #d2d3d7;
+       border-right: 1px solid #d2d3d7;
+       text-decoration: underline;
+}
+ul.subnav {
+       list-style: none;
+       margin-left: 0;
+       padding-left: 0;
+       margin-top: 0;
+}
+ul.subnav li {
+       display: inline;
+       margin-right: 1em;
+}
+#searchbox {
+       text-align:left;
+       line-height: 1;
+       margin: 0 10px 0 0.5em;
+       padding: 1px 0 1px 0;
+       position: absolute;
+       top:0;
+       right:0;
+       font-size: 0.75em;
+}
+#searchbox p {
+       margin: 0;
+       padding: 0;
+}
+#upperheader {
+       margin:0;
+       padding:0;
+}
+#logo {
+       position:absolute;
+       top:0;
+       left:0;
+       padding: 0;
+       background-color: transparent;
+       border: 1px solid transparent;
+       border-top: 0;
+       width: 50px;
+       height: 5.07em;
+       min-height: 65px;
+}
+#logo a {
+       display: block;
+       position: relative;
+       padding: 0;
+       height: 100%;
+       min-height: 65px;
+}
+#logo img {
+       margin-top: 5px;
+       position: absolute;
+       bottom: 0.3em;
+       overflow: auto;
+}
+#logo:hover {
+       border: 1px solid #d2d3d7 ;
+       border-top: 0;
+       background-color: #f5f6f7;
+}
+
+/* Links */
+
+a:link {
+       color: #0035c7;
+       text-decoration: underline;
+}
+a:visited {
+       color: #54638c;
+}
+a:link:hover {
+       text-decoration: none;
+       color: #00207a;
+}
+a:visited:hover {
+       text-decoration: none;
+}
+a:active {
+       color:#c2c3c7;
+}
+a img {
+       border:0;
+}
+a.rss_logo {
+       font-size: 0.75em;
+       float: right;
+       width: 35px;
+       line-height: 10px;
+       color: #ffffff;
+       background-color: #ff6600;
+       font-weight: bold;
+       font-family: sans-serif;
+       text-align: center;
+       text-decoration: none;
+       padding: 0.25em;
+       margin-left: 0.25em;
+       border: 1px solid #ff6600;
+}
+
+a.rss_logo:hover {
+       background-color: white;
+       border: 1px solid #ff6600;
+       color: #ff6600;
+}
+
+a.rss_logo.generic {
+       background-color: #ff8800;
+}
+
+a.rss_logo.generic:hover {
+       background-color: #ee7700;
+}
+
+
+/* Secondnav */
+
+#second-nav {
+       width: 16em;
+       font-size: 0.75em;
+       line-height: 1.5;
+       float: right;
+       top: 0;
+       right: 0;
+       margin: 3em 0 0 0;
+       padding: 0 0 0 1em;
+       border-left: 1px solid #d2d3d7 ;
+}
+#second-nav ul {
+       padding:0;
+       margin:0;
+       list-style:none;
+}
+#second-nav ul ul {
+       margin-left: 1em;
+}
+#second-nav li {
+       font-weight: normal;
+       margin:0;
+       padding:0;
+}
+#second-nav p {
+       line-height: 2;
+       font-weight: bold;
+       margin: 0;
+}
+#second-nav h2 {
+       margin:0;
+}
+
+/* Typography */
+
+p {
+       margin: 1.5em 0 1.5em 0;
+}
+strong {
+       font-weight: bold;
+}
+em {
+       font-style: italic;
+       color: #444;
+}
+small {
+       font-size: 0.75em;
+}
+sup {
+       font-size: 0.75em;
+       vertical-align:top;
+}
+h1
+, h2
+, h3
+, h4
+, h5
+, h6 {
+       font-weight: 600;
+       color: black;
+}
+h1 {
+       font-weight: normal;
+       font-size: 1.8em;
+       line-height: 0.83333;
+       margin: 0.83333em 0 0.83333em 0;
+}
+h2 {
+       font-size: 1.4em;
+       font-weight: normal;
+       line-height: 1.0714286;
+       margin: 1.0714286em 0 1.0714286em 0;
+}
+h3 {
+       font-size: 1.125em;
+       line-height: 1.333em;
+       margin: 1.333em 0 0 0;
+}
+h4 {
+       font-weight: normal;
+       font-style: italic;
+       margin: 1.5em 0 1.5em 0;
+       color: #444;
+}
+h5 {
+       font-style: italic;
+       font-size: 0.75em;
+       margin: 2em 0 2em 0;
+}
+ol,ul {
+       padding-left: 1.5em;
+       margin-left:0;
+       margin: 1.5em 0 1.5em 0;
+}
+ol>ol, ul>ul, li>ol, li>ul {
+       margin: 0;
+}
+
+ol {
+       list-style-type: decimal;
+}
+ul {
+       list-style-type: disc;
+}
+th {
+       font-weight: bold;
+       margin: 1.5em 0 1.5em 0;
+}
+hr {
+       border: none;
+       background-color: #bbb;
+       height: 1px;
+       margin: 1.4375em 0 1.5em 0;
+}
+pre {
+       margin: 1.5em 0 1.5em 0;
+       overflow: auto;
+       font-family: monospace;
+       white-space: pre;
+       color: black;
+}
+tt, code {
+       font-family: monospace;
+       white-space: pre;
+       color: black;
+}
+dt {
+       margin: 1.5em 0 0 0;
+       font-weight: bold;
+}
+dd {
+       margin:  0 0 0 1.5em;
+}
+blockquote {
+       font-size: 0.75em;
+       margin: 2em;
+       line-height: 2;
+}
+cite {
+       font-style: italic;
+       color: #444;
+}
+acronym, abbr {
+       text-transform: uppercase;
+       font-size: 0.9em;
+}
+.toc {
+       font-size: 0.75em;
+       list-style:none;
+       background-image: url('Pics/greydot.png');
+       background-position: bottom left;
+       background-repeat: repeat-x;
+       line-height:1.833;
+       padding: 0;
+       max-width: 62%;
+       margin: 2em 0 2em 0;
+}
+.toc li {
+       background-image: url('Pics/greydot.png');
+       background-position: top left;
+       background-repeat: repeat-x;
+       padding: 0.0833em 0 0.0833em 0;
+ }
+.toc a {
+       display:block;
+       text-decoration: none;
+}
+.toc a:hover {
+       display:block;
+       background-color: #f0f0f4;
+       text-decoration: underline;
+}
+.toc dt {
+       margin: 0;
+       background-image: url('Pics/greydot.png');
+       background-position: top left;
+       background-repeat: repeat-x;
+       padding: 0.0833em 0 0.0833em 0;
+}
+
+/* Sitemap */
+
+.card {
+       clear:both;
+       margin:1.5em 0 1.5em 0;
+       background-position: 0 -50px;
+       background-repeat: repeat-x;
+       padding:0;
+}
+.card ul {
+}
+.card ul li {
+       list-style:none;
+}
+.card h2 {
+}
+.lefthalf {
+       float:left;
+}
+.righthalf {
+       margin-left:50%;
+}
+.lefthalf ul {
+       margin-top:0;
+}
+
+/* Footer */
+
+#footer {
+       font-size: 0.75em;
+       border: 1px solid #dfdfe0;
+       padding:1em;
+       background-color: #f5f6f7;
+       margin: 0 10px 0 52px;
+       line-height: 1.5em;
+       border-left: 0;
+       border-right: 0;
+       clear: both;
+}
+#content #footer {
+       margin-left: 0;
+}
+#footer p {
+       margin: 1em 0 1em 0;
+}
+#footer hr {
+       border-top: 1px solid #d2d3d7;
+       border-bottom: 1px solid white;
+       height: 0;
+}
+#footer .editbar li {
+       display: inline;
+       margin-right: 2em;
+}
+#footer .info {
+}
+#fineprint {
+       margin-bottom: 1em;
+}
+#footermap {
+       list-style:none;
+       margin: 0 0 0 0;
+       padding: 0;
+       width:100%;
+       overflow: hidden;
+       border: 0;
+}
+ul#footermap-cola a
+, ul#footermap-colb a
+, ul#footermap-colc a
+, ul#footermap-cold a
+, ul#footermap-cole a {
+       padding-left: 0;
+}
+ul#footermap-cola
+, ul#footermap-colb
+, ul#footermap-colc
+, ul#footermap-cold
+, ul#footermap-cole {
+       float:left;
+       width: 19%;
+       min-width: 11em;
+       height: 12em;           /* Update when adding items */
+       margin:0 1% 0 0;
+       padding: 2em 0 0 0;
+       list-style: none;
+}
+ul#footermap-cole {
+       width: 18.9%;
+       margin-right:0;
+}
+#footermap-wrap {
+       padding:2em;
+       border-top: 1px solid white;
+}
+#footermap a {
+       margin: 0;
+}
+#footermap ul{
+       list-style: none;
+       padding:0;
+}
+#footermap li {
+       text-indent:0;
+       background-color: transparent;
+       font-weight:bold;
+}
+#footermap li ul {
+       margin: 0;
+       padding: 0;
+}
+#footermap li li {
+       margin:0;
+       text-indent:0;
+       padding:0;
+       font-weight:normal;
+       border:0;
+       background-image:none;
+       background-color:transparent;
+}
+#serverselect {
+}
+#serverselect input
+, #serverselect option 
+, #serverselect select {
+}
+#serverselect ul {
+       display: inline;
+       margin-left: 2em;
+}
+#serverselect li {
+       list-style: none;
+       display: inline;
+       padding:0 1em 0 1em;
+       margin:0;
+}
+#serverselect form p {
+       margin:0;
+       padding:0;
+       line-height: 1;
+}
+.lcol50 {
+       float: left;
+       width: 49%;
+       font-size:0.75em;
+       margin:0 0 0 0;
+       padding:0 0.5em 0 0;
+}
+.lcol50 h2 {
+       margin-top:0;
+}
+.rcol50 {
+       margin:0 0 0 51%;
+       padding:0;
+       font-size:0.75em;
+}
+#pageLang {
+       position: relative;     /*  establish a containing box. needed for
+                                   langContainer */
+}
+form#pageLang {
+       display: inline;
+}
+
+/* Extras */
+
+input:focus {
+       background-color:#FFFFCB;
+       
+}
+.hidecss {
+       display: none;
+}
+.clear {
+       clear:both
+}
+#clear {
+       clear:both;
+       border:0;
+       height:1px;
+       display:block;
+}
+.quicklist {
+       list-style: none;
+       font-size: 0.75em;
+       margin: 2em 0 2em 0;
+       padding:0;
+       text-indent:0;
+       line-height: 2em;
+}
+.quicklist li  {
+       display:inline;
+}
+.item p{
+       margin: 0;
+}
+.item h2
+, .item p
+, .item ul{
+       margin-right: 10px 
+}
+.item h2
+, .item h3
+, .item h4
+, .item h5 {
+       margin-top: 0;
+}
+.line {
+       padding: 0;
+       width: auto;
+       overflow: hidden;
+       }
+div.downloads {
+       border-top: 0.17em solid #339900;
+       margin: 1.33em 0 0 0; 
+}
+.downloads ul.downlist {
+       margin:0;
+}
+div.downloads .col50 { 
+       border-top: 0.15em solid #339900;
+}
+ul.downlist {
+       padding-left: 30px;
+       text-indent:0;
+       background: url('Pics/emblem-downloads.png') no-repeat 0 0.15em;
+       min-height: 23px;
+       /* 
+        * border-top: 0.17em solid #339900;
+        */
+}
+ul.quicklist.downlist {
+       border-top: 0.17em solid #339900;
+       padding-top: 0.25em;
+       margin-top: 1.6em;
+}
+ul.downlist li {
+       display: inline;
+}
+ul.downlist li:after {
+       content: ', ';
+}
+ul.downlist li:last-child:after {
+       content: '';
+}
+div.tip
+, div.important
+, div.warning
+, div.note 
+, div.trans-note {
+       padding:0 2em 0 4em;
+       margin: 1.85em 0 1.85em 0;
+       background-repeat: no-repeat;
+       background-position: 0.5em 0.5em;
+       font-size: 0.75em;
+       line-height: 2em;
+       background-color:#FFFFCB;
+       border:0.15em solid #CCCCA3;
+}
+div.tip p
+, div.important p
+, div.warning p
+, div.note p 
+, div.trans-note p {
+       margin: 1em 0 1em 0;
+}
+div.tip {
+       background-image: url('http://www.debian.org/Pics/admon-tip.png');
+}
+div.important{
+       background-image: url('http://www.debian.org/Pics/admon-important.png');
+}
+div.warning {
+       background-image: url('http://www.debian.org/Pics/admon-warning.png');
+}
+div.note
+, div.trans-note  {
+       background-image: url('http://www.debian.org/Pics/admon-note.png');
+}
+
+/* Layout Elements */
+
+.col50
+, .cardleft
+, .cardright {
+       width:47.5%;
+       float: left;
+       padding-bottom: 1.5em;
+}
+.lastcol
+, .cardright {
+       margin: auto;
+       width: 47.5%;
+       float:left;
+       padding-right: 0;
+       margin-left: 5%;
+}
+.lastcol h2
+, .lastcol p
+, .lastcol ul {
+       margin-right:0;
+}
+.cardleft h2 {
+       margin-right: 1em;
+}
+.cardright div {
+       margin-left: 1.5em;
+}
+.cardright h2 {
+       margin-left: 1em;
+}
+.votemenu a {
+       display:block;
+}
+table.vote td, table.vote th {
+       padding-right: 1.5em;
+}
+#maincol.with-toolbox {
+       margin-right: 14em;
+}
+div.tabular table, table.tabular, table.vendors {
+/*     border-bottom: 1px solid #a9abb3;
+       border-top: 1px solid #a9abb3; */
+       border-bottom: 0.15em solid #666;
+       border-top: 0.15em solid #666;
+       width: auto;
+       font-size: 0.75em;
+       line-height: 2em;
+       margin-bottom: 4em;
+       margin-top: -0.169em;
+}
+table td {
+       padding-right: 1.5em;
+}
+div.tabular table tr, table.tabular tr, table.vendors tr {
+       width: 100%;
+}
+table th {
+       padding-right: 1.5em;
+}
+div.tabular table td, table.tabular td, table.vendors td {
+       background-image: url(Pics/greydot.png);
+       background-position: top left;
+       background-repeat: repeat-x;
+}
+div.tabular table > td:fist-child, table.tabular  > td:fist-child, table.vendors  > td:fist-child {
+       background-image: none;
+}
+#pageLang p, #pageLang form {
+       display: inline;
+}
+.inline  a {
+       float: left;
+       margin-right: 1em;
+}
+#langSelector {
+       color: #0035c7;
+/*     text-decoration: underline; */
+}
+#langSelector:hover {
+       cursor: pointer;
+/*     text-decoration: none; */
+}
+#langContainer {
+       #background-color: #f5f6f7;
+       background-color: white;
+       background-image:url('Pics/gradient-flipped.png');
+       background-position: bottom;
+       background-repeat: repeat-x;
+       display: none;
+       position: absolute;
+       left: -1em;
+       border-bottom: 1px solid #dfdfe0;
+       margin-right: -1em;
+       min-width: 100%;        /* make it reach the right edge if only a few
+                                  languages are available */
+       padding: 0.5em 1em 1em 1em;
+}
+#langContainer a {
+       margin-right: 1em;
+}
+#pageLang:hover #langContainer {
+    display: block;
+}
+
+/* for l10n-arabic */
+.bidi {
+       direction: rtl;
+       text-align: right;
+}
+
index 070005abdd1e40517e1449e4269ff029054c993b..c38fc3670fd42ea3a417c6b58b5dc29fe666ca98 100644 (file)
@@ -16,35 +16,67 @@ function toggle_infmessages()
 </script>
 </head>
 <body>
-<h1>{html_escape($config{project})} {html_escape($config{bug})} report logs - 
-<a href="mailto:{$bug_num}@{html_escape($config{email_domain})}">#{$bug_num}</a><br/>
-{html_escape($status{subject})}</h1>
+<div id="header">
+  <div id="upperheader">
+    <div id="logo">
+     <a href="./" title="Debian Home"><img src="http://www.debian.org/Pics/openlogo-50.png" alt="" width="50" height="61"></a>
+    </div> <!-- end logo -->
+    <p class="section"><a href="/">Bugs</a></p>
+    <div id="searchbox">
+      <form name="p" method="get" action="http://search.debian.org/cgi-bin/omega">
+        <p>
+          <input name="P" value="" size="27">
+          <input type="submit" value="Search">
+        </p>
+      </form>
+    </div>
+    <!--<p id="bugnumber">Bug #569503</p>-->
+    <div id="navbar">
+      <ul>
+        <li><a href="http://{$config{subscription_domain}/$ptslinkk">Package Tracking System</a></li>
+        <!-- <li><a href="http://qa.debian.org/developer.php?login=dapal%40debian.org">Maintainer page</a></li> -->
+        {if (not $status{archived}) {
+            $output .=  qq(<li><a href="mailto:$bug_num\@$config{email_domain}">Reply</a></li> ).
+             qq(<li> <a href="mailto:$bug_num-subscribe\@$config{email_domain}">Subscribe</a> );
+        }}
+      </ul>
+    </div>
+  </div>
+
+  <div id="breadcrumbs">
+    <a href="/" title="Bugs">bugs</a>&nbsp;/&nbsp;<a href="pkgreport.cgi?src=gthumb">src:gthumb</a>&nbsp;/&ensp;<a href="pkgreport.cgi?package=gthumb">gthumb</a>&nbsp;/&ensp;#{$bug_num}
+  </div> <!-- end navbar -->
+</div>
+<div id="content">
+       <div class="index_include">
+
 <div class="versiongraph">{$version_graph}</div>
-{include(q(cgi/bugreport_pkginfo))}
-{include(q(cgi/bugreport_buginfo))}
+<h1>
+{html_escape($status{subject})}</h1>
+<div class="infobox">
 { my $output = '';
   if (looks_like_number($msg)) {
      $output .= sprintf qq(<p><a href="%s">Full log</a></p>),html_escape(bug_links(bug=>$bug_num,links_only=>1));
   }
   else {
-     if (not $status{archived}) {
-       $output .=  qq(<p><a href="mailto:$bug_num\@$config{email_domain}">Reply</a> ).
-          qq(or <a href="mailto:$bug_num-subscribe\@$config{email_domain}">subscribe</a> ).
-              qq(to this bug.</p>\n);
-     }
-     $output .=  qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
-     $output .= sprintf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
-         qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
+     $output .=  qq(<p id="toggleuseless"><a href="javascript:toggle_infmessages();">Toggle useless messages</a> </p>);
+     $output .= sprintf qq(<div class="msgreceived"><p>View this report as:</p><ul><li> <a href="%s">mbox folder</a></li> ).
+         qq(<li><a href="%s">status mbox</a></li><li><a href="%s">maintainer mbox</a></li></ul></div>\n),
               html_escape(bug_links(bug=>$bug_num, links_only=>1,options=>{mbox=>'yes'})),
                    html_escape(bug_links(bug=>$bug_num, links_only=>1,options=>{mbox=>'yes',mboxstatus=>'yes'})),
                         html_escape(bug_links(bug=>$bug_num, links_only=>1,options=>{mbox=>'yes',mboxmaint=>'yes'}));
   }
   $output;
 }
+</div>
+{include(q(cgi/bugreport_pkginfo))}
+{include(q(cgi/bugreport_buginfo))}
 {$log}
 <hr>
 <p class="msgreceived">Send a report that <a href="http://{$config{cgi_domain}}/bugspam.cgi">this bug log contains spam</a>.</p>
 <hr>
 {include(q(html/html_tail))}
+</div>
+</div>
 </body>
 </html>
index 8affad181f70ae0fb54f52a9ca6ff83439aa8c4c..b2f1048af1341a4873ca5510c72b27cd227fd487 100644 (file)
@@ -1,34 +1,33 @@
 <div class="buginfo">
-  <p>Reported by: {package_links(submitter=>$status{originator})}</p>
-  <p>Date: {$status{date_text}}</p>
+  <p><b>Reported by:</b> {package_links(submitter=>$status{originator})}</p>
+  <p><b>Date:</b> {$status{date_text}}</p>
 { my $output = ''; 
   if (defined $status{owner} and length $status{owner}) {
      $output = q(<p>Owned by: ).package_links(owner=>$status{owner}).q(</p>);
   }
   $output;
 }
-<p>Severity: {my $output = $status{severity};
+<p><b>Severity:</b> {my $output = $status{severity};
               if (isstrongseverity($status{severity})) {
                    $output = q(<em class="severity">).$status{severity}.q(</em>);
               }
               $output;
              }</p>
-<p>{@{$status{tags_array}}?q(Tags: ).html_escape(join(q(, ),@{$status{tags_array}})):''}</p>
+<p>{@{$status{tags_array}}?q(<b>Tags:</b> ).html_escape(join(q(, ),@{$status{tags_array}})):''}</p>
 {my $output = '';
  if (@{$status{mergedwith_array}}) {
-    $output .= q(<p>Merged with ).join(qq(,\n),bug_links(bug=>$status{mergedwith_array})).qq(</p>\n);
+    $output .= q(<p><b>Merged:</b> ).join(qq(,\n),bug_links(bug=>$status{mergedwith_array})).qq(</p>\n);
  }
  $output;
 }
 {my $output = '';
  if (@{$status{found_versions}}) {
-    $output .= q(<p>Found in );
-    $output .= (@{$status{found_versions}} == 1) ? 'version ' : 'versions ';
+    $output .= q(<p><b>Found in:</b> );
     $output .= join(qq(, ),map {html_escape($_);} @{$status{found_versions}}).qq(</p>\n);
  }
  if (@{$status{fixed_versions}}) {
-    $output .= q(<p>Fixed in );
-    $output .= (@{$status{fixed_versions}} == 1) ? 'version ' : 'versions ';
+    $output .= q(<p><b>Fixed in );
+    $output .= (@{$status{fixed_versions}} == 1) ? 'version: </b>' : 'versions: </b> ';
     $output .= join(qq(, ),map {html_escape($_);} @{$status{fixed_versions}}).qq(</p>\n);
  }
  $output;
 }
 { my $output = '';
   if (@{$status{blockedby_array}}) {
-     $output .= q(<p>Fix blocked by ).
+     $output .= q(<p><b>Fix blocked by:</b> ).
         join(q(, ),
          map {bug_links(bug=>$_->{bug_num}).q(: ).html_escape($_->{subject})}
          @{$status{blockedby_array}}).q(</p>)
   }
   if (@{$status{blocks_array}}) {
-     $output .= q(<p>Blocking fix for ).
+     $output .= q(<p><b>Blocking fix for:</b> ).
         join(q(, ),
          map {bug_links(bug=>$_->{bug_num}).q(: ).html_escape($_->{subject})}
          @{$status{blocks_array}}).q(</p>)
 }
 { my $output = '';
   if (exists $status{archived} and $status{archived}) {
-     $output .= q(<p>Bug is archived. No further changes may be made.<p>)
+     $output .= q(<div class="important">This bug is archived. No further changes may be made.<br>).
+                q(If you experience this bug, please <a href="http://www.debian.org/Bugs/server-control#reopen">reopen it</a>.</div>);
   }
   $output
 }{ my $output = '';
  if (length($status{forwarded})) {
-    $output = "<p>Forwarded to " . 
+    $output = "<p><b>Forwarded to:</b> " .
               join(', ',
                   map {maybelink($_)}
                    split /\,\s+/,$status{forwarded}
index 872aff44fc0913a75b4c0c0789a79fd2ef169c75..a6cd82eecb2ef9a63f50ce5b2b65675dc7f1b474 100644 (file)
@@ -1,19 +1,17 @@
 <div class="pkginfo">
-  <p>{if (keys %package > 1) { q(Packages)} else {q(Package)}}:
-     {join(q(, ),package_links(package => [map {$_->{package}} grep {!$_->{is_source}} values %package],
-                               source  => [map {$_->{source} } grep { $_->{is_source}} values %package],
-                               class => q(submitter),
-                              )
-          )};
+  <p>
 {my $output ='';
+ if (keys %package > 1) {
  for my $package (values %package) {
-     $output .= q(Maintainer for ).package_links($package->{is_source}?(source=>$package->{source}):(package=>$package->{package})).qq( is ).
-                package_links(maintainer => $package->{maintainer}).qq(; );
-     if (exists $package->{source} and not $package->{is_source}) {
-       $output .= q(Source for ).package_links(package=>$package->{package}).qq( is ).
-                   package_links(source => $package->{source}).qq(. );
-     }
+     $output .= q(<b>Maintainer for ). $package->{package}. q(:</b> ).
+                package_links(maintainer => $package->{maintainer});
+ $output .= q(<br>);
  }
+ } else {
+ for my $package (values %package) {
+     $output .= q(<b>Maintainer:</b> ).
+                package_links(maintainer => $package->{maintainer});
+ }}
  $output;
 }</p>
 </div>
index 169d161e0ca1a6e1a857aaa771b287cd60a2b7c5..c141b022ce76d71bb95fa58d45ba5fca42138cc4 100644 (file)
@@ -1,3 +1,4 @@
 </title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-<link rel="stylesheet" href="{$config{web_host_bug_dir}}/css/bugs.css" type="text/css">
+<link rel="stylesheet" href="{$config{web_host_bug_dir}}/css/debian.css" type="text/css">
+<link rel="stylesheet" href="{$config{web_host_bug_dir}}/css/debian-bugs.css" type="text/css">