From: <Art...@nt...> - 2005-12-02 22:09:32
|
Author: ArthurClemens Date: 2005-12-02 14:07:21 -0800 (Fri, 02 Dec 2005) New Revision: 7718 Modified: twiki/branches/DEVELOP/templates/rdiff.pattern.tmpl twiki/branches/DEVELOP/templates/twiki.pattern.tmpl twiki/branches/DEVELOP/templates/view.pattern.tmpl Log: Item911: rolling back Crawford's mistakenly erased changes to %SCRIPTURL{}% Modified: twiki/branches/DEVELOP/templates/rdiff.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/rdiff.pattern.tmpl 2005-12-02 19:10:15 UTC (rev 7717) +++ twiki/branches/DEVELOP/templates/rdiff.pattern.tmpl 2005-12-02 22:07:21 UTC (rev 7718) @@ -16,15 +16,15 @@ %TMPL:DEF{"repeatedsearchblock"}%%REPEAT%<div class="patternSearchResults"><div class="patternSearchResultsHeader"> <tt><b><<O>></b></tt> %MAKETEXT{"Difference Topic"}% - <b><a href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%">%TOPIC%</a></b> - (<a href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?rev=%REVTITLE1%" rel='nofollow'>%REVTITLE1%</a> - %REVINFO1%)</div> + <b><a href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%">%TOPIC%</a></b> + (<a href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?rev=%REVTITLE1%" rel='nofollow'>%REVTITLE1%</a> - %REVINFO1%)</div> %TEXT%</div>%REPEAT%%TMPL:END% -%TMPL:DEF{"topicaction"}%<a name="Actions"> </a><div class="patternTopicAction"><span class="patternActionButtons"> <a href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%">%MAKETEXT{"View topic"}%</a> +%TMPL:DEF{"topicaction"}%<a name="Actions"> </a><div class="patternTopicAction"><span class="patternActionButtons"> <a href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%">%MAKETEXT{"View topic"}%</a> %TMPL:P{"sep"}% %TMPL:P{"revisions"}% - %TMPL:P{"sep"}% <a href="%SCRIPTURLPATH%/oops%SCRIPTSUFFIX%/%WEB%/%TOPIC%?template=oopsmore&param1=%MAXREV%&param2=%CURRREV%" rel='nofollow'>%MAKETEXT{"More topic actions..."}%</a></span></div>%TMPL:END% + %TMPL:P{"sep"}% <a href="%SCRIPTURL{"oops"}%/%WEB%/%TOPIC%?template=oopsmore&param1=%MAXREV%&param2=%CURRREV%" rel='nofollow'>%MAKETEXT{"More topic actions..."}%</a></span></div>%TMPL:END% Modified: twiki/branches/DEVELOP/templates/twiki.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/twiki.pattern.tmpl 2005-12-02 19:10:15 UTC (rev 7717) +++ twiki/branches/DEVELOP/templates/twiki.pattern.tmpl 2005-12-02 22:07:21 UTC (rev 7718) @@ -13,7 +13,7 @@ -%TMPL:DEF{"canceltopicaction"}%<a href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%" title='%MAKETEXT{"Back to topic"}%' accesskey='C' rel='nofollow'>%MAKETEXT{"&Cancel"}%</a>%TMPL:END% +%TMPL:DEF{"canceltopicaction"}%<a href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%" title='%MAKETEXT{"Back to topic"}%' accesskey='C' rel='nofollow'>%MAKETEXT{"&Cancel"}%</a>%TMPL:END% @@ -32,7 +32,7 @@ <script type="text/javascript"> //<![CDATA[ function launchWindow(inWeb, inTopic) { - return launchTheWindow("%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/", inWeb, inTopic, "plain.pattern"); + return launchTheWindow("%SCRIPTURL{"view"}%/", inWeb, inTopic, "plain.pattern"); } //]]> </script> @@ -58,7 +58,7 @@ <link rel="icon" href="%FAVICON%" type="image/x-icon" /> <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" /> <meta name="robots" content="noindex" /> %HTTP_EQUIV_ON_VIEW% -<base href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%" /> +<base href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%" /> %TMPL:P{"script"}% %TMPL:P{"twikistyle"}% %TMPL:P{"templatecustomstyle"}% Modified: twiki/branches/DEVELOP/templates/view.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/view.pattern.tmpl 2005-12-02 19:10:15 UTC (rev 7717) +++ twiki/branches/DEVELOP/templates/view.pattern.tmpl 2005-12-02 22:07:21 UTC (rev 7718) @@ -32,15 +32,15 @@ -%TMPL:DEF{"inactive_edit"}%<span class="patternButton"><a href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%" rel="nofollow" title='%MAKETEXT{"View topic"}%'>%MAKETEXT{"View topic"}%</a></span>%TMPL:P{"sep"}%<span class="patternButton"><strike>%MAKETEXT{"Edit"}%</strike></span>%TMPL:END% +%TMPL:DEF{"inactive_edit"}%<span class="patternButton"><a href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%" rel="nofollow" title='%MAKETEXT{"View topic"}%'>%MAKETEXT{"View topic"}%</a></span>%TMPL:P{"sep"}%<span class="patternButton"><strike>%MAKETEXT{"Edit"}%</strike></span>%TMPL:END% -%TMPL:DEF{"editraw"}%<span class="patternButton"><a href="%SCRIPTURL%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%" rel="nofollow" title='%MAKETEXT{"Edit this topic text"}%' accesskey="E">%TMPL:P{context="new_topic" then="create_topic" else="edit_topic"}%</a></span>%TMPL:END% +%TMPL:DEF{"editraw"}%<span class="patternButton"><a href="%SCRIPTURL{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%" rel="nofollow" title='%MAKETEXT{"Edit this topic text"}%' accesskey="E">%TMPL:P{context="new_topic" then="create_topic" else="edit_topic"}%</a></span>%TMPL:END% %TMPL:DEF{"activatable_raw_edit"}%%TMPL:P{context="inactive" then="inactive_edit" else="editrawnowysiwyg"}%%TMPL:END% %TMPL:DEF{"editrawwysiwyg"}%%TMPL:P{"sep"}%%TMPL:P{"editraw"}%%TMPL:END% %TMPL:DEF{"editrawnowysiwyg"}%%TMPL:P{"editraw"}%%TMPL:END% -%TMPL:DEF{"wysiwyg"}%<span class="patternButton"><a href="%SCRIPTURL%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%?skin=kupu" rel="nofollow" title='%MAKETEXT{"Edit this topic text"}%'>%MAKETEXT{"&Compose"}%</a></span>%TMPL:END% +%TMPL:DEF{"wysiwyg"}%<span class="patternButton"><a href="%SCRIPTURL{"edit"}%/%WEB%/%TOPIC%?skin=kupu" rel="nofollow" title='%MAKETEXT{"Edit this topic text"}%'>%MAKETEXT{"&Compose"}%</a></span>%TMPL:END% %TMPL:DEF{"activatable_wysiwyg_edit_if_available"}%%TMPL:P{context="WysiwygPluginEnabled" then="wysiwyg"}%%TMPL:END% %TMPL:DEF{"activatable_wysiwyg_edit"}%%TMPL:P{context="inactive" else="activatable_wysiwyg_edit_if_available"}%%TMPL:END% |