Item14339: Change to Canonical PUBURL macro

core/data/System/EditingShorthand.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1490749805" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1510549663" format="1.1" version="1"}%
 ---+ Editing Shorthand
 %STARTINCLUDE%
 %TABLE{}%
@@ -458,7 +458,7 @@ Email addresses are also linked automatically,  see further details below.
    * nntp://foswiki.org
    * telnet://foswiki.org
    * name@foswiki.org
-   * %PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png
+   * %PUBURL{"foswiki-logo-icon.png" topic="%SYSTEMWEB%.ProjectLogos"}%
 </verbatim>
 </td>
 <td>
@@ -471,7 +471,7 @@ Email addresses are also linked automatically,  see further details below.
    * nntp://foswiki.org
    * telnet://foswiki.org
    * name@foswiki.org
-   * %PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png
+   * %PUBURL{"foswiki-logo-icon.png" topic="%SYSTEMWEB%.ProjectLogos"}%
 </td>
 </tr>
 <tr valign="top">
@@ -492,7 +492,7 @@ Email addresses are also linked automatically,  see further details below.
 
 <b>https://foswiki.org</b>
 
-_%PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png_
+_%PUBURL{"foswiki-logo-icon.png" topic="%SYSTEMWEB%.ProjectLogos"}%_
 </verbatim>
 </td><td>
 
@@ -506,7 +506,7 @@ _%PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png_
 
 <b>https://foswiki.org</b>
 
-_%PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png_
+_%PUBURL{"foswiki-logo-icon.png" topic="%SYSTEMWEB%.ProjectLogos"}%_
 </td>
 </tr>
 <tr valign="top">

core/data/System/FileAttachment.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1489539478" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1510549663" format="1.1" version="1"}%
 %META:TOPICPARENT{name="UserDocumentationCategory"}%
 %STARTINCLUDE%
 ---+ File Attachments
@@ -114,23 +114,23 @@ Move unwanted Attachments to web =Trash=, topic =TrashAttachment=.
 
    * Once a file is attached it can be referenced in the topic. Example:
       1. ==[Attach]== a file, for example: =Sample.txt=
-      1. ==[Edit]== the topic you attached the file to and enter: =%<nop>ATTACHURL%/Sample.txt=
-      1. ==[Preview]==: the =%<nop>ATTACHURL%/Sample.txt= text appears as: %PUBURL%/%WEB%/%TOPIC%/Sample.txt, a link to the text file.
+      1. ==[Edit]== the topic you attached the file to and enter: =%<nop>ATTACHURL{"Sample.txt"}%=
+      1. ==[Preview]==: the =%<nop>ATTACHURL{"Sample.txt"}%= text appears as: %ATTACHURL{"Sample.txt"}%, a link to the text file.
 
    * To reference an attachment located in another topic, enter:
