fix import bugs

xadmin/__init__.py

@@ -1,6 +1,7 @@
 
 VERSION = [0,5,0]
 
+from xadmin.sites import AdminSite, site
 
 class Settings(object):
     pass
@@ -16,7 +17,6 @@ def autodiscover():
     from importlib import import_module
     from django.conf import settings
     from django.utils.module_loading import module_has_submodule
-    from xadmin.sites import AdminSite, site
     setattr(settings, 'CRISPY_TEMPLATE_PACK', 'bootstrap3')
     setattr(settings, 'CRISPY_CLASS_CONVERTERS', {
         "textinput": "textinput textInput form-control",

xadmin/adminx.py

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

xadmin/apps.py

@@ -12,4 +12,4 @@ class XAdminConfig(AppConfig):
 
     def ready(self):
         self.module.autodiscover()
-        setattr(xadmin,'site',xadmin.sites.site)
+        setattr(xadmin,'site',xadmin.site)

xadmin/plugins/comments.py

@@ -91,4 +91,4 @@ def _bulk_flag(self, queryset, action, done_message):
 # Only register the default admin if the model is the built-in comment model
 # (this won't be true if there's a custom comment app).
 if 'django.contrib.comments' in settings.INSTALLED_APPS and (get_model() is Comment):
-    xadmin.sites.site.register(Comment, CommentsAdmin)
+    xadmin.site.register(Comment, CommentsAdmin)

xadmin/plugins/multiselect.py

@@ -104,4 +104,4 @@ def get_field_style(self, attrs, db_field, style, **kwargs):
         return attrs
 
 
-xadmin.sites.site.register_plugin(M2MSelectPlugin, ModelFormAdminView)
+xadmin.site.register_plugin(M2MSelectPlugin, ModelFormAdminView)

xadmin/sites.py

@@ -39,7 +39,7 @@ def __init__(self, name='xadmin'):
 
         self._admin_view_cache = {}
 
-        self.check_dependencies()
+        #self.check_dependencies()
 
         self.model_admins_order = 0
 

xadmin/static/xadmin/css/xadmin.form.css

@@ -85,7 +85,7 @@ select.selectmultiple {
    {
     max-width: 300px;
   }
-  .input-group.date{ max-width: 220px;}
+  .input-group.date{ max-width: 300px;}
   .input-group.time{ max-width: 180px;}
   .int-field {
     max-width: 100px;
@@ -144,6 +144,10 @@ select.selectmultiple {
     padding-left: 0px;
     padding-right: 0px;
   }
+  .form-horizontal .form-inline .form-control{
+    min-width:200px;
+    max-width:300px;
+  }
   .form-horizontal .fieldset .panel-body {
     padding-top: 24px;
   }
@@ -187,4 +191,4 @@ img.field_img {
 /** tabs **/
 .nav.nav-tabs {
   margin-bottom: 15px;
-}
+}

xadmin/templates/xadmin/blocks/comm.top.setlang.html

@@ -1,10 +1,10 @@
 {% load i18n xadmin_tags %}
 
-
 <li class="dropdown g-setlang">
   <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
   <i class="fa fa-globe"></i> <span class="hide-sm">
-    {% get_language_info for LANGUAGE_CODE as l %}{{ l.name_local }}
+    {{LANGUAGE_CODE}}
+    {# get_language_info for LANGUAGE_CODE as l %}{{ l.name_local #}
     <i class="caret"></i></span></a>
   <form id="setlang-form" action="{% url 'xadmin:django.views.i18n.set_language' %}" method="post" style="display:none;">
     {% csrf_token %}

xadmin/util.py

@@ -362,7 +362,6 @@ def display_for_value(value, boolean=False):
 class NotRelationField(Exception):
     pass
 
-
 def get_model_from_relation(field):
     if is_related_field(field):
         return field.model