Ver código fonte

edit css name for color picker

CauseFX 5 anos atrás
pai
commit
43f3a60440
4 arquivos alterados com 14 adições e 14 exclusões
  1. 8 8
      api/classes/organizr.class.php
  2. 1 1
      js/custom.js
  3. 0 0
      js/custom.min.js
  4. 5 5
      js/functions.js

+ 8 - 8
api/classes/organizr.class.php

@@ -1434,7 +1434,7 @@ class Organizr
 					'name' => 'headerColor',
 					'label' => 'Nav Bar Color',
 					'value' => $this->config['headerColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['headerColor'] . '"'
 				),
 				array(
@@ -1442,7 +1442,7 @@ class Organizr
 					'name' => 'headerTextColor',
 					'label' => 'Nav Bar Text Color',
 					'value' => $this->config['headerTextColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['headerTextColor'] . '"'
 				),
 				array(
@@ -1450,7 +1450,7 @@ class Organizr
 					'name' => 'sidebarColor',
 					'label' => 'Side Bar Color',
 					'value' => $this->config['sidebarColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['sidebarColor'] . '"'
 				),
 				array(
@@ -1458,7 +1458,7 @@ class Organizr
 					'name' => 'sidebarTextColor',
 					'label' => 'Side Bar Text Color',
 					'value' => $this->config['sidebarTextColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['sidebarTextColor'] . '"'
 				),
 				array(
@@ -1466,7 +1466,7 @@ class Organizr
 					'name' => 'accentColor',
 					'label' => 'Accent Color',
 					'value' => $this->config['accentColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['accentColor'] . '"'
 				),
 				array(
@@ -1474,7 +1474,7 @@ class Organizr
 					'name' => 'accentTextColor',
 					'label' => 'Accent Text Color',
 					'value' => $this->config['accentTextColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['accentTextColor'] . '"'
 				),
 				array(
@@ -1482,7 +1482,7 @@ class Organizr
 					'name' => 'buttonColor',
 					'label' => 'Button Color',
 					'value' => $this->config['buttonColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['buttonColor'] . '"'
 				),
 				array(
@@ -1490,7 +1490,7 @@ class Organizr
 					'name' => 'buttonTextColor',
 					'label' => 'Button Text Color',
 					'value' => $this->config['buttonTextColor'],
-					'class' => 'pick-a-color',
+					'class' => 'pick-a-color-custom-options',
 					'attr' => 'data-original="' . $this->config['buttonTextColor'] . '"'
 				),
 				array(

+ 1 - 1
js/custom.js

@@ -1074,7 +1074,7 @@ $(document).on("click", ".savecustomHTMLtwoTextarea", function () {
     $('.customHTMLtwoTextarea').val(customHTMLtwoEditor.getValue()).trigger('change');
 });
 
-$(document).on('focusout', 'input.pick-a-color', function(e) {
+$(document).on('focusout', 'input.pick-a-color-custom-options', function(e) {
     var original = $(this).attr('data-original');
     var newValue = $(this).val();
     if((original !== newValue) && (newValue !== '#987654') && newValue !== ''){

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
js/custom.min.js


+ 5 - 5
js/functions.js

@@ -669,14 +669,14 @@ function switchTab(tab, type, split = null){
 				newTab.addClass("show").removeClass('hidden');
                 setTabInfo(cleanClass(tab),'active',true);
 			}else{
-				$("#preloader").fadeIn();
+				//$("#preloader").fadeIn();
 				organizrConsole('Tab Function','Loading new tab for: '+tab);
 				$('#menu-'+tab+' a').children().addClass('tabLoaded');
 				newTab.addClass("show loaded").removeClass('hidden');
 				loadInternal(tabURL,cleanClass(tab), split);
                 setTabInfo(cleanClass(tab),'active',true);
                 setTabInfo(cleanClass(tab),'loaded',true);
-				$("#preloader").fadeOut();
+				//$("#preloader").fadeOut();
 			}
 			break;
 		case 1:
@@ -824,7 +824,7 @@ function reloadTab(tab, type){
 	$("#preloader").fadeOut();
 }
 function reloadCurrentTab(){
-	$("#preloader").fadeIn();
+	//$("#preloader").fadeIn();
 	organizrConsole('Tab Function','Reloading Current tab');
 	var iframe = $('.iFrame-listing').find('.show');
 	var internal = $('.internal-listing').find('.show');
@@ -864,7 +864,7 @@ function reloadCurrentTab(){
 		default:
 			console.error('Tab Function: Action not set');
 	}
-	$("#preloader").fadeOut();
+	//$("#preloader").fadeOut();
 }
 function loadNextTab(){
 	var next = $('#page-wrapper').find('.loaded').attr('data-name');
@@ -1966,7 +1966,7 @@ function buildCustomizeAppearance(){
             $('.javaThemeTextarea').val(javaThemeEditor.getValue());
             $('#customize-appearance-form-save').removeClass('hidden');
         });
-		$("input.pick-a-color").ColorPickerSliders({
+		$("input.pick-a-color-custom-options").ColorPickerSliders({
 			placement: 'bottom',
 			color: '#987654',
 			hsvpanel: true,

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff