reslove conflict add user detail template

c14eb421 · ibuler · 98d6043f · 7a8d4a3a · 98d6043f · 98d6043f
Commit c14eb421 authored Aug 16, 2016 by ibuler
94 changed files
--- a/apps/static/css/dropzone/basic.css
+++ b/apps/static/css/dropzone/basic.css
-/* The MIT License */
-.dropzone,
-.dropzone *,
-.dropzone-previews,
-.dropzone-previews * {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.dropzone {
-  position: relative;
-  border: 1px solid rgba(0,0,0,0.08);
-  background: rgba(0,0,0,0.02);
-  padding: 1em;
-}
-.dropzone.dz-clickable {
-  cursor: pointer;
-}
-.dropzone.dz-clickable .dz-message,
-.dropzone.dz-clickable .dz-message span {
-  cursor: pointer;
-}
-.dropzone.dz-clickable * {
-  cursor: default;
-}
-.dropzone .dz-message {
-  opacity: 1;
-  -ms-filter: none;
-  filter: none;
-}
-.dropzone.dz-drag-hover {
-  border-color: rgba(0,0,0,0.15);
-  background: rgba(0,0,0,0.04);
-}
-.dropzone.dz-started .dz-message {
-  display: none;
-}
-.dropzone .dz-preview,
-.dropzone-previews .dz-preview {
-  background: rgba(255,255,255,0.8);
-  position: relative;
-  display: inline-block;
-  margin: 17px;
-  vertical-align: top;
-  border: 1px solid #acacac;
-  padding: 6px 6px 6px 6px;
-}
-.dropzone .dz-preview.dz-file-preview [data-dz-thumbnail],
-.dropzone-previews .dz-preview.dz-file-preview [data-dz-thumbnail] {
-  display: none;
-}
-.dropzone .dz-preview .dz-details,
-.dropzone-previews .dz-preview .dz-details {
-  width: 100px;
-  height: 100px;
-  position: relative;
-  background: #ebebeb;
-  padding: 5px;
-  margin-bottom: 22px;
-}
-.dropzone .dz-preview .dz-details .dz-filename,
-.dropzone-previews .dz-preview .dz-details .dz-filename {
-  overflow: hidden;
-  height: 100%;
-}
-.dropzone .dz-preview .dz-details img,
-.dropzone-previews .dz-preview .dz-details img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100px;
-  height: 100px;
-}
-.dropzone .dz-preview .dz-details .dz-size,
-.dropzone-previews .dz-preview .dz-details .dz-size {
-  position: absolute;
-  bottom: -28px;
-  left: 3px;
-  height: 28px;
-  line-height: 28px;
-}
-.dropzone .dz-preview.dz-error .dz-error-mark,
-.dropzone-previews .dz-preview.dz-error .dz-error-mark {
-  display: block;
-}
-.dropzone .dz-preview.dz-success .dz-success-mark,
-.dropzone-previews .dz-preview.dz-success .dz-success-mark {
-  display: block;
-}
-.dropzone .dz-preview:hover .dz-details img,
-.dropzone-previews .dz-preview:hover .dz-details img {
-  display: none;
-}
-.dropzone .dz-preview .dz-success-mark,
-.dropzone-previews .dz-preview .dz-success-mark,
-.dropzone .dz-preview .dz-error-mark,
-.dropzone-previews .dz-preview .dz-error-mark {
-  display: none;
-  position: absolute;
-  width: 40px;
-  height: 40px;
-  font-size: 30px;
-  text-align: center;
-  right: -10px;
-  top: -10px;
-}
-.dropzone .dz-preview .dz-success-mark,
-.dropzone-previews .dz-preview .dz-success-mark {
-  color: #8cc657;
-}
-.dropzone .dz-preview .dz-error-mark,
-.dropzone-previews .dz-preview .dz-error-mark {
-  color: #ee162d;
-}
-.dropzone .dz-preview .dz-progress,
-.dropzone-previews .dz-preview .dz-progress {
-  position: absolute;
-  top: 100px;
-  left: 6px;
-  right: 6px;
-  height: 6px;
-  background: #d7d7d7;
-  display: none;
-}
-.dropzone .dz-preview .dz-progress .dz-upload,
-.dropzone-previews .dz-preview .dz-progress .dz-upload {
-  display: block;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 0%;
-  background-color: #8cc657;
-}
-.dropzone .dz-preview.dz-processing .dz-progress,
-.dropzone-previews .dz-preview.dz-processing .dz-progress {
-  display: block;
-}
-.dropzone .dz-preview .dz-error-message,
-.dropzone-previews .dz-preview .dz-error-message {
-  display: none;
-  position: absolute;
-  top: -5px;
-  left: -20px;
-  background: rgba(245,245,245,0.8);
-  padding: 8px 10px;
-  color: #800;
-  min-width: 140px;
-  max-width: 500px;
-  z-index: 500;
-}
-.dropzone .dz-preview:hover.dz-error .dz-error-message,
-.dropzone-previews .dz-preview:hover.dz-error .dz-error-message {
-  display: block;
-}
--- a/apps/static/css/dropzone/dropzone.css
+++ b/apps/static/css/dropzone/dropzone.css
-/* The MIT License */
-.dropzone,
-.dropzone *,
-.dropzone-previews,
-.dropzone-previews * {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.dropzone {
-  position: relative;
-  border: 1px solid rgba(0,0,0,0.08);
-  background: rgba(0,0,0,0.02);
-  padding: 1em;
-}
-.dropzone.dz-clickable {
-  cursor: pointer;
-}
-.dropzone.dz-clickable .dz-message,
-.dropzone.dz-clickable .dz-message span {
-  cursor: pointer;
-}
-.dropzone.dz-clickable * {
-  cursor: default;
-}
-.dropzone .dz-message {
-  opacity: 1;
-  -ms-filter: none;
-  filter: none;
-}
-.dropzone.dz-drag-hover {
-  border-color: rgba(0,0,0,0.15);
-  background: rgba(0,0,0,0.04);
-}
-.dropzone.dz-started .dz-message {
-  display: none;
-}
-.dropzone .dz-preview,
-.dropzone-previews .dz-preview {
-  background: rgba(255,255,255,0.8);
-  position: relative;
-  display: inline-block;
-  margin: 17px;
-  vertical-align: top;
-  border: 1px solid #acacac;
-  padding: 6px 6px 6px 6px;
-}
-.dropzone .dz-preview.dz-file-preview [data-dz-thumbnail],
-.dropzone-previews .dz-preview.dz-file-preview [data-dz-thumbnail] {
-  display: none;
-}
-.dropzone .dz-preview .dz-details,
-.dropzone-previews .dz-preview .dz-details {
-  width: 100px;
-  height: 100px;
-  position: relative;
-  background: #ebebeb;
-  padding: 5px;
-  margin-bottom: 22px;
-}
-.dropzone .dz-preview .dz-details .dz-filename,
-.dropzone-previews .dz-preview .dz-details .dz-filename {
-  overflow: hidden;
-  height: 100%;
-}
-.dropzone .dz-preview .dz-details img,
-.dropzone-previews .dz-preview .dz-details img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100px;
-  height: 100px;
-}
-.dropzone .dz-preview .dz-details .dz-size,
-.dropzone-previews .dz-preview .dz-details .dz-size {
-  position: absolute;
-  bottom: -28px;
-  left: 3px;
-  height: 28px;
-  line-height: 28px;
-}
-.dropzone .dz-preview.dz-error .dz-error-mark,
-.dropzone-previews .dz-preview.dz-error .dz-error-mark {
-  display: block;
-}
-.dropzone .dz-preview.dz-success .dz-success-mark,
-.dropzone-previews .dz-preview.dz-success .dz-success-mark {
-  display: block;
-}
-.dropzone .dz-preview:hover .dz-details img,
-.dropzone-previews .dz-preview:hover .dz-details img {
-  display: none;
-}
-.dropzone .dz-preview .dz-success-mark,
-.dropzone-previews .dz-preview .dz-success-mark,
-.dropzone .dz-preview .dz-error-mark,
-.dropzone-previews .dz-preview .dz-error-mark {
-  display: none;
-  position: absolute;
-  width: 40px;
-  height: 40px;
-  font-size: 30px;
-  text-align: center;
-  right: -10px;
-  top: -10px;
-}
-.dropzone .dz-preview .dz-success-mark,
-.dropzone-previews .dz-preview .dz-success-mark {
-  color: #8cc657;
-}
-.dropzone .dz-preview .dz-error-mark,
-.dropzone-previews .dz-preview .dz-error-mark {
-  color: #ee162d;
-}
-.dropzone .dz-preview .dz-progress,
-.dropzone-previews .dz-preview .dz-progress {
-  position: absolute;
-  top: 100px;
-  left: 6px;
-  right: 6px;
-  height: 6px;
-  background: #d7d7d7;
-  display: none;
-}
-.dropzone .dz-preview .dz-progress .dz-upload,
-.dropzone-previews .dz-preview .dz-progress .dz-upload {
-  display: block;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 0%;
-  background-color: #8cc657;
-}
-.dropzone .dz-preview.dz-processing .dz-progress,
-.dropzone-previews .dz-preview.dz-processing .dz-progress {
-  display: block;
-}
-.dropzone .dz-preview .dz-error-message,
-.dropzone-previews .dz-preview .dz-error-message {
-  display: none;
-  position: absolute;
-  top: -5px;
-  left: -20px;
-  background: rgba(245,245,245,0.8);
-  padding: 8px 10px;
-  color: #800;
-  min-width: 140px;
-  max-width: 500px;
-  z-index: 500;
-}
-.dropzone .dz-preview:hover.dz-error .dz-error-message,
-.dropzone-previews .dz-preview:hover.dz-error .dz-error-message {
-  display: block;
-}
-.dropzone {
-  border: 1px solid rgba(0,0,0,0.03);
-  min-height: 360px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  background: rgba(0,0,0,0.03);
-  padding: 23px;
-}
-.dropzone .dz-default.dz-message {
-  opacity: 1;
-  -ms-filter: none;
-  filter: none;
-  -webkit-transition: opacity 0.3s ease-in-out;
-  -moz-transition: opacity 0.3s ease-in-out;
-  -o-transition: opacity 0.3s ease-in-out;
-  -ms-transition: opacity 0.3s ease-in-out;
-  transition: opacity 0.3s ease-in-out;
-  background-image: url("../images/spritemap.png");
-  background-repeat: no-repeat;
-  background-position: 0 0;
-  position: absolute;
-  width: 428px;
-  height: 123px;
-  margin-left: -214px;
-  margin-top: -61.5px;
-  top: 50%;
-  left: 50%;
-}
-@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
-  .dropzone .dz-default.dz-message {
-    background-image: url("../images/spritemap@2x.png");
-    -webkit-background-size: 428px 406px;
-    -moz-background-size: 428px 406px;
-    background-size: 428px 406px;
-  }
-}
-.dropzone .dz-default.dz-message span {
-  display: none;
-}
-.dropzone.dz-square .dz-default.dz-message {
-  background-position: 0 -123px;
-  width: 268px;
-  margin-left: -134px;
-  height: 174px;
-  margin-top: -87px;
-}
-.dropzone.dz-drag-hover .dz-message {
-  opacity: 0.15;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=15)";
-  filter: alpha(opacity=15);
-}
-.dropzone.dz-started .dz-message {
-  display: block;
-  opacity: 0;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-}
-.dropzone .dz-preview,
-.dropzone-previews .dz-preview {
-  -webkit-box-shadow: 1px 1px 4px rgba(0,0,0,0.16);
-  box-shadow: 1px 1px 4px rgba(0,0,0,0.16);
-  font-size: 14px;
-}
-.dropzone .dz-preview.dz-image-preview:hover .dz-details img,
-.dropzone-previews .dz-preview.dz-image-preview:hover .dz-details img {
-  display: block;
-  opacity: 0.1;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=10)";
-  filter: alpha(opacity=10);
-}
-.dropzone .dz-preview.dz-success .dz-success-mark,
-.dropzone-previews .dz-preview.dz-success .dz-success-mark {
-  opacity: 1;
-  -ms-filter: none;
-  filter: none;
-}
-.dropzone .dz-preview.dz-error .dz-error-mark,
-.dropzone-previews .dz-preview.dz-error .dz-error-mark {
-  opacity: 1;
-  -ms-filter: none;
-  filter: none;
-}
-.dropzone .dz-preview.dz-error .dz-progress .dz-upload,
-.dropzone-previews .dz-preview.dz-error .dz-progress .dz-upload {
-  background: #ee1e2d;
-}
-.dropzone .dz-preview .dz-error-mark,
-.dropzone-previews .dz-preview .dz-error-mark,
-.dropzone .dz-preview .dz-success-mark,
-.dropzone-previews .dz-preview .dz-success-mark {
-  display: block;
-  opacity: 0;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  -webkit-transition: opacity 0.4s ease-in-out;
-  -moz-transition: opacity 0.4s ease-in-out;
-  -o-transition: opacity 0.4s ease-in-out;
-  -ms-transition: opacity 0.4s ease-in-out;
-  transition: opacity 0.4s ease-in-out;
-  background-image: url("../images/spritemap.png");
-  background-repeat: no-repeat;
-}
-@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
-  .dropzone .dz-preview .dz-error-mark,
-  .dropzone-previews .dz-preview .dz-error-mark,
-  .dropzone .dz-preview .dz-success-mark,
-  .dropzone-previews .dz-preview .dz-success-mark {
-    background-image: url("../images/spritemap@2x.png");
-    -webkit-background-size: 428px 406px;
-    -moz-background-size: 428px 406px;
-    background-size: 428px 406px;
-  }
-}
-.dropzone .dz-preview .dz-error-mark span,
-.dropzone-previews .dz-preview .dz-error-mark span,
-.dropzone .dz-preview .dz-success-mark span,
-.dropzone-previews .dz-preview .dz-success-mark span {
-  display: none;
-}
-.dropzone .dz-preview .dz-error-mark,
-.dropzone-previews .dz-preview .dz-error-mark {
-  background-position: -268px -123px;
-}
-.dropzone .dz-preview .dz-success-mark,
-.dropzone-previews .dz-preview .dz-success-mark {
-  background-position: -268px -163px;
-}
-.dropzone .dz-preview .dz-progress .dz-upload,
-.dropzone-previews .dz-preview .dz-progress .dz-upload {
-  -webkit-animation: loading 0.4s linear infinite;
-  -moz-animation: loading 0.4s linear infinite;
-  -o-animation: loading 0.4s linear infinite;
-  -ms-animation: loading 0.4s linear infinite;
-  animation: loading 0.4s linear infinite;
-  -webkit-transition: width 0.3s ease-in-out;
-  -moz-transition: width 0.3s ease-in-out;
-  -o-transition: width 0.3s ease-in-out;
-  -ms-transition: width 0.3s ease-in-out;
-  transition: width 0.3s ease-in-out;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 0%;
-  height: 100%;
-  background-image: url("../images/spritemap.png");
-  background-repeat: repeat-x;
-  background-position: 0px -400px;
-}
-@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
-  .dropzone .dz-preview .dz-progress .dz-upload,
-  .dropzone-previews .dz-preview .dz-progress .dz-upload {
-    background-image: url("../images/spritemap@2x.png");
-    -webkit-background-size: 428px 406px;
-    -moz-background-size: 428px 406px;
-    background-size: 428px 406px;
-  }
-}
-.dropzone .dz-preview.dz-success .dz-progress,
-.dropzone-previews .dz-preview.dz-success .dz-progress {
-  display: block;
-  opacity: 0;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  -webkit-transition: opacity 0.4s ease-in-out;
-  -moz-transition: opacity 0.4s ease-in-out;
-  -o-transition: opacity 0.4s ease-in-out;
-  -ms-transition: opacity 0.4s ease-in-out;
-  transition: opacity 0.4s ease-in-out;
-}
-.dropzone .dz-preview .dz-error-message,
-.dropzone-previews .dz-preview .dz-error-message {
-  display: block;
-  opacity: 0;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  -webkit-transition: opacity 0.3s ease-in-out;
-  -moz-transition: opacity 0.3s ease-in-out;
-  -o-transition: opacity 0.3s ease-in-out;
-  -ms-transition: opacity 0.3s ease-in-out;
-  transition: opacity 0.3s ease-in-out;
-}
-.dropzone .dz-preview:hover.dz-error .dz-error-message,
-.dropzone-previews .dz-preview:hover.dz-error .dz-error-message {
-  opacity: 1;
-  -ms-filter: none;
-  filter: none;
-}
-.dropzone a.dz-remove,
-.dropzone-previews a.dz-remove {
-  background-image: -webkit-linear-gradient(top, #fafafa, #eee);
-  background-image: -moz-linear-gradient(top, #fafafa, #eee);
-  background-image: -o-linear-gradient(top, #fafafa, #eee);
-  background-image: -ms-linear-gradient(top, #fafafa, #eee);
-  background-image: linear-gradient(to bottom, #fafafa, #eee);
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
-  border: 1px solid #eee;
-  text-decoration: none;
-  display: block;
-  padding: 4px 5px;
-  text-align: center;
-  color: #aaa;
-  margin-top: 26px;
-}
-.dropzone a.dz-remove:hover,
-.dropzone-previews a.dz-remove:hover {
-  color: #666;
-}
-@-moz-keyframes loading {
-  0% {
-    background-position: 0 -400px;
-  }
-  100% {
-    background-position: -7px -400px;
-  }
-}
-@-webkit-keyframes loading {
-  0% {
-    background-position: 0 -400px;
-  }
-  100% {
-    background-position: -7px -400px;
-  }
-}
-@-o-keyframes loading {
-  0% {
-    background-position: 0 -400px;
-  }
-  100% {
-    background-position: -7px -400px;
-  }
-}
-@-ms-keyframes loading {
-  0% {
-    background-position: 0 -400px;
-  }
-  100% {
-    background-position: -7px -400px;
-  }
-}
-@keyframes loading {
-  0% {
-    background-position: 0 -400px;
-  }
-  100% {
-    background-position: -7px -400px;
-  }
-}
--- a/apps/static/css/images/controls.png
+++ b/apps/static/css/images/controls.png
--- a/apps/static/css/images/loading.gif
+++ b/apps/static/css/images/loading.gif
--- a/apps/static/css/magnific/magnific-popup.css
+++ b/apps/static/css/magnific/magnific-popup.css
-/* Magnific Popup CSS */
-.mfp-bg {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1042;
-  overflow: hidden;
-  position: fixed;
-  background: #0b0b0b;
-  opacity: 0.8;
-  filter: alpha(opacity=80); }
-.mfp-wrap {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1043;
-  position: fixed;
-  outline: none !important;
-  -webkit-backface-visibility: hidden; }
-.mfp-container {
-  text-align: center;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  left: 0;
-  top: 0;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box; }
-.mfp-container:before {
-  content: '';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle; }
-.mfp-align-top .mfp-container:before {
-  display: none; }
-.mfp-content {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  margin: 0 auto;
-  text-align: left;
-  z-index: 1045; }
-.mfp-inline-holder .mfp-content, .mfp-ajax-holder .mfp-content {
-  width: 100%;
-  cursor: auto; }
-.mfp-ajax-cur {
-  cursor: progress; }
-.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
-  cursor: -moz-zoom-out;
-  cursor: -webkit-zoom-out;
-  cursor: zoom-out; }
-.mfp-zoom {
-  cursor: pointer;
-  cursor: -webkit-zoom-in;
-  cursor: -moz-zoom-in;
-  cursor: zoom-in; }
-.mfp-auto-cursor .mfp-content {
-  cursor: auto; }
-.mfp-close, .mfp-arrow, .mfp-preloader, .mfp-counter {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none; }
-.mfp-loading.mfp-figure {
-  display: none; }
-.mfp-hide {
-  display: none !important; }
-.mfp-preloader {
-  color: #CCC;
-  position: absolute;
-  top: 50%;
-  width: auto;
-  text-align: center;
-  margin-top: -0.8em;
-  left: 8px;
-  right: 8px;
-  z-index: 1044; }
-  .mfp-preloader a {
-    color: #CCC; }
-    .mfp-preloader a:hover {
-      color: #FFF; }
-.mfp-s-ready .mfp-preloader {
-  display: none; }
-.mfp-s-error .mfp-content {
-  display: none; }
-button.mfp-close, button.mfp-arrow {
-  overflow: visible;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-  display: block;
-  outline: none;
-  padding: 0;
-  z-index: 1046;
-  -webkit-box-shadow: none;
-  box-shadow: none; }
-button::-moz-focus-inner {
-  padding: 0;
-  border: 0; }
-.mfp-close {
-  width: 44px;
-  height: 44px;
-  line-height: 44px;
-  position: absolute;
-  right: 0;
-  top: 0;
-  text-decoration: none;
-  text-align: center;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  padding: 0 0 18px 10px;
-  color: #FFF;
-  font-style: normal;
-  font-size: 28px;
-  font-family: Arial, Baskerville, monospace; }
-  .mfp-close:hover, .mfp-close:focus {
-    opacity: 1;
-    filter: alpha(opacity=100); }
-  .mfp-close:active {
-    top: 1px; }
-.mfp-close-btn-in .mfp-close {
-  color: #333; }
-.mfp-image-holder .mfp-close, .mfp-iframe-holder .mfp-close {
-  color: #FFF;
-  right: -6px;
-  text-align: right;
-  padding-right: 6px;
-  width: 100%; }
-.mfp-counter {
-  position: absolute;
-  top: 0;
-  right: 0;
-  color: #CCC;
-  font-size: 12px;
-  line-height: 18px;
-  white-space: nowrap; }
-.mfp-arrow {
-  position: absolute;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  margin: 0;
-  top: 50%;
-  margin-top: -55px;
-  padding: 0;
-  width: 90px;
-  height: 110px;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
-  .mfp-arrow:active {
-    margin-top: -54px; }
-  .mfp-arrow:hover, .mfp-arrow:focus {
-    opacity: 1;
-    filter: alpha(opacity=100); }
-  .mfp-arrow:before, .mfp-arrow:after, .mfp-arrow .mfp-b, .mfp-arrow .mfp-a {
-    content: '';
-    display: block;
-    width: 0;
-    height: 0;
-    position: absolute;
-    left: 0;
-    top: 0;
-    margin-top: 35px;
-    margin-left: 35px;
-    border: medium inset transparent; }
-  .mfp-arrow:after, .mfp-arrow .mfp-a {
-    border-top-width: 13px;
-    border-bottom-width: 13px;
-    top: 8px; }
-  .mfp-arrow:before, .mfp-arrow .mfp-b {
-    border-top-width: 21px;
-    border-bottom-width: 21px;
-    opacity: 0.7; }
-.mfp-arrow-left {
-  left: 0; }
-  .mfp-arrow-left:after, .mfp-arrow-left .mfp-a {
-    border-right: 17px solid #FFF;
-    margin-left: 31px; }
-  .mfp-arrow-left:before, .mfp-arrow-left .mfp-b {
-    margin-left: 25px;
-    border-right: 27px solid #3F3F3F; }
-.mfp-arrow-right {
-  right: 0; }
-  .mfp-arrow-right:after, .mfp-arrow-right .mfp-a {
-    border-left: 17px solid #FFF;
-    margin-left: 39px; }
-  .mfp-arrow-right:before, .mfp-arrow-right .mfp-b {
-    border-left: 27px solid #3F3F3F; }
-.mfp-iframe-holder {
-  padding-top: 40px;
-  padding-bottom: 40px; }
-  .mfp-iframe-holder .mfp-content {
-    line-height: 0;
-    width: 100%;
-    max-width: 900px; }
-  .mfp-iframe-holder .mfp-close {
-    top: -40px; }
-.mfp-iframe-scaler {
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  padding-top: 56.25%; }
-  .mfp-iframe-scaler iframe {
-    position: absolute;
-    display: block;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
-    background: #000; }
-/* Main image in popup */
-img.mfp-img {
-  width: auto;
-  max-width: 100%;
-  height: auto;
-  display: block;
-  line-height: 0;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  padding: 40px 0 40px;
-  margin: 0 auto; }
-/* The shadow behind the image */
-.mfp-figure {
-  line-height: 0; }
-  .mfp-figure:after {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 40px;
-    bottom: 40px;
-    display: block;
-    right: 0;
-    width: auto;
-    height: auto;
-    z-index: -1;
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
-    background: #444; }
-  .mfp-figure small {
-    color: #BDBDBD;
-    display: block;
-    font-size: 12px;
-    line-height: 14px; }
-  .mfp-figure figure {
-    margin: 0; }
-.mfp-bottom-bar {
-  margin-top: -36px;
-  position: absolute;
-  top: 100%;
-  left: 0;
-  width: 100%;
-  cursor: auto; }
-.mfp-title {
-  text-align: left;
-  line-height: 18px;
-  color: #F3F3F3;
-  word-wrap: break-word;
-  padding-right: 36px; }
-.mfp-image-holder .mfp-content {
-  max-width: 100%; }
-.mfp-gallery .mfp-image-holder .mfp-figure {
-  cursor: pointer; }
-@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
-  /**
-       * Remove all paddings around the image on small screen
-       */
-  .mfp-img-mobile .mfp-image-holder {
-    padding-left: 0;
-    padding-right: 0; }
-  .mfp-img-mobile img.mfp-img {
-    padding: 0; }
-  .mfp-img-mobile .mfp-figure:after {
-    top: 0;
-    bottom: 0; }
-  .mfp-img-mobile .mfp-figure small {
-    display: inline;
-    margin-left: 5px; }
-  .mfp-img-mobile .mfp-bottom-bar {
-    background: rgba(0, 0, 0, 0.6);
-    bottom: 0;
-    margin: 0;
-    top: auto;
-    padding: 3px 5px;
-    position: fixed;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box; }
-    .mfp-img-mobile .mfp-bottom-bar:empty {
-      padding: 0; }
-  .mfp-img-mobile .mfp-counter {
-    right: 5px;
-    top: 3px; }
-  .mfp-img-mobile .mfp-close {
-    top: 0;
-    right: 0;
-    width: 35px;
-    height: 35px;
-    line-height: 35px;
-    background: rgba(0, 0, 0, 0.6);
-    position: fixed;
-    text-align: center;
-    padding: 0; }
- }
-@media all and (max-width: 900px) {
-  .mfp-arrow {
-    -webkit-transform: scale(0.75);
-    transform: scale(0.75); }
-  .mfp-arrow-left {
-    -webkit-transform-origin: 0;
-    transform-origin: 0; }
-  .mfp-arrow-right {
-    -webkit-transform-origin: 100%;
-    transform-origin: 100%; }
-  .mfp-container {
-    padding-left: 6px;
-    padding-right: 6px; }
- }
-.mfp-ie7 .mfp-img {
-  padding: 0; }
-.mfp-ie7 .mfp-bottom-bar {
-  width: 600px;
-  left: 50%;
-  margin-left: -300px;
-  margin-top: 5px;
-  padding-bottom: 5px; }
-.mfp-ie7 .mfp-container {
-  padding: 0; }
-.mfp-ie7 .mfp-content {
-  padding-top: 44px; }
-.mfp-ie7 .mfp-close {
-  top: 0;
-  right: 0;
-  padding-top: 0; }
--- a/apps/static/css/plugins/chosen/chosen.css
+++ b/apps/static/css/plugins/chosen/chosen.css
 /*!
 Chosen, a Select Box Enhancer for jQuery and Prototype
 by Patrick Filler for Harvest, http://getharvest.com
-Version 1.1.0
+Version 1.6.2
 Full source at https://github.com/harvesthq/chosen
-Copyright (c) 2011 Harvest http://getharvest.com
+Copyright (c) 2011-2016 Harvest http://getharvest.com
 MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
 This file is generated by `grunt build`, do not edit it by hand.
 */
 /* @group Base */
 .chosen-container {
-    position: relative;
+  position: relative;
-    display: inline-block;
+  display: inline-block;
-    vertical-align: middle;
+  vertical-align: middle;
-    font-size: 13px;
+  font-size: 13px;
-    zoom: 1;
+  -webkit-user-select: none;
-    *display: inline;
+  -moz-user-select: none;
-    -webkit-user-select: none;
+  user-select: none;
-    -moz-user-select: none;
+}
-    user-select: none;
+.chosen-container * {
-}
+  -webkit-box-sizing: border-box;
-.chosen-container .chosen-drop {
+  -moz-box-sizing: border-box;
-    position: absolute;
+  box-sizing: border-box;
-    top: 100%;
+}
-    left: -9999px;
+.chosen-container .chosen-drop {
-    z-index: 1010;
+  position: absolute;
-    -webkit-box-sizing: border-box;
+  top: 100%;
-    -moz-box-sizing: border-box;
+  left: -9999px;
-    box-sizing: border-box;
+  z-index: 1010;
-    width: 100%;
+  width: 100%;
-    border: 1px solid #aaa;
+  border: 1px solid #aaa;
-    border-top: 0;
+  border-top: 0;
-    background: #fff;
+  background: #fff;
-    box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
 }
 .chosen-container.chosen-with-drop .chosen-drop {
-    left: 0;
+  left: 0;
 }
 .chosen-container a {
-    cursor: pointer;
+  cursor: pointer;
 }
+.chosen-container .search-choice .group-name, .chosen-container .chosen-single .group-name {
-/* @end */
+  margin-right: 4px;
-/* @group Single Chosen */
+  overflow: hidden;
-.chosen-container-single .chosen-single {
+  white-space: nowrap;
-    position: relative;
+  text-overflow: ellipsis;
-    display: block;
+  font-weight: normal;
-    overflow: hidden;
+  color: #999999;
-    padding: 0 0 0 8px;
+}
-    height: 23px;
+.chosen-container .search-choice .group-name:after, .chosen-container .chosen-single .group-name:after {
-    border: 1px solid #aaa;
+  content: ":";
-    border-radius: 5px;
+  padding-left: 2px;
-    background-color: #fff;
+  vertical-align: top;
-    background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
+}
-    background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+/* @end */
-    background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+/* @group Single Chosen */
-    background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+.chosen-container-single .chosen-single {
-    background-clip: padding-box;
+  position: relative;
-    box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+  display: block;
-    color: #444;
+  overflow: hidden;
-    text-decoration: none;
+  padding: 0 0 0 8px;
-    white-space: nowrap;
+  height: 25px;
-    line-height: 24px;
+  border: 1px solid #aaa;
-}
+  border-radius: 5px;
-.chosen-container-single .chosen-default {
+  background-color: #fff;
-    color: #999;
+  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
-}
+  background: -webkit-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-.chosen-container-single .chosen-single span {
+  background: -moz-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    display: block;
+  background: -o-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    overflow: hidden;
+  background: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-    margin-right: 26px;
+  background-clip: padding-box;
-    text-overflow: ellipsis;
+  box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
-    white-space: nowrap;
+  color: #444;
-}
+  text-decoration: none;
-.chosen-container-single .chosen-single-with-deselect span {
+  white-space: nowrap;
-    margin-right: 38px;
+  line-height: 24px;
 }
-.chosen-container-single .chosen-single abbr {
+.chosen-container-single .chosen-default {
-    position: absolute;
+  color: #999;
-    top: 6px;
+}
-    right: 26px;
+.chosen-container-single .chosen-single span {
-    display: block;
+  display: block;
-    width: 12px;
+  overflow: hidden;
-    height: 12px;
+  margin-right: 26px;
-    background: url('chosen-sprite.png') -42px 1px no-repeat;
+  text-overflow: ellipsis;
-    font-size: 1px;
+  white-space: nowrap;
 }
-.chosen-container-single .chosen-single abbr:hover {
+.chosen-container-single .chosen-single-with-deselect span {
-    background-position: -42px -10px;
+  margin-right: 38px;
 }
-.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
+.chosen-container-single .chosen-single abbr {
-    background-position: -42px -10px;
+  position: absolute;
-}
+  top: 6px;
-.chosen-container-single .chosen-single div {
+  right: 26px;
-    position: absolute;
+  display: block;
-    top: 0;
+  width: 12px;
-    right: 0;
+  height: 12px;
-    display: block;
+  background: url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') -42px 1px no-repeat;
-    width: 18px;
+  font-size: 1px;
-    height: 100%;
+}
-}
+.chosen-container-single .chosen-single abbr:hover {
-.chosen-container-single .chosen-single div b {
+  background-position: -42px -10px;
-    display: block;
+}
-    width: 100%;
+.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
-    height: 100%;
+  background-position: -42px -10px;
-    background: url('chosen-sprite.png') no-repeat 0px 2px;
+}
-}
+.chosen-container-single .chosen-single div {
-.chosen-container-single .chosen-search {
+  position: absolute;
-    position: relative;
+  top: 0;
-    z-index: 1010;
+  right: 0;
-    margin: 0;
+  display: block;
-    padding: 3px 4px;
+  width: 18px;
-    white-space: nowrap;
+  height: 100%;
 }
-.chosen-container-single .chosen-search input[type="text"] {
+.chosen-container-single .chosen-single div b {
-    -webkit-box-sizing: border-box;
+  display: block;
-    -moz-box-sizing: border-box;
+  width: 100%;
-    box-sizing: border-box;
+  height: 100%;
-    margin: 1px 0;
+  background: url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') no-repeat 0px 2px;
-    padding: 4px 20px 4px 5px;
+}
-    width: 100%;
+.chosen-container-single .chosen-search {
-    height: auto;
+  position: relative;
-    outline: 0;
+  z-index: 1010;
-    border: 1px solid #aaa;
+  margin: 0;
-    background: white url('chosen-sprite.png') no-repeat 100% -20px;
+  padding: 3px 4px;
-    background: url('chosen-sprite.png') no-repeat 100% -20px;
+  white-space: nowrap;
-    font-size: 1em;
+}
-    font-family: sans-serif;
+.chosen-container-single .chosen-search input[type="text"] {
-    line-height: normal;
+  margin: 1px 0;
-    border-radius: 0;
+  padding: 4px 20px 4px 5px;
-}
+  width: 100%;
-.chosen-container-single .chosen-drop {
+  height: auto;
-    margin-top: -1px;
+  outline: 0;
-    border-radius: 0 0 4px 4px;
+  border: 1px solid #aaa;
-    background-clip: padding-box;
+  background: white url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') no-repeat 100% -20px;
-}
+  background: url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') no-repeat 100% -20px;
-.chosen-container-single.chosen-container-single-nosearch .chosen-search {
+  font-size: 1em;
-    position: absolute;
+  font-family: sans-serif;
-    left: -9999px;
+  line-height: normal;
-}
+  border-radius: 0;
+}
-/* @end */
+.chosen-container-single .chosen-drop {
-/* @group Results */
+  margin-top: -1px;
-.chosen-container .chosen-results {
+  border-radius: 0 0 4px 4px;
-    position: relative;
+  background-clip: padding-box;
-    overflow-x: hidden;
+}
-    overflow-y: auto;
+.chosen-container-single.chosen-container-single-nosearch .chosen-search {
-    margin: 0 4px 4px 0;
+  position: absolute;
-    padding: 0 0 0 4px;
+  left: -9999px;
-    max-height: 240px;
+}
-    -webkit-overflow-scrolling: touch;
-}
+/* @end */
-.chosen-container .chosen-results li {
+/* @group Results */
-    display: none;
+.chosen-container .chosen-results {
-    margin: 0;
+  color: #444;
-    padding: 5px 6px;
+  position: relative;
-    list-style: none;
+  overflow-x: hidden;
-    line-height: 15px;
+  overflow-y: auto;
-    -webkit-touch-callout: none;
+  margin: 0 4px 4px 0;
-}
+  padding: 0 0 0 4px;
-.chosen-container .chosen-results li.active-result {
+  max-height: 240px;
-    display: list-item;
+  -webkit-overflow-scrolling: touch;
-    cursor: pointer;
+}
-}
+.chosen-container .chosen-results li {
-.chosen-container .chosen-results li.disabled-result {
+  display: none;
-    display: list-item;
+  margin: 0;
-    color: #ccc;
+  padding: 5px 6px;
-    cursor: default;
+  list-style: none;
-}
+  line-height: 15px;
-.chosen-container .chosen-results li.highlighted {
+  word-wrap: break-word;
-    background-color: #3875d7;
+  -webkit-touch-callout: none;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+}
-    background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
+.chosen-container .chosen-results li.active-result {
-    background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
+  display: list-item;
-    background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
+  cursor: pointer;
-    background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+}
-    color: #fff;
+.chosen-container .chosen-results li.disabled-result {
-}
+  display: list-item;
-.chosen-container .chosen-results li.no-results {
+  color: #ccc;
-    display: list-item;
+  cursor: default;
-    background: #f4f4f4;
+}
-}
+.chosen-container .chosen-results li.highlighted {
-.chosen-container .chosen-results li.group-result {
+  background-color: #3875d7;
-    display: list-item;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
-    font-weight: bold;
+  background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
-    cursor: default;
+  background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
-}
+  background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
-.chosen-container .chosen-results li.group-option {
+  background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
-    padding-left: 15px;
+  color: #fff;
 }
-.chosen-container .chosen-results li em {
+.chosen-container .chosen-results li.no-results {
-    font-style: normal;
+  color: #777;
-    text-decoration: underline;
+  display: list-item;
-}
+  background: #f4f4f4;
+}
-/* @end */
+.chosen-container .chosen-results li.group-result {
-/* @group Multi Chosen */
+  display: list-item;
-.chosen-container-multi .chosen-choices {
+  font-weight: bold;
-    -moz-box-sizing: border-box;
+  cursor: default;
-    background-color: #FFFFFF;
+}
-    border: 1px solid #CBD5DD;
+.chosen-container .chosen-results li.group-option {
-    border-radius: 2px;
+  padding-left: 15px;
-    cursor: text;
+}
-    height: auto !important;
+.chosen-container .chosen-results li em {
-    margin: 0;
+  font-style: normal;
-    min-height: 30px;
+  text-decoration: underline;
-    overflow: hidden;
+}
-    padding: 2px;
-    position: relative;
+/* @end */
-    width: 100%;
+/* @group Multi Chosen */
-}
+.chosen-container-multi .chosen-choices {
-.chosen-container-multi .chosen-choices li {
+  position: relative;
-    float: left;
+  overflow: hidden;
-    list-style: none;
+  margin: 0;
-}
+  padding: 0 5px;
-.chosen-container-multi .chosen-choices li.search-field {
+  width: 100%;
-    margin: 0;
+  height: auto;
-    padding: 0;
+  border: 1px solid #aaa;
-    white-space: nowrap;
+  background-color: #fff;
-}
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+  background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
-    margin: 1px 0;
+  background-image: -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
-    padding: 5px;
+  background-image: -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
-    height: 25px;
+  background-image: linear-gradient(#eeeeee 1%, #ffffff 15%);
-    outline: 0;
+  cursor: text;
-    border: 0 !important;
+}
-    background: transparent !important;
+.chosen-container-multi .chosen-choices li {
-    box-shadow: none;
+  float: left;
-    color: #666;
+  list-style: none;
-    font-size: 100%;
+}
-    font-family: sans-serif;
+.chosen-container-multi .chosen-choices li.search-field {
-    line-height: normal;
+  margin: 0;
-    border-radius: 0;
+  padding: 0;
-}
+  white-space: nowrap;
-.chosen-container-multi .chosen-choices li.search-field .default {
+}
-    color: #999;
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
-}
+  margin: 1px 0;
-.chosen-container-multi .chosen-choices li.search-choice {
+  padding: 0;
-    position: relative;
+  height: 25px;
-    margin: 3px 0 3px 5px;
+  outline: 0;
-    padding: 3px 20px 3px 5px;
+  border: 0 !important;
-    border: 1px solid #aaa;
+  background: transparent !important;
-    border-radius: 3px;
+  box-shadow: none;
-    background-color: #e4e4e4;
+  color: #999;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  font-size: 100%;
-    background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  font-family: sans-serif;
-    background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  line-height: normal;
-    background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  border-radius: 0;
-    background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+}
-    background-clip: padding-box;
+.chosen-container-multi .chosen-choices li.search-choice {
-    box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  position: relative;
-    color: #333;
+  margin: 3px 5px 3px 0;
-    line-height: 13px;
+  padding: 3px 20px 3px 5px;
-    cursor: default;
+  border: 1px solid #aaa;
-}
+  max-width: 100%;
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+  border-radius: 3px;
-    position: absolute;
+  background-color: #eeeeee;
-    top: 4px;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-    right: 3px;
+  background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    display: block;
+  background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    width: 12px;
+  background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    height: 12px;
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    background: url('chosen-sprite.png') -42px 1px no-repeat;
+  background-size: 100% 19px;
-    font-size: 1px;
+  background-repeat: repeat-x;
-}
+  background-clip: padding-box;
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
+  box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
-    background-position: -42px -10px;
+  color: #333;
-}
+  line-height: 13px;
-.chosen-container-multi .chosen-choices li.search-choice-disabled {
+  cursor: default;
-    padding-right: 5px;
+}
-    border: 1px solid #ccc;
+.chosen-container-multi .chosen-choices li.search-choice span {
-    background-color: #e4e4e4;
+  word-wrap: break-word;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+}
-    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
-    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  position: absolute;
-    background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  top: 4px;
-    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  right: 3px;
-    color: #666;
+  display: block;
-}
+  width: 12px;
-.chosen-container-multi .chosen-choices li.search-choice-focus {
+  height: 12px;
-    background: #d4d4d4;
+  background: url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') -42px 1px no-repeat;
-}
+  font-size: 1px;
-.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
+}
-    background-position: -42px -10px;
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
-}
+  background-position: -42px -10px;
-.chosen-container-multi .chosen-results {
+}
-    margin: 0;
+.chosen-container-multi .chosen-choices li.search-choice-disabled {
-    padding: 0;
+  padding-right: 5px;
-}
+  border: 1px solid #ccc;
-.chosen-container-multi .chosen-drop .result-selected {
+  background-color: #e4e4e4;
-    display: list-item;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-    color: #ccc;
+  background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-    cursor: default;
+  background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-}
+  background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-/* @end */
+  color: #666;
-/* @group Active  */
+}
-.chosen-container-active .chosen-single {
+.chosen-container-multi .chosen-choices li.search-choice-focus {
-    border: 1px solid #5897fb;
+  background: #d4d4d4;
-    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
-}
+.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
-.chosen-container-active.chosen-with-drop .chosen-single {
+  background-position: -42px -10px;
-    border: 1px solid #aaa;
+}
-    -moz-border-radius-bottomright: 0;
+.chosen-container-multi .chosen-results {
-    border-bottom-right-radius: 0;
+  margin: 0;
-    -moz-border-radius-bottomleft: 0;
+  padding: 0;
-    border-bottom-left-radius: 0;
+}
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
+.chosen-container-multi .chosen-drop .result-selected {
-    background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  display: list-item;
-    background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  color: #ccc;
-    background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  cursor: default;
-    background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
+}
-    box-shadow: 0 1px 0 #fff inset;
-}
+/* @end */
-.chosen-container-active.chosen-with-drop .chosen-single div {
+/* @group Active  */
-    border-left: none;
+.chosen-container-active .chosen-single {
-    background: transparent;
+  border: 1px solid #5897fb;
-}
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-.chosen-container-active.chosen-with-drop .chosen-single div b {
+}
-    background-position: -18px 2px;
+.chosen-container-active.chosen-with-drop .chosen-single {
-}
+  border: 1px solid #aaa;
-.chosen-container-active .chosen-choices {
+  -moz-border-radius-bottomright: 0;
-    border: 1px solid #5897fb;
+  border-bottom-right-radius: 0;
-    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+  -moz-border-radius-bottomleft: 0;
-}
+  border-bottom-left-radius: 0;
-.chosen-container-active .chosen-choices li.search-field input[type="text"] {
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
-    color: #111 !important;
+  background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
-}
+  background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
-/* @end */
+  background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
-/* @group Disabled Support */
+  box-shadow: 0 1px 0 #fff inset;
-.chosen-disabled {
+}
-    opacity: 0.5 !important;
+.chosen-container-active.chosen-with-drop .chosen-single div {
-    cursor: default;
+  border-left: none;
-}
+  background: transparent;
-.chosen-disabled .chosen-single {
+}
-    cursor: default;
+.chosen-container-active.chosen-with-drop .chosen-single div b {
-}
+  background-position: -18px 2px;
-.chosen-disabled .chosen-choices .search-choice .search-choice-close {
+}
-    cursor: default;
+.chosen-container-active .chosen-choices {
-}
+  border: 1px solid #5897fb;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-/* @end */
+}
-/* @group Right to Left */
+.chosen-container-active .chosen-choices li.search-field input[type="text"] {
-.chosen-rtl {
+  color: #222 !important;
-    text-align: right;
+}
-}
-.chosen-rtl .chosen-single {
+/* @end */
-    overflow: visible;
+/* @group Disabled Support */
-    padding: 0 8px 0 0;
+.chosen-disabled {
-}
+  opacity: 0.5 !important;
-.chosen-rtl .chosen-single span {
+  cursor: default;
-    margin-right: 0;
+}
-    margin-left: 26px;
+.chosen-disabled .chosen-single {
-    direction: rtl;
+  cursor: default;
 }
-.chosen-rtl .chosen-single-with-deselect span {
+.chosen-disabled .chosen-choices .search-choice .search-choice-close {
-    margin-left: 38px;
+  cursor: default;
 }
-.chosen-rtl .chosen-single div {
-    right: auto;
+/* @end */
-    left: 3px;
+/* @group Right to Left */
-}
+.chosen-rtl {
-.chosen-rtl .chosen-single abbr {
+  text-align: right;
-    right: auto;
+}
-    left: 26px;
+.chosen-rtl .chosen-single {
-}
+  overflow: visible;
-.chosen-rtl .chosen-choices li {
+  padding: 0 8px 0 0;
-    float: right;
+}
-}
+.chosen-rtl .chosen-single span {
-.chosen-rtl .chosen-choices li.search-field input[type="text"] {
+  margin-right: 0;
-    direction: rtl;
+  margin-left: 26px;
-}
+  direction: rtl;
-.chosen-rtl .chosen-choices li.search-choice {
+}
-    margin: 3px 5px 3px 0;
+.chosen-rtl .chosen-single-with-deselect span {
-    padding: 3px 5px 3px 19px;
+  margin-left: 38px;
 }
-.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
+.chosen-rtl .chosen-single div {
-    right: auto;
+  right: auto;
-    left: 4px;
+  left: 3px;
 }
-.chosen-rtl.chosen-container-single-nosearch .chosen-search,
+.chosen-rtl .chosen-single abbr {
-.chosen-rtl .chosen-drop {
+  right: auto;
-    left: 9999px;
+  left: 26px;
 }
-.chosen-rtl.chosen-container-single .chosen-results {
+.chosen-rtl .chosen-choices li {
-    margin: 0 0 4px 4px;
+  float: right;
-    padding: 0 4px 0 0;
+}
-}
+.chosen-rtl .chosen-choices li.search-field input[type="text"] {
-.chosen-rtl .chosen-results li.group-option {
+  direction: rtl;
-    padding-right: 15px;
+}
-    padding-left: 0;
+.chosen-rtl .chosen-choices li.search-choice {
-}
+  margin: 3px 5px 3px 0;
-.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
+  padding: 3px 5px 3px 19px;
-    border-right: none;
+}
-}
+.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
-.chosen-rtl .chosen-search input[type="text"] {
+  right: auto;
-    padding: 4px 5px 4px 20px;
+  left: 4px;
-    background: white url('chosen-sprite.png') no-repeat -30px -20px;
+}
-    background: url('chosen-sprite.png') no-repeat -30px -20px;
+.chosen-rtl.chosen-container-single-nosearch .chosen-search,
-    direction: rtl;
+.chosen-rtl .chosen-drop {
-}
+  left: 9999px;
-.chosen-rtl.chosen-container-single .chosen-single div b {
+}
-    background-position: 6px 2px;
+.chosen-rtl.chosen-container-single .chosen-results {
-}
+  margin: 0 0 4px 4px;
-.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
+  padding: 0 4px 0 0;
-    background-position: -12px 2px;
+}
-}
+.chosen-rtl .chosen-results li.group-option {
+  padding-right: 15px;
-/* @end */
+  padding-left: 0;
-/* @group Retina compatibility */
+}
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
+.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
-    .chosen-rtl .chosen-search input[type="text"],
+  border-right: none;
-    .chosen-container-single .chosen-single abbr,
+}
-    .chosen-container-single .chosen-single div b,
+.chosen-rtl .chosen-search input[type="text"] {
-    .chosen-container-single .chosen-search input[type="text"],
+  padding: 4px 5px 4px 20px;
-    .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+  background: white url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') no-repeat -30px -20px;
-    .chosen-container .chosen-results-scroll-down span,
+  background: url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite.png') no-repeat -30px -20px;
-    .chosen-container .chosen-results-scroll-up span {
+  direction: rtl;
-        background-image: url('chosen-sprite@2x.png') !important;
+}
-        background-size: 52px 37px !important;
+.chosen-rtl.chosen-container-single .chosen-single div b {
-        background-repeat: no-repeat !important;
+  background-position: 6px 2px;
-    }
+}
-}
+.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
-/* @end */
+  background-position: -12px 2px;
+}
+/* @end */
+/* @group Retina compatibility */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) {
+  .chosen-rtl .chosen-search input[type="text"],
+  .chosen-container-single .chosen-single abbr,
+  .chosen-container-single .chosen-single div b,
+  .chosen-container-single .chosen-search input[type="text"],
+  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+  .chosen-container .chosen-results-scroll-down span,
+  .chosen-container .chosen-results-scroll-up span {
+    background-image: url('../../../../../../../Downloads/chosen_v1.6.2/chosen-sprite@2x.png') !important;
+    background-size: 52px 37px !important;
+    background-repeat: no-repeat !important;
+  }
+}
+/* @end */
--- a/apps/static/css/vaildator/images/loading.gif
+++ b/apps/static/css/vaildator/images/loading.gif
--- a/apps/static/css/vaildator/images/validator_default.png
+++ b/apps/static/css/vaildator/images/validator_default.png
--- a/apps/static/css/vaildator/images/validator_simple.png
+++ b/apps/static/css/vaildator/images/validator_simple.png
--- a/apps/static/css/vaildator/jquery.validator.css
+++ b/apps/static/css/vaildator/jquery.validator.css
--- a/apps/static/js/inspinia.js
+++ b/apps/static/js/inspinia.js
@@ -34,9 +34,9 @@ $(document).ready(function () {
    });
    // Append config box / Only for demo purpose
-    $.get("/skin_config/", function (data) {
+    //$.get("/skin_config/", function (data) {
-        $('body').append(data);
+    //    $('body').append(data);
-    });
+    //});
    // minimalize menu
    $('.navbar-minimalize').click(function () {

--- a/apps/static/js/plugins/chosen/chosen.jquery.min.js
+++ b/apps/static/js/plugins/chosen/chosen.jquery.min.js
+/* Chosen v1.6.2 | (c) 2011-2016 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */
+(function(){var a,AbstractChosen,Chosen,SelectParser,b,c={}.hasOwnProperty,d=function(a,b){function d(){this.constructor=a}for(var e in b)c.call(b,e)&&(a[e]=b[e]);return d.prototype=b.prototype,a.prototype=new d,a.__super__=b.prototype,a};SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(a){return"OPTGROUP"===a.nodeName.toUpperCase()?this.add_group(a):this.add_option(a)},SelectParser.prototype.add_group=function(a){var b,c,d,e,f,g;for(b=this.parsed.length,this.parsed.push({array_index:b,group:!0,label:this.escapeExpression(a.label),title:a.title?a.title:void 0,children:0,disabled:a.disabled,classes:a.className}),f=a.childNodes,g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(this.add_option(c,b,a.disabled));return g},SelectParser.prototype.add_option=function(a,b,c){return"OPTION"===a.nodeName.toUpperCase()?(""!==a.text?(null!=b&&(this.parsed[b].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:a.value,text:a.text,html:a.innerHTML,title:a.title?a.title:void 0,selected:a.selected,disabled:c===!0?c:a.disabled,group_array_index:b,group_label:null!=b?this.parsed[b].label:null,classes:a.className,style:a.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1):void 0},SelectParser.prototype.escapeExpression=function(a){var b,c;return null==a||a===!1?"":/[\&\<\>\"\'\`]/.test(a)?(b={"<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},c=/&(?!\w+;)|[\<\>\"\'\`]/g,a.replace(c,function(a){return b[a]||"&amp;"})):a},SelectParser}(),SelectParser.select_to_array=function(a){var b,c,d,e,f;for(c=new SelectParser,f=a.childNodes,d=0,e=f.length;e>d;d++)b=f[d],c.add_node(b);return c.parsed},AbstractChosen=function(){function AbstractChosen(a,b){this.form_field=a,this.options=null!=b?b:{},AbstractChosen.browser_is_supported()&&(this.is_multiple=this.form_field.multiple,this.set_default_text(),this.set_default_values(),this.setup(),this.set_up_html(),this.register_observers(),this.on_ready())}return AbstractChosen.prototype.set_default_values=function(){var a=this;return this.click_test_action=function(b){return a.test_active_click(b)},this.activate_action=function(b){return a.activate_field(b)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.allow_single_deselect=null!=this.options.allow_single_deselect&&null!=this.form_field.options[0]&&""===this.form_field.options[0].text?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.enable_split_word_search=null!=this.options.enable_split_word_search?this.options.enable_split_word_search:!0,this.group_search=null!=this.options.group_search?this.options.group_search:!0,this.search_contains=this.options.search_contains||!1,this.single_backstroke_delete=null!=this.options.single_backstroke_delete?this.options.single_backstroke_delete:!0,this.max_selected_options=this.options.max_selected_options||1/0,this.inherit_select_classes=this.options.inherit_select_classes||!1,this.display_selected_options=null!=this.options.display_selected_options?this.options.display_selected_options:!0,this.display_disabled_options=null!=this.options.display_disabled_options?this.options.display_disabled_options:!0,this.include_group_label_in_selected=this.options.include_group_label_in_selected||!1,this.max_shown_results=this.options.max_shown_results||Number.POSITIVE_INFINITY,this.case_sensitive_search=this.options.case_sensitive_search||!1},AbstractChosen.prototype.set_default_text=function(){return this.form_field.getAttribute("data-placeholder")?this.default_text=this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text:this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text,this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text},AbstractChosen.prototype.choice_label=function(a){return this.include_group_label_in_selected&&null!=a.group_label?"<b class='group-name'>"+a.group_label+"</b>"+a.html:a.html},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(a){var b=this;if(this.is_multiple){if(!this.active_field)return setTimeout(function(){return b.container_mousedown()},50)}else if(!this.active_field)return this.activate_field()},AbstractChosen.prototype.input_blur=function(a){var b=this;return this.mouse_on_container?void 0:(this.active_field=!1,setTimeout(function(){return b.blur_test()},100))},AbstractChosen.prototype.results_option_build=function(a){var b,c,d,e,f,g,h;for(b="",e=0,h=this.results_data,f=0,g=h.length;g>f&&(c=h[f],d="",d=c.group?this.result_add_group(c):this.result_add_option(c),""!==d&&(e++,b+=d),(null!=a?a.first:void 0)&&(c.selected&&this.is_multiple?this.choice_build(c):c.selected&&!this.is_multiple&&this.single_set_selected_text(this.choice_label(c))),!(e>=this.max_shown_results));f++);return b},AbstractChosen.prototype.result_add_option=function(a){var b,c;return a.search_match&&this.include_option_in_results(a)?(b=[],a.disabled||a.selected&&this.is_multiple||b.push("active-result"),!a.disabled||a.selected&&this.is_multiple||b.push("disabled-result"),a.selected&&b.push("result-selected"),null!=a.group_array_index&&b.push("group-option"),""!==a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.style.cssText=a.style,c.setAttribute("data-option-array-index",a.array_index),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):""},AbstractChosen.prototype.result_add_group=function(a){var b,c;return(a.search_match||a.group_match)&&a.active_options>0?(b=[],b.push("group-result"),a.classes&&b.push(a.classes),c=document.createElement("li"),c.className=b.join(" "),c.innerHTML=a.search_text,a.title&&(c.title=a.title),this.outerHTML(c)):""},AbstractChosen.prototype.results_update_field=function(){return this.set_default_text(),this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.results_build(),this.results_showing?this.winnow_results():void 0},AbstractChosen.prototype.reset_single_select_options=function(){var a,b,c,d,e;for(d=this.results_data,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.selected?e.push(a.selected=!1):e.push(void 0);return e},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(a){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.winnow_results=function(){var a,b,c,d,e,f,g,h,i,j,k,l;for(this.no_results_clear(),d=0,f=this.get_search_text(),a=f.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),i=new RegExp(a,"i"),c=this.get_search_regex(a),l=this.results_data,j=0,k=l.length;k>j;j++)b=l[j],b.search_match=!1,e=null,this.include_option_in_results(b)&&(b.group&&(b.group_match=!1,b.active_options=0),null!=b.group_array_index&&this.results_data[b.group_array_index]&&(e=this.results_data[b.group_array_index],0===e.active_options&&e.search_match&&(d+=1),e.active_options+=1),b.search_text=b.group?b.label:b.html,(!b.group||this.group_search)&&(b.search_match=this.search_string_match(b.search_text,c),b.search_match&&!b.group&&(d+=1),b.search_match?(f.length&&(g=b.search_text.search(i),h=b.search_text.substr(0,g+f.length)+"</em>"+b.search_text.substr(g+f.length),b.search_text=h.substr(0,g)+"<em>"+h.substr(g)),null!=e&&(e.group_match=!0)):null!=b.group_array_index&&this.results_data[b.group_array_index].search_match&&(b.search_match=!0)));return this.result_clear_highlight(),1>d&&f.length?(this.update_results_content(""),this.no_results(f)):(this.update_results_content(this.results_option_build()),this.winnow_results_set_highlight())},AbstractChosen.prototype.get_search_regex=function(a){var b,c;return b=this.search_contains?"":"^",c=this.case_sensitive_search?"":"i",new RegExp(b+a,c)},AbstractChosen.prototype.search_string_match=function(a,b){var c,d,e,f;if(b.test(a))return!0;if(this.enable_split_word_search&&(a.indexOf(" ")>=0||0===a.indexOf("["))&&(d=a.replace(/\[|\]/g,"").split(" "),d.length))for(e=0,f=d.length;f>e;e++)if(c=d[e],b.test(c))return!0},AbstractChosen.prototype.choices_count=function(){var a,b,c,d;if(null!=this.selected_option_count)return this.selected_option_count;for(this.selected_option_count=0,d=this.form_field.options,b=0,c=d.length;c>b;b++)a=d[b],a.selected&&(this.selected_option_count+=1);return this.selected_option_count},AbstractChosen.prototype.choices_click=function(a){return a.preventDefault(),this.results_showing||this.is_disabled?void 0:this.results_show()},AbstractChosen.prototype.keyup_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),b){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:if(a.preventDefault(),this.results_showing)return this.result_select(a);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:case 18:break;default:return this.results_search()}},AbstractChosen.prototype.clipboard_event_checker=function(a){var b=this;return setTimeout(function(){return b.results_search()},50)},AbstractChosen.prototype.container_width=function(){return null!=this.options.width?this.options.width:""+this.form_field.offsetWidth+"px"},AbstractChosen.prototype.include_option_in_results=function(a){return this.is_multiple&&!this.display_selected_options&&a.selected?!1:!this.display_disabled_options&&a.disabled?!1:a.empty?!1:!0},AbstractChosen.prototype.search_results_touchstart=function(a){return this.touch_started=!0,this.search_results_mouseover(a)},AbstractChosen.prototype.search_results_touchmove=function(a){return this.touch_started=!1,this.search_results_mouseout(a)},AbstractChosen.prototype.search_results_touchend=function(a){return this.touch_started?this.search_results_mouseup(a):void 0},AbstractChosen.prototype.outerHTML=function(a){var b;return a.outerHTML?a.outerHTML:(b=document.createElement("div"),b.appendChild(a),b.innerHTML)},AbstractChosen.browser_is_supported=function(){return"Microsoft Internet Explorer"===window.navigator.appName?document.documentMode>=8:/iP(od|hone)/i.test(window.navigator.userAgent)||/IEMobile/i.test(window.navigator.userAgent)||/Windows Phone/i.test(window.navigator.userAgent)||/BlackBerry/i.test(window.navigator.userAgent)||/BB10/i.test(window.navigator.userAgent)||/Android.*Mobile/i.test(window.navigator.userAgent)?!1:!0},AbstractChosen.default_multiple_text="Select Some Options",AbstractChosen.default_single_text="Select an Option",AbstractChosen.default_no_result_text="No results match",AbstractChosen}(),a=jQuery,a.fn.extend({chosen:function(b){return AbstractChosen.browser_is_supported()?this.each(function(c){var d,e;return d=a(this),e=d.data("chosen"),"destroy"===b?void(e instanceof Chosen&&e.destroy()):void(e instanceof Chosen||d.data("chosen",new Chosen(this,b)))}):this}}),Chosen=function(c){function Chosen(){return b=Chosen.__super__.constructor.apply(this,arguments)}return d(Chosen,c),Chosen.prototype.setup=function(){return this.form_field_jq=a(this.form_field),this.current_selectedIndex=this.form_field.selectedIndex,this.is_rtl=this.form_field_jq.hasClass("chosen-rtl")},Chosen.prototype.set_up_html=function(){var b,c;return b=["chosen-container"],b.push("chosen-container-"+(this.is_multiple?"multi":"single")),this.inherit_select_classes&&this.form_field.className&&b.push(this.form_field.className),this.is_rtl&&b.push("chosen-rtl"),c={"class":b.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title},this.form_field.id.length&&(c.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chosen"),this.container=a("<div />",c),this.is_multiple?this.container.html('<ul class="chosen-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>'):this.container.html('<a class="chosen-single chosen-default"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>'),this.form_field_jq.hide().after(this.container),this.dropdown=this.container.find("div.chosen-drop").first(),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chosen-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chosen-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chosen-search").first(),this.selected_item=this.container.find(".chosen-single").first()),this.results_build(),this.set_tab_index(),this.set_label_behavior()},Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("chosen:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var a=this;return this.container.bind("touchstart.chosen",function(b){return a.container_mousedown(b),b.preventDefault()}),this.container.bind("touchend.chosen",function(b){return a.container_mouseup(b),b.preventDefault()}),this.container.bind("mousedown.chosen",function(b){a.container_mousedown(b)}),this.container.bind("mouseup.chosen",function(b){a.container_mouseup(b)}),this.container.bind("mouseenter.chosen",function(b){a.mouse_enter(b)}),this.container.bind("mouseleave.chosen",function(b){a.mouse_leave(b)}),this.search_results.bind("mouseup.chosen",function(b){a.search_results_mouseup(b)}),this.search_results.bind("mouseover.chosen",function(b){a.search_results_mouseover(b)}),this.search_results.bind("mouseout.chosen",function(b){a.search_results_mouseout(b)}),this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(b){a.search_results_mousewheel(b)}),this.search_results.bind("touchstart.chosen",function(b){a.search_results_touchstart(b)}),this.search_results.bind("touchmove.chosen",function(b){a.search_results_touchmove(b)}),this.search_results.bind("touchend.chosen",function(b){a.search_results_touchend(b)}),this.form_field_jq.bind("chosen:updated.chosen",function(b){a.results_update_field(b)}),this.form_field_jq.bind("chosen:activate.chosen",function(b){a.activate_field(b)}),this.form_field_jq.bind("chosen:open.chosen",function(b){a.container_mousedown(b)}),this.form_field_jq.bind("chosen:close.chosen",function(b){a.input_blur(b)}),this.search_field.bind("blur.chosen",function(b){a.input_blur(b)}),this.search_field.bind("keyup.chosen",function(b){a.keyup_checker(b)}),this.search_field.bind("keydown.chosen",function(b){a.keydown_checker(b)}),this.search_field.bind("focus.chosen",function(b){a.input_focus(b)}),this.search_field.bind("cut.chosen",function(b){a.clipboard_event_checker(b)}),this.search_field.bind("paste.chosen",function(b){a.clipboard_event_checker(b)}),this.is_multiple?this.search_choices.bind("click.chosen",function(b){a.choices_click(b)}):this.container.bind("click.chosen",function(a){a.preventDefault()})},Chosen.prototype.destroy=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.search_field[0].tabIndex&&(this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex),this.container.remove(),this.form_field_jq.removeData("chosen"),this.form_field_jq.show()},Chosen.prototype.search_field_disabled=function(){return this.is_disabled=this.form_field_jq[0].disabled,this.is_disabled?(this.container.addClass("chosen-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus.chosen",this.activate_action),this.close_field()):(this.container.removeClass("chosen-disabled"),this.search_field[0].disabled=!1,this.is_multiple?void 0:this.selected_item.bind("focus.chosen",this.activate_action))},Chosen.prototype.container_mousedown=function(b){return this.is_disabled||(b&&"mousedown"===b.type&&!this.results_showing&&b.preventDefault(),null!=b&&a(b.target).hasClass("search-choice-close"))?void 0:(this.active_field?this.is_multiple||!b||a(b.target)[0]!==this.selected_item[0]&&!a(b.target).parents("a.chosen-single").length||(b.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),a(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action),this.results_show()),this.activate_field())},Chosen.prototype.container_mouseup=function(a){return"ABBR"!==a.target.nodeName||this.is_disabled?void 0:this.results_reset(a)},Chosen.prototype.search_results_mousewheel=function(a){var b;return a.originalEvent&&(b=a.originalEvent.deltaY||-a.originalEvent.wheelDelta||a.originalEvent.detail),null!=b?(a.preventDefault(),"DOMMouseScroll"===a.type&&(b=40*b),this.search_results.scrollTop(b+this.search_results.scrollTop())):void 0},Chosen.prototype.blur_test=function(a){return!this.active_field&&this.container.hasClass("chosen-container-active")?this.close_field():void 0},Chosen.prototype.close_field=function(){return a(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action),this.active_field=!1,this.results_hide(),this.container.removeClass("chosen-container-active"),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return this.container.addClass("chosen-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(b){var c;return c=a(b.target).closest(".chosen-container"),c.length&&this.container[0]===c[0]?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){return this.parsing=!0,this.selected_option_count=null,this.results_data=SelectParser.select_to_array(this.form_field),this.is_multiple?this.search_choices.find("li.search-choice").remove():this.is_multiple||(this.single_set_selected_text(),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?(this.search_field[0].readOnly=!0,this.container.addClass("chosen-container-single-nosearch")):(this.search_field[0].readOnly=!1,this.container.removeClass("chosen-container-single-nosearch"))),this.update_results_content(this.results_option_build({first:!0})),this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.parsing=!1},Chosen.prototype.result_do_highlight=function(a){var b,c,d,e,f;if(a.length){if(this.result_clear_highlight(),this.result_highlight=a,this.result_highlight.addClass("highlighted"),d=parseInt(this.search_results.css("maxHeight"),10),f=this.search_results.scrollTop(),e=d+f,c=this.result_highlight.position().top+this.search_results.scrollTop(),b=c+this.result_highlight.outerHeight(),b>=e)return this.search_results.scrollTop(b-d>0?b-d:0);if(f>c)return this.search_results.scrollTop(c)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){return this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.container.addClass("chosen-with-drop"),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results(),this.form_field_jq.trigger("chosen:showing_dropdown",{chosen:this}))},Chosen.prototype.update_results_content=function(a){return this.search_results.html(a)},Chosen.prototype.results_hide=function(){return this.results_showing&&(this.result_clear_highlight(),this.container.removeClass("chosen-with-drop"),this.form_field_jq.trigger("chosen:hiding_dropdown",{chosen:this})),this.results_showing=!1},Chosen.prototype.set_tab_index=function(a){var b;return this.form_field.tabIndex?(b=this.form_field.tabIndex,this.form_field.tabIndex=-1,this.search_field[0].tabIndex=b):void 0},Chosen.prototype.set_label_behavior=function(){var b=this;return this.form_field_label=this.form_field_jq.parents("label"),!this.form_field_label.length&&this.form_field.id.length&&(this.form_field_label=a("label[for='"+this.form_field.id+"']")),this.form_field_label.length>0?this.form_field_label.bind("click.chosen",function(a){return b.is_multiple?b.container_mousedown(a):b.activate_field()}):void 0},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices_count()<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c.length?(this.result_highlight=c,this.result_select(b),this.search_field.focus()):void 0},Chosen.prototype.search_results_mouseover=function(b){var c;return c=a(b.target).hasClass("active-result")?a(b.target):a(b.target).parents(".active-result").first(),c?this.result_do_highlight(c):void 0},Chosen.prototype.search_results_mouseout=function(b){return a(b.target).hasClass("active-result")?this.result_clear_highlight():void 0},Chosen.prototype.choice_build=function(b){var c,d,e=this;return c=a("<li />",{"class":"search-choice"}).html("<span>"+this.choice_label(b)+"</span>"),b.disabled?c.addClass("search-choice-disabled"):(d=a("<a />",{"class":"search-choice-close","data-option-array-index":b.array_index}),d.bind("click.chosen",function(a){return e.choice_destroy_link_click(a)}),c.append(d)),this.search_container.before(c)},Chosen.prototype.choice_destroy_link_click=function(b){return b.preventDefault(),b.stopPropagation(),this.is_disabled?void 0:this.choice_destroy(a(b.target))},Chosen.prototype.choice_destroy=function(a){return this.result_deselect(a[0].getAttribute("data-option-array-index"))?(this.show_search_field_default(),this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1&&this.results_hide(),a.parents("li").first().remove(),this.search_field_scale()):void 0},Chosen.prototype.results_reset=function(){return this.reset_single_select_options(),this.form_field.options[0].selected=!0,this.single_set_selected_text(),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change"),this.active_field?this.results_hide():void 0},Chosen.prototype.results_reset_cleanup=function(){return this.current_selectedIndex=this.form_field.selectedIndex,this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(a){var b,c;return this.result_highlight?(b=this.result_highlight,this.result_clear_highlight(),this.is_multiple&&this.max_selected_options<=this.choices_count()?(this.form_field_jq.trigger("chosen:maxselected",{chosen:this}),!1):(this.is_multiple?b.removeClass("active-result"):this.reset_single_select_options(),b.addClass("result-selected"),c=this.results_data[b[0].getAttribute("data-option-array-index")],c.selected=!0,this.form_field.options[c.options_index].selected=!0,this.selected_option_count=null,this.is_multiple?this.choice_build(c):this.single_set_selected_text(this.choice_label(c)),(a.metaKey||a.ctrlKey)&&this.is_multiple||this.results_hide(),this.show_search_field_default(),(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[c.options_index].value}),this.current_selectedIndex=this.form_field.selectedIndex,a.preventDefault(),this.search_field_scale())):void 0},Chosen.prototype.single_set_selected_text=function(a){return null==a&&(a=this.default_text),a===this.default_text?this.selected_item.addClass("chosen-default"):(this.single_deselect_control_build(),this.selected_item.removeClass("chosen-default")),this.selected_item.find("span").html(a)},Chosen.prototype.result_deselect=function(a){var b;return b=this.results_data[a],this.form_field.options[b.options_index].disabled?!1:(b.selected=!1,this.form_field.options[b.options_index].selected=!1,this.selected_option_count=null,this.result_clear_highlight(),this.results_showing&&this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[b.options_index].value}),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){return this.allow_single_deselect?(this.selected_item.find("abbr").length||this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>'),this.selected_item.addClass("chosen-single-with-deselect")):void 0},Chosen.prototype.get_search_text=function(){return a("<div/>").text(a.trim(this.search_field.val())).html()},Chosen.prototype.winnow_results_set_highlight=function(){var a,b;return b=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),a=b.length?b.first():this.search_results.find(".active-result").first(),null!=a?this.result_do_highlight(a):void 0},Chosen.prototype.no_results=function(b){var c;return c=a('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),c.find("span").first().html(b),this.search_results.append(c),this.form_field_jq.trigger("chosen:no_results",{chosen:this})},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var a;return this.results_showing&&this.result_highlight?(a=this.result_highlight.nextAll("li.active-result").first())?this.result_do_highlight(a):void 0:this.results_show()},Chosen.prototype.keyup_arrow=function(){var a;return this.results_showing||this.is_multiple?this.result_highlight?(a=this.result_highlight.prevAll("li.active-result"),a.length?this.result_do_highlight(a.first()):(this.choices_count()>0&&this.results_hide(),this.result_clear_highlight())):void 0:this.results_show()},Chosen.prototype.keydown_backstroke=function(){var a;return this.pending_backstroke?(this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke()):(a=this.search_container.siblings("li.search-choice").last(),a.length&&!a.hasClass("search-choice-disabled")?(this.pending_backstroke=a,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")):void 0)},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(a){var b,c;switch(b=null!=(c=a.which)?c:a.keyCode,this.search_field_scale(),8!==b&&this.pending_backstroke&&this.clear_backstroke(),b){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(a),this.mouse_on_container=!1;break;case 13:this.results_showing&&a.preventDefault();break;case 32:this.disable_search&&a.preventDefault();break;case 38:a.preventDefault(),this.keyup_arrow();break;case 40:a.preventDefault(),this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var b,c,d,e,f,g,h,i,j;if(this.is_multiple){for(d=0,h=0,f="position:absolute; left: -1000px; top: -1000px; display:none;",g=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"],i=0,j=g.length;j>i;i++)e=g[i],f+=e+":"+this.search_field.css(e)+";";return b=a("<div />",{style:f}),b.text(this.search_field.val()),a("body").append(b),h=b.width()+25,b.remove(),c=this.container.outerWidth(),h>c-10&&(h=c-10),this.search_field.css({width:h+"px"})}},Chosen}(AbstractChosen)}).call(this);
\ No newline at end of file
--- a/apps/static/js/cropper/cropper.min.js
+++ b/apps/static/js/cropper/cropper.min.js
--- a/apps/static/js/datapicker/bootstrap-datepicker.js
+++ b/apps/static/js/datapicker/bootstrap-datepicker.js
--- a/apps/static/js/demo/peity-demo.js
+++ b/apps/static/js/demo/peity-demo.js
--- a/apps/static/js/dropzone/dropzone.js
+++ b/apps/static/js/dropzone/dropzone.js
--- a/apps/static/js/echarts/chart/bar.js
+++ b/apps/static/js/echarts/chart/bar.js
--- a/apps/static/js/echarts/chart/chord.js
+++ b/apps/static/js/echarts/chart/chord.js
--- a/apps/static/js/echarts/chart/eventRiver.js
+++ b/apps/static/js/echarts/chart/eventRiver.js
--- a/apps/static/js/echarts/chart/force.js
+++ b/apps/static/js/echarts/chart/force.js
--- a/apps/static/js/echarts/chart/funnel.js
+++ b/apps/static/js/echarts/chart/funnel.js
--- a/apps/static/js/echarts/chart/gauge.js
+++ b/apps/static/js/echarts/chart/gauge.js
--- a/apps/static/js/echarts/chart/heatmap.js
+++ b/apps/static/js/echarts/chart/heatmap.js
--- a/apps/static/js/echarts/chart/k.js
+++ b/apps/static/js/echarts/chart/k.js
--- a/apps/static/js/echarts/chart/line.js
+++ b/apps/static/js/echarts/chart/line.js
--- a/apps/static/js/echarts/chart/map.js
+++ b/apps/static/js/echarts/chart/map.js
--- a/apps/static/js/echarts/chart/pie.js
+++ b/apps/static/js/echarts/chart/pie.js
--- a/apps/static/js/echarts/chart/radar.js
+++ b/apps/static/js/echarts/chart/radar.js
--- a/apps/static/js/echarts/chart/scatter.js
+++ b/apps/static/js/echarts/chart/scatter.js
--- a/apps/static/js/echarts/chart/tree.js
+++ b/apps/static/js/echarts/chart/tree.js
--- a/apps/static/js/echarts/chart/treemap.js
+++ b/apps/static/js/echarts/chart/treemap.js
--- a/apps/static/js/echarts/chart/venn.js
+++ b/apps/static/js/echarts/chart/venn.js
--- a/apps/static/js/echarts/chart/wordCloud.js
+++ b/apps/static/js/echarts/chart/wordCloud.js
--- a/apps/static/js/echarts/echarts-all.js
+++ b/apps/static/js/echarts/echarts-all.js
--- a/apps/static/js/echarts/echarts.js
+++ b/apps/static/js/echarts/echarts.js
--- a/apps/static/js/highcharts/adapters/standalone-framework.js
+++ b/apps/static/js/highcharts/adapters/standalone-framework.js
--- a/apps/static/js/highcharts/adapters/standalone-framework.src.js
+++ b/apps/static/js/highcharts/adapters/standalone-framework.src.js
--- a/apps/static/js/highcharts/highcharts-3d.js
+++ b/apps/static/js/highcharts/highcharts-3d.js
--- a/apps/static/js/highcharts/highcharts-3d.src.js
+++ b/apps/static/js/highcharts/highcharts-3d.src.js
--- a/apps/static/js/highcharts/highcharts-all.js
+++ b/apps/static/js/highcharts/highcharts-all.js
--- a/apps/static/js/highcharts/highcharts-more.js
+++ b/apps/static/js/highcharts/highcharts-more.js
--- a/apps/static/js/highcharts/highcharts-more.src.js
+++ b/apps/static/js/highcharts/highcharts-more.src.js
--- a/apps/static/js/highcharts/highcharts.js
+++ b/apps/static/js/highcharts/highcharts.js
--- a/apps/static/js/highcharts/highcharts.src.js
+++ b/apps/static/js/highcharts/highcharts.src.js
--- a/apps/static/js/highcharts/modules/canvas-tools.js
+++ b/apps/static/js/highcharts/modules/canvas-tools.js
--- a/apps/static/js/highcharts/modules/canvas-tools.src.js
+++ b/apps/static/js/highcharts/modules/canvas-tools.src.js
--- a/apps/static/js/highcharts/modules/data.js
+++ b/apps/static/js/highcharts/modules/data.js
--- a/apps/static/js/highcharts/modules/data.src.js
+++ b/apps/static/js/highcharts/modules/data.src.js
--- a/apps/static/js/highcharts/modules/drilldown.js
+++ b/apps/static/js/highcharts/modules/drilldown.js
--- a/apps/static/js/highcharts/modules/drilldown.src.js
+++ b/apps/static/js/highcharts/modules/drilldown.src.js
--- a/apps/static/js/highcharts/modules/exporting.js
+++ b/apps/static/js/highcharts/modules/exporting.js
--- a/apps/static/js/highcharts/modules/exporting.src.js
+++ b/apps/static/js/highcharts/modules/exporting.src.js
--- a/apps/static/js/highcharts/modules/funnel.js
+++ b/apps/static/js/highcharts/modules/funnel.js
--- a/apps/static/js/highcharts/modules/funnel.src.js
+++ b/apps/static/js/highcharts/modules/funnel.src.js
--- a/apps/static/js/highcharts/modules/heatmap.js
+++ b/apps/static/js/highcharts/modules/heatmap.js
--- a/apps/static/js/highcharts/modules/heatmap.src.js
+++ b/apps/static/js/highcharts/modules/heatmap.src.js
--- a/apps/static/js/highcharts/modules/no-data-to-display.js
+++ b/apps/static/js/highcharts/modules/no-data-to-display.js
--- a/apps/static/js/highcharts/modules/no-data-to-display.src.js
+++ b/apps/static/js/highcharts/modules/no-data-to-display.src.js
--- a/apps/static/js/highcharts/modules/solid-gauge.js
+++ b/apps/static/js/highcharts/modules/solid-gauge.js
--- a/apps/static/js/highcharts/modules/solid-gauge.src.js
+++ b/apps/static/js/highcharts/modules/solid-gauge.src.js
--- a/apps/static/js/highcharts/themes/dark-blue.js
+++ b/apps/static/js/highcharts/themes/dark-blue.js
--- a/apps/static/js/highcharts/themes/dark-green.js
+++ b/apps/static/js/highcharts/themes/dark-green.js
--- a/apps/static/js/highcharts/themes/dark-unica.js
+++ b/apps/static/js/highcharts/themes/dark-unica.js
--- a/apps/static/js/highcharts/themes/gray.js
+++ b/apps/static/js/highcharts/themes/gray.js
--- a/apps/static/js/highcharts/themes/grid-light.js
+++ b/apps/static/js/highcharts/themes/grid-light.js
--- a/apps/static/js/highcharts/themes/grid.js
+++ b/apps/static/js/highcharts/themes/grid.js
--- a/apps/static/js/highcharts/themes/sand-signika.js
+++ b/apps/static/js/highcharts/themes/sand-signika.js
--- a/apps/static/js/highcharts/themes/skies.js
+++ b/apps/static/js/highcharts/themes/skies.js
--- a/apps/static/js/layer/extend/layer.ext.js
+++ b/apps/static/js/layer/extend/layer.ext.js
--- a/apps/static/js/layer/layer.js
+++ b/apps/static/js/layer/layer.js
--- a/apps/static/js/layer/skin/default/icon-ext.png
+++ b/apps/static/js/layer/skin/default/icon-ext.png
--- a/apps/static/js/layer/skin/default/icon.png
+++ b/apps/static/js/layer/skin/default/icon.png
--- a/apps/static/js/layer/skin/default/loading-0.gif
+++ b/apps/static/js/layer/skin/default/loading-0.gif
--- a/apps/static/js/layer/skin/default/loading-1.gif
+++ b/apps/static/js/layer/skin/default/loading-1.gif
--- a/apps/static/js/layer/skin/default/loading-2.gif
+++ b/apps/static/js/layer/skin/default/loading-2.gif
--- a/apps/static/js/layer/skin/layer.css
+++ b/apps/static/js/layer/skin/layer.css
--- a/apps/static/js/layer/skin/layer.ext.css
+++ b/apps/static/js/layer/skin/layer.ext.css
--- a/apps/static/js/magnific/jquery.magnific-popup.min.js
+++ b/apps/static/js/magnific/jquery.magnific-popup.min.js
--- a/apps/static/js/validator/images/loading.gif
+++ b/apps/static/js/validator/images/loading.gif
--- a/apps/static/js/validator/images/validator_default.png
+++ b/apps/static/js/validator/images/validator_default.png
--- a/apps/static/js/validator/images/validator_simple.png
+++ b/apps/static/js/validator/images/validator_simple.png
--- a/apps/static/js/validator/jquery.validator.js
+++ b/apps/static/js/validator/jquery.validator.js
--- a/apps/static/js/validator/zh_CN.js
+++ b/apps/static/js/validator/zh_CN.js
--- a/apps/templates/_head_css_js.html
+++ b/apps/templates/_head_css_js.html
@@ -7,7 +7,7 @@
 {#<link href="{% static "css/animate.css" %}" rel="stylesheet">#}
 <link href="{% static "css/style.css" %}" rel="stylesheet">
 {#<link href="{% static "css/colorbox.css" %}" rel="stylesheet">#}
-<link href="{% static "css/vaildator/jquery.validator.css" %}" rel="stylesheet">
+<link href="{% static "css/plugins/vaildator/jquery.validator.css" %}" rel="stylesheet">
 {#<link href="{% static "css/magnific/magnific-popup.css" %}" rel="stylesheet">#}
 {#<link href="{% static "css/plugins/fullcalendar/fullcalendar.css" %}" rel="stylesheet">#}
 {#<link href="{% static "css/dropzone/basic.css" %}" rel="stylesheet">#}

--- a/apps/users/forms.py
+++ b/apps/users/forms.py
 # ~*~ coding: utf-8 ~*~
 from django.forms import ModelForm
+from django import forms
 from .models import User, UserGroup
@@ -9,6 +10,11 @@ class UserForm(ModelForm):
    class Meta:
        model = User
        fields = [
-            'username', 'password', 'name', 'email', 'groups', 'wechat',
+            'username', 'name', 'email', 'groups', 'wechat',
            'phone', 'enable_2FA', 'role', 'date_expired', 'comment',
        ]
+        # widgets = {
+        #     'groups': forms.SelectMultiple(attrs={'class': 'chosen-select'})
+        # }
--- a/apps/users/migrations/0005_auto_20160816_1358.py
+++ b/apps/users/migrations/0005_auto_20160816_1358.py
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-08-16 05:58
+from __future__ import unicode_literals
+from django.db import migrations, models
+class Migration(migrations.Migration):
+    dependencies = [
+        ('users', '0004_auto_20160815_2257'),
+    ]
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='comment',
+            field=models.TextField(blank=True, max_length=200, verbose_name='\u63cf\u8ff0'),
+        ),
+    ]
--- a/apps/users/templates/users/_user.html
+++ b/apps/users/templates/users/_user.html
 {% extends 'base.html' %}
+{% load static %}
 {% load bootstrap %}
+{% block custom_head_css_js %}
+    <link href="{% static "css/plugins/chosen/chosen.css" %}" rel="stylesheet">
+    <script href="{% static "js/plugins/chosen/chosen.jquery.min.js" %}" type="text/javascript"></script>
+{% endblock %}
 {% block content %}
    <div class="wrapper wrapper-content animated fadeInRight">
@@ -24,7 +29,7 @@
                        <form method="post" id="userForm" class="form-horizontal" action="">
                            {% csrf_token %}
                            <h3>账户</h3>
-                            {{ form.username|bootstrap_horizontal }}
+                            {% block username %} {% endblock %}
                            {{ form.name|bootstrap_horizontal }}
                            {{ form.email|bootstrap_horizontal }}
                            {{ form.groups|bootstrap_horizontal }}
@@ -61,49 +66,19 @@
        </div>
    </div>
 {% endblock %}
-{% block self_footer_js %}
+{% block custom_footer_js %}
+<script type="text/javascript">
-<script>
+{#$(document).ready(function() {#}
-$('#userForm').validator({
+{#    var config = {#}
-    timely: 2,
+{#        '.chosen-select': {},#}
-    theme: "yellow_right_effect",
+{#        '.chosen-select-deselect': {allow_single_deselect: true},#}
-    rules: {
+{#        '.chosen-select-no-single': {disable_search_threshold: 10},#}
-        check_username: [/^[\w.]{3,20}$/, '大小写字母数字和下划线小数点'],
+{#        '.chosen-select-no-results': {no_results_text: 'Oops, nothing found!'},#}
-        type_m: function(element){
+{#        '.chosen-select-width': {width: "95%"}#}
-                    return  $("#M").is(":checked");
+{#    };#}
-            }
+{#    for (var selector in config) {#}
-    },
+{#        $(selector).chosen(config[selector]);#}
-    fields: {
+{#    }#}
-        "username": {
+{#})#}
-            rule: "required;check_username",
-            tip: "输入用户名",
-            ok: "",
-            msg: {required: "必须填写!"}
-        },
-        "password": {
-            rule: "required;length[6~50]",
-            tip: "输入密码",
-            ok: "",
-            msg: {required: "必须填写!"}
-        },
-        "name": {
-            rule: "required",
-            tip: "姓名",
-            ok: "",
-            msg: {required: "必须填写"}
-        },
-        "email": {
-            rule: "required",
-            tip: "Email",
-            ok: "",
-            msg: {required: "必须填写"}
-        }
-    },
-    valid: function(form) {
-        form.submit();
-    }
-});
 </script>
 {% endblock %}
\ No newline at end of file
--- a/apps/users/templates/users/user_add.html
+++ b/apps/users/templates/users/user_add.html
 {% extends 'users/_user.html' %}
+{% load bootstrap %}
+{% block username %}
+    {{ form.username|bootstrap_horizontal }}
+{% endblock %}
 {% block password %}
    <h3>密码</h3>
    <div class="form-group">

--- a/apps/users/templates/users/user_delete_confirm.html
+++ b/apps/users/templates/users/user_delete_confirm.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>确认删除</title>
+</head>
+<body>
+<form action="" method="post">
+    {% csrf_token %}
+    <p>Are you sure you want to delete "{{ object.name }}"?</p>
+    <input type="submit" value="Confirm" />
+</form>
+</body>
+</html>
\ No newline at end of file
--- a/apps/users/templates/users/user_detail.html
+++ b/apps/users/templates/users/user_detail.html
+{% extends 'base.html' %}
+{% load common_tags %}
+{% load static %}
+{% block content %}
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+{#                <div class="ibox-content">#}
+                    <div class="panel-options">
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a href="" class="text-center"><i class="fa fa-laptop"></i> 用户信息 </a></li>
+                            <li><a href="" class="text-center"><i class="fa fa-bar-chart-o"></i> 用户资产</a></li>
+                            <li><a href="" class="text-center"><i class="fa fa-bar-chart-o"></i> 登录记录 </a></li>
+                            <div class="" style="float: right">
+                                <form id="search_form" method="get" action="" class="pull-right mail-search">
+                                    <div class="input-group">
+                                        <input type="text" class="form-control input-sm" id="keyword" name="keyword" value="{{ keyword }}" placeholder="Search">
+                                        <div class="input-group-btn">
+                                            <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
+                                                搜索
+                                            </button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div class="col-sm-7" style="padding-left: 0px;">
+                            <div class="ibox float-e-margins">
+                                <div class="ibox-title">
+                                    <span class="label"><b>{{ user.name }}</b></span>
+                                    <div class="ibox-tools">
+                                        <a class="collapse-link">
+                                            <i class="fa fa-chevron-up"></i>
+                                        </a>
+                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                            <i class="fa fa-wrench"></i>
+                                        </a>
+                                        <ul class="dropdown-menu dropdown-user">
+                                            <li><a href="#"></a>
+                                            </li>
+                                            <li><a href="#"></a>
+                                            </li>
+                                        </ul>
+                                        <a class="close-link">
+                                            <i class="fa fa-times"></i>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="ibox-content">
+                                    <table class="table">
+                                        <tbody>
+                                        <tr>
+                                            <td colspan="2">
+                                                <img src="{% static "img/root.png" %}" class="img-circle", width="64" height="64">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td width="20%"><b>姓名:</b></td>
+                                            <td>{{ user.name }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>用户名:</b></td>
+                                            <td>{{ user.username }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>邮件:</b></td>
+                                            <td>{{ user.email }}</td>
+                                        </tr>
+                                        {% if user.phone %}
+                                        <tr>
+                                            <td><b>手机:</b></td>
+                                            <td>{{ user.phone }}</td>
+                                        </tr>
+                                        {% endif %}
+                                        {% if user.wechat %}
+                                        <tr>
+                                            <td><b>微信:</b></td>
+                                            <td>{{ user.wechat }}</td>
+                                        </tr>
+                                        {% endif %}
+                                        <tr>
+                                            <td><b>角色:</b></td>
+                                            <td>{{ user.role.name }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>有效期:</b></td>
+                                            <td>{{ user.date_expired|date:"Y-m-j H:i:s" }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>创建者:</b></td>
+                                            <td>{{ user.created_by }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>创建日期:</b></td>
+                                            <td>{{ user.date_joined|date:"Y-m-j H:i:s" }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>最后登录:</b></td>
+                                            <td>{{ user.last_login|date:"Y-m-j H:i:s" }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>描述:</b></td>
+                                            <td>{{ user.comment }}</td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-sm-5" style="padding-left: 0px;">
+                            <div class="ibox float-e-margins">
+                                <div class="ibox-title " style="background: #1ab394">
+                                    <span style="color: white">快速修改</span>
+                                    <div class="ibox-tools">
+                                    </div>
+                                </div>
+                                <div class="ibox-content" style="border-color: #1ab394; border-style: solid solid solid; border-width: 1px" >
+                                    <table class="table">
+                                        <tbody>
+                                        <tr>
+                                            <td colspan="2">
+                                                <img src="{% static "img/root.png" %}" class="img-circle" width="64" height="64">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td width="20%"><b>姓名:</b></td>
+                                            <td>{{ user.name }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>描述:</b></td>
+                                            <td>{{ user.comment }}</td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                            <div class="ibox float-e-margins">
+                                <div class="ibox-title bg-primary">
+                                    <span class="label"><b>{{ user.name }}</b></span>
+                                    <div class="ibox-tools">
+                                    </div>
+                                </div>
+                                <div class="ibox-content">
+                                    <table class="table">
+                                        <tbody>
+                                        <tr>
+                                            <td colspan="2">
+                                                <img src="{% static "img/root.png" %}" class="img-circle", width="64" height="64">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td width="20%"><b>姓名:</b></td>
+                                            <td>{{ user.name }}</td>
+                                        </tr>
+                                        <tr>
+                                            <td><b>描述:</b></td>
+                                            <td>{{ user.comment }}</td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
--- a/apps/users/templates/users/user_edit.html
+++ b/apps/users/templates/users/user_edit.html
 {% extends 'users/_user.html' %}
-{% block password %}
+{% block username %}
-    <h3>密码</h3>
+    <div class="form-group">
-    <div class="form-group">
+        <label for="{{ form.username.id_for_label }}" class="col-sm-2 control-label">用户名</label>
-        <label for="password" class="col-sm-2 control-label">密码</label>
+        <div class="col-sm-9 controls" >
-        <div class="col-sm-9 controls" >
+            <input id="{{ form.username.id_for_label }}" name="username" type="text" value="{{ form.username.value }}" readonly class="form-control">
-            <input id="password" name="password" type="password" class="form-control">
+        </div>
-        </div>
+    </div>
-    </div>
+{% endblock %}
+{% block password %}
+    <h3>密码</h3>
+    <div class="form-group">
+        <label for="password" class="col-sm-2 control-label">密码</label>
+        <div class="col-sm-9 controls" >
+            <input id="password" name="password" type="password" class="form-control">
+        </div>
+    </div>
 {% endblock %}
\ No newline at end of file
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -58,7 +58,7 @@
                                    <input type="checkbox" name="checked" value="{{ user.id }}">
                                </td>
                                <td class="text-center">
-                                    <a href="{% url 'users:user-detail' pk=user.id %}?id={{ user.id }}">
+                                    <a href="{% url 'users:user-detail' pk=user.id %}">
                                        {{ user.name }}
                                    </a>
                                </td>

--- a/apps/users/urls.py
+++ b/apps/users/urls.py
 from django.conf.urls import url
-from .views import UserListView, UserAddView, UserUpdateView
+from .views import UserListView, UserAddView, UserUpdateView, UserDeleteView, UserDetailView
 app_name = 'users'
 urlpatterns = [
    url(r'^$', UserListView.as_view(), name='user-list'),
-    url(r'^(?P<pk>[0-9]+)/$', UserListView.as_view(), name='user-detail'),
+    url(r'^(?P<pk>[0-9]+)/$', UserDetailView.as_view(), name='user-detail'),
    url(r'^add/$', UserAddView.as_view(), name='user-add'),
    url(r'^(?P<pk>[0-9]+)/edit/$', UserUpdateView.as_view(), name='user-edit'),
-    url(r'^(?P<pk>[0-9]+)/delete/$', UserListView.as_view(), name='user-delete'),
+    url(r'^(?P<pk>[0-9]+)/delete/$', UserDeleteView.as_view(), name='user-delete'),
 ]
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -4,6 +4,7 @@ from django.urls import reverse_lazy
 from django.db.models import Q
 from django.views.generic.list import ListView
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
+from django.views.generic.detail import DetailView
 from .models import User, UserGroup, Role
 from .forms import UserForm
@@ -44,8 +45,8 @@ class UserAddView(CreateView):
    def form_valid(self, form):
        user = form.save()
-        password = form['password'].value()
+        user.created_by = self.request.user.username or 'Admin'
-        user.set_password(password)
+        user.save()
        return super(UserAddView, self).form_valid(form)
@@ -57,7 +58,19 @@ class UserUpdateView(UpdateView):
    def form_valid(self, form):
        user = form.save()
-        password = form['password'].value()
+        password = self.request.POST.get('password', '')
        if password:
            user.set_password(password)
        return super(UserUpdateView, self).form_valid(form)
+class UserDeleteView(DeleteView):
+    model = User
+    success_url = reverse_lazy('users:user-list')
+    template_name = 'users/user_delete_confirm.html'
+class UserDetailView(DeleteView):
+    model = User
+    template_name = 'users/user_detail.html'
+    context_object_name = "user"