From c65e4deaa2c098a10f9cca851947fd3acbbaeca0 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 5 May 2022 23:54:33 +0200
Subject: [PATCH] [Redizajn 1KA] Popupi: Analize  - Filtri > Segmenti

---
 admin/survey/SurveyAdmin.php              |  2 +-
 admin/survey/classes/class.SurveyZoom.php | 60 +++++++++++++++++------
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 690ebc1a9..71d9b805d 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['a'] == 'invitations' || $_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' || $_GET['a'] == 'analysis' ? ' divPopUp PopUpNarrow' : '').'"></div>';
 
         // fullscreen urejanje vprasanja
         echo '<div id="vprasanje" class="divPopUp"></div>';
diff --git a/admin/survey/classes/class.SurveyZoom.php b/admin/survey/classes/class.SurveyZoom.php
index cd0a98606..8d3009244 100644
--- a/admin/survey/classes/class.SurveyZoom.php
+++ b/admin/survey/classes/class.SurveyZoom.php
@@ -301,26 +301,54 @@ class SurveyZoom
         //echo '<div id="zoom_cover_div"></div>'."\n";
 		
         // div za kreacijo novega
-        echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
-        echo '<input id="newProfileName" name="newProfileName" type="text" value="" size="45"  />'."\n";
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'newCreate\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";            
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newCancel\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
-        echo '</div>'."\n";
+        echo '<div id="newProfileDiv">';
+		
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zoomProfileAction(\'newCancel\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zoomProfileAction(\'newCreate\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
         
         // div za preimenovanje
-        echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
-        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="45"  />'."\n";
-        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'doRename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n";            
-		echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancelRename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
-        echo '</div>'."\n";
+        echo '<div id="renameProfileDiv">';
+		
+		echo '<div class="setting_holder">';
+
+        echo '<div class="setting_item">';
+        echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+        echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" class="text large"/>';
+        echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zoomProfileAction(\'cancelRename\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zoomProfileAction(\'doRename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
                 
         // div za brisanje
-        echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . $currentFilterProfile['name'] . '</b>?'."\n";
-        echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />'."\n";
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'doDelete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
-        echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancelDelete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";            
-        echo '</div>'."\n";
+        echo '<div id="deleteProfileDiv">';
+		
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . $currentFilterProfile['name'] . '</span>?';
+        echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '"  />';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="zoomProfileAction(\'cancelDelete\'); return false;">'.$lang['srv_close_profile'].'</button>';             
+        echo '<button class="medium blue" onclick="zoomProfileAction(\'doDelete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	/** Funkcija prikaze osnovnih informacije profila