-      * =%<nop>PUBURL%/%<nop>WEB%/OtherTopic/Sample.txt= (if it's within the same web)
-      * =%<nop>PUBURL%/Otherweb/OtherTopic/Sample.txt= (if it's in a different web)
+      * =%<nop>PUBURL{"Sample.txt" topic="%<nop>WEB%.OtherTopic"}%= (if it's within the same web)
+      * =%<nop>PUBURL{"Sample.txt" topic="Otherweb.OtherTopic"}%= (if it's in a different web)
 
    * Attached HTML files and text files can be inlined in a topic. Example:
       1. ==[Attach]== file: =Sample.txt=
       1. ==[Edit]== topic and write text: =%<nop>INCLUDE{"%<nop>ATTACHURL%/Sample.txt"}%=
-         * Content of attached file is shown inlined.
-         * [[VarINCLUDE][Read more about INCLUDE]].
+         * Content of attached file is shown inlined.  ([[VarINCLUDE][Read more about INCLUDE]]).
+         * <blockquote> %INCLUDE{"%ATTACHURL{"Sample.txt"}%"}% </blockquote>
 
    * GIF, JPG and PNG images can be attached and shown embedded in a topic. Example:
       1. ==[Attach]== an image file, for example: =Smile.gif=
-      1. ==[Edit]== topic and write text: =%<nop>ATTACHURL%/Smile.gif=
-      1. ==[Preview]==: text appears as %PUBURLPATH%/%WEB%/%TOPIC%/Smile.gif, an image.
+      1. ==[Edit]== topic and write text: =%<nop>ATTACHURL{"Smile.gif"}%=
+      1. ==[Preview]==: text appears as %ATTACHURL{"Smile.gif"}%, an image.
 
 ---++ Securing Attachments
 In most installations, attachments are not secured. Anyone can read them if they know the name of the web, topic and attachment.
@@ -263,5 +263,5 @@ Describe the file so other people know what it is.
 ---
 *Related Topics:* UserDocumentationCategory
 
-%META:FILEATTACHMENT{name="Sample.txt" attr="" comment="Just a sample" date="1489539478" size="30" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="Smile.gif" attr="" comment="Smiley face" date="1489539478" size="94" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="Sample.txt" attr=""  date="1510549663" size="30" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="Smile.gif" attr=""  date="1510549663" size="94" user="ProjectContributor" version="1"}%

core/templates/attach.tmpl

@@ -48,7 +48,7 @@
 
 %TMPL:DEF{"hiddenfields"}%%{"space to put extra hidden form fields"}%%TMPL:END%
 
-%TMPL:DEF{"content"}%<form name="main" enctype="multipart/form-data" action="%SCRIPTURLPATH{"upload"}%/%WEB%/%TOPIC%" method="post">
+%TMPL:DEF{"content"}%<form name="main" enctype="multipart/form-data" action="%SCRIPTURLPATH{"upload" topic="%WEB%.%TOPIC%"}%" method="post">
 %TMPL:P{"previousdetails"}%
 %TMPL:P{"attachform"}%
 %TMPL:P{"notes"}%

core/templates/attachagain.tmpl

@@ -18,6 +18,6 @@
    * %MAKETEXT{"*Change comment:* If you use _Change Properties_ to change a comment, the comment shown in the topic will change, but the comment shown against the attachment history will be the comment when the file was uploaded."}%
    * %MAKETEXT{"*Attach new file:* If you select a different file in the browser, it is this that will be updated or added."}%
 %TMPL:END%
-%TMPL:DEF{"topicactionbuttons"}%<input type="submit" class="foswikiSubmit" value="%MAKETEXT{"Upload file"}%" />%TMPL:P{"sep"}%<input type="submit" class="foswikiSubmit" name="changeproperties" value="%MAKETEXT{"Change properties only"}%" />%TMPL:P{"sep"}%<a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?attachment=%FILENAME%" rel='nofollow'>%MAKETEXT{"Move or delete attachment"}%</a>%TMPL:P{"sep"}%%TMPL:P{"canceltopicaction"}%%TMPL:END%
+%TMPL:DEF{"topicactionbuttons"}%<input type="submit" class="foswikiSubmit" value="%MAKETEXT{"Upload file"}%" />%TMPL:P{"sep"}%<input type="submit" class="foswikiSubmit" name="changeproperties" value="%MAKETEXT{"Change properties only"}%" />%TMPL:P{"sep"}%<a href="%SCRIPTURLPATH{"rename" topic="%WEB%.%TOPIC%" attachment="%FILENAME%"}%" rel='nofollow'>%MAKETEXT{"Move or delete attachment"}%</a>%TMPL:P{"sep"}%%TMPL:P{"canceltopicaction"}%%TMPL:END%
 %TMPL:DEF{"fileuser"}%(%FILEUSER%)%TMPL:END%
 %TMPL:P{"attach"}%%{ end }%

core/templates/backlinksallwebs.tmpl

@@ -3,10 +3,10 @@
 %TMPL:DEF{"titleaction"}%%MAKETEXT{"(backlinks in all Webs)"}% %TMPL:END%
 
 
-%TMPL:DEF{"resultsheader"}%<p> *%MAKETEXT{"Backlinks to [_1] in all Webs" args="[[%TOPIC%]]"}%* <span class="foswikiSmall">(<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?template=backlinksweb" title='%MAKETEXT{"Search all webs for topics that link to here"}%' accesskey="b">%MAKETEXT{"Search [_1] Web only" args="<nop>%WEB%"}%</a>)</span></p>%TMPL:END%
+%TMPL:DEF{"resultsheader"}%<p> *%MAKETEXT{"Backlinks to [_1] in all Webs" args="[[%TOPIC%]]"}%* <span class="foswikiSmall">(<a href="%SCRIPTURLPATH{"view" topic="%WEB%.%TOPIC%" template="backlinksweb"}%" title='%MAKETEXT{"Search all webs for topics that link to here"}%' accesskey="b">%MAKETEXT{"Search [_1] Web only" args="<nop>%WEB%"}%</a>)</span></p>%TMPL:END%
 
 
 %TMPL:DEF{"content"}%%TMPL:P{"resultsheader"}%
 %TMPL:P{"searchweb"}%<br/>
 %TMPL:P{"searchallwebs"}%
-%TMPL:END%
+%TMPL:END%

core/templates/backlinksweb.tmpl

@@ -2,9 +2,9 @@
 %TMPL:DEF{"titleaction"}%%MAKETEXT{"(backlinks in [_1] Web)" args="%WEB%"}% %TMPL:END%
 
 
-%TMPL:DEF{"resultsheader"}%<p> *%MAKETEXT{"Backlinks to [_1] in [_2] Web" args="[[%TOPIC%]], <nop>%WEB%"}%* <span class="foswikiSmall">(<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?template=backlinksallwebs" title='%MAKETEXT{"Search all webs for topics that link to here"}%' accesskey="l">%MAKETEXT{"Search all webs"}%</a>)</span></p>%TMPL:END%
+%TMPL:DEF{"resultsheader"}%<p> *%MAKETEXT{"Backlinks to [_1] in [_2] Web" args="[[%TOPIC%]], <nop>%WEB%"}%* <span class="foswikiSmall">(<a href="%SCRIPTURLPATH{"view" topic="%WEB%.%TOPIC%" template="backlinksallwebs"}%" title='%MAKETEXT{"Search all webs for topics that link to here"}%' accesskey="l">%MAKETEXT{"Search all webs"}%</a>)</span></p>%TMPL:END%
 
 
 %TMPL:DEF{"content"}%%TMPL:P{"resultsheader"}%
 %TMPL:P{"searchweb"}%
-%TMPL:END%
+%TMPL:END%

core/templates/changeform.tmpl

@@ -12,7 +12,7 @@
 %TMPL:DEF{"topicactionbuttons"}%<input class="foswikiSubmit" type="submit" name="submit" value='%MAKETEXT{"Select"}%' /> %MAKETEXT{"or"}% %TMPL:P{"gobacktopicaction"}%%TMPL:END%
 
 
-%TMPL:DEF{"formstart"}%<form name="main" action="%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%" method="post">%TMPL:END%
+%TMPL:DEF{"formstart"}%<form name="main" action="%SCRIPTURLPATH{"edit" topic="%WEB%.%TOPIC%"}%" method="post">%TMPL:END%
 %TMPL:DEF{"formend"}%</form>%TMPL:END%
 
 
@@ -37,4 +37,4 @@
 %TEXT%
 %EDITACTION%
 %TMPL:P{"hiddenformfields"}%
-%TMPL:P{"topicinfo"}%%TMPL:P{"formend"}%%TMPL:END%
+%TMPL:P{"topicinfo"}%%TMPL:P{"formend"}%%TMPL:END%

core/templates/icons.tmpl

@@ -4,7 +4,7 @@
 
 %{ the 'alt' text should really be a MAKETEXT.. }%
 
-%TMPL:DEF{"iconurl:book"}%%PUBURL%/%SYSTEMWEB%/DocumentGraphics/book.png%TMPL:END%
+%TMPL:DEF{"iconurl:book"}%%PUBURLPATH{"book.png" topic="%SYSTEMWEB%.DocumentGraphics"}%%TMPL:END%
 %TMPL:DEF{"iconalt:book"}%Book%TMPL:END%
 %TMPL:DEF{"icon:book"}%<span class='foswikiIcon'><img src='%TMPL:P{"iconurl:book"}%' width='16' height='16' alt='%TMPL:P{"iconalt:book"}%' /></span>%TMPL:END%
 
@@ -18,27 +18,27 @@
 %TMPL:DEF{"icon:proportional"}%<span class='foswikiIcon'><div class='inner' style='width:14;height:14;border:1 solid gray;background:white;display:inline-block;font-family:serif;'>p</div></span>%TMPL:END%
 
 %{ non-16 sized icons }%
-%TMPL:DEF{"icon:more-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/more-small.png' width='13' height='13' alt='Read more' /></span>%TMPL:END%
-%TMPL:DEF{"icon:photo"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/photo.png' width='13' height='10' alt='Photo' /></span>%TMPL:END%
-%TMPL:DEF{"icon:video"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/video.png' width='13' height='10' alt='Video' /></span>%TMPL:END%
-%TMPL:DEF{"icon:search-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/search-small.png' width='13' height='13' alt='Search' /></span>%TMPL:END%
-%TMPL:DEF{"icon:uweb-bo12"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/uweb-bo12.png' width='12' height='12' alt='Edit' /></span>%TMPL:END%
-%TMPL:DEF{"icon:uweb-m12"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/uweb-m12.png' width='12' height='12' alt='Edit' /></span>%TMPL:END%
-%TMPL:DEF{"icon:uweb-o12"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/uweb-o12.png' width='12' height='12' alt='Edit' /></span>%TMPL:END%
-%TMPL:DEF{"icon:changes-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/changes-small.png' width='13' height='13' alt='Changes' /></span>%TMPL:END%
-%TMPL:DEF{"icon:rss-feed"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/rss-feed.png' width='36' height='14' alt='RSS feed' /></span>%TMPL:END%
-%TMPL:DEF{"icon:xml-feed"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/xml-feed.png' width='36' height='14' alt='XML feed' /></span>%TMPL:END%
-%TMPL:DEF{"icon:new"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/new.png' width='30' height='16' alt='New' /></span>%TMPL:END%
-%TMPL:DEF{"icon:todo"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/todo.png' width='37' height='16' alt='TODO' /></span>%TMPL:END%
-%TMPL:DEF{"icon:updated"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/updated.png' width='55' height='16' alt='UPDATED' /></span>%TMPL:END%
-%TMPL:DEF{"icon:done"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/done.png' width='37' height='16' alt='Done' /></span>%TMPL:END%
-%TMPL:DEF{"icon:closed"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/closed.png' width='48' height='16' alt='Closed' /></span>%TMPL:END%
-%TMPL:DEF{"icon:flag-gray-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/flag-gray-small.png' width='13' height='13' alt='Flag' /></span>%TMPL:END%
-%TMPL:DEF{"icon:tablesortdiamond"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/tablesortdiamond.png' width='11' height='13' alt='Sort table' /></span>%TMPL:END%
-%TMPL:DEF{"icon:tablesortdown"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/tablesortdown.png' width='11' height='13' alt='Sort table descending' /></span>%TMPL:END%
-%TMPL:DEF{"icon:tablesortup"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/tablesortup.png' width='11' height='13' alt='Sort table ascending' /></span>%TMPL:END%
-%TMPL:DEF{"icon:web-bg-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/web-bg-small.png' width='13' height='13' alt='Web' /></span>%TMPL:END%
-%TMPL:DEF{"icon:trash-small"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/trash-small.png' width='11' height='11' alt='Move to trash' /></span>%TMPL:END%
+%TMPL:DEF{"icon:more-small"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"more-small.png" topic="%SYSTEMWEB%.DocumentGraphics" }%' width='13' height='13' alt='Read more' /></span>%TMPL:END%
+%TMPL:DEF{"icon:photo"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"photo.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='13' height='10' alt='Photo' /></span>%TMPL:END%
+%TMPL:DEF{"icon:video"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"video.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='13' height='10' alt='Video' /></span>%TMPL:END%
+%TMPL:DEF{"icon:search-small"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"search-small.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='13' height='13' alt='Search' /></span>%TMPL:END%
+%TMPL:DEF{"icon:uweb-bo12"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"uweb-bo12.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='12' height='12' alt='Edit' /></span>%TMPL:END%
+%TMPL:DEF{"icon:uweb-m12"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"uweb-m12.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='12' height='12' alt='Edit' /></span>%TMPL:END%
+%TMPL:DEF{"icon:uweb-o12"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"uweb-o12.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='12' height='12' alt='Edit' /></span>%TMPL:END%
+%TMPL:DEF{"icon:changes-small"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"changes-small.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='13' height='13' alt='Changes' /></span>%TMPL:END%
+%TMPL:DEF{"icon:rss-feed"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"rss-feed.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='36' height='14' alt='RSS feed' /></span>%TMPL:END%
+%TMPL:DEF{"icon:xml-feed"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"xml-feed.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='36' height='14' alt='XML feed' /></span>%TMPL:END%
+%TMPL:DEF{"icon:new"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"new.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='30' height='16' alt='New' /></span>%TMPL:END%
+%TMPL:DEF{"icon:todo"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"todo.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='37' height='16' alt='TODO' /></span>%TMPL:END%
+%TMPL:DEF{"icon:updated"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"updated.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='55' height='16' alt='UPDATED' /></span>%TMPL:END%
+%TMPL:DEF{"icon:done"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"done.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='37' height='16' alt='Done' /></span>%TMPL:END%
+%TMPL:DEF{"icon:closed"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"closed.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='48' height='16' alt='Closed' /></span>%TMPL:END%
+%TMPL:DEF{"icon:flag-gray-small"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"flag-gray-small.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='13' height='13' alt='Flag' /></span>%TMPL:END%
+%TMPL:DEF{"icon:tablesortdiamond"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"tablesortdiamond.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='11' height='13' alt='Sort table' /></span>%TMPL:END%
+%TMPL:DEF{"icon:tablesortdown"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"tablesortdown.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='11' height='13' alt='Sort table descending' /></span>%TMPL:END%
+%TMPL:DEF{"icon:tablesortup"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"tablesortup.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='11' height='13' alt='Sort table ascending' /></span>%TMPL:END%
+%TMPL:DEF{"icon:web-bg-small"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"web-bg-small.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='13' height='13' alt='Web' /></span>%TMPL:END%
+%TMPL:DEF{"icon:trash-small"}%<span class='foswikiIcon'><img src='%PUBURLPATH{"trash-small.png" topic="%SYSTEMWEB%.DocumentGraphics"}%' width='11' height='11' alt='Move to trash' /></span>%TMPL:END%
 
-%TMPL:DEF{"icon:processing-32-bg"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/processing-32-bg.gif' width='32' height='32' alt='processing' /></span>%TMPL:END%
-%TMPL:DEF{"icon:processing-32"}%<span class='foswikiIcon'><img src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/processing-32.gif' width='32' height='32' alt='processing' /></span>%TMPL:END% 
+%TMPL:DEF{"icon:processing-32-bg"}%<span class='foswikiIcon'><img src='%PUBURLPATH{ topic="%SYSTEMWEB%.DocumentGraphics/processing-32-bg.gif' width='32' height='32' alt='processing' /></span>%TMPL:END%
+%TMPL:DEF{"icon:processing-32"}%<span class='foswikiIcon'><img src='%PUBURLPATH{ topic="%SYSTEMWEB%.DocumentGraphics/processing-32.gif' width='32' height='32' alt='processing' /></span>%TMPL:END%