Author: sdumitriu
Date: 2008-02-13 19:39:24 +0100 (Wed, 13 Feb 2008)
New Revision: 7669
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/chwmain.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/chwmain.vm
Log:
XWIKI-2114: Upgrade the default templates
XSALBATROSS-13: Move Albatross templates files to the XWiki Core templates
directory to share them with other skins
Deleted:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/chwmain.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/chwmain.vm
2008-02-13 18:38:57 UTC (rev 7668)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/chwmain.vm
2008-02-13 18:39:24 UTC (rev 7669)
@@ -1,47 +0,0 @@
-#template("xwikivars.vm")
-<?xml version="1.0" encoding="$xwiki.encoding" ?>
-<!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>Creating new chart</title>
-<meta http-equiv="Content-Type" content="text/xhtml+xml;
charset=$xwiki.encoding" />
-<meta http-equiv="imagetoolbar" content="no"/>
-$!xwiki.getWebPreference("meta")
-<link href="$xwiki.getSkinFile("chwSkin.css")" rel="stylesheet"
type="text/css"/>
-#template("stylesheets.vm")
-<script type="text/javascript"
src="$xwiki.getSkinFile("chwScripts.js")"></script>
-</head>
-<body onload='window.wizard.initialize("$xwiki.getSkinFile("")",
"$msg.get("chwshow")", "$msg.get("chwhide")");'>
-#template("header.vm")
-<form id="chwForm" action="$doc.getURL("createchart")" method="post"
onsubmit="alert('submit');">
-<div id="chartWizard">
- <table id="chwWizard" summary="Chart Wizard Content">
- <tbody>
- <tr>
- <td colspan="2" id="chwNavigation">
-#template("chw/navigationimages.vm")
- </td>
- </tr>
- <tr>
- <td id="chwPreview">
- <img id="chwPreviewImg"
src="$xwiki.getSkinFile("chwSampleBarChart.png")" alt="Chart Type: Bars"
title="Chart Type: Bars"/>
- </td>
- <td id="chwOptions">
-#template("chw/datapage.vm")
-#template("chw/typepage.vm")
-#template("chw/titlepage.vm")
-## Not ready for prime time
-## #template("chw/axispage.vm")
- </td>
- </tr>
- <tr>
- <td id="chwButtons" colspan="2"><a href="#" onclick="history.go(-1);
return false;" title="Cancel the chart creation process and return to the
previous page" class="chwButton">Cancel</a><a id="chwBackButton" href="#"
onclick="window.wizard.showPrevPage(); return false;" title="Go to previous
wizard page" accesskey="b" class="chwButtonDisabled">Back</a><a
id="chwNextButton" href="#" onclick="window.wizard.showNextPage(); return
false;" title="Go to next wizard page" accesskey="n"
class="chwButtonDisabled">Next</a><a id="chwFinishButton" href="#"
onclick="window.wizard.finish(); return false;" title="Done!"
class="chwButtonDisabled">Finish</a></td>
- </tr>
- </tbody>
- </table>
-</div>
-</form>
-#template("chw/colorpicker.vm")
-</body>
-</html>
\ No newline at end of file
Copied: xwiki-platform/web/trunk/standard/src/main/webapp/templates/chwmain.vm
(from rev 7668,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/chwmain.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/chwmain.vm
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/chwmain.vm
2008-02-13 18:39:24 UTC (rev 7669)
@@ -0,0 +1,47 @@
+#template("xwikivars.vm")
+<?xml version="1.0" encoding="$xwiki.encoding" ?>
+<!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>Creating new chart</title>
+<meta http-equiv="Content-Type" content="text/xhtml+xml;
charset=$xwiki.encoding" />
+<meta http-equiv="imagetoolbar" content="no"/>
+$!xwiki.getWebPreference("meta")
+<link href="$xwiki.getSkinFile("chwSkin.css")" rel="stylesheet"
type="text/css"/>
+#template("stylesheets.vm")
+<script type="text/javascript"
src="$xwiki.getSkinFile("chwScripts.js")"></script>
+</head>
+<body onload='window.wizard.initialize("$xwiki.getSkinFile("")",
"$msg.get("chwshow")", "$msg.get("chwhide")");'>
+#template("header.vm")
+<form id="chwForm" action="$doc.getURL("createchart")" method="post"
onsubmit="alert('submit');">
+<div id="chartWizard">
+ <table id="chwWizard" summary="Chart Wizard Content">
+ <tbody>
+ <tr>
+ <td colspan="2" id="chwNavigation">
+#template("chw/navigationimages.vm")
+ </td>
+ </tr>
+ <tr>
+ <td id="chwPreview">
+ <img id="chwPreviewImg"
src="$xwiki.getSkinFile("chwSampleBarChart.png")" alt="Chart Type: Bars"
title="Chart Type: Bars"/>
+ </td>
+ <td id="chwOptions">
+#template("chw/datapage.vm")
+#template("chw/typepage.vm")
+#template("chw/titlepage.vm")
+## Not ready for prime time
+## #template("chw/axispage.vm")
+ </td>
+ </tr>
+ <tr>
+ <td id="chwButtons" colspan="2"><a href="#" onclick="history.go(-1);
return false;" title="Cancel the chart creation process and return to the
previous page" class="chwButton">Cancel</a><a id="chwBackButton" href="#"
onclick="window.wizard.showPrevPage(); return false;" title="Go to previous
wizard page" accesskey="b" class="chwButtonDisabled">Back</a><a
id="chwNextButton" href="#" onclick="window.wizard.showNextPage(); return
false;" title="Go to next wizard page" accesskey="n"
class="chwButtonDisabled">Next</a><a id="chwFinishButton" href="#"
onclick="window.wizard.finish(); return false;" title="Done!"
class="chwButtonDisabled">Finish</a></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+</form>
+#template("chw/colorpicker.vm")
+</body>
+</html>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
