[Plone-cvs] CMFPlone/skins/plone_templates header.pt,1.103.2.16,1.103.2.17 main_template.pt,1.110.2.16,1.110.2.17

[Alexander L. <li...@us...>]

Update of /cvsroot/plone/CMFPlone/skins/plone_templates
In directory sc8-pr-cvs1:/tmp/cvs-serv3350/skins/plone_templates

Modified Files:
      Tag: Plone-2_0-branch
	header.pt main_template.pt 
Log Message:
Making table-based columns the default again - and adding a plone_tableless for whose who want to do tableless designs.

For those of you who were running tableless designs in the RC3 
and earlier releases and want to keep it that way - simply add
a DirectoryView for 'plone_tableless' in 'portal_skins', and 
add it to the skinpath. This will activate the tableless versions
of:

- main_template

- ploneColumns.css

Apart from adding these two templates, no other changes are needed.

Index: header.pt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_templates/header.pt,v
retrieving revision 1.103.2.16
retrieving revision 1.103.2.17
diff -u -d -r1.103.2.16 -r1.103.2.17
--- header.pt	9 Jan 2004 05:33:21 -0000	1.103.2.16
+++ header.pt	18 Jan 2004 11:11:35 -0000	1.103.2.17
@@ -103,14 +103,7 @@
 
     <!-- Common Plone ECMAScripts -->
 
-    <!-- IE min-width support -->
-    <tal:comment replace="structure string:&lt;!--[if IE]&gt;" />
-    <script type="text/javascript"
-            tal:attributes="src string:$portal_url/plone_minwidth.js"></script>
-    <tal:comment replace="structure string:&lt;![endif]--&gt;" />
-
-     
-    <!-- ECMAScript menu -->
+    <!-- Pull-down ECMAScript menu -->
     <script type="text/javascript"
             tal:attributes="src string:$portal_url/plone_menu.js"></script>
 

Index: main_template.pt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_templates/main_template.pt,v
retrieving revision 1.110.2.16
retrieving revision 1.110.2.17
diff -u -d -r1.110.2.16 -r1.110.2.17
--- main_template.pt	9 Jan 2004 01:21:31 -0000	1.110.2.16
+++ main_template.pt	18 Jan 2004 11:11:35 -0000	1.110.2.17
@@ -81,14 +81,26 @@
 
 <div class="visualClear"></div>
 
-<!-- The wrapper div. It contains the three columns. -->
-<div id="portal-columns" tal:attributes="class string:${hidecolumns}">
-
-    <!-- start of the main and left columns -->
-    <div id="visual-column-wrapper">
+<!-- The wrapper table. It contains the three columns. There's a table-less
+     alternative in the plone_tableless skin layer that you can use if you 
+     prefer layouts that don't use tables. -->
+<table id="portal-columns" tal:attributes="class string:${hidecolumns}">
+    <tbody>
+        <tr>
+            <!-- start of the left (by default at least) column -->
+            <td id="portal-column-one"
+                tal:condition="slots_mapping/left">
+                <div class="visualPadding">
+                    <metal:leftportlets use-macro="here/portlets_fetcher/macros/left_column">
+                        This instruction gets the portlets (boxes) for the left column.
+                    </metal:leftportlets>
+                    &nbsp;
+                </div>
+            </td>
+            <!-- end of the left (by default at least) column -->
 
         <!-- start of main content block -->
-        <div id="portal-column-content"
+            <td id="portal-column-content"
              tal:define="tabindex python:Iterator(pos=0)">
 
             <div id="content" tal:attributes="class python:test(is_editable,'documentEditable','')">
@@ -127,26 +139,11 @@
 
             </div>
 
-        </div>
+            </td>
         <!-- end of main content block -->
 
-        <!-- start of the left (by default at least) column -->
-        <div id="portal-column-one"
-            tal:condition="slots_mapping/left">
-            <div class="visualPadding">
-                <metal:leftportlets use-macro="here/portlets_fetcher/macros/left_column">
-                    This instruction gets the portlets (boxes) for the left column.
-                </metal:leftportlets>
-                &nbsp;
-            </div>
-        </div>
-        <!-- end of the left (by default at least) column -->
-
-    </div>
-    <!-- end of the main and left columns -->
-
     <!-- start of right (by default at least) column -->
-    <div id="portal-column-two"
+            <td id="portal-column-two"
         tal:condition="slots_mapping/right">
         <div class="visualPadding">
             <metal:rightportlets metal:use-macro="here/portlets_fetcher/macros/right_column">
@@ -154,13 +151,15 @@
             </metal:rightportlets>
             &nbsp;
         </div>
-    </div>
+            </td>
     <!-- end of the right (by default at least) column -->
+        </tr>
+    </tbody>
+</table>
+<!-- end column wrapper -->
 
-    <div class="visualClear">&nbsp;</div>
+<div class="visualClear">&nbsp;</div>
 
-</div>
-<!-- end column wrapper -->
 
 <hr class="netscape4" />