From ffe31002b87c88b3409f80a26a7d40defd7b124f Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 19 May 2022 04:09:07 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Urejanje=20>=20Nas?=
 =?UTF-8?q?tavitve=20>=20Obve=C5=A1=C4=8Danje=20o=20izpolnjeni=20anketi=20?=
 =?UTF-8?q?-=20Lastna=20oblika=20e-mail=20sporo=C4=8Dila?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/SurveyAdmin.php                                  | 2 +-
 admin/survey/SurveyAdminAjax.php                              | 3 +++
 admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php | 2 +-
 public/css/admin_new.css                                      | 3 +++
 resources/sass/admin_new/components/popup/basic.scss          | 4 ++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index c6b1343e8..5146e583a 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -414,7 +414,7 @@ class SurveyAdmin
         echo '<div id="vprasanje" class="divPopUp"></div>';
 
         // popup za urejanje vrednosti
-        echo '<div id="vrednost_edit" class="divPopUp"></div>';
+        echo '<div id="vrednost_edit" class="divPopUp PopUpAuto"></div>';
 
 
         // Generičen popup
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 329df203c..f43f30f86 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -5596,6 +5596,9 @@ class SurveyAdminAjax {
 			$text = $row['text'];
 		}
 		
+		echo '<h2><span class="faicon blue text_file empty"></span>'.$lang['srv_alert_custom'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="remove_editor(\'text\'); $(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').hide().html(\'\'); return false;">✕</a></div>';
+
 		echo '<form action="ajax.php?a=alert_custom_save" name="alert_custom" method="post">';
 		echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
 		echo '<input type="hidden" name="type" value="'.$type.'">';
diff --git a/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php b/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php
index 066944be2..21c06601e 100644
--- a/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php
+++ b/admin/survey/modules/mod_hierarhija/class/HierarhijaClass.php
@@ -392,7 +392,7 @@ class Hierarhija {
 			echo '</div>';
 
 			// popup za urejanje vrednosti
-			echo '<div id="vrednost_edit" class="divPopUp">';
+			echo '<div id="vrednost_edit" class="divPopUp PopUpAuto">';
 			echo '</div>';
 
 			// fade pri fullscreen urejanje spremenljivke
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f53b32e19..46e287564 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -7207,6 +7207,9 @@ a.help {
 .divPopUp.PopUpNarrow {
   width: 600px !important;
 }
+.divPopUp.PopUpAuto {
+  width: fit-content !important;
+}
 
 .divPopUp_info {
   padding: 16px;
diff --git a/resources/sass/admin_new/components/popup/basic.scss b/resources/sass/admin_new/components/popup/basic.scss
index 43ccb702b..13a82960a 100644
--- a/resources/sass/admin_new/components/popup/basic.scss
+++ b/resources/sass/admin_new/components/popup/basic.scss
@@ -292,6 +292,10 @@
     &.PopUpNarrow {
         width: 600px !important;
     }
+
+    &.PopUpAuto {
+        width: fit-content !important;
+    }
 }
 
 .divPopUp_info{