From b6f81861495207d01be11940dbe3583ce81d1104 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 13 Nov 2017 00:07:47 -0500 Subject: [PATCH] Item14339: Change to Canonical PUBURL macro --- core/data/System/EditingShorthand.txt | 10 +++--- core/data/System/FileAttachment.txt | 22 ++++++------ core/templates/attach.tmpl | 2 +- core/templates/attachagain.tmpl | 2 +- core/templates/backlinksallwebs.tmpl | 4 +-- core/templates/backlinksweb.tmpl | 4 +-- core/templates/changeform.tmpl | 4 +-- core/templates/icons.tmpl | 48 +++++++++++++-------------- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/core/data/System/EditingShorthand.txt b/core/data/System/EditingShorthand.txt index bfd2355ab3..5561e898fe 100644 --- a/core/data/System/EditingShorthand.txt +++ b/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"}% @@ -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"}% @@ -492,7 +492,7 @@ Email addresses are also linked automatically, see further details below. https://foswiki.org -_%PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png_ +_%PUBURL{"foswiki-logo-icon.png" topic="%SYSTEMWEB%.ProjectLogos"}%_ @@ -506,7 +506,7 @@ _%PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png_ https://foswiki.org -_%PUBURL%/%SYSTEMWEB%/ProjectLogos/foswiki-logo-icon.png_ +_%PUBURL{"foswiki-logo-icon.png" topic="%SYSTEMWEB%.ProjectLogos"}%_ diff --git a/core/data/System/FileAttachment.txt b/core/data/System/FileAttachment.txt index 7c3c974c3c..1390064430 100644 --- a/core/data/System/FileAttachment.txt +++ b/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: =%ATTACHURL%/Sample.txt= - 1. ==[Preview]==: the =%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: =%ATTACHURL{"Sample.txt"}%= + 1. ==[Preview]==: the =%ATTACHURL{"Sample.txt"}%= text appears as: %ATTACHURL{"Sample.txt"}%, a link to the text file. * To reference an attachment located in another topic, enter: - * =%PUBURL%/%WEB%/OtherTopic/Sample.txt= (if it's within the same web) - * =%PUBURL%/Otherweb/OtherTopic/Sample.txt= (if it's in a different web) + * =%PUBURL{"Sample.txt" topic="%WEB%.OtherTopic"}%= (if it's within the same web) + * =%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: =%INCLUDE{"%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]]). + *
%INCLUDE{"%ATTACHURL{"Sample.txt"}%"}%
* 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: =%ATTACHURL%/Smile.gif= - 1. ==[Preview]==: text appears as %PUBURLPATH%/%WEB%/%TOPIC%/Smile.gif, an image. + 1. ==[Edit]== topic and write text: =%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"}% diff --git a/core/templates/attach.tmpl b/core/templates/attach.tmpl index 89884d6fe8..fd7c97eca7 100644 --- a/core/templates/attach.tmpl +++ b/core/templates/attach.tmpl @@ -48,7 +48,7 @@ %TMPL:DEF{"hiddenfields"}%%{"space to put extra hidden form fields"}%%TMPL:END% -%TMPL:DEF{"content"}%
+%TMPL:DEF{"content"}% %TMPL:P{"previousdetails"}% %TMPL:P{"attachform"}% %TMPL:P{"notes"}% diff --git a/core/templates/attachagain.tmpl b/core/templates/attachagain.tmpl index 4970cb97c8..46e4a02920 100644 --- a/core/templates/attachagain.tmpl +++ b/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"}%%TMPL:P{"sep"}%%TMPL:P{"sep"}%%MAKETEXT{"Move or delete attachment"}%%TMPL:P{"sep"}%%TMPL:P{"canceltopicaction"}%%TMPL:END% +%TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"sep"}%%TMPL:P{"sep"}%%MAKETEXT{"Move or delete attachment"}%%TMPL:P{"sep"}%%TMPL:P{"canceltopicaction"}%%TMPL:END% %TMPL:DEF{"fileuser"}%(%FILEUSER%)%TMPL:END% %TMPL:P{"attach"}%%{ end }% diff --git a/core/templates/backlinksallwebs.tmpl b/core/templates/backlinksallwebs.tmpl index 39632a691d..03088f22d1 100644 --- a/core/templates/backlinksallwebs.tmpl +++ b/core/templates/backlinksallwebs.tmpl @@ -3,10 +3,10 @@ %TMPL:DEF{"titleaction"}%%MAKETEXT{"(backlinks in all Webs)"}% %TMPL:END% -%TMPL:DEF{"resultsheader"}%

