[popfile-commit] engine/UI HTML.pm,1.350,1.351

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15367/UI

Modified Files:
	HTML.pm 
Log Message:
* HTML.pm: make handling of the config bar a little smarter. It now sets a template
 variable that decides whether the history bar also gets included. Should any other
 tabs also get a dedicated bar, config-bar.thtml must be changed to include another
 if statement and the new template; HTML::handle_configuration_bar() must be changed
 to set the new if variable.
* HTML.pm: remove some tab characters
* configuration-bar.thtml: Include the opening and closing form tag
* configuration-bar.thtml: Include common-before-configuration.thtml and common-after-configuration.html
 directly from here.
* common-after-configuration.thml and common-bottom.html: move the closing table tags
 to the latter because the table tags were opened in common-middle.thtml and thus
 should be closed in common-bottom.
* xy-page.thml: adapt to the changes in the config bar template and simply include
 the that template from here.

Next step (possibly): Get rid of common-before-configuration and common-after-configuration.

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.350
retrieving revision 1.351
diff -C2 -d -r1.350 -r1.351
*** HTML.pm	20 May 2005 23:25:36 -0000	1.350
--- HTML.pm	22 May 2005 10:45:35 -0000	1.351
***************
*** 620,626 ****
  
      if ( !defined( $session ) ) {
!     	my $continue;
          ($session, $continue) = $self->password_page( $client, $url );
! 	$continue = '/' unless defined( $continue );
          if ( defined( $session ) ) {
              $self->http_redirect_( $client, $continue , $session );
--- 620,626 ----
  
      if ( !defined( $session ) ) {
!         my $continue;
          ($session, $continue) = $self->password_page( $client, $url );
!         $continue = '/' unless defined( $continue );
          if ( defined( $session ) ) {
              $self->http_redirect_( $client, $continue , $session );
***************
*** 1073,1076 ****
--- 1073,1081 ----
      }
      $templ->param( 'Configuration_Loop_Languages' => \@language_loop );
+     
+     # If the configuration bar was included by the history page, let it also include the
+     # history bar
+     
+     $templ->param( 'Is_history_page' => ( $template eq 'history-page.thtml' ? 1 : 0 ) );
  
      if ( defined($self->{form_}{hide_configbar}) ) {
***************
*** 3274,3278 ****
  #
  # $client     The web browser to send the results to
! # $url	      The higher level page the password prompt is to be embedded in
  #
  # Returns undef if login failed, or a session key value if it succeeded
--- 3279,3283 ----
  #
  # $client     The web browser to send the results to
! # $url        The higher level page the password prompt is to be embedded in
  #
  # Returns undef if login failed, or a session key value if it succeeded