Author: jmorliaguet
Date: Sun May 21 23:54:52 2006
New Revision: 3192
Added:
cpsskins/branches/paris-sprint-2006/ui/panels/setting_editor.pt (contents,
props changed)
Modified:
cpsskins/branches/paris-sprint-2006/ftests/test_permissions.py
cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js
cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/panels/settings_section.pt
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.css
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt
Log:
- began adding a setting editor
- added an [edit] link for local/customized settings
Modified: cpsskins/branches/paris-sprint-2006/ftests/test_permissions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ftests/test_permissions.py
(original)
+++ cpsskins/branches/paris-sprint-2006/ftests/test_permissions.py Sun May
21 23:54:52 2006
@@ -21,13 +21,13 @@
from zope.app.testing.functional import BrowserTestCase
-from cpsskins.tests.setup import addThemeManager, addThemeSkeleton
+from cpsskins.tests.setup import addThemeManager, addThemeSkeleton, makeSite
class Tests(BrowserTestCase):
def setUp(self):
self.root = self.getRootFolder()
- tmutil = addThemeManager(self.root)
+ tmutil = addThemeManager(self.root, makeSite(self.root))
addThemeSkeleton(tmutil)
def test_theme_view_permission(self):
Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/authoring.js Sun May
21 23:54:52 2006
@@ -1,4 +1,9 @@
+function editSetting(uri) {
+
CPSSkins.getControllerById('site-manager-perspectives').switchTo('setting-editor')
+ CPSSkins.getModelById('setting-editor').updateData({'form': {'uri': uri} });
+}
+
function insertPortlet(info) {
var url = '@@insertElement'
var args = {
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 Sun May
21 23:54:52 2006
@@ -30,6 +30,20 @@
}
},
+ 'setting-editor': {
+ 'id': 'setting-editor',
+ 'data': {
+ 'url': '@@setting-editor.html',
+ 'css': '++resource++site-manager.css',
+ 'script': '',
+ 'form': {
+ 'id': '',
+ 'format': '',
+ 'data': {}
+ },
+ }
+ },
+
'perspective-selector': {
'id': 'perspective-selector',
'data': {
@@ -188,6 +202,16 @@
'controllers': ['main-editor-perspectives'],
},
+ 'setting-editor': {
+ 'id': 'setting-editor',
+ 'widget': {
+ 'type': 'panel',
+ },
+ 'model': 'setting-editor',
+ 'perspectives': ['setting-editor'],
+ 'controllers': ['site-manager-perspectives'],
+ },
+
'tooltip': {
'id': 'tooltip',
'selectors': ['.actionPad a'],
Modified: cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/configure.zcml Sun May
21 23:54:52 2006
@@ -71,6 +71,13 @@
template="element_editor.pt"
/>
+ <!-- setting editor -->
+
+ <page
+ name="setting-editor.html"
+ template="setting_editor.pt"
+ />
+
</pages>
<pages
Added: cpsskins/branches/paris-sprint-2006/ui/panels/setting_editor.pt
==============================================================================
--- (empty file)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/setting_editor.pt Sun May
21 23:54:52 2006
@@ -0,0 +1,10 @@
+<tal:block define="uri request/form/uri|nothing">
+ <a class="back"
+
href="javascript:CPSSkins.getControllerById('site-manager-perspectives').goBack()">Back</a>
+
+ <h3>Setting editor</h3>
+
+ <tal:block content="uri" />
+
+</tal:block>
+
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 Sun May
21 23:54:52 2006
@@ -14,6 +14,9 @@
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 href="javascript:void(0)"
+ tal:attributes="onclick string:editSetting('$uri')"
+ tal:condition="not:readonly">[edit]</a>
</tal:block>
</li>
</ul>
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
Sun May 21 23:54:52 2006
@@ -25,7 +25,7 @@
font-size: 110%;
font-weight: bold;
color: #000;
- border-bottom: 1px solid #666;
+ border-bottom: 1px solid #999;
}
h4 {
@@ -35,6 +35,11 @@
margin-bottom: 0.2em;
}
+.back {
+ border: 1px solid #030;
+ background-color: #efc
+}
+
.description {
color: #333;
padding-right: 1.5em;
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/site_manager.pt
Sun May 21 23:54:52 2006
@@ -7,6 +7,9 @@
<ins class="model" cite="@@getModel?id=settings"></ins>
<ins class="view" cite="@@getView?id=settings"></ins>
+<ins class="model" cite="@@getModel?id=setting-editor"></ins>
+<ins class="view" cite="@@getView?id=setting-editor"></ins>
+
<h2 onclick="javascript:
CPSSkins.getControllerById('site-manager-perspectives').switchTo('negotiation')">
Negotiation</h2>
<ins class="model" cite="@@getModel?id=negotiation"></ins>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
