[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - main_template.pt:1.5 zpt_stylesheet.css:1.5

[Chris Withers]

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

Modified Files:
	main_template.pt zpt_stylesheet.css 
Log Message:
Merging CMF Calendar work from branch.

=== CMF/CMFDefault/skins/zpt_generic/main_template.pt 1.4 => 1.5 ===
    </tr>
 
+   <tr>
+    <td>
+     <div metal:use-macro="here/calendarBox/macros/calendarBox | default">
+      <!-- CMFCalendar not Installed -->
+     </div>
+    </td>
+   </tr>
+
   </table>
   <!-- end actions_box -->
 


=== CMF/CMFDefault/skins/zpt_generic/zpt_stylesheet.css 1.4 => 1.5 ===
 }
 
+<dtml-var CalendarStyle missing>