From 8ce70e680af3003273651a7dfb53de822f588742 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 24 Mar 2022 23:22:15 +0100
Subject: [PATCH] [Redizajn 1KA] - Objava -> Pregled - v4

---
 admin/survey/SurveyAdminAjax.php              |  4 +--
 admin/survey/SurveyAdminSettings.php          |  2 +-
 public/css/admin_new.css                      | 14 +++++++--
 .../sass/admin_new/basic/icons/export.scss    |  3 ++
 .../admin_new/pages/my_surveys/objava.scss    | 30 +++++++++++--------
 5 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 2af3656cd..4b5f74ccc 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6771,7 +6771,7 @@ class SurveyAdminAjax {
 
 				echo '<h2><span class="faicon fa-qrcode"></span>'.$lang['srv_anketa_href_friends'].'</h2>';
 				
-				echo '<div class="popup_content publish">';
+				echo '<div class="popup_content publish qr">';
 				echo '<img src="'.$site_url.'admin/survey/'.$img.'">';
 				echo '</div>';
 
@@ -7169,7 +7169,7 @@ class SurveyAdminAjax {
 
         echo '<div class="button_holder">';
 		if ($name == 'settings' || $name == 'QR') {
-			echo '<button class="medium blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';				
+			echo '<button class="medium blue" id="'.$name.'" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';				
 		}
 		else {
 			echo '<button class="medium white-blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';				
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 5b4e3f681..ce4a87bb9 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2569,7 +2569,7 @@ class SurveyAdminSettings {
 		$this->niceUrlSettings();
 		
 		// Več načinov deljenja ankete
-		echo '<div class="title"><div class="title_icon"><span class="faicon edit_square empty"></span></div><h2>'.$lang['srv_publication_survey_more'].'</h2></div>';
+		echo '<div class="title"><div class="title_icon"><span class="faicon share-arrow"></span></div><h2>'.$lang['srv_publication_survey_more'].'</h2></div>';
 
 		echo '<div class="more">';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4f22e042a..e9ab29957 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6625,6 +6625,10 @@ span.faicon.arhiv_mail::before {
   content: "\f14d";
 }
 
+span.faicon.share-arrow::before {
+  content: "\f14d";
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -11195,17 +11199,21 @@ div#vabila div.more div.more_block div.more_title a.help {
   margin-left: 5px;
 }
 
-div.popup_content.publish {
+div#general_popup div.popup_content.publish {
   max-width: 600px;
 }
-div.popup_content.publish textarea {
+div#general_popup div.popup_content.publish textarea {
   width: 568px;
   padding: 8px;
   height: auto;
 }
-div.popup_content.publish textarea.iframe {
+div#general_popup div.popup_content.publish textarea.iframe {
   height: 155px;
 }
+div#general_popup div.popup_content.publish.qr {
+  display: flex;
+  justify-content: center;
+}
 
 .dashboard_top_settings {
   display: flex;
diff --git a/resources/sass/admin_new/basic/icons/export.scss b/resources/sass/admin_new/basic/icons/export.scss
index a98915484..e7624cbe6 100644
--- a/resources/sass/admin_new/basic/icons/export.scss
+++ b/resources/sass/admin_new/basic/icons/export.scss
@@ -130,3 +130,6 @@ span.faicon.arhiv_mail::before{
         font-weight: 400;
 		content: "\f14d";
 }
+span.faicon.share-arrow::before{
+	content: "\f14d";
+}
diff --git a/resources/sass/admin_new/pages/my_surveys/objava.scss b/resources/sass/admin_new/pages/my_surveys/objava.scss
index bc299563c..ab52570c1 100644
--- a/resources/sass/admin_new/pages/my_surveys/objava.scss
+++ b/resources/sass/admin_new/pages/my_surveys/objava.scss
@@ -300,18 +300,24 @@ div#vabila {
 
 // Več načinov deljenja - popup
 
-div.popup_content {
-    &.publish {
-        max-width: 600px;
-        
-        textarea {
-            width: 568px;
-            padding: 8px;
-            height: auto;
-
-            &.iframe {
-                height: 155px;
+div#general_popup {
+    div.popup_content {
+        &.publish {
+            max-width: 600px;
+            textarea {
+                width: 568px;
+                padding: 8px;
+                height: auto;
+    
+                &.iframe {
+                    height: 155px;
+                }
+            }
+    
+            &.qr {
+                display: flex;
+                justify-content: center;  
             }
         }
     }
-}
\ No newline at end of file
+}