[Z3lab-checkins] r3166 - cpsskins/branches/paris-sprint-2006/setup/io

2006-05-20 Thread jmorliaguet
Author: jmorliaguet
Date: Sat May 20 10:03:51 2006
New Revision: 3166

Modified:
   cpsskins/branches/paris-sprint-2006/setup/io/fields.py

Log:

- fixed typo



Modified: cpsskins/branches/paris-sprint-2006/setup/io/fields.py
==
--- cpsskins/branches/paris-sprint-2006/setup/io/fields.py  (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/fields.py  Sat May 20 
10:03:51 2006
@@ -62,9 +62,9 @@
 for o in obj:
 res.append(self.field_io.load(o))
 if ITuple.providedBy(self.field):
-obj = tuple(obj)
-self.field.validate(obj)
-return obj
+res = tuple(res)
+self.field.validate(res)
+return res
 
 # Fields  ##
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins


[Z3lab-checkins] r3167 - in cpsskins/branches/paris-sprint-2006/setup: . io

2006-05-20 Thread jmorliaguet
Author: jmorliaguet
Date: Sat May 20 10:14:25 2006
New Revision: 3167

Modified:
   cpsskins/branches/paris-sprint-2006/setup/io/adapters.py
   cpsskins/branches/paris-sprint-2006/setup/manager.py

Log:

- raise an exception if a setting is not found

- resources are already stored in settings - they don't need to be added to 
  a container during XML imports



Modified: cpsskins/branches/paris-sprint-2006/setup/io/adapters.py
==
--- cpsskins/branches/paris-sprint-2006/setup/io/adapters.py(original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/adapters.pySat May 20 
10:14:25 2006
@@ -183,7 +183,6 @@
 value = archive[filename]
 setattr(context, name, value)
 
-
 # child nodes
 for child_el in node.childNodes:
 if child_el.nodeType != Node.ELEMENT_NODE:
@@ -206,12 +205,13 @@
 # create the object
 element = createObject(factory_name)
 
-# add it to the container
-if IStorage.providedBy(context):
-context.add(element, contentname)
-else:
-name = INameChooser(context).chooseName(contentname, element)
-context[name] = element
+if context.__parent__ is None:
+if IStorage.providedBy(context):
+context.add(element, contentname)
+else:
+namechooser = INameChooser(context)
+name = namechooser.chooseName(contentname, element)
+context[name] = element
 
 # load data into the object
 importer = getMultiAdapter((element, child_el), IDOMAdapter)

Modified: cpsskins/branches/paris-sprint-2006/setup/manager.py
==
--- cpsskins/branches/paris-sprint-2006/setup/manager.py(original)
+++ cpsskins/branches/paris-sprint-2006/setup/manager.pySat May 20 
10:14:25 2006
@@ -121,6 +121,8 @@
 
 if '@' in location:
 setting = self.lookup(uri, context)
+if setting is None:
+raise ValueError(No such setting: %s % uri)
 resource = IResource(setting).getResource()
 
 elif ':' in location:
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins


[Z3lab-checkins] r3172 - in cpsskins/branches/paris-sprint-2006: setup ui/editing ui/panels

2006-05-20 Thread jmorliaguet
Author: jmorliaguet
Date: Sat May 20 14:48:52 2006
New Revision: 3172

Modified:
   cpsskins/branches/paris-sprint-2006/setup/manager.py
   cpsskins/branches/paris-sprint-2006/ui/editing/views.py
   cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt

Log:

- register resource uids



Modified: cpsskins/branches/paris-sprint-2006/setup/manager.py
==
--- cpsskins/branches/paris-sprint-2006/setup/manager.py(original)
+++ cpsskins/branches/paris-sprint-2006/setup/manager.pySat May 20 
14:48:52 2006
@@ -46,7 +46,8 @@
custom=False, context=None):
 Register the setting as a utility.
 
-settings = getThemeManager(context).getSettings()
+mgr = getThemeManager(context)
+settings = mgr.getSettings()
 chooser = INameChooser(settings)
 name = name or chooser.chooseName(title, context)
 if context is None:
@@ -61,6 +62,9 @@
 self.unregister(uri, context)
 settings[uri] = setting
 settings.registerUtility(setting, ISetting, uri)
+
+mgr.registerElement(resource)
+
 return setting
 
 def unregister(self, uri=u'', context=None):

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 May 20 
14:48:52 2006
@@ -171,7 +171,8 @@
 if is_setting:
 setting = format
 
-formats.append({'name': format_name, 'id': f.identifier, 'uri': 
uri})
+formats.append({'name': format_name, 'id': f.identifier,
+'uri': uri})
 
 viewer = getMultiAdapter((context, request), IViewer)
 preview = viewer()

Modified: cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt   
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt   Sat May 
20 14:48:52 2006
@@ -13,8 +13,6 @@
  tal:condition=python: not custom and not readonly[remove]/a
   a tal:attributes=href string:@@decustomizeSetting?uri=$uri
  tal:condition=custom[remove customization]/a
-  a tal:attributes=href string:@@exportSetting?uri=$uri
- tal:condition=not:readonly[export]/a
 /tal:block
   /li
   li
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins


[Z3lab-checkins] r3174 - in cpsskins/branches/paris-sprint-2006/ui: editing panels

2006-05-20 Thread jmorliaguet
Author: jmorliaguet
Date: Sat May 20 16:30:05 2006
New Revision: 3174

Modified:
   cpsskins/branches/paris-sprint-2006/ui/editing/views.py
   cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt

Log:

- UI updates



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 May 20 
16:30:05 2006
@@ -171,8 +171,8 @@
 if is_setting:
 setting = format
 
-formats.append({'name': format_name, 'id': f.identifier,
-'uri': uri})
+formats.append({'name': format_name, 'id': f.identifier or 0,
+'uri': uri, 'is_setting': is_setting})
 
 viewer = getMultiAdapter((context, request), IViewer)
 preview = viewer()

Modified: cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt Sat May 
20 16:30:05 2006
@@ -49,17 +49,17 @@
   /div
 
   tal:block condition=python: mode == 'edit'
-div class=form tal:content=structure edited/@@edit.html /
+div tal:condition=not:setting
+ class=form tal:content=structure edited/@@edit.html /
   /tal:block
 
   div class=form tal:condition=python: mode == 'preview'
tal:content=structure info/preview /
 
-   div class=form tal:condition=request/form/format|nothing
-div tal:condition=setting
-  Warning: this is a site setting.
-  Changes made to it may affect several site elements.
-/div
+  div class=form tal:condition=request/form/format|nothing
+p tal:condition=setting
+  This format uses a site-wide setting which cannot be modified here.
+/p
 
 div tal:condition=not:setting
   divCreate a setting/div
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins


[Z3lab-checkins] r3175 - in cpsskins/branches/paris-sprint-2006/ui: panels screens/sitemanager

2006-05-20 Thread jmorliaguet
Author: jmorliaguet
Date: Sat May 20 17:18:49 2006
New Revision: 3175

Modified:
   cpsskins/branches/paris-sprint-2006/ui/panels/settings.pt
   cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css

Log:

- cosmetic



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 May 20 
17:18:49 2006
@@ -1,16 +1,20 @@
 
 table class=panel cellpadding=0 cellspacing=0
tal:define=info context/@@getSettingInfo
+  tr class=header
+th style=width: 50px/th
+th style=width: 150pxCategories/th
+thSettings/th
+  /tr
   tr
 td class=icon
   img src=++resource++settings-48.png /
 /td
 td class=section
   div class=sections
-span class=descriptionmanage settings .../span
-ul
+ul class=items
   li tal:repeat=section python: ['perspective', 'widget', 'style', 
'color']
-a class=section tal:attributes=href 
string:javascript:CPSSkins.getModelById('settings-section').setData({'form': 
{'section': '$section'}}) tal:content=sectionSECTION/a/li
+a tal:attributes=href 
string:javascript:CPSSkins.getModelById('settings-section').setData({'form': 
{'section': '$section'}}) tal:content=sectionSECTION/a/li
 /ul
 br style=clear:both/
   /div

Modified: cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt   
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt   Sat May 
20 17:18:49 2006
@@ -1,8 +1,8 @@
 div class=sections tal:define=section request/form/section|nothing
   div tal:condition=section
-ul tal:define=setting_info context/@@getSettingInfo
+ul class=items tal:define=setting_info context/@@getSettingInfo
   li tal:repeat=info setting_info/?section|nothing
-tal:block content=info/setting/title /
+a tal:attributes=href string: tal:content=info/setting/title /
 tal:block define=name info/name;
uri info/uri;
readonly info/readonly;
@@ -15,9 +15,6 @@
  tal:condition=custom[remove customization]/a
 /tal:block
   /li
-  li
-a tal:attributes=href string:@@refreshSettings[refresh]/a
-  /li
 /ul
   /div
   div tal:condition=not:section

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css
==
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css 
Sat May 20 17:18:49 2006
@@ -46,10 +46,13 @@
   margin: 2px 2px 2px 0;
 }
 
