[D-community-commits] r145 - in trunk/fai-config-dir/files/usr/share/ikiwiki/templates: . editpage.tmpl
h01ger-guest at alioth.debian.org
h01ger-guest at alioth.debian.org
Sat Jun 30 21:44:53 UTC 2007
Author: h01ger-guest
Date: 2007-06-30 21:44:53 +0000 (Sat, 30 Jun 2007)
New Revision: 145
Added:
trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/
trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER
Removed:
trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER
trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tpml/
Log:
/srv or /svr
Copied: trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl (from rev 140, trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tpml)
Deleted: trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER
===================================================================
--- trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tpml/WEBSERVER 2007-06-30 20:24:08 UTC (rev 140)
+++ trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER 2007-06-30 21:44:53 UTC (rev 145)
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<base href="<TMPL_VAR BASEURL>" />
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><TMPL_VAR FORM-TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
-<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
-</TMPL_IF>
-</head>
-<body>
-<TMPL_IF NAME="PAGE_CONFLICT">
-<p>
-<b>Your changes conflict with other changes made to the page.</b>
-</p>
-<p>
-Conflict markers have been inserted into the page content. Reconcile the
-conflict and commit again to save your changes.
-</p>
-</TMPL_IF>
-<TMPL_IF NAME="FAILED_SAVE">
-<p>
-<b>Failed to save your changes.</b>
-</p>
-<p>
-Your changes were not able to be saved to disk. The system gave the error:
-<blockquote>
-<TMPL_VAR ERROR_MESSAGE>
-</blockquote>
-Your changes are preserved below, and you can try again to save them.
-</p>
-</TMPL_IF>
-<TMPL_IF NAME="PAGE_GONE">
-<p>
-<b>The page you were editing has disappeared.</b>
-</p>
-<p>
-Perhaps someone else has deleted it or moved it. If you want to recreate
-this page with your text, click "Save Page" again.
-</p>
-</TMPL_IF>
-<TMPL_IF NAME="CREATION_CONFLICT">
-<p>
-<b>While you were creating this page, someone else independently created a page
-with the same name.</b>
-</p>
-<p>
-The edit box below contains the page's current content, followed by the
-content you entered previously, to allow you to merge the two
-together before saving.
-</p>
-</TMPL_IF>
-<TMPL_VAR FORM-START>
-<div class="header">
-<span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>
-</div>
-<TMPL_VAR FIELD-DO>
-<TMPL_VAR FIELD-FROM>
-<TMPL_VAR FIELD-RCSINFO>
-<TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
-<TMPL_ELSE>
-<br />
-<TMPL_VAR FIELD-PAGE>
-<TMPL_VAR FIELD-TYPE>
-</TMPL_IF>
-<TMPL_VAR FIELD-EDITCONTENT><br />
-<TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:<br />
-<TMPL_VAR FIELD-COMMENTS><br />
-</TMPL_IF>
-<input id="_submit" name="_submit" type="submit" value="Save Page" /><input id="_submit_2" name="_submit" type="submit" value="Preview" /><input id="_submit_3" name="_submit" type="submit" value="Cancel" />
-<TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_VAR FORM-END>
-<TMPL_IF NAME="PAGE_PREVIEW">
-<hr />
-<div class="header">
-<span>Page preview:</span>
-</div>
-<div id="content">
-<TMPL_VAR PAGE_PREVIEW>
-</div>
-</TMPL_IF>
-<div id="footer">
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
-</div>
-</body>
-</html>
Copied: trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER (from rev 144, trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tpml/WEBSERVER)
===================================================================
--- trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER (rev 0)
+++ trunk/fai-config-dir/files/usr/share/ikiwiki/templates/editpage.tmpl/WEBSERVER 2007-06-30 21:44:53 UTC (rev 145)
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<base href="<TMPL_VAR BASEURL>" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title><TMPL_VAR FORM-TITLE></title>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<TMPL_IF NAME="FAVICON">
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+</TMPL_IF>
+</head>
+<body>
+<TMPL_IF NAME="PAGE_CONFLICT">
+<p>
+<b>Your changes conflict with other changes made to the page.</b>
+</p>
+<p>
+Conflict markers have been inserted into the page content. Reconcile the
+conflict and commit again to save your changes.
+</p>
+</TMPL_IF>
+<TMPL_IF NAME="FAILED_SAVE">
+<p>
+<b>Failed to save your changes.</b>
+</p>
+<p>
+Your changes were not able to be saved to disk. The system gave the error:
+<blockquote>
+<TMPL_VAR ERROR_MESSAGE>
+</blockquote>
+Your changes are preserved below, and you can try again to save them.
+</p>
+</TMPL_IF>
+<TMPL_IF NAME="PAGE_GONE">
+<p>
+<b>The page you were editing has disappeared.</b>
+</p>
+<p>
+Perhaps someone else has deleted it or moved it. If you want to recreate
+this page with your text, click "Save Page" again.
+</p>
+</TMPL_IF>
+<TMPL_IF NAME="CREATION_CONFLICT">
+<p>
+<b>While you were creating this page, someone else independently created a page
+with the same name.</b>
+</p>
+<p>
+The edit box below contains the page's current content, followed by the
+content you entered previously, to allow you to merge the two
+together before saving.
+</p>
+</TMPL_IF>
+<TMPL_VAR FORM-START>
+<div class="header">
+<span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>
+</div>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-FROM>
+<TMPL_VAR FIELD-RCSINFO>
+<TMPL_VAR FIELD-NEWFILE>
+<TMPL_IF NAME="PAGE_SELECT">
+Page location: <TMPL_VAR FIELD-PAGE>
+Page type: <TMPL_VAR FIELD-TYPE>
+<TMPL_ELSE>
+<br />
+<TMPL_VAR FIELD-PAGE>
+<TMPL_VAR FIELD-TYPE>
+</TMPL_IF>
+<TMPL_VAR FIELD-EDITCONTENT><br />
+<TMPL_IF NAME="CAN_COMMIT">
+Optional comment about this change:<br />
+<TMPL_VAR FIELD-COMMENTS><br />
+</TMPL_IF>
+<p>I am the author of the changes I'm committing and I am releasing the content under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License v2++</a>. I assign the copyright to The Debian-Community.org Team.</b></p>
+<input id="_submit" name="_submit" type="submit" value="Save Page" /><input id="_submit_2" name="_submit" type="submit" value="Preview" /><input id="_submit_3" name="_submit" type="submit" value="Cancel" />
+<TMPL_VAR HELPONFORMATTINGLINK>
+<TMPL_VAR FORM-END>
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Page preview:</span>
+</div>
+<div id="content">
+<TMPL_VAR PAGE_PREVIEW>
+</div>
+</TMPL_IF>
+<div id="footer">
+<!-- from <TMPL_VAR NAME=WIKINAME> -->
+</div>
+</body>
+</html>
More information about the D-community-commits
mailing list