Merge pull request #615 from causefx/cero-dev

more edits on settings and index

functions.php

@@ -4504,7 +4504,7 @@ function buildMenu($array){
 			}
 			$result .= '
 			<button id="'.$v['id'].'" box="'.$v['box'].'" type="button" style="border-radius: 0px !important; -webkit-border-radius: 0px !important;margin-bottom: 3px;margin-left:5px;color:white;" class="btn '.$v['color2'].' btn-icon waves waves-circle waves-effect waves-float settingsMenu">
-				<i class="fa fa-'.$v['icon_2'].' fa-fw pull-left" style="padding-left: '.$v['padding'].'px;font-size: 25px"></i>
+				<i class="mdi mdi-'.$v['icon_1'].' fa-fw pull-left" style="padding-left: '.$v['padding'].'px;font-size: 30px"></i>
 				<p class="" style="text-align: center;direction: rtl;display:none;margin: 2px;"><strong>'.$v['name'].'</strong></p>
 			</button>
 			';

index.php

@@ -810,77 +810,6 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 			</div>
 			<!--End Content-->
 
-			<!--Welcome notification-->
-			<div id="welcome"></div>
-			<!-- OLD USER INFO 
-			<div id="members-sidebar" style="background: <?=$sidebar;?>;" class="members-sidebar fade in">
-				<h4 class="pull-left zero-m"><?php echo $language->translate("OPTIONS");?></h4>
-				<span class="close-members-sidebar"><i class="fa fa-remove fa-lg pull-right"></i></span>
-				<div class="clearfix"><br/></div>
-				<?php if($configReady == "Yes") : if($USER->authenticated) : ?>
-				<br>
-				<div class="content-box profile-sidebar box-shadow">
-					<?php if(GRAVATAR == "true") : ?>
-					<img src="https://www.gravatar.com/avatar/<?=$userpic;?>?s=100&d=mm" class="img-responsive img-circle center-block" alt="user">
-					<?php endif; ?>
-					<div class="profile-usertitle">
-						<div class="profile-usertitle-name">
-							<?php echo strtoupper($USER->username); ?>
-						</div>
-						<div class="profile-usertitle-job">
-							<?php echo strtoupper($USER->role); ?>
-						</div>
-					</div>
-					<div id="buttonsDiv" class="profile-userbuttons">
-						<button id="editInfo" type="button" class="btn btn-primary text-uppercase waves waves-effect waves-float"><?php echo $language->translate("EDIT_INFO");?></button>
-						<button type="button" class="logout btn btn-warning waves waves-effect waves-float"><?php echo $language->translate("LOGOUT");?></button>
-					</div>
-					<div id="editInfoDiv" style="display: none" class="profile-usertitle">
-						<form class="content-form form-inline" name="update" id="update" action="" method="POST">
-
-							<input type="hidden" name="op" value="update"/>
-							<input type="hidden" name="sha1" value=""/>
-							<input type="hidden" name="password" value="">
-							<input type="hidden" name="username" value="<?php echo $USER->username; ?>"/>
-							<input type="hidden" name="role" value="<?php echo $USER->role; ?>"/>
-
-							<div class="form-group">
-
-								<input autocomplete="off" type="text" value="<?php echo $USER->email; ?>" class="form-control" name="email" placeholder="<?php echo $language->translate("EMAIL_ADDRESS");?>">
-
-							</div>
-
-							<div class="form-group">
-
-								<input autocomplete="off" type="password" class="form-control" name="password1" placeholder="<?php echo $language->translate("PASSWORD");?>">
-
-							</div>
-
-							<div class="form-group">
-
-								<input autocomplete="off" type="password" class="form-control" name="password2" placeholder="<?php echo $language->translate("PASSWORD_AGAIN");?>">
-
-							</div>
-
-							<br>
-
-							<div class="form-group">
-
-								<input type="button" class="btn btn-success text-uppercase waves-effect waves-float" value="<?php echo $language->translate("UPDATE");?>" onclick="User.processUpdate()"/>
-								<button id="goBackButtons" type="button" class="btn btn-primary text-uppercase waves waves-effect waves-float"><?php echo $language->translate("GO_BACK");?></button>
-
-							</div>
-
-						</form>
-
-					</div>
-				</div>
-
-				<?php endif; endif;?>
-
-			</div>
-			END OLD USER INFO --> 
-
 		</div>
 		<?php if($configReady == "Yes") : if(!$USER->authenticated && $configReady == "Yes") : ?>
 		<div id="loginModal" class="login-modal modal fade">
@@ -1166,13 +1095,12 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 		</div>
 		<?php } ?>
 		<!-- CHAT BOX -->
