Merge branch 'release/3.1.3'

Author: atwellpub

assets/css/wpl.edit-lead.css

@@ -104,6 +104,27 @@ float: right;
 #lead-searches .lead-timeline {
 	margin-left: 10px !important;
 }
+
+#lead-searches #search-error-count{
+    width: 92%;
+    margin-left: 10px;
+}
+
+#lead-searches .search-error-icon{
+    font-size: 54px;
+    position: absolute;
+    left: 30px;
+    margin-top: 10px;
+}
+
+#lead-searches .search-error-message{
+    padding: 26px 10px 26px 10px;
+    border: 1px solid #e5e5e5;
+    border-radius: 5px;
+    background: #fff;
+    margin-top: 3px;
+    margin-left: 83px;
+}
 #conversions-data-display .nav-container {
 margin-top: 5px;
 }
@@ -222,4 +243,4 @@ body .metabox-holder .postbox-container .empty-container {
 
 #full-contact-icon  {
 	vertical-align:middle;
-}
+}

assets/js/wpl.admin.edit.js

@@ -259,6 +259,10 @@ jQuery(document).ready(function ($) {
             the_list.tsort({attr: 'data-date', order: 'desc'});
             jQuery('.lead-sort-active').removeClass('lead-sort-active');
             jQuery(this).addClass('lead-sort-active');
+            if(which_sort == '#lead-searches'){
+                var errorCount = jQuery('#search-error-count').detach();
+                jQuery('#lead-searches').append(errorCount);
+            }
         });
 
         jQuery('#oldest-event').click(function () {
@@ -267,6 +271,10 @@ jQuery(document).ready(function ($) {
             the_list.tsort({attr: 'data-date', order: 'asc'});
             jQuery('.lead-sort-active').removeClass('lead-sort-active');
             jQuery(this).addClass('lead-sort-active');
+            if(which_sort == '#lead-searches'){
+                var errorCount = jQuery('#search-error-count').detach();
+                jQuery('#lead-searches').append(errorCount);
+            }
         });
 
         jQuery('#highest').click(function () {
@@ -290,6 +298,10 @@ jQuery(document).ready(function ($) {
         the_list.tsort({attr: 'data-date', order: 'desc'});
         jQuery(toggle_this).fadeIn(700);
         jQuery(".lead-item-num").show();
+        if(which_sort == '#lead-searches'){
+            var errorCount = jQuery('#search-error-count').detach();
+            jQuery('#lead-searches').append(errorCount);
+        }
     });
 
     jQuery("body").on('click', '.lead-activity-show-all', function () {