[CMF-checkins] CVS: CMF/CMFDecor/skins/zpt_content - discussionitem_view.pt:1.6 document_view.pt:1.5 favorite_view.pt:1.5 file_view.pt:1.4 folder_edit_form.pt:1.4 image_view.pt:1.4 link_view.pt:1.4 newsitem_view.pt:1.3

Tres Seaver tseaver@zope.com
Sat, 6 Oct 2001 20:34:08 -0400 

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

Modified Files:
	discussionitem_view.pt document_view.pt favorite_view.pt 
	file_view.pt folder_edit_form.pt image_view.pt link_view.pt 
	newsitem_view.pt 
Log Message:


 - Cleaned up main template and stylesheet.

 - Made content views more uniform in display of "forematter"
   (title, description, byline), using the new section of the
   page next to the actions menu.

 - Moved main body of content views, forms, etc. below the
   menu (gets horizontal real estate back).

 - Exported macro from roster, to ease reuse.


=== CMF/CMFDecor/skins/zpt_content/discussionitem_view.pt 1.5 => 1.6 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">	  
-<div class="Desktop">
 
- <div class="Document">
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
 
   <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
 
-  <div class="Discussion">
+</div>
+
+<div metal:fill-slot="main">	  
+
+  <div id="DiscussionAbove">
    <span tal:replace="structure here/aboveInThread"></span>
   </div>
 
-  <h1> <span tal:replace="here/Title">My Title</span> </h1>
-
   <div tal:replace="structure here/CookedBody">Body</div>
 
   <div class="Discussion">
-  <span tal:replace="structure here/viewThreadsAtBottom"
-       tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
+   <span tal:replace="structure here/viewThreadsAtBottom"
+        tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
   </div>
- </div>
-</div>
+
 </div>
+
 </body>
 </html>


=== CMF/CMFDecor/skins/zpt_content/document_view.pt 1.4 => 1.5 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
+
+<div metal:fill-slot="header">
+
+    <h1 id="DesktopTitle"
+        tal:content="here/Title">Document Title</h1>
+
+    <div id="DesktopDescription" tal:content="here/Description">
+        Document Description goes here.
+    </div>
+
+    <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
 <div metal:fill-slot="main">
 
-<div class="Desktop">
- <table>
- <tr>
-          <td height="20">
-<div class="aTitle" tal:content="structure here/Title">Document Title</div></td></tr>
-  <tr valign="top">
-          <td height="1" bgcolor="#000000"><img src="../zpt_images/c.gif" width="360" height="1" border="0" alt=""
-                                                          tal:attributes="src string:c.gif"></td>
-        </tr>
-		<tr><td>&nbsp;</td></tr>
-  <tr>
-    <td><div metal:use-macro="here/content_byline/macros/byline">By Me</div></td>
-  </tr>
-  <tr>
-    <td><div class="Description" tal:content="here/Description"></div></td>
-  </tr>
-  <tr>
-    <td><div tal:replace="structure here/CookedBody">Cooked Body</div></td>
-  </tr>
-  <tr>
-  <td><div class="Discussion">
+<div tal:replace="structure here/CookedBody">Cooked Body</div>
+
+<div class="Discussion">
    <span tal:replace="structure here/viewThreadsAtBottom"
          tal:condition="here/viewThreadsAtBottom|nothing"></span>
-  </div>
-  </td>
-  </tr>
-  </table>
 </div>
+
 </div>
+
 </body>
 </html>


=== CMF/CMFDecor/skins/zpt_content/favorite_view.pt 1.4 => 1.5 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
-<div class="Desktop">
-<table>
- <tr>
-   <td>
-      <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
-   </td>
- </tr>
- <tr>
-   <td> 
-<a href="favorite.html" title="ZopeOrg"
-   tal:define="favorite python:here.portal_url.getPortalPath() + '/' + here.remote_url"
-   tal:attributes="href favorite; title favorite"><span tal:replace="favorite">www.zope.org</span></a>
-   </td>
-  </tr>
- <tr>
-   <td>
-<div class="Discussion">
-<span tal:replace="here/viewThreadsAtBottom"
-       tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
-</div>
- </td>
-</tr>
-</table>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
 </div>
+
+<div metal:fill-slot="main">
+
+ <p> Link: <a href=""
+              tal:attributes="href here/remote_url"
+              tal:content="here/remote_url"
+           >/index_html</a></p>
+
+ <div class="Discussion">
+    <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
 </div>
+
 </body>
 </html>
 


=== CMF/CMFDecor/skins/zpt_content/file_view.pt 1.3 => 1.4 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
+
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
+</div>
+
 <div metal:fill-slot="main">
