From eb441f24f714ff3223e379e0c2e57fd5b84c2133 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 27 May 2022 05:02:37 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Analize=20>=20Po?=
 =?UTF-8?q?=C5=A1lji=20arhiv=20[V=20DELU]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../class.SurveyAnalysisArchive.php            | 14 ++++++++++----
 admin/survey/script/script_analiza.js          |  4 ++--
 public/css/admin_new.css                       | 18 ++++++++----------
 .../components/popup/page_specific.scss        |  9 +++++++++
 .../pages/survey_edit/popups/archive.scss      |  8 --------
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index 8ef0d20a5..d7a577317 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -475,7 +475,7 @@ class SurveyAnalysisArchive {
 	static function EmailArchive($aid) {
 		global $lang;
 		
-        echo '<div id="div_analiza_archive_name" class="divPopUp PopUpNarrow">'."\n";
+        echo '<div id="div_analiza_archive_name">'."\n";
         
         echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
 		
@@ -486,7 +486,8 @@ class SurveyAnalysisArchive {
 		 
 		if ( $CAE > 0) {
 			# vsebina emaila in naslovi
-			echo '<div id="div_archives_email_left">'."\n";
+			echo '<div id="div_archives_email_wrap">';
+			echo '<div id="div_archives_email_left">';
 	
             echo '<p>'.$lang['srv_analiza_archive_message_note'].'</p>';
             
@@ -520,18 +521,23 @@ class SurveyAnalysisArchive {
 			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
 			echo '<br class="clr" />';
 			echo '</div>';
+
+
 			echo '<div id="div_error">';
 			# navodila
 			echo $lang['srv_analiza_arhiviraj_mail_note_0'];
 			echo '</div>';
 			echo '<br/>';
 			echo '<br/>';
+			
 			echo '<div id="div_error">';
 			# navodila
 			echo $lang['srv_analiza_arhiviraj_mail_note_1'];
 			echo '</div>';
-			echo '</div>';
-	        echo '<br class="clr" />';
+			
+			echo '</div>'; //right
+
+			echo '</div>'; //wrap
 		} else {
 			self::DisplayError($CAE);
 		}
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index 28e65238d..dcb6f72e5 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -953,7 +953,7 @@ function createArchiveBeforeEmail() {
 		if (parseInt(response) > 0) {
 			var aid = parseInt(response);
 			$("#fullscreen").load('ajax.php?a=emailArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, aid:aid}, function() {
-				$('#fullscreen').show();
+				$('#fullscreen').addClass("PopUpNarrow divPopUp").show();
 			});
 		} else {
 			if (parseInt(response) == -1) {
@@ -961,7 +961,7 @@ function createArchiveBeforeEmail() {
 			} else {
 				genericAlertPopup('alert_archive_error_response',response);
 			}
-			$('#fullscreen').hide();
+			$('#fullscreen').removeClass("PopUpNarrow divPopUp").hide();
 			$('#fade').fadeOut('slow');
 		}
 	});
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 17bd56471..e0dc6c6d3 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8320,6 +8320,14 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
   width: 50%;
 }
 
+#div_archives_email_left {
+  width: 75%;
+}
+
+#div_archives_email_right {
+  width: 25%;
+}
+
 #creport_profiles {
   cursor: pointer;
   width: 99%;
@@ -21403,16 +21411,6 @@ and open the template in the editor.
   right: 20px;
 }
 
-#div_archives_email_left {
-  width: 590px;
-  float: left;
-}
-
-#div_archives_email_right {
-  width: 300px;
-  float: right;
-}
-
 dl.arch_email dd {
   margin-left: 60px;
   position: relative;
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index dd020b219..6ace85009 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -223,6 +223,15 @@ div#div_analiza_archive_name {
     }
 }
 
+//Pošji arhiv
+
+#div_archives_email_left {
+	width: 75%;
+}
+#div_archives_email_right {
+	width: 25%;
+}
+
 //Poročila
 #creport_profiles {
     cursor: pointer;
diff --git a/resources/sass/admin_new/pages/survey_edit/popups/archive.scss b/resources/sass/admin_new/pages/survey_edit/popups/archive.scss
index e5db163e8..abc8dcd98 100644
--- a/resources/sass/admin_new/pages/survey_edit/popups/archive.scss
+++ b/resources/sass/admin_new/pages/survey_edit/popups/archive.scss
@@ -69,14 +69,6 @@ and open the template in the editor.
     bottom: 20px;
     right: 20px;
 }
-#div_archives_email_left {
-	width: 590px;
-	float: left;
-}
-#div_archives_email_right {
-	width: 300px;
-	float: right;
-}
 dl.arch_email {
 	dd {
 		margin-left: 60px;