[TWiki-Dev] CVS: twiki/bin view,1.44,1.45

[Richard D. <rd...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv24664

Modified Files:
	view 
Log Message:
Simplified fix for RefreshEditPage, introducing %EDITURL% variable
for use by non-default skins (e.g. those using buttons for Edit).
This variable is also implemented globally in TWiki::handleInternalTags.


Index: view
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/view,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** view	21 Mar 2002 08:40:38 -0000	1.44
--- view	29 Mar 2002 18:41:24 -0000	1.45
***************
*** 198,201 ****
--- 198,202 ----
      if( $mirrorSiteName ) {
          # disable edit and attach
+ 	# FIXME: won't work with non-default skins, see %EDITURL%
          $tmpl =~ s/%EDITTOPIC%/$mirrorLink | <strike>Edit<\/strike>/o;
          $tmpl =~ s/<a [^>]*?>Attach<\/a>/<strike>Attach<\/strike>/oi;
***************
*** 210,213 ****
--- 211,215 ----
      } elsif( $rev < $maxrev ) {
          # disable edit of previous revisions - FIXME consider change to use two templates
+ 	# FIXME: won't work with non-default skins, see %EDITURL%
          $tmpl =~ s/%EDITTOPIC%/<strike>Edit<\/strike>/o;
          $tmpl =~ s/<a [^>]*?>Attach<\/a>/<strike>Attach<\/strike>/oi;
***************
*** 216,230 ****
          $tmpl =~ s/%REVARG%/&rev=1.$rev/go;
      } else {
! 	# RD: time string on Edit URL - fix for RefreshEditPage
  	my $timestring = time();	# Time in seconds since 1970
!         if( $topicExists ) {
! 	    $tmpl =~ s!%EDITTOPIC%!<a href=\"$scriptUrlPath/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%\?t=$timestring\"><b>Edit</b></a>!go;
!             # remove the NOINDEX meta tag
!             $tmpl =~ s/<meta name="robots"[^>]*>//goi;
!         } else {
! 	    # FIXME: If we remove the NOINDEX tag from Create-mode view,
! 	    # we can simplify this code.
!             $tmpl =~ s!%EDITTOPIC%!<a href=\"$scriptUrlPath/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%\?t=$timestring\"><b>Create</b></a>!go;
!         }
          $tmpl =~ s/%REVTITLE%//go;
          $tmpl =~ s/%REVARG%//go;
--- 218,233 ----
          $tmpl =~ s/%REVARG%/&rev=1.$rev/go;
      } else {
! 	# Remove the NOINDEX meta tag (for robots) from both Edit and 
! 	# Create pages
! 	$tmpl =~ s/<meta name="robots"[^>]*>//goi;
! 	my $editAction = $topicExists ? 'Edit' : 'Create';
! 
! 	# Make Edit URL unique for every edit - fix for RefreshEditPage,
! 	# also creates new %EDITURL% variable for use in non-default skins.
! 	# Special case for 'view' to handle %EDITTOPIC% and Edit vs. Create.
  	my $timestring = time();	# Time in seconds since 1970
! 	$tmpl =~ s!%EDITTOPIC%!<a href=\"%EDITURL%\"><b>$editAction</b></a>!go;
! 	$tmpl =~ s!%EDITURL%!$scriptUrlPath/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%\?t=$timestring!go;
! 
          $tmpl =~ s/%REVTITLE%//go;
          $tmpl =~ s/%REVARG%//go;