-		<?php if(CHAT == "true" && qualifyUser(CHATAUTH)){?>
+		<?php if(CHAT == "true" && qualifyUser(CHATAUTH) && $dbcreated){?>
 		<div id="main-chat" class="email-content chat-box white-bg" style="z-index:1000000">
 			<div class="email-body">
 				<div class="email-inner small-box" style="padding: 0">
 					<div class="email-inner-section" style="margin-top: 0;">
 						<div class="small-box fade in" style="padding: 0">											
-							<?php if( $dbcreated ){ ?>
 							<div class="main-wrapper" style="position: initial; left:0;">
 								<div id="content">
 									<div class="btn-group btn-group-justified grayish-blue-bg">
@@ -1189,7 +1117,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 
 									<div id="chat-chat-div" class="">
 										<div class="big-box chat gray-bg">
-											<div class="box" style="overflow: hidden; width: auto; height: calc(100vh - <?php echo $chatSize; ?>) !important;">
+											<div class="box" style="overflow: hidden; width: auto; height: calc(100vh - <?php echo $chatSize; ?>)">
 												<div id="intro">
 													<center><img class="logo" alt="logo" src="images/organizr-logo-h.png" style="width: 100%;">
 													<br><br>start chatting...</center>
@@ -1219,7 +1147,6 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 									</div>
 								</div>
 							</div>		
-							<?php } ?>
 						</div>
 					</div>
 				</div>
@@ -1262,7 +1189,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 									</div>
 									<!--EDIT USER -->
 									<div id="user-menu-div" class="col-lg-12 gray-bg" style="display: block;">
-										<div class="gray-bg"  style="overflow: hidden; width: auto; height: calc(100vh - 62px) !important;">
+										<div class="gray-bg"  style="overflow: hidden; width: auto; height: calc(100vh - 62px)">
 											<br>
 											<div class="content-box">
 
@@ -1326,29 +1253,6 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 												</div>
 											</div>
 											<?php } ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-												
-											
 										</div>
 									</div>
 									<!-- END EDIT USER -->
@@ -1373,11 +1277,6 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 			</div>
 		</div>
 		<?php } ?>
-		<script>
-			var d = new Date();
-			var timezone = d.getTimezoneOffset();
-			console.log(timezone)
-		</script>
 
 		<!--Scripts-->
 		<script src="<?=$baseURL;?>bower_components/jquery/dist/jquery.min.js"></script>
@@ -1578,6 +1477,9 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 		//Members Sidebar
 		$(".show-members").click(function(e){
 			$('#main-user').toggleClass('email-active');
+			if($('#main-chat').hasClass('email-active')){
+				$('#main-chat').toggleClass('email-active');
+			}
 			e.preventDefault();
 		});
 
@@ -1810,6 +1712,9 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 			if($('.chat-box').hasClass('email-active')){
 				$("#message").focus();
 			}
