Packages::CGI: Remove support for msgs and notes

Unused code.

diff --git a/lib/Packages/CGI.pm b/lib/Packages/CGI.pm
index b15e9edc63162da758865f07f4607bc8a6cf90f7..c29e56ce8b932014b562c56e33c68d6f4c8181c9 100644 (file)
--- a/lib/Packages/CGI.pm
+++ b/lib/Packages/CGI.pm
@@ -26,11 +26,11 @@ sub get_mime {
     return $mime_types{$_[0]} || $_[1] || 'text/html';
 }
 
     return $mime_types{$_[0]} || $_[1] || 'text/html';
 }
 

-our (@fatal_errors, @errors, @debug, @msgs, @hints, @notes);
+our (@fatal_errors, @errors, @debug, @hints);

 our $http_code;
 
 sub reset {
 our $http_code;
 
 sub reset {

-    @fatal_errors = @errors = @debug = @msgs = @hints = @notes = ();
+    @fatal_errors = @errors = @debug = @hints = ();

     $http_code = 200;
 }
 
     $http_code = 200;
 }
 


@@ -48,27 +48,17 @@ sub debug {
     my $lvl = $_[1] || 0;
     push(@debug, $_[0]) if $debug > $lvl;
 }
     my $lvl = $_[1] || 0;
     push(@debug, $_[0]) if $debug > $lvl;
 }

-sub msg {
-    push @msgs, $_[0];
-}
-sub note {
-    push @notes, [ @_ ];
-}

 sub get_errors { (@fatal_errors, @errors) }
 sub get_debug {
     return unless $debug && @debug;
     return @debug;
 }
 sub get_errors { (@fatal_errors, @errors) }
 sub get_debug {
     return unless $debug && @debug;
     return @debug;
 }

-sub get_msgs { @msgs };

 sub get_hints { @hints };
 sub get_hints { @hints };

-sub get_notes { @notes };

 sub get_all_messages {
     return {
        errors => [ @fatal_errors, @errors ],
        debugs => $debug ? \@debug : [],
 sub get_all_messages {
     return {
        errors => [ @fatal_errors, @errors ],
        debugs => $debug ? \@debug : [],

-       msgs => \@msgs,

        hints => \@hints,
        hints => \@hints,

-       notes => \@notes,

     };
 }
 
     };
 }
 

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 30158c54b42d35ce6f5dcc91e8b008aac502efb3..2e336927df217b2adb978f006b6658656bd56355 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -14,7 +14,7 @@ use Deb::Versions;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
                         @ARCHITECTURES %FTP_SITES @DDTP_LANGUAGES);
 use Packages::I18N::Locale;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
                         @ARCHITECTURES %FTP_SITES @DDTP_LANGUAGES);
 use Packages::I18N::Locale;

-use Packages::CGI qw( :DEFAULT make_url make_search_url note );
+use Packages::CGI qw( :DEFAULT make_url make_search_url );

 use Packages::DB;
 use Packages::Search qw( :all );
 use Packages::Page ();
 use Packages::DB;
 use Packages::Search qw( :all );
 use Packages::Page ();

diff --git a/static/packages.css.sed.in b/static/packages.css.sed.in
index 9e09dd8192208d8f42abc3c0425e02e63662a5ee..7a4d9d3184b62c6e0324da6ea15415312ba78d7f 100644 (file)
--- a/static/packages.css.sed.in
+++ b/static/packages.css.sed.in
@@ -137,16 +137,6 @@ h1 {
        margin: 0;
        clear: both;
 }
        margin: 0;
        clear: both;
 }

-.pnotes {
-       margin: .2em;
-       padding: .5em;
-       border: solid thin black;
-       background-color: #bdf;
-       clear: both;
-}
-.pnotes h2 {
-       color: red;
-}

 .pconstantnag {
        max-width: 60em;
        border: dotted thin red;
 .pconstantnag {
        max-width: 60em;
        border: dotted thin red;

diff --git a/templates/html/messages.tmpl b/templates/html/messages.tmpl
index 7c9c6117700d817f0467fd22be9e784b630a9191..3faa76d97faf8b49fa31201851b99fa9bdc21fc6 100644 (file)
--- a/templates/html/messages.tmpl
+++ b/templates/html/messages.tmpl
@@ -14,18 +14,3 @@
  <p>[% hint | html %]</p>
 [% '</div>' IF loop.last -%]
 [% END -%]
  <p>[% hint | html %]</p>
 [% '</div>' IF loop.last -%]
 [% END -%]

-[%- FOREACH msg IN msgs %]
-[%- '<div class="pmsgs">' IF loop.first %]
- <p>[% msg | html %]</p>
-[% '</div>' IF loop.last -%]
-[% END -%]
-[%- FOREACH note IN notes %]
-[%- '<div class="pnotes">' IF loop.first %]
-[%- IF note.1 %]
- <h2>[% note.0 | html %]</h2>
- <p>[% note.1 | html %]</p>
-[% ELSE %]
- <p>[% note.0 | html %]</p>
-[% END -%]
-[% '</div>' IF loop.last -%]
-[% END -%]