[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/ - tweaking
Yvo Schubbe
cvs-admin at zope.org
Mon Jul 30 06:36:42 UTC 2012
Log message for revision 127400:
- tweaking
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.pt
A Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst
U Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch_widgets.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/configure.zcml
A Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.txt 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/TODO.txt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -1,40 +1,33 @@
Converting skins to views:
- [x] batch_widget:
-
- batch_widgets.pt -> templates/batch_widgets.pt
- getBatchItemInfos.py -> BatchViewBase.listItemInfos
- getBatchNavigation.py -> BatchViewBase.navigation_previous
- BatchViewBase.navigation_next
-
- [x] form_widget:
-
- form_widgets.pt -> templates/form_widgets.pt
-
[x] IFolderish @@view.html:
index_html.py -> FolderView
index_html_template.pt -> folder.pt
- [x] IFolderish @@edit.html:
+ [/] IFolderish @@edit.html:
- folder_contents.py -> FolderContentsView
- folder_contents_template.pt -> templates/folder_contents.pt
- validateItemIds.py -> FolderContentsView.validateItemIds
- validateClipboardData.py -> FolderContentsView.validateClipboardData
- folder_cut_control.py -> FolderContentsView.cut_control
- folder_copy_control.py -> FolderContentsView.copy_control
- folder_paste_control.py -> FolderContentsView.paste_control
- folder_delete_control.py -> FolderContentsView.delete_control
- folder_sort_control.py -> FolderContentsView.sort_control
- folder_up_control.py -> FolderContentsView.up_control
- folder_down_control.py -> FolderContentsView.down_control
- folder_top_control.py -> FolderContentsView.top_control
- folder_bottom_control.py -> FolderContentsView.bottom_control
- filterCookie.py -> FolderContentsView.set_filter_control
- FolderContentsView.clear_filter_control
- clearCookie.py -> FolderContentsView.clear_filter_control
+ [x] folder_contents.py -> ContentsView
+ [x] folder_contents_template.pt -> folder_contents.pt
+ [x] validateItemIds.py -> ContentsView.validate_items
+ [x] validateClipboardData.py -> obsolete (show_paste checks cb_dataValid)
+ [x] folder_cut_control.py -> ContentsView.handle_cut
+ [x] folder_copy_control.py -> ContentsView.handle_copy
+ [x] folder_paste_control.py -> ContentsView.handle_paste
+ [x] folder_delete_control.py -> ContentsView.handle_delete
+ [x] folder_sort_control.py -> ContentsView.handle_sort_order
+ [x] folder_up_control.py -> ContentsView.handle_up
+ [x] folder_down_control.py -> ContentsView.handle_down
+ [x] folder_top_control.py -> ContentsView.handle_top
+ [x] folder_bottom_control.py -> ContentsView.handle_bottom
+ [-] folder_filter_form.pt (structure)
+ [-] filterCookie.py
+ [-] clearCookie.py
+ [?] folder_rename_form.py
+ [?] folder_rename_control.py
+ [?] folder_rename_template.pt
+
[x] IMutableMinimalDublinCore @@properties.html:
folder_edit_form.py -> MinimalMetadataEditView
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.pt 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.pt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -1,26 +1,8 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<head>
-
-<metal:slot fill-slot="style_slot">
-<tal:span tal:replace="structure context/getBaseTag" />
-</metal:slot>
-
-</head>
+<html metal:use-macro="context/@@content_macros/page">
<body>
-<metal:slot metal:fill-slot="body">
-<h1 id="DesktopTitle" tal:content="view/title">Document Title</h1>
-
-<div id="DesktopDescription" tal:content="view/description">Document
- Description goes here.</div>
-
-<metal:macro metal:use-macro="context/content_byline/macros/byline" />
-
+<metal:slot metal:fill-slot="main">
<tal:span tal:replace="structure view/text">Cooked Body</tal:span>
-
-<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
- <tal:span tal:replace="structure context/viewThreadsAtBottom" />
-</div>
</metal:slot>
</body>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.pt 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.pt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -1,21 +1,7 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<head>
-
-<metal:slot fill-slot="style_slot">
-<tal:span tal:replace="structure context/getBaseTag" />
-</metal:slot>
-
-</head>
+<html metal:use-macro="context/@@content_macros/page">
<body>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<h1 id="DesktopTitle" tal:content="view/title">Document Title</h1>
-
-<div id="DesktopDescription" tal:content="view/description">Document
- Description goes here.</div>
-
-<metal:macro metal:use-macro="context/content_byline/macros/byline" />
-
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<h2 i18n:translate="">File Properties</h2>
<table>
@@ -38,10 +24,6 @@
<p><a href="." title="Download File"
tal:attributes="href view/url; title view/title"
tal:content="string:Download ${view/title}">Download File</a></p>
-
-<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
- <tal:span tal:replace="structure context/viewThreadsAtBottom" />
-</div>
</metal:slot>
</body>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.pt 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.pt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -1,26 +1,8 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<head>
-
-<metal:slot fill-slot="style_slot">
-<tal:span tal:replace="structure context/getBaseTag" />
-</metal:slot>
-
-</head>
+<html metal:use-macro="context/@@content_macros/page">
<body>
-<metal:slot metal:fill-slot="body">
-<h1 id="DesktopTitle" tal:content="view/title">Document Title</h1>
-
-<div id="DesktopDescription" tal:content="view/description">Document
- Description goes here.</div>
-
-<metal:macro metal:use-macro="context/content_byline/macros/byline" />
-
+<metal:slot metal:fill-slot="main">
<tal:span tal:replace="structure view/image">Image Tag</tal:span>
-
-<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
- <tal:span tal:replace="structure context/viewThreadsAtBottom" />
-</div>
</metal:slot>
</body>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.pt 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.pt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -1,28 +1,10 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<head>
-
-<metal:slot fill-slot="style_slot">
-<tal:span tal:replace="structure context/getBaseTag" />
-</metal:slot>
-
-</head>
+<html metal:use-macro="context/@@content_macros/page">
<body>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<h1 id="DesktopTitle" tal:content="view/title">Document Title</h1>
-
-<div id="DesktopDescription" tal:content="view/description">Document
- Description goes here.</div>
-
-<metal:macro metal:use-macro="context/content_byline/macros/byline" />
-
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<p i18n:translate="">Link:
<a href="" tal:attributes="href view/url" tal:content="view/url"
i18n:name="link">http://www.zope.org</a></p>
-
-<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
- <tal:span tal:replace="structure context/viewThreadsAtBottom" />
-</div>
</metal:slot>
</body>
Added: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst 2012-07-30 06:36:38 UTC (rev 127400)
@@ -0,0 +1,24 @@
+Converting skins to views:
+==========================
+
+[x] * @@batch_widget (macros):
+------------------------------
+- [x] batch_widgets.pt -> batch_widgets.pt
+- [x] getBatchItemInfos.py -> BatchViewBase.listBatchItems
+- [x] getBatchNavigation.py -> BatchViewBase.navigation_previous
+ BatchViewBase.navigation_next
+
+[x] deprecated: * @@form_widget (macros) / new: * @@formlib_macros (macros):
+----------------------------------------------------------------------------
+- [x] form_widgets.pt -> form_widgets.pt
+- [x] new: formlib_macros.pt
+
+[/] * @@content_macros (macros):
+--------------------------------
+- [x] getBaseTag.pt (structure) -> content_macros.pt
+- [x] content_byline.pt (macros) -> content_macros.pt
+
+- [?] viewThreadsAtBottom.pt (structure)
+- [?] talkback_tree.pt (macros)
+- [?] setup_talkback_tree.py
+- [?] discitem_delete.py
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch_widgets.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch_widgets.pt 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch_widgets.pt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -39,14 +39,12 @@
><p class="BatchNavigation" tal:condition="python: prev_info or next_info"
><tal:case tal:condition="prev_info">
<a href="" tal:attributes="href prev_info/url"
- tal:content="prev_info/title"
- i18n:translate="">PREVIOUS N ITEMS</a></tal:case
+ tal:content="prev_info/title">PREVIOUS N ITEMS</a></tal:case
><tal:case tal:condition="python: prev_info and next_info">
</tal:case
><tal:case tal:condition="next_info">
<a href="" tal:attributes="href next_info/url"
- tal:content="next_info/title"
- i18n:translate="">NEXT N ITEMS</a></tal:case
+ tal:content="next_info/title">NEXT N ITEMS</a></tal:case
></p
></metal:macro>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/configure.zcml 2012-07-30 06:33:45 UTC (rev 127399)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/configure.zcml 2012-07-30 06:36:38 UTC (rev 127400)
@@ -21,6 +21,14 @@
<browser:page
for="*"
layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
+ name="content_macros"
+ template="content_macros.pt"
+ permission="zope2.View"
+ />
+
+ <browser:page
+ for="*"
+ layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
name="formlib_macros"
template="formlib_macros.pt"
permission="zope2.View"
Added: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt 2012-07-30 06:36:38 UTC (rev 127400)
@@ -0,0 +1,48 @@
+<metal:macro metal:define-macro="page"
+><html metal:use-macro="context/@@standard_macros/page">
+<head>
+
+<metal:slot fill-slot="style_slot">
+<base metal:define-macro="style_slot"
+ href="" tal:attributes="href string:${context/absolute_url}" />
+</metal:slot>
+
+</head>
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<h1 id="DesktopTitle" tal:content="view/title">CONTENT TITLE</h1>
+
+<div id="DesktopDescription" tal:content="view/description">CONTENT DESCRIPTION
+ GOES HERE.</div>
+
+<div metal:define-macro="byline"
+ id="ContentByline" tal:define="mtool context/portal_membership">
+ <p><span tal:omit-tag="" i18n:translate="">Created by</span
+ > <tal:case tal:condition="context/listCreators"
+ ><tal:loop tal:repeat="creator context/listCreators"
+ ><tal:case tal:condition="not: repeat/creator/start"
+ ><tal:case tal:condition="not: repeat/creator/end">, </tal:case
+ ><tal:case tal:condition="repeat/creator/end"
+ > <span tal:omit-tag="" i18n:translate="">and</span> </tal:case
+ ></tal:case
+ ><a href="." title="creator"
+ tal:define="home_url python: mtool.getHomeUrl(creator)"
+ tal:attributes="href home_url; title creator"
+ tal:content="creator"
+ tal:omit-tag="not: home_url">creator</a></tal:loop></tal:case
+ ><tal:case tal:condition="not: context/listCreators"
+ ><span tal:omit-tag="" i18n:translate="">unknown</span></tal:case>.
+ <span tal:omit-tag="" i18n:translate="">Last modified</span
+ > <tal:span tal:content="context/ModificationDate">Today</tal:span>.</p>
+</div>
+
+<metal:slot metal:define-slot="main" />
+
+<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
+ <tal:span tal:replace="structure context/viewThreadsAtBottom" />
+</div>
+</metal:slot>
+
+</body>
+</html></metal:macro>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the checkins
mailing list