*%MAKETEXT{"Backlinks to [_1] in all Webs" args="[[%TOPIC%]]"}%* (%MAKETEXT{"Search [_1] Web only" args="%WEB%"}%)

%TMPL:END% +%TMPL:DEF{"resultsheader"}%

*%MAKETEXT{"Backlinks to [_1] in all Webs" args="[[%TOPIC%]]"}%* (%MAKETEXT{"Search [_1] Web only" args="%WEB%"}%)

%TMPL:END% %TMPL:DEF{"content"}%%TMPL:P{"resultsheader"}% %TMPL:P{"searchweb"}%
%TMPL:P{"searchallwebs"}% -%TMPL:END% \ No newline at end of file +%TMPL:END% diff --git a/core/templates/backlinksweb.tmpl b/core/templates/backlinksweb.tmpl index b10f35a082..567cd4a50a 100644 --- a/core/templates/backlinksweb.tmpl +++ b/core/templates/backlinksweb.tmpl @@ -2,9 +2,9 @@ %TMPL:DEF{"titleaction"}%%MAKETEXT{"(backlinks in [_1] Web)" args="%WEB%"}% %TMPL:END% -%TMPL:DEF{"resultsheader"}%

*%MAKETEXT{"Backlinks to [_1] in [_2] Web" args="[[%TOPIC%]], %WEB%"}%* (%MAKETEXT{"Search all webs"}%)

%TMPL:END% +%TMPL:DEF{"resultsheader"}%

*%MAKETEXT{"Backlinks to [_1] in [_2] Web" args="[[%TOPIC%]], %WEB%"}%* (%MAKETEXT{"Search all webs"}%)