-.sections .section {
-  font: 13px Arial, sans-serif;
+.sections a {
+  font: 12px Arial, sans-serif;
 }
 
+.sections a:hover {
+  background-color: #eee;
+}
 
 a, a:visited, a:hover {
   color: #204a87;
@@ -69,6 +72,17 @@
   width: 100%;
 }
 
+table.panel .header{
+  background-color: #eee;
+  text-align: left;
+  font-size: 90%;
+  color: #666;
+}
+
+table.panel .header th {
+  padding: 0.2em;
+}
+
 table.panel td {
   vertical-align:top;
   padding-top: 0.2em;
@@ -85,3 +99,9 @@
 table.panel td.icon {
   padding: 1em;
 }
+
+.sections .items li {
+  border-bottom: 1px solid #eee;
+  padding: 0.2em;
+}
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins


[Z3lab-checkins] r3177 - in cpsskins/branches/paris-sprint-2006: standard/filters/style ui/panels ui/screens/elementeditor

2006-05-20 Thread jmorliaguet
Author: jmorliaguet
Date: Sun May 21 00:56:06 2006
New Revision: 3177

Modified:
   cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
   cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
   cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
   
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css

Log:

- cosmetic

- all widgets are available in the style editor

- settings can be edited again



Modified: 
cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt
==
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt  
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/style_editor.pt  
Sun May 21 00:56:06 2006
@@ -1,4 +1,5 @@
-div tal:define=widget_types view/getWidgetTypes;
+div i18n:domain=cpsskins
+ tal:define=widget_types view/getWidgetTypes;
  style_id context/identifier
 
   ins class=model tal:content=view/getModelDef /
@@ -17,7 +18,7 @@
   div class=inlineTabs style=margin-bottom: 0.3em
 a i18n:translate=
tal:repeat=type widget_types
-   tal:content=string:widget.$type
+   tal:content=string:widget.${type}
tal:attributes=href 
string:javascript:CPSSkins.getModelById('style-editor').updateData({widget: 
'$type', selector: '', style_id: '$style_id'}); /
   /div
 

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 Sun May 
21 00:56:06 2006
@@ -17,18 +17,15 @@
 
 __docformat__ = reStructuredText
 
-from zope.component import getUtility
 from zope.app import zapi
 from zope.app.cache.ram import RAMCache
 from zope.app.session.interfaces import ISession
+from zope.component import getUtility, getUtilitiesFor
 
 from cpsskins import configuration
 from cpsskins import minjson as json
 from cpsskins import utils
-from cpsskins.elements.interfaces import IFormattable
-from cpsskins.relations.interfaces import IRelatable
 from cpsskins.setup.interfaces import IResourceManager
-from cpsskins.standard.formats.style import IStyle
 from cpsskins.utils import getThemeManager
 
 cache = RAMCache()
@@ -44,10 +41,7 @@
 self.tmutil = getThemeManager(context)
 
 def getWidgetTypes(self):
-display_id = self.request.form.get('display')
-display = self.tmutil.getElementById(display_id)
-widget = IFormattable(display).getFormat(u'widget')
-return widget.types
+return [w[0] for w in getUtilitiesFor(configuration.IWidget)]
 
 def renderWidgetPreview(self):
 Render a style preview based on the specified widget.
@@ -123,7 +117,6 @@
 resources = getUtility(IResourceManager)
 style = resources.resolve(uri, context=self.context)
 
-
 props = {}
 for name in self.getFieldNames():
 value = self.request.form.get(name)

Modified: cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt
==
--- cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/element_editor.pt Sun May 
21 00:56:06 2006
@@ -49,8 +49,7 @@
   /div
 
   tal:block condition=python: mode == 'edit'
-div tal:condition=not:setting
- class=form tal:content=structure edited/@@edit.html /
+div class=form tal:content=structure edited/@@edit.html /
   /tal:block
 
   div class=form tal:condition=python: mode == 'preview'
@@ -58,7 +57,7 @@
 
   div class=form tal:condition=request/form/format|nothing
 p tal:condition=setting
-  This format uses a site-wide setting which cannot be modified here.
+  This format uses a site-wide setting.
 /p
 
 div tal:condition=not:setting

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css
==
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css 
(original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/elementeditor/element-editor.css 
Sun May 21 00:56:06 2006
@@ -51,7 +51,10 @@
 }
 
 div.inlineTabs a {
-  border-bottom: 1px solid #ccc;
-  background-color: #eee;
+  margin-left: 0.2em;
+  background-color: #efc;
+  color: #060;
+  border: 1px solid #ccc;
+  padding: 0 0.4em
 }
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins