diff --git a/apps/cmdb/forms.py b/apps/cmdb/forms.py
index 4f44c9b..0e62e9b 100644
--- a/apps/cmdb/forms.py
+++ b/apps/cmdb/forms.py
@@ -4,7 +4,7 @@
 
 from django import forms
 
-from .models import Code
+from .models import Code, DeviceInfo, ConnectionInfo, DeviceFile
 
 
 class CodeCreateForm(forms.ModelForm):
@@ -43,4 +43,63 @@ class CodeUpdateForm(CodeCreateForm):
                 raise forms.ValidationError(msg)
             if matching_code.filter(value=value).exists():
                 msg = 'value：{} 已经存在'.format(value)
-                raise forms.ValidationError(msg)
\ No newline at end of file
+                raise forms.ValidationError(msg)
+
+
+class DeviceCreateForm(forms.ModelForm):
+    class Meta:
+        model = DeviceInfo
+        exclude = ['dev_connection']
+        error_messages = {
+            'hostname': {'required': '请填写设备地址'},
+            'buyDate': {'required': '请填写购买日期'},
+            'warrantyDate': {'required': '请填写到保日期'}
+        }
+
+    def clean(self):
+        cleaned_data = super(DeviceCreateForm, self).clean()
+        hostname = cleaned_data.get('hostname')
+
+        if DeviceInfo.objects.filter(hostname=hostname).count():
+            raise forms.ValidationError('设备地址：{}已存在'.format(hostname))
+
+
+class DeviceUpdateForm(DeviceCreateForm):
+    def clean(self):
+        cleaned_data = self.cleaned_data
+        hostname = cleaned_data.get('hostname')
+
+        if self.instance:
+            matching_device = DeviceInfo.objects.exclude(pk=self.instance.pk)
+            if matching_device.filter(hostname=hostname).exists():
+                raise forms.ValidationError('设备地址：{}已存在'.format(hostname))
+
+
+class ConnectionInfoForm(forms.ModelForm):
+
+    class Meta:
+        model = ConnectionInfo
+        fields = '__all__'
+
+        error_messages = {
+            'port': {'required': '端口不能为空'},
+        }
+
+    def clean(self):
+        cleaned_data = self.cleaned_data
+        username = cleaned_data.get('username')
+        password = cleaned_data.get('password')
+        private_key = cleaned_data.get('private_key')
+        auth_type = cleaned_data.get('auth_type')
+        if len(username) == 0:
+            raise forms.ValidationError('用户名不能为空！')
+        if auth_type == 'password' and len(password) == 0:
+            raise forms.ValidationError('认证类型为[密码]时，必须设置密码信息！')
+        if auth_type == 'private_key' and len(private_key) == 0:
+            raise forms.ValidationError('认证类型为[密钥]时，必须设置密钥信息！')
+
+
+class DeviceFileUploadForm(forms.ModelForm):
+    class Meta:
+        model = DeviceFile
+        fields = '__all__'
\ No newline at end of file
diff --git a/apps/cmdb/models.py b/apps/cmdb/models.py
index 1151a50..bb516c5 100644
--- a/apps/cmdb/models.py
+++ b/apps/cmdb/models.py
@@ -20,7 +20,7 @@ class AbstractMode(models.Model):
 class Code(AbstractMode):
     key = models.CharField(max_length=80, verbose_name='键')
     value = models.CharField(max_length=80, verbose_name='值')
-    desc = models.BooleanField(default=True, verbose_name='备注')
+    desc = models.CharField(max_length=100, blank=True, default='', verbose_name='备注')
 
     class Meta:
         verbose_name = '字典'
@@ -53,11 +53,11 @@ class ConnectionAbstract(models.Model):
 
 
 class DeviceAbstract(models.Model):
-    sys_hostname = models.CharField(max_length=50, blank=True, default='', verbose_name='主机名')
-    mac_address = models.CharField(max_length=50, blank=True, default='', verbose_name='MAC地址')
-    sn_number = models.CharField(max_length=50, blank=True, default='', verbose_name='SN号码')
-    os_type = models.CharField(max_length=50, blank=True, default='', verbose_name='系统类型')
-    device_type = models.CharField(max_length=50, blank=True, default='', verbose_name='设备类型')
+    sys_hostname = models.CharField(max_length=150, blank=True, default='', verbose_name='主机名')
+    mac_address = models.CharField(max_length=150, blank=True, default='', verbose_name='MAC地址')
+    sn_number = models.CharField(max_length=150, blank=True, default='', verbose_name='SN号码')
+    os_type = models.CharField(max_length=150, blank=True, default='', verbose_name='系统类型')
+    device_type = models.CharField(max_length=150, blank=True, default='', verbose_name='设备类型')
 
     class Meta:
         abstract = True
@@ -100,7 +100,7 @@ class DeviceInfo(AbstractMode, DeviceAbstract, TimeAbstract):
     warrantyDate = models.DateField(default=datetime.now, verbose_name="到保日期")
     desc = models.TextField(blank=True, default='', verbose_name='备注信息')
     changed_by = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL)
-    history = HistoricalRecords(excluded_fields=['add_time', 'modify_time'])
+    history = HistoricalRecords(excluded_fields=['add_time', 'modify_time', 'parent'])
 
     class Meta:
         verbose_name = '设备信息'
diff --git a/apps/cmdb/signals.py b/apps/cmdb/signals.py
index d66e53a..a681322 100644
--- a/apps/cmdb/signals.py
+++ b/apps/cmdb/signals.py
@@ -1,13 +1,46 @@
 import os
 
 from django.dispatch import receiver
-from django.db.models.signals import post_delete
+from django.db.models.signals import post_delete, post_save
 
-from .models import DeviceFile
+from .models import DeviceFile, DeviceInfo, ConnectionInfo
+from utils.db_utils import MongodbDriver
 
 
 @receiver(post_delete, sender=DeviceFile)
 def auto_delete_file(sender, instance, **kwargs):
     if instance.file_content:
         if os.path.isfile(instance.file_content.path):
-            os.remove(instance.file_content.path)
\ No newline at end of file
+            os.remove(instance.file_content.path)
+
+
+@receiver(post_save, sender=DeviceInfo)
+def auto_compare_diff(sender, instance, **kwargs):
+    record = instance.history.latest()
+    prev_record = record.prev_record
+    ope_type = {'~': 'update', '+': 'create', '-': 'delete'}
+    compare_result = {
+        'id': record.id,
+        'changed_by': record.changed_by.name,
+        'history_type': ope_type[record.history_type],
+        'history_date': record.history_date
+    }
+    changes = {}
+    if prev_record is not None:
+        delta = record.diff_against(prev_record)
+        for change in delta.changes:
+            changes[change.field] = [change.old, change.new]
+    compare_result['changes'] = changes
+    if compare_result['changes'] or compare_result['history_type'] == 'create':
+        try:
+            mongo = MongodbDriver(collection='change_compare')
+            mongo.insert(compare_result)
+        except Exception as e:
+            pass
+
+
+@receiver(post_delete, sender=DeviceInfo)
+def auto_delete_connection(sender, instance, **kwargs):
+    dev_connection = getattr(instance, 'dev_connection')
+    if dev_connection:
+        ConnectionInfo.objects.filter(id=dev_connection).delete()
\ No newline at end of file
diff --git a/apps/cmdb/templatetags/__init__.py b/apps/cmdb/templatetags/__init__.py
new file mode 100644
index 0000000..e483ac4
--- /dev/null
+++ b/apps/cmdb/templatetags/__init__.py
@@ -0,0 +1,3 @@
+# @Time   : 2019/2/17 21:28
+# @Author : RobbieHan
+# @File   : __init__.py.py 
\ No newline at end of file
diff --git a/apps/cmdb/templatetags/extra_tags.py b/apps/cmdb/templatetags/extra_tags.py
new file mode 100644
index 0000000..f4568c9
--- /dev/null
+++ b/apps/cmdb/templatetags/extra_tags.py
@@ -0,0 +1,60 @@
+from django import template
+from django.db.models.query import QuerySet
+from django.contrib.auth import get_user_model
+
+from cmdb.models import Code, Cabinet
+
+register = template.Library()
+
+User = get_user_model()
+
+
+@register.simple_tag
+def get_con(context, arg, field):
+    if isinstance(context, QuerySet):
+        context = context.values()
+        instance = [con for con in context if con['id'] == arg]
+        if instance:
+            return instance[0][field]
+        return ''
+
+
+@register.filter(name='compare_result')
+def get_change_compare(changes):
+    change_compare = []
+    for key, value in changes.items():
+        if key in ['network_type', 'service_type', 'operation_type']:
+            log = replace_log(key, value, Code, 'value')
+        elif key == 'dev_cabinet':
+            log = replace_log(key, value, Cabinet, 'number')
+        elif key == 'leader':
+            log = replace_log(key, value, User, 'name')
+        else:
+            log = '字段："%(field)s"，由："%(old)s"，变更为："%(new)s"。' % {
+                'field': key,
+                'old': value[0],
+                'new': value[1]
+            }
+        change_compare.append(log)
+    return '，'.join(str(i) for i in change_compare)
+
+
+def replace_log(key, value, model, field):
+    old = value[0]
+    new = value[1]
+    log_format = '字段："%(field)s"，由："%(old)s"，变更为："%(new)s"。'
+    try:
+        data = model.objects.filter(id=old).values()[0]
+        old_data = data[field]
+    except Exception:
+        old_data = old
+    try:
+        data = model.objects.filter(id=new).values()[0]
+        new_data = data[field]
+    except Exception:
+        new_data = new
+    return log_format % {
+        'field': key,
+        'old': old_data,
+        'new': new_data
+    }
\ No newline at end of file
diff --git a/apps/cmdb/urls.py b/apps/cmdb/urls.py
index f58f0a7..5856c99 100644
--- a/apps/cmdb/urls.py
+++ b/apps/cmdb/urls.py
@@ -27,4 +27,15 @@ urlpatterns = [
     path('eam/cabinet/list/', views_eam.CabinetListView.as_view(), name='eam-cabinet-list'),
     path('eam/cabinet/delete/', views_eam.CabinetDeleteView.as_view(), name='eam-cabinet-delete'),
 
+    path('eam/device/', views_eam.DeviceView.as_view(), name='eam-device'),
+    path('eam/device/create/', views_eam.DeviceCreateView.as_view(), name='eam-device-create'),
+    path('eam/device/update/', views_eam.DeviceUpdateView.as_view(), name='eam-device-update'),
+    path('eam/device/list/', views_eam.DeviceListView.as_view(), name='eam-device-list'),
+    path('eam/device/delete/', views_eam.DeviceDeleteView.as_view(), name='eam-device-delete'),
+    path('eam/device/device2connection/', views_eam.Device2ConnectionView.as_view(), name='eam-device-device2connection'),
+    path('eam/device/detail/', views_eam.DeviceDetailView.as_view(), name='eam-device-detail'),
+    path('eam/device/upload/', views_eam.DeviceFileUploadView.as_view(), name='eam-device-upload'),
+    path('eam/device/file_delete/', views_eam.DeviceFileDeleteView.as_view(), name='eam-device-file_delete'),
+    path('eam/device/auto_update_device_info/', views_eam.AutoUpdateDeviceInfo.as_view(),
+         name='eam-device-auto_update_device_info'),
 ]
diff --git a/apps/cmdb/views_eam.py b/apps/cmdb/views_eam.py
index 68d9018..4264164 100644
--- a/apps/cmdb/views_eam.py
+++ b/apps/cmdb/views_eam.py
@@ -1,9 +1,21 @@
-from django.views.generic import TemplateView
+import re
+
+from django.views.generic import TemplateView, View
+from django.contrib.auth import get_user_model
+from django.shortcuts import get_object_or_404
+from django.http import JsonResponse
+from django.shortcuts import render
+from django.forms.models import model_to_dict
 
 from system.mixin import LoginRequiredMixin
 from custom import (BreadcrumbMixin, SandboxDeleteView,
                     SandboxListView, SandboxUpdateView, SandboxCreateView)
-from .models import Cabinet
+from .models import Cabinet, DeviceInfo, Code, ConnectionInfo, DeviceFile
+from .forms import DeviceCreateForm, DeviceUpdateForm, ConnectionInfoForm, DeviceFileUploadForm
+from utils.db_utils import MongodbDriver
+from utils.sandbox_utils import LoginExecution
+
+User = get_user_model()
 
 
 class CabinetView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
@@ -36,3 +48,188 @@ class CabinetListView(SandboxListView):
 
 class CabinetDeleteView(SandboxDeleteView):
     model = Cabinet
