Minor CSS changes, fixed mongoengine field ordering

flask_admin/contrib/mongoengine/form.py

+from operator import attrgetter
+
 from mongoengine import ReferenceField
 from mongoengine.base import BaseDocument, DocumentMetaclass
 
@@ -167,7 +169,8 @@ def get_form(model, converter,
     field_args = field_args or {}
 
     # Find properties
-    properties = ((k, v) for k, v in iteritems(model._fields))
+    properties = sorted(((k, v) for k, v in iteritems(model._fields)),
+                        key=lambda v: v[1].creation_counter)
 
     if only:
         props = dict(properties)

flask_admin/contrib/mongoengine/helpers.py

+def make_gridfs_args(value):
+    args = {
+        'id': value.grid_id,
+        'coll': value.collection_name
+    }
+
+    if value.db_alias != 'default':
+        args['db'] = value.db_alias
+
+    return args
+
+
+def make_thumb_args(value):
+    if value.thumbnail:
+        args = {
+            'id': value.thumbnail._id,
+            'coll': value.collection_name
+        }
+
+        if value.db_alias != 'default':
+            args['db'] = value.db_alias
+
+        return args
+    else:
+        return make_gridfs_args(value)

flask_admin/contrib/mongoengine/typefmt.py

@@ -18,7 +18,7 @@ def grid_formatter(view, value):
          '</a> %(size)dk (%(content_type)s)') %
         {
             'url': url_for('.api_file_view', **args),
-            'name': escape(value.filename),
+            'name': escape(value.name),
             'size': value.length // 1024,
             'content_type': escape(value.content_type)
         })

flask_admin/contrib/mongoengine/widgets.py

@@ -17,10 +17,10 @@ class MongoFileInput(object):
 
         placeholder = ''
         if field.data:
-            data = field.data.fs
+            data = field.data
 
             placeholder = self.template % {
-                'name': escape(data.filename),
+                'name': escape(data.name),
                 'content_type': escape(data.content_type),
                 'size': data.length // 1024
             }

flask_admin/static/admin/css/admin.css

@@ -83,6 +83,24 @@ table.filters {
     max-height: 100px;
 }
 
+/* Forms */
+.form-horizontal .control-label {
+    width: 100px;
+    text-align: left;
+    margin-left: 4px;
+}
+
+.form-horizontal .controls {
+    margin-left: 110px;
+}
+
+/* Inline forms */
+.inline-field .inline-form {
+    border-left: 1px solid #eeeeee;
+    padding-left: 8px;
+    margin-bottom: 4px;
+}
+
 /* Patch Select2 */
 .select2-results li {
     min-height: 24px !important;

flask_admin/templates/admin/model/inline_form.html

 {% import 'admin/lib.html' as lib with context %}
-{{ lib.render_form_fields(field, False) }}
-<hr/>
+<div class="inline-form">
+  {{ lib.render_form_fields(field, False) }}
+</div>

flask_admin/templates/admin/model/inline_list_base.html

 {% macro render_inline_fields(field, template, render, check=None) %}
-<div class="well">
+<div class="inline-field">
     <div id="{{ field.id }}-fields">
         {% for subfield in field %}
         <div id="{{ subfield.id }}" class="fa-inline-field">