From db9eda8981012426c33ace317eb80865a63e70e9 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 6 Jan 2022 17:02:45 +0100
Subject: [PATCH] [Redizajn 1KA] - Moje ankete --> Uvoz besedila - v4

---
 admin/survey/Help.php                                |  6 +++---
 admin/survey/classes/class.NewSurvey.php             | 12 ++++++------
 public/css/admin_new.css                             |  9 +++++++--
 resources/sass/admin_new/basic/icons/icons.scss      |  5 +++++
 .../pages/new_survey_page/right_content.scss         |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/admin/survey/Help.php b/admin/survey/Help.php
index ff64e211d..656f9884e 100644
--- a/admin/survey/Help.php
+++ b/admin/survey/Help.php
@@ -7,7 +7,7 @@ class Help {
     * ce smo v editmodu se bo prikazal textbox za urejanje helpa
     * ce smo v navadnem modu se bo prikazal help box
     */
-    public static function display ($what) {
+    public static function display ($what, $title) {
         global $admin_type, $lang;
         
         $sql = sisplet_query("SELECT help FROM srv_help WHERE what='$what' AND lang='$lang[id]'");
@@ -15,10 +15,10 @@ class Help {
         $help = $row['help'];
         
         if ($admin_type == 0 && isset($_COOKIE['edithelp'])) {
-            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="edithelp" onclick="return false;" title_txt="">(?)</a>';  
+            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="edithelp" onclick="return false;" title_txt="">'.(empty($title) ? '(?)' : '<span class="faicon help2 title20"></span>').'</a>';  
         } 
         elseif ($help != '') {
-            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="help" onclick="return false;" title_txt="">(?)</a>';
+            return ' <a href="/" id="help_'.$what.'" lang="'.$lang['id'].'" class="help" onclick="return false;" title_txt="">'.(empty($title) ? '(?)' : '<span class="faicon help2 title20"></span>').'</a>';
         }
         
     }
diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php
index 117f339d0..15af2e395 100644
--- a/admin/survey/classes/class.NewSurvey.php
+++ b/admin/survey/classes/class.NewSurvey.php
@@ -653,7 +653,7 @@ class NewSurvey{
 		echo '<div class="fieldset anketa_from_text">';	
 
 		// Naslov
-		echo '<div class="title">' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text').'</div>';
+		echo '<div class="title">' . $lang['srv_newSurvey_survey_from_text_title'] . ' '.Help::display('srv_create_survey_from_text', "title").'</div>';
 		echo '<p>' . $lang['srv_newSurvey_survey_from_text_text1'] . '</p>';
 		echo '<p>' . $lang['srv_newSurvey_survey_from_text_text2'] . '</p>';
 		echo '<p class="bottom32">' . $lang['srv_newSurvey_survey_from_text_text3'] . '</p>';
@@ -840,7 +840,7 @@ class NewSurvey{
 				// Dodamo se textbox ce je samo vprasanje
 				$text = preg_replace(
 					'/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/', 
-	        		'$1<br /><input type="text" class="large" /><br /><br />',
+	        		'$1<br /><input type="text" class="large" /><br />',
 					$text
 				);
 				
@@ -853,13 +853,13 @@ class NewSurvey{
 				// Dodamo se textbox na zadnjo vrstico ce je potrebno
 				$text = preg_replace(
 					'/(<span class="variable_title">[^<>]+<\/span>)\Z/', 
-					'$1<br /><input type="text" class="large" />',
+					'$1<br /><input type="text" class="large" /><br />',
 					$text
 				);
-				// Dodamo se textbox na prvo vrstico ce je potrebno
+				// Dodamo se textbox na prvo vrstico, ce je potrebno
 				$text = preg_replace(
-					'/(<span class="variable_title">[^<>]+<\/span>)<br \/><br \/>/', 
-					'$1<br /><input type="text" class="large" /><br /><br />',
+					'/(<span class="variable_title">[^<>]+<\/span>)<br \/>/', 
+					'$1<br /><input type="text" class="large" /><br />',
 					$text, 1
 				);				
 			}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 7134cc7df..25e0e57b4 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5157,6 +5157,11 @@ span.faicon.medium::before,
 a.faicon.medium::before {
   font-size: 24px !important;
 }
+span.faicon.title20::before,
+a.faicon.title20::before {
+  font-size: 20px !important;
+  margin-left: 16px;
+}
 span.faicon.normal::before,
 a.faicon.normal::before {
   font-size: 16px !important;
@@ -14329,7 +14334,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #input_field_holder #input_field textarea {
   width: 519px;
-  height: 509px;
+  height: 370px;
   box-sizing: border-box;
   border-color: #E5E5E5;
   margin-top: 0;
@@ -14347,7 +14352,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering .anketa_from_text .from_text_sidebyside_holder #preview_field_holder #preview_field {
   width: 519px;
-  height: 509px;
+  height: 370px;
   box-sizing: border-box;
   overflow: auto;
   padding: 16px;
diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss
index ee50bbf9e..16ed8a398 100644
--- a/resources/sass/admin_new/basic/icons/icons.scss
+++ b/resources/sass/admin_new/basic/icons/icons.scss
@@ -26,6 +26,11 @@ a.faicon{
         font-size: 24px !important;
     }
 
+    &.title20::before {
+        font-size: 20px !important;
+        margin-left: 16px;
+    }
+
     &.normal::before {
         font-size: 16px !important;
     }
diff --git a/resources/sass/admin_new/pages/new_survey_page/right_content.scss b/resources/sass/admin_new/pages/new_survey_page/right_content.scss
index e49ee22fa..ad7907c3b 100644
--- a/resources/sass/admin_new/pages/new_survey_page/right_content.scss
+++ b/resources/sass/admin_new/pages/new_survey_page/right_content.scss
@@ -465,7 +465,7 @@ $skin_selector: $red;
 							
 							textarea{
 								width: 519px;
-								height: 509px;
+								height: 370px;
 								box-sizing: border-box;
 
 								border-color: $gray;
@@ -488,7 +488,7 @@ $skin_selector: $red;
 						
 						#preview_field{
 							width: 519px;
-							height: 509px;
+							height: 370px;
 							box-sizing: border-box;
 							overflow: auto;