From 6468f177daf75ed321cad6d01e419dd81dedbc66 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 5 May 2022 22:16:40 +0200
Subject: [PATCH] [Redizajn 1KA] Popupi: Objava > Vabila - Preveri nstavitve
 gumb

---
 admin/survey/SurveyAdmin.php               | 2 +-
 admin/survey/classes/objects/obj.PopUp.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index a197bb9ed..9fe80b8c6 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -408,7 +408,7 @@ class SurveyAdmin
         echo '<div id="branching" style="display:none"></div>';
 
         // fullscreen urejanje spremenljivke
-        echo '<div id="fullscreen"  class="'.($_GET['a'] == A_ANALYSIS ? ' analiza' : '') . ($_GET['a'] == 'telephone' || $_GET['m'] == 'anal_arch' ? ' divPopUp PopUpNarrow' : '').'"></div>';
+        echo '<div id="fullscreen"  class="'.($_GET['a'] == A_ANALYSIS ? ' analiza' : '') . ($_GET['a'] == 'telephone' || $_GET['a'] == 'invitations' || $_GET['m'] == 'anal_arch' ? ' divPopUp PopUpNarrow' : '').'"></div>';
 
         // fullscreen urejanje vprasanja
         echo '<div id="vprasanje" class="divPopUp"></div>';
diff --git a/admin/survey/classes/objects/obj.PopUp.php b/admin/survey/classes/objects/obj.PopUp.php
index 523103f31..396c977f6 100644
--- a/admin/survey/classes/objects/obj.PopUp.php
+++ b/admin/survey/classes/objects/obj.PopUp.php
@@ -105,6 +105,8 @@ class PopUp
 			echo '<div class="divPopUp_top">';
 			echo $this->_headerText;
 			echo '</div>'; #PM_top
+
+			echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
 		}