[Redizajn 1ka] - Popravki

admin/survey/SurveyAdminAjax.php

@@ -6808,6 +6808,7 @@ class SurveyAdminAjax {
 				break;
 
 			case 'settings': // še v delu 
+				$d = new Dostop();
 
 				echo '<h2><span class="faicon wheel_32 blue"></span>'.$lang['srv_publication_survey_settings'].'</h2>';
 				
@@ -7173,7 +7174,7 @@ class SurveyAdminAjax {
 		}
 		else {
 			echo '<button class="medium white-blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';				
-			echo '<button class="medium blue" onclick="CopyToClipboard(\'copy_link_v_delu_@TG\'); actionNotePopup(\'link_copied\', \'success\'); popupClose(); return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+			echo '<button class="medium blue" onclick="CopyToClipboard(\''.$code.'\'); actionNotePopup(\'link_copied\', \'success\'); popupClose(); return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
 		}
 		echo '</div>';
 	}

admin/survey/classes/class.SurveyAktivnost.php

@@ -166,7 +166,6 @@ class SurveyAktivnost{
 		echo '  </div>';
 		echo '</div>'; //div#dataSettingsCheckboxes
 
-
 		// Datum
 		echo '<div id="end">';    
 		echo '<div class="dataSettingsBasic">';    
@@ -231,6 +230,21 @@ class SurveyAktivnost{
 		echo '</div>';
 		echo '</div>'; //div#dataSettingsCheckboxes_Date
 
+		// Klik izven razprith nastavitev - zapremo okno
+        echo '<script>
+            $(document).mouseup(function(e){
+                var container1 = $("#dataSettingsCheckboxes");
+                var container2 = $("#dataSettingsCheckboxes_Date");
+            
+                if (!container1.is(e.target) && container1.has(e.target).length === 0){
+                    $("#dataSettingsCheckboxes").addClass("displayNone");
+                }
+				if (!container2.is(e.target) && container2.has(e.target).length === 0){
+                    $("#dataSettingsCheckboxes_Date").addClass("displayNone");
+                }
+            });
+        </script>';
+
 
 		echo '</div>'; // div.data_table_top_holder
 

resources/fonts/FontAwesome5/scss/solid.scss

@@ -16,25 +16,8 @@
   url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
 }
 
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-style: normal;
-  font-weight: 400;
-  src: url('#{$fa-font-path}/fa-brands-400.eot');
-  src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
-  url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
-}
-
 .fa,
 .fas {
   font-family: 'Font Awesome 5 Free';
   font-weight: 900;
-}
+}
-
-.fa-brands {
-  font-family: 'Font Awesome 5 Brands';
-  font-weight: 400;
-}

resources/sass/admin_new/basic/font.scss

@@ -13,6 +13,11 @@ body {
 	font-family: $font_family;
 }
 
+.fa-brands {
+	font-family: 'Font Awesome 5 Brands';
+  	font-weight: 400;
+}
+
 //font-weight
 $light: 300;
 $regular: 400;

resources/sass/admin_new/pages/aktivnost/weekyearmonth.scss

@@ -30,9 +30,13 @@ div.page_diagnostics {
     $background_color_130: #8064a2;
     $background_color_131: #4f81bd;
 
+    .time_span.year_2023 {
+        background-color: $background_color_127;
+    }
     .time_span.year_2022 {
         background-color: $background_color_128;
-    }.time_span.year_2021 {
+    }
+    .time_span.year_2021 {
         background-color: $background_color_129;
     }
     .time_span.year_2020 {