+			if($('#main-user').hasClass('email-active')){
+				$('#main-user').toggleClass('email-active');
+			}
 		});
 
 		$('#chat-switch-chat').on('click tap', function(){

settings.php

@@ -189,16 +189,21 @@ if(SLIMBAR == "true") {
 			button.settingsMenu:hover {
 				width: 250px !important;
 				z-index: 10000;
-				color: black !important;
+				opacity: 1 !important;
 			}
 			button.settingsMenu:hover p{
 				display: block !important;
 				-webkit-animation: fadeIn 1s;
 				animation: fadeIn 1s;
+				opacity: 1 !important;
 			}
 			button.settingsMenuActive {
 				margin-left: 0px !important;
 				color: black !important;
+				opacity: 1 !important;
+			}
+			button.settingsMenuInactive {
+				opacity: .5;
 			}
             .loop-animation {
                 animation-iteration-count: infinite;
@@ -391,89 +396,89 @@ $buildMenu = array(
 		'id' => 'open-tabs',
 		'box' => 'tab-box',
 		'name' => 'Edit Tabs',
-		'icon_1' => 'circle',
+		'icon_1' => 'view-list',
 		'icon_2' => 'th-list',
 		'color' => 'red-orange',
 		'color2' => 'palette-Red-A700 bg',
-		'padding' => '8',
+		'padding' => '2',
 	),
 	array(
 		'id' => 'open-colors',
 		'box' => 'color-box',
 		'name' => 'Edit Colors',
-		'icon_1' => 'circle',
+		'icon_1' => 'format-paint',
 		'icon_2' => 'paint-brush',
 		'color' => 'red',
 		'color2' => 'palette-Indigo-A700 bg',
-		'padding' => '8',
+		'padding' => '2',
 	),
 	array(
 		'id' => 'open-users',
 		'box' => 'users-box',
 		'name' => 'Manage Users',
-		'icon_1' => 'circle',
+		'icon_1' => 'account-multiple',
 		'icon_2' => 'user',
 		'color' => 'green',
 		'color2' => 'palette-Blue-Grey-700 bg',
-		'padding' => '9',
+		'padding' => '2',
 	),
 	array(
 		'id' => 'open-logs',
 		'box' => 'logs-box',
 		'name' => 'View Logs',
-		'icon_1' => 'circle',
+		'icon_1' => 'file-document-box',
 		'icon_2' => 'list-alt',
 		'color' => 'blue',
-		'color2' => 'palette-Light-Blue-A700 bg',
-		'padding' => '8',
+		'color2' => 'palette-Teal-A700 bg',
+		'padding' => '2',
 	),
 	array(
 		'id' => 'open-homepage',
 		'box' => 'homepage-box',
 		'name' => 'Edit Homepage',
-		'icon_1' => 'circle',
+		'icon_1' => 'television-guide',
 		'icon_2' => 'home',
 		'color' => 'yellow',
-		'color2' => 'palette-Yellow-A700 bg',
-		'padding' => '9',
+		'color2' => 'palette-Deep-Orange-A400 bg',
+		'padding' => '2',
 	),
 	array(
 		'id' => 'open-invites',
 		'box' => 'invites-box',
 		'name' => 'Plex Invites',
-		'icon_1' => 'circle',
+		'icon_1' => 'account-multiple-plus',
 		'icon_2' => 'user-plus',
 		'color' => 'light-blue',
 		'color2' => 'palette-Amber-A700 bg',
-		'padding' => '7',
+		'padding' => '2',
 	),
 	array(
 		'id' => 'open-advanced',
 		'box' => 'advanced-box',
 		'name' => 'Advanced',
-		'icon_1' => 'circle',
+		'icon_1' => 'settings',
 		'icon_2' => 'cog',
 		'color' => 'gray',
-		'color2' => 'light-blue-bg',
-		'padding' => '8',
+		'color2' => 'palette-Grey-600 bg',
+		'padding' => '2',
 	),array(
 		'id' => 'open-info',
 		'box' => 'info-box',
 		'name' => 'About',
-		'icon_1' => 'circle',
+		'icon_1' => 'information',
 		'icon_2' => 'info-circle',
 		'color' => 'orange',
-		'color2' => 'palette-Blue-A700 bg',
-		'padding' => '8',
+		'color2' => 'palette-Light-Blue-A700 bg',
+		'padding' => '2',
 	),array(
 		'id' => 'open-donate',
 		'box' => 'donate-box',
 		'name' => 'Donate',
-		'icon_1' => 'square',
+		'icon_1' => 'cash-usd',
 		'icon_2' => 'money',
 		'color' => 'red',
 		'color2' => 'palette-Green-A700 bg',
-		'padding' => '7',
+		'padding' => '2',
 	),
 );
 if($userDevice !== "phone"){ echo "<br><br><br>".buildMenu($buildMenu); }else{ echo buildMenuPhone($buildMenu); }
@@ -2741,8 +2746,10 @@ echo buildSettings(
 		<script>
 			<?php echo speedTestDisplay(speedTestData(),"graph");?>
 			$(".settingsMenu").click(function() {
-                $(".settingsMenu").removeClass("settingsMenuActive");
-                $(this).addClass("settingsMenuActive");
+				$(".settingsMenu").removeClass("settingsMenuActive");
+				$(this).addClass("settingsMenuActive");
+				$(".settingsMenu").addClass("settingsMenuInactive");
+				$(this).removeClass("settingsMenuInactive");
 			})
 			$(".special").click(function() {
                 swal({
@@ -3327,8 +3334,9 @@ echo buildSettings(
             $(".email-header .close-button").click(function () {
 				$(".email-content").removeClass("email-active");
 				$(".settingsMenu").removeClass("settingsMenuActive");
+				$(".settingsMenu").removeClass("settingsMenuInactive");
                 $('html').removeClass("overhid");
-                $("#settings-list").find("li").removeClass("active");
+				$("#settings-list").find("li").removeClass("active");
             });
              $(document).mouseup(function (e)
 {
@@ -3345,9 +3353,11 @@ echo buildSettings(
                     var container = $(".email-content");
 
                     if (!container.is(e.target) && container.has(e.target).length === 0) {
-                        $(".email-content").removeClass("email-active");
-                        $('html').removeClass("overhid");
-                        $("#settings-list").find("li").removeClass("active");
+						$(".email-content").removeClass("email-active");
+						$(".settingsMenu").removeClass("settingsMenuActive");
+						$(".settingsMenu").removeClass("settingsMenuInactive");
+						$('html').removeClass("overhid");
+						$("#settings-list").find("li").removeClass("active");
                     }
                 }
             });