From e445593f81db8e9da019b230e34babd6253c305f Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 5 May 2022 13:51:08 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Urejanje=20>=20Vpr?=
 =?UTF-8?q?a=C5=A1alnik=20>=20Napredne=20mo=C5=BEnosti=20urejanje=20-=20Po?=
 =?UTF-8?q?i=C5=A1=C4=8Di=20in=20zamenjaj?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/BranchingAjax.php                | 26 ++++++++++++++-----
 lang/1.php                                    |  2 +-
 lang/2.php                                    |  2 +-
 public/css/admin_new.css                      |  7 +++++
 .../components/popup/page_specific.scss       | 13 ++++++++++
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 5adf6e06c..16ceaddc4 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -2766,13 +2766,25 @@ class BranchingAjax {
 
 		echo '<h2>'.$lang['srv_find_replace'].'</h2>';
 		
-		echo '<p class="gray">'.$lang['srv_find_text'].'</p>';
-		
-		echo '<p><label style="display:inline-block; width:100px">'.$lang['srv_find'].': </label><input type="text" name="find" style="width:200px"><span id="find_count" style="color:red; margin:0 20px"></span></p>';
-		echo '<p><label style="display:inline-block; width:100px">'.$lang['srv_replace_with'].': </label><input type="text" name="replace" style="width:200px"></p>';
-		
-		echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="find_replace_do(); return false;" href="#"><span>'.$lang['srv_replace'].'</span></a></div></span>';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray btn_savesettings" onclick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;" href="#"><span>'.$lang['srv_cancel'].'</span></a></div></span>';	
+		echo '<p class="gray bottom16">'.$lang['srv_find_text'].'</p>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['srv_find'].':</p>';
+		echo '<div class="find-holder">';
+		echo '<input type="text" class="text large" name="find">';
+		echo '<span class="red" id="find_count" style="margin-left: 16px;"></span>';
+		echo '</div>';
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<p>'.$lang['srv_replace_with'].':</p>';
+		echo '<input type="text" class="text large" name="replace">';
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="$(\'#vrednost_edit\').hide().html(\'\'); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_cancel'].'</button>';              
+        echo '<button class="medium blue" onclick="find_replace_do(); return false;">'.$lang['srv_replace'].'</button>';
+        echo '</div>';
 	}
 	
 	function ajax_find_replace_count() {
diff --git a/lang/1.php b/lang/1.php
index 659302a97..81e6da195 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5853,7 +5853,7 @@ $lang = array (
 	"XSTARleta"									=>	'Starost: vnos starosti (min: 10 let, max: 90 let)',
 	"XLETNICA"									=>	'Starost: izbira letnice rojstva v roleti z letnicami od 1910 do 2010.',
 	"XDATUMROJ"									=>	'Starost: Izbira datuma rojstva na koledarju',
-	"srv_find_text"								=>	'Zgolj za iskanje uporabite Ctrl + F',
+	"srv_find_text"								=>	'Zgolj za iskanje uporabite Ctrl + F.',
 	"srv_find_replace_count"					=>	'Najdenih besed',
 	"srv_demografija_text"						=>	'Na konec ankete lahko dodate že pripravljena demografska vprašanja',
 	"srv_demografska_vprasanja"					=>	'Demografska vprašanja',
diff --git a/lang/2.php b/lang/2.php
index 9d0f9faee..75159b6c7 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5748,7 +5748,7 @@ $lang = array (
 	"srv_break_kategories_note" 				=>	'Choose two category:',
 	"srv_break_error_note_1" 					=>	'Independent variable is not selected!',
 	"srv_break_table_for" 						=>	'Table for: ',
-	"srv_find_text"								=>	'For search only use Ctrl + F',
+	"srv_find_text"								=>	'For search only use Ctrl + F.',
 	"srv_find_replace_count"					=>	'Words found',
 	"srv_demografija_text"						=>	'You can add demographic questions to the end of the survey',
 	"srv_demografska_vprasanja"					=>	'Demographic questions',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 5adc5c593..90b69f321 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8193,6 +8193,13 @@ fieldset#missingProfileFieldset div.mv_settings_other {
   margin-bottom: 16px;
 }
 
+div.setting_holder div.find-wrap {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 16px;
+}
+
 /* 
     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 9ef6902d1..21c4c803a 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -92,4 +92,17 @@ fieldset#missingProfileFieldset {
         margin-bottom: 16px;
     }
 
+}
+
+
+/////// UREJANJE //////@
+//Vprašalnik
+
+div.setting_holder {
+    div.find-wrap {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        gap: 16px;
+    }
 }
\ No newline at end of file