Merge branch 'master' of https://git.1ka.si:/git/1ka

admin/survey/classes/class.SurveyStaticHtml.php

@@ -527,6 +527,7 @@ class SurveyStaticHtml
         // Radio status (vsi, ustrezni...)
         if ($analiza || in_array($podstran, array('data', 'export', 'charts', 'analysis_creport', 'analysis_links', 'para_graph', 'reminder_tracking', 'heatmap'))) {
             echo '<div id="dataOnlyValid" ' . $borderLeft . '>';
+            echo '<span class="dataOnlyValid_label">'.$lang['srv_data_valid_label'].':</span>';
             SurveyStatusProfiles::displayOnlyValidCheckbox();
             echo '</div>';
         }

admin/survey/classes/surveyData/class.SurveyDataDisplay.php

@@ -1132,8 +1132,8 @@ class SurveyDataDisplay{
 
 
 			// Checkboxa za urejanje in izpise podatkov ter razpiranje dodatnih nastavitev
-			echo '<div class="dataSettingsBasic">';    
+			echo '<div class="dataSettingsBasic">';   
-			echo '  <button id="toggleDataCheckboxes" class="small white-blue" onClick="toggleDataCheckboxes(\'data\');"><span class="faicon plus"></span>'.$lang['srv_displaydata_columns'].'</button>';
+			echo '  <button id="toggleDataCheckboxes" class="small white-blue '.(self::$displayEditIconsSettings ? 'active' : '').'" onClick="toggleDataCheckboxes(\'data\');"><span class="faicon plus"></span>'.$lang['srv_displaydata_columns'].'</button>';
 			echo '</div>';
 
 
@@ -1403,9 +1403,7 @@ class SurveyDataDisplay{
 		//self::$_SVP_PV = array_merge($_svp_pv, self::$_SVP_PV);
 
 		
-		#izpišemo tabelo
+		#izpišemo tabelo	
-		echo '<div style="padding-top:0px; height:5px;" class="clr">&nbsp;</div>';
-		
 		echo '<div id="tableContainer" class="tableContainer">';
 		
 		# div v katerem po potrebi prikazujemo gumbe za skrolanje levo in desno

admin/survey/script/script.js

@@ -4632,12 +4632,14 @@ function toggleDataCheckboxes(podstran){
 
 	if($('#dataSettingsCheckboxes').css('display') == 'none'){
 		$("#dataSettingsCheckboxes").fadeIn("medium");
+		$("#toggleDataCheckboxes").addClass("active");
 		var showSettings = 1;
-
+        
 		$(".dropdown_blue").switchClass("dropdown_blue", "dropup_blue");
 	}
 	else{
-		$("#dataSettingsCheckboxes").fadeOut("medium");
+        $("#dataSettingsCheckboxes").fadeOut("medium");
+        $("#toggleDataCheckboxes").removeClass("active");
 		var showSettings = 0;
 
 		$(".dropup_blue").switchClass("dropup_blue", "dropdown_blue");

lang/1.php

@@ -5717,6 +5717,7 @@ $lang = array (
 	"srv_statistic_menu"						=>	"Izberite: ",		
 	"srv_back_to_email"							=>	"Nazaj na objavo",		
 	"srv_data_valid_units_settings"				=>	"Nastavitve prikazov v analizah in podatkih",	
+	"srv_data_valid_label"						=>	"Prikaži enote",		
 	"srv_data_only_valid"						=>	"Samo ustrezni",		
 	"srv_data_valid_units"						=>	"Ustrezne",		
 	"srv_data_finished_units"					=>	"Končani",		

lang/2.php

@@ -5670,6 +5670,7 @@ $lang = array (
 	"srv_statistic_menu"						=>	"Select: ",		
 	"srv_back_to_email"							=>	"Back to Publication",	
 	"srv_data_valid_units_settings"				=>	"Display settings in analysis and data",
+    "srv_data_valid_label"						=>	"Show units",		
 	"srv_data_only_valid"						=>	"Only valid",		
 	"srv_data_valid_units"						=>	"Valid units",
 	"srv_data_finished_units"					=>	"Finished",

resources/sass/admin_new/components/header/navigation.scss

@@ -319,6 +319,13 @@ header{
                     font-size: 14px;
                     line-height: 18px;
                 }
+
+                .dataOnlyValid_label{
+                    display: none;
+                    margin-right: 16px;
+
+                    font-size: 14px;
+                }
             }
 
             // Podnavigacija analiz
@@ -463,6 +470,10 @@ header{
             &#analiza_right_options_holder {
                 position: relative;
                 
+                .faicon{
+                    cursor: pointer;
+                }
+
                 #analiza_right_options {
                     display: inline;
                 }

resources/sass/admin_new/pages/survey_data/data_table.scss

@@ -70,6 +70,13 @@
 
             tr{
 
+                &:hover{
+
+                    td{
+                        background-color: $medium-blue;
+                    }
+                }
+
                 td,
                 th{
                     box-sizing: border-box;
@@ -246,7 +253,34 @@
 // Fullscreen tabela
 body.data_fullscreen{
     
-    header, 
+    header{
+
+        #top_line,
+        #surveyNavigation,
+        #secondNavigation{
+            display: none;
+        }
+
+        #topSettingsHolder{
+            margin: 0 16px;
+            padding: 0;
+            width: auto;
+
+            .left_options_holder #dataOnlyValid{
+                padding: 0;
+                border-left: 0;
+
+                .dataOnlyValid_label{
+                    display: block;
+                }
+            }
+
+            #additional_navigation{
+                display: none;
+            }
+        }
+    }
+
     footer{
         display: none;
     }
@@ -255,10 +289,10 @@ body.data_fullscreen{
         overflow: hidden;
 
         position: fixed;
-        top: 0;
+        top: 44px;
         left: 0;
         width: 100%;
-        height: 100%;
+        height: calc(100% - 44px);
 
         box-sizing: border-box;
         padding: 16px;
@@ -274,7 +308,7 @@ body.data_fullscreen{
         
             #tableContainer{
                 overflow-x: auto;
-                max-height: calc(100vh - 100px);
+                max-height: calc(100vh - 144px);
             
                 // Puscice za scroll
                 #dataTableScroller{

resources/sass/admin_new/pages/survey_data/data_table_settings.scss

@@ -35,6 +35,7 @@
 
             &.active{
                 color: $blue;
+                background-color: $medium-blue;
                 border: 1px $blue solid;
             }
 
@@ -76,6 +77,7 @@
             font-weight: 400;
             color: $black;
 
+            border-color: $gray;
             border-radius: 2px;
 
             .faicon:before{
@@ -84,6 +86,10 @@
                 font-size: 12px;
                 color: $blue;
             }
+
+            &.active{
+                border-color: $blue;
+            }
         }
     }