Author: jmorliaguet Date: Sun Jun 25 23:47:31 2006 New Revision: 3525 Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
Log: - display vocabulary tokens for location scopes Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt Sun Jun 25 23:47:31 2006 @@ -53,7 +53,8 @@ <input type="hidden" name="root" tal:attributes="value section" /> <input type="hidden" name="action" value="add" /> <input type="text" name="location_path" value="/" /> - <input class="submit" type="submit" value="add" /> + <input style="background-color: #ccf" + class="submit" type="submit" value="add" /> <a class="button" i18n:translate="" tal:attributes="href string:javascript:CPSSkins.getModelById('negotiation-section').setData({'form': {'section': '$section'}})">cancel</a> </td> @@ -61,7 +62,8 @@ <input type="hidden" name="action" value="edit" /> <input type="hidden" name="root" tal:attributes="value section" /> <input type="hidden" name="location_path" tal:attributes="value edited" /> - <input class="submit" type="submit" value="save" /> + <input style="background-color: #ccf" class="submit" + type="submit" value="save" /> <a class="button" i18n:translate="" tal:attributes="href string:javascript:CPSSkins.getModelById('negotiation-section').setData({'form': {'section': '$section'}})">cancel</a> </td> 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 Sun Jun 25 23:47:31 2006 @@ -20,6 +20,7 @@ from zope.component import getUtility from zope.formlib import form from zope.schema import getFields +from zope.schema.interfaces import IVocabularyFactory from cpsskins import minjson as json from cpsskins.locations import Location @@ -141,14 +142,17 @@ tmutil = getThemeManager(self.context) locations = tmutil.getLocationStorage() + scopes_factory = getUtility(IVocabularyFactory, u'location scopes') + info = {} for root in locations.getRoots(): info[root] = {} for location in locations.getLocations(root): + scopes = scopes_factory(location) info[root][location.path] = { 'path': location.path, 'data': location.data, - 'scope': location.scope, + 'scope': scopes.getTerm(location.scope).token, 'object': location, } return info -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins