[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - document_edit_form.pt:1.7 file_edit_form.pt:1.5 full_metadata_edit_form.pt:1.7 image_edit_form.pt:1.5 link_edit_form.pt:1.5 metadata_edit_form.pt:1.7 newsitem_edit_form.pt:1.7

Yvo Schubbe schubbe@web.de
Sun, 8 Jun 2003 15:48:23 -0400


Update of /cvs-repository/CMF/CMFDefault/skins/zpt_content
In directory cvs.zope.org:/tmp/cvs-serv26280/CMFDefault/skins/zpt_content

Modified Files:
	document_edit_form.pt file_edit_form.pt 
	full_metadata_edit_form.pt image_edit_form.pt 
	link_edit_form.pt metadata_edit_form.pt newsitem_edit_form.pt 
Log Message:
Merged yuppie-buglets2-branch:
- Fixed some zpt issues. (Collector #156 and other)
- Fixed stylesheets. (Collector #164)
- Cleanup.

=== CMF/CMFDefault/skins/zpt_content/document_edit_form.pt 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/zpt_content/document_edit_form.pt:1.6	Thu Mar  6 05:40:21 2003
+++ CMF/CMFDefault/skins/zpt_content/document_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -4,6 +4,7 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
+
 <h2 i18n:translate="">Edit <span
     tal:replace="here/getId" i18n:name="objectid">My ID</span></h2>
 
@@ -21,57 +22,52 @@
    <span tal:replace="here/Title">Title</span>
   </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Description</th>
   <td>
    <span tal:replace="here/Description">Description</span>
   </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Format</th>
   <td>
-   <input type="radio" name="text_format"
-                     value="structured-text"
-                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
-   <label for="cb_structuredtext" i18n:translate="">structured-text</label>
-   <input type="radio" name="text_format" value="plain"
-          tal:attributes="checked python: path('here/text_format') == 'plain'" />
-   <label for="cb_html" i18n:translate="">plain text</label>
-   <input type="radio" name="text_format" value="html"
-          tal:attributes="checked python: path('here/text_format') == 'html'" />
+   <input type="radio" name="text_format" value="structured-text" id="cb_stx"
+          tal:attributes="
+                checked python:path('here/text_format')=='structured-text'" />
+   <label for="cb_stx" i18n:translate="">structured-text</label>
+   <input type="radio" name="text_format" value="plain" id="cb_plain"
+          tal:attributes="checked python:path('here/text_format')=='plain'" />
+   <label for="cb_plain" i18n:translate="">plain text</label>
+   <input type="radio" name="text_format" value="html" id="cb_html"
+          tal:attributes="checked python:path('here/text_format')=='html'" />
    <label for="cb_html" i18n:translate="">html</label>
   </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Upload</th>
   <td>
    <input type="file" name="file" size="25" />
   </td>
  </tr>
-
  <tr>
   <th class="TextField" i18n:translate="">Edit</th>
   <td class="TextField">
    <textarea name="text:text" rows="20" cols="80" wrap="soft"
-                    tal:content="here/EditableBody"></textarea>
+             tal:content="here/EditableBody"></textarea>
   </td>
  </tr>
-
  <tr>
   <td> <br /> </td>
   <td>
-   <input type="submit" name="change" value=" Change "
+   <input type="submit" name="change" value="Change"
           i18n:attributes="value" />
-   <input type="submit" name="change_and_view" value=" Change and View "
+   <input type="submit" name="change_and_view" value="Change and View"
           i18n:attributes="value" />
   </td>
  </tr>
-
 </table>
 </form>
+
 </div>
 </div>
 </body>


=== CMF/CMFDefault/skins/zpt_content/file_edit_form.pt 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/zpt_content/file_edit_form.pt:1.4	Thu Mar  6 05:40:34 2003
+++ CMF/CMFDefault/skins/zpt_content/file_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -2,11 +2,8 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
-<span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr /></span>
 
 <h2 i18n:translate="">Edit <span
     tal:replace="here/getId" i18n:name="objectid">My ID</span></h2>
@@ -15,39 +12,34 @@
       tal:attributes="action string:${here/absolute_url}/file_edit"
 >
 <table class="FormLayout">
-
  <tr>
   <th i18n:translate="">Title</th>
   <td> <span tal:replace="here/Title">My Title</span></td>
  </tr>
-
  <tr>
   <th i18n:translate="">Description</th>
   <td> <span tal:replace="here/Description">My Description</span></td>
  </tr>
-
  <tr>
   <th i18n:translate="">Content type</th>
   <td> <span tal:replace="here/Format">html/text</span></td>
  </tr>
-
  <tr>
   <th i18n:translate="">Upload file</th>
   <td> <input type="file" name="file" size="35" /> </td>
  </tr>
-
  <tr>
   <td> <br /> </td>
   <td>
-   <input type="submit" name="change" value=" Change "
+   <input type="submit" name="change" value="Change"
           i18n:attributes="value" />
-   <input type="submit" name="change_and_view" value=" Change and View "
+   <input type="submit" name="change_and_view" value="Change and View"
           i18n:attributes="value" />
   </td>
  </tr>
-
 </table>
 </form>
+
 </div>
 </div>
 </body>


=== CMF/CMFDefault/skins/zpt_content/full_metadata_edit_form.pt 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/zpt_content/full_metadata_edit_form.pt:1.6	Thu Mar  6 05:41:10 2003
+++ CMF/CMFDefault/skins/zpt_content/full_metadata_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -4,12 +4,6 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
-
-
-<span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr /></span>
-
-
 <div class="Metadata">
 
 <h2 i18n:translate="">Resource Metadata</h2>
@@ -55,30 +49,31 @@
   <td colspan="3">
    <textarea name="description:text" rows="5"
              cols="65" wrap="soft"
-			 tal:content="here/Description"></textarea>
+             tal:content="here/Description"></textarea>
   </td>
  </tr>
-
  <tr valign="top">
   <th align="right" i18n:translate="">Subject</th>
   <td tal:define="subj_lines python: modules['string'].join(
                                          here.subjectsList(), '\n' )">
-     <textarea name="subject:lines" rows="3" cols="20"
-	           tal:content="subj_lines"></textarea>
+   <textarea name="subject:lines" rows="3" cols="20"
+             tal:content="subj_lines"></textarea>
    <br />
    <select name="subject:list" multiple>
-     <option value=""
-		   tal:define="items python: here.portal_metadata.listAllowedSubjects(here); subjects here/Subject"
-		   tal:repeat="item items"
-		   tal:attributes="value item; selected python: item in subjects"
-		   tal:content="item">
-      </option>
-    </select>
+    <option value=""
+            tal:define="
+                  items python:here.portal_metadata.listAllowedSubjects(here);
+                  subjects here/Subject"
+            tal:repeat="item items"
+            tal:attributes="value item; selected python: item in subjects"
+            tal:content="item">
+    </option>
+   </select>
   </td>
   <th align="right" i18n:translate="">Contributors</th>
   <td tal:define="contrib_lines python: '\n'.join( here.Contributors() )">
    <textarea name="contributors:lines" rows="5" cols="30"
-			 tal:content="contrib_lines"></textarea>
+             tal:content="contrib_lines"></textarea>
   </td>
  </tr>
  <tr valign="top">
@@ -124,11 +119,13 @@
  <tr valign="top">
   <td> <br /> </td>
   <td>
-   <input type="submit" value=" Change " i18n:attributes="value" />
+   <input type="submit" name="change" value="Change"
+          i18n:attributes="value" />
   </td>
  </tr>
 </table>
 </form>
+
 </div>
 </div>
 </div>


=== CMF/CMFDefault/skins/zpt_content/image_edit_form.pt 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/zpt_content/image_edit_form.pt:1.4	Thu Mar  6 05:41:39 2003
+++ CMF/CMFDefault/skins/zpt_content/image_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -4,10 +4,6 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
-
-
-<span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr /></span>
 <div class="Image">
 
 <h2 i18n:translate="">Edit <span
@@ -17,37 +13,31 @@
       tal:attributes="action string:${here/absolute_url}/image_edit"
 >
 <table class="FormLayout">
-
  <tr>
   <th i18n:translate="">Title</th>
   <td> <span tal:replace="here/Title">My Title</span> </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Description</th>
   <td> <span tal:replace="here/Description">My Description</span> </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Content type</th>
   <td> <span tal:replace="here/Format">text/html</span> </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Upload image</th>
   <td> <input type="file" name="file" size="25" /> </td>
  </tr>
-
  <tr>
   <td> <br /> </td>
   <td>
-   <input type="submit" name="change" value=" Change "
+   <input type="submit" name="change" value="Change"
           i18n:attributes="value" />
-   <input type="submit" name="change_and_view" value=" Change and View "
+   <input type="submit" name="change_and_view" value="Change and View"
           i18n:attributes="value" />
   </td>
  </tr>
-
 </table>
 </form>
 


=== CMF/CMFDefault/skins/zpt_content/link_edit_form.pt 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/zpt_content/link_edit_form.pt:1.4	Thu Mar  6 05:41:39 2003
+++ CMF/CMFDefault/skins/zpt_content/link_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -4,11 +4,6 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
-
-
-<span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr /></span>
-
 <div class="Link">
 
 <h2 i18n:translate="">Edit <span
@@ -25,15 +20,16 @@
  <tr>
   <th i18n:translate="">URL</th>
   <td>
-   <input type="text" name="remote_url" value="" tal:attributes="value here/remote_url" />
+   <input type="text" name="remote_url" value=""
+          tal:attributes="value here/remote_url" />
   </td>
  </tr>
  <tr>
   <td> <br /> </td>
   <td>
-   <input type="submit" name="change" value=" Change "
+   <input type="submit" name="change" value="Change"
           i18n:attributes="value" />
-   <input type="submit" name="change_and_view" value=" Change and View "
+   <input type="submit" name="change_and_view" value="Change and View"
           i18n:attributes="value" />
   </td>
  </tr>
@@ -42,7 +38,6 @@
 
 </div>
 </div>
-
 </div>
 </body>
 </html>


=== CMF/CMFDefault/skins/zpt_content/metadata_edit_form.pt 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/zpt_content/metadata_edit_form.pt:1.6	Thu Mar  6 05:42:09 2003
+++ CMF/CMFDefault/skins/zpt_content/metadata_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -4,11 +4,6 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
-
-
-<span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr /></span>
-
 <div class="Metadata">
 
 <h2 i18n:translate="">Standard Resource Metadata</h2>
@@ -17,9 +12,7 @@
       tal:attributes="action string:${here/absolute_url}/metadata_edit"
 >
 <table class="FormLayout">
-
- <tr valign="top">
-
+ <tr>
   <th i18n:translate="">Enable Discussion?</th>
   <td>
     <select name="allowDiscussion"
@@ -41,18 +34,13 @@
       i18n:translate=""
      >Edit all metadata</a>
   </td>
-
  </tr>
-
  <tr valign="top">
-
   <th align="right" i18n:translate="">Identifier</th>
-  <td colspan="3"> <span tal:replace="here/Identifier" /> </td>
-
+  <td colspan="3"> <span tal:replace="here/Identifier"></span>
+  </td>
  </tr>
-
  <tr valign="top">
-
   <th align="right" i18n:translate="">Title</th>
   <td colspan="3">
    <input type="text"
@@ -61,62 +49,52 @@
           size="65"
           tal:attributes="value here/Title" />
   </td>
-
  </tr>
-
  <tr valign="top">
-
   <th align="right" i18n:translate="">Description</th>
   <td colspan="3">
    <textarea name="description:text" rows="5"
              cols="65" wrap="soft"
-			 tal:content="here/Description"></textarea>
+             tal:content="here/Description"></textarea>
   </td>
-
  </tr>
-
  <tr valign="top">
-       <th align="right" i18n:translate="">Subject</th>
+  <th align="right" i18n:translate="">Subject</th>
   <td tal:define="subj_lines python: modules['string'].join(
                                          here.subjectsList(), '\n' )">
-     <textarea name="subject:lines" rows="3" cols="20"
-	           tal:content="subj_lines"></textarea>
+   <textarea name="subject:lines" rows="3" cols="20"
+             tal:content="subj_lines"></textarea>
    <br />
    <select name="subject:list" multiple>
-     <option value=""
-		   tal:define="items python: here.portal_metadata.listAllowedSubjects(
-                                              here);
-                       subjects here/Subject;
-                      "
-		   tal:repeat="item items"
-		   tal:attributes="value item; selected python: item in subjects"
-		   tal:content="item">
-      </option>
-    </select>
+    <option value=""
+            tal:define="
+                  items python:here.portal_metadata.listAllowedSubjects(here);
+                  subjects here/Subject"
+            tal:repeat="item items"
+            tal:attributes="value item; selected python: item in subjects"
+            tal:content="item">
+    </option>
+   </select>
   </td>