-<div class="Desktop">
-<div metal:use-macro="here/content_byline/macros/byline">By Me</div>
-<p>
-<b>Filename</b>: <span tal:replace="here/getId">My ID</span>
-<br>
-<b>Size</b>: <span tal:replace="here/size">1024K</span>
-<br>
-<b>Content type</b>: <span tal:replace="here/content_type">application/gzip</span>
-<br>
-<b>Description</b>: <span tal:define="pss modules/Products.PythonScripts.standard; description here/Description"
-                          tal:replace="structure python:pss.newline_to_br(description)">File Description</span>
+
+<h2> File Properties </h2>
+
+ <table>
+
+  <tr>
+   <th align="right">Filename</th>
+   <td tal:content="here/getId">My ID</td>
+  </tr>
+
+  <tr>
+   <th align="right">Size</th>
+   <td tal:content="here/size">1024K</td>
+  </tr>
+  
+  <tr>
+   <th align="right">Content-type</th>
+   <td tal:content="here/content_type">application/gzip</td>
+  <tr>
+
+  <tr>
+   <td> <br> </td>
+   <td> 
+   </td>
+  </tr>
+ </table>
+
+<h2> Download File </h2>
+
+<p> <a href="." title="Download File"
+           tal:define="file here/absolute_url"
+           tal:attributes="href file; title here/Title"
+           tal:content="string:Download ${here/Title}">Download File</a>
 </p>
 
-<a href="aLInk.html" title="Download File"
-   tal:define="file here/absolute_url"
-   tal:attributes="href file; title here/Title"
-   tal:content="string:Download ${here/Title}">Download File</a>
-
-<div class="Discussion">
-<span tal:replace="here/viewThreadsAtBottom"
-       tal:condition="here/viewThreadsAtBottom|nothing">Dicussions</span>
-</div>
-</div>
+ <div class="Discussion">
+    <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
 </div>
+
 </body>
 </html>


=== CMF/CMFDecor/skins/zpt_content/folder_edit_form.pt 1.3 => 1.4 ===
   <td> <br> </td>
   <td>
-   <input type="submit" value=" Change ">
+   <input type="submit" name="choice" value=" Change ">
+   <input type="submit" name="choice" value=" Change and View ">
   </td>
  </tr>
  


=== CMF/CMFDecor/skins/zpt_content/image_view.pt 1.3 => 1.4 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
 
-<div class="Desktop">
+<div metal:fill-slot="header">
 
-<div class="Image">
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
 
-<span tal:replace="structure here/tag">Tag</span>
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
 
-<div class="Discussion">
-<span tal:replace="structure here/viewThreadsAtBottom"
-         tal:condition="here/viewThreadsAtBottom|nothing"></span>
-</div>
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
 
 </div>
-</div>
+
+<div metal:fill-slot="main">
+
+ <span tal:replace="structure here/tag">Tag</span>
+
+ <div class="Discussion">
+ <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
 
 </div>
+
 </body>
 </html>


=== CMF/CMFDecor/skins/zpt_content/link_view.pt 1.3 => 1.4 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
-<div class="Desktop">
-<table>
-  <tr>
-    <td><div metal:use-macro="here/content_byline/macros/byline">By Me</div></td>
-  </tr>
-  <tr><td>&nbsp;</td></tr>
-  <tr>
-    <td><a tal:attributes="href here/remote_url" href=""><span tal:replace="here/remote_url">www.zope.org</span></a></td>
-  </tr>
-  <tr>
-    <td><div class="Description" tal:replace="here/Description">Description</div></td>
-  </tr>
-  <tr tal:condition="here/viewThreadsAtBottom">
-    <td><div class="Discussion">
-            <span tal:replace="structure here/viewThreadsAtBottom" />
-        </div>
-    </td>
-  </tr>
-</table>
+
+<div metal:fill-slot="header">
+
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
+
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
+
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
+
 </div>
 
+<div metal:fill-slot="main">
+
+ <p> Link: <a href=""
+              tal:attributes="href here/remote_url"
+              tal:content="here/remote_url"
+           >http://www.zope.org</a></p>
+
+ <div class="Discussion">
+    <span tal:replace="structure here/viewThreadsAtBottom"
+          tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
 </div>
+
 </body>
 </html>


=== CMF/CMFDecor/skins/zpt_content/newsitem_view.pt 1.2 => 1.3 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
-<div class="Desktop">
-
-<div class="NewsItem">
 
-<blockquote class="Description">
-<span tal:replace="here/Description">Description</span>
-</blockquote>
+<div metal:fill-slot="header">
 
-<div tal:replace="structure here/content_byline">By Me</div>
+  <h1 id="DesktopTitle"
+      tal:content="here/Title">Document Title</h1>
 
-<div tal:replace="structure here/CookedBody">Body</div>
+  <div id="DesktopDescription" tal:content="here/Description">
+      Document Description goes here.
+  </div>
 
-<div class="Discussion">
+  <div metal:use-macro="here/content_byline/macros/byline">By Me</div>
 
-<span tal:replace="structure here/viewThreadsAtBottom"
-         tal:condition="here/viewThreadsAtBottom|nothing"></span>
-</div>
-</div>
 </div>
+
+<div metal:fill-slot="main">
+
+ <div tal:replace="structure here/CookedBody">Body</div>
+
+ <div class="Discussion">
+  <span tal:replace="structure here/viewThreadsAtBottom"
+           tal:condition="here/viewThreadsAtBottom|nothing"></span>
+ </div>
+
 </div>
+
 </body>
 </html>