Author: jmorliaguet
Date: Tue May 9 11:22:41 2006
New Revision: 3085
Modified:
cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt
cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
cpsskins/branches/paris-sprint-2006/standard/filters/widget/widgets.py
Log:
- the name of the widget is now getting inserted in the rendered code of the
widget as a CSS class (<div class="someWidget">...</div>)
also widgets no longer need to contain CSS classes
this is meant to create namespaces, e.g.
<img class="imageWidgetA" />
being different from:
<img class="imageWidgetB" />
Modified: cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt
(original)
+++ cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt Tue May
9 11:22:41 2006
@@ -206,7 +206,7 @@
>>> info.data = None
>>> test_render(widget, rendered, info)
- u'<div><h1>Test of HTML</h1></div>'
+ u'<div class="standardPlainHtml"><h1>Test of HTML</h1></div>'
Available widgets:
==================
@@ -222,31 +222,31 @@
----------------
>>> widget = Widget([u'standard.vertical_menu'])
>>> test_render(widget, rendered, info)
- u'<ul class="verticalMenu"><li><a href="@@urlA.html">Item A</a></li><li><a
href="@@urlB.html">Item B</a></li></ul>'
+ u'<ul class="standardVerticalMenu"><li><a href="@@urlA.html">Item
A</a></li><li><a href="@@urlB.html">Item B</a></li></ul>'
b) horizontal tabs
------------------
>>> widget = Widget([u'standard.horizontal_tabs'])
>>> test_render(widget, rendered, info)
- u'<ul class="horizontalTabs"><li><a href="@@urlA.html">Item
A</a></li><li><a href="@@urlB.html">Item B</a></li></ul>'
+ u'<ul class="standardHorizontalTabs"><li><a href="@@urlA.html">Item
A</a></li><li><a href="@@urlB.html">Item B</a></li></ul>'
c) Menu bar
-------------------
>>> widget = Widget([u'standard.menu_bar'])
>>> test_render(widget, rendered, info)
- u'<div class="menuBar"><a href="@@urlA.html">Item A</a><a
href="@@urlB.html">Item B</a></div>'
+ u'<div class="standardMenuBar"><a href="@@urlA.html">Item A</a><a
href="@@urlB.html">Item B</a></div>'
d) Horizontal trail
-------------------
>>> widget = Widget([u'standard.horizontal_trail'])
>>> test_render(widget, rendered, info)
- u'<div class="horizontalTrail"><a href="@@urlA.html">Item A</a><span
class="sep">></span><a href="@@urlB.html">Item B</a><span
class="sep">></span></div>'
+ u'<div class="standardHorizontalTrail"><a href="@@urlA.html">Item
A</a><span class="sep">></span><a href="@@urlB.html">Item B</a><span
class="sep">></span></div>'
e) Drop-down list
-----------------
>>> widget = Widget([u'standard.dropdown_list'])
>>> test_render(widget, rendered, info)
- u'<form action="@@cpsskins_redirect" method="post"><select
onchange="submit()" name="url"><option value="./"></option><option
value="@@urlA.html">Item A</option><option value="@@urlB.html">Item
B</option></select></form>'
+ u'<form action="@@cpsskins_redirect" class="standardDropdownList"
method="post"><select onchange="submit()" name="url"><option
value="./"></option><option value="@@urlA.html">Item A</option><option
value="@@urlB.html">Item B</option></select></form>'
Widgets displaying HTML markup
@@ -261,37 +261,37 @@
>>> info.metadata = MetaData(title=u'Example frame box')
>>> widget = Widget([u'standard.frame_box'])
>>> test_render(widget, rendered, info)
- u'<fieldset><legend>Example frame box</legend><div><h1>Test of
HTML</h1></div></fieldset>'
+ u'<fieldset class="standardFrameBox"><legend>Example frame
box</legend><div><h1>Test of HTML</h1></div></fieldset>'
b) horizontal scrollbar
-----------------------
>>> widget = Widget([u'standard.horizontal_scrollbar'])
>>> test_render(widget, rendered, info)
- u'<div style="overflow-x:scroll;"><h1>Test of HTML</h1></div>'
+ u'<div style="overflow-x:scroll;"
class="standardHorizontalScrollbar"><h1>Test of HTML</h1></div>'
c) pageblock frame
- --------------
+ ------------------
>>> widget = Widget([u'standard.pageblock_frame'])
>>> test_render(widget, rendered, info)
- u'<table summary=""><tr><h1>Test of HTML</h1></tr></table>'
+ u'<table summary="" class="standardPageblockFrame"><tr><h1>Test of
HTML</h1></tr></table>'
d) cell frame
- --------------
+ -------------
>>> widget = Widget([u'standard.cell_frame'])
>>> test_render(widget, rendered, info)
- u'<td style="vertical-align:top;"><h1>Test of HTML</h1></td>'
+ u'<td style="vertical-align:top;" class="standardCellFrame"><h1>Test of
HTML</h1></td>'
e) pageblock frame (tableless rendering)
------------------------------------
>>> widget = Widget([u'tableless-standard.pageblock_frame'])
>>> test_render(widget, rendered, info)
- u'<div><h1>Test of HTML</h1><br style="clear:left"/></div><div
style="clear:left"></div>'
+ u'<div class="tablelessStandardPageblockFrame"><h1>Test of HTML</h1><br
style="clear:left"/></div><div style="clear:left"></div>'
f) cell frame (tableless rendering)
---------------------------------
>>> widget = Widget([u'tableless-standard.cell_frame'])
>>> test_render(widget, rendered, info)
- u'<div style="float:left;overflow:hidden"><h1>Test of HTML</h1></div>'
+ u'<div style="float:left;overflow:hidden"
class="tablelessStandardCellFrame"><h1>Test of HTML</h1></div>'
Widgets displaying images
@@ -304,6 +304,6 @@
--------
>>> widget = Widget([u'standard.image'])
>>> test_render(widget, rendered, info)
- u'<img src="/some/image.png" alt="" style="border: none" />'
+ u'<img src="/some/image.png" alt="" style="border: none"
class="standardImage" />'
[to finish]
Modified:
cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
Tue May 9 11:22:41 2006
@@ -24,11 +24,12 @@
from zope.interface import implements
from zope.i18nmessageid import MessageFactory
+from cpsskins import utils
from cpsskins.browser.rendering.interfaces import IFilterView
from cpsskins.standard.ds.html import HTML
from cpsskins.standard.formats.widget import IWidget
-from cpsskins.standard.filters.widget.interfaces import (
- IBasicWidgetView, IWidgetView)
+from cpsskins.standard.filters.widget.interfaces import IBasicWidgetView
+from cpsskins.standard.filters.widget.interfaces import IWidgetView
logger = logging.getLogger("cpsskins")
@@ -85,7 +86,9 @@
repr(info.element))
return markup
- return factory(markup=markup, info=info)
+ markup = factory(markup=markup, info=info)
+ markup = utils.insertCSSClass(markup, utils.camelize(type))
+ return markup
class WidgetView:
"""Widgets are used for formatting elements using some HTML markup.
Modified: cpsskins/branches/paris-sprint-2006/standard/filters/widget/widgets.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/widget/widgets.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/widget/widgets.py
Tue May 9 11:22:41 2006
@@ -128,10 +128,10 @@
_preview = u'<body>Page content</body>'
class VerticalMenu(MenuView):
- _start = u'<ul class="verticalMenu">'
+ _start = u'<ul>'
_repeat = u'<li><a href="%(url)s">%(title)s</a></li>'
_end = u'</ul>'
- _preview = u'<ul label="menu box" class="verticalMenu">' \
+ _preview = u'<ul label="menu box">' \
'<li label="menu item">' \
'<a label="link" href="#">First item</a></li>' \
'<li label="menu item">' \
@@ -141,10 +141,10 @@
'</ul>'
class HorizontalTabs(MenuView):
- _start = u'<ul class="horizontalTabs">'
+ _start = u'<ul>'
_repeat = u'<li><a href="%(url)s">%(title)s</a></li>'
_end = u'</ul>'
- _preview = u'<ul label="menu box" class="horizontalTabs">' \
+ _preview = u'<ul label="menu box">' \
'<li label="menu tab">' \
'<a label="link" href="#">First item</a></li>' \
'<li label="menu tab">' \
@@ -154,10 +154,10 @@
'</ul>'
class MenuBar(MenuView):
- _start = u'<div class="menuBar">'
+ _start = u'<div>'
_repeat = u'<a href="%(url)s">%(title)s</a>'
_end = u'</div>'
- _preview = u'<ul label="menu bar" class="menuBar">' \
+ _preview = u'<ul label="menu bar">' \
'<li label="menu item">' \
'<a label="link" href="#">First item</a></li>' \
'<li label="menu item">' \
@@ -167,11 +167,11 @@
'</ul>'
class HorizontalTrail(MenuView):
- _start = u'<div class="horizontalTrail">'
+ _start = u'<div>'
_repeat = u'<a href="%(url)s">%(title)s</a>'
_separator = u'<span class="sep">></span>'
_end = u'</div>'
- _preview = u'<div label="box" class="horizontalTrail">' \
+ _preview = u'<div label="box">' \
'<a label="trail item" href="#">First item</a>' \
'<span label="separator" class="sep">></span>' \
'<a label="trail item" href="#">Second item</a>' \
@@ -249,7 +249,7 @@
"""Display a monthly calendar
"""
_markup = u'Not done yet'
- _preview = u'<table label="calendar" class="calendar">' \
+ _preview = u'<table label="calendar">' \
'<thead><tr label="header">' \
'<th>Mo</th><th>Tu</th><th>We</th><th>Th</th>' \
'<th>Fr</th><th>Sa</th><th>Su</th></tr></thead>' \
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
