From ff7df798469ffde91985586169147f229ca7332a Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 27 May 2022 01:08:59 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Urejanje=20>=20Vpr?=
 =?UTF-8?q?a=C5=A1alnik=20>=20Napredne=20mo=C5=BEnosti=20urejanja=20-=20Pr?=
 =?UTF-8?q?everi=20pravilnost=20postavljenih=20pogojev=20-=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/BranchingAjax.php | 11 +++++++++--
 lang/1.php                     |  1 +
 lang/2.php                     |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 9247a4944..8f7d475ab 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -1608,9 +1608,16 @@ class BranchingAjax {
 		// pogoji so ok
 		if ($code === true) {
 			if ($_GET['izpis'] == 'long') {
-				echo '<p class="semi-bold center">'.$lang['srv_check_pogoji_ok'].'!</p>';
-			
 				
+				echo '<h2>'.$lang['srv_check_pogoji_ok2'].'</h2>';
+                echo '<div class="popup_close"><a href="#" onClick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">✕</a></div>';        
+
+				echo '<p>'.$lang['srv_check_pogoji_ok'].'!</p>';
+			
+				echo '<div class="button_holder">';
+				echo '<button class="medium blue" onClick="$(\'#check_pogoji\').fadeOut(\'slow\'); $(\'#fade\').fadeOut(\'slow\');">'.$lang['srv_zapri'].'</button>';
+				echo '</div>';
+
 			} else {
 				echo '1';
 			}
diff --git a/lang/1.php b/lang/1.php
index 9d7e7718a..6ce5bd82e 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3970,6 +3970,7 @@ $lang = array (
 	"srv_statistic_choose_dates"		=>	"Izberite datume",
 	"srv_extra_translations"			=>	"Standardne besede",
 	"srv_extra_translations2"			=>	"- v ostale jezike pa lahko prevajate v zavihku <a href=\"%s\">Jezik</a>",
+	"srv_check_pogoji_ok2"				=>	"Preverjanje pogojev",
 	"srv_check_pogoji_ok"				=>	"Vsi pogoji v anketi so ustrezno nastavljeni",
 	"srv_check_pogoji_not_ok"			=>	"Anketa vsebuje napake!",
 	"srv_check_pogoji_spremenljivka"	=>	"Napaka v pogoju na vrednosti spremenljivke",
diff --git a/lang/2.php b/lang/2.php
index b9a262f26..1519ffb24 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3940,6 +3940,7 @@ $lang = array (
 	"srv_statistic_choose_interval"		=>	"Choose interval",
 	"srv_statistic_choose_dates"		=>	"Choose dates",
 	"srv_check_pogoji_ok"				=>	"All conditions in survey are set up properly",
+	"srv_check_pogoji_ok2"				=>	"Checking conditions",
 	"srv_check_pogoji_not_ok"			=>	"Survey contains errors!",
 	"srv_check_pogoji_spremenljivka"	=>	"Error is in question variable condition",
 	"srv_check_validacija"				=>	"Error is in question validation",