Merge pull request #467 from causefx/develop

Develop

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 {

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") {

index.php

@@ -891,7 +891,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
             </div>
 
         </div>
-        <?php if($configReady == "Yes") : if(!$USER->authenticated && $configReady == "Yes") : if(!$inviteCode) : ?>
+        <?php if($configReady == "Yes") : if(!$USER->authenticated && $configReady == "Yes") : ?>
         <div class="login-modal modal fade">
             <div style="background:<?=$sidebar;?>;" class="table-wrapper">
                 <div class="table-row">
@@ -1009,7 +1009,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
                 </div>
             </div>
         </div>
-        <?php endif; endif; endif;?>
+        <?php endif; endif; ?>
         <?php if($configReady == "Yes") : if($USER->authenticated) : ?>
         <div style="background:<?=$topbar;?>;" class="logout-modal modal fade">
             <div class="table-wrapper" style="background: <?=$sidebar;?>">
@@ -1078,6 +1078,16 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 										<h4 id="accountMade" style="display: none" class="text-center">
 											<span class="label label-primary"><?php echo $language->translate("ACCOUNT_MADE");?></span>
 										</h4>
+										<div id="accountSubmitted" style="display: none" class="panel panel-success">
+											<div class="panel-heading">
+												<h3 class="panel-title"><?php echo explosion($language->translate('ACCOUNT_SUBMITTED'), 0);?></h3>
+											</div>
+											<div class="panel-body">
+												<?php echo explosion($language->translate('ACCOUNT_SUBMITTED'), 1);?><br/>
+												<?php echo explosion($language->translate('ACCOUNT_SUBMITTED'), 2);?><br/>
+												<?php echo explosion($language->translate('ACCOUNT_SUBMITTED'), 3);?>
+											</div>
+										</div>
 										<div class="form-group">
 											<input style="font-size: 400%; height: 100%" type="hidden" class="form-control yellow-bg text-center text-uppercase" name="inviteCode" placeholder="<?php echo $language->translate("CODE");?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" value="<?=$inviteCode;?>" maxlength="6" required>
 											<input type="text" class="form-control material" name="inviteUser" placeholder="<?php echo $language->translate("USERNAME_EMAIL");?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" value="" autofocus required>
@@ -1132,7 +1142,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 +1191,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);
                     }
 
                 });
@@ -1326,6 +1336,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 					if(result === true){
 						//$('#checkInviteForm').hide();
 						//$('#chooseMethod').show();
+						$('#accountSubmitted').show();
 						console.log(result);
 					}
 				});

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

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 ) {