urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ikiwiki/templates/editpage.tmpl

91 lines
2.3 KiB
Cheetah
Raw Normal View History

first cut at svn merge and conflict
2006-03-19 20:09:57 +01:00
<TMPL_IF NAME="PAGE_CONFLICT">
<p>
typos
2006-11-15 21:49:10 +01:00
<b>Your changes conflict with other changes made to the page.</b>
conflict detection, merging, etc should be done now, I think
2006-03-19 21:34:59 +01:00
</p>
<p>
first cut at svn merge and conflict
2006-03-19 20:09:57 +01:00
Conflict markers have been inserted into the page content. Reconcile the
typos
2006-11-15 21:49:10 +01:00
conflict and commit again to save your changes.
first cut at svn merge and conflict
2006-03-19 20:09:57 +01:00
</p>
</TMPL_IF>
* Many changes to make ikiwiki very resistant to write failures including out of disk space situations. ikiwiki should never leave truncated files, and if the error occurs during a web-based file edit, the user will be given an opportunity to retry. Inspired by the many ways Moin Moin destroys itself when out of disk. :-) * Fix syslogging of errors.
2007-02-15 03:22:08 +01:00
<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>
* Patch from Ethan to improve behavior if a page is deleted or moved while someone is editing it. * Some cleanup of field setting in the failed edit and conflict handling code.
2007-02-24 01:39:06 +01:00
<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>
* Detect the case of two people independently creating the same page at the same time, and let the second person resolve the conflict.
2007-03-18 00:57:03 +01:00
<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
wording
2007-03-18 00:58:34 +01:00
content you entered previously, to allow you to merge the two
* Detect the case of two people independently creating the same page at the same time, and let the second person resolve the conflict.
2007-03-18 00:57:03 +01:00
together before saving.
</p>
</TMPL_IF>
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_VAR FORM-START>
<TMPL_VAR FIELD-DO>
Fix CSRF attacks against the preferences and edit forms. Closes: #475445 The fix involved embedding the session id in the forms, and not allowing the forms to be submitted if the embedded id does not match the session id. In the case of the preferences form, if the session id is not embedded, then the CGI parameters are cleared. This avoids a secondary attack where the link to the preferences form prefills password or other fields, and the user hits "submit" without noticing these prefilled values. In the case of the editpage form, the anonok plugin can allow anyone to edit, and so I chose not to guard against CSRF attacks against users who are not logged in. Otherwise, it also embeds the session id and checks it. For page editing, I assume that the user will notice if content or commit message is changed because of CGI parameters, and won't blndly hit save page. So I didn't block those CGI paramters. (It's even possible to use those CGI parameters, for good, not for evil, I guess..) The only other CSRF attack I can think of in ikiwiki involves the poll plugin. It's certianly possible to set up a link that causes the user to unknowingly vote in a poll. However, the poll plugin is not intended to be used for things that people would want to attack, since anyone can after all edit the poll page and fill in any values they like. So this "attack" is ignorable.
2008-04-10 22:35:30 +02:00
<TMPL_VAR FIELD-SID>
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_VAR FIELD-FROM>
conflict detection, merging, etc should be done now, I think
2006-03-19 21:34:59 +01:00
<TMPL_VAR FIELD-RCSINFO>
* Patch from Ethan to improve behavior if a page is deleted or moved while someone is editing it. * Some cleanup of field setting in the failed edit and conflict handling code.
2007-02-24 01:39:06 +01:00
<TMPL_VAR FIELD-NEWFILE>
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_IF NAME="PAGE_SELECT">
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
Page location: <TMPL_VAR FIELD-PAGE>
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
Page type: <TMPL_VAR FIELD-TYPE>
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_ELSE>
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
<br />
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_VAR FIELD-PAGE>
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
<TMPL_VAR FIELD-TYPE>
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
</TMPL_IF>
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
<TMPL_VAR FIELD-EDITCONTENT><br />
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_IF NAME="CAN_COMMIT">
html validation fixes: - escape & in urls (also clean up cgi url generation) - since markdown wraps inlined pages in <p></p>, close and re-open the paragraph tags when generating the embedded html - added XHTML 1.0 doctypes to templates - fixed <hr /> and <br /> in templates - add an alt attribute to inline images, based on the WikiLink to the image. Allows things like [[my_image|img.png]] to customise alt text.
2006-03-29 05:18:21 +02:00
Optional comment about this change:<br />
<TMPL_VAR FIELD-COMMENTS><br />
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
</TMPL_IF>
* Applied Jeremie Koenig's pluggable editpage buttons patch: - add a title to the editpage form; - pass a reference to the list of buttons to the formbuilder_setup hooks, so we can add ours; - relax asumption about the possible submit values (use "Save Page" explicitly); - de-hardcode the submit buttons from the editpage template (This was needed for compatability with a bug in CGI::FormBuilder 3.0401, but ikiwiki already needs a newer version.) * Pass buttons to all other formbuilder_setup hooks too.
2007-08-17 07:34:59 +02:00
<TMPL_VAR FORM-SUBMIT>
so make sure to let perl know it should be handled as utf8. Also, * Improve layout of edit page so formatting help link is always visible w/o getting in the way of the preview.
2006-07-02 19:44:43 +02:00
<TMPL_VAR HELPONFORMATTINGLINK>
attachments interface visibility toggling
2008-07-02 21:42:32 +02:00
<a class="toggle" href="#attachments">Attachments</a>
add support for an attachment upload field FormBuilder makes it annoyingly hard to move a submit button to a nonstandard place. The button name has to be "_submit" or FormBuilder will ignore it.
2008-07-01 03:15:19 +02:00
<TMPL_IF NAME="FIELD-ATTACHMENT">
attachments interface visibility toggling
2008-07-02 21:42:32 +02:00
<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
<table>
basic attachment list
2008-07-01 23:19:38 +02:00
<tr><td colspan=5><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
<TMPL_LOOP NAME="ATTACHMENT_LIST">
<tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
</TMPL_LOOP>
<TMPL_IF NAME="ATTACHMENT_LIST">
<tr><td colspan=2><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-DELETE><TMPL_VAR FIELD-RENAME></td></tr>
</TMPL_IF>
</tr>
</table>
</div>
add support for an attachment upload field FormBuilder makes it annoyingly hard to move a submit button to a nonstandard place. The button name has to be "_submit" or FormBuilder will ignore it.
2008-07-01 03:15:19 +02:00
</TMPL_IF>
- use templates for signin form, error messages - use FormBuilder for edit page forms (also use template) - print debug to stderr in cgi mode to avoid breaking http headers - fix links to page in parentlinks if $url is unset - reorganise how wikilink is used in templates - only make recentchanes link if svn is enabled - change session id cookie to something we control - add support for logging committer name for web commits from signed in users (untested) - probably more changes I forgot
2006-03-12 17:37:26 +01:00
<TMPL_VAR FORM-END>
* Wrap the editpage template in the standard misctemplate, this allows the pagetemplate hook to work for that page. * Above change fixes the favicon plugin to work on edit pages.
2007-07-16 07:24:31 +02:00
link to helponformatting from the edit page
2006-03-19 22:31:11 +01:00
<TMPL_IF NAME="PAGE_PREVIEW">
so make sure to let perl know it should be handled as utf8. Also, * Improve layout of edit page so formatting help link is always visible w/o getting in the way of the preview.
2006-07-02 19:44:43 +02:00
<hr />
header can appear more than one time, so is a class, not an id
2006-05-26 03:42:00 +02:00
<div class="header">
* The page name and parent links has switched from using a <h1> to a styled <span>, so pages can use <h1> internally instead of needing to use <h2>. * Updated all of ikiwiki's own wiki pages for that. * Add pagetemplate hook, which can be used by plugins that want to mess around with adding new stuff to the page template. * Remove headercontent; the search plugin now adds the search box to the header by registering a pagetemplate hook, and other plugins should do similarly.
2006-05-26 03:10:58 +02:00
<span>Page preview:</span>
css support
2006-03-29 09:24:03 +02:00
</div>
* Wrap the editpage template in the standard misctemplate, this allows the pagetemplate hook to work for that page. * Above change fixes the favicon plugin to work on edit pages.
2007-07-16 07:24:31 +02:00
<div id="preview">
dd page preview
2006-03-16 22:39:45 +01:00
<TMPL_VAR PAGE_PREVIEW>
css support
2006-03-29 09:24:03 +02:00
</div>
dd page preview
2006-03-16 22:39:45 +01:00
</TMPL_IF>
attachments interface visibility toggling
2008-07-02 21:42:32 +02:00
<TMPL_VAR JAVASCRIPT>