Changeset 7494 for main/waeup.sirp/trunk/src

Timestamp:

20 Jan 2012, 10:10:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Adjust size of phone widget. The default country code is still not being set.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/browser_templates/applicantregemailsent.pt (modified) (1 diff)
• widgets/phonewidget.py (modified) (2 diffs)
• widgets/tests/test_phonewidget.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py

@@ -878 +878 @@
         return
 
-    @action('Get login credentials')
+    @action('Get login credentials', style='primary')
     def register(self, **data):
         if not self.captcha_result.is_valid:

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregemailsent.pt

@@ -1 @@
-<h2>
-  Your registration for application process was successful
-</h2>
-
 <div>
   <p>

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

@@ -129 +129 @@
         """
         value = self.context.query(self.context.context)
-        # we have to modify the adapter according to our own
+        # We have to modify the adapter according to our own
         # 'required' state. Some ugly workaround
         adapter = copy.deepcopy(IPhoneData)
@@ -138 +138 @@
             form.FormFields(IPhoneData),
             self.name, value, self.request, adapters=adapters)
-        self.widgets['country'].displayWidth = 3
-        self.widgets['area'].displayWidth = 5
-        self.widgets['extension'].displayWidth = 10
+        # The displayWidth cant'be set
+        # because it is overridden by Bootstrap css classes
+        #self.widgets['country'].displayWidth = 3
+        #self.widgets['area'].displayWidth = 5
+        #self.widgets['extension'].displayWidth = 10
+        # We have to set the cssClass attributes
+        self.widgets['country'].cssClass = 'span2'
+        self.widgets['area'].cssClass = 'span2'
+        self.widgets['extension'].cssClass = 'span3'
+
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_phonewidget.py

@@ -126 +126 @@
         self.assertEqual(
             self.widget(),
-            (u'+&nbsp;<input class="textType" id="field.foo.country"'
-             u' name="field.foo.country" size="3" type="text" value="123" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.area"'
-             u' name="field.foo.area" size="5" type="text" value="456" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="10" type="text"'
+            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
+             u' name="field.foo.country" size="20" type="text" value="123" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span2 textType" id="field.foo.area"'
+             u' name="field.foo.area" size="20" type="text" value="456" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span3 textType" id="field.foo.extension"'
+             u' name="field.foo.extension" size="20" type="text"'
              u' value="1234567"  />\n'))
         return
@@ -288 +288 @@
         self.assertEqual(
             self.widget.hidden(),
-            (u'<input class="hiddenType" id="field.foo.country"'
+            (u'<input class="span2 hiddenType" id="field.foo.country"'
              u' name="field.foo.country" type="hidden" value="123" '
              u' />'
              u'\n'
-             u'<input class="hiddenType" id="field.foo.area"'
+             u'<input class="span2 hiddenType" id="field.foo.area"'
              u' name="field.foo.area" type="hidden" value="456" '
              u' />'
              u'\n'
-             u'<input class="hiddenType" id="field.foo.extension"'
+             u'<input class="span3 hiddenType" id="field.foo.extension"'
              u' name="field.foo.extension" type="hidden"'
              u' value="1234567"  />'))
@@ -378 +378 @@
         self.assertEqual(
             widget(),
-            (u'+&nbsp;<input class="textType" id="field.foo.country"'
-             u' name="field.foo.country" size="3" type="text" value="11" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.area"'
-             u' name="field.foo.area" size="5" type="text" value="222" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="10" type="text"'
+            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
+             u' name="field.foo.country" size="20" type="text" value="11" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span2 textType" id="field.foo.area"'
+             u' name="field.foo.area" size="20" type="text" value="222" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span3 textType" id="field.foo.extension"'
+             u' name="field.foo.extension" size="20" type="text"'
              u' value="3333"  />\n'))
         return
@@ -401 +401 @@
         self.assertEqual(
             widget(),
-            (u'+&nbsp;<input class="textType" id="field.foo.country"'
-             u' name="field.foo.country" size="3" type="text" value="11" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.area"'
-             u' name="field.foo.area" size="5" type="text" value="222" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="10" type="text"'
+            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
+             u' name="field.foo.country" size="20" type="text" value="11" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span2 textType" id="field.foo.area"'
+             u' name="field.foo.area" size="20" type="text" value="222" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span3 textType" id="field.foo.extension"'
+             u' name="field.foo.extension" size="20" type="text"'
              u' value="3333"  />\n'))
         return
@@ -485 +485 @@
         self.assertEqual(
             self.widget(),
-            (u'+&nbsp;<input class="textType" id="field.foo.country"'
-             u' name="field.foo.country" size="3" type="text" value="" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.area"'
-             u' name="field.foo.area" size="5" type="text" value="" '
-             u' />'
-             u'&nbsp;-\n'
-             u'<input class="textType" id="field.foo.extension"'
-             u' name="field.foo.extension" size="10" type="text"'
+            (u'+&nbsp;<input class="span2 textType" id="field.foo.country"'
+             u' name="field.foo.country" size="20" type="text" value="" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span2 textType" id="field.foo.area"'
+             u' name="field.foo.area" size="20" type="text" value="" '
+             u' />'
+             u'&nbsp;-\n'
+             u'<input class="span3 textType" id="field.foo.extension"'
+             u' name="field.foo.extension" size="20" type="text"'
              u' value=""  />\n'))
         return