From: Don Armstrong Date: Fri, 9 Mar 2018 00:27:11 +0000 (-0800) Subject: Merge branch 'text_xslate_templates' X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=757b392b853d7bc16592b9431d5275ca943684e4;hp=-c;p=debbugs.git Merge branch 'text_xslate_templates' --- 757b392b853d7bc16592b9431d5275ca943684e4 diff --combined debian/control index 0cb7162,8bac723..34e186c --- a/debian/control +++ b/debian/control @@@ -1,25 -1,22 +1,25 @@@ Source: debbugs Section: misc -Priority: extra +Priority: optional Maintainer: Debbugs developers Uploaders: Colin Watson , Don Armstrong -Standards-Version: 3.9.4 -Vcs-Browser: http://bugs.debian.org/debbugs-source/mainline -Vcs-Git: http://bugs.debian.org/debbugs-source/debbugs.git +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/debbugs-team/debbugs +Vcs-Git: https://salsa.debian.org/debbugs-team/debbugs.git Build-Depends: debhelper (>= 9) Build-Depends-Indep: libparams-validate-perl, libmailtools-perl, libmime-tools-perl, libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl, libcgi-simple-perl, libhttp-server-simple-perl, libtest-www-mechanize-perl, - libmail-rfc822-address-perl, libsafe-hole-perl, libuser-perl, + libmail-rfc822-address-perl, libuser-perl, libconfig-simple-perl, libtest-pod-perl, liblist-allutils-perl, # used by Debbugs::Libravatar and libravatar.cgi libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick, - libtext-template-perl, graphviz, libtext-iconv-perl, libnet-server-perl, - libtext-xslate-perl, graphviz, libtext-iconv-perl, libnet-server-perl -Homepage: http://wiki.debian.org/Teams/Debbugs ++ libtext-xslate-perl, graphviz, libtext-iconv-perl, libnet-server-perl, +# used to make the logo + inkscape +Homepage: https://salsa.debian.org/debbugs-team +Testsuite: autopkgtest-pkg-perl Package: debbugs Architecture: all @@@ -47,9 -44,8 +47,8 @@@ Depends ${misc:Depends}, ${perl:Depends}, libmailtools-perl, ed, libmime-tools-perl, libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl, - libcgi-simple-perl, libparams-validate-perl, libtext-template-perl, - libsafe-hole-perl, libmail-rfc822-address-perl, liblist-moreutils-perl, - libtext-template-perl, + libcgi-simple-perl, libparams-validate-perl, libtext-xslate-perl, + libmail-rfc822-address-perl, liblist-moreutils-perl, # used by Debbugs::Libravatar and libravatar.cgi libfile-libmagic-perl, libgravatar-url-perl, libwww-perl, imagemagick Section: perl diff --combined templates/en_US/cgi/bugreport.tx index 0000000,21f7c4e..67f9c5e mode 000000,100644..100644 --- a/templates/en_US/cgi/bugreport.tx +++ b/templates/en_US/cgi/bugreport.tx @@@ -1,0 -1,51 +1,52 @@@ + <: include "html/pre_title.tx" :>#<: $bug_num :> - <: $status.subject :> - <: $config.project :> <: $config.bug :> report logs<: include "html/post_title.tx" :> ++ + + + +

<: $config.project :> <: $config.bug :> report logs

#<: $bug_num :> + <: $status.subject :> +

<: raw($version_graph) :>

+ <: include "cgi/bugreport_pkginfo.tx" :> + <: include "cgi/bugreport_buginfo.tx" :> +

+ : if looks_like_number($msg) { + Full log + : } else { + : if ! $status.archived { + Reply + or subscribe + to this <: $config.bug :>. + : } + View this <: $config.bug :> as an + 1,options=>{mbox=>"yes"}) :>">mbox, + 1,options=>{mbox=>"yes",mboxstatus => "yes"}) :>">status mbox, or + 1,options=>{mbox=>"yes",mboxmaint => "yes"}) :>">maintainer mbox + +

+ : } + <: raw($log) :> + +

Send a report that this bug log contains spam.

+ <: include "html/html_tail.tx" :> + + diff --combined templates/en_US/html/pre_title.tx index 0000000,f6e17aa..8ea5bfe mode 000000,100644..100644 --- a/templates/en_US/html/pre_title.tx +++ b/templates/en_US/html/pre_title.tx @@@ -1,0 -1,3 +1,4 @@@ + + ++ +