Changeset 11254 for main/waeup.kofa/trunk/src/waeup/kofa/widgets

Timestamp:

22 Feb 2014, 15:46:03 (11 years ago)

Author:

uli

Message:

Merge changes from uli-diazo-themed back into trunk. If this works, then a miracle happened.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/widgets/phonewidget.py (modified) (3 diffs)
• src/waeup/kofa/widgets/sequencewidget.pt (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py

@@ -37 +37 @@
 
     subwidget_names = ('country', 'area', 'ext')
-    bootstrap_span = 'span2'
+    cssClass = 'phone-input'
 
     def _renderPrefixWidget(self, value):
@@ -51 +51 @@
                 '<option value="%s"%s>%s</option>' % (pval, selected, ptitle))
         options = '\n'.join(options)
-        return '<select id="%s" name="%s" size="1" class="span4">\n%s\n</select>' % (
+        return '<select id="%s" name="%s" size="1" class="%s">\n%s\n</select>' % (
             '%s.%s' % (self.name, 'country'),
             '%s.%s' % (self.name, 'country'),
+            self.cssClass,
             options)
 
@@ -83 +84 @@
             kwargs.update(name = '%s.%s' % (self.name, subname))
             kwargs.update(id=kwargs['name'])
-            # kwargs.update(cssClass = '%s %s' % (self.cssClass, 'span1'))
-            kwargs.update(cssClass = '%s %s' % ('', self.bootstrap_span))
+            kwargs.update(cssClass = '%s %s' % ('', self.cssClass))
             kwargs.update(value = subvalues[num])
             fields.append(renderElement(self.tag, **kwargs))

main/waeup.kofa/trunk/src/waeup/kofa/widgets/sequencewidget.pt

@@ -1 @@
-<table border="0" class="sequencewidget"
-  i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa">
   <tr tal:repeat="widget view/widgets">
     <td>
@@ -19 +18 @@
       Don't forget to save the form after adding or deleting items.
       </p>
-      <input type="submit" value="Remove selected items"
-             class="btn"
+      <button type="submit"
+             class="btn btn-default"
+             tal:condition="view/need_add"
+             tal:attributes="name string:${view/name}.add"
+             tal:content="view/addButtonLabel" />
+      <button type="submit" class="btn btn-default"
              tal:condition="view/need_delete"
              tal:attributes="name string:${view/name}.remove"
-             i18n:attributes="value remove-selected-items" />
-      <input type="submit" value="Add foo"
-             class="btn"
-             tal:condition="view/need_add"
-             tal:attributes="name string:${view/name}.add;
-                             value view/addButtonLabel" />
+             i18n:translate="remove-selected-items">Remove selected items</button>
     </td>
   </tr>