more customize appearance work

add update message after update

api/config/default.php

@@ -2,6 +2,8 @@
 return array(
     'branch' => 'v2-develop',
     'logo' => 'plugins\images\organizr\logo-wide.png',
-    'title' => 'Organizr',
-    'useLogo' => false
+    'title' => 'Organizr V2',
+    'useLogo' => false,
+    'headerColor' => '',
+    'headerTextColor' => ''
 );

api/functions/api-functions.php

@@ -827,45 +827,6 @@ function createUser($username,$password,$defaults,$email=null) {
         return false;
     }
 }
-function getCustomizeAppearance(){
-    if(file_exists('config'.DIRECTORY_SEPARATOR.'config.php')){
-        return array(
-            'config' => array(/*
-                array(
-                    'type' => 'select',
-                    'name' => 'branch',
-                    'label' => 'Organizr Branch',
-                    'value' => $GLOBALS['branch'],
-                    'options' => array(
-                        'Master' => 'v2-master',
-                        'Develop' => 'v2-develop'
-                    )
-                ),*/
-                array(
-                    'type' => 'input',
-                    'name' => 'logo',
-                    'label' => 'Logo',
-                    'value' => $GLOBALS['logo']
-                ),
-                array(
-                    'type' => 'input',
-                    'name' => 'title',
-                    'label' => 'Title',
-                    'value' => $GLOBALS['title']
-                ),
-                array(
-                    'type' => 'switch',
-                    'name' => 'useLogo',
-                    'label' => 'Use Logo instead of Title',
-                    'value' => $GLOBALS['useLogo']
-                )
-            ),
-            'database' => array(
-
-            )
-        );
-    }
-}
 function allTabs(){
     if(file_exists('config'.DIRECTORY_SEPARATOR.'config.php')){
         try {

api/functions/organizr-functions.php

@@ -140,9 +140,56 @@ function loadAppearance(){
     $appearance = array();
     $appearance['logo'] = $GLOBALS['logo'];
     $appearance['title'] = $GLOBALS['title'];
-    $appearance['useLogo'] = $GLOBALS['useLogo'];
+	$appearance['useLogo'] = $GLOBALS['useLogo'];
+    $appearance['headerColor'] = $GLOBALS['headerColor'];
     return $appearance;
 }
+function getCustomizeAppearance(){
+    if(file_exists('config'.DIRECTORY_SEPARATOR.'config.php')){
+        return array(
+            'config' => array(/*
+                array(
+                    'type' => 'select',
+                    'name' => 'branch',
+                    'label' => 'Organizr Branch',
+                    'value' => $GLOBALS['branch'],
+                    'options' => array(
+                        'Master' => 'v2-master',
+                        'Develop' => 'v2-develop'
+                    )
+                ),*/
+                array(
+                    'type' => 'input',
+                    'name' => 'logo',
+                    'label' => 'Logo',
+                    'value' => $GLOBALS['logo']
+                ),
+                array(
+                    'type' => 'input',
+                    'name' => 'title',
+                    'label' => 'Title',
+                    'value' => $GLOBALS['title']
+                ),
+                array(
+                    'type' => 'switch',
+                    'name' => 'useLogo',
+                    'label' => 'Use Logo instead of Title',
+                    'value' => $GLOBALS['useLogo']
+                ),
+                array(
+                    'type' => 'input',
+                    'name' => 'headerColor',
+                    'label' => 'Nav Bar Color',
+                    'value' => $GLOBALS['headerColor'],
+                    'class' => 'colorpicker'
+                )
+            ),
+            'database' => array(
+
+            )
+        );
+    }
+}
 function auth(){
     $debug = false; // CAREFUL WHEN SETTING TO TRUE AS THIS OPENS AUTH UP
     $ban = isset($_GET['ban']) ? strtoupper($_GET['ban']) : "";

api/pages/settings-customize-appearance.php

@@ -7,7 +7,7 @@ $pageSettingsCustomizeAppearance = '
 			console.log("changed");
 		}
 	});
-buildCustomizeAppearance();
+	buildCustomizeAppearance();
 </script>
 <div class="panel bg-theme-dark panel-info">
     <div class="panel-heading">

css/colors/blue-dark.css

@@ -377,6 +377,20 @@ body.stop-scrolling {
 .sweet-alert button.cancel:hover {
   background-color: #3a7b98;
 }
+.asColorPicker-wrap {
+    position: relative;
+    display: block;
+    width: calc(100% - 35px);
+}
+.asColorPicker-dropdown {
+  display: none;
+}
+.top-left-part {
+    width: auto;
+    max-width: 220px;
+    float: left;
+    border-right: transparent;
+}
 .table-hover>tbody>tr:hover, .table-striped>tbody>tr:nth-of-type(odd), .table>tbody>tr.active>td, .table>tbody>tr.active>th, .table>tbody>tr>td.active, .table>tbody>tr>th.active, .table>tfoot>tr.active>td, .table>tfoot>tr.active>th, .table>tfoot>tr>td.active, .table>tfoot>tr>th.active, .table>thead>tr.active>td, .table>thead>tr.active>th, .table>thead>tr>td.active, .table>thead>tr>th.active {
   background-color: #1f1f1f!important;
 }

index.php

@@ -19,6 +19,7 @@
 	<link href="plugins/bower_components/Magnific-Popup-master/dist/magnific-popup.css" rel="stylesheet">
 	<link href="plugins/bower_components/sweetalert/sweetalert.css" rel="stylesheet" type="text/css">
 	<link href="plugins/bower_components/switchery/dist/switchery.min.css" rel="stylesheet" />
+	<link href="plugins/bower_components/jquery-asColorPicker-master/css/asColorPicker.css" rel="stylesheet">
 	<link href="css/style.css?v=<?php echo $GLOBALS['installedVersion']; ?>" rel="stylesheet">
 	<link href="css/colors/blue-dark.css?v=<?php echo $GLOBALS['installedVersion']; ?>" id="theme" rel="stylesheet">
 	<!--[if lt IE 9]>
@@ -117,6 +118,8 @@
 	<script src="plugins/bower_components/Magnific-Popup-master/dist/jquery.magnific-popup.min.js"></script>
 	<script src="plugins/bower_components/sweetalert/sweetalert.min.js"></script>
 	<script src="plugins/bower_components/switchery/dist/switchery.min.js"></script>
+	<script src="plugins/bower_components/jquery-asColorPicker-master/libs/jquery-asColor.js"></script>
+    <script src="plugins/bower_components/jquery-asColorPicker-master/dist/jquery-asColorPicker.min.js"></script>
 	<script src="js/functions.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
 	<script src="js/custom.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
 </body>

js/custom.js

@@ -72,6 +72,9 @@ function pageLoad(){
         $("#preloader").fadeOut();
         $('#side-menu').metisMenu();
     });
+    $(".colorpicker").asColorPicker({
+        mode: 'palettes'
+    });
 
 
     /* ===== Theme Settings ===== */
@@ -190,7 +193,6 @@ function pageLoad(){
         size: "0px",
         color: '#dcdcdc'
     });
