Browse Source

Fix PlexSearch - Fix Notification Bug - Fix tab icon scroll bug

causefx 8 years ago
parent
commit
fc2794949c
5 changed files with 15 additions and 6 deletions
  1. 1 1
      css/style.css
  2. 7 1
      homepage.php
  3. 2 2
      index.php
  4. 2 2
      js/notifications/notificationFx.js
  5. 3 0
      settings.php

+ 1 - 1
css/style.css

@@ -2541,7 +2541,7 @@ a.thumbnail.active, a.thumbnail:focus, a.thumbnail:hover {
 }
 
 .input-group-addon {
-  border: solid 1px #C0C0C0 !important;
+  border: solid 0px #C0C0C0 !important;
 }
 
 .form-inline .form-group {

+ 7 - 1
homepage.php

@@ -398,7 +398,8 @@ $endDate = date('Y-m-d',strtotime("+".CALENDARENDDAY." days"));
                                 <div class="">
                                     <div class="input-group">
                                         <div style="border-radius: 25px 0 0 25px; border:0" class="input-group-addon gray-bg"><i class="fa fa-search white"></i></div>
-                                        <input type="text" style="border-radius: 0 25px 25px 0;" autocomplete="off" name="search-title" class="form-control input-group-addon gray-bg" placeholder="Media Search">
+                                        <input id="searchInput" type="text" style="border-radius: 0;" autocomplete="off" name="search-title" class="form-control input-group-addon gray-bg" placeholder="Media Search">
+										<div id="clearSearch" style="border-radius: 0 25px 25px 0;border:0; cursor: pointer;" class="input-group-addon gray-bg"><i class="fa fa-close white"></i></div>
                                         <button style="display:none" id="plexSearchForm_submit" class="btn btn-primary waves"></button>
                                     </div>
                                 </div>
@@ -542,6 +543,11 @@ $endDate = date('Y-m-d',strtotime("+".CALENDARENDDAY." days"));
             var closedBox = $(this).closest('div.content-box').remove();
             e.preventDefault();
         });
+		$('#clearSearch').click(function(e){
+            $('#searchInput').val("");
+            $('#searchInput').focus();
+            e.preventDefault();
+        });
         
 		$(document).on("click", ".openTab", function(e) {
 			if($(this).attr("openTab") === "true") {

+ 2 - 2
index.php

@@ -1132,7 +1132,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
         <script src="<?=$baseURL;?>bower_components/smoke/dist/js/smoke.min.js"></script>
 
         <!--Notification-->
-        <script src="<?=$baseURL;?>js/notifications/notificationFx.js"></script>
+        <script src="<?=$baseURL;?>js/notifications/notificationFx.js?v=<?php echo INSTALLEDVERSION; ?>"></script>
 
         <!--Custom Scripts-->
         <script src="<?=$baseURL;?>js/common.js"></script>
@@ -1181,7 +1181,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 
                     type: notifyType,
                     onClose: function () {
-                        $(".ns-box.ns-effect-thumbslider").fadeOut(400);
+                        $(".ns-box").fadeOut(400);
                     }
 
                 });

+ 2 - 2
js/notifications/notificationFx.js

@@ -92,9 +92,9 @@
 		// dismiss after [options.ttl]ms
 		var self = this;
 		this.dismissttl = setTimeout( function() {
-			if( self.active ) {
+			//if( self.active ) {
 				self.dismiss();
-			}
+			//}
 		}, this.options.ttl );
 
 		// init events

+ 3 - 0
settings.php

@@ -2943,6 +2943,9 @@ echo buildSettings(
             });
             $("textarea").niceScroll({
                 railpadding: {top:0,right:0,left:0,bottom:0}
+            });
+			 $(".iconpicker-items").niceScroll({
+                railpadding: {top:0,right:0,left:0,bottom:0}
             });
             //Stop Div behind From Scrolling
             $( '.email-content' ).on( 'mousewheel', function ( e ) {