From: <Cra...@nt...> - 2005-08-26 13:39:00
|
Author: CrawfordCurrie Date: 2005-08-26 20:08:21 -0700 (Fri, 26 Aug 2005) New Revision: 6177 Modified: twiki/branches/DEVELOP/templates/oopsattention.tmpl twiki/branches/DEVELOP/templates/renameweb.pattern.tmpl twiki/branches/DEVELOP/templates/renamewebbase.pattern.tmpl twiki/branches/DEVELOP/templates/renamewebbase.tmpl twiki/branches/DEVELOP/templates/renamewebconfirm.pattern.tmpl Log: Item293: moved english strings into templates Modified: twiki/branches/DEVELOP/templates/oopsattention.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsattention.tmpl 2005-08-27 02:52:33 UTC (rev 6176) +++ twiki/branches/DEVELOP/templates/oopsattention.tmpl 2005-08-27 03:08:21 UTC (rev 6177) @@ -78,7 +78,7 @@ Please go back in your browser and chose a topic name that is a %TWIKIWEB%.WikiWord or check the allow non-Wiki Word box %TMPL:END% %TMPL:DEF{"rename_err"}% -During rename of topic <nop>%WEB%.<nop>%TOPIC% to <nop>%PARAM2%.<nop>%PARAM3% an error (%PARAM1%) was found. Please notify your %WIKITOOLNAME% +During rename of topic <nop>%WEB%.<nop>%TOPIC% to <nop>%PARAM2% an error (%PARAM1%) was found. Please notify your %WIKITOOLNAME% administrator. %TMPL:END% %TMPL:DEF{"rename_web_err"}% @@ -322,9 +322,23 @@ Go back in your browser and save your changes locally. %TMPL:END% %TMPL:DEF{"rename_web_prerequisites"}% ----++ Potential Problems Renaming Web: +---+++ There are problems with renaming this web: +1. You are denied access to the following topics in the web: %PARAM1% +2. The following topics are locked for edit, and cannot be moved: +%PARAM2% + +3. The following topics refer to topics in this web, but you are denied access to them: +%PARAM3% + +4. The following topics refer to topics in this web, but are being edited: +%PARAM4% + +<div %PARAM5%> +<a href="%SCRIPTURL%/rename%SCRIPTSUFFIX%/%WEB%/%HOMETOPIC%?action=renameweb;confirm=continue" />Continue and try to rename web?</a> +</div> + %TMPL:END% %TMPL:DEF{"message"}% Modified: twiki/branches/DEVELOP/templates/renameweb.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/renameweb.pattern.tmpl 2005-08-27 02:52:33 UTC (rev 6176) +++ twiki/branches/DEVELOP/templates/renameweb.pattern.tmpl 2005-08-27 03:08:21 UTC (rev 6177) @@ -24,7 +24,7 @@ -%TMPL:DEF{"movewebhelp"}%You can move this web to a different web name. <br />Move this web to the Trash web to delete it. %TMPL:END% +%TMPL:DEF{"movewebhelp"}%You can rename this web to a different web name. <br />Move this web to the Trash web to delete it (for example, rename it to %TRASHWEB%/%WEB%). %TMPL:END% Modified: twiki/branches/DEVELOP/templates/renamewebbase.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/renamewebbase.pattern.tmpl 2005-08-27 02:52:33 UTC (rev 6176) +++ twiki/branches/DEVELOP/templates/renamewebbase.pattern.tmpl 2005-08-27 03:08:21 UTC (rev 6177) @@ -61,7 +61,13 @@ </div> <div class="patternSearchResults"><div class="patternSearchResultsHeader">Notices:</div> -%RENAMEWEB_NOTICES% +*Topics which are currently being edited by other users in the <nop>%WEB% Web:* +%MOVE_LOCKED% + +*Topics which refer to this web and are are currently being edited by other users:* %REF_LOCKED% + +*Topics which refer to this web that you do not have permission to change:* +%REF_DENIED% </div> <div class="patternSearchResults"><div class="patternSearchResultsHeader">Change links in topics that refer to %WEB% in the <nop>%WEB% Web:</div>%LOCAL_SEARCH%</div> @@ -74,9 +80,7 @@ </tr></table></div> <div class="twikiHelp"> *Note:* - * Get help on - <a target="ManagingWebs" onclick="return launchWindow('%TWIKIWEB%','ManagingWebs')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/ManagingWebs" rel='nofollow'>Renaming and moving webs</a>. - * Select the %TRASHWEB% Web to delete the web. + * <a target="ManagingWebs" onclick="return launchWindow('%TWIKIWEB%','ManagingWebs')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/ManagingWebs" rel='nofollow'>Click here</a> to get help on managing webs * The checkmarked topics will be updated </div> %TMPL:P{"topicaction"}% Modified: twiki/branches/DEVELOP/templates/renamewebbase.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/renamewebbase.tmpl 2005-08-27 02:52:33 UTC (rev 6176) +++ twiki/branches/DEVELOP/templates/renamewebbase.tmpl 2005-08-27 03:08:21 UTC (rev 6177) @@ -32,10 +32,15 @@ | *To:* | %TMPL:P{"newparentweb"}%. |%TMPL:P{"newsubweb"}% | %TMPL:P{"notes"}% ----++ Notices: +---++ Notices +*Topics which are currently being edited by other users in the <nop>%WEB% Web:* +%MOVE_LOCKED% -%RENAMEWEB_NOTICES% +*Topics which refer to this web and are are currently being edited by other users:* %REF_LOCKED% +*Topics which refer to this web that you do not have permission to change:* +%REF_DENIED% + ---++ Change links in topics that refer to <nop>%WEB%.Topicname in the <nop>%WEB% Web: %LOCAL_SEARCH% Modified: twiki/branches/DEVELOP/templates/renamewebconfirm.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/renamewebconfirm.pattern.tmpl 2005-08-27 02:52:33 UTC (rev 6176) +++ twiki/branches/DEVELOP/templates/renamewebconfirm.pattern.tmpl 2005-08-27 03:08:21 UTC (rev 6177) @@ -17,11 +17,16 @@ +<!-- + * Set refresh_prompt = Refresh + * Set submit_prompt = Submit +--> %TMPL:DEF{"topicaction"}%<div class="patternTopicAction"> <table> <tr> <td class="patternCancelCol"><a href="%SCRIPTURLPATH%/rename/%WEB%/%TOPIC%?action=renameweb&confirm=cancel">Cancel</a></td> -<td class="patternSubmitCol"><input type="hidden" name="nonwikiword" value="%URLPARAM{"nonwikiword"}%" /><input type="submit" class="twikiSubmit" value="%RENAMEWEB_SUBMIT%" /></td> +<td class="patternSubmitCol"><input type="hidden" name="nonwikiword" value="%URLPARAM{"nonwikiword"}%" /> +<input type="submit" class="twikiSubmit" value="%RENAMEWEB_SUBMIT%" then=refresh_prompt" else="submit_prompt"}%" /></td> <td class="patternAddCol"></td> </tr></table></div>%TMPL:END% |