From a7be11f375ba6728e39b2d5e57e167083cdd75f9 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 6 May 2022 00:15:13 +0200
Subject: [PATCH] [Redizajn 1KA] Popupi: Analize  - Filtri > Zoom

---
 admin/survey/SurveyAdmin.php                  |  2 +-
 admin/survey/classes/class.SurveyInpect.php   | 54 ++++++++++---------
 lang/1.php                                    |  2 +-
 lang/2.php                                    |  2 +-
 public/css/admin_new.css                      |  5 ++
 .../components/popup/page_specific.scss       | 17 +++++-
 6 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 71d9b805d..3ac874d1b 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -463,7 +463,7 @@ class SurveyAdmin
         echo '<div id="zoom_div" class="divPopUp"></div>';
 
         # skrit div za izbor profilov nastavitev
-        echo '<div id="inspect_div" class="divPopUp"></div>';
+        echo '<div id="inspect_div" class="divPopUp PopUpNarrow"></div>';
 
         # skrit div za izbor profilov zank
         echo '<div id="div_zanka_profiles" class="divPopUp"></div>';
diff --git a/admin/survey/classes/class.SurveyInpect.php b/admin/survey/classes/class.SurveyInpect.php
index ffc86a6b2..7416a2117 100644
--- a/admin/survey/classes/class.SurveyInpect.php
+++ b/admin/survey/classes/class.SurveyInpect.php
@@ -552,40 +552,46 @@ class SurveyInspect {
         
 
 		# Nastavitve za Inspect
-        echo '<div class="setting_line">';
+        echo '<p class="bottom16">';
 		echo    $lang['srv_inspect_setting_link'];
-        echo '</div>';
+        echo '</p>';
         
+		echo '<div class="setting_holder">';
+		echo '<p class="setting_title">'.$lang['srv_inspect_setting_enabled'].'</p>';
 
-        echo '<div class="setting_line">';
+		echo '<div class="horizontal">';
 
-		echo '  <label>'.$lang['srv_inspect_setting_enabled'].'</label>';
-		
-        echo '  <input id="enableInspect0" name="enableInspect" type="radio" value="0" '.(($this->enableInspect == false) ? ' checked="checked" ' : '').' autocomplete="off">';
+		echo '<div class="setting_item">';
+		echo '  <input id="enableInspect0" name="enableInspect" type="radio" value="0" '.(($this->enableInspect == false) ? ' checked="checked" ' : '').' autocomplete="off">';
 		echo '  <label for="enableInspect0">'.$lang['no'].'</label>';
-        
+		echo '</div>';
+		echo '<div class="setting_item">';
 		echo '  <input id="enableInspect1" name="enableInspect" type="radio" value="1" '.(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off">';
 		echo '  <label for="enableInspect1">'.$lang['yes'].' '.Help :: display('srv_crosstab_inspect').'</label>';
-        
-        echo '</div>';
-
-
-		echo '<div class="setting_line">';
-
-		echo '  <label>'.$lang['srv_inspect_goto_note'].'</label>';
-
-        echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
-		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label>';
-
-        echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
-		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label>';
-		
-        echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
-        echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
-
+		echo '</div>';
+					
+		echo '</div>';
 		echo '</div>';
 
 
+		echo '<div class="setting_holder">';
+		echo '<p class="setting_title">'.$lang['srv_inspect_goto_note'].'</p>';
+
+		echo '<div class="setting_item">';
+		echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+		echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label>';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '  <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
+        echo '  <label>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
+		echo '</div>';
+					
+		echo '</div>';
+        
 		echo '<div id="inspectListDiv" class="settings_block" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
 		echo '  <div class="setting_line">';
 		echo        $lang['srv_inspect_setting_show_variables'];
diff --git a/lang/1.php b/lang/1.php
index 1b810e4d7..a3842dcf9 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5467,7 +5467,7 @@ $lang = array (
 	"srv_replace"								=> 'Zamenjaj',
 	"srv_inspect_setting"						=> 'Zoom',
 	"srv_inspect_setting_enabled"				=> '"Zoom" je omogočen:',
-	"srv_inspect_setting_link"					=> 'Preberite več o funkcionalnosti "Zoom" <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/zoom?from1ka=1" target="_blank"><span class="bold">tukaj</span></a>',
+	"srv_inspect_setting_link"					=> 'Preberite več o funkcionalnosti "Zoom" <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/zoom?from1ka=1" target="_blank">tukaj.</a>',
 	"srv_inspect_setting_show_variables"		=> 'Pri pregledovanju prikaži dodatne spremenljivke:',
 	"srv_inspect_goto_note"						=> '"Zoom" kaže na:',
 	"srv_inspect_goto_0"						=> 'Obstoječe analize',
diff --git a/lang/2.php b/lang/2.php
index 60ac11470..24b94215d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5427,7 +5427,7 @@ $lang = array (
 	"srv_replace"								=> 'Replace',
 	"srv_inspect_setting"						=> 'Zoom',
 	"srv_inspect_setting_enabled"				=> '"Zoom" is enabled:',
-	"srv_inspect_setting_link"					=> 'For more information on "Zoom" functionality click <a href="https://www.1ka.si/d/en/help/manuals/zoom" target="_blank"><span class="bold">here</span></a>',
+	"srv_inspect_setting_link"					=> 'For more information on "Zoom" functionality click <a href="https://www.1ka.si/d/en/help/manuals/zoom" target="_blank">here.</a>',
 	"srv_inspect_setting_show_variables"		=> 'Always show the following variables:',
 	"srv_inspect_goto_note"						=> '"Zoom" points to the:',
 	"srv_inspect_goto_0"						=> 'Existing analyses',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4d7c5af07..000b61b2f 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8356,6 +8356,11 @@ fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label {
   margin-right: 4px;
 }
 
+div#inspect_div .setting_holder .horizontal {
+  display: flex;
+  flex-direction: row;
+}
+
 /* 
     Header scss - top line, menu...
 */
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 0bf3ae3a3..d77ba1aab 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -317,4 +317,19 @@ fieldset.statusProfileFieldset {
 
 #rec_spremenljivka_naslov {
     margin-right: 4px;
-}
\ No newline at end of file
+}
+
+
+//////ANALIZA//////
+//Zoom
+
+div#inspect_div {
+
+    .setting_holder {
+        
+        .horizontal {
+            display: flex;
+            flex-direction: row;
+        }
+    }
+}