+
+
+def get_device_public():
+    all_code = Code.objects.all()
+    all_cabinet = Cabinet.objects.all()
+    all_user = User.objects.all()
+    all_device = DeviceInfo.objects.all()
+    ret = {
+        'all_code': all_code,
+        'all_cabinet': all_cabinet,
+        'all_user': all_user,
+        'all_device': all_device,
+    }
+    return ret
+
+
+class DeviceView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
+    template_name = 'cmdb/deviceinfo.html'
+
+    def get_context_data(self, **kwargs):
+        device_public = get_device_public()
+        kwargs.update(device_public)
+        return super().get_context_data(**kwargs)
+
+
+class DeviceListView(SandboxListView):
+    model = DeviceInfo
+    fields = ['id', 'sys_hostname', 'sn_number', 'os_type', 'device_type', 'hostname', 'mac_address', 'leader']
+
+    def get_filters(self):
+        data = self.request.GET
+        filters = {}
+        if 'sys_hostname' in data and data['sys_hostname']:
+            filters['sys_hostname__icontains'] = data['sys_hostname']
+        if 'hostname' in data and data['hostname']:
+            filters['hostname__icontains'] = data['hostname']
+        if 'network_type' in data and data['network_type']:
+            filters['network_type'] = data['network_type']
+        if 'service_type' in data and data['service_type']:
+            filters['service_type'] = data['service_type']
+        if 'operation_type' in data and data['operation_type']:
+            filters['operation_type'] = data['operation_type']
+        return filters
+
+    def get_datatables_paginator(self, request):
+        context_data = super().get_datatables_paginator(request)
+        data = context_data['data']
+        for device in data:
+            user_id = device['leader']
+            device['leader'] = get_object_or_404(
+                User, pk=int(user_id)).name if user_id else ''
+        return context_data
+
+
+class DeviceCreateView(SandboxCreateView):
+    model = DeviceInfo
+    form_class = DeviceCreateForm
+
+    def get_context_data(self, **kwargs):
+        public_data = get_device_public()
+        kwargs.update(public_data)
+        print(public_data)
+        return super().get_context_data(**kwargs)
+
+
+class DeviceUpdateView(SandboxUpdateView):
+    model = DeviceInfo
+    form_class = DeviceUpdateForm
+
+    def get_context_data(self, **kwargs):
+        public_data = get_device_public()
+        kwargs.update(public_data)
+        return super().get_context_data(**kwargs)
+
+
+class DeviceDeleteView(SandboxDeleteView):
+    model = DeviceInfo
+
+
+class Device2ConnectionView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        ret = dict()
+        if 'id' in request.GET and request.GET['id']:
+            device = get_object_or_404(DeviceInfo, pk=int(request.GET['id']))
+            ret['device'] = device
+            dev_connection = device.dev_connection
+            if dev_connection:
+                connection_info = get_object_or_404(
+                    ConnectionInfo, pk=int(dev_connection)
+                )
+                ret['connection_info'] = connection_info
+        return render(request, 'cmdb/deviceinfo2connection.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        con_info = ConnectionInfo()
+        if 'id' in request.POST and request.POST['id']:
+            con_info = get_object_or_404(ConnectionInfo, pk=request.POST['id'])
+        form = ConnectionInfoForm(request.POST, instance=con_info)
+        if form.is_valid():
+            instance = form.save()
+            con_id = getattr(instance, 'id')
+            device = get_object_or_404(DeviceInfo, hostname=request.POST['hostname'])
+            device.dev_connection = con_id
+            device.save()
+            res['result'] = True
+        else:
+            pattern = '<li>.*?<ul class=.*?><li>(.*?)</li>'
+            form_errors = str(form.errors)
+            errors = re.findall(pattern, form_errors)
+            res['error'] = errors[0]
+        return JsonResponse(res)
+
+
+class DeviceDetailView(LoginRequiredMixin, BreadcrumbMixin, TemplateView):
+    template_name = 'cmdb/deviceinfo_detail.html'
+
+    def get_context_data(self, **kwargs):
+        device = get_object_or_404(DeviceInfo, pk=int(self.request.GET['id']))
+        mongo = MongodbDriver()
+        logs = mongo.find(id=int(self.request.GET['id']), sort_by='history_date')
+        all_file = device.devicefile_set.all()
+        device_public = get_device_public()
+        kwargs['device'] = device
+        kwargs['logs'] = logs
+        kwargs['all_file'] = all_file
+        kwargs.update(device_public)
+        return super().get_context_data(**kwargs)
+
+
+class DeviceFileUploadView(LoginRequiredMixin, View):
+
+    def get(self, request):
+        ret = dict()
+        device = get_object_or_404(DeviceInfo, pk=request.GET['id'])
+        ret['device'] = device
+        return render(request, 'cmdb/deviceinfo_upload.html', ret)
+
+    def post(self, request):
+        res = dict(result=False)
+        device_file = DeviceFile()
+        upload_form = DeviceFileUploadForm(
+            request.POST, request.FILES, instance=device_file
+        )
+        if upload_form.is_valid():
+            upload_form.save()
+            res['result'] = True
+        return JsonResponse(res)
+
+
+class DeviceFileDeleteView(SandboxDeleteView):
+    model = DeviceFile
+
+
+class AutoUpdateDeviceInfo(LoginRequiredMixin, View):
+
+    def post(self, request):
+        res = dict(status='fail')
+        if 'id' in request.POST and request.POST['id']:
+            device = get_object_or_404(DeviceInfo, pk=int(request.POST['id']))
+            con_id = device.dev_connection
+            conn = ConnectionInfo.objects.filter(id=con_id)
+            if con_id and conn:
+                try:
+                    conn_info = conn.get()
+                    kwargs = model_to_dict(conn_info, exclude=['id', 'auth_type'])
+                    auth_type = conn_info.auth_type
+                    le = LoginExecution()
+                    data = le.login_execution(auth_type=auth_type, **kwargs)
+                    conn_info.status = data['status']
+                    conn_info.save()
+                    if data['status'] == 'succeed':
+                        device.sys_hostname = data['sys_hostname']
+                        device.mac_address = data['mac_address']
+                        device.sn_number = data['sn_number']
+                        device.os_type = data['os_type']
+                        device.device_type = data['device_type']
+                        device.save()
+                        res['status'] = 'success'
+                except conn.model.DoesNotExist:
+                    res['status'] = 'con_empty'
+            else:
+                res['status'] = 'con_empty'
+        return JsonResponse(res)
diff --git a/apps/utils/db_utils.py b/apps/utils/db_utils.py
new file mode 100644
index 0000000..2014cb6
--- /dev/null
+++ b/apps/utils/db_utils.py
@@ -0,0 +1,18 @@
+import pymongo
+
+
+class MongodbDriver(object):
+
+    def __init__(self, db='device', collection='change_compare'):
+        self.client = pymongo.MongoClient('127.0.0.1', 27017)
+        self.db = self.client[db]
+        self.col = self.db[collection]
+
+    def insert(self, content):
+        return self.col.insert(content)
+
+    def find(self, sort_by, **filters,):
+        data = self.col.find(filters)
+        if sort_by:
+            data.sort(sort_by, pymongo.DESCENDING)
+        return data
\ No newline at end of file
diff --git a/sandboxMP/settings.py b/sandboxMP/settings.py
index 741f587..35147fa 100644
--- a/sandboxMP/settings.py
+++ b/sandboxMP/settings.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = [
     'simple_history',
     'system',
     'cmdb',
+    'cmdb.templatetags',
 ]
 
 MIDDLEWARE = [
diff --git a/static/plugins/masonry/masonry.js b/static/plugins/masonry/masonry.js
new file mode 100644
index 0000000..e52f238
--- /dev/null
+++ b/static/plugins/masonry/masonry.js
@@ -0,0 +1,2462 @@
+/*!
+ * Masonry PACKAGED v4.1.0
+ * Cascading grid layout library
+ * http://masonry.desandro.com
+ * MIT License
+ * by David DeSandro
+ */
+
+/**
+ * Bridget makes jQuery widgets
+ * v2.0.0
+ * MIT license
+ */
+
+/* jshint browser: true, strict: true, undef: true, unused: true */
+
+( function( window, factory ) {
+  'use strict';
+  /* globals define: false, module: false, require: false */
+
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD
+    define( 'jquery-bridget/jquery-bridget',[ 'jquery' ], function( jQuery ) {
+      factory( window, jQuery );
+    });
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS
+    module.exports = factory(
+      window,
+      require('jquery')
+    );
+  } else {
+    // browser global
+    window.jQueryBridget = factory(
+      window,
+      window.jQuery
+    );
+  }
+
+}( window, function factory( window, jQuery ) {
+'use strict';
+
+// ----- utils ----- //
+
+var arraySlice = Array.prototype.slice;
+
+// helper function for logging errors
+// $.error breaks jQuery chaining
+var console = window.console;
+var logError = typeof console == 'undefined' ? function() {} :
+  function( message ) {
+    console.error( message );
+  };
+
+// ----- jQueryBridget ----- //
+
+function jQueryBridget( namespace, PluginClass, $ ) {
+  $ = $ || jQuery || window.jQuery;
+  if ( !$ ) {
+    return;
+  }
+
+  // add option method -> $().plugin('option', {...})
+  if ( !PluginClass.prototype.option ) {
+    // option setter
+    PluginClass.prototype.option = function( opts ) {
+      // bail out if not an object
+      if ( !$.isPlainObject( opts ) ){
+        return;
+      }
+      this.options = $.extend( true, this.options, opts );
+    };
+  }
+
+  // make jQuery plugin
+  $.fn[ namespace ] = function( arg0 /*, arg1 */ ) {
+    if ( typeof arg0 == 'string' ) {
+      // method call $().plugin( 'methodName', { options } )
+      // shift arguments by 1
+      var args = arraySlice.call( arguments, 1 );
+      return methodCall( this, arg0, args );
+    }
+    // just $().plugin({ options })
+    plainCall( this, arg0 );
+    return this;
+  };
+
+  // $().plugin('methodName')
+  function methodCall( $elems, methodName, args ) {
+    var returnValue;
+    var pluginMethodStr = '$().' + namespace + '("' + methodName + '")';
+
+    $elems.each( function( i, elem ) {
+      // get instance
+      var instance = $.data( elem, namespace );
+      if ( !instance ) {
+        logError( namespace + ' not initialized. Cannot call methods, i.e. ' +
+          pluginMethodStr );
+        return;
+      }
+
+      var method = instance[ methodName ];
+      if ( !method || methodName.charAt(0) == '_' ) {
+        logError( pluginMethodStr + ' is not a valid method' );
+        return;
+      }
+
+      // apply method, get return value
+      var value = method.apply( instance, args );
+      // set return value if value is returned, use only first value
+      returnValue = returnValue === undefined ? value : returnValue;
+    });
+
+    return returnValue !== undefined ? returnValue : $elems;
+  }
+
+  function plainCall( $elems, options ) {
+    $elems.each( function( i, elem ) {
+      var instance = $.data( elem, namespace );
+      if ( instance ) {
+        // set options & init
+        instance.option( options );
+        instance._init();
+      } else {
+        // initialize new instance
+        instance = new PluginClass( elem, options );
+        $.data( elem, namespace, instance );
+      }
+    });
+  }
+
+  updateJQuery( $ );
+
+}
+
+// ----- updateJQuery ----- //
+
+// set $.bridget for v1 backwards compatibility
+function updateJQuery( $ ) {
+  if ( !$ || ( $ && $.bridget ) ) {
+    return;
+  }
+  $.bridget = jQueryBridget;
+}
+
+updateJQuery( jQuery || window.jQuery );
+
+// -----  ----- //
+
+return jQueryBridget;
+
+}));
+
+/**
+ * EvEmitter v1.0.2
+ * Lil' event emitter
+ * MIT License
+ */
+
+/* jshint unused: true, undef: true, strict: true */
+
+( function( global, factory ) {
+  // universal module definition
+  /* jshint strict: false */ /* globals define, module */
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD - RequireJS
+    define( 'ev-emitter/ev-emitter',factory );
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS - Browserify, Webpack
+    module.exports = factory();
+  } else {
+    // Browser globals
+    global.EvEmitter = factory();
+  }
+
+}( this, function() {
+
+
+
+function EvEmitter() {}
+
+var proto = EvEmitter.prototype;
+
+proto.on = function( eventName, listener ) {
+  if ( !eventName || !listener ) {
+    return;
+  }
+  // set events hash
+  var events = this._events = this._events || {};
+  // set listeners array
+  var listeners = events[ eventName ] = events[ eventName ] || [];
+  // only add once
+  if ( listeners.indexOf( listener ) == -1 ) {
+    listeners.push( listener );
+  }
+
+  return this;
+};
+
+proto.once = function( eventName, listener ) {
+  if ( !eventName || !listener ) {
+    return;
+  }
+  // add event
+  this.on( eventName, listener );
+  // set once flag
+  // set onceEvents hash
+  var onceEvents = this._onceEvents = this._onceEvents || {};
+  // set onceListeners object
+  var onceListeners = onceEvents[ eventName ] = onceEvents[ eventName ] || {};
+  // set flag
+  onceListeners[ listener ] = true;
+
+  return this;
+};
+
+proto.off = function( eventName, listener ) {
+  var listeners = this._events && this._events[ eventName ];
+  if ( !listeners || !listeners.length ) {
+    return;
+  }
+  var index = listeners.indexOf( listener );
+  if ( index != -1 ) {
+    listeners.splice( index, 1 );
+  }
+
+  return this;
+};
+
+proto.emitEvent = function( eventName, args ) {
+  var listeners = this._events && this._events[ eventName ];
+  if ( !listeners || !listeners.length ) {
+    return;
+  }
+  var i = 0;
+  var listener = listeners[i];
+  args = args || [];
+  // once stuff
+  var onceListeners = this._onceEvents && this._onceEvents[ eventName ];
+
+  while ( listener ) {
+    var isOnce = onceListeners && onceListeners[ listener ];
+    if ( isOnce ) {
+      // remove listener
+      // remove before trigger to prevent recursion
+      this.off( eventName, listener );
+      // unset once flag
+      delete onceListeners[ listener ];
+    }
+    // trigger listener
+    listener.apply( this, args );
+    // get next listener
+    i += isOnce ? 0 : 1;
+    listener = listeners[i];
+  }
+
+  return this;
+};
+
+return EvEmitter;
+
+}));
+
+/*!
+ * getSize v2.0.2
+ * measure size of elements
+ * MIT license
+ */
+
+/*jshint browser: true, strict: true, undef: true, unused: true */
+/*global define: false, module: false, console: false */
+
+( function( window, factory ) {
+  'use strict';
+
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD
+    define( 'get-size/get-size',[],function() {
+      return factory();
+    });
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS
+    module.exports = factory();
+  } else {
+    // browser global
+    window.getSize = factory();
+  }
+
+})( window, function factory() {
+'use strict';
+
+// -------------------------- helpers -------------------------- //
+
+// get a number from a string, not a percentage
+function getStyleSize( value ) {
+  var num = parseFloat( value );
+  // not a percent like '100%', and a number
+  var isValid = value.indexOf('%') == -1 && !isNaN( num );
+  return isValid && num;
+}
+
+function noop() {}
+
+var logError = typeof console == 'undefined' ? noop :
+  function( message ) {
+    console.error( message );
+  };
+
+// -------------------------- measurements -------------------------- //
+
+var measurements = [
+  'paddingLeft',
+  'paddingRight',
+  'paddingTop',
+  'paddingBottom',
+  'marginLeft',
+  'marginRight',
+  'marginTop',
+  'marginBottom',
+  'borderLeftWidth',
+  'borderRightWidth',
+  'borderTopWidth',
+  'borderBottomWidth'
+];
+
+var measurementsLength = measurements.length;
+
+function getZeroSize() {
+  var size = {
+    width: 0,
+    height: 0,
+    innerWidth: 0,
+    innerHeight: 0,
+    outerWidth: 0,
+    outerHeight: 0
+  };
+  for ( var i=0; i < measurementsLength; i++ ) {
+    var measurement = measurements[i];
+    size[ measurement ] = 0;
+  }
+  return size;
+}
+
+// -------------------------- getStyle -------------------------- //
+
+/**
+ * getStyle, get style of element, check for Firefox bug
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=548397
+ */
+function getStyle( elem ) {
+  var style = getComputedStyle( elem );
+  if ( !style ) {
+    logError( 'Style returned ' + style +
+      '. Are you running this code in a hidden iframe on Firefox? ' +
+      'See http://bit.ly/getsizebug1' );
+  }
+  return style;
+}
+
+// -------------------------- setup -------------------------- //
+
+var isSetup = false;
+
+var isBoxSizeOuter;
+
+/**
+ * setup
+ * check isBoxSizerOuter
+ * do on first getSize() rather than on page load for Firefox bug
+ */
+function setup() {
+  // setup once
+  if ( isSetup ) {
+    return;
+  }
+  isSetup = true;
+
+  // -------------------------- box sizing -------------------------- //
+
+  /**
+   * WebKit measures the outer-width on style.width on border-box elems
+   * IE & Firefox<29 measures the inner-width
+   */
+  var div = document.createElement('div');
+  div.style.width = '200px';
+  div.style.padding = '1px 2px 3px 4px';
+  div.style.borderStyle = 'solid';
+  div.style.borderWidth = '1px 2px 3px 4px';
+  div.style.boxSizing = 'border-box';
+
+  var body = document.body || document.documentElement;
+  body.appendChild( div );
+  var style = getStyle( div );
+
+  getSize.isBoxSizeOuter = isBoxSizeOuter = getStyleSize( style.width ) == 200;
+  body.removeChild( div );
+
+}
+
+// -------------------------- getSize -------------------------- //
+
+function getSize( elem ) {
+  setup();
+
+  // use querySeletor if elem is string
+  if ( typeof elem == 'string' ) {
+    elem = document.querySelector( elem );
+  }
+
+  // do not proceed on non-objects
+  if ( !elem || typeof elem != 'object' || !elem.nodeType ) {
+    return;
+  }
+
+  var style = getStyle( elem );
+
+  // if hidden, everything is 0
+  if ( style.display == 'none' ) {
+    return getZeroSize();
+  }
+
+  var size = {};
+  size.width = elem.offsetWidth;
+  size.height = elem.offsetHeight;
+
+  var isBorderBox = size.isBorderBox = style.boxSizing == 'border-box';
+
+  // get all measurements
+  for ( var i=0; i < measurementsLength; i++ ) {
+    var measurement = measurements[i];
+    var value = style[ measurement ];
+    var num = parseFloat( value );
+    // any 'auto', 'medium' value will be 0
+    size[ measurement ] = !isNaN( num ) ? num : 0;
+  }
+
+  var paddingWidth = size.paddingLeft + size.paddingRight;
+  var paddingHeight = size.paddingTop + size.paddingBottom;
+  var marginWidth = size.marginLeft + size.marginRight;
+  var marginHeight = size.marginTop + size.marginBottom;
+  var borderWidth = size.borderLeftWidth + size.borderRightWidth;
+  var borderHeight = size.borderTopWidth + size.borderBottomWidth;
+
+  var isBorderBoxSizeOuter = isBorderBox && isBoxSizeOuter;
+
+  // overwrite width and height if we can get it from style
+  var styleWidth = getStyleSize( style.width );
+  if ( styleWidth !== false ) {
+    size.width = styleWidth +
+      // add padding and border unless it's already including it
+      ( isBorderBoxSizeOuter ? 0 : paddingWidth + borderWidth );
+  }
+
+  var styleHeight = getStyleSize( style.height );
+  if ( styleHeight !== false ) {
+    size.height = styleHeight +
+      // add padding and border unless it's already including it
+      ( isBorderBoxSizeOuter ? 0 : paddingHeight + borderHeight );
+  }
+
+  size.innerWidth = size.width - ( paddingWidth + borderWidth );
+  size.innerHeight = size.height - ( paddingHeight + borderHeight );
+
+  size.outerWidth = size.width + marginWidth;
+  size.outerHeight = size.height + marginHeight;
+
+  return size;
+}
+
+return getSize;
+
+});
+
+/**
+ * matchesSelector v2.0.1
+ * matchesSelector( element, '.selector' )
+ * MIT license
+ */
+
+/*jshint browser: true, strict: true, undef: true, unused: true */
+
+( function( window, factory ) {
+  /*global define: false, module: false */
+  'use strict';
+  // universal module definition
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD
+    define( 'desandro-matches-selector/matches-selector',factory );
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS
+    module.exports = factory();
+  } else {
+    // browser global
+    window.matchesSelector = factory();
+  }
+
+}( window, function factory() {
+  'use strict';
+
+  var matchesMethod = ( function() {
+    var ElemProto = Element.prototype;
+    // check for the standard method name first
+    if ( ElemProto.matches ) {
+      return 'matches';
+    }
+    // check un-prefixed
+    if ( ElemProto.matchesSelector ) {
+      return 'matchesSelector';
+    }
+    // check vendor prefixes
+    var prefixes = [ 'webkit', 'moz', 'ms', 'o' ];
+
+    for ( var i=0; i < prefixes.length; i++ ) {
+      var prefix = prefixes[i];
+      var method = prefix + 'MatchesSelector';
+      if ( ElemProto[ method ] ) {
+        return method;
+      }
+    }
+  })();
+
+  return function matchesSelector( elem, selector ) {
+    return elem[ matchesMethod ]( selector );
+  };
+
+}));
+
+/**
+ * Fizzy UI utils v2.0.1
+ * MIT license
+ */
+
+/*jshint browser: true, undef: true, unused: true, strict: true */
+
+( function( window, factory ) {
+  // universal module definition
+  /*jshint strict: false */ /*globals define, module, require */
+
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD
+    define( 'fizzy-ui-utils/utils',[
+      'desandro-matches-selector/matches-selector'
+    ], function( matchesSelector ) {
+      return factory( window, matchesSelector );
+    });
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS
+    module.exports = factory(
+      window,
+      require('desandro-matches-selector')
+    );
+  } else {
+    // browser global
+    window.fizzyUIUtils = factory(
+      window,
+      window.matchesSelector
+    );
+  }
+
+}( window, function factory( window, matchesSelector ) {
+
+
+
+var utils = {};
+
+// ----- extend ----- //
+
+// extends objects
+utils.extend = function( a, b ) {
+  for ( var prop in b ) {
+    a[ prop ] = b[ prop ];
+  }
+  return a;
+};
+
+// ----- modulo ----- //
+
+utils.modulo = function( num, div ) {
+  return ( ( num % div ) + div ) % div;
+};
+
+// ----- makeArray ----- //
+
+// turn element or nodeList into an array
+utils.makeArray = function( obj ) {
+  var ary = [];
+  if ( Array.isArray( obj ) ) {
+    // use object if already an array
+    ary = obj;
+  } else if ( obj && typeof obj.length == 'number' ) {
+    // convert nodeList to array
+    for ( var i=0; i < obj.length; i++ ) {
+      ary.push( obj[i] );
+    }
+  } else {
+    // array of single index
+    ary.push( obj );
+  }
+  return ary;
+};
+
+// ----- removeFrom ----- //
+
+utils.removeFrom = function( ary, obj ) {
+  var index = ary.indexOf( obj );
+  if ( index != -1 ) {
+    ary.splice( index, 1 );
+  }
+};
+
+// ----- getParent ----- //
+
+utils.getParent = function( elem, selector ) {
+  while ( elem != document.body ) {
+    elem = elem.parentNode;
+    if ( matchesSelector( elem, selector ) ) {
+      return elem;
+    }
+  }
+};
+
+// ----- getQueryElement ----- //
+
+// use element as selector string
+utils.getQueryElement = function( elem ) {
+  if ( typeof elem == 'string' ) {
+    return document.querySelector( elem );
+  }
+  return elem;
+};
+
+// ----- handleEvent ----- //
+
+// enable .ontype to trigger from .addEventListener( elem, 'type' )
+utils.handleEvent = function( event ) {
+  var method = 'on' + event.type;
+  if ( this[ method ] ) {
+    this[ method ]( event );
+  }
+};
+
+// ----- filterFindElements ----- //
+
+utils.filterFindElements = function( elems, selector ) {
+  // make array of elems
+  elems = utils.makeArray( elems );
+  var ffElems = [];
+
+  elems.forEach( function( elem ) {
+    // check that elem is an actual element
+    if ( !( elem instanceof HTMLElement ) ) {
+      return;
+    }
+    // add elem if no selector
+    if ( !selector ) {
+      ffElems.push( elem );
+      return;
+    }
+    // filter & find items if we have a selector
+    // filter
+    if ( matchesSelector( elem, selector ) ) {
+      ffElems.push( elem );
+    }
+    // find children
+    var childElems = elem.querySelectorAll( selector );
+    // concat childElems to filterFound array
+    for ( var i=0; i < childElems.length; i++ ) {
+      ffElems.push( childElems[i] );
+    }
+  });
+
+  return ffElems;
+};
+
+// ----- debounceMethod ----- //
+
+utils.debounceMethod = function( _class, methodName, threshold ) {
+  // original method
+  var method = _class.prototype[ methodName ];
+  var timeoutName = methodName + 'Timeout';
+
+  _class.prototype[ methodName ] = function() {
+    var timeout = this[ timeoutName ];
+    if ( timeout ) {
+      clearTimeout( timeout );
+    }
+    var args = arguments;
+
+    var _this = this;
+    this[ timeoutName ] = setTimeout( function() {
+      method.apply( _this, args );
+      delete _this[ timeoutName ];
+    }, threshold || 100 );
+  };
+};
+
+// ----- docReady ----- //
+
+utils.docReady = function( callback ) {
+  if ( document.readyState == 'complete' ) {
+    callback();
+  } else {
+    document.addEventListener( 'DOMContentLoaded', callback );
+  }
+};
+
+// ----- htmlInit ----- //
+
+// http://jamesroberts.name/blog/2010/02/22/string-functions-for-javascript-trim-to-camel-case-to-dashed-and-to-underscore/
+utils.toDashed = function( str ) {
+  return str.replace( /(.)([A-Z])/g, function( match, $1, $2 ) {
+    return $1 + '-' + $2;
+  }).toLowerCase();
+};
+
+var console = window.console;
+/**
+ * allow user to initialize classes via [data-namespace] or .js-namespace class
+ * htmlInit( Widget, 'widgetName' )
+ * options are parsed from data-namespace-options
+ */
+utils.htmlInit = function( WidgetClass, namespace ) {
+  utils.docReady( function() {
+    var dashedNamespace = utils.toDashed( namespace );
+    var dataAttr = 'data-' + dashedNamespace;
+    var dataAttrElems = document.querySelectorAll( '[' + dataAttr + ']' );
+    var jsDashElems = document.querySelectorAll( '.js-' + dashedNamespace );
+    var elems = utils.makeArray( dataAttrElems )
+      .concat( utils.makeArray( jsDashElems ) );
+    var dataOptionsAttr = dataAttr + '-options';
+    var jQuery = window.jQuery;
+
+    elems.forEach( function( elem ) {
+      var attr = elem.getAttribute( dataAttr ) ||
+        elem.getAttribute( dataOptionsAttr );
+      var options;
+      try {
+        options = attr && JSON.parse( attr );
+      } catch ( error ) {
+        // log error, do not initialize
+        if ( console ) {
+          console.error( 'Error parsing ' + dataAttr + ' on ' + elem.className +
+          ': ' + error );
+        }
+        return;
+      }
+      // initialize
+      var instance = new WidgetClass( elem, options );
+      // make available via $().data('layoutname')
+      if ( jQuery ) {
+        jQuery.data( elem, namespace, instance );
+      }
+    });
+
+  });
+};
+
+// -----  ----- //
+
+return utils;
+
+}));
+
+/**
+ * Outlayer Item
+ */
+
+( function( window, factory ) {
+  // universal module definition
+  /* jshint strict: false */ /* globals define, module, require */
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD - RequireJS
+    define( 'outlayer/item',[
+        'ev-emitter/ev-emitter',
+        'get-size/get-size'
+      ],
+      factory
+    );
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS - Browserify, Webpack
+    module.exports = factory(
+      require('ev-emitter'),
+      require('get-size')
+    );
+  } else {
+    // browser global
+    window.Outlayer = {};
+    window.Outlayer.Item = factory(
+      window.EvEmitter,
+      window.getSize
+    );
+  }
+
+}( window, function factory( EvEmitter, getSize ) {
+'use strict';
+
+// ----- helpers ----- //
+
+function isEmptyObj( obj ) {
+  for ( var prop in obj ) {
+    return false;
+  }
+  prop = null;
+  return true;
+}
+
+// -------------------------- CSS3 support -------------------------- //
+
+
+var docElemStyle = document.documentElement.style;
+
+var transitionProperty = typeof docElemStyle.transition == 'string' ?
+  'transition' : 'WebkitTransition';
+var transformProperty = typeof docElemStyle.transform == 'string' ?
+  'transform' : 'WebkitTransform';
+
+var transitionEndEvent = {
+  WebkitTransition: 'webkitTransitionEnd',
+  transition: 'transitionend'
+}[ transitionProperty ];
+
+// cache all vendor properties that could have vendor prefix
+var vendorProperties = {
+  transform: transformProperty,
+  transition: transitionProperty,
+  transitionDuration: transitionProperty + 'Duration',
+  transitionProperty: transitionProperty + 'Property',
+  transitionDelay: transitionProperty + 'Delay'
+};
+
+// -------------------------- Item -------------------------- //
+
+function Item( element, layout ) {
+  if ( !element ) {
+    return;
+  }
+
+  this.element = element;
+  // parent layout class, i.e. Masonry, Isotope, or Packery
+  this.layout = layout;
+  this.position = {
+    x: 0,
+    y: 0
+  };
+
+  this._create();
+}
+
+// inherit EvEmitter
+var proto = Item.prototype = Object.create( EvEmitter.prototype );
+proto.constructor = Item;
+
+proto._create = function() {
+  // transition objects
+  this._transn = {
+    ingProperties: {},
+    clean: {},
+    onEnd: {}
+  };
+
+  this.css({
+    position: 'absolute'
+  });
+};
+
+// trigger specified handler for event type
+proto.handleEvent = function( event ) {
+  var method = 'on' + event.type;
+  if ( this[ method ] ) {
+    this[ method ]( event );
+  }
+};
+
+proto.getSize = function() {
+  this.size = getSize( this.element );
+};
+
+/**
+ * apply CSS styles to element
+ * @param {Object} style
+ */
+proto.css = function( style ) {
+  var elemStyle = this.element.style;
+
+  for ( var prop in style ) {
+    // use vendor property if available
+    var supportedProp = vendorProperties[ prop ] || prop;
+    elemStyle[ supportedProp ] = style[ prop ];
+  }
+};
+
+ // measure position, and sets it
+proto.getPosition = function() {
+  var style = getComputedStyle( this.element );
+  var isOriginLeft = this.layout._getOption('originLeft');
+  var isOriginTop = this.layout._getOption('originTop');
+  var xValue = style[ isOriginLeft ? 'left' : 'right' ];
+  var yValue = style[ isOriginTop ? 'top' : 'bottom' ];
+  // convert percent to pixels
+  var layoutSize = this.layout.size;
+  var x = xValue.indexOf('%') != -1 ?
+    ( parseFloat( xValue ) / 100 ) * layoutSize.width : parseInt( xValue, 10 );
+  var y = yValue.indexOf('%') != -1 ?
+    ( parseFloat( yValue ) / 100 ) * layoutSize.height : parseInt( yValue, 10 );
+
+  // clean up 'auto' or other non-integer values
+  x = isNaN( x ) ? 0 : x;
+  y = isNaN( y ) ? 0 : y;
+  // remove padding from measurement
+  x -= isOriginLeft ? layoutSize.paddingLeft : layoutSize.paddingRight;
+  y -= isOriginTop ? layoutSize.paddingTop : layoutSize.paddingBottom;
+
+  this.position.x = x;
+  this.position.y = y;
+};
+
+// set settled position, apply padding
+proto.layoutPosition = function() {
+  var layoutSize = this.layout.size;
+  var style = {};
+  var isOriginLeft = this.layout._getOption('originLeft');
+  var isOriginTop = this.layout._getOption('originTop');
+
+  // x
+  var xPadding = isOriginLeft ? 'paddingLeft' : 'paddingRight';
+  var xProperty = isOriginLeft ? 'left' : 'right';
+  var xResetProperty = isOriginLeft ? 'right' : 'left';
+
+  var x = this.position.x + layoutSize[ xPadding ];
+  // set in percentage or pixels
+  style[ xProperty ] = this.getXValue( x );
+  // reset other property
+  style[ xResetProperty ] = '';
+
+  // y
+  var yPadding = isOriginTop ? 'paddingTop' : 'paddingBottom';
+  var yProperty = isOriginTop ? 'top' : 'bottom';
+  var yResetProperty = isOriginTop ? 'bottom' : 'top';
+
+  var y = this.position.y + layoutSize[ yPadding ];
+  // set in percentage or pixels
+  style[ yProperty ] = this.getYValue( y );
+  // reset other property
+  style[ yResetProperty ] = '';
+
+  this.css( style );
+  this.emitEvent( 'layout', [ this ] );
+};
+
+proto.getXValue = function( x ) {
+  var isHorizontal = this.layout._getOption('horizontal');
+  return this.layout.options.percentPosition && !isHorizontal ?
+    ( ( x / this.layout.size.width ) * 100 ) + '%' : x + 'px';
+};
+
+proto.getYValue = function( y ) {
+  var isHorizontal = this.layout._getOption('horizontal');
+  return this.layout.options.percentPosition && isHorizontal ?
+    ( ( y / this.layout.size.height ) * 100 ) + '%' : y + 'px';
+};
+
+proto._transitionTo = function( x, y ) {
+  this.getPosition();
+  // get current x & y from top/left
+  var curX = this.position.x;
+  var curY = this.position.y;
+
+  var compareX = parseInt( x, 10 );
+  var compareY = parseInt( y, 10 );
+  var didNotMove = compareX === this.position.x && compareY === this.position.y;
+
+  // save end position
+  this.setPosition( x, y );
+
+  // if did not move and not transitioning, just go to layout
+  if ( didNotMove && !this.isTransitioning ) {
+    this.layoutPosition();
+    return;
+  }
+
+  var transX = x - curX;
+  var transY = y - curY;
+  var transitionStyle = {};
+  transitionStyle.transform = this.getTranslate( transX, transY );
+
+  this.transition({
+    to: transitionStyle,
+    onTransitionEnd: {
+      transform: this.layoutPosition
+    },
+    isCleaning: true
+  });
+};
+
+proto.getTranslate = function( x, y ) {
+  // flip cooridinates if origin on right or bottom
+  var isOriginLeft = this.layout._getOption('originLeft');
+  var isOriginTop = this.layout._getOption('originTop');
+  x = isOriginLeft ? x : -x;
+  y = isOriginTop ? y : -y;
+  return 'translate3d(' + x + 'px, ' + y + 'px, 0)';
+};
+
+// non transition + transform support
+proto.goTo = function( x, y ) {
+  this.setPosition( x, y );
+  this.layoutPosition();
+};
+
+proto.moveTo = proto._transitionTo;
+
+proto.setPosition = function( x, y ) {
+  this.position.x = parseInt( x, 10 );
+  this.position.y = parseInt( y, 10 );
+};
+
+// ----- transition ----- //
+
+/**
+ * @param {Object} style - CSS
+ * @param {Function} onTransitionEnd
+ */
+
+// non transition, just trigger callback
+proto._nonTransition = function( args ) {
+  this.css( args.to );
+  if ( args.isCleaning ) {
+    this._removeStyles( args.to );
+  }
+  for ( var prop in args.onTransitionEnd ) {
+    args.onTransitionEnd[ prop ].call( this );
+  }
+};
+
+/**
+ * proper transition
+ * @param {Object} args - arguments
+ *   @param {Object} to - style to transition to
+ *   @param {Object} from - style to start transition from
+ *   @param {Boolean} isCleaning - removes transition styles after transition
+ *   @param {Function} onTransitionEnd - callback
+ */
+proto.transition = function( args ) {
+  // redirect to nonTransition if no transition duration
+  if ( !parseFloat( this.layout.options.transitionDuration ) ) {
+    this._nonTransition( args );
+    return;
+  }
+
+  var _transition = this._transn;
+  // keep track of onTransitionEnd callback by css property
+  for ( var prop in args.onTransitionEnd ) {
+    _transition.onEnd[ prop ] = args.onTransitionEnd[ prop ];
+  }
+  // keep track of properties that are transitioning
+  for ( prop in args.to ) {
+    _transition.ingProperties[ prop ] = true;
+    // keep track of properties to clean up when transition is done
+    if ( args.isCleaning ) {
+      _transition.clean[ prop ] = true;
+    }
+  }
+
+  // set from styles
+  if ( args.from ) {
+    this.css( args.from );
+    // force redraw. http://blog.alexmaccaw.com/css-transitions
+    var h = this.element.offsetHeight;
+    // hack for JSHint to hush about unused var
+    h = null;
+  }
+  // enable transition
+  this.enableTransition( args.to );
+  // set styles that are transitioning
+  this.css( args.to );
+
+  this.isTransitioning = true;
+
+};
+
+// dash before all cap letters, including first for
+// WebkitTransform => -webkit-transform
+function toDashedAll( str ) {
+  return str.replace( /([A-Z])/g, function( $1 ) {
+    return '-' + $1.toLowerCase();
+  });
+}
+
+var transitionProps = 'opacity,' + toDashedAll( transformProperty );
+
+proto.enableTransition = function(/* style */) {
+  // HACK changing transitionProperty during a transition
+  // will cause transition to jump
+  if ( this.isTransitioning ) {
+    return;
+  }
+
+  // make `transition: foo, bar, baz` from style object
+  // HACK un-comment this when enableTransition can work
+  // while a transition is happening
+  // var transitionValues = [];
+  // for ( var prop in style ) {
+  //   // dash-ify camelCased properties like WebkitTransition
+  //   prop = vendorProperties[ prop ] || prop;
+  //   transitionValues.push( toDashedAll( prop ) );
+  // }
+  // munge number to millisecond, to match stagger
+  var duration = this.layout.options.transitionDuration;
+  duration = typeof duration == 'number' ? duration + 'ms' : duration;
+  // enable transition styles
+  this.css({
+    transitionProperty: transitionProps,
+    transitionDuration: duration,
+    transitionDelay: this.staggerDelay || 0
+  });
+  // listen for transition end event
+  this.element.addEventListener( transitionEndEvent, this, false );
+};
+
+// ----- events ----- //
+
+proto.onwebkitTransitionEnd = function( event ) {
+  this.ontransitionend( event );
+};
+
+proto.onotransitionend = function( event ) {
+  this.ontransitionend( event );
+};
+
+// properties that I munge to make my life easier
+var dashedVendorProperties = {
+  '-webkit-transform': 'transform'
+};
+
+proto.ontransitionend = function( event ) {
+  // disregard bubbled events from children
+  if ( event.target !== this.element ) {
+    return;
+  }
+  var _transition = this._transn;
+  // get property name of transitioned property, convert to prefix-free
+  var propertyName = dashedVendorProperties[ event.propertyName ] || event.propertyName;
+
+  // remove property that has completed transitioning
+  delete _transition.ingProperties[ propertyName ];
+  // check if any properties are still transitioning
+  if ( isEmptyObj( _transition.ingProperties ) ) {
+    // all properties have completed transitioning
+    this.disableTransition();
+  }
+  // clean style
+  if ( propertyName in _transition.clean ) {
+    // clean up style
+    this.element.style[ event.propertyName ] = '';
+    delete _transition.clean[ propertyName ];
+  }
+  // trigger onTransitionEnd callback
+  if ( propertyName in _transition.onEnd ) {
+    var onTransitionEnd = _transition.onEnd[ propertyName ];
+    onTransitionEnd.call( this );
+    delete _transition.onEnd[ propertyName ];
+  }
+
+  this.emitEvent( 'transitionEnd', [ this ] );
+};
+
+proto.disableTransition = function() {
+  this.removeTransitionStyles();
+  this.element.removeEventListener( transitionEndEvent, this, false );
+  this.isTransitioning = false;
+};
+
+/**
+ * removes style property from element
+ * @param {Object} style
+**/
+proto._removeStyles = function( style ) {
+  // clean up transition styles
+  var cleanStyle = {};
+  for ( var prop in style ) {
+    cleanStyle[ prop ] = '';
+  }
+  this.css( cleanStyle );
+};
+
+var cleanTransitionStyle = {
+  transitionProperty: '',
+  transitionDuration: '',
+  transitionDelay: ''
+};
+
+proto.removeTransitionStyles = function() {
+  // remove transition
+  this.css( cleanTransitionStyle );
+};
+
+// ----- stagger ----- //
+
+proto.stagger = function( delay ) {
+  delay = isNaN( delay ) ? 0 : delay;
+  this.staggerDelay = delay + 'ms';
+};
+
+// ----- show/hide/remove ----- //
+
+// remove element from DOM
+proto.removeElem = function() {
+  this.element.parentNode.removeChild( this.element );
+  // remove display: none
+  this.css({ display: '' });
+  this.emitEvent( 'remove', [ this ] );
+};
+
+proto.remove = function() {
+  // just remove element if no transition support or no transition
+  if ( !transitionProperty || !parseFloat( this.layout.options.transitionDuration ) ) {
+    this.removeElem();
+    return;
+  }
+
+  // start transition
+  this.once( 'transitionEnd', function() {
+    this.removeElem();
+  });
+  this.hide();
+};
+
+proto.reveal = function() {
+  delete this.isHidden;
+  // remove display: none
+  this.css({ display: '' });
+
+  var options = this.layout.options;
+
+  var onTransitionEnd = {};
+  var transitionEndProperty = this.getHideRevealTransitionEndProperty('visibleStyle');
+  onTransitionEnd[ transitionEndProperty ] = this.onRevealTransitionEnd;
+
+  this.transition({
+    from: options.hiddenStyle,
+    to: options.visibleStyle,
+    isCleaning: true,
+    onTransitionEnd: onTransitionEnd
+  });
+};
+
+proto.onRevealTransitionEnd = function() {
+  // check if still visible
+  // during transition, item may have been hidden
+  if ( !this.isHidden ) {
+    this.emitEvent('reveal');
+  }
+};
+
+/**
+ * get style property use for hide/reveal transition end
+ * @param {String} styleProperty - hiddenStyle/visibleStyle
+ * @returns {String}
+ */
+proto.getHideRevealTransitionEndProperty = function( styleProperty ) {
+  var optionStyle = this.layout.options[ styleProperty ];
+  // use opacity
+  if ( optionStyle.opacity ) {
+    return 'opacity';
+  }
+  // get first property
+  for ( var prop in optionStyle ) {
+    return prop;
+  }
+};
+
+proto.hide = function() {
+  // set flag
+  this.isHidden = true;
+  // remove display: none
+  this.css({ display: '' });
+
+  var options = this.layout.options;
+
+  var onTransitionEnd = {};
+  var transitionEndProperty = this.getHideRevealTransitionEndProperty('hiddenStyle');
+  onTransitionEnd[ transitionEndProperty ] = this.onHideTransitionEnd;
+
+  this.transition({
+    from: options.visibleStyle,
+    to: options.hiddenStyle,
+    // keep hidden stuff hidden
+    isCleaning: true,
+    onTransitionEnd: onTransitionEnd
+  });
+};
+
+proto.onHideTransitionEnd = function() {
+  // check if still hidden
+  // during transition, item may have been un-hidden
+  if ( this.isHidden ) {
+    this.css({ display: 'none' });
+    this.emitEvent('hide');
+  }
+};
+
+proto.destroy = function() {
+  this.css({
+    position: '',
+    left: '',
+    right: '',
+    top: '',
+    bottom: '',
+    transition: '',
+    transform: ''
+  });
+};
+
+return Item;
+
+}));
+
+/*!
+ * Outlayer v2.1.0
+ * the brains and guts of a layout library
+ * MIT license
+ */
+
+( function( window, factory ) {
+  'use strict';
+  // universal module definition
+  /* jshint strict: false */ /* globals define, module, require */
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD - RequireJS
+    define( 'outlayer/outlayer',[
+        'ev-emitter/ev-emitter',
+        'get-size/get-size',
+        'fizzy-ui-utils/utils',
+        './item'
+      ],
+      function( EvEmitter, getSize, utils, Item ) {
+        return factory( window, EvEmitter, getSize, utils, Item);
+      }
+    );
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS - Browserify, Webpack
+    module.exports = factory(
+      window,
+      require('ev-emitter'),
+      require('get-size'),
+      require('fizzy-ui-utils'),
+      require('./item')
+    );
+  } else {
+    // browser global
+    window.Outlayer = factory(
+      window,
+      window.EvEmitter,
+      window.getSize,
+      window.fizzyUIUtils,
+      window.Outlayer.Item
+    );
+  }
+
+}( window, function factory( window, EvEmitter, getSize, utils, Item ) {
+'use strict';
+
+// ----- vars ----- //
+
+var console = window.console;
+var jQuery = window.jQuery;
+var noop = function() {};
+
+// -------------------------- Outlayer -------------------------- //
+
+// globally unique identifiers
+var GUID = 0;
+// internal store of all Outlayer intances
+var instances = {};
+
+
+/**
+ * @param {Element, String} element
+ * @param {Object} options
+ * @constructor
+ */
+function Outlayer( element, options ) {
+  var queryElement = utils.getQueryElement( element );
+  if ( !queryElement ) {
+    if ( console ) {
+      console.error( 'Bad element for ' + this.constructor.namespace +
+        ': ' + ( queryElement || element ) );
+    }
+    return;
+  }
+  this.element = queryElement;
+  // add jQuery
+  if ( jQuery ) {
+    this.$element = jQuery( this.element );
+  }
+
+  // options
+  this.options = utils.extend( {}, this.constructor.defaults );
+  this.option( options );
+
+  // add id for Outlayer.getFromElement
+  var id = ++GUID;
+  this.element.outlayerGUID = id; // expando
+  instances[ id ] = this; // associate via id
+
+  // kick it off
+  this._create();
+
+  var isInitLayout = this._getOption('initLayout');
+  if ( isInitLayout ) {
+    this.layout();
+  }
+}
+
+// settings are for internal use only
+Outlayer.namespace = 'outlayer';
+Outlayer.Item = Item;
+
+// default options
+Outlayer.defaults = {
+  containerStyle: {
+    position: 'relative'
+  },
+  initLayout: true,
+  originLeft: true,
+  originTop: true,
+  resize: true,
+  resizeContainer: true,
+  // item options
+  transitionDuration: '0.4s',
+  hiddenStyle: {
+    opacity: 0,
+    transform: 'scale(0.001)'
+  },
+  visibleStyle: {
+    opacity: 1,
+    transform: 'scale(1)'
+  }
+};
+
+var proto = Outlayer.prototype;
+// inherit EvEmitter
+utils.extend( proto, EvEmitter.prototype );
+
+/**
+ * set options
+ * @param {Object} opts
+ */
+proto.option = function( opts ) {
+  utils.extend( this.options, opts );
+};
+
+/**
+ * get backwards compatible option value, check old name
+ */
+proto._getOption = function( option ) {
+  var oldOption = this.constructor.compatOptions[ option ];
+  return oldOption && this.options[ oldOption ] !== undefined ?
+    this.options[ oldOption ] : this.options[ option ];
+};
+
+Outlayer.compatOptions = {
+  // currentName: oldName
+  initLayout: 'isInitLayout',
+  horizontal: 'isHorizontal',
+  layoutInstant: 'isLayoutInstant',
+  originLeft: 'isOriginLeft',
+  originTop: 'isOriginTop',
+  resize: 'isResizeBound',
+  resizeContainer: 'isResizingContainer'
+};
+
+proto._create = function() {
+  // get items from children
+  this.reloadItems();
+  // elements that affect layout, but are not laid out
+  this.stamps = [];
+  this.stamp( this.options.stamp );
+  // set container style
+  utils.extend( this.element.style, this.options.containerStyle );
+
+  // bind resize method
+  var canBindResize = this._getOption('resize');
+  if ( canBindResize ) {
+    this.bindResize();
+  }
+};
+
+// goes through all children again and gets bricks in proper order
+proto.reloadItems = function() {
+  // collection of item elements
+  this.items = this._itemize( this.element.children );
+};
+
+
+/**
+ * turn elements into Outlayer.Items to be used in layout
+ * @param {Array or NodeList or HTMLElement} elems
+ * @returns {Array} items - collection of new Outlayer Items
+ */
+proto._itemize = function( elems ) {
+
+  var itemElems = this._filterFindItemElements( elems );
+  var Item = this.constructor.Item;
+
+  // create new Outlayer Items for collection
+  var items = [];
+  for ( var i=0; i < itemElems.length; i++ ) {
+    var elem = itemElems[i];
+    var item = new Item( elem, this );
+    items.push( item );
+  }
+
+  return items;
+};
+
+/**
+ * get item elements to be used in layout
+ * @param {Array or NodeList or HTMLElement} elems
+ * @returns {Array} items - item elements
+ */
+proto._filterFindItemElements = function( elems ) {
+  return utils.filterFindElements( elems, this.options.itemSelector );
+};
+
+/**
+ * getter method for getting item elements
+ * @returns {Array} elems - collection of item elements
+ */
+proto.getItemElements = function() {
+  return this.items.map( function( item ) {
+    return item.element;
+  });
+};
+
+// ----- init & layout ----- //
+
+/**
+ * lays out all items
+ */
+proto.layout = function() {
+  this._resetLayout();
+  this._manageStamps();
+
+  // don't animate first layout
+  var layoutInstant = this._getOption('layoutInstant');
+  var isInstant = layoutInstant !== undefined ?
+    layoutInstant : !this._isLayoutInited;
+  this.layoutItems( this.items, isInstant );
+
+  // flag for initalized
+  this._isLayoutInited = true;
+};
+
+// _init is alias for layout
+proto._init = proto.layout;
+
+/**
+ * logic before any new layout
+ */
+proto._resetLayout = function() {
+  this.getSize();
+};
+
+
+proto.getSize = function() {
+  this.size = getSize( this.element );
+};
+
+/**
+ * get measurement from option, for columnWidth, rowHeight, gutter
+ * if option is String -> get element from selector string, & get size of element
+ * if option is Element -> get size of element
+ * else use option as a number
+ *
+ * @param {String} measurement
+ * @param {String} size - width or height
+ * @private
+ */
+proto._getMeasurement = function( measurement, size ) {
+  var option = this.options[ measurement ];
+  var elem;
+  if ( !option ) {
+    // default to 0
+    this[ measurement ] = 0;
+  } else {
+    // use option as an element
+    if ( typeof option == 'string' ) {
+      elem = this.element.querySelector( option );
+    } else if ( option instanceof HTMLElement ) {
+      elem = option;
+    }
+    // use size of element, if element
+    this[ measurement ] = elem ? getSize( elem )[ size ] : option;
+  }
+};
+
+/**
+ * layout a collection of item elements
+ * @api public
+ */
+proto.layoutItems = function( items, isInstant ) {
+  items = this._getItemsForLayout( items );
+
+  this._layoutItems( items, isInstant );
+
+  this._postLayout();
+};
+
+/**
+ * get the items to be laid out
+ * you may want to skip over some items
+ * @param {Array} items
+ * @returns {Array} items
+ */
+proto._getItemsForLayout = function( items ) {
+  return items.filter( function( item ) {
+    return !item.isIgnored;
+  });
+};
+
+/**
+ * layout items
+ * @param {Array} items
+ * @param {Boolean} isInstant
+ */
+proto._layoutItems = function( items, isInstant ) {
+  this._emitCompleteOnItems( 'layout', items );
+
+  if ( !items || !items.length ) {
+    // no items, emit event with empty array
+    return;
+  }
+
+  var queue = [];
+
+  items.forEach( function( item ) {
+    // get x/y object from method
+    var position = this._getItemLayoutPosition( item );
+    // enqueue
+    position.item = item;
+    position.isInstant = isInstant || item.isLayoutInstant;
+    queue.push( position );
+  }, this );
+
+  this._processLayoutQueue( queue );
+};
+
+/**
+ * get item layout position
+ * @param {Outlayer.Item} item
+ * @returns {Object} x and y position
+ */
+proto._getItemLayoutPosition = function( /* item */ ) {
+  return {
+    x: 0,
+    y: 0
+  };
+};
+
+/**
+ * iterate over array and position each item
+ * Reason being - separating this logic prevents 'layout invalidation'
+ * thx @paul_irish
+ * @param {Array} queue
+ */
+proto._processLayoutQueue = function( queue ) {
+  this.updateStagger();
+  queue.forEach( function( obj, i ) {
+    this._positionItem( obj.item, obj.x, obj.y, obj.isInstant, i );
+  }, this );
+};
+
+// set stagger from option in milliseconds number
+proto.updateStagger = function() {
+  var stagger = this.options.stagger;
+  if ( stagger === null || stagger === undefined ) {
+    this.stagger = 0;
+    return;
+  }
+  this.stagger = getMilliseconds( stagger );
+  return this.stagger;
+};
+
+/**
+ * Sets position of item in DOM
+ * @param {Outlayer.Item} item
+ * @param {Number} x - horizontal position
+ * @param {Number} y - vertical position
+ * @param {Boolean} isInstant - disables transitions
+ */
+proto._positionItem = function( item, x, y, isInstant, i ) {
+  if ( isInstant ) {
+    // if not transition, just set CSS
+    item.goTo( x, y );
+  } else {
+    item.stagger( i * this.stagger );
+    item.moveTo( x, y );
+  }
+};
+
+/**
+ * Any logic you want to do after each layout,
+ * i.e. size the container
+ */
+proto._postLayout = function() {
+  this.resizeContainer();
+};
+
+proto.resizeContainer = function() {
+  var isResizingContainer = this._getOption('resizeContainer');
+  if ( !isResizingContainer ) {
+    return;
+  }
+  var size = this._getContainerSize();
+  if ( size ) {
+    this._setContainerMeasure( size.width, true );
+    this._setContainerMeasure( size.height, false );
+  }
+};
+
+/**
+ * Sets width or height of container if returned
+ * @returns {Object} size
+ *   @param {Number} width
+ *   @param {Number} height
+ */
+proto._getContainerSize = noop;
+
+/**
+ * @param {Number} measure - size of width or height
+ * @param {Boolean} isWidth
+ */
+proto._setContainerMeasure = function( measure, isWidth ) {
+  if ( measure === undefined ) {
+    return;
+  }
+
+  var elemSize = this.size;
+  // add padding and border width if border box
+  if ( elemSize.isBorderBox ) {
+    measure += isWidth ? elemSize.paddingLeft + elemSize.paddingRight +
+      elemSize.borderLeftWidth + elemSize.borderRightWidth :
+      elemSize.paddingBottom + elemSize.paddingTop +
+      elemSize.borderTopWidth + elemSize.borderBottomWidth;
+  }
+
+  measure = Math.max( measure, 0 );
+  this.element.style[ isWidth ? 'width' : 'height' ] = measure + 'px';
+};
+
+/**
+ * emit eventComplete on a collection of items events
+ * @param {String} eventName
+ * @param {Array} items - Outlayer.Items
+ */
+proto._emitCompleteOnItems = function( eventName, items ) {
+  var _this = this;
+  function onComplete() {
+    _this.dispatchEvent( eventName + 'Complete', null, [ items ] );
+  }
+
+  var count = items.length;
+  if ( !items || !count ) {
+    onComplete();
+    return;
+  }
+
+  var doneCount = 0;
+  function tick() {
+    doneCount++;
+    if ( doneCount == count ) {
+      onComplete();
+    }
+  }
+
+  // bind callback
+  items.forEach( function( item ) {
+    item.once( eventName, tick );
+  });
+};
+
+/**
+ * emits events via EvEmitter and jQuery events
+ * @param {String} type - name of event
+ * @param {Event} event - original event
+ * @param {Array} args - extra arguments
+ */
+proto.dispatchEvent = function( type, event, args ) {
+  // add original event to arguments
+  var emitArgs = event ? [ event ].concat( args ) : args;
+  this.emitEvent( type, emitArgs );
+
+  if ( jQuery ) {
+    // set this.$element
+    this.$element = this.$element || jQuery( this.element );
+    if ( event ) {
+      // create jQuery event
+      var $event = jQuery.Event( event );
+      $event.type = type;
+      this.$element.trigger( $event, args );
+    } else {
+      // just trigger with type if no event available
+      this.$element.trigger( type, args );
+    }
+  }
+};
+
+// -------------------------- ignore & stamps -------------------------- //
+
+
+/**
+ * keep item in collection, but do not lay it out
+ * ignored items do not get skipped in layout
+ * @param {Element} elem
+ */
+proto.ignore = function( elem ) {
+  var item = this.getItem( elem );
+  if ( item ) {
+    item.isIgnored = true;
+  }
+};
+
+/**
+ * return item to layout collection
+ * @param {Element} elem
+ */
+proto.unignore = function( elem ) {
+  var item = this.getItem( elem );
+  if ( item ) {
+    delete item.isIgnored;
+  }
+};
+
+/**
+ * adds elements to stamps
+ * @param {NodeList, Array, Element, or String} elems
+ */
+proto.stamp = function( elems ) {
+  elems = this._find( elems );
+  if ( !elems ) {
+    return;
+  }
+
+  this.stamps = this.stamps.concat( elems );
+  // ignore
+  elems.forEach( this.ignore, this );
+};
+
+/**
+ * removes elements to stamps
+ * @param {NodeList, Array, or Element} elems
+ */
+proto.unstamp = function( elems ) {
+  elems = this._find( elems );
+  if ( !elems ){
+    return;
+  }
+
+  elems.forEach( function( elem ) {
+    // filter out removed stamp elements
+    utils.removeFrom( this.stamps, elem );
+    this.unignore( elem );
+  }, this );
+};
+
+/**
+ * finds child elements
+ * @param {NodeList, Array, Element, or String} elems
+ * @returns {Array} elems
+ */
+proto._find = function( elems ) {
+  if ( !elems ) {
+    return;
+  }
+  // if string, use argument as selector string
+  if ( typeof elems == 'string' ) {
+    elems = this.element.querySelectorAll( elems );
+  }
+  elems = utils.makeArray( elems );
+  return elems;
+};
+
+proto._manageStamps = function() {
+  if ( !this.stamps || !this.stamps.length ) {
+    return;
+  }
+
+  this._getBoundingRect();
+
+  this.stamps.forEach( this._manageStamp, this );
+};
+
+// update boundingLeft / Top
+proto._getBoundingRect = function() {
+  // get bounding rect for container element
+  var boundingRect = this.element.getBoundingClientRect();
+  var size = this.size;
+  this._boundingRect = {
+    left: boundingRect.left + size.paddingLeft + size.borderLeftWidth,
+    top: boundingRect.top + size.paddingTop + size.borderTopWidth,
+    right: boundingRect.right - ( size.paddingRight + size.borderRightWidth ),
+    bottom: boundingRect.bottom - ( size.paddingBottom + size.borderBottomWidth )
+  };
+};
+
+/**
+ * @param {Element} stamp
+**/
+proto._manageStamp = noop;
+
+/**
+ * get x/y position of element relative to container element
+ * @param {Element} elem
+ * @returns {Object} offset - has left, top, right, bottom
+ */
+proto._getElementOffset = function( elem ) {
+  var boundingRect = elem.getBoundingClientRect();
+  var thisRect = this._boundingRect;
+  var size = getSize( elem );
+  var offset = {
+    left: boundingRect.left - thisRect.left - size.marginLeft,
+    top: boundingRect.top - thisRect.top - size.marginTop,
+    right: thisRect.right - boundingRect.right - size.marginRight,
+    bottom: thisRect.bottom - boundingRect.bottom - size.marginBottom
+  };
+  return offset;
+};
+
+// -------------------------- resize -------------------------- //
+
+// enable event handlers for listeners
+// i.e. resize -> onresize
+proto.handleEvent = utils.handleEvent;
+
+/**
+ * Bind layout to window resizing
+ */
+proto.bindResize = function() {
+  window.addEventListener( 'resize', this );
+  this.isResizeBound = true;
+};
+
+/**
+ * Unbind layout to window resizing
+ */
+proto.unbindResize = function() {
+  window.removeEventListener( 'resize', this );
+  this.isResizeBound = false;
+};
+
+proto.onresize = function() {
+  this.resize();
+};
+
+utils.debounceMethod( Outlayer, 'onresize', 100 );
+
+proto.resize = function() {
+  // don't trigger if size did not change
+  // or if resize was unbound. See #9
+  if ( !this.isResizeBound || !this.needsResizeLayout() ) {
+    return;
+  }
+
+  this.layout();
+};
+
+/**
+ * check if layout is needed post layout
+ * @returns Boolean
+ */
+proto.needsResizeLayout = function() {
+  var size = getSize( this.element );
+  // check that this.size and size are there
+  // IE8 triggers resize on body size change, so they might not be
+  var hasSizes = this.size && size;
+  return hasSizes && size.innerWidth !== this.size.innerWidth;
+};
+
+// -------------------------- methods -------------------------- //
+
+/**
+ * add items to Outlayer instance
+ * @param {Array or NodeList or Element} elems
+ * @returns {Array} items - Outlayer.Items
+**/
+proto.addItems = function( elems ) {
+  var items = this._itemize( elems );
+  // add items to collection
+  if ( items.length ) {
+    this.items = this.items.concat( items );
+  }
+  return items;
+};
+
+/**
+ * Layout newly-appended item elements
+ * @param {Array or NodeList or Element} elems
+ */
+proto.appended = function( elems ) {
+  var items = this.addItems( elems );
+  if ( !items.length ) {
+    return;
+  }
+  // layout and reveal just the new items
+  this.layoutItems( items, true );
+  this.reveal( items );
+};
+
+/**
+ * Layout prepended elements
+ * @param {Array or NodeList or Element} elems
+ */
+proto.prepended = function( elems ) {
+  var items = this._itemize( elems );
+  if ( !items.length ) {
+    return;
+  }
+  // add items to beginning of collection
+  var previousItems = this.items.slice(0);
+  this.items = items.concat( previousItems );
+  // start new layout
+  this._resetLayout();
+  this._manageStamps();
+  // layout new stuff without transition
+  this.layoutItems( items, true );
+  this.reveal( items );
+  // layout previous items
+  this.layoutItems( previousItems );
+};
+
+/**
+ * reveal a collection of items
+ * @param {Array of Outlayer.Items} items
+ */
+proto.reveal = function( items ) {
+  this._emitCompleteOnItems( 'reveal', items );
+  if ( !items || !items.length ) {
+    return;
+  }
+  var stagger = this.updateStagger();
+  items.forEach( function( item, i ) {
+    item.stagger( i * stagger );
+    item.reveal();
+  });
+};
+
+/**
+ * hide a collection of items
+ * @param {Array of Outlayer.Items} items
+ */
+proto.hide = function( items ) {
+  this._emitCompleteOnItems( 'hide', items );
+  if ( !items || !items.length ) {
+    return;
+  }
+  var stagger = this.updateStagger();
+  items.forEach( function( item, i ) {
+    item.stagger( i * stagger );
+    item.hide();
+  });
+};
+
+/**
+ * reveal item elements
+ * @param {Array}, {Element}, {NodeList} items
+ */
+proto.revealItemElements = function( elems ) {
+  var items = this.getItems( elems );
+  this.reveal( items );
+};
+
+/**
+ * hide item elements
+ * @param {Array}, {Element}, {NodeList} items
+ */
+proto.hideItemElements = function( elems ) {
+  var items = this.getItems( elems );
+  this.hide( items );
+};
+
+/**
+ * get Outlayer.Item, given an Element
+ * @param {Element} elem
+ * @param {Function} callback
+ * @returns {Outlayer.Item} item
+ */
+proto.getItem = function( elem ) {
+  // loop through items to get the one that matches
+  for ( var i=0; i < this.items.length; i++ ) {
+    var item = this.items[i];
+    if ( item.element == elem ) {
+      // return item
+      return item;
+    }
+  }
+};
+
+/**
+ * get collection of Outlayer.Items, given Elements
+ * @param {Array} elems
+ * @returns {Array} items - Outlayer.Items
+ */
+proto.getItems = function( elems ) {
+  elems = utils.makeArray( elems );
+  var items = [];
+  elems.forEach( function( elem ) {
+    var item = this.getItem( elem );
+    if ( item ) {
+      items.push( item );
+    }
+  }, this );
+
+  return items;
+};
+
+/**
+ * remove element(s) from instance and DOM
+ * @param {Array or NodeList or Element} elems
+ */
+proto.remove = function( elems ) {
+  var removeItems = this.getItems( elems );
+
+  this._emitCompleteOnItems( 'remove', removeItems );
+
+  // bail if no items to remove
+  if ( !removeItems || !removeItems.length ) {
+    return;
+  }
+
+  removeItems.forEach( function( item ) {
+    item.remove();
+    // remove item from collection
+    utils.removeFrom( this.items, item );
+  }, this );
+};
+
+// ----- destroy ----- //
+
+// remove and disable Outlayer instance
+proto.destroy = function() {
+  // clean up dynamic styles
+  var style = this.element.style;
+  style.height = '';
+  style.position = '';
+  style.width = '';
+  // destroy items
+  this.items.forEach( function( item ) {
+    item.destroy();
+  });
+
+  this.unbindResize();
+
+  var id = this.element.outlayerGUID;
+  delete instances[ id ]; // remove reference to instance by id
+  delete this.element.outlayerGUID;
+  // remove data for jQuery
+  if ( jQuery ) {
+    jQuery.removeData( this.element, this.constructor.namespace );
+  }
+
+};
+
+// -------------------------- data -------------------------- //
+
+/**
+ * get Outlayer instance from element
+ * @param {Element} elem
+ * @returns {Outlayer}
+ */
+Outlayer.data = function( elem ) {
+  elem = utils.getQueryElement( elem );
+  var id = elem && elem.outlayerGUID;
+  return id && instances[ id ];
+};
+
+
+// -------------------------- create Outlayer class -------------------------- //
+
+/**
+ * create a layout class
+ * @param {String} namespace
+ */
+Outlayer.create = function( namespace, options ) {
+  // sub-class Outlayer
+  var Layout = subclass( Outlayer );
+  // apply new options and compatOptions
+  Layout.defaults = utils.extend( {}, Outlayer.defaults );
+  utils.extend( Layout.defaults, options );
+  Layout.compatOptions = utils.extend( {}, Outlayer.compatOptions  );
+
+  Layout.namespace = namespace;
+
+  Layout.data = Outlayer.data;
+
+  // sub-class Item
+  Layout.Item = subclass( Item );
+
+  // -------------------------- declarative -------------------------- //
+
+  utils.htmlInit( Layout, namespace );
+
+  // -------------------------- jQuery bridge -------------------------- //
+
+  // make into jQuery plugin
+  if ( jQuery && jQuery.bridget ) {
+    jQuery.bridget( namespace, Layout );
+  }
+
+  return Layout;
+};
+
+function subclass( Parent ) {
+  function SubClass() {
+    Parent.apply( this, arguments );
+  }
+
+  SubClass.prototype = Object.create( Parent.prototype );
+  SubClass.prototype.constructor = SubClass;
+
+  return SubClass;
+}
+
+// ----- helpers ----- //
+
+// how many milliseconds are in each unit
+var msUnits = {
+  ms: 1,
+  s: 1000
+};
+
+// munge time-like parameter into millisecond number
+// '0.4s' -> 40
+function getMilliseconds( time ) {
+  if ( typeof time == 'number' ) {
+    return time;
+  }
+  var matches = time.match( /(^\d*\.?\d*)(\w*)/ );
+  var num = matches && matches[1];
+  var unit = matches && matches[2];
+  if ( !num.length ) {
+    return 0;
+  }
+  num = parseFloat( num );
+  var mult = msUnits[ unit ] || 1;
+  return num * mult;
+}
+
+// ----- fin ----- //
+
+// back in global
+Outlayer.Item = Item;
+
+return Outlayer;
+
+}));
+
+/*!
+ * Masonry v4.1.0
+ * Cascading grid layout library
+ * http://masonry.desandro.com
+ * MIT License
+ * by David DeSandro
+ */
+
+( function( window, factory ) {
+  // universal module definition
+  /* jshint strict: false */ /*globals define, module, require */
+  if ( typeof define == 'function' && define.amd ) {
+    // AMD
+    define( [
+        'outlayer/outlayer',
+        'get-size/get-size'
+      ],
+      factory );
+  } else if ( typeof module == 'object' && module.exports ) {
+    // CommonJS
+    module.exports = factory(
+      require('outlayer'),
+      require('get-size')
+    );
+  } else {
+    // browser global
+    window.Masonry = factory(
+      window.Outlayer,
+      window.getSize
+    );
+  }
+
+}( window, function factory( Outlayer, getSize ) {
+
+
+
+// -------------------------- masonryDefinition -------------------------- //
+
+  // create an Outlayer layout class
+  var Masonry = Outlayer.create('masonry');
+  // isFitWidth -> fitWidth
+  Masonry.compatOptions.fitWidth = 'isFitWidth';
+
+  Masonry.prototype._resetLayout = function() {
+    this.getSize();
+    this._getMeasurement( 'columnWidth', 'outerWidth' );
+    this._getMeasurement( 'gutter', 'outerWidth' );
+    this.measureColumns();
+
+    // reset column Y
+    this.colYs = [];
+    for ( var i=0; i < this.cols; i++ ) {
+      this.colYs.push( 0 );
+    }
+
+    this.maxY = 0;
+  };
+
+  Masonry.prototype.measureColumns = function() {
+    this.getContainerWidth();
+    // if columnWidth is 0, default to outerWidth of first item
+    if ( !this.columnWidth ) {
+      var firstItem = this.items[0];
+      var firstItemElem = firstItem && firstItem.element;
+      // columnWidth fall back to item of first element
+      this.columnWidth = firstItemElem && getSize( firstItemElem ).outerWidth ||
+        // if first elem has no width, default to size of container
+        this.containerWidth;
+    }
+
+    var columnWidth = this.columnWidth += this.gutter;
+
+    // calculate columns
+    var containerWidth = this.containerWidth + this.gutter;
+    var cols = containerWidth / columnWidth;
+    // fix rounding errors, typically with gutters
+    var excess = columnWidth - containerWidth % columnWidth;
+    // if overshoot is less than a pixel, round up, otherwise floor it
+    var mathMethod = excess && excess < 1 ? 'round' : 'floor';
+    cols = Math[ mathMethod ]( cols );
+    this.cols = Math.max( cols, 1 );
+  };
+
+  Masonry.prototype.getContainerWidth = function() {
+    // container is parent if fit width
+    var isFitWidth = this._getOption('fitWidth');
+    var container = isFitWidth ? this.element.parentNode : this.element;
+    // check that this.size and size are there
+    // IE8 triggers resize on body size change, so they might not be
+    var size = getSize( container );
+    this.containerWidth = size && size.innerWidth;
+  };
+
+  Masonry.prototype._getItemLayoutPosition = function( item ) {
+    item.getSize();
+    // how many columns does this brick span
+    var remainder = item.size.outerWidth % this.columnWidth;
+    var mathMethod = remainder && remainder < 1 ? 'round' : 'ceil';
+    // round if off by 1 pixel, otherwise use ceil
+    var colSpan = Math[ mathMethod ]( item.size.outerWidth / this.columnWidth );
+    colSpan = Math.min( colSpan, this.cols );
+
+    var colGroup = this._getColGroup( colSpan );
+    // get the minimum Y value from the columns
+    var minimumY = Math.min.apply( Math, colGroup );
+    var shortColIndex = colGroup.indexOf( minimumY );
+
+    // position the brick
+    var position = {
+      x: this.columnWidth * shortColIndex,
+      y: minimumY
+    };
+
+    // apply setHeight to necessary columns
+    var setHeight = minimumY + item.size.outerHeight;
+    var setSpan = this.cols + 1 - colGroup.length;
+    for ( var i = 0; i < setSpan; i++ ) {
+      this.colYs[ shortColIndex + i ] = setHeight;
+    }
+
+    return position;
+  };
+
+  /**
+   * @param {Number} colSpan - number of columns the element spans
+   * @returns {Array} colGroup
+   */
+  Masonry.prototype._getColGroup = function( colSpan ) {
+    if ( colSpan < 2 ) {
+      // if brick spans only one column, use all the column Ys
+      return this.colYs;
+    }
+
+    var colGroup = [];
+    // how many different places could this brick fit horizontally
+    var groupCount = this.cols + 1 - colSpan;
+    // for each group potential horizontal position
+    for ( var i = 0; i < groupCount; i++ ) {
+      // make an array of colY values for that one group
+      var groupColYs = this.colYs.slice( i, i + colSpan );
+      // and get the max value of the array
+      colGroup[i] = Math.max.apply( Math, groupColYs );
+    }
+    return colGroup;
+  };
+
+  Masonry.prototype._manageStamp = function( stamp ) {
+    var stampSize = getSize( stamp );
+    var offset = this._getElementOffset( stamp );
+    // get the columns that this stamp affects
+    var isOriginLeft = this._getOption('originLeft');
+    var firstX = isOriginLeft ? offset.left : offset.right;
+    var lastX = firstX + stampSize.outerWidth;
+    var firstCol = Math.floor( firstX / this.columnWidth );
+    firstCol = Math.max( 0, firstCol );
+    var lastCol = Math.floor( lastX / this.columnWidth );
+    // lastCol should not go over if multiple of columnWidth #425
+    lastCol -= lastX % this.columnWidth ? 0 : 1;
+    lastCol = Math.min( this.cols - 1, lastCol );
+    // set colYs to bottom of the stamp
+
+    var isOriginTop = this._getOption('originTop');
+    var stampMaxY = ( isOriginTop ? offset.top : offset.bottom ) +
+      stampSize.outerHeight;
+    for ( var i = firstCol; i <= lastCol; i++ ) {
+      this.colYs[i] = Math.max( stampMaxY, this.colYs[i] );
+    }
+  };
+
+  Masonry.prototype._getContainerSize = function() {
+    this.maxY = Math.max.apply( Math, this.colYs );
+    var size = {
+      height: this.maxY
+    };
+
+    if ( this._getOption('fitWidth') ) {
+      size.width = this._getContainerFitWidth();
+    }
+
+    return size;
+  };
+
+  Masonry.prototype._getContainerFitWidth = function() {
+    var unusedCols = 0;
+    // count unused columns
+    var i = this.cols;
+    while ( --i ) {
+      if ( this.colYs[i] !== 0 ) {
+        break;
+      }
+      unusedCols++;
+    }
+    // fit container to columns that have been used
+    return ( this.cols - unusedCols ) * this.columnWidth - this.gutter;
+  };
+
+  Masonry.prototype.needsResizeLayout = function() {
+    var previousWidth = this.containerWidth;
+    this.getContainerWidth();
+    return previousWidth != this.containerWidth;
+  };
+
+  return Masonry;
+
+}));
\ No newline at end of file
diff --git a/templates/cmdb/code_update.html b/templates/cmdb/code_update.html
index aa28a99..402d856 100644
--- a/templates/cmdb/code_update.html
+++ b/templates/cmdb/code_update.html
@@ -40,7 +40,7 @@
                         </div>
                         <label class="col-sm-2 control-label">描述信息</label>
                         <div class="col-sm-3">
