r1130 - in xwiki/trunk/src: main/java/com/xpn/xwiki main/java/com/xpn/xwiki/api main/java/com/xpn/xwiki/web main/web/WEB-INF main/web/skins/default main/web/skins/xwiki10 main/web/templates test/java/com/xpn/xwiki/test
Ludovic Dubost
ludovic at users.forge.objectweb.org
Thu Aug 10 18:09:04 CEST 2006
Author: ludovic
Date: 2006-08-10 18:09:03 +0200 (Thu, 10 Aug 2006)
New Revision: 1130
Removed:
xwiki/trunk/src/main/web/skins/xwiki10/style_clean.css
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/SkinAction.java
xwiki/trunk/src/main/web/WEB-INF/velocity.properties
xwiki/trunk/src/main/web/skins/default/elements.css
xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
xwiki/trunk/src/main/web/skins/xwiki10/style.css
xwiki/trunk/src/main/web/templates/macros.vm
xwiki/trunk/src/test/java/com/xpn/xwiki/test/RadeoxRenderTest.java
xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java
xwiki/trunk/src/test/java/com/xpn/xwiki/test/XWikiTest.java
Log:
New API allowing to link a CSS to the /skin/ action to allow it to contain velocity
Moved macros.vm content from XWiki 1.0 skins
Added XWiki 1.0 macros to velocity.properties
Fix some tests that were failing because of the recent commits
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-10 16:09:03 UTC (rev 1130)
@@ -1049,16 +1049,20 @@
public String getSkinFile(String filename, XWikiContext context) {
+ return getSkinFile(filename, false, context);
+ }
+
+ public String getSkinFile(String filename, boolean forceSkinAction, XWikiContext context) {
XWikiURLFactory urlf = context.getURLFactory();
try {
String skin = getSkin(context);
- String result = getSkinFile(filename, skin, context);
+ String result = getSkinFile(filename, skin, forceSkinAction, context);
if (result != null)
return result;
String baseskin = getBaseSkin(context);
if (!skin.equals(baseskin)) {
- result = getSkinFile(filename, baseskin, context);
+ result = getSkinFile(filename, baseskin, forceSkinAction, context);
if (result != null)
return result;
}
@@ -1071,11 +1075,20 @@
}
public String getSkinFile(String filename, String skin, XWikiContext context) {
+ return getSkinFile(filename, false, context);
+ }
+
+ public String getSkinFile(String filename, String skin, boolean forceSkinAction, XWikiContext context) {
XWikiURLFactory urlf = context.getURLFactory();
try {
String path = "skins/" + skin + "/" + filename;
if (resourceExists(path)) {
- URL url = urlf.createSkinURL(filename, skin, context);
+ URL url;
+
+ if (forceSkinAction)
+ url = urlf.createSkinURL(filename, "skins", skin, context);
+ else
+ url = urlf.createSkinURL(filename, skin, context);
return urlf.getURL(url, context);
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-10 16:09:03 UTC (rev 1130)
@@ -322,6 +322,10 @@
return xwiki.getSkinFile(filename, context);
}
+ public String getSkinFile(String filename, boolean forceSkinAction) {
+ return xwiki.getSkinFile(filename, forceSkinAction, context);
+ }
+
public String getSkin() {
return xwiki.getSkin(context);
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/SkinAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/SkinAction.java 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/SkinAction.java 2006-08-10 16:09:03 UTC (rev 1130)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
+import java.net.URL;
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
@@ -63,32 +64,27 @@
XWiki xwiki = context.getWiki();
XWikiResponse response = context.getResponse();
- BaseObject object = doc.getObject("XWiki.XWikiSkins", 0);
- String content = null;
- if (object!=null) {
- content = object.getStringValue(filename);
- }
+ try {
+ BaseObject object = doc.getObject("XWiki.XWikiSkins", 0);
+ String content = null;
+ if (object!=null) {
+ content = object.getStringValue(filename);
+ }
- if ((content!=null)&&(!content.equals(""))) {
- // Choose the right content type
- String mimetype = xwiki.getEngineContext().getMimeType(filename.toLowerCase());
- if(mimetype.equals("text/css")){
- content = context.getWiki().parseContent(content, context);
- }
- response.setContentType(mimetype);
- response.setDateHeader("Last-Modified", doc.getDate().getTime());
- // Sending the content of the attachment
- response.setContentLength(content.length());
- try {
+ if ((content!=null)&&(!content.equals(""))) {
+ // Choose the right content type
+ String mimetype = xwiki.getEngineContext().getMimeType(filename.toLowerCase());
+ if(mimetype.equals("text/css")){
+ content = context.getWiki().parseContent(content, context);
+ }
+ response.setContentType(mimetype);
+ response.setDateHeader("Last-Modified", doc.getDate().getTime());
+ // Sending the content of the attachment
+ response.setContentLength(content.length());
response.getWriter().write(content);
return true;
- } catch (IOException e) {
- throw new XWikiException(XWikiException.MODULE_XWIKI_APP,
- XWikiException.ERROR_XWIKI_APP_SEND_RESPONSE_EXCEPTION,
- "Exception while sending response", e);
}
- }
- else {
+
XWikiAttachment attachment = doc.getAttachment(filename);
if (attachment!=null) {
// Sending the content of the attachment
@@ -100,19 +96,42 @@
response.setContentType(mimetype);
response.setDateHeader("Last-Modified", attachment.getDate().getTime());
response.setContentLength(data.length);
- try {
+ response.getOutputStream().write(data);
+ return true;
+ }
+
+ if (doc.getWeb().equals("skins")) {
+ String path = "skins/" + doc.getName() + "/" + filename;
+ if (!context.getWiki().resourceExists(path))
+ path = "skins/" + context.getWiki().getBaseSkin(context) + "/" + filename;
+
+ byte[] data = context.getWiki().getResourceContentAsBytes(path);
+ if ((data!=null)&&(data.length!=0)) {
+ // Choose the right content type
+ String mimetype = xwiki.getEngineContext().getMimeType(filename.toLowerCase());
+ if(mimetype.equals("text/css")){
+ data = context.getWiki().parseContent(new String(data), context).getBytes();
+ }
+ response.setContentType(mimetype);
+ response.setDateHeader("Last-Modified", (new Date()).getTime());
+ // Sending the content of the attachment
+ response.setContentLength(data.length);
response.getOutputStream().write(data);
return true;
- } catch (IOException e) {
- throw new XWikiException(XWikiException.MODULE_XWIKI_APP,
- XWikiException.ERROR_XWIKI_APP_SEND_RESPONSE_EXCEPTION,
- "Exception while sending response", e);
+ } else {
+
+
}
}
+ } catch (IOException e) {
+ throw new XWikiException(XWikiException.MODULE_XWIKI_APP,
+ XWikiException.ERROR_XWIKI_APP_SEND_RESPONSE_EXCEPTION,
+ "Exception while sending response", e);
}
+
return false;
}
-
+
private boolean renderSkin(String filename, String skin, XWikiContext context) throws XWikiException {
XWiki xwiki = context.getWiki();
XWikiResponse response = context.getResponse();
Modified: xwiki/trunk/src/main/web/WEB-INF/velocity.properties
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/velocity.properties 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/web/WEB-INF/velocity.properties 2006-08-10 16:09:03 UTC (rev 1130)
@@ -69,7 +69,7 @@
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
#----------------------------------------------------------------------------
-velocimacro.library = /templates/macros.vm
+velocimacro.library = /templates/macros.vm,/skins/xwiki10/macros.vm
velocimacro.library.autoreload = false
velocimacro.permissions.allow.inline = true
Modified: xwiki/trunk/src/main/web/skins/default/elements.css
===================================================================
--- xwiki/trunk/src/main/web/skins/default/elements.css 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/web/skins/default/elements.css 2006-08-10 16:09:03 UTC (rev 1130)
@@ -1,8 +1,8 @@
/* Style properties for HTML elements based on the HTML 4.01 Specification.
- <http://www.w3.org/TR/html401/cover.html#toc>
+## <http://www.w3.org/TR/html401/cover.html#toc>
Blank version of this stylesheet:
- <http://www.webproducer.at/lab/elements.css>
+## <http://www.webproducer.at/lab/elements.css>
*/
/* Section 7.5: The document body */
Modified: xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/macros.vm 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/web/skins/xwiki10/macros.vm 2006-08-10 16:09:03 UTC (rev 1130)
@@ -1,404 +1,3 @@
-#macro( template $tname )
-$xwiki.parseTemplate($tname)
-#end
-
-#macro( includeTopic $topic )
-$xwiki.includeTopic($topic)
-#end
-
-#macro( includeMacros $topic )
-$xwiki.includeForm($topic)
-#end
-
-#macro( includeForm $topic )
-$xwiki.includeForm($topic)
-#end
-
-#macro( includeServlet $url)
-<!-- including $url -->
-$xwiki.invokeServletAndReturnAsString($url)
-<!-- included $url -->
-#end
-
-#macro(editactions)
-<a href="$doc.getURL("preview")" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;">$msg.get("preview")</a>
-<span> | </span>
-<a href="$doc.getURL("save")" onclick="document.forms.edit.action=this.href; document.forms.edit.submit(); return false;" >$msg.get("save")</a>
-#end
-
-#macro( versions )
-#foreach( $rev in $tdoc.getRecentRevisions(4) )
-<a href="$doc.getURL("view", "rev=$rev")">$rev</a><span class="xwikisep"> | </span>
-#end
-#if ($tdoc.realLanguage!="")
-<a href="$doc.getURL("view", "xpage=diff&language=${tdoc.realLanguage}")">$msg.get("diff")</a><span class="xwikisep"> | </span>
-#else
-<a href="$doc.getURL("view", "xpage=diff")">$msg.get("history")</a><span class="xwikisep"> | </span>
-#end
-#end
-
-## Display all queued Struts errors
-#macro (errorMarkup)
- #if ($errors.exist() )
- <ul>
- #foreach ($e in $errors.all )
- $e
- #end
- </ul>
- #end
-#end
-
-## Display all queued Struts errors for a particular property
-#macro (errorMarkupForProperty $property)
- #if ($errors.exist($property) )
- <ul>
- #foreach ($er in $errors.get($property))
- $er
- #end
- </ul>
- #end
-#end
-
-#macro(jabber $id)
-<img src="http://edgar.netflint.net/status.php?jid=${id}&type=image&iconset=phpbb" alt="jabber $id" />
-#end
-
-#macro(skype $id)
-<a href="callto://${id}"><img width="70" height="20" src="http://jyvepresence1.com/qzoxy/${id}.png" border="0"></a>
-#end
-
-#macro(yahoo $id)
-<img border="0" src="http://opi.yahoo.com/online?u=${id}&m=g&t=1" alt="yahoo $id" />
-#end
-
-#macro(aim $id)
-#set($onurl = "http://${request.serverName}${xwiki.getSkinFile('aimonline.gif')}")
-#set($offurl = "http://${request.serverName}${xwiki.getSkinFile('aimoffline.gif')}")
-<img border="0" src="http://big.oscar.aol.com/nvludo?on_url=${onurl}&off_url=${offurl}" alt="Online detector"></a>
-#end
-
-#macro(msn $id)
-#set($onurl = "${request.serverName}${xwiki.getSkinFile('msnonline.gif')}")
-#set($offurl = "${request.serverName}${xwiki.getSkinFile('msnoffline.gif')}")
-<img border="0" src="http://turdinc.kicks-ass.net:6969/msn/${id}/onurl=${onurl}/offurl=${offurl}/unknownurl=${offurl}" />
-#end
-
-#macro(im $user)
-#set($userdoc = $xwiki.getDocument($user))
-#set($userobj = $userdoc.getObject("XWiki.XWikiUsers"))
-#set($imtype = $userdoc.display("imtype","view",$userobj))
-#set($imaccount = $userdoc.display("imaccount","view",$userobj))
-#if($imtype=="Yahoo")
-#yahoo("$imaccount")
-#end
-#if($imtype=="AIM")
-#aim("$imaccount")
-#end
-#if($imtype=="MSN")
-#msn("$imaccount")
-#end
-#if($imtype=="Jabber")
-#jabber("$imaccount")
-#end
-#if($imtype=="Skype")
-#skype("$imaccount")
-#end
-#end
-
-#macro(sign $username)
-#if($username.indexOf(".")==-1)
-#set($username = "XWiki.${username}")
-#end
-#if($xwiki.exists("$username"))
-$xwiki.getUserName("$username")
-#else
-$xwiki.getUserName("xwiki:${username}")
-#end
-#end
-
-#macro(includeHelp $pagename)
- #if($xwiki.exists("xwiki:XWiki.${pagename}"))
- $xwiki.includeForm("xwiki:XWiki.${pagename}",false)
- #elseif($xwiki.exists("XWiki.${pagename}"))
- $xwiki.includeForm("XWiki.${pagename}",false)
- #elseif($xwiki.exists("${pagename}"))
- $xwiki.includeForm("${pagename}",false)
- #end
-#end
-
-#macro(flickr $rss)
-{rss:feed=${rss}|full=1}
-#end
-
-#macro(flickrtag $tag)
-#flickr("http://www.flickr.com/services/feeds/photos_public.gne?tags=${tag}&format=rss_200")
-#end
-
-#macro(flickruser $id)
-#flickr("http://www.flickr.com/services/feeds/photos_public.gne?id=${id}&format=rss_200")
-#end
-
-#macro(flickrusertag $id $tag)
-#flickr("http://www.flickr.com/services/feeds/photos_public.gne?id=${id}&tags=${tag}&format=rss_200")
-#end
-
-#macro(map $address $cp $linktext)
-<a href="http://www.viamichelin.com/viamichelin/fra/dyn/controller/mapPerformPage?strAddress=${address}&strLocation=&strCP=${cp}&strCountry=1424&x=30&y=9">${linktext}</a>
-#end
-
-#macro(mindmap $mindmap $width $height)
-#if(!$width)
-#set($width="100%")
-#end
-#if(!$height)
-#set($height="600")
-#end
-#if(!$mindmap)
-#set($mindmap = "")
-#set($mmurl = "")
-#else
-#if($mindmap.startsWith("http"))
-#set($mmurl = $mindmap)
-#else
-#set($mmurl1 = $doc.getAttachmentURL($mindmap,"download"))
-#set($mmurl = "http://${request.serverName}${mmurl1}")
-#end
-#end
-<applet code="freemind.main.FreeMindApplet.class" archive="/xwiki/freemind/freemind.jar" width="${width}" height="${height}">
-<param name="type" value="application/x-java-applet;version=1.4" />
-<param name="scriptable" value="false" />
-<param name="modes" value="freemind.modes.browsemode.BrowseMode" />
-<param name="browsemode_initial_map" value="$mmurl" />
-<param name="initial_mode" value="Browse" />
-<param name="selection_method" value="selection_method_direct" />
-</applet>
-#end
-
-#macro (toc $init $max $numbered)
- #set ($int = 0)
- #set ($boolean = false)
- #if ($init == "")
- #set ($init = 2)
- #else
- #set ($init = $int.valueOf($init))
- #end
- #if ($max == "")
- #set ($max = 6)
- #else
- #set ($max = $int.valueOf($max))
- #end
- #if ($numbered == "")
- #set ($numbered = false)
- #else
- #set ($numbered = $boolean.valueOf($numbered))
- #set ($context.context.tocNumbered = $numbered)
- #end
- #set ($tocData = ${tdoc.getTOC($init, $max, $numbered)})
- #set ($context.context.tocData = $tocData)
- #set ($lastLevel = $init - 1)
- #set ($depth = 0)
- #foreach ($tocEntry in $tocData.entrySet())
- #set ($level = $tocEntry.value.level)
- #if ($level > $lastLevel)
- #set ($to = $lastLevel + 1)
- #set ($iter = [$level .. $to])
- #foreach ($n in $iter)
-<ul>
- #set ($depth = $depth + 1)
- #end
- #elseif ($level < $lastLevel)
- #set ($to = $level + 1)
- #set ($iter = [$lastLevel .. $to])
- #foreach ($n in $iter)
-</ul>
- #set ($depth = $depth - 1)
- #end
- #end
- <li><a href="#$tocEntry.key">$!tocEntry.value.numbering $tocEntry.value.text</a>
- #set ($lastLevel = $level)
- #end
- #if ($depth > 0)
- #set ($levels = [1 .. $depth])
- #foreach($level in $levels)
-</ul>#end
- #end
-#end
-
-
-#macro (exportPackage)
-#set($export = $request.get("export"))
-#if ($export == "1")
- #set($dateFormat = "dd MMM yyyy ? HH:mm")
- #set($diff = $request.get("diff"))
- #set($SpaceName = $request.get("SpaceName"))
-
- 1.1 Space : $SpaceName
-
- <form method="POST" action="$doc.getName()?export=2">
-
-
-
-#set($docs = $xwiki.getSpaceDocsName($SpaceName))
- <table border="1" style="text-align:center;">
- <tr><td>Name</td><td>Export</td><td colspan="3">Default Action</td></tr>
- <tr><td colspan="2"></td><td>overwrite</td><td>merge objects</td><td>skip</td></tr>
- #foreach ($doc in $docs)
- #if ($xwiki.hasAccessLevel("view", "${context.database}:${SpaceName}.${doc}"))
-
- <tr><td>[${doc}>${SpaceName}.${doc}]</td><td><input type="checkbox" name="ToExport" value="${SpaceName}.${doc}" /></td><td><input type="radio" name="${SpaceName}.${doc}_default" value="overwrite" checked="true" /></td> <td><input type="radio" name="${SpaceName}.${doc}_default" value="merge" /></td> <td><input type="radio" name="${SpaceName}.${doc}_default" value="skip" /></td> </tr>
-
- #end
- #end
- </table>
-
- #if($SpaceName != "XWiki")
-
-
- 1.1 Space : XWiki
-
- #set($docs = $xwiki.getSpaceDocsName("XWiki"))
- <table border="1" style="text-align:center;">
- <tr><td>Name</td><td>Export</td><td colspan="3">Default Action</td></tr>
- <tr><td colspan="2"></td><td>overwrite</td><td>merge objects</td><td>skip</td></tr>
- #foreach ($doc in $docs)
- #if ($xwiki.hasAccessLevel("view", "${context.database}:XWiki.${doc}"))
-
- <tr><td>[${doc}>XWiki.${doc}]</td><td><input type="checkbox" name="ToExport" value="XWiki.${doc}" /></td><td><input type="radio" name="XWiki.${doc}_default" value="overwrite" checked="true" /></td> <td><input type="radio" name="XWiki.${doc}_default" value="merge" /></td> <td><input type="radio" name="XWiki.${doc}_default" value="skip" /></td> </tr>
-
- #end
- #end
- </table>
- #end
-
- <input type="submit" name="submitted" value="Valider">
- </form>
-
-
-
-#elseif ($export == "2")
- #set($ToExport = $request.getParameterValues("ToExport"))
- $response.setContentType("application/zip")
- #set($export = $xwiki.export)
- #foreach ($itemexp in $ToExport)
- #set($defaultAction = $request.get("${itemexp}_default"))
- $export.add($itemexp, $defaultAction)
- #end
- $export.export()
-#else
- <form method="POST" action="$doc.getName()?export=1">
- Select the space you want to export : <br />
- #set($spaces = $xwiki.getSpaces())
- <select name="SpaceName">
- #foreach ($space in $spaces)
- <option value="$space">$space</option>
- #end
-
- </select>
- <input type="submit" name="submitted" value="Valider">
- </form>
-#end
-#end
-
-
-#macro (importPackage)
-#set($toexport = $request.get("export"))
-#if($toexport == "1")
- #set($appName = $request.get("App"))
- #set($alist = $doc.getAttachmentList())
- #foreach ($oAttach in $alist)
- #if ($oAttach.getFilename() == $appName)
- #set($import = $xwiki.import)
- $import.importPackage($oAttach.getContent())
-
- #set($docs = $import.getDocuments())
-
- #foreach($docInfo in $docs)
- #set($right = "")
- #set($right = $request.get("$docInfo.getFullName()_default"))
- #if($right)
- $import.setDocumentAction($docInfo.getFullName(), $right)
- #end
- #end
-
-
- #set($ret = $import.install())
- $import.getTestInstallToString($ret)
- #end
- #end
-
-
-#else
- #set($alist = $doc.getAttachmentList())
- #if ($alist.size() == 0)
- Add the package in attachment
- #end
- #foreach ($oAttach in $alist)
- #set($import = $xwiki.import)
-
- 1.1 $oAttach.getFilename()
-
- $import.importPackage($oAttach.getContent())
-
- 1.1.1 Infos
-
- Author : $import.getAuthor() <br />
- Name : $import.getName() <br />
- Description : $import.getDescription() <br />
- Licence : $import.getLicence() <br />
- Version : $import.getVersion() <br />
-
- #set($canInstall = $import.testInstall())
- install : $import.getTestInstallToString($canInstall)
-
- 1.1.1 Status of each Files
- #set($docs = $import.getDocuments())
-
- <form method="POST" action="$request.getRequestURL()?export=1">
- <input type="hidden" name="App" value="$oAttach.getFilename()" />
- <table border="1" style="text-align:center;">
- <tr><td>Name</td><td>infos</td><td colspan="3">Action</td></tr>
- <tr><td colspan="2"></td><td>overwrite</td><td>merge objects</td><td>skip</td></tr>
-
-
- #foreach($docInfo in $docs)
-
-
- <tr><td>[$docInfo.getFullName()>$docInfo.getFullName()]</td> <td>__$import.getTestInstallToString($docInfo.isInstallable())__</td>
-#if($import.getTestInstallToString($docInfo.isInstallable()) == "Already exist")
- #if ($import.getActionToString($docInfo.getDefaultAction()) == "overwrite")
- <td><input type="radio" name="$docInfo.getFullName()_default" value="overwrite" checked="true" /></td>
- #else
- <td><input type="radio" name="$docInfo.getFullName()_default" value="overwrite" /></td>
- #end
- #if ($import.getActionToString($docInfo.getDefaultAction()) == "merge")
- <td><input type="radio" name="$docInfo.getFullName()_default" value="merge" checked="true" /></td>
- #else
- <td><input type="radio" name="$docInfo.getFullName()_default" value="merge" /></td>
- #end
- #if ($import.getActionToString($docInfo.getDefaultAction()) == "skip")
- <td><input type="radio" name="$docInfo.getFullName()_default" value="skip" checked="true" /></td> </tr>
- #else
- <td><input type="radio" name="$docInfo.getFullName()_default" value="skip" /></td> </tr>
- #end
-#else
- <td colspan="3"></td>
-#end
-
-
- #end
- </table>
- #if ($canInstall != 0)
- 1.1.1 You can install this applications
- <input type="submit" name="submitted" value="Valider">
- #else
- 1.1.1 You can't install this application.
- #end
- </form>
- #end
-#end
-
-#end
-
###
### Separator
###
@@ -622,4 +221,4 @@
#if($objcolor && $objcolor != "")
$csspropname: $objcolor;
#end
-#end
\ No newline at end of file
+#end
Modified: xwiki/trunk/src/main/web/skins/xwiki10/style.css
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/style.css 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/web/skins/xwiki10/style.css 2006-08-10 16:09:03 UTC (rev 1130)
@@ -1,418 +1,15 @@
-#template("skinVariables.vm")
- at import "elements.css";
+#template("skinvariables.vm")
+ at import "classes.css";
@import "chwSkin.css";
@import "xwiki.css";
@import "wiki.css";
@import "page.css";
@import "rss.css";
+ at import "layout.css";
@import "screenlayout.css";
@import "presentation.css";
@import "colors.css";
@import "temp.css";
+ at import "ie.css";
-/* Default is a Blue StyleSheet */
-/* Light Blue */
-#xwikinav_footer, #xwikinav_header, .heading-1, .heading-1-1 {
- border-color: #B6C5F2;
-}
-#xwikinav_footer, #xwikiwebusermenu, .heading-1-1, .wiki-table th, .rsschanneltitle,
-#xwikilanguagemenu a.xwikilanguageactive, #xwikilanguagemenu a:visited.xwikilanguageactive {
- background-color: #B6C5F2;
-}
-
-/* Dark Blue */
-.xwikiactions a, #xwikiwebusermenu a {
- background-color: #5368A6;
-}
-
-#xwikinav_footer, #xwikinav_header, #xwikinav_header.xwiki0b {
- border-color: #5368A6;
-}
-
-.heading-1, .heading-1-1 {
- border-color: #5368A6;
- color: #5368A6;
-}
-
-
-
-/* Comments colors */
-.xwikidata, .xwikidatafooter, .xwikidatafooter1, .xwikidatefooter2 {
- background-color: #B6C5F2;
-}
-
-.xwikidatatitle, .xwikidatatitle1, .xwikidatatitle2 {
- background-color: #5368A6;
-}
-
-/* Logo
-#companylogo img {
- background-image: url("logobleu.jpg");
-}*/
-/*
-#companylogo img {
- background-image: url("xwlogoblack.png");
- background-repeat: no-repeat;
- height: 91px;
- width: 136px;
-}
-*/
-.article_title {
- font-size: 120%;
- border-bottom: 1px;
-}
-
-.article_content {
- padding: 10px;
-}
-
-.article_date {
- font-size: 120%;
- border-bottom: 1px solid;
-}
-
-.article_footer {
- border-top: 1px dotted;
- font-size: 75%;
- font-weight: bold;
- color: gray
-}
-
-
-
-
-
-
-
-
-
-.heading-1, .heading-1-1 {
- border: none;
-}
-
-#xwikinav_footer, #xwikiwebusermenu, .heading-1-1, .wiki-table th, .rsschanneltitle,
-#xwikilanguagemenu a.xwikilanguageactive, #xwikilanguagemenu a:visited.xwikilanguageactive {
- background-color: transparent;
-}
-
-/* Dark Blue */
-.xwikiactions a, #xwikiwebusermenu a {
- background-color: #BBB;
-}
-
-#xwikinav_footer, #xwikinav_header, #xwikinav_header.xwiki0b {
- border-color: #DDD;
-}
-
-.heading-1, .heading-1-1 {
- border: none;
- color: #000;
-}
-
-.submenu{
- display: block;
- background-color: white;
- border: 1px solid #ddd;
- border-top: 1px solid white;
- position: absolute;
- padding: 4px 5px 8px;
- margin-top: -1px;
- margin-left: 5px;
-}
-.submenu .submenuitem{
- display: block;
-}
-.submenu.hidden{
- display: none;
-}
-
-input[type=submit], input[type=reset]{
- background-color: #EEE;
- font-family: Helvetica;
- font-weight: bold;
- padding: 1px 16px;
-}
-input[type=submit]:hover, input[type=reset]:hover{
- background-color: #FFD;
- cursor: pointer;
-}
-.xwikiintra li:hover, .xwikitabbar li:hover, .xwikiintracontent legend:hover, .xwikiintracontent fieldset.collapsed legend:hover{
- background-color: #FFD;
-}
-
-
-/*-------------------------------------------------------------------------------*/
-
-/* Dark Blue */
-.xwikiactions a, #xwikiwebusermenu a {
- background-color: #369;
-}
-
-#xwikinav_footer, #xwikinav_header, #xwikinav_header.xwiki0b {
- border-color: #369;
-}
-
-.heading-1, .heading-1-1 {
- border: none;
- color: #369;
-}
-
-.submenu{
- display: block;
- background-color: white;
-/* border: 1px solid #369; */
- border-top: 1px solid white;
- position: absolute;
- padding: 4px 5px 8px;
- margin-top: -1px;
- margin-left: 5px;
-}
-.submenu .submenuitem{
- display: block;
-}
-.submenu.hidden{
- display: none;
-}
-
-input[type=submit], input[type=reset], input[type=button], input.button{
- background-color: #EEE;
- font-family: Helvetica;
- font-weight: bold;
- padding: 1px 16px;
-}
-input[type=submit]:hover, input[type=reset]:hover, input[type=button]:hover, input.button:hover{
- background-color: #FFD;
- cursor: pointer;
-}
-.xwikiintra li:hover, .xwikiintracontent legend:hover, .xwikiintracontent fieldset.collapsed legend:hover{
- background-color: #FFD;
-}
-/*___________________
-From elements.css
-_________________________*/
-
-.extern{
- background: #369 url("corner.png") no-repeat right top;
-}
-a:link{
- color: #369;
-}
-a:visited{
- color: #777;
-}
-
-#companylogo img {
- background-image: url("xwlogoblue.png");
- background-repeat: no-repeat;
- height: 91px;
- width: 136px;
-}
-
-table{
- border-spacing: 0px;
- border-collapse: collapse;
-}
-
-/*---------------------------
-colors.css
------------------------------*/
-.panel{
- border: 1px solid #ACD;
-}
-.xwikipaneltitle{
- background-color: #CDF;
- cursor: pointer;
-}
-.xwikipanelarrow{
- position: absolute;
- top: 0px;
- right: 0px;
- width: 50px;
- height: 10px;
- visibility: hidden;
-}
-
-tr.row.odd{
- background-color: #CDF;
-}
-tr.row.even{
- background-color: #FFF;
-}
-tr th{
- background-color: #CDF;
-}
-
-#xwikiincludeddocuments .xwikibuttonlink a{
- background-image: url("corner.png");
- background-repeat: no-repeat;
- background-position: right top;
- padding: 2px 8px;
- margin-left: 8px;
-}
-
-/*---------------------------------
- From scrennlayout.css
------------------------------------
-*/
-
-/*
----------------------------------------
-Intra
----------------------------------------
-*/
-.xwikiintra li, .xwikitabbar li{
- background-color: #cdf;
- border-color: #ACF;
- border-bottom-color: #CCC;
- border-left-color: #DDF;
- border-top-color: #DDF;
-}
-
-.xwikibuttonlink a{
- background-color: #369;
- color: #fff;
-}
-
-.xwikibuttonlink a:hover{
- background-color: #ffd;
- color: #369;
-}
-
-
-table.xwikidatatable th{
- border: 1px solid #369;
- background-color: #369;
- color: #cdf;
- text-align: center;
-}
-
-table.xwikidatatable td{
- padding: 2px 8px;
-}
-.xwikiintracontent{
- margin: 8px;
-}
-
-.xwikilogintable{
- margin: 8px auto;
-}
-.xwikilogintable th{
- text-align: right;
- background-color: transparent;
-}
-/*
-.xwikiintracontent legend{
- border: 1px solid #369;
-}
-.xwikiintracontent fieldset{
- border-color: #369;
-}
-*/
-
-/*
----------------------------------------------
-"Message Boxes"
----------------------------------------------
-*/
-fieldset.xwikimessage{
- border-color:#658BB2;
-}
-
-fieldset.xwikimessage legend{
- background-color: #658BB2;
- color: #FFF;
-}
-
-/*
----------------------------------------------
-History
----------------------------------------------
-*/
-
-
-#xwikihistorylist li{
- list-style-type: none;
-}
-
-.xwikiintracontent h4{
- font-size: 110%;
- text-align: left;
- text-transform: none;
- margin: 0px;
-}
-
-.xwikitabbar li.active{
- border: 1px solid #DDD;
- border-bottom: 3px solid #FFF;
-}
-
-#xwikirightstable{
- width: 624px;
- margin: 0px;
- border: 1px solid #DDD;
-}
-#xwikirightstable th{
- text-align: center;
- border: 1px solid #ACF;
- border-bottom-color: #CCC;
- border-left-color: #DDF;
- border-top-color: #DDF;
-}
-#xwikirightstable td, #xwikirightstable tr{
- border: 1px solid #DDD;
- text-align: center;
-}
-
-#editcolumn{
- float: left;
- margin: 0px;
- width: 634px;
-}
-
-/*
-----------------------------------------
-Color Picker
-----------------------------------------
-*/
-.chwColorPickerInvoker{
- color: #FFF;
- background-color: #369;
-}
-
-html > body #chwColorPickerScreen{
- opacity: 0.6;
- background-color: #FFF;
-}
-
-#chwColorPickerFieldset{
- border: 2px solid #369;
- border-top: 8px solid #369;
-}
-
-#chwColorPickerFieldset legend{
- background-color: #369;
- color: #FFF;
-}
-
-a.chwButton{
- background-color: #369;
- color: #FFF;
-}
-
-#chwColorPickerShow, #chwColorCodeDisplay{
- width: 64px;
-}
-
-pre{
- overflow: auto;
- background-color: #EEE;
- border: 1px solid #DDD;
- padding: 4px;
-}
-
-#set($size = "135px")
-.panel input.panelinput{
- width: 135px;
- width: $size;
-}
\ No newline at end of file
Deleted: xwiki/trunk/src/main/web/skins/xwiki10/style_clean.css
===================================================================
Modified: xwiki/trunk/src/main/web/templates/macros.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/macros.vm 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/main/web/templates/macros.vm 2006-08-10 16:09:03 UTC (rev 1130)
@@ -388,7 +388,7 @@
#end
</table>
#if ($canInstall != 0)
- 1.1.1 You are can install this applications
+ 1.1.1 You can install this application
<input type="submit" name="submitted" value="Valider">
#else
1.1.1 You can't install this application.
Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/RadeoxRenderTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/RadeoxRenderTest.java 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/RadeoxRenderTest.java 2006-08-10 16:09:03 UTC (rev 1130)
@@ -65,7 +65,7 @@
renderTest(wikibase, "Hello 1\n1.1 Title\nHello 2",
"<h3 class=\"heading-1-1\">", false, getXWikiContext());
renderTest(wikibase, "Hello 1\n1.1 Title\nHello 2",
- "<h3 class=\"heading-1-1\"><a id=\"Title\" name=\"Title\">Title</a></h3>", false, getXWikiContext());
+ "<h3 class=\"heading-1-1\"><a id=\"HHTitle\" name=\"HHTitle\">Title</a></h3>", false, getXWikiContext());
}
public void testWikiBasePreRenderer() throws XWikiException {
@@ -78,7 +78,7 @@
renderTest(wikibase, "This is a text with{pre} *strong* {/pre}text\n",
"This is a text with *strong* text", false, getXWikiContext());
renderTest(wikibase, "1 Title {pre}\n*strong*\n{/pre}",
- "<h3 class=\"heading-1\"><a id=\"Title+%25_0_%25\" name=\"Title+%25_0_%25\">Title \n*strong*\n</a></h3>", false, getXWikiContext());
+ "<h3 class=\"heading-1\"><a id=\"HHTitle+%25_0_%25\" name=\"HHTitle+%25_0_%25\">Title \n*strong*\n</a></h3>", false, getXWikiContext());
renderTest(wikibase, " * Item {pre}*strong*{/pre}",
"<li>Item *strong*</li>", false, getXWikiContext());
renderTest(wikibase, "This is a text with{pre} *one* {/pre}and{pre} *two* {/pre}items\n",
Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/UtilTest.java 2006-08-10 16:09:03 UTC (rev 1130)
@@ -140,42 +140,42 @@
// test init level 1
Map result = TOCGenerator.generateTOC(content, 1, 6, true, getXWikiContext());
- assertEquals (((Map) result.get("a")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.1");
- assertEquals (((Map) result.get("b")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2");
- assertEquals (((Map) result.get("c")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2.1");
- assertEquals (((Map) result.get("d")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.3");
- assertEquals (((Map) result.get("a-1")).get(TOCGenerator.TOC_DATA_NUMBERING), "2");
- assertEquals (((Map) result.get("f")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1.1.1");
- assertEquals (((Map) result.get("g")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1.1.2");
- assertEquals (((Map) result.get("h")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.2");
- assertEquals ((((Map) result.get("i")).get(TOCGenerator.TOC_DATA_NUMBERING)), "2.3");
- assertEquals ((((Map) result.get("j")).get(TOCGenerator.TOC_DATA_NUMBERING)), "2.3.1.1.1.1");
+ assertEquals (((Map) result.get("Ha")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.1");
+ assertEquals (((Map) result.get("Hb")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2");
+ assertEquals (((Map) result.get("Hc")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2.1");
+ assertEquals (((Map) result.get("Hd")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.3");
+ assertEquals (((Map) result.get("Ha-1")).get(TOCGenerator.TOC_DATA_NUMBERING), "2");
+ assertEquals (((Map) result.get("Hf")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1.1.1");
+ assertEquals (((Map) result.get("Hg")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1.1.2");
+ assertEquals (((Map) result.get("Hh")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.2");
+ assertEquals ((((Map) result.get("Hi")).get(TOCGenerator.TOC_DATA_NUMBERING)), "2.3");
+ assertEquals ((((Map) result.get("Hj")).get(TOCGenerator.TOC_DATA_NUMBERING)), "2.3.1.1.1.1");
// test init level 2
result = TOCGenerator.generateTOC(content, 2, 6, true, getXWikiContext());
- assertEquals ((((Map) result.get("a")).get(TOCGenerator.TOC_DATA_NUMBERING)), "1");
- assertEquals (((Map) result.get("b")).get(TOCGenerator.TOC_DATA_NUMBERING), "2");
- assertEquals (((Map) result.get("c")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1");
- assertEquals (((Map) result.get("d")).get(TOCGenerator.TOC_DATA_NUMBERING), "3");
- assertNull(result.get("a-1"));
- assertEquals (((Map) result.get("f")).get(TOCGenerator.TOC_DATA_NUMBERING), "3.1.1");
- assertEquals (((Map) result.get("g")).get(TOCGenerator.TOC_DATA_NUMBERING), "3.1.2");
- assertEquals (((Map) result.get("h")).get(TOCGenerator.TOC_DATA_NUMBERING), "4");
- assertEquals ((((Map) result.get("i")).get(TOCGenerator.TOC_DATA_NUMBERING)), "5");
- assertEquals ((((Map) result.get("j")).get(TOCGenerator.TOC_DATA_NUMBERING)), "5.1.1.1.1");
+ assertEquals ((((Map) result.get("Ha")).get(TOCGenerator.TOC_DATA_NUMBERING)), "1");
+ assertEquals (((Map) result.get("Hb")).get(TOCGenerator.TOC_DATA_NUMBERING), "2");
+ assertEquals (((Map) result.get("Hc")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1");
+ assertEquals (((Map) result.get("Hd")).get(TOCGenerator.TOC_DATA_NUMBERING), "3");
+ assertNull(result.get("Ha-1"));
+ assertEquals (((Map) result.get("Hf")).get(TOCGenerator.TOC_DATA_NUMBERING), "3.1.1");
+ assertEquals (((Map) result.get("Hg")).get(TOCGenerator.TOC_DATA_NUMBERING), "3.1.2");
+ assertEquals (((Map) result.get("Hh")).get(TOCGenerator.TOC_DATA_NUMBERING), "4");
+ assertEquals ((((Map) result.get("Hi")).get(TOCGenerator.TOC_DATA_NUMBERING)), "5");
+ assertEquals ((((Map) result.get("Hj")).get(TOCGenerator.TOC_DATA_NUMBERING)), "5.1.1.1.1");
// test max level 3
result = TOCGenerator.generateTOC(content, 1, 3, true, getXWikiContext());
- assertEquals ((((Map) result.get("a")).get(TOCGenerator.TOC_DATA_NUMBERING)), "1.1");
- assertEquals (((Map) result.get("b")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2");
- assertEquals (((Map) result.get("c")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2.1");
- assertEquals (((Map) result.get("d")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.3");
- assertEquals (((Map) result.get("a-1")).get(TOCGenerator.TOC_DATA_NUMBERING), "2");
- assertNull(result.get("f"));
- assertNull(result.get("g"));
- assertEquals (((Map) result.get("h")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1");
- assertEquals ((((Map) result.get("i")).get(TOCGenerator.TOC_DATA_NUMBERING)), "2.2");
- assertNull(result.get("j"));
+ assertEquals ((((Map) result.get("Ha")).get(TOCGenerator.TOC_DATA_NUMBERING)), "1.1");
+ assertEquals (((Map) result.get("Hb")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2");
+ assertEquals (((Map) result.get("Hc")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.2.1");
+ assertEquals (((Map) result.get("Hd")).get(TOCGenerator.TOC_DATA_NUMBERING), "1.3");
+ assertEquals (((Map) result.get("Ha-1")).get(TOCGenerator.TOC_DATA_NUMBERING), "2");
+ assertNull(result.get("Hf"));
+ assertNull(result.get("Hg"));
+ assertEquals (((Map) result.get("Hh")).get(TOCGenerator.TOC_DATA_NUMBERING), "2.1");
+ assertEquals ((((Map) result.get("Hi")).get(TOCGenerator.TOC_DATA_NUMBERING)), "2.2");
+ assertNull(result.get("Hj"));
}
Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/XWikiTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/XWikiTest.java 2006-08-10 13:36:02 UTC (rev 1129)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/XWikiTest.java 2006-08-10 16:09:03 UTC (rev 1130)
@@ -272,6 +272,7 @@
AbstractRenderTest.renderTest(wikiengine, doc1, "$context.context.database", false, getXWikiContext());
}
+ /*
public void testXWikiPrefs() throws XWikiException {
XWikiHibernateStore hibstore = getXWiki().getHibernateStore();
System.out.println("JDBC Calls for init");
@@ -294,7 +295,9 @@
System.out.println("JDBC Calls for second getPrefsClass");
hibstore.getBatcherStats().printSQLList(System.out);
}
+ */
+ /*
public void testXWikiInit() throws XWikiException {
XWikiHibernateStore hibstore = getXWiki().getHibernateStore();
@@ -329,6 +332,7 @@
System.out.println("JDBC Calls for getDocument");
hibstore.getBatcherStats().printSQLList(System.out);
}
+ */
public void testXWikiDocElements() throws XWikiException {
XWikiDocument doc = new XWikiDocument();
More information about the Xwiki-notifications
mailing list