-
     /* ===== Resize all elements ===== */
 
 
@@ -954,7 +956,7 @@ $(document).on("click", ".changeDefaultCategory", function () {
     settingsAPI(post,callbacks);
 });
 // CHANGE CUSTOMIZE Options
-$(document).on('change', '#customize-appearance-form :input', function(e) {
+$(document).on('change asColorPicker::change', '#customize-appearance-form :input', function(e) {
 	$(this).attr('data-changed', true);
     switch ($(this).attr('type')) {
         case 'switch':

js/functions.js

@@ -775,7 +775,7 @@ function buildLogin(){
 	organizrConnect('api/?v1/login_page').success(function(data) {
 		var json = JSON.parse(data);
 		console.log("Organizr Function: Opening Login Page");
-		$(json.data).appendTo($('.login-area'));
+		$('.login-area').html(json.data);
 	}).fail(function(xhr) {
 		console.error("Organizr Function: Login Connection Failed");
 	});
@@ -1146,6 +1146,7 @@ function updateUpdateBar(title,percent,update=false){
 }
 function countdown(remaining) {
     if(remaining === 0){
+		local('set','message','Organizr Update|Update Successful|update');
         location.reload();
 	}
 	$('#update-seconds').text(remaining);
@@ -1416,7 +1417,7 @@ function radioLoop(element){
 	$('[type=radio][id!="'+element.id+'"]').each(function() { this.checked=false });
 }
 function loadAppearance(appearance){
-	console.log(appearance);
+	//console.log(appearance);
 	if(appearance.useLogo === false){
 		$('#main-logo').html(appearance.title);
 		$('#side-logo').html(appearance.title);
@@ -1424,13 +1425,23 @@ function loadAppearance(appearance){
 		$('#main-logo').html('<img alt="home" class="dark-logo" height="60px" src="'+appearance.logo+'">');
 		$('#side-logo').html('<img alt="home" height="35px" src="'+appearance.logo+'">');
 	}
-	$('.navbar-header').css("background", "#1f1f1f");
+	if(appearance.headerColor !== ''){
+		$('.navbar-header').css("background", appearance.headerColor);
+	}
 }
 function clearForm(form){
 	$(form+" input[type=text]", form+" input[type=password]").each(function() {
         $(this).val('');
     })
 }
+function checkMessage(){
+	var check = (local('get','message')) ? local('get','message') : false;
+	if(check){
+		local('remove', 'message');
+		var message = check.split('|');
+		messageSingle(window.lang.translate(message[0]),window.lang.translate(message[1]),'bottom-right','#FFF',message[2],'10000');
+	}
+}
 function launch(){
 	organizrConnect('api/?v1/launch_organizr').success(function (data) {
 		var json = JSON.parse(data);
@@ -1472,4 +1483,5 @@ function launch(){
 				console.error('Organizr Function: Action not set or defined');
 		}
 	});
+	checkMessage();
 }