Menu
▾
▴
[TWiki-Dev] [SVN] ArthurClemens r14197 - in twiki/branches/MAIN/twikiplugins/PatternSkin: lib/TWiki/Contrib/PatternSkin pub/TWiki/PatternSkin templates
|
From: <de...@de...> - 2007-06-17 20:16:42
|
Author: ArthurClemens
Date: 2007-06-17 15:16:42 -0500 (Sun, 17 Jun 2007)
New Revision: 14197
Removed:
twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/oopsmore_diff_debug.gif
twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/oopsmore_diff_sequential.gif
twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/oopsmore_diff_sidebyside.gif
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmore.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorebacklinks.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorechildtopics.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoredelete.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerename.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerevision.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresetparent.pattern.tmpl
twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresettings.pattern.tmpl
Modified:
twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST
twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/colors.css
twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
Log:
Item4142: let pattern oopsmore inherit from default oopsmore
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/lib/TWiki/Contrib/PatternSkin/MANIFEST 2007-06-17 20:16:42 UTC (rev 14197)
@@ -44,9 +44,6 @@
pub/TWiki/PatternSkin/gradient_blue.gif 0644
pub/TWiki/PatternSkin/gradient_yellow.gif 0644
pub/TWiki/PatternSkin/layout.css 0644
-pub/TWiki/PatternSkin/oopsmore_diff_debug.gif 0644
-pub/TWiki/PatternSkin/oopsmore_diff_sequential.gif 0644
-pub/TWiki/PatternSkin/oopsmore_diff_sidebyside.gif 0644
pub/TWiki/PatternSkin/patternskin_screenshot_full.png 0644
pub/TWiki/PatternSkin/patternskin_screenshot.jpg 0644
pub/TWiki/PatternSkin/print.css 0644
@@ -87,14 +84,6 @@
templates/logo.pattern.tmpl 0444
templates/moveattachment.pattern.tmpl 0444
templates/oops.pattern.tmpl 0444
-templates/oopsmore.pattern.tmpl 0444
-templates/oopsmorebacklinks.pattern.tmpl 0444
-templates/oopsmorechildtopics.pattern.tmpl 0444
-templates/oopsmoredelete.pattern.tmpl 0444
-templates/oopsmorerename.pattern.tmpl 0444
-templates/oopsmorerevision.pattern.tmpl 0444
-templates/oopsmoresetparent.pattern.tmpl 0444
-templates/oopsmoresettings.pattern.tmpl 0444
templates/preview.pattern.tmpl 0444
templates/rdiff.pattern.tmpl 0444
templates/rename.pattern.tmpl 0444
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/colors.css
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/colors.css 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/colors.css 2007-06-17 20:16:42 UTC (rev 14197)
@@ -562,12 +562,6 @@
color:#8E9195;
}
-/* oopsmore.pattern.tmpl */
-
-table.patternDiffOptions img {
- border-color:#ccc;
-}
-
/* edit.pattern.tmpl */
.patternEditPage .twikiEditTextarea {
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/oopsmore_diff_debug.gif
===================================================================
(Binary files differ)
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/oopsmore_diff_sequential.gif
===================================================================
(Binary files differ)
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/oopsmore_diff_sidebyside.gif
===================================================================
(Binary files differ)
Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2007-06-17 20:16:42 UTC (rev 14197)
@@ -52,7 +52,7 @@
width:100%;
margin:1em 0; /* Win IE tries to make this bigger otherwise */
}
-/* IE behavior for pre is defined in twiki.pattern.tmpl in conditional comment */
+/* IE behavior for pre is defined in css.pattern.tmpl in conditional comment */
html>body pre { /* hide from IE */
/*\*/ overflow:auto !important; /* */ overflow:scroll; width:auto; /* for Mac Safari */
}
@@ -62,7 +62,12 @@
ol li, ul li {
line-height:1.4em; /*S1*/
}
-
+blockquote {
+ border-style:solid;
+ border-width:0 0 0 3px;
+ padding:.5em 1.25em;
+}
+
/* Text */
h1, h2, h3, h4, h5, h6 {
line-height:104%;
@@ -89,7 +94,7 @@
height:auto;
}
h1.patternTemplateTitle {
- font-size:150%;
+ font-size:160%;
text-align:center;
}
h2.patternTemplateTitle {
@@ -191,13 +196,7 @@
.twikiInputFieldReadOnly {
padding:.1em .2em;
}
-blockquote {
- border-style:solid;
- border-width:0 0 0 3px;
- padding:.5em 1.25em;
-}
-
/* LAYOUT ELEMENTS */
/* for specific layout sub-elements see further down */
@@ -467,14 +466,11 @@
font-size:130%;
font-weight:bold;
}
-.twikiFormStep h3 {
+.twikiFormStep h3,
+.twikiFormStep h4 {
font-size:115%;
font-weight:bold;
}
-.twikiFormStep h4 {
- font-size:115%;
- font-weight:normal;
-}
.twikiFormStep p {
margin:.3em 0;
}
@@ -913,26 +909,6 @@
padding-top:1.5em;
}
-
-/* oopsmore.pattern.tmpl */
-
-table.patternDiffOptions {
- margin:.5em 0;
- border:none;
-}
-table.patternDiffOptions td {
- border:none;
- text-align:center;
-}
-table.patternDiffOptions img {
- padding:0 10px;
- border-width:1px;
- border-style:solid;
-}
-table.patternDiffOptions input {
- border:0;
-}
-
/* edit.pattern.tmpl */
.patternEditPage .twikiEditTextarea {
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmore.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmore.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmore.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,31 +0,0 @@
-%TMPL:INCLUDE{"oops"}%
-%TMPL:INCLUDE{"oopsmoredelete"}%
-%TMPL:INCLUDE{"oopsmorerename"}%
-%TMPL:INCLUDE{"oopsmorebacklinks"}%
-%TMPL:INCLUDE{"oopsmorechildtopics"}%
-%TMPL:INCLUDE{"oopsmoresetparent"}%
-%TMPL:INCLUDE{"oopsmorerevision"}%
-%TMPL:INCLUDE{"oopsmoresettings"}%
-
-
-%TMPL:DEF{"titleaction"}%%MAKETEXT{"(more)"}% %TMPL:END%
-
-
-%TMPL:DEF{"webaction"}%%TMPL:END%
-
-
-%TMPL:DEF{"heading"}%%MAKETEXT{"More Actions on Topic [_1]" args="[[%TOPIC%]]"}%%TMPL:END%
-
-
-%TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"canceltopicaction"}%%TMPL:END%
-
-
-%TMPL:DEF{"message"}%
-%TMPL:P{"oopsmoresettings"}%
-%TMPL:P{"oopsmorerename"}%
-%TMPL:P{"oopsmoredelete"}%
-%TMPL:P{"oopsmoresetparent"}%
-%TMPL:P{"oopsmorechildtopics"}%
-%TMPL:P{"oopsmorerevision"}%
-%TMPL:P{"oopsmorebacklinks"}%
-%TMPL:END%
\ No newline at end of file
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorebacklinks.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorebacklinks.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorebacklinks.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,6 +0,0 @@
-%TMPL:DEF{"oopsmorebacklinks"}%
----++++ %ICON{"topicbacklinks"}% *%MAKETEXT{"Backlinks"}%* <br/>
- * <b><a href='%SCRIPTURLPATH{"oops"}%/%WEB%/%TOPIC%?template=backlinksallwebs' title='%MAKETEXT{"Search all webs for topics that link to here"}%' accesskey='l'>%MAKETEXT{"Find topics that link to [_1] ..." args="<nop>%TOPIC%"}%</a></b>,
- %MAKETEXT{"<em>in all public webs</em>"}%
- * <a href='%SCRIPTURLPATH{"oops"}%/%WEB%/%TOPIC%?template=backlinksweb' title='%MAKETEXT{"Search the [_1] Web for topics that link to here" args="<nop>%WEB%"}%' accesskey='w'>%MAKETEXT{"Find topics that link to [_1] ..." args="<nop>%TOPIC%"}%</a>,
- %MAKETEXT{"<em>in [_1] web</em> only" args="<nop>%WEB%"}%%TMPL:END%
\ No newline at end of file
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorechildtopics.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorechildtopics.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorechildtopics.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,3 +0,0 @@
-%TMPL:DEF{"oopsmorechildtopics"}%
----++++ %ICON{"arrowdown"}% *%MAKETEXT{"Child topics in [_1] web" args="<nop>%WEB%"}%*
- * %METASEARCH{type="parent" web="%WEB%" topic="%TOPIC%" default="%MAKETEXT{"No child topics"}%"}%%TMPL:END%
\ No newline at end of file
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoredelete.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoredelete.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoredelete.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,6 +0,0 @@
-%TMPL:DEF{"oopsmoredelete"}%
----++++ %ICON{"trash"}% *%MAKETEXT{"Delete topic"}%*
- * <b><a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?newweb=%TRASHWEB%&nonwikiword=on" rel='nofollow'>%MAKETEXT{"Delete topic..."}%</a></b>,
- %MAKETEXT{"looking for references in _all public webs_"}% *%MAKETEXT{"(recommended)"}%*
- * <a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?newweb=%TRASHWEB%&nonwikiword=on&currentwebonly=on" rel='nofollow'>%MAKETEXT{"Delete topic..."}%</a>,
- %MAKETEXT{"looking for references in _[_1] web_ only" args="%WEB%"}%%TMPL:END%
\ No newline at end of file
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerename.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerename.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerename.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,6 +0,0 @@
-%TMPL:DEF{"oopsmorerename"}%
----++++ %ICON{"move"}% *%MAKETEXT{"Rename or move topic"}%*
- * <b><a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%" rel='nofollow'>%MAKETEXT{"Rename/move topic..."}%</a></b>,
- %MAKETEXT{"looking for references in _all public webs_"}% *%MAKETEXT{"(recommended)"}%*
- * <a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?currentwebonly=on" rel='nofollow'>%MAKETEXT{"Rename/move topic..."}%</a>,
- %MAKETEXT{"looking for references in _[_1] web_ only" args="%WEB%"}%%TMPL:END%
\ No newline at end of file
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerevision.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerevision.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmorerevision.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,23 +0,0 @@
-%TMPL:DEF{"oopsmorerevision"}%
----++++ %ICON{"viewtopic"}% %MAKETEXT{"Revisions"}%
-%IF{"$ param1='0'" then="<!--" }%
----+++++ *%MAKETEXT{"View previous topic revision"}%* (1 ... %PARAM1%)
-<form name="main" action="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%">
- * %MAKETEXT{"View revision:"}% <input class="twikiInputField" type="text" name="rev" size="6" value="%PARAM2%" />
- <input type="checkbox" class="twikiCheckbox" id="raw" name="raw" /><label for="raw">%MAKETEXT{"in raw text format"}%</label>
- <input type="submit" class="twikiButton" value='%MAKETEXT{"View"}%' />
-</form>
----+++++ *%MAKETEXT{"Compare revisions"}%*
-<form name="main" action="%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%">
- * %MAKETEXT{"Older revision:"}% <input class="twikiInputField" type="text" name="rev2" size="6" value="1" /> %MAKETEXT{"Newer revision:"}% <input class="twikiInputField" type="text" name="rev1" size="6" value="%PARAM1%" /><br />
- <table class="twikiTable patternDiffOptions"><tr><td><label for="sequential"><img src="%PUBURLPATH%/%TWIKIWEB%/PatternSkin/oopsmore_diff_sequential.gif" alt="sequential" width="80" height="80" /></label></td><td><label for="sidebyside"><img src="%PUBURLPATH%/%TWIKIWEB%/PatternSkin/oopsmore_diff_sidebyside.gif" alt="side by side" width="80" height="80" /></label></td><td><label for="debug"><img src="%PUBURLPATH%/%TWIKIWEB%/PatternSkin/oopsmore_diff_debug.gif" alt="debug" width="80" height="80" /></label></td></tr><tr><td><input type="radio" name="render" id="sequential" value="sequential" checked="checked" /><label for="sequential"> %MAKETEXT{"Sequential"}%</label></td><td><input type="radio" name="render" id="sidebyside" value="sidebyside" /><label for="sidebyside"> %MAKETEXT{"Side by side"}%</label></td><td><input type="radio" name="render" id="debug" value="debug" /><label for="debug"> %MAKETEXT{"Debug"}%</label></td></tr></table>
- <input type="submit" class="twikiButton" value='%MAKETEXT{"View difference"}%' />
-</form>
----+++++ *%MAKETEXT{"Restore topic"}%*
-<form name="main" action="%SCRIPTURLPATH{"manage"}%/%WEB%/%TOPIC%">
- * %MAKETEXT{"Restore topic to revision:"}% <input class="twikiInputField" type="text" name="rev" size="6" value="%PARAM2%" />
- <input type="hidden" name="action" value="restoreRevision" />
- <input type="submit" class="twikiButton" title="%MAKETEXT{"Restore topic to this revision"}%" value='%MAKETEXT{"Restore"}%' /> <span class="twikiGrayText">%MAKETEXT{"You will be able to review the topic before saving it to a new revision"}%</span>
-</form>
-%IF{"$ param1='0'" then="-->" }%%IF{"$ param1!='0'" then="<!--" }%
-%MAKETEXT{"No previous revision exists."}%%IF{"$ param1!='0'" then="-->" }%%TMPL:END%
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresetparent.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresetparent.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresetparent.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,17 +0,0 @@
-%TMPL:DEF{"oopsmoresetparent"}%
----++++ %ICON{"arrowup"}% *%MAKETEXT{"Set new topic parent"}%*
-
-<form name="main" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%?action_save=1">
-<div class="twikiFormSteps">
-<div class="twikiFormStep">
----+++ %MAKETEXT{"Current parent:"}% %IF{"'NONE%SEARCH{ "^%TOPIC%$" scope="topic" regex="on" nosearch="on" nototal="on" format="$parent" }%'='NONE'" then="(none)" else='%SEARCH{ "^%TOPIC%$" scope="topic" regex="on" nosearch="on" nototal="on" format="[[$web.$parent][$parent]]" }%' }%
-</div>
-<div class="twikiFormStep">
----+++ %MAKETEXT{"Select topic parent:"}% %BR%
-%IF{"defined pickparent" then="<select name='topicparent' size='10' class='twikiSelect' tabindex='12'>$percntTOPICLIST{$quot<option $marker value='$name'>$name</option>$quot separator=$quot$quot selection=$quot$percntMETASEARCH{type=$quotparent$quot}$percnt}$percnt<option value=$quot$quot>$percntMAKETEXT{$quot(no parent, orphaned topic)$quot}$percnt</option></select>" else="<input type='text' size='40' class='twikiInputField' /> <a href='$percntSCRIPTURLPATH{oops}$percnt/$percntWEB$percnt/$percntTOPIC$percnt?template=oopsmore;$percntQUERYSTRING$percnt;pickparent=1'>%MAKETEXT{"Pick from a list"}%</a>"}%
-</div>
-<div class="twikiFormStep">
-<input type='submit' class='twikiButton' value='%MAKETEXT{"Set new parent"}%' />
-</div>
-</div>
-</form>%TMPL:END%
\ No newline at end of file
Deleted: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresettings.pattern.tmpl
===================================================================
--- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresettings.pattern.tmpl 2007-06-17 20:16:16 UTC (rev 14196)
+++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/oopsmoresettings.pattern.tmpl 2007-06-17 20:16:42 UTC (rev 14197)
@@ -1,3 +0,0 @@
-%TMPL:DEF{"oopsmoresettings"}%
----++++ %ICON{"edittopic"}% *%MAKETEXT{"Edit topic preference settings"}%*
- * %MAKETEXT{"<a href='[_1]' rel='nofollow'>Edit settings</a> for this topic" args="%SCRIPTURLPATH{"manage"}%/%WEB%/%TOPIC%?action=editSettings"}%%TMPL:END%
\ No newline at end of file
|