Skip to content

Commit

Permalink
Item14339: More SCRIPTURL converting to canonical form
Browse files Browse the repository at this point in the history
  • Loading branch information
@gac410
gac410 committed Mar 28, 2017
1 parent 38650f9 commit 1422572
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 19 deletions.
6 changes: 3 additions & 3 deletions core/data/Main/WebRss.txt
View file
@@ -1,8 +1,8 @@
%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
%IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
<link>%SCRIPTURL{"view"}%/%WEB%</link>
<link>%SCRIPTURL{"view" web="%WEB%"}%</link>
<description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
%INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
* Set SKIN = rss
Expand Down
7 changes: 4 additions & 3 deletions core/data/Sandbox/WebRss.txt
View file
@@ -1,7 +1,8 @@
%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
%IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
<link>%SCRIPTURL{"view"}%/%WEB%</link>
<link>%SCRIPTURL{"view" web="%WEB%"}%</link>
<description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
%INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
* Set SKIN = rss
Expand Down
4 changes: 2 additions & 2 deletions core/data/System/AppendixCascadingStyleSheets.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1489206078" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1490666627" format="1.1" version="1"}%
%META:TOPICPARENT{name="DeveloperDocumentationCategory"}%
%STARTINCLUDE%
---+ Appendix C: CSS
Expand Down Expand Up @@ -214,7 +214,7 @@ Markers to invoke behaviour with unobtrusive !JavaScript.
#TestFoswikiFocus
---++++ Troubleshooting foswikiFocus
* Test for loading error of focus plugin (no message means ok): %JQREQUIRE{"focus"}%
* [[%SCRIPTURLPATH{"view" topic="%WEB%.%TOPIC%" testfocus="1"}%#TestFoswikiFocus][Test foswikiFocus]]
* [[%SCRIPTURLPATH{"view" topic="%WEB%.%TOPIC%" testfocus="1" #="TestFoswikiFocus"}%][Test foswikiFocus]]

%IF{"$'URLPARAM{testfocus}'='1'" then="
$percntJQREQUIRE{$quotfocus$quot}$percnt
Expand Down
6 changes: 3 additions & 3 deletions core/data/System/WebRss.txt
View file
@@ -1,8 +1,8 @@
%META:TOPICINFO{author="ProjectContributor" date="1394718139" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
%IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
<link>%SCRIPTURL{"view"}%/%WEB%</link>
<link>%SCRIPTURL{"view" web="%WEB%"}%</link>
<description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
%INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
* Set SKIN = rss
Expand Down
4 changes: 2 additions & 2 deletions core/data/Trash/WebHome.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1433037425" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1490664179" format="1.1" version="1"}%
---+!! %MAKETEXT{"Welcome to the [_1] web" args="<nop>%WEB%"}%
%MAKETEXT{"This is the Trash. Here you can undelete topics; deleted attachments are in TrashAttachment." args="<b><nop>%WEB%</b>"}%

Expand All @@ -12,7 +12,7 @@ Last 15 changes in this web:
[[WebChanges][%MAKETEXT{"more..."}%]]

---++ <nop>%WEB% Web Utilities
<form action='%SCRIPTURLPATH{"search"}%/%WEB%/'>
<form action='%SCRIPTURLPATH{"search" web="%WEB%"}%'>
* <input type="text" name="search" size="22" />&nbsp;<input type="submit" class="foswikiSubmit" value="Search" /> - [[WebSearchAdvanced][advanced search]]
* WebTopicList - all topics in alphabetical order
* WebChanges - recent topic changes in this web
Expand Down
7 changes: 4 additions & 3 deletions core/data/Trash/WebRss.txt
View file
@@ -1,7 +1,8 @@
%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
%IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
<link>%SCRIPTURL{"view"}%/%WEB%</link>
<link>%SCRIPTURL{"view" web="%WEB%"}%</link>
<description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
%INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
* Set SKIN = rss
Expand Down
7 changes: 4 additions & 3 deletions core/data/_default/WebRss.txt
View file
@@ -1,7 +1,8 @@
%META:TOPICINFO{author="ProjectContributor" date="1281665178" format="1.1" version="1"}%
<channel rdf:about="%SCRIPTURL{"view"}%/%WEB%">
%META:TOPICINFO{author="ProjectContributor" date="1490663609" format="1.1" version="1"}%
%META:TOPICPARENT{name="WebHome"}%
<channel rdf:about="%SCRIPTURL{"view" web="%WEB%"}%">
%IF{ "$'URLPARAM{search}'!=''" then="<title><nop>%WIKITOOLNAME% search results for <nop>%URLPARAM{search}%</title>" else="<title><nop>%WIKITOOLNAME%'s <nop>%WEB% web</title>"}%
<link>%SCRIPTURL{"view"}%/%WEB%</link>
<link>%SCRIPTURL{"view" web="%WEB%"}%</link>
<description><literal>%MAKETEXT{"The [_1] web of [_2]." args="<nop>%WEB%,<nop>%WIKITOOLNAME%"}% <nop>%WEBSUMMARY%</literal></description>
%INCLUDE{"%SYSTEMWEB%.WebRssBase"}%<!--
* Set SKIN = rss
Expand Down

0 comments on commit 1422572

Please sign in to comment.