Menu
▾
▴
[Plone-cvs] r39494 - in sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles: . templates
|
From: Rok G. <svn...@pl...> - 2010-08-29 17:28:25
|
Author: garbas
Date: Sun Aug 29 17:28:16 2010
New Revision: 39494
Removed:
sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/navtree.py
sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/templates/navtree.pt
Modified:
sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/configure.zcml
sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/navigation.py
sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/standardtiles.txt
sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/templates/navigation.pt
Log:
removing navtree tile and adding tested navigation tile, still tickets #10994, #10995 are open for this tile
Modified: sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/configure.zcml
==============================================================================
--- sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/configure.zcml (original)
+++ sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/configure.zcml Sun Aug 29 17:28:16 2010
@@ -223,18 +223,6 @@
/>
<plone:tile
- name="plone.app.standardtiles.navtree"
- title="Navigation tree"
- add_permission="zope2.View"
- class=".navtree.NavtreeTile"
- template="templates/navtree.pt"
- permission="zope.Public"
- />
-
- <adapter
- factory=".navtree.TreeFactory" />
-
- <plone:tile
name="plone.app.standardtiles.contentlisting"
title="Content listing"
description='A tile which displays the content listing of this item'
Modified: sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/navigation.py
==============================================================================
--- sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/navigation.py (original)
+++ sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/navigation.py Sun Aug 29 17:28:16 2010
@@ -17,7 +17,7 @@
from Products.CMFDynamicViewFTI.interface import IBrowserDefault
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from plone.tiles import Tile
+from plone.tiles import PersistentTile
from plone.memoize.instance import memoize
from plone.directives.form import Schema
from plone.i18n.normalizer.interfaces import IIDNormalizer
@@ -97,7 +97,7 @@
required=False)
-class NavigationTile(Tile):
+class NavigationTile(PersistentTile):
implements(INavigationTile)
@@ -108,10 +108,9 @@
self.properties = portal_properties.navtree_properties
def title(self):
- # FIXME: this should be actually fixed in TIle Data provider stuff
- if self.data['name'] or self.data['name'] == 'None':
+ if not self.data['name'] or self.data['name'] == 'None':
return self.properties.name
- return self.date['name']
+ return self.data['name']
@property
def available(self):
Modified: sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/standardtiles.txt
==============================================================================
--- sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/standardtiles.txt (original)
+++ sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/standardtiles.txt Sun Aug 29 17:28:16 2010
@@ -336,17 +336,47 @@
Rendering this tile in the site root should show the document we
created before::
- >>> browser.open(portalURL + '/@@add-tile/plone.app.standardtiles.navtree/navtree-tile')
+ >>> browser.open(portalURL + '/@@add-tile/plone.app.standardtiles.navigation/navigation-tile')
+ >>> browser.getControl(name='name').value = 'TEST NAVIGATION TILE'
+ >>> browser.getControl(name='includeTop:list').value = ['selected']
+ >>> browser.getControl(name='topLevel').value = '0'
>>> browser.getControl(label='Save').click()
- >>> browser.open(portalURL + '/@@plone.app.standardtiles.navtree/navtree-tile')
+ >>> browser.open(portalURL + '/@@plone.app.standardtiles.navigation/navigation-tile')
>>> print browser.contents
<body>
- <ul id="navigation" class="navigation">
- <li>
- <a href="http://nohost/plone/a-simple-page" class="state-missing-value" title="A description">
- A simple page <em class="icon document">(Page)</em></a>
- </li>
- </ul>
+ <div class="navigationTile">
+ <h2 class="tileHeader">TEST NAVIGATION TILE</h2>
+ <ul class="navTree navTreeLevel0">
+ <li class="navTreeItem navTreeTopNode navTreeCurrentNode">
+ <div>
+ <a href="http://nohost/plone" class="contenttype-plone-site navTreeCurrentItem" title="">
+ Home
+ </a>
+ </div>
+ </li>
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ <li class="navTreeItem visualNoMarker section-a-simple-page">
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ <a href="http://nohost/plone/a-simple-page" class="state-missing-value contenttype-document" title="A description">
+ <BLANKLINE>
+ <span>A simple page</span>
+ </a>
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ </li>
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ <BLANKLINE>
+ </ul>
+ </div>
</body>
Modified: sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/templates/navigation.pt
==============================================================================
--- sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/templates/navigation.pt (original)
+++ sandbox/plone.app.standardtiles/trunk/plone/app/standardtiles/templates/navigation.pt Sun Aug 29 17:28:16 2010
@@ -4,39 +4,34 @@
i18n:domain="plone"
tal:omit-tag="">
<body>
-
<div class="navigationTile"
tal:define="root view/navigation_root">
-
<h2 class="tileHeader"
tal:condition="view/title"
tal:content="view/title">
Navigation
</h2>
-
<ul class="navTree navTreeLevel0">
<li tal:define="selectedClass view/root_item_class;
li_class python:selectedClass and ' navTreeCurrentNode' or '';"
tal:condition="view/include_top"
tal:attributes="class string:navTreeItem navTreeTopNode${li_class}">
<div tal:define="rootIsPortal view/root_is_portal;">
- <a tal:attributes="href root/absolute_url;
+ <a tal:attributes="href root/absolute_url;
title root/Description;
class string:contenttype-plone-site $selectedClass;">
- <span tal:omit-tag=""
- tal:condition="rootIsPortal"
- i18n:translate="tabs_home">Home</span>
- <span tal:condition="not:rootIsPortal"
- tal:replace="root/Title">Root item title</span>
- </a>
+ <span tal:omit-tag=""
+ tal:condition="rootIsPortal"
+ i18n:translate="tabs_home">Home</span><span
+ tal:condition="not:rootIsPortal"
+ tal:replace="root/Title">Root item title</span>
+ </a>
</div>
</li>
<li tal:replace="structure view/createNavTree">
SUBTREE
</li>
</ul>
-
</div>
-
</body>
</html>
|