Author: jmorliaguet
Date: Sat Apr 22 22:36:54 2006
New Revision: 2940
Modified:
cpsskins/branches/paris-sprint-2006/browser/caching.py
cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py
cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py
cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
cpsskins/branches/paris-sprint-2006/ui/authoring/views.py
cpsskins/branches/paris-sprint-2006/ui/editing/views.py
cpsskins/branches/paris-sprint-2006/ui/manager/views.py
cpsskins/branches/paris-sprint-2006/ui/panels/io.pt
cpsskins/branches/paris-sprint-2006/ui/panels/io_section.pt
cpsskins/branches/paris-sprint-2006/ui/panels/negotiation.pt
cpsskins/branches/paris-sprint-2006/ui/panels/portlet_factory.pt
cpsskins/branches/paris-sprint-2006/ui/panels/settings.pt
cpsskins/branches/paris-sprint-2006/ui/panels/theme_tabs.pt
cpsskins/branches/paris-sprint-2006/ui/panels/views.py
cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
Log:
- making it easier for Five to find views / resources
Modified: cpsskins/branches/paris-sprint-2006/browser/caching.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/caching.py (original)
+++ cpsskins/branches/paris-sprint-2006/browser/caching.py Sat Apr 22
22:36:54 2006
@@ -18,14 +18,17 @@
__docformat__ = "reStructuredText"
from zope.app.file.browser.image import ImageData
-from zope.publisher.browser import BrowserView
from cpsskins.utils import getThemeManager
-class ImageCacheView(BrowserView):
+class ImageCacheView:
"""A view for accessing cached images.
"""
+ def __init__(self, element, request):
+ self.element = element
+ self.request = request
+
def getCachedImage(self, key):
tmutil = getThemeManager(self.context)
cache = tmutil.getImageCache()
Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py Sat Apr
22 22:36:54 2006
@@ -18,7 +18,6 @@
__docformat__ = "reStructuredText"
from zope.app import zapi
-from zope.publisher.browser import BrowserView
from zope.component import getMultiAdapter
from zope.interface import implements
@@ -28,11 +27,15 @@
from cpsskins.browser.negotiation.interfaces import INegotiationStrategy
from cpsskins.utils import getThemeManager
-class NegotiationView(BrowserView):
+class NegotiationView:
"""A view for the negotiation of the effective theme, perspective, ...
"""
implements(INegotiation)
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def negotiate(self, name):
manager = getThemeManager(self.context)
strategy = zapi.getUtility(INegotiationStrategy, manager.negotiation)
Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py Sat Apr
22 22:36:54 2006
@@ -19,7 +19,6 @@
import logging
-from zope.publisher.browser import BrowserView
from zope.app.zapi import getMultiAdapter, queryMultiAdapter
from zope.component import adapts, queryUtility
from zope.interface import implements
@@ -163,7 +162,7 @@
return filters
-class ZPTViewFilter(BrowserView):
+class ZPTViewFilter:
"""A filter view that renders a zope page template.
"""
def __init__(self, context, request):
Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py Sat Apr
22 22:36:54 2006
@@ -20,7 +20,6 @@
import logging
from zope.app import zapi
-from zope.publisher.browser import BrowserView
from zope.traversing.api import getParent
from zope.app.zapi import getMultiAdapter
from zope.component import adapts, getUtility
@@ -45,7 +44,7 @@
def __init__(self, object):
self.object = object
-class Viewer(BrowserView):
+class Viewer:
"""An element viewer provides a view of an element which is displayed
in two phases:
@@ -75,6 +74,7 @@
negotiation = getMultiAdapter((element, request),
INegotiation, 'negotiation')
perspective = negotiation.getPerspective()
+ perspective = u'default'
# update global context info variables passed as keyword parameters
globals = ContextInfo(kw)
Modified: cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
(original)
+++ cpsskins/branches/paris-sprint-2006/perspectives/perspective.py Sat Apr
22 22:36:54 2006
@@ -19,7 +19,6 @@
from xml.dom.minidom import parseString
-from zope.publisher.browser import BrowserView
from zope.component import adapts
from zope.component.factory import Factory
from zope.interface import implements, implementedBy
Modified: cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py Sat Apr
22 22:36:54 2006
@@ -17,7 +17,6 @@
"""
__docformat__ = "reStructuredText"
-from zope.publisher.browser import BrowserView
from zope.interface import implements, Interface
from zope.component import getUtility, getUtilitiesFor
@@ -31,11 +30,15 @@
def renderCSS():
"""Render the styles in CSS"""
-class StylesheetView(BrowserView):
+class StylesheetView:
"""A stylesheet renderer
"""
implements(IStylesheetView)
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def renderCSS(self):
"""Render the styles in CSS
"""
Modified: cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py Sat Apr
22 22:36:54 2006
@@ -19,16 +19,19 @@
from zope.component import getUtility
from zope.app import zapi
-from zope.publisher.browser import BrowserView
from cpsskins import configuration
from cpsskins import minjson as json
from cpsskins.standard.formats.style import IStyle
from cpsskins.utils import getThemeManager
-class StyleEditor(BrowserView):
+class StyleEditor:
"""Style editor view"""
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def renderPreview(self, widget_type):
"""Render a style preview based on the specified widget.
"""
@@ -54,7 +57,7 @@
},
})
-class JSONView(BrowserView):
+class JSONView:
"""JSON methods
>>> s = Style()
@@ -80,8 +83,12 @@
{u'div.body': {'color': 'red'}}
"""
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def getWidgetType(self):
- return
+ return
def getWidgetStyle(self):
return json.write(dict(self.context))
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
Sat Apr 22 22:36:54 2006
@@ -19,7 +19,6 @@
import logging
-from zope.publisher.browser import BrowserView
from zope.component import adapts
from zope.component import queryMultiAdapter
from zope.interface import implements
@@ -88,7 +87,7 @@
return factory(markup=markup, info=info)
-class WidgetView(BrowserView):
+class WidgetView:
"""Widgets are used for formatting elements using some HTML markup.
The '_preview' variable (a string) contains a preview of the widget
@@ -110,6 +109,10 @@
"""
implements(IWidgetView)
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def redirect(self, url):
return self.request.response.redirect(url)
Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py Sat Apr
22 22:36:54 2006
@@ -15,7 +15,7 @@
'id': 'element-editor',
'data': {
'url': '@@element-editor.html',
- 'css': '/++skin++cpsskins/@@/++resource++element-editor.css',
+ 'css': '++resource++element-editor.css',
'form': {
'id': '',
'format': '',
@@ -59,7 +59,7 @@
'form': {
'engine': 'page-designer',
},
- 'css': '/++skin++cpsskins/@@/++resource++page-designer.css',
+ 'css': '++resource++page-designer.css',
}
},
@@ -70,7 +70,7 @@
'form': {
'engine': 'layout-designer',
},
- 'css': '/++skin++cpsskins/@@/++resource++layout-designer.css',
+ 'css': '++resource++layout-designer.css',
}
},
@@ -81,7 +81,7 @@
'form': {
'engine': 'content-author',
},
- 'css': '/++skin++cpsskins/@@/++resource++content-author.css',
+ 'css': '++resource++content-author.css',
}
},
@@ -89,7 +89,7 @@
'id': 'interaction-designer',
'data': {
'url': '@@interaction-designer.html',
- 'css': '/++skin++cpsskins/@@/++resource++interaction-designer.css',
+ 'css': '++resource++interaction-designer.css',
}
},
@@ -97,7 +97,7 @@
'id': 'site-manager',
'data': {
'url': '@@site-manager.html',
- 'css': '/++skin++cpsskins/@@/++resource++site-manager.css',
+ 'css': '++resource++site-manager.css',
}
},
@@ -377,13 +377,13 @@
'items': [
{'type': 'item',
'label': _('Edit'),
- 'icon': '/++skin++cpsskins/@@/++resource++edit-16.png',
+ 'icon': '++resource++edit-16.png',
'action': 'edit element',
'visible': 'editable',
},
{'type': 'item',
'label': _('Duplicate'),
- 'icon': '/++skin++cpsskins/@@/++resource++duplicate-16.png',
+ 'icon': '++resource++duplicate-16.png',
'action': 'duplicate element',
'visible': 'editable',
},
@@ -391,12 +391,12 @@
},
{'type': 'item',
'label': _('Copy'),
- 'icon': '/++skin++cpsskins/@@/++resource++copy-16.png',
+ 'icon': '++resource++copy-16.png',
'action': 'copy element',
},
{'type': 'item',
'label': _('Paste'),
- 'icon': '/++skin++cpsskins/@@/++resource++paste-16.png',
+ 'icon': '++resource++paste-16.png',
'action': 'paste element',
'visible': 'editable',
},
@@ -416,7 +416,7 @@
},
{'type': 'item',
'label': _('Delete'),
- 'icon': '/++skin++cpsskins/@@/++resource++delete-16.png',
+ 'icon': '++resource++delete-16.png',
'action': 'delete element',
'confirm': _('Deleting, are you sure?'),
}
Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/views.py Sat Apr 22
22:36:54 2006
@@ -18,7 +18,6 @@
__docformat__ = "reStructuredText"
from zope.lifecycleevent import ObjectCreatedEvent
-from zope.publisher.browser import BrowserView
from zope.app.session.interfaces import ISession
from zope.app.zapi import getParent, getMultiAdapter
from zope.component import adapts, getUtility, createObject
@@ -43,7 +42,8 @@
class IAuthoring(Interface):
"""Authoring views"""
-class Authoring(BrowserView):
+class Authoring:
+ """Authoring views"""
implements(IAuthoring)
@@ -285,7 +285,12 @@
duplicating = getMultiAdapter((container, request), INodeDuplicating)
return str(duplicating.duplicate(element))
-class JSONViews(BrowserView):
+class JSONViews:
+ """JSON views"""
+
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
def getHint(self, msgid):
return json.write({
Modified: cpsskins/branches/paris-sprint-2006/ui/editing/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/views.py Sat Apr 22
22:36:54 2006
@@ -19,7 +19,6 @@
from zope.location.traversing import LocationPhysicallyLocatable
from zope.location.pickling import locationCopy
-from zope.publisher.browser import BrowserView
from zope.app.zapi import queryMultiAdapter, getMultiAdapter, getParent
from zope.component import queryUtility, getUtility
from zope.interface import implements, Interface
@@ -54,10 +53,14 @@
def getIcon():
""" """
-class Editing(BrowserView):
+class Editing:
implements(IEditing)
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def getId(self):
"""Return the element's id
"""
@@ -111,7 +114,11 @@
return ''
-class EditPanel(BrowserView):
+class EditPanel:
+
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
def getAbsoluteURL(self, object):
return getMultiAdapter((object, self.request), name=u'absolute_url')()
@@ -196,16 +203,24 @@
class ISettingsView(Interface):
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def createSetting(title):
"""Create a setting from an object considered as a resource."""
def useSettingAsFormat(setting_name):
"""Replace an existing format with a setting."""
-class SettingsView(BrowserView):
+class SettingsView:
implements(ISettingsView)
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def createSetting(self, title=u''):
"""Create a setting from the context.
"""
Modified: cpsskins/branches/paris-sprint-2006/ui/manager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/manager/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/manager/views.py Sat Apr 22
22:36:54 2006
@@ -20,7 +20,6 @@
import urllib
from zope.app import zapi
-from zope.publisher.browser import BrowserView
from zope.interface import implements, Interface
from cpsskins.browser.negotiation.interfaces import INegotiation
@@ -43,11 +42,15 @@
(id, title, url)
"""
-class ThemeManagerView(BrowserView):
+class ThemeManagerView:
"""Themes manager view.
"""
implements(IThemeManagerView)
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def getThemeManager(self):
return self.context
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/io.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/io.pt (original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/io.pt Sat Apr 22 22:36:54 2006
@@ -3,7 +3,7 @@
tal:define="info context/@@getSettingInfo">
<tr>
<td class="icon">
- <img src="/++skin++cpsskins/@@/++resource++io-48.png" />
+ <img src="++resource++io-48.png" />
</td>
<td class="section">
<div class="sections">
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/io_section.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/io_section.pt (original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/io_section.pt Sat Apr 22
22:36:54 2006
@@ -27,7 +27,7 @@
<form action="@@importSnapshot" method="post"
enctype="multipart/form-data">
<select name="filename">
- <option tal:repeat="snapshot view/@@listSnapshots"
+ <option tal:repeat="snapshot context/@@listSnapshots"
tal:content="snapshot" />
</select>
<button type="submit">Load</button>
@@ -37,7 +37,7 @@
<div tal:condition="python: section == 'snapshots'">
<h3>Snapshots</h3>
<ul>
- <li tal:repeat="snapshot view/@@listSnapshots">
+ <li tal:repeat="snapshot context/@@listSnapshots">
<a tal:attributes="href string:@@downloadSnapshot?filename=$snapshot"
tal:content="snapshot" />
</li>
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/negotiation.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/negotiation.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/negotiation.pt Sat Apr
22 22:36:54 2006
@@ -2,7 +2,7 @@
tal:define="info context/@@getSettingInfo">
<tr>
<td class="icon">
- <img src="/++skin++cpsskins/@@/++resource++negotiation-48.png" />
+ <img src="++resource++negotiation-48.png" />
</td>
<td class="section">
<div class="sections">
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/portlet_factory.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/portlet_factory.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/portlet_factory.pt Sat Apr
22 22:36:54 2006
@@ -9,7 +9,7 @@
<img width="16" height="16"
i18n:attributes="title"
tal:attributes="title title;
- src string:/++skin++cpsskins/++resource++${portlet/icon}" /></td>
+ src string:++resource++${portlet/icon}" /></td>
</tal:block>
</tr>
</table>
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/settings.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/settings.pt (original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/settings.pt Sat Apr 22
22:36:54 2006
@@ -3,7 +3,7 @@
tal:define="info context/@@getSettingInfo">
<tr>
<td class="icon">
- <img src="/++skin++cpsskins/@@/++resource++settings-48.png" />
+ <img src="++resource++settings-48.png" />
</td>
<td class="section">
<div class="sections">
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/theme_tabs.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/theme_tabs.pt (original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/theme_tabs.pt Sat Apr 22
22:36:54 2006
@@ -8,7 +8,7 @@
<tal:block define="selected python: theme == effective_theme">
<td tal:attributes="class python: selected and 'ltabselected' or
'ltab'">
<img alt="" width="5" height="5"
- src="/++skin++cpsskins/@@/++resource++ltab.png" />
+ src="++resource++ltab.png" />
</td>
<td tal:attributes="class python: selected and 'tabselected' or 'tab'">
<a tal:content="theme/title"
@@ -16,7 +16,7 @@
</td>
<td tal:attributes="class python: selected and 'rtabselected' or
'rtab'">
<img alt="" width="5" height="5"
- src="/++skin++cpsskins/@@/++resource++rtab.png" />
+ src="++resource++rtab.png" />
</td>
<td class="separator"></td>
</tal:block>
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/views.py Sat Apr 22
22:36:54 2006
@@ -17,7 +17,6 @@
"""
__docformat__ = "reStructuredText"
-from zope.publisher.browser import BrowserView
from zope.app.zapi import getMultiAdapter
from zope.interface import implements, Interface
@@ -25,7 +24,11 @@
from cpsskins.browser.rendering.interfaces import IViewer
from cpsskins.utils import getThemeManager
-class Rendering(BrowserView):
+class Rendering:
+
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
def renderPage(self, engine=u''):
"""Render the page
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt (original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt Sat Apr 22
22:36:54 2006
@@ -2,26 +2,17 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++authoring.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++cpsskins.css" />
- <link rel="Stylesheet" type="text/css"
- href="/++skin++cpsskins/@@/++resource++widgets.css" />
-
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++misc.js"></script>
-
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++prototype.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++json.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++ctal.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++cpsskins.js"></script>
- <script type="text/javascript"
- src="/++skin++cpsskins/@@/++resource++authoring.js"></script>
+ <link rel="Stylesheet" type="text/css" href="++resource++authoring.css" />
+ <link rel="Stylesheet" type="text/css" href="++resource++cpsskins.css" />
+ <link rel="Stylesheet" type="text/css" href="++resource++widgets.css" />
+
+ <script type="text/javascript" src="++resource++misc.js"></script>
+
+ <script type="text/javascript" src="++resource++prototype.js"></script>
+ <script type="text/javascript" src="++resource++json.js"></script>
+ <script type="text/javascript" src="++resource++ctal.js"></script>
+ <script type="text/javascript" src="++resource++cpsskins.js"></script>
+ <script type="text/javascript" src="++resource++authoring.js"></script>
</head>
<body>
<div class="floatingHeader">
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py Sat Apr
22 22:36:54 2006
@@ -21,7 +21,6 @@
from zope.app.interface import queryType
from zope.app.file import File
-from zope.publisher.browser import BrowserView
from zope.component import getUtilitiesFor, getUtility, getMultiAdapter
from zope.component import queryUtility, getAllUtilitiesRegisteredFor
@@ -42,7 +41,11 @@
</themes>
"""
-class SiteDesignerView(BrowserView):
+class SiteDesignerView:
+
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
###################################################################
# Settings
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
