Merge branch 'refs/heads/master' into docs-chinese

Conflicts:
	xadmin/views/base.py
	xadmin/views/edit.py
	xadmin/views/list.py

Author: sshwsfc

README.rst

@@ -1,9 +1,12 @@
-django-xadmin |Build Status|
-============================
+django-xadmin |Build Status| |Build Status2|
+============================================
 
 .. |Build Status| image:: https://travis-ci.org/sshwsfc/django-xadmin.png?branch=master
    :target: https://travis-ci.org/sshwsfc/django-xadmin
 
+.. |Build Status2| image:: https://drone.io/github.com/sshwsfc/django-xadmin/status.png
+   :target: https://drone.io/github.com/sshwsfc/django-xadmin/latest
+
 Drop-in replacement of Django admin comes with lots of goodies, fully extensible with plugin support, pretty UI based on Twitter Bootstrap.
 
 Live Demo

setup.py

@@ -18,10 +18,12 @@
     install_requires=[
         'setuptools',
         'django>=1.4',
-        'xlwt',
         'django-crispy-forms>=1.2.3',
         'django-reversion',
     ],
+    extras_require={
+        'Excel': ['xlwt'],
+    },
     zip_safe=True,
     keywords=['admin', 'django', 'xadmin', 'bootstrap'],
     classifiers=[

xadmin/__init__.py

@@ -14,6 +14,13 @@ def autodiscover():
     from django.utils.importlib import import_module
     from django.utils.module_loading import module_has_submodule
 
+    setattr(settings, 'CRISPY_TEMPLATE_PACK', 'bootstrap3')
+    setattr(settings, 'CRISPY_CLASS_CONVERTERS', {
+        "textinput": "textinput textInput form-control",
+        "fileinput": "fileinput fileUpload form-control",
+        "passwordinput": "textinput textInput form-control",
+        })
+
     from xadmin import views
     from xadmin import plugins
 

xadmin/adminx.py

@@ -6,4 +6,5 @@
 
 class UserSettingsAdmin(object):
     model_icon = 'cog'
+    hidden_menu = True
 xadmin.site.register(UserSettings, UserSettingsAdmin)

xadmin/layout.py

@@ -4,6 +4,7 @@
 from crispy_forms.utils import render_field, flatatt
 
 from crispy_forms import layout
+from crispy_forms import bootstrap
 
 
 class Fieldset(layout.Fieldset):
@@ -18,14 +19,14 @@ def __init__(self, legend, *fields, **kwargs):
 class Row(layout.Div):
 
     def __init__(self, *fields, **kwargs):
-        css_class = 'form-row num%d' % len(fields)
+        css_class = 'form-row row num%d' % len(fields)
         super(Row, self).__init__(css_class=css_class, *fields, **kwargs)
 
 
 class Col(layout.Column):
 
     def __init__(self, id, *fields, **kwargs):
-        css_class = ['column', 'form-column', id, 'span%d' %
+        css_class = ['column', 'form-column', id, 'col col-sm-%d' %
                      kwargs.get('span', 6)]
         if kwargs.get('horizontal'):
             css_class.append('form-horizontal')
@@ -34,12 +35,48 @@ def __init__(self, id, *fields, **kwargs):
 
 
 class Main(layout.Column):
-    css_class = "column form-column main span9 form-horizontal"
+    css_class = "column form-column main col col-sm-9 form-horizontal"
 
 
 class Side(layout.Column):
-    css_class = "column form-column sidebar span3"
+    css_class = "column form-column sidebar col col-sm-3"
 
 
 class Container(layout.Div):
-    css_class = "form-container row-fluid"
+    css_class = "form-container row clearfix"
+
+
+# Override bootstrap3
+class InputGroup(layout.Field):
+
+    template = "bootstrap3/layout/input_group.html"
+
+    def __init__(self, field, *args, **kwargs):
+        self.field = field
+        self.inputs = list(args)
+        if '@@' not in args:
+            self.inputs.append('@@')
+
+        super(InputGroup, self).__init__(field, **kwargs)
+
+    def render(self, form, form_style, context, template_pack='bootstrap'):
+        classes = form.fields[self.field].widget.attrs['class']
+        context.update({'inputs': self.inputs, 'classes': classes.replace('form-control', '')})
+        return render_field(self.field, form, form_style, context, template=self.template, attrs=self.attrs, template_pack=template_pack)
+
+class PrependedText(InputGroup):
+
+    def __init__(self, field, text, **kwargs):
+        super(PrependedText, self).__init__(field, text, '@@', **kwargs)
+
+class AppendedText(InputGroup):
+
+    def __init__(self, field, text, **kwargs):
+        super(AppendedText, self).__init__(field, '@@', text, **kwargs)
+
+class PrependedAppendedText(InputGroup):
+
+    def __init__(self, field, prepended_text=None, appended_text=None, *args, **kwargs):
+        super(PrependedAppendedText, self).__init__(field, prepended_text, '@@', appended_text, **kwargs)
+
+