Author: jmorliaguet Date: Sat Nov 19 11:19:31 2005 New Revision: 1894 Modified: cpsskins/branches/jmo-perspectives/browser/editing/presentation_editor.pt cpsskins/branches/jmo-perspectives/elements/interfaces.py cpsskins/branches/jmo-perspectives/elements/presentation.py cpsskins/branches/jmo-perspectives/elements/theme.py Log:
- UI fixes Modified: cpsskins/branches/jmo-perspectives/browser/editing/presentation_editor.pt ============================================================================== --- cpsskins/branches/jmo-perspectives/browser/editing/presentation_editor.pt (original) +++ cpsskins/branches/jmo-perspectives/browser/editing/presentation_editor.pt Sat Nov 19 11:19:31 2005 @@ -33,9 +33,9 @@ formats info/formats; perspective info/perspective; perspective_name python: perspective and perspective.name or ''; - perspective_is_current python: perspective == current_perspective; + perspective_is_current python: perspective_name == current_perspective; current_formats python: current_perspective and - presentations[current_perspective.name]['formats'] or []" + presentations[current_perspective]['formats'] or []" tal:attributes="class python: even and 'even' or nothing"> <td tal:content="perspective/title|string:default" /> @@ -90,13 +90,6 @@ <td tal:condition="not:formats"></td> </tal:block> - <td style="background-color: #fff;border:none"> - <tal:block condition="perspective_is_current">⇐ current presentation</tal:block> - <a href="" style="display:block; width: auto" - tal:condition="not:perspective_is_current" - tal:define="perspective python: perspective and perspective or ''" - tal:attributes="href string:@@setPerspective?perspective=$perspective_name"> </a> - </td> </tr> </tal:block> </table> Modified: cpsskins/branches/jmo-perspectives/elements/interfaces.py ============================================================================== --- cpsskins/branches/jmo-perspectives/elements/interfaces.py (original) +++ cpsskins/branches/jmo-perspectives/elements/interfaces.py Sat Nov 19 11:19:31 2005 @@ -245,8 +245,8 @@ """Return the storage implementing the given interface """ - def getPerspectiveById(id): - """Return a perspective by id + def getPerspectiveByName(name): + """Return a perspective by name """ def addPerspective(perspective, id): Modified: cpsskins/branches/jmo-perspectives/elements/presentation.py ============================================================================== --- cpsskins/branches/jmo-perspectives/elements/presentation.py (original) +++ cpsskins/branches/jmo-perspectives/elements/presentation.py Sat Nov 19 11:19:31 2005 @@ -156,7 +156,6 @@ 'perspective': perspective} format_names = [] - # override initial values for r in reltool.search(first=object, predicate=hasDisplay) \ + reltool.search(first=object, Modified: cpsskins/branches/jmo-perspectives/elements/theme.py ============================================================================== --- cpsskins/branches/jmo-perspectives/elements/theme.py (original) +++ cpsskins/branches/jmo-perspectives/elements/theme.py Sat Nov 19 11:19:31 2005 @@ -82,9 +82,9 @@ continue return v - def getPerspectiveById(self, id): - """Return a perspective by id.""" - return getUtility(IResourceManager, 'perspectives').lookup(id, self) + def getPerspectiveByName(self, name): + """Return a perspective by name.""" + return getUtility(IResourceManager, 'perspectives').lookup(name, self) def addPerspective(self, name, title): """Add a perspective to the perspective storage -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins