Author: sdumitriu
Date: 2007-12-12 18:36:39 +0100 (Wed, 12 Dec 2007)
New Revision: 6362
Removed:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/ad.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/cancel.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/changesall.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diff.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diffall.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/flash.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getpagedatasources.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/gettables.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/hiddenobject.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/languages.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/macrowysiwyg.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/portletConfig.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/rdf.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5b.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5bheader.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5header.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/save.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/status.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/stylesheetlinks.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/userinactive.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/viewobject.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/xml.vm
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/ad.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/cancel.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/rdf.vm
Log:
[cleanup] Remove unneeded templates from the skin
Deleted: xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/ad.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/ad.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/ad.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,23 +0,0 @@
-###
-### Ads
-###
-### Google ads - not used for the moment
-###
-#if($xwiki.getAdType().equals("google"))
-#set($googleclientid = $xwiki.getAdClientId())
-<script type="text/javascript"><!--
-google_ad_client = "${googleclientid}";
-google_ad_width = 234;
-google_ad_height = 60;
-google_ad_format = "234x60_as";
-google_ad_channel ="";
-google_color_border = "336699";
-google_color_bg = "FFFFFF";
-google_color_link = "0000FF";
-google_color_url = "008000";
-google_color_text = "000000";
-//--></script>
-<script type="text/javascript"
- src="http://pagead2.googlesyndication.com/pagead/show_ads.js";>
-</script>
-#end
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/cancel.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/cancel.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/cancel.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,7 +0,0 @@
-###
-### Cancel action
-###
-### This should NOT be displayed
-###
-#set($message=$msg.get("changescanceled"))
-#template("view.vm")
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/changesall.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/changesall.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/changesall.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,38 +0,0 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-#template("viewheader.vm")
-<div id="xwikicontent">
-#if($request.get("type"))
-#set($type= $request.get("type"))
-#else
-#set($type = "html")
-#end
-#if ($tdoc.realLanguage!="")
-#set($lang = "&language=${tdoc.realLanguage}")
-#else
-#set($lang = "")
-#end
-$msg.get("currentdifftype"): $type (
-<a href="$doc.getURL("view",
"xpage=changesall&type=wiki$lang")">$msg.get("wikidiff")</a>
-<a href="$doc.getURL("view",
"xpage=changesall&type=source$lang")">$msg.get("sourcediff")</a>
-<a href="$doc.getURL("view",
"xpage=changesall&type=html$lang")">$msg.get("htmldiff")</a>
-)
-#set($firstrev = $tdoc.getVersion())
-#set($nextversion = $firstrev)
-#foreach ($version in $tdoc.getRecentRevisions(0))
-#if($version != $firstrev)
-#set($origdoc = "")
-#set($newdoc = "")
-#set($origdoc = $xwiki.getDocument($tdoc, $version))
-#set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
-#template("changesdoc.vm")
-#set($nextversion = $version)
-#end
-#end
-#set($newdoc = $origdoc)
-#set($origdoc = $xwiki.getDocument($tdoc,"1.0"))
-#template("changesdoc.vm")
-</div>
-#template("basefooter.vm")
-#template("footer.vm")
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diff.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diff.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diff.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1 +0,0 @@
-#template("history.vm")
\ No newline at end of file
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diffall.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diffall.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/diffall.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,121 +0,0 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-#template("viewheader.vm")
-#if($message)
-<div id="xwikimessage">
-$message
-</div>
-#end
-<div id="xwikicontent">
-#set($versiontodiff= $request.get("version"))
-#set($topic = $request.get("topic"))
-#if(!$topic)
-#set($topic = "Main.WebHome")
-#end
-#if($request.get("type"))
-#set($type= $request.get("type"))
-#else
-#set($type = "html")
-#end
-#if ($tdoc.realLanguage!="")
-#set($lang = "&language=${tdoc.realLanguage}")
-#else
-#set($lang = "")
-#end
-#if($versiontodiff)
-#set($other="$lang")
-#else
-#set($other="&version=$versiontodiff$lang")
-#end
-$msg.get("currentdiffyype"): $type (
-<a href="$doc.getURL("view",
"xpage=diff&type=wiki$other")">$msg.get("wikidiff")</a>
-<a href="$doc.getURL("view",
"xpage=diff&type=source$other")">$msg.get("sourcediff")</a>
-<a href="$doc.getURL("view",
"xpage=diff&type=html$other")">$msg.get("htmldiff")</a>
-) <a href="$doc.getURL("view",
"xpage=diff&type=html&version=all&$lang")">$msg.get("showalldiff")</a>
-#set($firstrev = $tdoc.getVersion())
-#set($nextversion = $firstrev)
-#foreach ($version in $tdoc.getRecentRevisions(0))
-#if($version != $firstrev)
-#set($origdoc = "")
-#set($newdoc = "")
-#set($origdoc = $xwiki.getDocument($tdoc, $version))
-#set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
-<div style="width: 100%; background-color: #DDDDDD">
-<h3>$msg.get("From") version $version $msg.get("to") $nextversion
-#if(($origdoc=="")||($newdoc==""))
-#if($newdoc!="")
-$msg.get("by") $xwiki.getLocalUserName($newdoc.author),$doc)
$xwiki.formatDate($newdoc.date)
-#end
- ($msg.get("cannotreaddocumentversion") $nextversion)</h3>
-#else
-$msg.get("by") $xwiki.getLocalUserName($newdoc.author) $msg.get("on")
$xwiki.formatDate($newdoc.date)
-(<a href="$doc.getURL("view",
"xpage=diff&type=html&version=$version&$lang")">$msg.get("showdiff")</a>)
-</h3>
-</div>
-#if(($versiontodiff=="all")||($versiontodiff==$version))
-<ul>
-#foreach($item in $doc.getMetaDataDiff($origdoc, $newdoc))
-<li>$item</li>
-#end
-</ul>
-
-<ul>
-#foreach($item in $doc.getClassDiff($origdoc, $newdoc))
-<li>$item</li>
-#end
-</ul>
-
-<ul>
-#foreach($item in $doc.getObjectDiff($origdoc, $newdoc))
-<li>$item</li>
-#end
-</ul>
-
-
-#if($type=="wiki")
-#set($deltas= $tdoc.getRenderedContentDiff($origdoc, $newdoc))
-#end
-
-#if($type=="xml")
-#set($deltas= $tdoc.getXMLDiff($origdoc, $newdoc))
-#else
-#set($deltas= $tdoc.getContentDiff($origdoc, $newdoc))
-#end
-
-#foreach($delta in $deltas)
-#set($chunk = $delta.revised)
-#if ($chunk.size()>0)
-<div style="border-left: 8px solid #00FF00">
-#if (($type == "source")||($type == "xml"))
-<pre>
-$xwiki.renderChunk($chunk, true, $tdoc)
-</pre>
-#else
-$xwiki.renderChunk($chunk, $tdoc)
-#end
-</div>
-#end
-
-#set($chunk = $delta.original)
-#if ($chunk.size()>0)
-<div style="border-left: 8px solid #FF0000">
-#if (($type == "source")||($type == "xml"))
-<pre>
-$xwiki.renderChunk($chunk, true, $tdoc)
-</pre>
-#else
-$xwiki.renderChunk($chunk, $tdoc)
-#end
-</div>
-#end
-#end
-#end
-#end
-
-#set($nextversion = $version)
-#end
-#end
-</div>
-#template("basefooter.vm")
-#template("footer.vm")
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/flash.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/flash.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/flash.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,9 +0,0 @@
-<OBJECT CLASSID="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" WIDTH="${width}"
HEIGHT="${height}"
CODEBASE="http://active.macromedia.com/flash5/cabs/swflash.cab#version=5,0,0,0";>
-<PARAM NAME="movie" VALUE="${flashurl}">
-<PARAM NAME="play" VALUE="true">
-<PARAM NAME="loop" VALUE="false">
-<PARAM NAME="quality" VALUE="low">
-<EMBED SRC="${flashurl}" WIDTH="${width}" HEIGHT="${height}" quality="low"
loop="false" TYPE="application/x-shockwave-flash"
PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash";>
-</EMBED>
-</OBJECT>
-
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getpagedatasources.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getpagedatasources.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getpagedatasources.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,14 +0,0 @@
-$response.setContentType("text/xml")
-<types>
-#set($objects = $doc.getxWikiObjects())
-#set($classes = $objects.keySet())
-#foreach($class in $classes)
- #if($class.endsWith("DataSource"))
- <type>$class</type>
- #end
-#end
-
-#foreach($prefix in $xwiki.getSpaces())
- <option name="$prefix" value="$prefix"/>
-#end
-</types>
\ No newline at end of file
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/gettables.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/gettables.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/gettables.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,50 +0,0 @@
-$response.setContentType("text/xml")
-<?xml version="1.0" encoding="$response.getCharacterEncoding()"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns='http://www.w3.org/1999/xhtml'>
- <head>
- <title>Tables from the page $doc.getFullName()</title>
- </head>
- <body>
- <div id='tdwEnvelope'>
-
- #set ( $tables = $rhelper.getTables() )
- #set ( $tidx = 0 )
-
- #foreach ($table in $tables)
- #set ( $rowCount = $rhelper.getTableRowCount($table) )
- #set ( $colCount = $rhelper.getTableColumnCount($table)
)
- <table>
- #set ( $nexttidx = $tidx + 1 )
- <caption>Table $nexttidx</caption>
- #set ( $ccount = $colCount+1 )
- #foreach ( $cidx in [0..$ccount] )
- <col id='T${tidx}C${cidx}'/>
- #end
- <tbody id='T$tidx'>
- <tr id='T${tidx}R0'>
- <th id='T${tidx}R0C0'>*</th>
- #foreach ( $cidx in [0..$colCount] )
- #set ( $nextcidx = $cidx + 1 )
- <th
id='T${tidx}R0C${nextcidx}'>$rhelper.getColumn($cidx)</th>
- #end
- </tr>
- #foreach ( $ridx in [0..$rowCount] )
- #set ( $nextridx = $ridx + 1 )
- <tr id='T${tidx}R${nextridx}'>
- <th
id='T${tidx}R${nextridx}C0'>${nextridx}</th>
- #foreach ( $cidx in [0..$colCount] )
- #set ( $nextcidx = $cidx + 1 )
- <td
id='T${tidx}R${nextridx}C${nextcidx}'>$!rhelper.getCell($table, $cidx,
$ridx)</td>
- #end
- </tr>
- #end
- </tbody>
- </table>
- #set( $tidx = $tidx + 1 )
- #end
-
- </div>
- <div
id="tdwObjectCount">$doc.getObjectNumbers("XWiki.TableDataSource")</div>
- </body>
-</html>
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/hiddenobject.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/hiddenobject.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/hiddenobject.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,11 +0,0 @@
-#foreach($class in $doc.xWikiClasses)
-#set( $nb = $doc.getObjectNumbers("${class.name}"))
-<input type="hidden" name="${class.name}_nb" value="$nb" />
-#foreach($obj in $doc.getObjects($class.name))
- #if ($obj.xWikiClass)
- #foreach($prop in $class.properties)
- $doc.displayHidden($prop, "${class.name}_${obj.number}_", $obj)
- #end
- #end
- #end
-#end
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/languages.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/languages.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/languages.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,17 +0,0 @@
-#if ($xwiki.isMultiLingual()==true)
-#set($preflanguage = $xwiki.languagePreference)
-#set($languageactive = (($preflanguage == "")||($preflanguage ==
"default")||($preflanguage==$doc.defaultLanguage)))
-<span class="xwikisep2expl">$msg.get("language"):</span>
-<span class="xwikisep2"> | </span>
-#set($defaultLanguage = $doc.defaultLanguage)
-#if ($doc.defaultLanguage == "")
-#set($defaultLanguage = "default")
-#end
-<a #if ($languageactive) class="xwikilanguageactive" #end
href="$doc.getURL("view","language=${defaultLanguage}")">
-$msg.get($defaultLanguage)
-</a>
-#foreach ($language in $doc.translationList)
-#set($languageactive = ($preflanguage==$language))
-<span class="xwikisep2"> | </span><a #if ($languageactive)
class="xwikilanguageactive" #end
href="$doc.getURL("view","language=${language}")">$language</a>
-#end
-#end
\ No newline at end of file
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/macrowysiwyg.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/macrowysiwyg.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/macrowysiwyg.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,86 +0,0 @@
-
-#set($macros = $xwiki.getMacroList())
-#set($macros = $macros.split('\n'))
-<form id="macroform" name="macroform" onsubmit="insertMacro(); return false;"
action="">
- <div>
- <table width="100%" border="0" cellspacing="4" cellpadding="0">
- <tr>
- <td class="title" nowrap="nowrap">$msg.get("choosemacro")</td>
- </tr>
- <tr>
- <td >
- <table cellspacing="0" cellpadding="0" width="100%"
style="border: 0px">
- <tr>
- <td>
- <select id="selmacro" name="selmacro"
style="border: 1px solid #d3e3f5; width:100%;" size="7"
onchange="inputMacro();">
- #foreach ($macro in $macros)
- #if (!$macro.trim().equals(""))
- #set($macroname =
$macro.toString().substring(0,$macro.indexOf("=")))
- <option
value="$macroname">$macroname</option>
- #end
- #end
- </select>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
-
- <div id="input">
- </div>
- #foreach ($macro in $macros)
- #if (!$macro.trim().equals(""))
- #set($macroname =
$macro.toString().substring(0,$macro.indexOf("=")).trim())
- <div id="$macroname" style="display: none;" >
- #set($index = $macro.indexOf("=") + 1)
- #set($temp = $macro.substring($index))
- #set($infoArr = $temp.split(':'))
- #set($counter = 0)
- #set($counparam = 0)
- #set($macroparam = "")
- <input type="hidden" id="macroname" name="macroname"
value="$macroname" />
- #foreach ($paramnum in $infoArr)
- #if($counparam == 2)
- #set($macroparam = $paramnum)
- <div>
- <fieldset style="border: 1px solid #d3e3f5;">
- <legend>$msg.get("macro") $macroname</legend>
- <table width="100%" border="0" cellspacing="4"
cellpadding="0">
- #foreach ($infoMacro in $infoArr)
- #if ($counter == 2)
- #set($params = $infoMacro.split(","))
- #foreach ($param in $params)
- #set($param = $param.trim())
- <tr>
- <td nowrap="nowrap"
width="25%">$param.substring(0,1).toUpperCase()$param.substring(1) :</td>
- <td>
- <input type="text"
id="$param" name="$param" style="width:240px;" value=""/>
- </td>
- </tr>
- #end
- #end
- #if($counter == 3)
- #if (!$infoMacro.equals(""))
- <tr>
- <td
nowrap='nowrap'>$infoMacro.substring(0,1).toUpperCase()$infoMacro.substring(1)
:</td>
- <td>
- <textarea id="content"
name="content" rows='' cols='4' style='width:240px;'></textarea>
- </td>
- </tr>
- #end
- #end
- #set($counter = $counter + 1)
- #end
- </table>
- </fieldset>
- </div>
- #end
- #set($counparam = $counparam + 1)
- #end
- <input type="hidden" id="macroparam" name="macroparam"
value="$macroparam" />
- </div>
- #end
- #end
-</form>
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/portletConfig.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/portletConfig.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/portletConfig.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,4 +0,0 @@
-<form action="$response.createActionURL()" method="post">
- Root space name: <input type="text" name="rootSpace"
value="$request.getPreferences().getValue( "rootTopic", "")" />
- <br/><input type="submit" />
-</form>
\ No newline at end of file
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/rdf.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/rdf.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/rdf.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="$xwiki.encoding" ?>
-#template("xwiki.vm")
-$response.setContentType("text/xml")
-$cdoc.getRenderedContent()
Deleted: xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,5 +0,0 @@
-#template("xwiki.vm")
-#template("s5bheader.vm")
-$cdoc.getRenderedContent()
-</body>
-</html>
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5b.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5b.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5b.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,5 +0,0 @@
-#template("xwiki.vm")
-#template("s5bheader.vm")
-$cdoc.getRenderedContent()
-</body>
-</html>
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5bheader.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5bheader.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5bheader.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,38 +0,0 @@
-#if($context.getMode()==0)
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
-<head>
-<title>
-#set($title = $!doc.display("title", "view",
$doc.getObject("XWiki.XWikiHTML",0)))
-#if ( $title != "")
-#set( $title = $!xwiki.getWebPreference("title"))
-#end
-#if ( $title != "")
-$xwiki.parseContent($title)
-#else
-XWiki . $!doc.web . $!doc.name
-#end
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="generator" content="S5" />
-<meta name="version" content="S5 1.1" />
-<meta name="presdate" content="20041130" />
-<meta name="author" content="Ludovic Dubost, Olivier Seres" />
-<meta name="company" content="XPertNet" />
-<meta name="slideshow" content="yes" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/outline.css" type="text/css"
media="screen" id="outlineStyle" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/slides.css" type="text/css"
media="projection" id="slideProj" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/opera.css" type="text/css"
media="projection" id="operaFix" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/print.css" type="text/css"
media="print" id="slidePrint" />
-<script src="/xwiki/s5/ui2/slides.js" type="text/javascript"></script>
-</head>
-<body>
-<style type="text/css">
-$!xwiki.getWebPreference("style")
-</style>
-<style type="text/css">
-$!doc.display("style", "view", $doc.getObject("XWiki.XWikiHTML",0))
-</style>
-#end
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5header.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5header.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/s5header.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,38 +0,0 @@
-#if($context.getMode()==0)
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
-<head>
-<title>
-#set($title = $!doc.display("title", "view",
$doc.getObject("XWiki.XWikiHTML",0)))
-#if ( $title != "")
-#set( $title = $!xwiki.getWebPreference("title"))
-#end
-#if ( $title != "")
-$xwiki.parseContent($title)
-#else
-XWiki . $!doc.web . $!doc.name
-#end
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="generator" content="S5" />
-<meta name="version" content="S5 1.1" />
-<meta name="presdate" content="20041130" />
-<meta name="author" content="Ludovic Dubost, Olivier Seres" />
-<meta name="company" content="XPertNet" />
-<meta name="slideshow" content="yes" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/outline.css" type="text/css"
media="screen" id="outlineStyle" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/slides.css" type="text/css"
media="projection" id="slideProj" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/opera.css" type="text/css"
media="projection" id="operaFix" />
-<link rel="stylesheet" href="/xwiki/s5/ui2/print.css" type="text/css"
media="print" id="slidePrint" />
-<script src="/xwiki/s5/ui2/slides.js" type="text/javascript"></script>
-</head>
-<body>
-<style type="text/css">
-$!xwiki.getWebPreference("style")
-</style>
-<style type="text/css">
-$!doc.display("style", "view", $doc.getObject("XWiki.XWikiHTML",0))
-</style>
-#end
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/save.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/save.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/save.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,2 +0,0 @@
-#set($message=$msg.get("changessaved"))
-#template("view.vm")
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/status.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/status.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/status.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,106 +0,0 @@
-<html>
-<head>
-<title>Database Status</title>
-<script type="text/javascript">
-<!--
-function switchView(divname) {
- var divel = document.getElementById(divname);
- if (divel.style.display=='block')
- divel.style.display = 'none';
- else
- divel.style.display = 'block';
-}
-// -->
-</script>
-</head>
-<body>
-<h1>Memory and Database Status</h1>
-<h2>Memory</h2>
-<ul>
-<li>Max: $xwiki.maxMemory()</li>
-<li>Free: $xwiki.freeMemory()</li>
-<li>Total: $xwiki.totalMemory()</li>
-</ul>
-<h2>Active Connections</h2>
-<ul>
-<li />Active: $xwiki.store.store.nbConnections
-<li />Map Size: $xwiki.store.store.connections.size()
-</ul>
-<br /><br />
-
-#foreach ($mconn in $xwiki.store.store.connections)
-<h3>$mconn</h3>
-#set($pconn = $mconn.connection)
-<ul>
-<li /><a href="" onclick="switchView('$mconn'); return false;">Time:
$mconn.date</a>
-<div id="$mconn" style="display: none">
-The database connection was assigned in the following page:<br />
-$mconn.url
-<br /><br />
-StackTrace: <br />
-<pre>
-$mconn.exception.getStackTraceAsString()
-</pre>
-</div>
-<li />Closed: $pconn.isClosed()
-#if ( $pconn.closed==false)
-<li />Catalog: $!pconn.catalog
-<li />AutoCommit: $!pconn.autoCommit
-<li />ReadOnline: $!pconn.readOnly
-<li />Warnings: $!pconn.warnings
-#end
-</ul>
-#end
-
-
-#set($provider = $xwiki.store.store.sessionFactory.connectionProvider)
-#set($pool = $xwiki.getPrivateField($provider,"connectionPool"))
-
-#if ($pool)
-<h2>Current Pool</h2>
-
-
-<h3>Before gc</h3>
-<ul>
-<li />Max Active: $pool.maxActive
-<li />Max Idle: $pool.maxIdle
-<li />Max Wait: $pool.maxWait
-<li />Active: $pool.numActive
-<li />Idle: $pool.numIdle
-</ul>
-
-$xwiki.gc()
-$xwiki.gc()
-$xwiki.gc()
-
-<h3>After gc</h3>
-<ul>
-<li />Max Active: $pool.maxActive
-<li />Max Idle: $pool.maxIdle
-<li />Max Wait: $pool.maxWait
-<li />Active: $pool.numActive
-<li />Idle: $pool.numIdle
-</ul>
-
-
-#set($list = $xwiki.getPrivateField($pool,"_pool"))
-#foreach ($element in $list)
-#set($pconn = $xwiki.getPrivateField($element, "value"))
-#set($timea = $xwiki.currentDate.time)
-#set($timeb = $xwiki.getPrivateField($element, "tstamp"))
-<h3>$pconn</h3>
-#set($conn = $pconn.delegate.delegate)
-<ul>
-<li />CurrentTime: $timea
-<li />LastActiveTime: $timeb
-<li />$conn
-<li />Closed: $conn.isClosed()
-#if ( $conn.closed==false)
-<li />Catalog: $!conn.catalog
-<li />AutoCommit: $!conn.autoCommit
-<li />ReadOnline: $!conn.readOnly
-<li />Warnings: $!conn.warnings
-#end
-</ul>
-#end
-#end
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/stylesheetlinks.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/stylesheetlinks.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/stylesheetlinks.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,14 +0,0 @@
-#set( $stylesheets = $xwiki.getWebPreference("stylesheets"))
-#if ($stylesheets != "")
-<a href="#" onclick="setActiveStyleSheet('default'); return
false;">$msg.get("defaultstyle")</a>
-#set( $stylenb = 1)
-#foreach ( $stylesheet in $xwiki.split($stylesheets, ","))
-<a href="#" onclick="setActiveStyleSheet('Alternate StyleSheet $stylenb');
return false;">$msg.get("altstyle$stylenb")</a>
-#set( $stylenb = $stylenb + 1)
-#end
-#else
-<a href="#" onclick="setActiveStyleSheet('default'); return
false;">$msg.get("defaultstyle")</a>
-<a href="#" onclick="setActiveStyleSheet('Alternate StyleSheet 1'); return
false;">$msg.get("altstyle1")</a>
-<a href="#" onclick="setActiveStyleSheet('Alternate StyleSheet 2'); return
false;">$msg.get("altstyle2")</a>
-<a href="#" onclick="setActiveStyleSheet('Alternate StyleSheet 3'); return
false;">$msg.get("altstyle3")</a>
-#end
\ No newline at end of file
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/userinactive.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/userinactive.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/userinactive.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,23 +0,0 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-#template("baseheader.vm")
-<div id="xwikicontent">
-#if ($cause == "disabled")
-$msg.get("accountdisabled")
-#else
-$msg.get("accountnotactive")
-<br />
-$msg.get("accountnotactive_email")
-<br />
-#set($confirmdoc = $xwiki.getDocument("XWiki.RegisterNewUserConfirmation"))
-<form action="$confirmdoc.getURL("view")" method="post">
-<input type="hidden" name="xwikiname" value="$context.user" />
-<input type="text" name="validkey" size="16" />
-<input type="submit" value="$msg.get("confirmaccount")" />
-</form>
-#end
-
-</div>
-#template("basefooter.vm")
-#template("footer.vm")
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/viewobject.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/viewobject.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/viewobject.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,11 +0,0 @@
-<h2>Properties</h2>
-<table border="0">
-#foreach($obj in $doc.xWikiObjects)
-<tr><td>$obj.xWikiClass.name</td></tr>
-#foreach($prop in $obj.xWikiClass.properties)
-<tr><td>$prop.prettyName</td>
-<td>$doc.displayView($prop, "${obj.xWikiClass.name}_", $obj)
-</td></tr>
-#end
-#end
-</table>
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/xml.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/xml.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/xml.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1 +0,0 @@
-$response.setContentType("text/xml")$cdoc.getXMLContent()
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/ad.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/ad.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/ad.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,3 +1,8 @@
+###
+### Ads
+###
+### Google ads - not used for the moment
+###
#if($xwiki.getAdType().equals("google"))
#set($googleclientid = $xwiki.getAdClientId())
<script type="text/javascript"><!--
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/cancel.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/cancel.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/cancel.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,2 +1,7 @@
+###
+### Cancel action
+###
+### This should NOT be displayed
+###
#set($message=$msg.get("changescanceled"))
#template("view.vm")
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/rdf.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/rdf.vm
2007-12-12 17:23:28 UTC (rev 6361)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/rdf.vm
2007-12-12 17:36:39 UTC (rev 6362)
@@ -1,3 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="$xwiki.encoding" ?>
#template("xwiki.vm")
+$response.setContentType("text/xml")
$cdoc.getRenderedContent()
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
