From fa6290753c233a13969207c2af46c36462b67ada Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Thu, 8 Mar 2007 10:59:41 +0000
Subject: [PATCH] minor improvements on create/edit dialog

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1628 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/loops.js           | 4 +++-
 browser/resource.py        | 8 +++++---
 browser/resource_macros.pt | 7 ++++---
 interfaces.py              | 2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/browser/loops.js b/browser/loops.js
index f6cea32..e16699b 100644
--- a/browser/loops.js
+++ b/browser/loops.js
@@ -52,10 +52,12 @@ function inlineEdit(id, saveUrl) {
 
 function setConceptTypeForComboBox(typeId, cbId) {
     var t = dojo.byId(typeId).value;
-    var dp = dojo.widget.manager.getWidgetById(cbId).dataProvider;
+    var cb = dojo.widget.manager.getWidgetById(cbId)
+    var dp = cb.dataProvider;
     var baseUrl = dp.searchUrl.split('&')[0];
     var newUrl = baseUrl + '&searchType=' + t;
     dp.searchUrl = newUrl;
+    cb.setValue('');
 }
 
 var dialogs = {}
diff --git a/browser/resource.py b/browser/resource.py
index a9a2662..dc582ee 100644
--- a/browser/resource.py
+++ b/browser/resource.py
@@ -36,7 +36,7 @@ from zope.security import canAccess, canWrite
 from zope.security.proxy import removeSecurityProxy
 
 from cybertools.typology.interfaces import IType
-from loops.interfaces import IBaseResource, IDocument, IMediaAsset
+from loops.interfaces import IBaseResource, IDocument, IMediaAsset, ITextDocument
 from loops.browser.common import EditForm, BaseView, Action
 from loops.browser.concept import ConceptRelationView, ConceptConfigureView
 from loops.browser.node import NodeView, node_macros
@@ -113,8 +113,10 @@ class ResourceView(BaseView):
            if viewName:
                return component.queryMultiAdapter((context, self.request),
                            name=viewName)
-        if context.contentType.startswith('text/'):
-            # TODO: This should be controlled by resourceType
+        ct = context.contentType
+        #if ct.startswith('text/') and ct != 'text/rtf':
+        ti = IType(context).typeInterface
+        if not ti or issubclass(ti, ITextDocument):
             return DocumentView(context, self.request)
         return self
 
diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index c4cf78e..02beabc 100644
--- a/browser/resource_macros.pt
+++ b/browser/resource_macros.pt
@@ -22,10 +22,11 @@
 
 <metal:block define-macro="render_note">
   <metal:render use-macro="item/template/macros/render" />
-  <div class="content-1" id="1.link">
+  <div class="content-1" id="1.link"
+       tal:define="linkUrl item/linkUrl">
     <a href="."
-       tal:attributes="href item/linkUrl"
-       tal:condition="item/linkUrl">more...</a>
+       tal:attributes="href linkUrl"
+       tal:condition="python: linkUrl and linkUrl != 'http://'">more...</a>
   </div>
 </metal:block>
 
diff --git a/interfaces.py b/interfaces.py
index 0db4d8f..b16be0d 100644
--- a/interfaces.py
+++ b/interfaces.py
@@ -619,7 +619,7 @@ class INote(ITextDocument):
     linkUrl = schema.TextLine(
         title=_(u'Link URL'),
         description=_(u'An (optional) link associated with this note'),
-        default=u'',
+        default=u'http://',
         required=False)