Skip to content

Commit

Permalink
Item8571: I think Foswikirev:8300 missed foswikiCSS depends on foswik…
Browse files Browse the repository at this point in the history
…iArray

However, I'm just going by the fact that Crawford set foswikiCSS to depend
on missing foswikiArray. Added TMPL:DEFs to get this loaded.

git-svn-id: http://svn.foswiki.org/trunk@8355 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
PaulHarvey authored and PaulHarvey committed Jul 30, 2010
1 parent a4ffabd commit f48e3d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion PatternSkin/templates/foswiki.pattern.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
}%%TMPL:P{"JavascriptFiles/foswikiWindow"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiEvent"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiHTML"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiArray"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiCSS"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiForm"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiPref"}%%{
Expand Down Expand Up @@ -86,4 +87,4 @@

%TMPL:DEF{"bodyend"}%</body></html>%TMPL:END%

%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or propotional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or propotional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
5 changes: 4 additions & 1 deletion core/templates/foswiki.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ the base templates, but are provided for fancier skins.
}%%TMPL:DEF{"JavascriptFiles/foswikiHTML"}%%{
}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswikiHTML" requires="JavascriptFiles/foswikilib"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"JavascriptFiles/foswikiArray"}%%{
}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswikiArray" requires="JavascriptFiles/foswikilib"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"JavascriptFiles/foswikiCSS"}%%{
}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswikiCSS" requires="JavascriptFiles/foswikilib,JavascriptFiles/foswikiArray"}%%TMPL:END%%{
---------------------------------------------------
Expand All @@ -44,7 +47,7 @@ the base templates, but are provided for fancier skins.
}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswikiStyles" requires=""}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"JavascriptFiles/foswiki_edit"}%%{
}%%TMPL:P{"JavascriptFiles/foswikiPref"}%%TMPL:P{"JavascriptFiles/foswikiCSS"}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswiki_edit" requires="JavascriptFiles/foswikilib,JavascriptFiles/foswikiPref,JavascriptFiles/foswikiCSS"}%%TMPL:END%%{
}%%TMPL:P{"JavascriptFiles/foswikiPref"}%%TMPL:P{"JavascriptFiles/foswikiArray"}%%TMPL:P{"JavascriptFiles/foswikiCSS"}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswiki_edit" requires="JavascriptFiles/foswikilib,JavascriptFiles/foswikiPref,JavascriptFiles/foswikiCSS"}%%TMPL:END%%{
---------------------------------------------------
}%%TMPL:DEF{"JavascriptFiles/foswiki_renamebase"}%%{
}%%TMPL:P{"LIBJS" id="JavascriptFiles/foswiki_renamebase" requires=""}%%TMPL:END%%{
Expand Down

0 comments on commit f48e3d7

Please sign in to comment.