-
   <th align="right" i18n:translate="">Format</th>
   <td>
    <input type="text" name="format" value=""
           tal:attributes="value here/Format" />
    <br />
-   <input type="submit" name="change" value=" Change "
+   <input type="submit" name="change" value="Change"
           i18n:attributes="value" />
    <br />
-   <input type="submit" name="change_and_edit" value=" Change & Edit "
+   <input type="submit" name="change_and_edit" value="Change & Edit"
           i18n:attributes="value" />
    <br />
-   <input type="submit" name="change_and_view" value=" Change & View "
+   <input type="submit" name="change_and_view" value="Change & View"
           i18n:attributes="value" />
   </td>
  </tr>
-
 </table>
-
 </form>
 
 </div>
-
 </div>
 </div>
 </body>


=== CMF/CMFDefault/skins/zpt_content/newsitem_edit_form.pt 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/zpt_content/newsitem_edit_form.pt:1.6	Thu Mar  6 05:42:19 2003
+++ CMF/CMFDefault/skins/zpt_content/newsitem_edit_form.pt	Sun Jun  8 15:47:52 2003
@@ -4,11 +4,6 @@
 <body>
 <div metal:fill-slot="main" i18n:domain="cmf_default">
 <div class="Desktop">
-
-
-<span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr /></span>
-
 <div class="NewsItem">
 
 <h2 i18n:translate="">Edit <span
