diff --git a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/__init__.py b/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/__init__.py index 33cc0f7dd..19f748b2f 100644 --- a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/__init__.py +++ b/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/__init__.py @@ -4,14 +4,16 @@ class ZMSNote: """ # Access - access = {"delete":["ZMSAdministrator" - ,"ZMSAuthor" - ,"ZMSEditor"] - ,"delete_custom":"" - ,"insert":["ZMSAdministrator" - ,"ZMSAuthor" - ,"ZMSEditor"] - ,"insert_custom":"{$}"} + access = {"delete_custom":"" + ,"delete_deny":["" + ,"" + ,"" + ,""] + ,"insert_custom":"{$}" + ,"insert_deny":["" + ,"" + ,"" + ,""]} # Enabled enabled = 1 @@ -26,7 +28,7 @@ class ZMSNote: package = "com.zms.foundation" # Revision - revision = "5.0.0" + revision = "5.1.0" # Type type = "ZMSObject" @@ -43,19 +45,10 @@ class Attrs: ,"repetitive":0 ,"type":"constant"} - zmsnote_bggif = {"default":"" - ,"id":"zmsnote_bg.gif" - ,"keys":[] - ,"mandatory":0 - ,"multilang":0 - ,"name":"Resource: Background" - ,"repetitive":0 - ,"type":"resource"} - text = {"default":"" ,"id":"text" ,"keys":[] - ,"mandatory":0 + ,"mandatory":1 ,"multilang":1 ,"name":"Memotext" ,"repetitive":0 @@ -70,16 +63,6 @@ class Attrs: ,"repetitive":0 ,"type":"interface"} - catalogtext = {"custom":"" - ,"default":"" - ,"id":"catalogText" - ,"keys":[] - ,"mandatory":0 - ,"multilang":0 - ,"name":"Hook: Catalog-Text" - ,"repetitive":0 - ,"type":"constant"} - rendershort = {"default":"" ,"id":"renderShort" ,"keys":[] diff --git a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/renderShort.zpt b/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/renderShort.zpt index d8ac134d8..a9376f042 100644 --- a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/renderShort.zpt +++ b/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/renderShort.zpt @@ -1,61 +1,56 @@ - - - - - - - - - -
-
+
the text
+ tal:content="structure python:zmscontext.getText(request).replace('\n','
')"> + TEXT +
+ + + +
-
- \ No newline at end of file diff --git a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/zmsnote_bg.gif b/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/zmsnote_bg.gif deleted file mode 100644 index 3f5e371b2..000000000 --- a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSNote/zmsnote_bg.gif +++ /dev/null @@ -1 +0,0 @@ -b"b'62273632323733343337333433393334333633333338333333393336333133303634333033303330363433303330363233333330333033303330363636333633363533363334363636333636333636323633363636333634363133383633363636333634333233373334363636363636363636363636363636333633363533363633363636333636363536333633333033303330333033373337333733383338333233363338363536343330333033323331333133323330333036353338333033303330333033303330333933303330333236363635333033303330333036363636333033303330333036363636333033303330333036363636333233313636333933303334333033303330333033303330333033303330333033323633333033303330333033303330333033303330363433303330333036343330333033303333333033343332363336323330333933303334333936353632333033343633333233363631333133303338333636313635333833303331333133363334333136363331333133383631363436353337333733383631363133343632333536313332333936323332333136333632363133333333363236333636333136343337333836353333363536343337363236343337363133363634363433323636333533333330333033313338333836363334333833363333333033343330333033333632323727'" \ No newline at end of file diff --git a/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js b/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js index c37832390..d2b6fe5a9 100644 --- a/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js +++ b/Products/zms/plugins/www/bootstrap/plugin/bootstrap.plugin.zmi.js @@ -672,14 +672,14 @@ ZMI.prototype.initInputFields = function(container) { var labelText = $label.text().basicTrim(); var $controlGroup = $label.parents(".form-group"); var $controls = $("div:first",$controlGroup); - var $control = $('input[name='+forName+'],select:not([name^="zms_mms_src_"])',$controls); + var $control = $('input[name='+forName+'],textarea[name='+forName+'],select:not([name^="zms_mms_src_"])',$controls); $label.attr("title",""); $control.attr("title",""); if ($control.length==1) { var isBlank = false; var nodeName = $control.prop("nodeName").toLowerCase(); var nodeType = $control.prop("type").toLowerCase(); - if (nodeName=="input") { + if (nodeName=="input" || nodeName=="textarea") { if ($control.val().basicTrim().length==0 && typeof $control.attr("data-value-attr")!="undefined") { $control.val($control.attr($control.attr("data-value-attr"))); }