From: Boris Z. <bo...@am...> - 2002-07-01 08:36:24
|
Hi, this patch let you use PKIT_ERRORSPAN and PKIT_ERRORFONT without a special NAME attr. Usefull if you like to color/mark somthing ever in a document. Changed files: Apache-PageKit/Changes Apache-PageKit/lib/Apache/PageKit/View.pm Index: Apache-PageKit/Changes =================================================================== RCS file: /cvsroot/pagekit/Apache-PageKit/Changes,v retrieving revision 1.153 diff -u -r1.153 Changes --- Apache-PageKit/Changes 26 Jun 2002 15:19:01 -0000 1.153 +++ Apache-PageKit/Changes 26 Jun 2002 15:24:43 -0000 @@ -5,6 +5,8 @@ - Use parameters for Apache::PageKit->startup if we can not find PKIT_ROOT and or PKIT_SERVER for mod_perl >= 1.06 (Boris Zentner) + - Add patch to use <PKIT_ERRORSPAN> and <PKIT_ERRORFONT> + without a name attribute. (Boris Zentner) - Fix: bug, where path relative components are not listed as an edit component. (Boris Zentner, Gabriel Burca) - Fix a errormessage is fixed, that report file is out of Index: Apache-PageKit/lib/Apache/PageKit/View.pm =================================================================== RCS file: /cvsroot/pagekit/Apache-PageKit/lib/Apache/PageKit/View.pm,v retrieving revision 1.98 diff -u -r1.98 View.pm --- Apache-PageKit/lib/Apache/PageKit/View.pm 26 Jun 2002 15:19:01 -0000 1.98 +++ Apache-PageKit/lib/Apache/PageKit/View.pm 26 Jun 2002 15:24:47 -0000 @@ -595,6 +595,17 @@ $$html_code_ref =~ s%<(!--)?\s*(?:MODEL|PKIT)_(VAR|LOOP|IF|ELSE|UNLESS)($key_value_pattern*)\s*/?(?(1)--)>%<TMPL_$2$3>%sig; $$html_code_ref =~ + s^<(!--)?\s*PKIT_ERROR(?:FONT|SPAN)$key_value_pattern?\s*(?(1)--)>(.*?)<(!--)?\s*/PKIT_ERROR(?:FONT|SPAN)\s*(?(8)--)>^ + my $name = $4 || $5 || $6 || $3; + if ( $name ) { + qq{<TMPL_VAR NAME="PKIT_ERRORSPAN_BEGIN_$name">$7<TMPL_VAR NAME="PKIT_ERRORSPAN_END_$name">}; + } else { + my $text = $7; + ( my $errorspan_begin_tag = $view->{errorspan_begin_tag} ) =~ s/<(!--)?\s*PKIT_ERRORSTR\s*(?(1)--)>/$view->{default_errorstr}/gi; + $errorspan_begin_tag . $text . $view->{errorspan_end_tag} + } ^seig; + + $$html_code_ref =~ s%<(!--)?\s*PKIT_SELFURL$key_value_pattern?\s*/?(?(1)--)>% &process_selfurl_tag($exclude_params_set, $4 || $5 || $6 || $3 ) %seig; $$html_code_ref =~ s%<(!--)?\s*/PKIT_(VIEW|IS_ERROR|NOT_ERROR|MESSAGES|HAVE_MESSAGES|HAVE_NOT_MESSAGES)\s*(?(1)--)>% $replace_end_tags{uc($2)} %seig; @@ -604,9 +615,7 @@ $$html_code_ref =~ s^<(!--)?\s*PKIT_VIEW$key_value_pattern\s*/?(?(1)--)>^ sprintf '<TMPL_IF NAME="PKIT_VIEW:%s">', $4 || $5 || $6 || $3; ^sieg; #" - $$html_code_ref =~ - s^<(!--)?\s*PKIT_ERROR(?:FONT|SPAN)$key_value_pattern(?(1)--)\s*>(.*?)<(!--)?\s*/PKIT_ERROR(?:FONT|SPAN)\s*(?(8)--)>^ my $font = $4 || $5 || $6 || $3; qq{<TMPL_VAR NAME="PKIT_ERRORSPAN_BEGIN_$font">$7<TMPL_VAR NAME="PKIT_ERRORSPAN_END_$font">}; ^seig; - } + } else { if ( $$html_code_ref =~ m%<PKIT_(?:VAR|LOOP|IF|UNLESS)(?:$key_value_pattern)*/?>%i ) { @@ -624,6 +633,17 @@ $$html_code_ref =~ s%<(?:MODEL|PKIT)_(VAR|LOOP|IF|ELSE|UNLESS)($key_value_pattern*)/?>%<TMPL_$1$2>%sig; $$html_code_ref =~ + s^<PKIT_ERROR(?:FONT|SPAN)$key_value_pattern?>(.*?)</PKIT_ERROR(?:FONT|SPAN)>^ + my $name = $3 || $4 || $5 || $2; + if ( $name ) { + qq{<TMPL_VAR NAME="PKIT_ERRORSPAN_BEGIN_$name">$6<TMPL_VAR NAME="PKIT_ERRORSPAN_END_$name">}; + } else { + my $text = $6; + ( my $errorspan_begin_tag = $view->{errorspan_begin_tag} ) =~ s/<PKIT_ERRORSTR>/$view->{default_errorstr}/gi; + $errorspan_begin_tag . $text . $view->{errorspan_end_tag} + } ^seig; + + $$html_code_ref =~ s%<PKIT_SELFURL$key_value_pattern?/?>% &process_selfurl_tag($exclude_params_set, $3 || $4 || $5 || $2 ) %seig; $$html_code_ref =~ s%</PKIT_(VIEW|IS_ERROR|NOT_ERROR|MESSAGES|HAVE_MESSAGES|HAVE_NOT_MESSAGES)>% $replace_end_tags{uc($1)} %seig; @@ -632,8 +652,6 @@ $$html_code_ref =~ s^<PKIT_VIEW$key_value_pattern/?>^ sprintf '<TMPL_IF NAME="PKIT_VIEW:%s">', $3 || $4 || $5 || $2; ^sieg; #" - $$html_code_ref =~ - s^<PKIT_ERROR(?:FONT|SPAN)$key_value_pattern>(.*?)</PKIT_ERROR(?:FONT|SPAN)>^ my $font = $3 || $4 || $5 || $2; qq{<TMPL_VAR NAME="PKIT_ERRORSPAN_BEGIN_$font">$6<TMPL_VAR NAME="PKIT_ERRORSPAN_END_$font">}; ^seig; } my @a = keys %$exclude_params_set; -- Boris |