Menu
▾
▴
[Plone-cvs] CMFPlone/skins/plone_content document_edit_form.cpt,1.2.2.8,1.2.2.9 event_edit_form.cpt,1.2.2.10,1.2.2.11 file_edit_form.cpt,1.2.2.9,1.2.2.10 folder_edit_form.cpt,1.2.2.11,1.2.2.12 image_edit_form.cpt,1.2.2.6,1.2.2.7 link_edit_form.cpt,1.3.2.6,1.3.2.7 newsitem_edit_form.cpt,1.2.2.7,1.2.2.8
|
From: Sidnei da S. <dre...@us...> - 2003-12-30 18:16:58
|
Update of /cvsroot/plone/CMFPlone/skins/plone_content
In directory sc8-pr-cvs1:/tmp/cvs-serv22236/skins/plone_content
Modified Files:
Tag: Plone-2_0-branch
document_edit_form.cpt event_edit_form.cpt file_edit_form.cpt
folder_edit_form.cpt image_edit_form.cpt link_edit_form.cpt
newsitem_edit_form.cpt
Log Message:
Some rewrapping and whitespace cleaning. Added missing 'rows' and 'cols' attributes to description widget of document_edit_form
Index: file_edit_form.cpt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_content/file_edit_form.cpt,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -d -r1.2.2.9 -r1.2.2.10
--- file_edit_form.cpt 22 Dec 2003 16:33:08 -0000 1.2.2.9
+++ file_edit_form.cpt 30 Dec 2003 18:16:52 -0000 1.2.2.10
@@ -1,199 +1,200 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"
metal:use-macro="here/main_template/macros/master"
i18n:domain="plone">
-<body>
-<div metal:fill-slot="main"
- tal:define="errors options/state/getErrors">
+ <body>
- <h1 i18n:translate="heading_edit_item">
- Edit
- <span i18n:name="itemtype">
- <span i18n:translate=""
- tal:content="python:here.getTypeInfo().Title()"
- tal:omit-tag="">Item type</span>
- </span>
- </h1>
-
- <p i18n:translate="description_edit_file">
- Add the relevant details of the file to be added in the form below,
- select the file with the 'Browse' button, and press 'Save'.
- </p>
+ <div metal:fill-slot="main"
+ tal:define="errors options/state/getErrors">
- <form name="edit_form"
- action="."
- method="post"
- enctype="multipart/form-data"
- tal:attributes="action string:${here/getId}/${template/getId}" >
-
- <fieldset>
-
- <legend i18n:translate="legend_file_details">File Details</legend>
-
- <div class="field"
- tal:condition="python:member.getProperty('visible_ids', None)"
- tal:define="error errors/id | nothing;
- id python:request.get('id', test(here.show_id(),here.getId(),''));"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="id" i18n:translate="label_short_name">Short Name</label>
+ <h1 i18n:translate="heading_edit_item">
+ Edit
+ <span i18n:name="itemtype">
+ <span i18n:translate=""
+ tal:content="python:here.getTypeInfo().Title()"
+ tal:omit-tag="">Item type</span>
+ </span>
+ </h1>
- <div class="formHelp" i18n:translate="help_shortname">
- Should not contain spaces, underscores or mixed case.
- Short Name is part of the file's web address.
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="id"
- name="id"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value id;
- tabindex tabindex/next;"
- />
-
- </div>
+ <p i18n:translate="description_edit_file">
+ Add the relevant details of the file to be added in the form below,
+ select the file with the 'Browse' button, and press 'Save'.
+ </p>
- <input type="hidden"
- name="id"
- tal:condition="python:not member.getProperty('visible_ids', '')"
- tal:attributes="value python:request.get('id', here.getId())"
- />
-
- <div class="field"
- tal:define="error errors/title|nothing;
- Title request/title | here/Title;"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="title" i18n:translate="label_title">Title</label>
-
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="title"
- name="title"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value Title;
- tabindex tabindex/next;"
- />
-
- </div>
-
- <div class="field"
- tal:define="description request/description | here/Description ">
+ <form name="edit_form"
+ action="."
+ method="post"
+ enctype="multipart/form-data"
+ tal:attributes="action string:${here/getId}/${template/getId}" >
- <label for="description" i18n:translate="label_description">Description</label>
-
- <div class="formHelp" i18n:translate="help_description">
- A brief description of the file.
- </div>
+ <fieldset>
- <textarea cols="80"
- rows="5"
- tabindex=""
- id="description"
- name="description"
- tal:content="description"
- tal:attributes="tabindex tabindex/next;"
- >
- Description
- </textarea>
- </div>
-
- <div class="field"
- tal:define="error errors/file|nothing;
- file request/file|here/file|nothing;"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="file" i18n:translate="label_file">File</label>
+ <legend i18n:translate="legend_file_details">File Details</legend>
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
+ <div class="field"
+ tal:condition="python:member.getProperty('visible_ids', None)"
+ tal:define="error errors/id | nothing;
+ id python:request.get('id', test(here.show_id(),here.getId(),''));"
+ tal:attributes="class python:test(error, 'field error', 'field')">
- <div class="formHelp" i18n:translate="help_file">
- Select the file to be added by clicking the 'Browse' button.
- </div>
+ <label for="id" i18n:translate="label_short_name">Short Name</label>
- <div tal:content="error">Validation error output</div>
+ <div class="formHelp" i18n:translate="help_shortname">
+ Should not contain spaces, underscores or mixed case.
+ Short Name is part of the file's web address.
+ </div>
-
- <input type="file"
- id="file"
- name="file"
- size="30"
- tabindex=""
- tal:attributes="tabindex tabindex/next"
- />
+ <div tal:content="error">Validation error output</div>
- <br />
+ <input type="text"
+ id="id"
+ name="id"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value id;
+ tabindex tabindex/next;"
+ />
- <span i18n:translate="no_file_uploaded"
- tal:define="file_size python:here.getObjSize(here)"
- tal:condition="not: file_size">
- (No file has been uploaded yet)
- </span>
- </div>
-
- <div class="field"
- tal:define="content_type python:here.content_type;
- content_type python:test(content_type==None,'',content_type);"
- tal:condition="python:test(content_type.find('text')>-1 and here.data, 1,0)">
-
+ </div>
- <label for="file_data" i18n:translate="label_edit_contents">Edit Contents</label>
+ <input type="hidden"
+ name="id"
+ tal:condition="python:not member.getProperty('visible_ids', '')"
+ tal:attributes="value python:request.get('id', here.getId())"
+ />
- <div class="formHelp" i18n:translate="help_edit_contents">
- This file is a text file, and you can edit its
- contents directly.
- </div>
-
- <textarea name="file_data:text"
- id="file_data"
- cols="80"
- rows="20"
- tabindex=""
- tal:content="here/data"
- tal:attributes="tabindex tabindex/next"></textarea>
- </div>
-
- <div class="formControls"
- tal:define="process_creation request/process_creation|nothing;">
-
- <input class="context"
- type="submit"
- tabindex=""
- name="form.button.Save"
- value="Save"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next"
- />
- <input class="context"
- type="submit"
- tabindex=""
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next"
- />
- </div>
-
- <input type="hidden" name="form.submitted" value="1" />
+ <div class="field"
+ tal:define="error errors/title|nothing;
+ Title request/title | here/Title;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
- </fieldset>
+ <label for="title" i18n:translate="label_title">Title</label>
- </form>
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
-</div>
-
-</body>
+ <div tal:content="error">Validation error output</div>
+
+ <input type="text"
+ id="title"
+ name="title"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value Title;
+ tabindex tabindex/next;"
+ />
+
+ </div>
+
+ <div class="field"
+ tal:define="description request/description | here/Description ">
+
+ <label for="description" i18n:translate="label_description">Description</label>
+
+ <div class="formHelp" i18n:translate="help_description">
+ A brief description of the file.
+ </div>
+
+ <textarea cols="80"
+ rows="5"
+ tabindex=""
+ id="description"
+ name="description"
+ tal:content="description"
+ tal:attributes="tabindex tabindex/next;"
+ >
+ Description
+ </textarea>
+ </div>
+
+ <div class="field"
+ tal:define="error errors/file|nothing;
+ file request/file|here/file|nothing;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label for="file" i18n:translate="label_file">File</label>
+
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
+
+ <div class="formHelp" i18n:translate="help_file">
+ Select the file to be added by clicking the 'Browse' button.
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+
+ <input type="file"
+ id="file"
+ name="file"
+ size="30"
+ tabindex=""
+ tal:attributes="tabindex tabindex/next"
+ />
+
+ <br />
+
+ <span i18n:translate="no_file_uploaded"
+ tal:define="file_size python:here.getObjSize(here)"
+ tal:condition="not: file_size">
+ (No file has been uploaded yet)
+ </span>
+ </div>
+
+ <div class="field"
+ tal:define="content_type python:here.content_type;
+ content_type python:test(content_type==None,'',content_type);"
+ tal:condition="python:test(content_type.find('text')>-1 and here.data, 1,0)">
+
+
+ <label for="file_data" i18n:translate="label_edit_contents">Edit Contents</label>
+
+ <div class="formHelp" i18n:translate="help_edit_contents">
+ This file is a text file, and you can edit its
+ contents directly.
+ </div>
+
+ <textarea name="file_data:text"
+ id="file_data"
+ cols="80"
+ rows="20"
+ tabindex=""
+ tal:content="here/data"
+ tal:attributes="tabindex tabindex/next"></textarea>
+ </div>
+
+ <div class="formControls"
+ tal:define="process_creation request/process_creation|nothing;">
+
+ <input class="context"
+ type="submit"
+ tabindex=""
+ name="form.button.Save"
+ value="Save"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next"
+ />
+ <input class="context"
+ type="submit"
+ tabindex=""
+ name="form.button.Cancel"
+ value="Cancel"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next"
+ />
+ </div>
+
+ <input type="hidden" name="form.submitted" value="1" />
+
+ </fieldset>
+
+ </form>
+
+ </div>
+
+ </body>
</html>
Index: document_edit_form.cpt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_content/document_edit_form.cpt,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -d -r1.2.2.8 -r1.2.2.9
--- document_edit_form.cpt 22 Dec 2003 16:54:52 -0000 1.2.2.8
+++ document_edit_form.cpt 30 Dec 2003 18:16:52 -0000 1.2.2.9
@@ -3,183 +3,185 @@
metal:use-macro="here/main_template/macros/master"
i18n:domain="plone">
-<body>
+ <body>
-<div metal:fill-slot="main"
- tal:define="errors options/state/getErrors;
- editor python:member.getProperty('wysiwyg_editor','None');
- wysiwyg python:test(editor and editor!='None', editor, 'None');">
+ <div metal:fill-slot="main"
+ tal:define="errors options/state/getErrors;
+ editor python:member.getProperty('wysiwyg_editor','None');
+ wysiwyg python:test(editor and editor!='None', editor, 'None');">
- <h1 i18n:translate="heading_edit_item">
- Edit
- <span i18n:name="itemtype">
- <span i18n:translate=""
- tal:content="python:here.getTypeInfo().Title()"
- tal:omit-tag="">Item type</span>
- </span>
- </h1>
-
- <p i18n:translate="description_edit_document">
- Fill in the details of this document.
- </p>
+ <h1 i18n:translate="heading_edit_item">
+ Edit
+ <span i18n:name="itemtype">
+ <span i18n:translate=""
+ tal:content="python:here.getTypeInfo().Title()"
+ tal:omit-tag="">Item type</span>
+ </span>
+ </h1>
- <form name="edit_form"
- action="."
- method="post"
- enctype="multipart/form-data"
- tal:attributes="action string:${here/getId}/${template/getId}" >
-
- <fieldset>
-
- <legend i18n:translate="legend_document_details">Document Details</legend>
-
- <div class="field"
- tal:condition="python:member.getProperty('visible_ids', None)"
- tal:define="error errors/id | nothing;
- id python:request.get('id', test(here.show_id(),here.getId(),''));"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="id" i18n:translate="label_short_name">Short Name</label>
+ <p i18n:translate="description_edit_document">
+ Fill in the details of this document.
+ </p>
- <div class="formHelp" i18n:translate="help_shortname">
- Should not contain spaces, underscores or mixed case.
- Short Name is part of the document's web address.
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="id"
- name="id"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value id;
- tabindex tabindex/next;"
- />
-
- </div>
+ <form name="edit_form"
+ action="."
+ method="post"
+ enctype="multipart/form-data"
+ tal:attributes="action string:${here/getId}/${template/getId}" >
- <input type="hidden"
- name="id"
- tal:condition="python:not member.getProperty('visible_ids', '')"
- tal:attributes="value python:request.get('id', here.getId())"
- />
-
- <div class="field"
- tal:define="error errors/title|nothing;
- Title request/title | here/Title;"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="title" i18n:translate="label_title">Title</label>
-
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="title"
- name="title"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value Title;
- tabindex tabindex/next;"
- />
-
- </div>
-
- <div class="field"
- tal:define="description request/description | here/Description ">
+ <fieldset>
- <label for="description" i18n:translate="label_description">Description</label>
-
- <div class="formHelp" i18n:translate="help_description">
- A brief description of the document.
- </div>
+ <legend i18n:translate="legend_document_details">Document Details</legend>
- <textarea tabindex=""
- name="description"
- id="description"
- tal:content="description"
- tal:attributes="tabindex tabindex/next;"
- >
- Description
- </textarea>
- </div>
-
- <div class="field"
- tal:define="text python:request.get('text', getattr(here,'text',''));
- cooked_text python:request.get('text',getattr(here,'cooked_text',''))">
-
- <label for="text" i18n:translate="label_body_text">Body text</label>
-
- <tal:editor define="inputname string:text;
- formname string:edit_form;
- inputvalue text;
- cooked_inputvalue cooked_text;
- tabindex tabindex/next;">
- <div metal:use-macro="here/wysiwyg_support/macros/wysiwygEditorBox">
- The WYSIWYG code
- </div>
- </tal:editor>
-
- <div metal:use-macro="here/wysiwyg_support/macros/textFormatSelector">
- Format box, if needed
- </div>
-
- </div>
-
- <div class="field"
- tal:define="error errors/file|nothing;"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="file" i18n:translate="label_upload_contents_optional">Upload contents (optional)</label>
-
- <div class="formHelp" i18n:translate="help_uploads">
- Uploaded files will replace the body text entered above.
- </div>
+ <div class="field"
+ tal:condition="python:member.getProperty('visible_ids', None)"
+ tal:define="error errors/id | nothing;
+ id python:request.get('id', test(here.show_id(),here.getId(),''));"
+ tal:attributes="class python:test(error, 'field error', 'field')">
- <div tal:content="error">Validation error output</div>
-
- <input type="file"
- id="file"
- name="file"
- size="30"
- tabindex=""
- value=""
- tal:attributes="tabindex tabindex/next"
- />
- </div>
-
-
- <div class="formControls"
- tal:define="process_creation request/process_creation|nothing;">
- <input class="context"
- tabindex=""
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next;" />
-
- <input class="standalone"
- tabindex=""
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next;" />
- </div>
- </fieldset>
-
- <input type="hidden" name="form.submitted" value="1" />
+ <label for="id" i18n:translate="label_short_name">Short Name</label>
- </form>
+ <div class="formHelp" i18n:translate="help_shortname">
+ Should not contain spaces, underscores or mixed case.
+ Short Name is part of the document's web address.
+ </div>
-</div>
+ <div tal:content="error">Validation error output</div>
-</body>
+ <input type="text"
+ id="id"
+ name="id"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value id;
+ tabindex tabindex/next;"
+ />
+
+ </div>
+
+ <input type="hidden"
+ name="id"
+ tal:condition="python:not member.getProperty('visible_ids', '')"
+ tal:attributes="value python:request.get('id', here.getId())"
+ />
+
+ <div class="field"
+ tal:define="error errors/title|nothing;
+ Title request/title | here/Title;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label for="title" i18n:translate="label_title">Title</label>
+
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
+
+ <div tal:content="error">Validation error output</div>
+
+ <input type="text"
+ id="title"
+ name="title"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value Title;
+ tabindex tabindex/next;"
+ />
+
+ </div>
+
+ <div class="field"
+ tal:define="description request/description | here/Description ">
+
+ <label for="description" i18n:translate="label_description">Description</label>
+
+ <div class="formHelp" i18n:translate="help_description">
+ A brief description of the document.
+ </div>
+
+ <textarea cols="80"
+ rows="5"
+ tabindex=""
+ id="description"
+ name="description"
+ tal:content="description"
+ tal:attributes="tabindex tabindex/next;"
+ >
+ Description
+ </textarea>
+ </div>
+
+ <div class="field"
+ tal:define="text python:request.get('text', getattr(here,'text',''));
+ cooked_text python:request.get('text',getattr(here,'cooked_text',''))">
+
+ <label for="text" i18n:translate="label_body_text">Body text</label>
+
+ <tal:editor define="inputname string:text;
+ formname string:edit_form;
+ inputvalue text;
+ cooked_inputvalue cooked_text;
+ tabindex tabindex/next;">
+ <div metal:use-macro="here/wysiwyg_support/macros/wysiwygEditorBox">
+ The WYSIWYG code
+ </div>
+ </tal:editor>
+
+ <div metal:use-macro="here/wysiwyg_support/macros/textFormatSelector">
+ Format box, if needed
+ </div>
+
+ </div>
+
+ <div class="field"
+ tal:define="error errors/file|nothing;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label for="file" i18n:translate="label_upload_contents_optional">Upload contents (optional)</label>
+
+ <div class="formHelp" i18n:translate="help_uploads">
+ Uploaded files will replace the body text entered above.
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+ <input type="file"
+ id="file"
+ name="file"
+ size="30"
+ tabindex=""
+ value=""
+ tal:attributes="tabindex tabindex/next"
+ />
+ </div>
+
+
+ <div class="formControls"
+ tal:define="process_creation request/process_creation|nothing;">
+ <input class="context"
+ tabindex=""
+ type="submit"
+ name="form.button.Save"
+ value="Save"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next;" />
+
+ <input class="standalone"
+ tabindex=""
+ type="submit"
+ name="form.button.Cancel"
+ value="Cancel"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next;" />
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="form.submitted" value="1" />
+
+ </form>
+
+ </div>
+
+ </body>
</html>
Index: event_edit_form.cpt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_content/event_edit_form.cpt,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -u -d -r1.2.2.10 -r1.2.2.11
--- event_edit_form.cpt 22 Dec 2003 16:31:52 -0000 1.2.2.10
+++ event_edit_form.cpt 30 Dec 2003 18:16:52 -0000 1.2.2.11
@@ -2,321 +2,321 @@
lang="en-US"
metal:use-macro="here/main_template/macros/master"
i18n:domain="plone">
-
-<body>
-<div metal:fill-slot="main"
- tal:define="errors options/state/getErrors">
+ <body>
- <h1 i18n:translate="heading_edit_item">
- Edit
- <span i18n:name="itemtype">
- <span i18n:translate=""
- tal:content="python:here.getTypeInfo().Title()"
- tal:omit-tag="">Item type</span>
- </span>
- </h1>
-
- <p i18n:translate="description_edit_event">
- Fill in the details of the event you want to add.
- </p>
+ <div metal:fill-slot="main"
+ tal:define="errors options/state/getErrors">
-
- <form name="edit_form"
- action="."
- method="post"
- enctype="multipart/form-data"
- tal:attributes="action string:${here/getId}/${template/getId}" >
-
- <fieldset>
-
- <legend i18n:translate="legend_event_details">Event Details</legend>
-
- <div class="field"
- tal:condition="python:member.getProperty('visible_ids', None)"
- tal:define="error errors/id | nothing;
- id python:request.get('id', test(here.show_id(),here.getId(),''));"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="id" i18n:translate="label_short_name">Short Name</label>
+ <h1 i18n:translate="heading_edit_item">
+ Edit
+ <span i18n:name="itemtype">
+ <span i18n:translate=""
+ tal:content="python:here.getTypeInfo().Title()"
+ tal:omit-tag="">Item type</span>
+ </span>
+ </h1>
- <div class="formHelp" i18n:translate="help_shortname">
- Should not contain spaces, underscores or mixed case.
- Short Name is part of the event's web address.
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="id"
- name="id"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value id;
- tabindex tabindex/next;"
- />
-
- </div>
+ <p i18n:translate="description_edit_event">
+ Fill in the details of the event you want to add.
+ </p>
- <input type="hidden"
- name="id"
- tal:condition="python:not member.getProperty('visible_ids', '')"
- tal:attributes="value python:request.get('id', here.getId())"
- />
-
- <div class="field"
- tal:define="error errors/title|nothing;
- Title request/title | here/Title;"
- tal:attributes="class python:test(error, 'field error', 'field')">
- <label for="title" i18n:translate="label_title">Title</label>
-
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="title"
- name="title"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value Title;
- tabindex tabindex/next;"
- />
-
- </div>
-
+ <form name="edit_form"
+ action="."
+ method="post"
+ enctype="multipart/form-data"
+ tal:attributes="action string:${here/getId}/${template/getId}" >
- <div class="field">
- <label for="location" i18n:translate="label_event_location">Event Location</label>
+ <fieldset>
- <div class="formHelp" i18n:translate="help_event_location">
- Enter the location where the event will take place.
- </div>
-
- <input type="text"
- id="location"
- name="location"
- size="25"
- value="location"
- tabindex=""
- tal:attributes="value python: request.get('location',getattr(here,'location',''));
- tabindex tabindex/next"
- />
- </div>
-
- <div class="field">
- <label for="event_type" i18n:translate="label_event_type">Event Type</label>
+ <legend i18n:translate="legend_event_details">Event Details</legend>
- <div class="formHelp" i18n:translate="help_event_type">
- Multiple event types possible by depressing Ctrl (or Apple
- key on Mac).
- </div>
-
- <select name="event_type:list"
- id="event_type"
- multiple="multiple"
- tabindex=""
- size="6"
- tal:attributes="tabindex tabindex/next;"
- tal:define="contentSubject request/event_type | here/Subject;
- allowedSubjects python:here.portal_metadata.listAllowedSubjects(here)">
-
- <option tal:replace="nothing">Event Type 1</option>
- <option tal:replace="nothing">Event Type 2</option>
- <option tal:replace="nothing">...</option>
- <option value="subj"
- tal:repeat="subj allowedSubjects"
- tal:attributes="value subj; selected python:subj in contentSubject and 1 or 0"
- tal:content="subj">Event Type N</option>
- </select>
- </div>
-
- <div class="field"
- tal:define="description request/description | here/Description ">
+ <div class="field"
+ tal:condition="python:member.getProperty('visible_ids', None)"
+ tal:define="error errors/id | nothing;
+ id python:request.get('id', test(here.show_id(),here.getId(),''));"
+ tal:attributes="class python:test(error, 'field error', 'field')">
- <label for="description" i18n:translate="label_description">Description</label>
-
- <div class="formHelp" i18n:translate="help_description">
- A brief description of the item.
- </div>
+ <label for="id" i18n:translate="label_short_name">Short Name</label>
- <textarea cols="80"
- rows="5"
- tabindex=""
- id="description"
- name="description"
- tal:content="description"
- tal:attributes="tabindex tabindex/next;"
- >
- Description
- </textarea>
- </div>
+ <div class="formHelp" i18n:translate="help_shortname">
+ Should not contain spaces, underscores or mixed case.
+ Short Name is part of the event's web address.
+ </div>
- <div class="field">
- <label for="event_url" i18n:translate="label_event_url">Event URL</label>
-
- <div class="formHelp" i18n:translate="help_event_url">
- Optional web address of a page containing more info about
- the event.
- </div>
+ <div tal:content="error">Validation error output</div>
- <input type="text"
- id="event_url"
- name="event_url"
- size="25"
- value="event_url"
- tabindex=""
- tal:attributes="value python:request.get('event_url',getattr(here,'event_url',''));
- tabindex tabindex/next"
- />
- </div>
+ <input type="text"
+ id="id"
+ name="id"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value id;
+ tabindex tabindex/next;"
+ />
- <div class="field"
- tal:define="here_start here/start|nothing;
- start_date python:request.get('start_date', here_start);
- error errors/start_date | nothing;"
- tal:attributes="class python:test(error, 'field error', 'field')">
+ </div>
- <label for="start_date" i18n:translate="label_event_start">Event Starts</label>
+ <input type="hidden"
+ name="id"
+ tal:condition="python:not member.getProperty('visible_ids', '')"
+ tal:attributes="value python:request.get('id', here.getId())"
+ />
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
+ <div class="field"
+ tal:define="error errors/title|nothing;
+ Title request/title | here/Title;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
- <div class="formHelp" i18n:translate="help_event_start">
- Click the calendar icon to select a date or browse the calendar.
- </div>
+ <label for="title" i18n:translate="label_title">Title</label>
- <div tal:content="error">Validation error output</div>
-
- <div tal:define="inputname string:start_date;
- formname string:edit_form;
- inputvalue start_date;
- tabindex tabindex/next;">
- <div metal:use-macro="here/calendar_slot/macros/calendarDatePickerBox">
- Get date selectors.
- </div>
- </div>
- </div>
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
- <div class="field"
- tal:define="here_end here/end|nothing;
- end_date python:request.get('end_date', here_end);
- error errors/end_date | nothing;"
- tal:attributes="class python:test(error, 'field error', 'field')">
+ <div tal:content="error">Validation error output</div>
- <label for="end_date" i18n:translate="label_event_end">Event Ends</label>
-
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
-
- <div class="formHelp" i18n:translate="help_event_end">
- Click the calendar icon to select a date or browse the calendar.
- </div>
+ <input type="text"
+ id="title"
+ name="title"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value Title;
+ tabindex tabindex/next;"
+ />
- <div tal:content="error">Validation error output</div>
+ </div>
- <div tal:define="inputname string:end_date;
- formname string:edit_form;
- inputvalue end_date;
- tabindex tabindex/next;">
- <div metal:use-macro="here/calendar_slot/macros/calendarDatePickerBox">
- a calendar, hopefully
- </div>
- </div>
+ <div class="field">
+ <label for="location" i18n:translate="label_event_location">Event Location</label>
- </div>
+ <div class="formHelp" i18n:translate="help_event_location">
+ Enter the location where the event will take place.
+ </div>
- <div class="field">
- <label for="contact_name" i18n:translate="label_contact_name">Contact Name</label>
-
- <div class="formHelp" i18n:translate="help_contact_name">
- Contact person or organization for the event.
- </div>
-
- <input type="text"
- id="contact_name"
- name="contact_name"
- size="25"
- value=""
- tabindex=""
- tal:attributes="value python:request.get('contact_name',getattr(here,'contact_name',''));
- tabindex tabindex/next"
- />
- </div>
+ <input type="text"
+ id="location"
+ name="location"
+ size="25"
+ value="location"
+ tabindex=""
+ tal:attributes="value python: request.get('location',getattr(here,'location',''));
+ tabindex tabindex/next"
+ />
+ </div>
- <div class="field">
- <label for="contact_email" i18n:translate="label_contact_email">Contact E-mail</label>
-
- <div class="formHelp" i18n:translate="help_contact_email">
- E-mail address to display for information regarding
- the event.
- </div>
-
- <input type="text"
- id="contact_email"
- name="contact_email"
- size="25"
- value="contact_email"
- tabindex=""
- tal:attributes="value python:request.get('contact_email',getattr(here,'contact_email',''));
- tabindex tabindex/next"
- />
- </div>
+ <div class="field">
+ <label for="event_type" i18n:translate="label_event_type">Event Type</label>
- <div class="field">
- <label for="contact_phone" i18n:translate="label_contact_phone">Contact Phone</label>
-
- <div class="formHelp" i18n:translate="help_contact_phone">
- Phone number to call for information and/or booking.
- </div>
-
- <input type="text"
- id="contact_phone"
- name="contact_phone"
- size="25"
- value="contact_phone"
- tabindex=""
- tal:attributes="value python:request.get('contact_phone',getattr(here,'contact_phone',''));
- tabindex tabindex/next"
- />
- </div>
+ <div class="formHelp" i18n:translate="help_event_type">
+ Multiple event types possible by depressing Ctrl (or Apple
+ key on Mac).
+ </div>
- <div class="formControls"
- tal:define="process_creation request/process_creation|nothing;">
- <input class="context"
- tabindex=""
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next"
- />
- <input class="context"
- tabindex=""
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next"
- />
- </div>
-
- <input type="hidden" name="form.submitted" value="1" />
+ <select name="event_type:list"
+ id="event_type"
+ multiple="multiple"
+ tabindex=""
+ size="6"
+ tal:attributes="tabindex tabindex/next;"
+ tal:define="contentSubject request/event_type | here/Subject;
+ allowedSubjects python:here.portal_metadata.listAllowedSubjects(here)">
- </fieldset>
+ <option tal:replace="nothing">Event Type 1</option>
+ <option tal:replace="nothing">Event Type 2</option>
+ <option tal:replace="nothing">...</option>
+ <option value="subj"
+ tal:repeat="subj allowedSubjects"
+ tal:attributes="value subj; selected python:subj in contentSubject and 1 or 0"
+ tal:content="subj">Event Type N</option>
+ </select>
+ </div>
- </form>
+ <div class="field"
+ tal:define="description request/description | here/Description ">
-</div>
+ <label for="description" i18n:translate="label_description">Description</label>
-</body>
+ <div class="formHelp" i18n:translate="help_description">
+ A brief description of the item.
+ </div>
+
+ <textarea cols="80"
+ rows="5"
+ tabindex=""
+ id="description"
+ name="description"
+ tal:content="description"
+ tal:attributes="tabindex tabindex/next;"
+ >
+ Description
+ </textarea>
+ </div>
+
+ <div class="field">
+ <label for="event_url" i18n:translate="label_event_url">Event URL</label>
+
+ <div class="formHelp" i18n:translate="help_event_url">
+ Optional web address of a page containing more info about
+ the event.
+ </div>
+
+ <input type="text"
+ id="event_url"
+ name="event_url"
+ size="25"
+ value="event_url"
+ tabindex=""
+ tal:attributes="value python:request.get('event_url',getattr(here,'event_url',''));
+ tabindex tabindex/next"
+ />
+ </div>
+
+ <div class="field"
+ tal:define="here_start here/start|nothing;
+ start_date python:request.get('start_date', here_start);
+ error errors/start_date | nothing;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label for="start_date" i18n:translate="label_event_start">Event Starts</label>
+
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
+
+ <div class="formHelp" i18n:translate="help_event_start">
+ Click the calendar icon to select a date or browse the calendar.
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+ <div tal:define="inputname string:start_date;
+ formname string:edit_form;
+ inputvalue start_date;
+ tabindex tabindex/next;">
+ <div metal:use-macro="here/calendar_slot/macros/calendarDatePickerBox">
+ Get date selectors.
+ </div>
+ </div>
+ </div>
+
+ <div class="field"
+ tal:define="here_end here/end|nothing;
+ end_date python:request.get('end_date', here_end);
+ error errors/end_date | nothing;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label for="end_date" i18n:translate="label_event_end">Event Ends</label>
+
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
+
+ <div class="formHelp" i18n:translate="help_event_end">
+ Click the calendar icon to select a date or browse the calendar.
+ </div>
+
+ <div tal:content="error">Validation error output</div>
+
+ <div tal:define="inputname string:end_date;
+ formname string:edit_form;
+ inputvalue end_date;
+ tabindex tabindex/next;">
+
+ <div metal:use-macro="here/calendar_slot/macros/calendarDatePickerBox">
+ a calendar, hopefully
+ </div>
+ </div>
+
+ </div>
+
+ <div class="field">
+ <label for="contact_name" i18n:translate="label_contact_name">Contact Name</label>
+
+ <div class="formHelp" i18n:translate="help_contact_name">
+ Contact person or organization for the event.
+ </div>
+
+ <input type="text"
+ id="contact_name"
+ name="contact_name"
+ size="25"
+ value=""
+ tabindex=""
+ tal:attributes="value python:request.get('contact_name',getattr(here,'contact_name',''));
+ tabindex tabindex/next"
+ />
+ </div>
+
+ <div class="field">
+ <label for="contact_email" i18n:translate="label_contact_email">Contact E-mail</label>
+
+ <div class="formHelp" i18n:translate="help_contact_email">
+ E-mail address to display for information regarding
+ the event.
+ </div>
+
+ <input type="text"
+ id="contact_email"
+ name="contact_email"
+ size="25"
+ value="contact_email"
+ tabindex=""
+ tal:attributes="value python:request.get('contact_email',getattr(here,'contact_email',''));
+ tabindex tabindex/next"
+ />
+ </div>
+
+ <div class="field">
+ <label for="contact_phone" i18n:translate="label_contact_phone">Contact Phone</label>
+
+ <div class="formHelp" i18n:translate="help_contact_phone">
+ Phone number to call for information and/or booking.
+ </div>
+
+ <input type="text"
+ id="contact_phone"
+ name="contact_phone"
+ size="25"
+ value="contact_phone"
+ tabindex=""
+ tal:attributes="value python:request.get('contact_phone',getattr(here,'contact_phone',''));
+ tabindex tabindex/next"
+ />
+ </div>
+
+ <div class="formControls"
+ tal:define="process_creation request/process_creation|nothing;">
+ <input class="context"
+ tabindex=""
+ type="submit"
+ name="form.button.Save"
+ value="Save"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next"
+ />
+ <input class="context"
+ tabindex=""
+ type="submit"
+ name="form.button.Cancel"
+ value="Cancel"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next"
+ />
+ </div>
+
+ <input type="hidden" name="form.submitted" value="1" />
+
+ </fieldset>
+
+ </form>
+
+ </div>
+
+ </body>
</html>
Index: folder_edit_form.cpt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_content/folder_edit_form.cpt,v
retrieving revision 1.2.2.11
retrieving revision 1.2.2.12
diff -u -d -r1.2.2.11 -r1.2.2.12
--- folder_edit_form.cpt 22 Dec 2003 16:35:54 -0000 1.2.2.11
+++ folder_edit_form.cpt 30 Dec 2003 18:16:52 -0000 1.2.2.12
@@ -3,136 +3,136 @@
metal:use-macro="here/main_template/macros/master"
i18n:domain="plone">
-<metal:border fill-slot="head_slot">
+ <metal:border fill-slot="head_slot">
<tal:border define="dummy python:request.set('enable_border',1)" />
-</metal:border>
+ </metal:border>
-<body>
+ <body>
<div metal:fill-slot="main"
- tal:define="errors options/state/getErrors">
-
- <h1 i18n:translate="heading_edit_folder_properties">Edit Folder Properties</h1>
+ tal:define="errors options/state/getErrors">
- <form name="edit_form"
- action="."
- method="post"
- enctype="multipart/form-data"
- tal:attributes="action string:${here/getId}/${template/getId}" >
-
-
-
- <fieldset>
-
- <legend i18n:translate="legend_folder_details">Folder Details</legend>
-
- <div class="field"
- tal:condition="python:member.getProperty('visible_ids', None) and
- len(utool.getRelativeContentPath(here))"
- tal:define="error errors/id | nothing;
- id python:request.get('id', test(here.show_id(),here.getId(),''));"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="id" i18n:translate="label_short_name">Short Name</label>
+ <h1 i18n:translate="heading_edit_folder_properties">Edit Folder Properties</h1>
- <div class="formHelp" i18n:translate="help_shortname">
- Should not contain spaces, underscores or mixed case.
- Short Name is part of the folder's web address.
- </div>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="id"
- name="id"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value id;
- tabindex tabindex/next;"
- />
-
- </div>
+ <form name="edit_form"
+ action="."
+ method="post"
+ enctype="multipart/form-data"
+ tal:attributes="action string:${here/getId}/${template/getId}" >
- <input type="hidden"
- name="id"
- tal:condition="python:not member.getProperty('visible_ids', '') or
- not len(utool.getRelativeContentPath(here))"
- tal:define="id python:request.get('id', here.getId())"
- tal:attributes="value id"
- />
-
- <div class="field"
- tal:define="error errors/title|nothing;
- Title request/title | here/Title;"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="title" i18n:translate="label_title">Title</label>
-
- <span class="fieldRequired" title="Required"
- i18n:attributes="title"
- i18n:translate="label_required">(Required)</span>
-
- <div tal:content="error">Validation error output</div>
-
- <input type="text"
- id="title"
- name="title"
- value=""
- size="40"
- tabindex=""
- tal:attributes="value Title;
- tabindex tabindex/next;"
- />
-
- </div>
-
- <div class="field"
- tal:define="description request/description | here/Description ">
- <label for="description" i18n:translate="label_description">Description</label>
-
- <div class="formHelp" i18n:translate="help_description">
- A brief description of the folder.
- </div>
- <textarea cols="80"
- rows="5"
- tabindex=""
- id="description"
- name="description"
- tal:content="description"
- tal:attributes="tabindex tabindex/next;"
- >
- Description
- </textarea>
- </div>
+ <fieldset>
- <div class="formControls"
- tal:define="process_creation request/process_creation|nothing;">
- <input class="context"
- tabindex=""
- type="submit"
- name="form.button.Save"
- value="Save"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next;" />
-
- <input class="standalone"
- tabindex=""
- type="submit"
- name="form.button.Cancel"
- value="Cancel"
- i18n:attributes="value"
- tal:attributes="tabindex tabindex/next;" />
- </div>
- </fieldset>
+ <legend i18n:translate="legend_folder_details">Folder Details</legend>
- <input type="hidden" name="form.submitted" value="1" />
+ <div class="field"
+ tal:condition="python:member.getProperty('visible_ids', None) and
+ len(utool.getRelativeContentPath(here))"
+ tal:define="error errors/id | nothing;
+ id python:request.get('id', test(here.show_id(),here.getId(),''));"
+ tal:attributes="class python:test(error, 'field error', 'field')">
- </form>
+ <label for="id" i18n:translate="label_short_name">Short Name</label>
-</div>
+ <div class="formHelp" i18n:translate="help_shortname">
+ Should not contain spaces, underscores or mixed case.
+ Short Name is part of the folder's web address.
+ </div>
-</body>
+ <div tal:content="error">Validation error output</div>
+
+ <input type="text"
+ id="id"
+ name="id"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value id;
+ tabindex tabindex/next;"
+ />
+
+ </div>
+
+ <input type="hidden"
+ name="id"
+ tal:condition="python:not member.getProperty('visible_ids', '') or
+ not len(utool.getRelativeContentPath(here))"
+ tal:define="id python:request.get('id', here.getId())"
+ tal:attributes="value id"
+ />
+
+ <div class="field"
+ tal:define="error errors/title|nothing;
+ Title request/title | here/Title;"
+ tal:attributes="class python:test(error, 'field error', 'field')">
+
+ <label for="title" i18n:translate="label_title">Title</label>
+
+ <span class="fieldRequired" title="Required"
+ i18n:attributes="title"
+ i18n:translate="label_required">(Required)</span>
+
+ <div tal:content="error">Validation error output</div>
+
+ <input type="text"
+ id="title"
+ name="title"
+ value=""
+ size="40"
+ tabindex=""
+ tal:attributes="value Title;
+ tabindex tabindex/next;"
+ />
+
+ </div>
+
+ <div class="field"
+ tal:define="description request/description | here/Description ">
+
+ <label for="description" i18n:translate="label_description">Description</label>
+
+ <div class="formHelp" i18n:translate="help_description">
+ A brief description of the folder.
+ </div>
+
+ <textarea cols="80"
+ rows="5"
+ tabindex=""
+ id="description"
+ name="description"
+ tal:content="description"
+ tal:attributes="tabindex tabindex/next;"
+ >
+ Description
+ </textarea>
+ </div>
+
+ <div class="formControls"
+ tal:define="process_creation request/process_creation|nothing;">
+ <input class="context"
+ tabindex=""
+ type="submit"
+ name="form.button.Save"
+ value="Save"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next;" />
+
+ <input class="standalone"
+ tabindex=""
+ type="submit"
+ name="form.button.Cancel"
+ value="Cancel"
+ i18n:attributes="value"
+ tal:attributes="tabindex tabindex/next;" />
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="form.submitted" value="1" />
+
+ </form>
+
+ </div>
+
+ </body>
</html>
Index: newsitem_edit_form.cpt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_content/newsitem_edit_form.cpt,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -d -r1.2.2.7 -r1.2.2.8
--- newsitem_edit_form.cpt 22 Dec 2003 17:24:03 -0000 1.2.2.7
+++ newsitem_edit_form.cpt 30 Dec 2003 18:16:52 -0000 1.2.2.8
@@ -1,163 +1,164 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US"
metal:use-macro="here/main_template/macros/master"
i18n:domain="plone">
-<body>
-<div metal:fill-slot="main"
- tal:define="errors options/state/getErrors;
- editor python:member.getProperty('wysiwyg_editor','None');
- wysiwyg python:test(editor and (editor!='None'), editor, 'None');">
+ <body>
- <h1 i18n:translate="heading_edit_item">
- Edit
- <span i18n:name="itemtype">
- <span i18n:translate=""
- tal:content="python:here.getTypeInfo().Title()"
- tal:omit-tag="">Item type</span>
- </span>
- </h1>
+ <div metal:fill-slot="main"
+ tal:define="errors options/state/getErrors;
+ editor python:member.getProperty('wysiwyg_editor','None');
+ wysiwyg python:test(editor and (editor!='None'), editor, 'None');">
- <p i18n:translate="description_edit_news_item">
- A news item is a small piece of news that is published on the front
- page. Add the relevant details below, and press 'Save'.
- </p>
+ <h1 i18n:translate="heading_edit_item">
+ Edit
+ <span i18n:name="itemtype">
+ <span i18n:translate=""
+ tal:content="python:here.getTypeInfo().Title()"
+ tal:omit-tag="">Item type</span>
+ </span>
+ </h1>
- <form name="edit_form"
- action="."
- method="post"
- enctype="multipart/form-data"
- tal:attributes="action string:${here/getId}/${template/getId}" >
-
- <fieldset>
-
- <legend i18n:translate="legend_newsitem_details">News Item Details</legend>
-
- <div class="field"
- tal:condition="python:member.getProperty('visible_ids', None)"
- tal:define="error errors/id | nothing;
- id python:request.get('id', test(here.show_id(),here.getId(),''));"
- tal:attributes="class python:test(error, 'field error', 'field')">
-
- <label for="id" i18n:translate="label_short_name">Short Name</label>
+ <p i18n:translate="description_edit_news_item">
+ A news item is a small piece of news that is published on th...
[truncated message content] |