Menu
▾
▴
[TWiki-Dev] [SVN] r1730 - twiki/trunk/templates
|
From: Arthur C. <acl...@nt...> - 2004-08-23 23:09:46
|
Author: aclemens
Date: 2004-08-23 16:07:59 -0700 (Mon, 23 Aug 2004)
New Revision: 1730
Modified:
twiki/trunk/templates/attachagain.pattern.tmpl
twiki/trunk/templates/edit.pattern.tmpl
twiki/trunk/templates/edit.tmpl
twiki/trunk/templates/preview.pattern.tmpl
twiki/trunk/templates/view.pattern.tmpl
Log:
some more patternskin updates: edit screen, revinfo
Modified: twiki/trunk/templates/attachagain.pattern.tmpl
===================================================================
--- twiki/trunk/templates/attachagain.pattern.tmpl 2004-08-22 12:44:05 UTC (rev 1729)
+++ twiki/trunk/templates/attachagain.pattern.tmpl 2004-08-23 23:07:59 UTC (rev 1730)
@@ -43,16 +43,16 @@
-%TMPL:DEF{"topicaction"}%<div class="twikiTopicAction"><div class="twikiTopicActionSecondary"><a href="%SCRIPTURLPATH%/rename%SCRIPTSUFFIX%/%WEB%/%TOPIC%?attachment=%FILENAME%">Move attachment...</a>
-</div>
-<table>
-<tr>
+%TMPL:DEF{"topicaction"}%<table class="twikiTopicAction">
+<tr class="twikiTopicActionSecondary">
+<td class="twikiCancelCol" colspan="3" style="text-align:right;"><a href="%SCRIPTURLPATH%/rename%SCRIPTSUFFIX%/%WEB%/%TOPIC%?attachment=%FILENAME%">Move attachment...</a></td>
+</tr>
+<tr class="twikiTopicAction">
<td class="twikiCancelCol">[[%WEB%.%TOPIC%][Cancel]]</td>
<td class="twikiSubmitCol"><input type="submit" class="twikiSubmit" value="Upload file" /></td>
<td class="twikiAddCol"><input type="submit" class="twikiSubmit twikiTertiary" name="changeproperties" value="Change properties only" /></td>
</tr>
-</table>
-</div>%TMPL:END%
+</table>%TMPL:END%
Modified: twiki/trunk/templates/edit.pattern.tmpl
===================================================================
--- twiki/trunk/templates/edit.pattern.tmpl 2004-08-22 12:44:05 UTC (rev 1729)
+++ twiki/trunk/templates/edit.pattern.tmpl 2004-08-23 23:07:59 UTC (rev 1730)
@@ -53,7 +53,7 @@
if( ! theAnchor ) {
theAnchor = "";
}
- win = open( "%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/" + theWeb + "/" + theTopic + "?skin=plain" + theAnchor,
+ win = open( "%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/" + theWeb + "/" + theTopic + theAnchor,
theTopic, "titlebar=0,width=500,height=480,resizable,scrollbars");
if( win ) {
win.focus();
@@ -88,29 +88,28 @@
-%TMPL:DEF{"topicaction"}%<div class="twikiTopicAction">
-<div class="twikiTopicActionHelp twikiGrayText">
-<a href="#Opens page in new window" onclick="launchWindow('%TWIKIWEB%', 'AccessKeys'); return false;">Access keys</a>: C = Cancel, K = Checkpoint, Q = Quiet Save, S = Save, P = Preview</div><div class="twikiTopicActionSecondary">
-<input type="checkbox" class="twikiCheckbox" name="unlock" id="releaselock" %RELEASEEDITLOCKCHECKBOX% /><label for="releaselock">Release edit lock</label> <a target="UnlockTopic" onclick="return launchWindow('%TWIKIWEB%','UnlockTopic')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/UnlockTopic">help</a><br />
- <input type="checkbox" class="twikiCheckbox" id="dontnotify" name="dontnotify" %DONTNOTIFYCHECKBOX% /><label for="dontnotify">Minor changes, don't notify</label> <a target="DontNotify" onclick="return launchWindow('%TWIKIWEB%','DontNotify')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/DontNotify">help</a>
-</div>
-<table>
-<tr>
+%TMPL:DEF{"topicaction"}%<table class="twikiTopicAction">
+<tr class="twikiTopicActionHelp twikiGrayText">
+<td colspan="3" class="twikiTopicActionHelp twikiGrayText"><a href="#Opens page in new window" onclick="launchWindow('%TWIKIWEB%', 'AccessKeys'); return false;">Access keys</a>: C = Cancel, K = Checkpoint, Q = Quiet Save, S = Save, P = Preview</td>
+</tr>
+<tr class="twikiTopicActionSecondary">
+<td class="twikiCancelCol"> </td>
+<td class="twikiSubmitCol"><div class="twikiSubmitOptions"><input type="checkbox" class="twikiCheckbox" name="unlock" id="releaselock" %RELEASEEDITLOCKCHECKBOX% /><label for="releaselock">Release edit lock</label> <a target="UnlockTopic" onclick="return launchWindow('%TWIKIWEB%','UnlockTopic')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/UnlockTopic">help</a><br />
+ <input type="checkbox" class="twikiCheckbox" id="dontnotify" name="dontnotify" %DONTNOTIFYCHECKBOX% /><label for="dontnotify">Minor changes, don't notify</label> <a target="DontNotify" onclick="return launchWindow('%TWIKIWEB%','DontNotify')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/DontNotify">help</a></div></td>
+<td class="twikiAddCol"> </td>
+</tr>
+<tr class="twikiTopicAction">
<td class="twikiCancelCol"><a id="cancel" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?unlock=on" accesskey="c">Cancel</a></td>
-<td class="twikiSubmitCol">
- <input type="submit" class="twikiSubmit twikiSecondary" name="action" id="checkpoint" value="Checkpoint" /><label accesskey="k" for="checkpoint"></label>
- <input type="submit" class="twikiSubmit twikiSecondary" name="action" id="quietsave" value="QuietSave" /><label accesskey="q" for="quietsave"></label>
- <input type="submit" class="twikiSubmit" name="action" id="save" value="Save" /><label accesskey="s" for="save"></label></td>
+<td class="twikiSubmitCol"><input type="submit" class="twikiSubmit twikiSecondary" name="action" id="checkpoint" value="Checkpoint" /><label accesskey="k" for="checkpoint"></label><input type="submit" class="twikiSubmit twikiSecondary" name="action" id="quietsave" value="QuietSave" /><label accesskey="q" for="quietsave"></label><input type="submit" class="twikiSubmit" name="action" id="save" value="Save" /><label accesskey="s" for="save"></label></td>
<td class="twikiAddCol"><input type="submit" class="twikiSubmit twikiTertiary" name="action" id="preview" value="Preview" /><label accesskey="p" for="preview"></label></td>
</tr>
</table>
-</div>
%TMPL:END%
%TMPL:DEF{"content"}%
-%TMPL:P{"simpleheader"}%<div class="twikiFormHolder"><form name="main" action="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="post"><label for="topic" class="twikiGrayText">See below for help in editing this page.</label><textarea id="topic" name="text" wrap="virtual" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" onkeydown="if(window.event.keyCode==27) return false;">%TEXT%</textarea><br />
+%TMPL:P{"simpleheader"}%<div class="twikiFormHolder"><form name="main" action="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="post"><label for="topic" class="twikiGrayText">See below for help in editing this page.<br /></label><textarea id="topic" name="text" wrap="virtual" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" onkeydown="if(window.event.keyCode==27) return false;">%TEXT%</textarea><br />
<input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" />
<input type="hidden" name="topicparent" value="%TOPICPARENT%" />
<input type="hidden" name="cmd" value="%CMD%" /><div></div>
Modified: twiki/trunk/templates/edit.tmpl
===================================================================
--- twiki/trunk/templates/edit.tmpl 2004-08-22 12:44:05 UTC (rev 1729)
+++ twiki/trunk/templates/edit.tmpl 2004-08-23 23:07:59 UTC (rev 1730)
@@ -76,11 +76,11 @@
</div>%TMPL:END%
%TMPL:DEF{"topicaction"}%
- <input type="submit" class="twikiSubmit" name="action" value="Cancel" id="cancel" />
- <input type="submit" class="twikiSubmit" name="action" value="Preview" id="preview" />
+ <input type="submit" class="twikiSubmit" name="action" value="Cancel" id="cancel" />
<input type="submit" class="twikiSubmit" name="action" value="Checkpoint" id="checkpoint" />
<input type="submit" class="twikiSubmit" name="action" value="QuietSave" id="quietsave" />
- <input type="submit" class="twikiSubmit" name="action" value="Save" id="save" />%TMPL:END%
+ <input type="submit" class="twikiSubmit" name="action" value="Save" id="save" />
+ <input type="submit" class="twikiSubmit" name="action" value="Preview" id="preview" />%TMPL:END%
%TMPL:DEF{"titleaction"}%(edit) %TMPL:END%
%TMPL:DEF{"titlehelp"}% %TMPL:END%
%TMPL:DEF{"webaction"}%Change topic%TMPL:END%
Modified: twiki/trunk/templates/preview.pattern.tmpl
===================================================================
--- twiki/trunk/templates/preview.pattern.tmpl 2004-08-22 12:44:05 UTC (rev 1729)
+++ twiki/trunk/templates/preview.pattern.tmpl 2004-08-23 23:07:59 UTC (rev 1730)
@@ -42,17 +42,22 @@
-%TMPL:DEF{"topicaction"}%<div class="twikiTopicAction"><div class="twikiTopicActionSecondary">
-<input type="checkbox" class="twikiCheckbox" name="unlock" id="releaselock" %RELEASEEDITLOCKCHECKBOX% /><label for="releaselock">Release edit lock</label> <a target="UnlockTopic" onclick="return launchWindow('%TWIKIWEB%','UnlockTopic')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/UnlockTopic">help</a><br />
- <input type="checkbox" class="twikiCheckbox" id="dontnotify" name="dontnotify" %DONTNOTIFYCHECKBOX% /><label for="dontnotify">Minor changes, don't notify</label> <a target="DontNotify" onclick="return launchWindow('%TWIKIWEB%','DontNotify')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/DontNotify">help</a>
-</div>
-<table>
-<tr>
+%TMPL:DEF{"topicaction"}%<table class="twikiTopicAction">
+<tr class="twikiTopicActionHelp twikiGrayText">
+<td colspan="3" class="twikiTopicActionHelp twikiGrayText"></td>
+</tr>
+<tr class="twikiTopicActionSecondary">
+<td class="twikiCancelCol"></td>
+<td class="twikiSubmitCol"><div class="twikiSubmitOptions"><input type="checkbox" class="twikiCheckbox" name="unlock" id="releaselock" %RELEASEEDITLOCKCHECKBOX% /><label for="releaselock">Release edit lock</label> <a target="UnlockTopic" onclick="return launchWindow('%TWIKIWEB%','UnlockTopic')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/UnlockTopic">help</a><br />
+ <input type="checkbox" class="twikiCheckbox" id="dontnotify" name="dontnotify" %DONTNOTIFYCHECKBOX% /><label for="dontnotify">Minor changes, don't notify</label> <a target="DontNotify" onclick="return launchWindow('%TWIKIWEB%','DontNotify')" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%TWIKIWEB%/DontNotify">help</a></div></td>
+<td class="twikiAddCol"></td>
+</tr>
+<tr class="twikiTopicAction">
<td class="twikiCancelCol"><a href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?unlock=on">Discard</a></td>
<td class="twikiSubmitCol"><input type="submit" class="twikiSubmit" value="Save Changes" />%FORMFIELDS%</td>
<td class="twikiAddCol"></td>
-</tr></table>
-</div>%TMPL:END%
+</tr>
+</table>%TMPL:END%
Modified: twiki/trunk/templates/view.pattern.tmpl
===================================================================
--- twiki/trunk/templates/view.pattern.tmpl 2004-08-22 12:44:05 UTC (rev 1729)
+++ twiki/trunk/templates/view.pattern.tmpl 2004-08-23 23:07:59 UTC (rev 1730)
@@ -24,7 +24,7 @@
* %EDITTOPIC%
* <a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%">Attach</a>
* <a href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?skin=print.pattern%REVARG%">Printable</a>
-</div><div class="twikiRevInfo"><span class="twikiToolbarElem"><b><nop>%WEB%.%TOPIC%</b></span><span class="twikiGrayText"><span class="twikiToolbarElem">%REVINFO{"$date"}% GMT - <nop>%REVINFO{"$username"}%</span><span class="twikiToolbarElem"><a href="#TopicEnd">topic end</a></span></span></div></div>%TMPL:END%
+</div><div class="twikiRevInfo"><span class="twikiGrayText"><span class="twikiToolbarElem"><nop>%WEB%.%TOPIC%</span><span class="twikiToolbarElem">%REVINFO%</span><span class="twikiToolbarElem"><a href="#TopicEnd">topic end</a></span></span></div></div>%TMPL:END%
@@ -50,7 +50,7 @@
-%TMPL:DEF{"topicinfo"}%<span class="twikiHidden"><br /></span><div class="twikiTopicInfo"><span class="twikiRevInfo twikiGrayText">Revision: %REVINFO% <span class="twikiMoved"><br />%META{"moved"}%</span></span></div>%TMPL:END%
+%TMPL:DEF{"topicinfo"}%<div class="twikiTopicInfo twikiRevInfo twikiGrayText twikiMoved">%META{"moved"}%</div>%TMPL:END%
|