-                            <input class="form-control" id="desc" name="desc" type="text" />
+                            <input class="form-control" id="desc" name="desc" type="text" value="{{ code.desc }}"/>
                         </div>
                     </div>
 
diff --git a/templates/cmdb/deviceinfo.html b/templates/cmdb/deviceinfo.html
new file mode 100644
index 0000000..b5a443c
--- /dev/null
+++ b/templates/cmdb/deviceinfo.html
@@ -0,0 +1,347 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/datatables/jquery.dataTables.min.css' %}">
+    <link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+{% endblock %}
+
+{% block content %}
+
+    <!-- Main content -->
+  <section class="content">
+    <div id="devlist">
+        <div class="box box-primary" id="liebiao">
+            <div class="box-header">
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnRefresh" class="btn btn-default">
+                        <i class="glyphicon glyphicon-repeat"></i>刷新
+                    </button>
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnCreate" class="btn btn-default">
+                        <i class="glyphicon glyphicon-plus"></i>新增
+                    </button>
+
+                </div>
+                <div class="btn-group pull-left">&nbsp</div>
+                <div class="btn-group pull-left">
+                    <button type="button" id="btnDelete" class="btn btn-default">
+                        <i class="glyphicon glyphicon-trash"></i>删除
+                    </button>
+                </div>
+            </div>
+            <div class="box-header">
+                <form class="form-inline" id="queryForm">
+                    <div class="form-group searchArea margin-r-5 margin-top-5">
+                        <label>主机名：</label>
+                        <input type="text" name="sys_hostname" class="form-control inputText" id="sys_hostname">
+                    </div>
+                    <div class="form-group searchArea margin-r-5 margin-top-5">
+                        <label>设备地址：</label>
+                        <input type="text" name="hostname" class="form-control inputText" id="hostname">
+                    </div>
+                    <div class="form-group searchArea margin-r-5 margin-top-5">
+                        <label>网络类型：</label>
+                        <select class="form-control inputText select2" name="network_type" id="network_type">
+                          <option></option>
+                          {% for code in all_code %}
+                              {% ifequal code.parent.key 'NETWORK_TYPE' %}
+                                <option value="{{ code.id }}">{{ code.value }}</option>
+                              {% endifequal %}
+                          {% endfor %}
+                         </select>
+                    </div>
+                    <div class="form-group searchArea margin-r-5 margin-top-5">
+                        <label>服务类型：</label>
+                        <select class="form-control inputText select2" name="service_type" , id="service_type">
+                          <option></option>
+                          {% for code in all_code %}
+                              {% if code.parent.key == 'SERVICE_TYPE' %}
+                                <option value="{{ code.id }}">{{ code.value }}</option>
+                              {% endif %}
+                          {% endfor %}
+                        </select>
+                    </div>
+                    <div class="form-group searchArea margin-r-5 margin-top-5">
+                        <label>业务类型：</label>
+                        <select class="form-control inputText select2" name="operation_type" , id="operation_type">
+                          <option></option>
+                          {% for code in all_code %}
+                              {% if code.parent.key == 'OPERATION_TYPE' %}
+                                <option value="{{ code.id }}">{{ code.value }}</option>
+                              {% endif %}
+                          {% endfor %}
+                        </select>
+                    </div>
+                  <button type="button" id="btnSearch" class="btn btn-default">
+                    <i class="glyphicon glyphicon-search"></i>查询
+                  </button>
+                </form>
+            </div>
+
+            <div class="box-body">
+                <table id="dtbList" class="display" cellspacing="0" width="100%">
+                    <thead>
+                    <tr valign="middle">
+                        <th><input type="checkbox" id="checkAll"></th>
+                        <th>ID</th>
+                        <th>主机名</th>
+                        <th>SN编号</th>
+                        <th>系统类型</th>
+                        <th>设备类型</th>
+                        <th>设备地址</th>
+                        <th>MAC地址</th>
+                        <th>责任人</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+                <br> <br>
+            </div>
+        </div>
+    </div>
+
+  </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+
+{% block javascripts %}
+
+<script src="{% static 'plugins/datatables/jquery.dataTables.min.js' %}"></script>
+<script src="{% static 'plugins/datatables/dataTables.const-1.js' %}"></script>
+<script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+<script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+
+<script type="text/javascript">
+    // 菜单选中高亮
+    $(function () {
+        $('#CMDB-EAM').addClass('active');
+        $('#CMDB-EAM-DEVICE').addClass('active');
+
+    });
+
+    // datatables 初始化配置
+    var oDataTable = null;
+    $(function () {
+        oDataTable = initTable();
+
+        function initTable() {
+            var oTable = $('#dtbList').DataTable($.extend(true, {},
+                DATATABLES_CONSTANT.DATA_TABLES.SERVER_SIDE_OPTION,
+
+                {
+                    ajax: {
+                        "url": "{% url 'cmdb:eam-device-list' %}",
+                        "data": function (d) {
+                                d.sys_hostname = $("#sys_hostname").val();
+                                d.hostname = $("#hostname").val();
+                                d.network_type = $("#network_type").val();
+                                d.service_type = $("#service_type").val();
+                                d.operation_type = $("#operation_type").val();
+                            }
+                    },
+                    columns: [
+                        DATATABLES_CONSTANT.DATA_TABLES.COLUMN.CHECKBOX,
+
+                        {
+                            data: "id",
+                        },
+                        {
+                            data: "sys_hostname",
+                        },
+                        {
+                            data: "sn_number",
+                        },
+                        {
+                            data: "os_type",
+                        },
+                        {
+                            data: "device_type",
+                        },
+                        {
+                            data: "hostname",
+                        },
+                        {
+                            data: "mac_address",
+                        },
+                        {
+                            data: "leader",
+                        },
+                        {
+                            data: "id",
+                            bSortable: "false",
+                            render: function (data, type, row, meta) {
+                                var ret = "<button title='详情' onclick='doDetail("
+                                    + data + ")'><i class='glyphicon glyphicon-list-alt'></i></button>";
+                                ret = ret + "<button title='修改' onclick='doUpdate("
+                                    + data + ")'><i class='glyphicon glyphicon-pencil'></i></button>";
+                                ret = ret + "<button title='认证管理' onclick='doDevice2Connection("
+                                    + data + ")'><i class='glyphicon glyphicon-user'></i></button>";
+                                ret = ret + "<button title='删除' onclick='doDelete("
+                                    + data + ")'><i class='glyphicon glyphicon-trash'></i></button>";
+                                return ret;
+                            }
+                        }],
+                    }));
+                return oTable;
+            }
+
+        });
+
+    // 刷新数据
+    $("#btnRefresh").click(function () {
+        window.location.reload();
+    });
+    //新建数据
+    $("#btnCreate").click(function () {
+        var div=layer.open({
+            type: 2,
+            title: '新增',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: "{% url 'cmdb:eam-device-create' %}",
+            end: function () {
+                //关闭时做的事情
+                oDataTable.ajax.reload();
+            }
+        });
+        layer.full(div )
+    });
+
+    //修改数据
+    function doUpdate(id) {
+        var div=layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'cmdb:eam-device-update' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+        layer.full(div )
+    }
+
+    //checkbox全选
+    $("#checkAll").on("click", function () {
+        if ($(this).prop("checked") === true) {
+            $("input[name='checkList']").prop("checked", $(this).prop("checked"));
+            $('#example tbody tr').addClass('selected');
+        } else {
+            $("input[name='checkList']").prop("checked", false);
+            $('#example tbody tr').removeClass('selected');
+        }
+    });
+
+    //批量删除
+    $("#btnDelete").click(function () {
+        if ($("input[name='checkList']:checked").length == 0) {
+            layer.msg("请选择要删除的记录");
+            return;
+        }
+
+        var arrId = new Array();
+        $("input[name='checkList']:checked").each(function () {
+            //alert($(this).val());
+            arrId.push($(this).val());
+        });
+
+        sId = arrId.join(',');
+
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'cmdb:eam-device-delete' %}",
+                    data: {"id": sId, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert("操作成功", {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert("操作失败", {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    //删除单个数据
+    function doDelete(id) {
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'cmdb:eam-device-delete' %}",
+                    data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('删除成功', {icon: 1});
+                            oDataTable.ajax.reload();
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('删除失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    //select2
+    $(function () {
+        //Initialize Select2 Elements
+        $(".select2").select2();
+    });
+
+    $("#btnSearch").click(function(){
+        oDataTable.ajax.reload();
+    });
+
+
+    function doDevice2Connection(id) {
+          layer.open({
+            type: 2,
+            title: '认证管理',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'cmdb:eam-device-device2connection' %}" + '?id=' + id, 'no'],
+            end: function () {
+                oDataTable.ajax.reload();
+            }
+        });
+        }
+
+    function doDetail(id){
+        window.location.href="{% url 'cmdb:eam-device-detail' %}?id="+id;
+    }
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/cmdb/deviceinfo2connection.html b/templates/cmdb/deviceinfo2connection.html
new file mode 100644
index 0000000..1b2af51
--- /dev/null
+++ b/templates/cmdb/deviceinfo2connection.html
@@ -0,0 +1,108 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+{% block css %}
+    <link rel="stylesheet" href="{% static 'plugins/select2/select2.min.css' %}">
+    <!-- iCheck for checkboxes and radio inputs -->
+{% endblock %}
+{% block main %}
+    <div class="box box-danger">
+        <form class="form-horizontal" id="addForm" method="post">
+            <input type="hidden" name='id' value="{{ connection_info.id }}" />
+            <input type="hidden" name='hostname' value="{{ device.hostname }}" />
+            {% csrf_token %}
+            <div class="box-body">
+                <fieldset>
+                    <legend>
+                        <h4>关联设备：{{ device.sys_hostname }}({{ device.hostname }})</h4>
+                    </legend>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">用户名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="username" type="text" value="{{ connection_info.username }}"/>
+                        </div>
+                    <label class="col-sm-2 control-label">认证类型</label>
+                    <div class="col-sm-3">
+                      <select class="form-control select2" style="width:100%;" name="auth_type">
+                      <option value="password" {% ifequal connection_info.auth_type 'password' %}selected="selected"{% endifequal %}>密码</option>
+                      <option value="private_key" {% ifequal connection_info.auth_type 'private_key' %}selected="selected"{% endifequal %}>密钥</option>
+                     </select>
+                    </div>
+                    </div>
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">密码</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="password" type="password" value="{{ connection_info.password }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">密钥</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="private_key" type="text" value="{{ connection_info.private_key }}"/>
+                        </div>
+                    </div>
+
+                    <div class="form-group has-feedback">
+                        <label class="col-sm-2 control-label">端口</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="port" type="text" value="{{ connection_info.port }}"/>
+                        </div>
+                        <label class="col-sm-2 control-label">状态</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" name="status" type="text" value="{{ connection_info.status }}" readonly/>
+                        </div>
+                    </div>
+
+                </fieldset>
+            </div>
+            <div class="box-footer ">
+                <div class="row span7 text-center ">
+                    <button type="button" id="btnCancel" class="btn btn-default margin-right ">重置</button>
+                    <button type="button" id="btnSave" class="btn btn-info margin-right ">保存</button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+    <script type="text/javascript">
+
+
+    $("#btnSave").click(function () {
+        var data = $("#addForm").serialize();
+        $.ajax({
+            type: $("#addForm").attr('method'),
+            url: "{% url 'cmdb:eam-device-device2connection' %}",
+            data: data,
+            cache: false,
+            success: function (msg) {
+                if (msg.result) {
+                    layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                        parent.layer.closeAll(); //关闭所有弹窗
+                    });
+                } else {
+                    layer.alert(msg.error, {icon: 5});
+                    //$('errorMessage').html(msg.message)
+                }
+                return;
+            }
+        });
+    });
+
+
+        /*点取消刷新新页面*/
+        $("#btnCancel").click(function () {
+            window.location.reload();
+
+        });
+
+        $(function () {
+            //Initialize Select2 Elements
+            $(".select2").select2();
+        });
+
+    </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/cmdb/deviceinfo_detail.html b/templates/cmdb/deviceinfo_detail.html
new file mode 100644
index 0000000..2e1abab
--- /dev/null
+++ b/templates/cmdb/deviceinfo_detail.html
@@ -0,0 +1,316 @@
+{% extends "base-left.html" %}
+{% load staticfiles %}
+{% load extra_tags %}
+
+{% block css %}
+<link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+{% endblock %}
+
+{% block content %}
+
+  <section class="content">
+
+        <div class="nav-tabs-custom">
+            <ul class="nav nav-tabs">
+              <li class="active"><a href="#activity" data-toggle="tab">设备详情</a></li>
+              <li><a href="#history" data-toggle="tab">历史纪录</a></li>
+            </ul>
+            <div class="tab-content">
+              <div class="active tab-pane" id="activity">
+                <div class="box-body no-padding">
+                    <div class="btn-group pull-right margin">
+                        <button type="button" class="btn btn-primary btn-sm margin-r-5"
+                                onclick="doUpload({{ device.id }})">
+                            <i class="fa fa-cloud-upload"> 上传资料</i>
+                        </button>
+                        <button type="button" class="btn btn-primary btn-sm margin-r-5" title="认证管理" onclick="doDevice2Connection({{ device.id }})">
+                            <i class="fa fa-user"> 认证管理</i>
+                        </button>
+                        <button type="button" class="btn btn-primary btn-sm margin-r-5" title="自动更新" onclick="doAutoUpdate({{ device.id }})">
+                            <i class="fa fa-circle-o-notch"> 自动更新</i>
+                        </button>
+                        <button type="button" class="btn btn-primary btn-sm margin-r-5" title="编辑" onclick="doUpdate({{ device.id }})">
+                            <i class="fa fa-pencil"> 编辑</i>
+                        </button>
+                        <button type="button" id="btnReturn" class="btn btn-primary btn-sm">
+                            <i class="fa fa-arrow-left"></i> 返回
+                        </button>
+                    </div>
+                </div>
+                <div class="table-responsive mailbox-messages">
+                    <table class="table" id="tbWorkList" style="white-space: nowrap;">
+                        <tbody>
+                        <tr class="info">
+                            <td width="10%"><strong>主机名</strong></td>
+                            <td class="text-left">{{ device.sys_hostname }}</td>
+                            <td width="10%"><strong>SN编号</strong></td>
+                            <td class="text-left">{{ device.sn_number }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>系统类型</strong></td>
+                            <td>{{ device.os_type }}</td>
+                            <td><strong>设备类型</strong></td>
+                            <td>{{ device.device_type }}</td>
+                        </tr>
+                        <tr class="info">
+                            <td><strong>设备地址</strong></td>
+                            <td>{{ device.hostname }}</td>
+                            <td><strong>MAC地址</strong></td>
+                            <td>{{ device.mac_address }}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>网络类型</strong></td>
+                            <td>{% get_con all_code device.network_type 'value' %}</td>
+                            <td><strong>服务类型</strong></td>
+                            <td>{% get_con all_code device.service_type 'value' %}</td>
+                        </tr>
+                        <tr class="info">
+                            <td><strong>业务类型</strong></td>
+                            <td>{% get_con all_code device.operation_type 'value' %}</td>
+                            <td><strong>机柜信息</strong></td>
+                            <td>{% get_con all_cabinet device.dev_cabinet 'number' %}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>购买日期</strong></td>
+                            <td>{{ device.buyDate }}</td>
+                            <td><strong>质保日期</strong></td>
+                            <td>{{ device.warrantyDate }}</td>
+                        </tr>
+                        <tr class="info">
+                            <td><strong>所属</strong></td>
+                            <td>{% if device.parent %}
+                                {{ device.parent.sys_hostname }}({{ device.parent.hostname }})
+                                {% endif %}
+                            </td>
+                            <td><strong>责任人</strong></td>
+                            <td>{% get_con all_user device.leader 'name' %}</td>
+                        </tr>
+                        <tr>
+                            <td><strong>入库时间</strong></td>
+                            <td>{{ device.add_time }}</td>
+                            <td><strong>最后变更</strong></td>
+                            <td>{{ device.modify_time }}</td>
+                        </tr>
+                        <tr class="info">
+                            <td><strong>最后操作人</strong></td>
+                            <td>{{ device.changed_by.name }}</td>
+                            <td><strong></strong></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td><strong>备注信息</strong></td>
+                            <td colspan="3">{{ device.desc }}</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <br>
+                <div class="box-footer">
+
+                    <ul class="mailbox-attachments clearfix" id="imageContainer">
+                        {% for file in all_file %}
+                            <li class="imageItem">
+                                <div class="mailbox-attachment-info">
+                                    <a href="/media/{{ file.file_content }}" target="_blank"><i
+                                            class="fa fa-file-text"></i>
+                                        <small>{{ file.file_content|cut:'asset_file/' }}</small>
+                                    </a>
+                                    <span class="mailbox-attachment-size">
+                                      <b>上传人</b>：{{ file.upload_user }}
+                                      <a href="/media/{{ file.file_content }}" download="{{ file.file_content }}"
+                                         class="btn btn-primary btn-xs pull-right">
+                                          <i class="fa fa-cloud-download" title="下载文件"></i>
+                                      </a>
+                                      <button class="btn btn-adn btn-xs pull-right margin-r-5"
+                                              onclick="doDelete({{ file.id }})">
+                                          <i class="fa fa-trash" title="删除文件"> </i>
+                                      </button>
+                                    </span>
+                                </div>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+              </div>
+              <!-- /.tab-pane -->
+              <div class="tab-pane" id="history">
+                <div class="box-body">
+                    <ul class="todo-list">
+                        {% for log in logs %}
+                        <li>
+                          <!-- drag handle -->
+                              <span class="handle">
+                                <small class="text-maroon">
+                                    <i class="glyphicon glyphicon-time"></i>
+                                    {{ log.history_date }}
+                                    &nbsp;&nbsp;
+                                    {{ log.changed_by }}
+                                    &nbsp;&nbsp;
+                                    {{ log.history_type }}
+                                </small>
+                              </span>
+                            <span class="text-sm">
+                                {{ log.changes | compare_result }}
+                            </span>
+                            <!--
+                            <button class="btn btn-xs btn-danger pull-right">还原数据</button>
+                            -->
+                        </li>
+                        {% endfor %}
+                  </ul>
+                </div>
+              </div>
+
+              <!-- /.tab-pane -->
+            </div>
+            <!-- /.tab-content -->
+          </div>
+  </section>
+
+    <!-- /.content -->
+
+{% endblock %}
+
+{% block javascripts %}
+  <script src="{% static 'js/plugins/layer/layer.js' %}"></script>
+  <script src="{% static 'plugins/masonry/masonry.js' %}"></script>
+  <script type="text/javascript">
+    $(function () {
+        $('#CMDB-EAM').addClass('active');
+        $('#CMDB-EAM-DEVICE').addClass('active');
+
+    });
+
+    $("#btnReturn").click(function(){
+		history.back();
+	});
+
+    // 资产文件瀑布流
+
+    $('#imageContainer').masonry({
+        columnWidth: 10,
+        itemSelector: '.imageItem'
+    });
+
+    //上传资料
+    function doUpload(id) {
+        var div = layer.open({
+            type: 2,
+            title: '上传设备文件',
+            shadeClose: false,
+            maxmin: true,
+            area: ['770px', '400px'],
+            content: ["/cmdb/eam/device/upload/" + '?id=' + id],
+            end: function () {
+                window.location.reload();
+
+            }
+        });
+        layer.full(div)
+    }
+
+    //删除文件
+    function doDelete(id) {
+        layer.alert('确定删除吗？', {
+            title: '提示'
+            , icon: 3
+            , time: 0
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    url: "{% url 'cmdb:eam-device-file_delete' %}",
+                    data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    cache: false,
+                    success: function (msg) {
+                        if (msg.result) {
+                            layer.alert('删除成功', {icon: 1}, function () {
+                                parent.location.reload()
+                            });
+                        } else {
+                            //alert(msg.message);
+                            layer.alert('删除失败', {icon: 2});
+                        }
+                        return;
+                    }
+                });
+            }
+        });
+
+    }
+
+    //自动更新设备信息
+    function doAutoUpdate(id) {
+        layer.alert('确定自动更新设备信息？', {
+            title: '提示'
+            , icon: 3 //0:感叹号 1：对号 2：差号 3：问号 4：小锁 5：哭脸 6：笑脸
+            , time: 0 //不自动关闭
+            , btn: ['YES', 'NO']
+            , yes: function (index) {
+                layer.close(index);
+                $.ajax({
+                    type: "POST",
+                    data: {"id": id, csrfmiddlewaretoken: '{{ csrf_token }}'},
+                    url: "{% url 'cmdb:eam-device-auto_update_device_info' %}",
+                    cache: false,
+                beforeSend:function(){
+                    this.layerIndex = layer.load(2, {
+                        shade: [0.1,'#fff']
+                        });
+                    },
+                success: function (msg) {
+                    layer.closeAll('loading');
+                    if (msg.status == 'success') {
+                        layer.alert('设备信息更新成功！', {icon: 1}, function(){
+                            parent.location.reload()
+                        });
+                    }
+                    else if (msg.status == 'con_empty') {
+                        layer.alert('请先添加认证信息！', {icon: 4});
+
+                    }
+                    else {
+                        //alert(msg.message);
+                        layer.alert('设备信息更新失败！', {icon: 2});
+                    }
+                    return;
+                }
+
+                });
+            }
+        });
+    }
+
+   //修改数据
+    function doUpdate(id) {
+        var div=layer.open({
+            type: 2,
+            title: '编辑',
+            shadeClose: false,
+            maxmin: true,
+            area: ['800px', '400px'],
+            content: ["{% url 'cmdb:eam-device-update' %}" + '?id=' + id, 'no'],
+            end: function () {
+                window.location.reload();
+            }
+        });
+        layer.full(div )
+    }
+
+   function doDevice2Connection(id) {
+      layer.open({
+        type: 2,
+        title: '认证管理',
+        shadeClose: false,
+        maxmin: true,
+        area: ['800px', '400px'],
+        content: ["{% url 'cmdb:eam-device-device2connection' %}" + '?id=' + id, 'no'],
+        end: function () {
+            oDataTable.ajax.reload();
+        }
+    });
+    }
+  </script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/cmdb/deviceinfo_form.html b/templates/cmdb/deviceinfo_form.html
new file mode 100644
index 0000000..91e3cf9
--- /dev/null
+++ b/templates/cmdb/deviceinfo_form.html
@@ -0,0 +1,221 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+<link rel="stylesheet" href="{%static 'plugins/select2/select2.min.css' %}">
+<link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-datetimepicker.min.css' %}">
+{% endblock %}
+
+{% block main %}
+<div class="box box-danger">
+	<form class="form-horizontal" id="addForm" method="post">
+        <input type="hidden" name='id' value="{{ deviceinfo.id }}" />
+        <input type="hidden" name='changed_by' value="{{ request.user.id }}" />
+		{% csrf_token %}
+		<div class="box-body">
+          <fieldset>
+            <legend>
+            </legend>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">主机名</label>
+                <div class="col-sm-3">
+                    <input class="form-control" name="sys_hostname" type="text" value="{{ deviceinfo.sys_hostname }}" />
+                </div>
+                <label class="col-sm-2 control-label">SN编号</label>
+                <div class="col-sm-3">
+                    <input class="form-control" name="sn_number" type="text" value="{{ deviceinfo.sn_number }}" />
+                </div>
+            </div>
+
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">系统类型</label>
+                <div class="col-sm-3">
+                    <input class="form-control" name="os_type" type="text" value="{{ deviceinfo.os_type }}" />
+                </div>
+                <label class="col-sm-2 control-label">设备类型</label>
+                <div class="col-sm-3">
+                    <input class="form-control" name="device_type" type="text" value="{{ deviceinfo.device_type }}"/>
+                </div>
+            </div>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">设备地址</label>
+                <div class="col-sm-3">
+                    <input class="form-control" name="hostname" type="text" value="{{ deviceinfo.hostname }}" />
+                </div>
+                <label class="col-sm-2 control-label">MAC地址</label>
+                <div class="col-sm-3">
+                    <input class="form-control" name="mac_address" type="text" value="{{ deviceinfo.mac_address }}"/>
+                </div>
+            </div>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">网络类型</label>
+                <div class="col-sm-3">
+                  <select class="form-control select2" style="width:100%;" name="network_type">
+                  <option {% ifequal deviceinfo.network_type '' %}selected="selected"{% endifequal %}></option>
+                  {% for code in all_code %}
+                      {% ifequal code.parent.key 'NETWORK_TYPE' %}
+                        <option value="{{ code.id }}" {% ifequal deviceinfo.network_type code.id %}selected="selected"{% endifequal %}>
+                            {{ code.value }}</option>
+                      {% endifequal %}
+                  {% endfor %}
+                 </select>
+                </div>
+                <label class="col-sm-2 control-label">服务类型</label>
+                <div class="col-sm-3">
+                  <select class="form-control select2" style="width:100%;" name="service_type">
+                  <option {% ifequal deviceinfo.service_type '' %}selected="selected"{% endifequal %}></option>
+                  {% for code in all_code %}
+                      {% if code.parent.key == 'SERVICE_TYPE' %}
+                        <option value="{{ code.id }}" {% ifequal deviceinfo.service_type code.id %}selected="selected"{% endifequal %}>
+                            {{ code.value }}</option>
+                      {% endif %}
+                  {% endfor %}
+                 </select>
+                </div>
+            </div>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">业务类型</label>
+                <div class="col-sm-3">
+                  <select class="form-control select2" style="width:100%;" name="operation_type">
+                  <option {% ifequal deviceinfo.operation_type '' %}selected="selected"{% endifequal %}></option>
+                  {% for code in all_code %}
+                      {% if code.parent.key == 'OPERATION_TYPE' %}
+                        <option value="{{ code.id }}" {% ifequal deviceinfo.operation_type code.id %}selected="selected"{% endifequal %}>
+                            {{ code.value }}</option>
+                      {% endif %}
+                  {% endfor %}
+                 </select>
+                </div>
+                <label class="col-sm-2 control-label">机柜信息</label>
+                <div class="col-sm-3">
+                  <select class="form-control select2" style="width:100%;" name="dev_cabinet">
+                  <option {% ifequal deviceinfo.dev_cabinet '' %}selected="selected"{% endifequal %}></option>
+                  {% for cabinet in all_cabinet %}
+                    <option value="{{ cabinet.id }}" {% ifequal deviceinfo.dev_cabinet cabinet.id %}selected="selected"{% endifequal %}>
+                        {{ cabinet.number }}</option>
+                  {% endfor %}
+                 </select>
+                </div>
+            </div>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">购买日期</label>
+                <div class="col-sm-3">
+                    <input type="text" class="form-control pull-right form_datetime" name="buyDate"
+                           value="{{ deviceinfo.buyDate | date:'Y-m-d' }}" readonly/>
+                </div>
+                <label class="col-sm-2 control-label">质保日期</label>
+                <div class="col-sm-3">
+                    <input type="text" class="form-control pull-right form_datetime" name="warrantyDate"
+                           value="{{ deviceinfo.warrantyDate | date:'Y-m-d' }}" readonly/>
+                </div>
+            </div>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">所属</label>
+                <div class="col-sm-3">
+                  <select class="form-control select2" style="width:100%;" name="parent">
+                  <option {% ifequal deviceinfo.parent_id '' %}selected="selected"{% endifequal %}></option>
+                  {% for device in all_device %}
+                  <option value="{{ device.id }}" {% ifequal deviceinfo.parent_id device.id %}selected="selected"{% endifequal %}>
+                      {{ device.sys_hostname }}({{ device.hostname }})</option>
+                  {% endfor %}
+                 </select>
+                </div>
+                <label class="col-sm-2 control-label">责任人</label>
+                <div class="col-sm-3">
+                  <select class="form-control select2" style="width:100%;" name="leader">
+                  <option {% ifequal deviceinfo.leader '' %}selected="selected"{% endifequal %}></option>
+                  {% for u in all_user %}
+                  <option value="{{ u.id }}" {% ifequal deviceinfo.leader u.id %}selected="selected"{% endifequal %}>
+                      {{ u.name }}</option>
+                  {% endfor %}
+                 </select>
+                </div>
+            </div>
+            <div class="form-group has-feedback">
+                <label class="col-sm-2 control-label">备注信息</label>
+                <div class="col-sm-8">
+                    <textarea class="form-control" name="desc" rows="5" >{{ deviceinfo.desc }}</textarea>
+                </div>
+            </div>
+
+          </fieldset>
+		</div>
+		<div class="box-footer ">
+			<div class="row span7 text-center ">
+              <button type="button" id="btnCancel" class="btn btn-default margin-right " >重置</button>
+              <button type="button" id="btnSave" class="btn btn-info margin-right " >保存</button>
+			</div>
+		</div>
+
+	</form>
+</div>
+
+{% endblock %}
+
+{% block javascripts %}
+<script src="{% static 'plugins/select2/select2.full.min.js' %}"></script>
+<script src="{% static 'bootstrap/js/bootstrap-datetimepicker.js' %}"></script>
+<script type="text/javascript">
+
+    function getUrl() {
+        if ($("input[name='id']").val()) {
+            var url = "{% url 'cmdb:eam-device-update' %}";
+        } else {
+            var url = "{% url 'cmdb:eam-device-create' %}";
+        }
+        return url
+        }
+
+    $("#btnSave").click(function () {
+        var data = $("#addForm").serialize();
+        $.ajax({
+            type: $("#addForm").attr('method'),
+            url: getUrl(),
+            data: data,
+            cache: false,
+            success: function (msg) {
+                if (msg.result) {
+                    layer.alert('数据保存成功！', {icon: 1}, function (index) {
+                        parent.layer.closeAll(); //关闭所有弹窗
+                    });
+                } else {
+                    layer.alert(msg.error, {icon: 5});
+                    //$('errorMessage').html(msg.message)
+                }
+                return;
+            }
+        });
+    });
+
+	/*点取消刷新新页面*/
+    $("#btnCancel").click(function () {
+	    window.location.reload();
+
+    })
+
+
+/*input 时间输入选择*/
+    $(".form_datetime").datetimepicker({
+            language:  'zh',
+            minView: 'month', //选择范围知道日期，不选择时分
+            //weekStart: 1,
+            //todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            //startView: 2,
+            forceParse: 0,
+            showMeridian: 1,
+            format: 'yyyy-mm-dd'
+        }).on('changeDate', function (ev) {
+            $(this).datetimepicker('hide');
+    });
+
+// select2
+  $(function () {
+    //Initialize Select2 Elements
+    $(".select2").select2();
+  });
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/cmdb/deviceinfo_upload.html b/templates/cmdb/deviceinfo_upload.html
new file mode 100644
index 0000000..775e820
--- /dev/null
+++ b/templates/cmdb/deviceinfo_upload.html
@@ -0,0 +1,65 @@
+{% extends 'base-layer.html' %}
+{% load staticfiles %}
+
+{% block css %}
+<link rel="stylesheet" href="{%static 'plugins/select2/select2.min.css' %}">
+<link rel="stylesheet" href="{% static 'js/plugins/layer/skin/layer.css' %}">
+<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-datetimepicker.min.css' %}">
+<link rel="stylesheet" href="{% static 'plugins/fileinput/fileinput.css' %}">
+
+{% endblock %}
+{% block main %}
+<div class="box box-danger">
+	<form class="form-horizontal" id="addForm" method="post">
+		{% csrf_token %}
+        <div class="box-body">
+          <fieldset>
+            <div class="form-group has-feedback">
+                <div class="col-sm-12">
+                    <div class="file-loading">
+                        <input id="file_content" name="file_content"  type="file" multiple="multiple"/>
+                    </div>
+                </div>
+            </div>
+          </fieldset>
+            <fieldset>
+                <div class="form-group has-feedback">
+                    <label class="col-sm-2 control-label"></label>
+                    <div class="col-sm-12">
+                        <p class="text-red">同时最多可上传4个文件，支持文件格式：png", "jpg", "gif", "zip", "rar"，大小不得超过10M</p>
+                    </div>
+                </div>
+            </fieldset>
+        </div>
+    </form>
+</div>
+
+{% endblock %}
+
+{% block javascripts %}
+<script src="{% static 'plugins/fileinput/fileinput.js' %}"></script>
+<script src="{% static 'plugins/fileinput/zh.js' %}"></script>
+<script type="text/javascript">
+
+//上传文件
+
+$(document).on('ready', function() {
+    $("#file_content").fileinput({
+        language: "zh",
+        showUpload: true,
+        allowedFileExtensions: ["png", "jpg", "gif", "zip", "rar"],
+        uploadUrl: "{% url 'cmdb:eam-device-upload' %}",
+        uploadExtraData: {
+            'csrfmiddlewaretoken': '{{ csrf_token }}',
+            'device': '{{ device.id }}',
+            'upload_user': '{{ request.user.name }}',
+        },
+        maxFileCount: 4,
+        autoReplace: true,
+        maxFileSize: 10240,
+    });
+});
+
+</script>
+
+{% endblock %}
\ No newline at end of file