conflit widget maskedinput & maskMoney + widget input with button

opensipkd/base/views/widget_os.py

@@ -4,9 +4,10 @@ import logging
 from colander import SchemaNode, null, Mapping, Invalid, string_types
 from deform.widget import Widget, _StrippedString, Select2Widget, default_resources, \
     ResourceRegistry, default_resource_registry
+from deform.form import Button
 from iso8601.iso8601 import ISO8601_REGEX
 from deform.i18n import _
-
+from  colander import compat
 _logging = logging.getLogger(__name__)
 
 
@@ -690,4 +691,16 @@ class BootStrapDateTimeInputWidget(Widget):
                 raise Invalid(field.schema, _("Incomplete time"), result)
 
             return result
+from deform import widget
+
+class MoneyInputWidget(widget.MoneyInputWidget):
+    requirements = ({"js":"opensipkd.base:static/jquery/jquery.maskMoney.min.js"},)
+    
+class TextInputWidget(widget.TextInputWidget):
+    template = "textinput_btn"
+    button=None
+    def __init__(self, **kw):
+        super(TextInputWidget, self).__init__(**kw)
     
+        if isinstance(self.button, compat.string_types):
+                self.button = Button(self.button, type="button")
\ No newline at end of file

opensipkd/base/views/widgets/textinput_btn.pt

+<span tal:define="name name|field.name;
+                  css_class css_class|field.widget.css_class;
+                  oid oid|field.oid;
+                  mask mask|field.widget.mask;
+                  button button|field.widget.button;
+                  mask_placeholder mask_placeholder|field.widget.mask_placeholder;
+                  style style|field.widget.style;
+        " tal:omit-tag="">
+    <input type="text" tal:attributes="class string: form-control ${css_class or ''};
+                           style style;
+                           attributes|field.widget.attributes|{};" id="${oid}" name="${name}" value="${cstruct}"
+        tal:condition="not button" />
+
+    <div class="input-group" tal:condition="button">
+        <input type="text" name="${name}" value="${cstruct}" tal:attributes="class string: form-control ${css_class or ''};
+                       style style;
+                       attributes|field.widget.attributes|{};" id="${oid}" />
+        <span class="input-group-btn">
+            <button tal:define="btn_disposition 'btn-default';" tal:attributes="disabled button.disabled if button.disabled else None;
+                                attributes|button.attributes|{};" id="${oid+button.name}" name="${button.name}"
+                type="${button.type}" class="btn ${button.css_class or btn_disposition}" value="${button.value}"
+                tal:condition="button.type != 'link'">
+                <span tal:condition="button.icon" class="glyphicon glyphicon-${button.icon}"></span>
+                ${button.title}
+            </button>
+            <a tal:define="btn_disposition 'btn-default';
+                btn_href button.value|''" class="btn ${button.css_class or btn_disposition}" id="${oid + button.name}"
+                href="${btn_href}" tal:condition="button.type == 'link'">
+                <span tal:condition="button.icon" class="glyphicon glyphicon-${button.icon}"></span>
+                ${button.title}
+            </a>
+        </span>
+    </div><!-- /input-group -->
+
+    <script tal:condition="mask" type="text/javascript">
+        deform.addCallback(
+            '${oid}',
+            function (oid) {
+                $("#" + oid).mask("${mask}",
+                    { placeholder: "${mask_placeholder}" });
+            });
+    </script>
+</span>
\ No newline at end of file