From 28739ba82ecb1d0a323dbfe9d2709a396a8e36ec Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Fri, 17 Jun 2022 05:12:48 +0200
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Urejanje=20>=20Vpr?=
 =?UTF-8?q?a=C5=A1alnik=20-=20Inline=20edit=20kategorije=20-=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/survey/classes/class.SurveyCustomReport.php      |  4 ++--
 admin/survey/classes/class.Vprasanje.php               | 10 +++++-----
 public/css/admin_new.css                               |  4 ++++
 resources/sass/admin_new/basic/typography.scss         |  4 ++++
 .../sass/admin_new/components/popup/page_specific.scss |  1 -
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index 20fcbb1d5..6b8925598 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -1871,8 +1871,8 @@ class SurveyCustomReport {
 
 		echo '<div class="button_holder">';
         echo '<button class="medium white-black" onClick="close_creport_profile(); return false;">'.$lang['srv_zapri'].'</button>';              
-        echo '<button class="medium white-blue" onClick="use_creport_profile(); return false;">'.$lang['srv_save_and_run_profile'].'</button>';              
-        echo '<button class="medium blue" onclick="creport_profile_action(\'show_new\'); return false;">'.$lang['srv_custom_report_create'].'</button>';
+        echo '<button class="medium white-blue" onclick="creport_profile_action(\'show_new\'); return false;">'.$lang['srv_custom_report_create'].'</button>';
+        echo '<button class="medium blue" onClick="use_creport_profile(); return false;">'.$lang['srv_save_and_run_profile'].'</button>';              
         echo '</div>';
 
 	}
diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 15369202e..970568252 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -2864,14 +2864,14 @@ class Vprasanje {
 
 			echo '<div class="setting_holder">';
 			echo '<span class="setting_title">'.(in_array($rows['tip'], array(2,6,16,19,20))?$lang['srv_spremenljivka']:$lang['srv_vrednost']).':</span>';
-			echo '<input type="text" class="text large" name="vrednost_variable" value="'.$row['variable'].'" '.(in_array($rows['tip'], array(2,6,16,19,20)) ? ' onkeyup="vprasanje_check_variable(this);"' : '').'>';
+			echo '<input type="text" class="text large w200" name="vrednost_variable" value="'.$row['variable'].'" '.(in_array($rows['tip'], array(2,6,16,19,20)) ? ' onkeyup="vprasanje_check_variable(this);"' : '').'>';
 			echo '</div>';
             
 			// RAZVRSTI odgovore
 			echo '<div class="setting_holder">';
 			echo '<span class="setting_title">'.$lang['sort'].':</span>';
 
-			echo '<select class="dropdown large" name="vrednost_random">';
+			echo '<select class="dropdown large w200" name="vrednost_random">';
             echo '<option value="0"'.($row['random']==0?' selected':'').'>'.$lang['srv_random_off2'].'</option>';
             echo '<option value="1"'.($row['random']==1?' selected':'').'>'.$lang['srv_random_on2'].'</option>';
             echo '<option value="2"'.($row['random']==2?' selected':'').'>'.$lang['srv_sort_asc2'].'</option>';
@@ -2880,11 +2880,11 @@ class Vprasanje {
 			
 			echo '</div>';
 
-			echo '<div class="bottom4">'.$lang['srv_vprasanje_text'].' <span onmouseover="$(this).hide(); create_editor(\'vrednost_naslov\');" class="pointer"> - '.$lang['srv_editor'].'</span>:';
+			echo '<div><p class="bottom4">'.$lang['srv_vprasanje_text'].'<span onmouseover="$(this).hide(); create_editor(\'vrednost_naslov\');" class="pointer"> - '.$lang['srv_editor'].'</span>:</p>';
 			
-			echo '<textarea id="vrednost_naslov" name="vrednost_naslov" style="width:99%">'.$row['naslov'].'</textarea></div>';
+			echo '<textarea class="top0" id="vrednost_naslov" name="vrednost_naslov" style="width:99%">'.$row['naslov'].'</textarea></div>';
 						
-			echo '<p>';
+			echo '<p class="top16">';
 			if ($row['if_id'] > 0) {
 				echo $lang['srv_podif_edit'].': ';
                 echo '<a href="#" onclick="vrednost_condition_editing(\''.$vrednost.'\'); return false;">';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ddcd101f6..f6c189c9c 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5095,6 +5095,10 @@ p, span {
   margin-top: 4px;
 }
 
+.top0 {
+  margin-top: 0px;
+}
+
 .warning,
 .red {
   color: #FF0000;
diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss
index 5eb5da813..f5fe515d7 100644
--- a/resources/sass/admin_new/basic/typography.scss
+++ b/resources/sass/admin_new/basic/typography.scss
@@ -38,6 +38,10 @@ p,span {
 	margin-top: 4px;
 }
 
+.top0 {
+	margin-top: 0px;
+}
+
 //Barve
 .warning,
 .red {
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 82ecd6501..74b4c5a83 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -224,7 +224,6 @@ div#fullscreen {
 }
 
 //Komentarji
-
 div.qtip_comment {
     h1 {
         &:before {