Merge pull request #57 from stard0g101/master

mark_safe pull request

bootstrap/widgets.py

@@ -28,22 +28,26 @@ class OptionsRadio(RadioSelect):
 
 class AppendedText(TextInput):
     def render(self, name, value, attrs=None):
-        append_text = self.attrs.get('append_text', '')
-        return '%s<span class="add-on">%s</span>' % (super(AppendedText, self).render(name, value, attrs),
-                                                     append_text)
+        append_text = self.attrs.get('text', '')
+        return mark_safe(u'%s<span class="add-on">%s</span>' % (super(AppendedText, self).render(name, value, attrs),
+                                                     append_text))
 
 
 class PrependedText(TextInput):
     def render(self, name, value, attrs=None):
-        prepend_text = self.attrs.get('prepend_text', '')
-        return '<span class="add-on">%s</span>%s' % (prepend_text, super(PrependedText, self).render(name, value, attrs))
+        prepend_text = self.attrs.get('text', '')
+        return mark_safe(u'<span class="add-on">%s</span>%s' % (prepend_text, super(PrependedText, self).render(name, value, attrs)))
 
 
 class AppendPrependText(TextInput):
     def render(self, name, value, attrs=None):
         append_text, prepend_text = self.attrs.get('append_text', ''), self.attrs.get('prepend_text', '')
-        return '<span class="add-on">%s</span>%s<span class="add-on">%s</span>' % (prepend_text, super(AppendPrependText, self).render(name, value, attrs), append_text)
+        return mark_safe(u'<span class="add-on">%s</span>%s<span class="add-on">%s</span>' % (prepend_text, super(AppendPrependText, self).render(name, value, attrs), append_text))
 
 
 class EmailInput(Input):
     input_type = 'email'
+    def render(self, name, value, attrs=None):
+        append_text = self.attrs.get('text', '@')
+        return mark_safe(u'%s<span class="add-on">%s</span>' % (super(EmailInput, self).render(name, value, attrs),
+                                                     append_text))