From: <Cra...@nt...> - 2005-03-27 11:32:39
|
Author: CrawfordCurrie Date: 2005-03-27 03:32:01 -0800 (Sun, 27 Mar 2005) New Revision: 3911 Removed: twiki/branches/DEVELOP/templates/oopsaccesschange.tmpl twiki/branches/DEVELOP/templates/oopsaccessmanage.tmpl twiki/branches/DEVELOP/templates/oopsaccessrename.tmpl twiki/branches/DEVELOP/templates/oopsauth.tmpl twiki/branches/DEVELOP/templates/oopsbadcharset.tmpl twiki/branches/DEVELOP/templates/oopsbadpwformat.tmpl twiki/branches/DEVELOP/templates/oopsempty.tmpl twiki/branches/DEVELOP/templates/oopslocked.pattern.tmpl twiki/branches/DEVELOP/templates/oopslocked.tmpl twiki/branches/DEVELOP/templates/oopslockedrename.pattern.tmpl twiki/branches/DEVELOP/templates/oopslockedrename.tmpl twiki/branches/DEVELOP/templates/oopsmissing.tmpl twiki/branches/DEVELOP/templates/oopsresetpasswd2.tmpl twiki/branches/DEVELOP/templates/oopsrev.tmpl Modified: twiki/branches/DEVELOP/templates/oopsnotopic.tmpl twiki/branches/DEVELOP/templates/oopsnoweb.tmpl Log: SortOutOopsTemplates: Deleted useless (unused) templates Deleted: twiki/branches/DEVELOP/templates/oopsaccesschange.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsaccesschange.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsaccesschange.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,14 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Change Access Denied%TMPL:END% -%TMPL:DEF{"message"}% -You do not have permission to change topic <nop>%WEB%.<nop>%TOPIC%. - -Contact -<a href="mailto:%WIKIWEBMASTER%?subject=Change Access Denied for '%WEB%.%TOPIC%'">%WIKIWEBMASTER%</a> -if you have any questions. - -__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsaccessmanage.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsaccessmanage.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsaccessmanage.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,14 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Create Web Access Denied%TMPL:END% -%TMPL:DEF{"message"}% -You do not have permission to create new TWiki webs. - -Contact -<a href="mailto:%WIKIWEBMASTER%?subject=Create Web Access Denied for '%WEB%.%TOPIC%'">%WIKIWEBMASTER%</a> -if you have any questions. - -__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl, %TWIKIWEB%.%WIKIPREFSTOPIC% %TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsaccessrename.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsaccessrename.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsaccessrename.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,14 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}% Rename Access Denied%TMPL:END% -%TMPL:DEF{"message"}% -You do not have permission to rename topic <nop>%WEB%.<nop>%TOPIC%. - -Contact -<a href="mailto:%WIKIWEBMASTER%?subject=Rename Access Denied for '%WEB%.%TOPIC%'">%WIKIWEBMASTER%</a> -if you have any questions. - -__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsauth.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsauth.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsauth.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,21 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Either you need to register or the authentication failed%TMPL:END% -%TMPL:DEF{"message"}% -To edit topics on this %WIKITOOLNAME% collaborative web, you must be registered as a user. - ----+++ If you expected to be logged in at this point: - - * Did you type in your login name and password correctly? Remember, both are case sensitive. - * If you want to try again, back arrow and hit edit again. - * Registered users can %TWIKIWEB%.ChangePasswords and %TWIKIWEB%.ResetPasswords. - * __Note:__ You can also login anonymously as user *TWikiGuest* with password *guest*. - ----+++ To register as a new user: - - * Simply fill out the *[[%TWIKIWEB%.TWikiRegistration][TWikiRegistration]]* form. It only takes a minute. %TMPL:END% -%TMPL:DEF{"topicaction"}% - [[%WEB%.%TOPIC%][OK]] %TMPL:P{"sep"}% - [[%TWIKIWEB%.TWikiRegistration][Register]] %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsbadcharset.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsbadcharset.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsbadcharset.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,15 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Unusable site character set%TMPL:END% -%TMPL:DEF{"message"}% -The character encoding (character set) '%CHARSET%' configured in the =TWiki.cfg= file is not -usable with TWiki. This is because this character set could cause TWiki -syntax characters such as '[' to be recognized within multi-byte -characters. - -Please specify a different character set in the =TWiki.cfg= file by -updating the =$siteLocale= and =$siteCharsetOverride= settings as needed. -%TMPL:END% -%TMPL:DEF{"topicaction"}% %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsbadpwformat.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsbadpwformat.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsbadpwformat.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,13 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Password Format Error!%TMPL:END% -%TMPL:DEF{"message"}% -Incorrect format of submitted data: <b>%PARAM1%</b> - -The correct format is =WikiName:<encryptedpassword>= (13 chars). - -Please go back and check. -%TMPL:END% -%TMPL:DEF{"topicaction"}% %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsempty.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsempty.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsempty.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,15 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Topic must not be empty%TMPL:END% -%TMPL:DEF{"message"}% -You cannot save a topic with no text entered. Please try again. - -Some browser configurations occasionally send undefined data to the -server. *Don't worry, your changes are not lost.* Just click the Back -button on your browser and try again. - -The other possibility is that someone sent you the preview URL of -%WEB%.%TOPIC% instead of the view URL. %TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopslocked.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopslocked.pattern.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopslocked.pattern.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,34 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% - - - -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% - - - -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% - - - -%TMPL:DEF{"heading"}%Topic is locked by another user%TMPL:END% - - - -%TMPL:DEF{"message"}% -There is a possibility that <b> %PARAM1% </b> is editing this topic. -Please ask the contributor before making changes to this topic. - - * To look at the text without editing the topic click on the *View raw text* link. - * To edit anyway click on the *Edit anyway* link. - * To cancel go back in your browser or click on *Cancel*. - -__Note:__ Locking gets reset after %PARAM2% minutes of inactivity, -the earliest in <b>%PARAM3% minutes</b>. %TMPL:END% - - - -%TMPL:DEF{"topicaction"}%[[%WEB%.%TOPIC%][View topic]] %TMPL:P{"sep"}% <a href="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/%INCLUDINGTOPIC%?t=%GMTIME{"$year$month$day$hours$minutes$seconds"}%" title="Try if the topic is unlocked now" rel='nofollow'>Try again</a> %TMPL:P{"sep"}% <a href="%EDITURL%&breaklock=on" rel='nofollow'>Edit anyway</a> %TMPL:P{"sep"}% <a href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?raw=on" rel='nofollow'>View raw text</a> %TMPL:END% - - - -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopslocked.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopslocked.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopslocked.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,19 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Topic is locked by another user%TMPL:END% -%TMPL:DEF{"message"}% -There is a possibility that <b> %PARAM1% </b> is editing this topic. -Please ask the contributor before making changes to this topic. - - * To look at the text without editing the topic click on the *View raw text* link. - * To edit anyway click on the *Edit anyway* link. - * To cancel go back in your browser or click on *Cancel*. - -__Note:__ Locking gets reset after %PARAM2% minutes of inactivity, -the earliest in <b>%PARAM3% minutes</b>. %TMPL:END% - -%TMPL:DEF{"topicaction"}%[[%WEB%.%TOPIC%][View topic]] %TMPL:P{"sep"}% <a href="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/%INCLUDINGTOPIC%?t=%GMTIME{"$year$month$day$hours$minutes$seconds"}%" title="Try if the topic is unlocked now" rel='nofollow'>Try again</a> %TMPL:P{"sep"}% <a href="%EDITURL%&breaklock=on" rel='nofollow'>Edit anyway</a> %TMPL:P{"sep"}% <a href="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?raw=on" rel='nofollow'>View raw text</a> %TMPL:END% - - -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopslockedrename.pattern.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopslockedrename.pattern.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopslockedrename.pattern.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,32 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% - - - -%TMPL:DEF{"titleaction"}%(oops rename) %TMPL:END% - - - -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% - - - -%TMPL:DEF{"heading"}%Topic is locked by another user%TMPL:END% - - - -%TMPL:DEF{"message"}% - -%OLD_LOCK% -%NEW_LOCK% - - * To rename anyway click on *Rename anyway* - * To cancel go back in your browser or click on *Cancel* -%TMPL:END% - - - -%TMPL:DEF{"topicaction"}%[[%WEB%.%TOPIC%][Cancel]] %TMPL:P{"sep"}% [[%SCRIPTURL%/rename%SCRIPTSUFFIX%/%WEB%/%TOPIC%?breaklock=on&newWeb=%NEW_WEB%&newTopic=%NEW_TOPIC%&attachment=%ATTACHMENT%][Rename anyway]]%TMPL:END% - - - -%TMPL:P{"oops"}% \ No newline at end of file Deleted: twiki/branches/DEVELOP/templates/oopslockedrename.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopslockedrename.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopslockedrename.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,15 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops rename) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Topic is locked by another user%TMPL:END% -%TMPL:DEF{"message"}% - -%OLD_LOCK% -%NEW_LOCK% - - * To rename anyway click on *Rename anyway* - * To cancel go back in your browser or click on *Cancel* - -%TMPL:END% -%TMPL:DEF{"topicaction"}%[[%WEB%.%TOPIC%][Cancel]] %TMPL:P{"sep"}% [[%SCRIPTURL%/rename%SCRIPTSUFFIX%/%WEB%/%TOPIC%?breaklock=on&newWeb=%NEW_WEB%&newTopic=%NEW_TOPIC%&attachment=%ATTACHMENT%][Rename anyway]]%TMPL:END% -%TMPL:P{"oops"}% Deleted: twiki/branches/DEVELOP/templates/oopsmissing.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsmissing.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsmissing.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,8 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(oops topic missing) %TMPL:END% -%TMPL:DEF{"webaction"}% *Attention* %TMPL:END% -%TMPL:DEF{"heading"}%Topic does not exist%TMPL:END% -%TMPL:DEF{"message"}% -Please go back in your browser and chose a topic that exists. %TMPL:END% -%TMPL:DEF{"topicaction"}% %TMPL:END% -%TMPL:P{"oops"}% Modified: twiki/branches/DEVELOP/templates/oopsnotopic.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsnotopic.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsnotopic.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -6,7 +6,7 @@ You cannot %PARAM1% a non-existant topic. Please create the topic first. %TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%HOMETOPIC%][Cancel]] %SEP% -[[%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%][View]] %SEP% +%TMPL:DEF{"topicaction"}% [[%WEB%.%HOMETOPIC%][Cancel]] %TMPL:P{"sep"}% +[[%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%][View]] %TMPL:P{"sep"}% [[%SCRIPTURL%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%?t=%SERVERTIME{"$year$mo$day$min$sec"}%][Create]] %TMPL:END% %TMPL:P{"oops"}% Modified: twiki/branches/DEVELOP/templates/oopsnoweb.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsnoweb.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsnoweb.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -3,8 +3,9 @@ %TMPL:DEF{"webaction"}% *Attention* %TMPL:END% %TMPL:DEF{"heading"}%The "%WEB%" web does not exist%TMPL:END% %TMPL:DEF{"message"}% + A %TWIKIWEB%.TWikiSite is divided into webs; each one represents one -subject, one area of collaboration. You are trying to access a web +subject, one area of collaboration. You are trying to '%PARAM1%' in a web that does not exist. ---+++ If you came here by clicking on a question mark link: Deleted: twiki/branches/DEVELOP/templates/oopsresetpasswd2.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsresetpasswd2.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsresetpasswd2.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,10 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(note) %TMPL:END% -%TMPL:DEF{"webaction"}% *Note* %TMPL:END% -%TMPL:DEF{"heading"}%Your TWiki password has been changed%TMPL:END% -%TMPL:DEF{"message"}% - -A new *system-generated* password has been sent to *%PARAM1%* along with instructions on how to change it. -%TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END% - Deleted: twiki/branches/DEVELOP/templates/oopsrev.tmpl =================================================================== --- twiki/branches/DEVELOP/templates/oopsrev.tmpl 2005-03-27 11:30:25 UTC (rev 3910) +++ twiki/branches/DEVELOP/templates/oopsrev.tmpl 2005-03-27 11:32:01 UTC (rev 3911) @@ -1,28 +0,0 @@ -%TMPL:INCLUDE{"twiki"}% -%TMPL:DEF{"titleaction"}%(revision) %TMPL:END% -%TMPL:DEF{"webaction"}% *Select revision* %TMPL:END% -%TMPL:DEF{"heading"}%View Previous Topic Revision%TMPL:END% -%TMPL:DEF{"message"}% -<form name="main" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%"> - * Revision: <input type="text" name="rev" size="6" value="%PARAM1%" /> - <input type="submit" class="twikiSubmit" value="View revision" /> ( 1.1 ... %PARAM1% ) -</form> - ----+ Compare Revisions - -<form name="main" action="%SCRIPTURLPATH%/rdiff%SCRIPTSUFFIX%/%WEB%/%TOPIC%"> -<table> -<tr><td> - * Older revision: -</td><td> -<input type="text" name="rev2" size="6" value="1.1" /> -</td></tr><tr><td> - * Newer revision: -</td><td> -<input type="text" name="rev1" size="6" value="%PARAM1%" /> -<input type="submit" class="twikiSubmit" value="View difference" /> -</td></tr> -</table> -</form> %TMPL:END% -%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][Cancel]] %TMPL:END% -%TMPL:P{"oops"}% |