From 9098a22f8afbfbddd1fc6d514b3db7f7fce9c96f Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 20 May 2022 13:14:54 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Analize=20?=
 =?UTF-8?q?=E2=86=92=20Poro=C4=8Dila=20=E2=86=92=20Poro=C4=8Dila=20po=20me?=
 =?UTF-8?q?ri=20-=20Preimenuj,=20izbri=C5=A1i,=20deli=20z=20uredniki?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classes/class.SurveyCustomReport.php      | 63 +++++++++++++------
 public/css/admin_new.css                      | 14 ++++-
 .../components/popup/page_specific.scss       | 16 ++++-
 3 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index 56f5ed163..96ea5adf7 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -1889,19 +1889,32 @@ class SurveyCustomReport {
 
 
 		// div za preimenovanje
-        echo '<div id="renameCReportProfile">'.$lang['srv_custom_report_name'].': '."\n";
-        echo '<input id="renameCReportProfileName" name="renameCReportProfileName" type="text" size="45" />'."\n";
-        echo '<input id="renameCReportProfileId" type="hidden" value="' . $this->creportProfile . '"  />'."\n";
-        echo '<br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'rename\'); 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="creport_profile_action(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
-        echo '</div>'."\n";
+        echo '<div id="renameCReportProfile">';
+		
+		echo '<p>'.$lang['srv_custom_report_name'].':</p>';
+        echo '<input id="renameCReportProfileName" name="renameCReportProfileName" type="text" class="text large" />';
+
+        echo '<input id="renameCReportProfileId" type="hidden" value="' . $this->creportProfile . '"  />';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '<button class="medium blue" onclick="creport_profile_action(\'rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+        echo '</div>';
+		
+        echo '</div>';
 		
 		// div za brisanje
-        echo '<div id="deleteCReportProfile">'.$lang['srv_custom_report_delete_confirm'].': <span id="deleteCReportProfileName" style="font-weight:bold;"></span>?'."\n";
+        echo '<div id="deleteCReportProfile">';
+
+		echo '<p>'.$lang['srv_custom_report_delete_confirm'].':<span id="deleteCReportProfileName" class="semi-bold"></span>?</p>';
         echo '<input id="deleteCReportProfileId" type="hidden" value="' . $this->creportProfile . '"  />'."\n";
-        echo '<br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'delete\'); 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="creport_profile_action(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";            
-        echo '</div>'."\n";
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '<button class="medium blue" onclick="creport_profile_action(\'delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+        echo '</div>';
+
+		echo '</div>';
 		
 		// div za deljenje z drugimi uredniki
         echo '<div id="shareCReportProfile">';
@@ -2580,9 +2593,12 @@ class SurveyCustomReport {
 	
 		// prikazemo deljenje profila z drugimi uredniki
 		if($_GET['a'] == 'shareProfileShow') {
-			
-			echo '<span class="bold clr" style="display:block; margin-bottom:25px;">'.$lang['srv_custom_report_share_long'].':</span>'."\n";
-			
+
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_custom_report_share_long'].':</span>';
+
+
 			if (isset ($_POST['id'])){
 				$id = $_POST['id'];
 				
@@ -2594,16 +2610,25 @@ class SurveyCustomReport {
 					if($user['id'] != $global_user_id){
 						$sql = sisplet_query("SELECT * FROM srv_custom_report_share WHERE ank_id='".$this->ank_id."' AND profile_id='".$id."' AND author_usr_id='".$global_user_id."' AND share_usr_id='".$user['id']."' LIMIT 1");
 						$checked = (mysqli_num_rows($sql) > 0) ? ' checked="checked"' : '';
-						
+
+						echo '<div class="setting_item">';
 						echo '<input type="checkbox" '.$checked.' name="share_usr_id[]" id="share_usr_id'.$user['id'].'" value="'.$user['id'].'"> ';
-						echo '<label for="share_usr_id'.$user['id'].'">'.$user['email'].'</label><br />';
+						echo '<label for="share_usr_id'.$user['id'].'">'.$user['email'].'</label>';
+						echo '</div>';
+						
 					}
 				}	  
 			}
-			
-			echo '<input id="shareCReportProfileId" type="hidden" value="' . $id . '"  />'."\n";
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'share\'); return false;"><span>'.$lang['srv_custom_report_share'].'</span></a></span></span>'."\n";            
-			echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_share\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
+
+			echo '</div>';
+
+			echo '<input id="shareCReportProfileId" type="hidden" value="' . $id . '"  />';
+
+
+			echo '<div class="button_holder">';
+			echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_share\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+			echo '<button class="medium blue" onclick="creport_profile_action(\'share\'); return false;">'.$lang['srv_custom_report_share'].'</button>';
+			echo '</div>';
 		}
 	
 		// delimo profil z drugimi uredniki
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c493a95ba..c0774f1b2 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8323,10 +8323,22 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
   width: 100%;
 }
 
-#newCReportProfile .text {
+#newCReportProfile .text,
+#renameCReportProfile .text {
   width: 100%;
 }
 
+#renameCReportProfile .button_holder,
+#deleteCReportProfile .button_holder {
+  margin-top: 32px;
+  justify-content: flex-end;
+  margin-bottom: 0;
+}
+#renameCReportProfile .button_holder button,
+#deleteCReportProfile .button_holder button {
+  margin: 0 0 0 16px;
+}
+
 .pbLabel {
   height: 20px;
   width: 160px;
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 2a906f14b..fbab81cbb 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -242,12 +242,26 @@ div#div_analiza_archive_name {
     }
 }
 
-#newCReportProfile {
+#newCReportProfile,
+#renameCReportProfile {
     .text {
         width: 100%;
     }
 }
 
+#renameCReportProfile,
+#deleteCReportProfile {
+    .button_holder {
+        margin-top: 32px;
+        justify-content: flex-end;
+        margin-bottom: 0;
+
+        button {
+            margin: 0 0 0 16px;
+        }
+    }
+}
+
 
 //// TESTIRANJE /////
 //Avtomatski vnosi - progress bar