%TMPL:END% %TMPL:DEF{"content"}%%TMPL:P{"resultsheader"}% %TMPL:P{"searchweb"}% -%TMPL:END% \ No newline at end of file +%TMPL:END% diff --git a/core/templates/changeform.tmpl b/core/templates/changeform.tmpl index 4305ab388a..3e6c313493 100644 --- a/core/templates/changeform.tmpl +++ b/core/templates/changeform.tmpl @@ -12,7 +12,7 @@ %TMPL:DEF{"topicactionbuttons"}% %MAKETEXT{"or"}% %TMPL:P{"gobacktopicaction"}%%TMPL:END% -%TMPL:DEF{"formstart"}%%TMPL:END% +%TMPL:DEF{"formstart"}%%TMPL:END% %TMPL:DEF{"formend"}%
%TMPL:END% @@ -37,4 +37,4 @@ %TEXT% %EDITACTION% %TMPL:P{"hiddenformfields"}% -%TMPL:P{"topicinfo"}%%TMPL:P{"formend"}%%TMPL:END% \ No newline at end of file +%TMPL:P{"topicinfo"}%%TMPL:P{"formend"}%%TMPL:END% diff --git a/core/templates/icons.tmpl b/core/templates/icons.tmpl index 0e34b29761..2b0f24d8a1 100644 --- a/core/templates/icons.tmpl +++ b/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"}%%TMPL:P{"iconalt:book"}%%TMPL:END% @@ -18,27 +18,27 @@ %TMPL:DEF{"icon:proportional"}%
p
%TMPL:END% %{ non-16 sized icons }% -%TMPL:DEF{"icon:more-small"}%Read more%TMPL:END% -%TMPL:DEF{"icon:photo"}%Photo%TMPL:END% -%TMPL:DEF{"icon:video"}%Video%TMPL:END% -%TMPL:DEF{"icon:search-small"}%Search%TMPL:END% -%TMPL:DEF{"icon:uweb-bo12"}%Edit%TMPL:END% -%TMPL:DEF{"icon:uweb-m12"}%Edit%TMPL:END% -%TMPL:DEF{"icon:uweb-o12"}%Edit%TMPL:END% -%TMPL:DEF{"icon:changes-small"}%Changes%TMPL:END% -%TMPL:DEF{"icon:rss-feed"}%RSS feed%TMPL:END% -%TMPL:DEF{"icon:xml-feed"}%XML feed%TMPL:END% -%TMPL:DEF{"icon:new"}%New%TMPL:END% -%TMPL:DEF{"icon:todo"}%TODO%TMPL:END% -%TMPL:DEF{"icon:updated"}%UPDATED%TMPL:END% -%TMPL:DEF{"icon:done"}%Done%TMPL:END% -%TMPL:DEF{"icon:closed"}%Closed%TMPL:END% -%TMPL:DEF{"icon:flag-gray-small"}%Flag%TMPL:END% -%TMPL:DEF{"icon:tablesortdiamond"}%Sort table%TMPL:END% -%TMPL:DEF{"icon:tablesortdown"}%Sort table descending%TMPL:END% -%TMPL:DEF{"icon:tablesortup"}%Sort table ascending%TMPL:END% -%TMPL:DEF{"icon:web-bg-small"}%Web%TMPL:END% -%TMPL:DEF{"icon:trash-small"}%Move to trash%TMPL:END% +%TMPL:DEF{"icon:more-small"}%Read more%TMPL:END% +%TMPL:DEF{"icon:photo"}%Photo%TMPL:END% +%TMPL:DEF{"icon:video"}%Video%TMPL:END% +%TMPL:DEF{"icon:search-small"}%Search%TMPL:END% +%TMPL:DEF{"icon:uweb-bo12"}%Edit%TMPL:END% +%TMPL:DEF{"icon:uweb-m12"}%Edit%TMPL:END% +%TMPL:DEF{"icon:uweb-o12"}%Edit%TMPL:END% +%TMPL:DEF{"icon:changes-small"}%Changes%TMPL:END% +%TMPL:DEF{"icon:rss-feed"}%RSS feed%TMPL:END% +%TMPL:DEF{"icon:xml-feed"}%XML feed%TMPL:END% +%TMPL:DEF{"icon:new"}%New%TMPL:END% +%TMPL:DEF{"icon:todo"}%TODO%TMPL:END% +%TMPL:DEF{"icon:updated"}%UPDATED%TMPL:END% +%TMPL:DEF{"icon:done"}%Done%TMPL:END% +%TMPL:DEF{"icon:closed"}%Closed%TMPL:END% +%TMPL:DEF{"icon:flag-gray-small"}%Flag%TMPL:END% +%TMPL:DEF{"icon:tablesortdiamond"}%Sort table%TMPL:END% +%TMPL:DEF{"icon:tablesortdown"}%Sort table descending%TMPL:END% +%TMPL:DEF{"icon:tablesortup"}%Sort table ascending%TMPL:END% +%TMPL:DEF{"icon:web-bg-small"}%Web%TMPL:END% +%TMPL:DEF{"icon:trash-small"}%Move to trash%TMPL:END% -%TMPL:DEF{"icon:processing-32-bg"}%processing%TMPL:END% -%TMPL:DEF{"icon:processing-32"}%processing%TMPL:END% +%TMPL:DEF{"icon:processing-32-bg"}%processing%TMPL:END% +%TMPL:DEF{"icon:processing-32"}%processing%TMPL:END%