@@ -18,28 +13,25 @@
       tal:attributes="action string:${here/absolute_url}/newsitem_edit"
 >
 <table class="FormLayout">
-
  <tr>
   <th i18n:translate="">Title</th>
   <td> <span tal:replace="here/Title">My Title</span> </td>
  </tr>
-
  <tr>
   <th i18n:translate="">Format</th>
   <td>
-   <input type="radio" name="text_format"
-                     value="structured-text"
-                     tal:attributes="checked python: path('here/text_format') == 'structured-text'" />
-   <label for="cb_structuredtext" i18n:translate="">structured-text</label>
-   <input type="radio" name="text_format" value="plain"
-          tal:attributes="checked python: path('here/text_format') == 'plain'" />
-   <label for="cb_html" i18n:translate="">plain text</label>
-   <input type="radio" name="text_format" value="html"
-          tal:attributes="checked python: path('here/text_format') == 'html'" />
+   <input type="radio" name="text_format" value="structured-text" id="cb_stx"
+          tal:attributes="
+                checked python:path('here/text_format')=='structured-text'" />
+   <label for="cb_stx" i18n:translate="">structured-text</label>
+   <input type="radio" name="text_format" value="plain" id="cb_plain"
+          tal:attributes="checked python:path('here/text_format')=='plain'" />
+   <label for="cb_plain" i18n:translate="">plain text</label>
+   <input type="radio" name="text_format" value="html" id="cb_html"
+          tal:attributes="checked python:path('here/text_format')=='html'" />
    <label for="cb_html" i18n:translate="">html</label>
   </td>
  </tr>
-
  <tr>
   <th class="TextField" i18n:translate="">Lead-in</th>
   <td class="TextField">
@@ -54,17 +46,15 @@
              tal:content="here/EditableBody"></textarea>
   </td>
  </tr>
-
  <tr>
   <td> <br /> </td>
   <td>
-   <input type="submit" name="change" value=" Change "
+   <input type="submit" name="change" value="Change"
           i18n:attributes="value" />
-   <input type="submit" name="change_and_view" value=" Change and View "
+   <input type="submit" name="change_and_view" value="Change and View"
           i18n:attributes="value" />
   </td>
  </tr>
-
 </table>
 </form>