[Redizajn 1KA] Popupi: Analize > Grafi > Nastavitve - Barve - v2

admin/survey/classes/surveyAnalysis/class.SurveyChart.php

@@ -10439,6 +10439,13 @@ class SurveyChart {
 		echo '<h2>'.$lang['srv_chart_skin_long'].'</h2>';
 		echo '<div class="popup_close"><a href="#" onClick="close_chartColor(); return false;">✕</a></div>';
 
+		// Opozorilo - privzetih ne morejo spreminjati
+		if(!is_numeric($skin)){
+			echo '<div id="chart_skin_note">';
+			echo $lang['srv_chart_skin_warning'];
+			echo '</div>'; 
+		}
+		
 		echo '<script type="text/javascript" charset="utf-8">
 			  $(document).ready(function() {
 				var f = $.farbtastic(\'#picker\');
@@ -10533,7 +10540,7 @@ class SurveyChart {
 			//$value = (self::$settings['colors'][$i] != '') ? self::$settings['colors'][$i] : $default_colors[$i];
 			$value = $default_colors[$i];
 			
-			echo '  <div class="form-item"><label for="'.$name.'">'.$lang['srv_color'].' '.($i+1).': </label><input type="text" id="'.$name.'" name="'.$name.'" class="colorwell" value="'.$value.'" /></div>';
+			echo '  <div class="form-item"><label for="'.$name.'">'.$lang['srv_color'].' '.($i+1).': </label><input onfocus="toggleGrafiColorWheel();" type="text" id="'.$name.'" name="'.$name.'" class="colorwell" value="'.$value.'" /></div>';
 		}
 		
 		// reset na default barvo
@@ -10544,23 +10551,17 @@ class SurveyChart {
 		echo '<div id="chart_settings_profiles_right">';
 		
 		// Izbira custom skina
+		echo '<div id="chart_custom_skin_cover">';
 		echo '<div id="chart_custom_skin">';
 		
 		echo '<div id="picker"></div>';	
 		
+		echo '</div>';
 		echo '</div>';
 				
 		echo '</div>'; #right
 		echo '</div>'; #wrap
 
-		// Opozorilo - privzetih ne morejo spreminjati
-		if(!is_numeric($skin)){
-			echo '<div id="chart_skin_note">';
-			echo $lang['srv_chart_skin_warning'];
-			echo '</div>'; 
-		}	
-
-		
 		// cover Div
         echo '<div id="dsp_cover_div"></div>';
 		
@@ -10616,7 +10617,7 @@ class SurveyChart {
 
 		echo '<div class="button_holder">';
         echo '<button class="medium white-black" onClick="close_chartColor(); return false;">'.$lang['srv_zapri'].'</button>';              
-        echo '<button class="medium white-blue" onClick="chart_skin_action(\'show_new\'); return false;">'.$lang['srv_save_new_profile'].'</button>';              
+        echo '<button class="medium white-blue" onClick="chart_skin_action(\'show_new\'); return false;">'.$lang['srv_save_new_selection'].'</button>';              
         echo '<button class="medium blue" onclick="save_chartColor(); return false;">'.$lang['save'].'</button>';
         echo '</div>';
 

admin/survey/script/script.js

@@ -5613,3 +5613,7 @@ function toggleAddComment (box_id) {
 	$(toggle).toggle();
 	$(wrapper).toggle();
 }
+
+function toggleGrafiColorWheel () {
+	$("#chart_custom_skin_cover").css("pointer-events", "auto");
+}

lang/1.php

@@ -3322,6 +3322,7 @@ $lang = array (
     "srv_new_profile_ime"			=>  "Nov profil",
 	"srv_create_new_profile"		=>	"Ustvari nov profil",
 	"srv_save_new_profile"			=>	"Shrani kot nov profil",
+	"srv_save_new_selection"			=>	"Shrani kot nov nabor",
 	"srv_rename_profile"			=>	"Preimenuj",
 	"srv_delete_profile"			=>	"Izbriši",
 	"srv_close_profile"				=>	"Zapri", #Prekliči

lang/2.php

@@ -3290,6 +3290,7 @@ $lang = array (
 	"srv_new_profile_name"			=>	"New profile",
 	"srv_choose_profile"          	=>  "Choose profile",
 	"srv_save_new_profile"			=>	"Save as a new profile",
+	"srv_save_new_selection"			=>	"Save as a new selection",
     "srv_new_profile_ime"			=>  "New profile",
 	"srv_create_new_profile"        =>  "Create new profile",
 	"srv_rename_profile"			=>	"Rename",

public/css/admin_new.css

@@ -29752,16 +29752,17 @@ ul.vrednost_sort input[type=text] {
   text-indent: 0px;
 }
 
+#chart_custom_skin_cover {
+  pointer-events: none;
+}
+
 #chart_settings_profiles_middle #div_chart_skin_previews {
   position: fixed;
-  top: 193px;
-  left: 90px;
+  top: 19.8%;
+  left: 7%;
   width: 200px;
   padding: 16px;
   background-color: white;
-  box-shadow: 0 0 20px black;
-  -moz-box-shadow: 0 0 20px black;
-  -webkit-box-shadow: 0 0 20px black;
 }
 #chart_settings_profiles_middle .div_chart_skin_preview {
   display: none;
@@ -31757,6 +31758,7 @@ input#endDate {
   border: 1px solid #E5E5E5;
   background-color: #F8F8F8;
   border-radius: 2px;
+  margin-bottom: 16px;
 }
 #div_chart_settings_profiles #chart_settings_profiles_wrap {
   display: flex;

resources/sass/admin_new/pages/survey_analysis/page_charts.scss

@@ -475,17 +475,19 @@ ul.vrednost_sort {
 	text-indent: 0px;
 }
 
+
+#chart_custom_skin_cover {
+    pointer-events: none;
+}
+
 #chart_settings_profiles_middle {
     #div_chart_skin_previews {
 		position: fixed;
-		top: 193px;
-		left: 90px;
+		top: 19.8%;
+		left: 7%;
 		width: 200px;
 		padding: 16px;
 		background-color: white;
-		box-shadow: 0 0 20px black;
-		-moz-box-shadow: 0 0 20px black;
-		-webkit-box-shadow: 0 0 20px black;
 	}
 	.div_chart_skin_preview {
 		display: none;

resources/sass/admin_new/pages/survey_analysis/popups/chart.scss

@@ -27,6 +27,7 @@
 		border: 1px solid $gray;
 		background-color: $light-gray;
 		border-radius: 2px;
+		margin-bottom: 16px;
 	}
 
 	#chart_settings_profiles_wrap {