From 18c14ebbfefefc70e5b4ad7169c88d46422d6e96 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 5 May 2022 11:55:31 +0200
Subject: [PATCH] [Redizajn 1KA] Popupi: Status > Neodgovor premenljivke -
 Filtri > Spremenljivke

---
 .../classes/class.SurveyVariablesProfiles.php | 66 ++++++++++++++-----
 lang/1.php                                    |  2 +-
 lang/2.php                                    |  2 +-
 public/css/admin_new.css                      | 26 +++++++-
 .../components/popup/page_specific.scss       | 37 +++++++++--
 5 files changed, 110 insertions(+), 23 deletions(-)

diff --git a/admin/survey/classes/class.SurveyVariablesProfiles.php b/admin/survey/classes/class.SurveyVariablesProfiles.php
index b81dec350..89e620661 100644
--- a/admin/survey/classes/class.SurveyVariablesProfiles.php
+++ b/admin/survey/classes/class.SurveyVariablesProfiles.php
@@ -297,7 +297,7 @@ class SurveyVariablesProfiles
 		$svp_av = self::$SDF->getSurveyVariables();
 
 		if ( self::$currentId != SVP_DEFAULT_PROFILE ) {
-			echo '<div id="not_default_setting" class="popup_note">';
+			echo '<div id="not_default_setting" class="popup_note red">';
 			echo $lang['srv_not_default_setting'];
 			echo '</div>';
 		}
@@ -373,43 +373,77 @@ class SurveyVariablesProfiles
 		echo '<div id="variableProfileCoverDiv"></div>';
 
 		// div za shranjevanje novega profila
-		echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
-		echo '<input id="newProfileName" name="newProfileName" type="text" size="45"  />';
+		echo '<div id="newProfile">';
+
+		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"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+
+		$button = new PopUpButton($lang['srv_cancel']);
+		echo $button -> setFloat('right')
+		-> addAction('onClick','variableProfileAction(\'newCancel\'); return false;');
+		
 		$button = new PopUpButton($lang['srv_save_profile']);
 		echo $button -> setFloat('right')
 		->setButtonColor('orange')
 		-> addAction('onClick','variableProfileAction(\'newSave\'); return false;');
-		$button = new PopUpButton($lang['srv_cancel']);
-		echo $button -> setFloat('right')
-		-> addAction('onClick','variableProfileAction(\'newCancel\'); return false;');
+
+        echo '</div>';
+
 		echo '</div>';
 
 		// div za preimenovanje
-		echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
-		echo '<input id="renameProfileName" name="renameProfileName" type="text" value="'.$svp_ap[$cvp]['name'].'" size="45"  />';
+		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="'.$svp_ap[$cvp]['name'].'" class="text large"  />';
 		echo '<input id="renameProfileId" type="hidden" value="'.$pid.'"  />';
+        echo '</div>';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+
+		$button = new PopUpButton($lang['srv_cancel']);
+		echo $button -> setFloat('right')
+		-> addAction('onClick','variableProfileAction(\'renameCancel\'); return false;');
+		
 		$button = new PopUpButton($lang['srv_rename_profile_yes']);
 		echo $button -> setFloat('right')
 		->setButtonColor('orange')
 		-> addAction('onClick','variableProfileAction(\'renameProfile\'); return false;');
 
-		$button = new PopUpButton($lang['srv_cancel']);
-		echo $button -> setFloat('right')
-		-> addAction('onClick','variableProfileAction(\'renameCancel\'); return false;');
+		echo '</div>';
+		
 		echo '</div>';
 
 		// div za brisanje
-		echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>'.$svp_ap[$cvp]['name'].'</b>?';
+		echo '<div id="deleteProfileDiv">';
+		
+		echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">'.$svp_ap[$cvp]['name'].'</span>?';
 		echo '<input id="deleteProfileId" type="hidden" value="'.$pid.'"  />';
 
-		$button = new PopUpButton($lang['srv_delete_profile_yes']);
-		echo $button -> setFloat('right')
-		->setButtonColor('orange')
-		-> addAction('onClick','variableProfileAction(\'deleteConfirm\'); return false;');
+        echo '<div class="button_holder">';
 
 		$button = new PopUpButton($lang['srv_cancel']);
 		echo $button -> setFloat('right')
 		-> addAction('onClick','variableProfileAction(\'deleteCancel\'); return false;');
+		
+		$button = new PopUpButton($lang['srv_delete_profile_yes']);
+		echo $button -> setFloat('right')
+		->setButtonColor('orange')
+		-> addAction('onClick','variableProfileAction(\'deleteConfirm\'); return false;');
+		
+		echo '</div>';
+		
 		echo '</div>';
 
 		$content = ob_get_clean();
diff --git a/lang/1.php b/lang/1.php
index c278bf178..b5e0ced4e 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5534,7 +5534,7 @@ $lang = array (
 	"reg_donthave_uname"						=> 'Nimate uporabni&#154;kega imena',
 	"reg_can_social"							=> 'Prijavite ali registrirate se lahko tudi z uporabni&#154;kim imenom va&#154;ega socialnega omre&#382;ja.',
 	"login_or_register"							=> 'Prijava ali registracija',
-	"srv_not_default_setting"					=> '»Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev«',
+	"srv_not_default_setting"					=> 'Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev.',
 	"srv_dataIcons_write"						=> 'Izvoz posamezne ankete',
 	"srv_dataIcons_labels"						=> 'Labele',
 	"srv_dataIcons_note"						=> 'Ikone:',
diff --git a/lang/2.php b/lang/2.php
index a44c0dfd2..9d0f9faee 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5494,7 +5494,7 @@ $lang = array (
 	"reg_donthave_uname"						=> 'Don\'t have username',
 	"reg_can_social"							=> 'You can also register or login using your social network username.',
 	"login_or_register"							=> 'Login or register',
-	"srv_not_default_setting"					=> '»You have selected your own settings that differ from the default 1KA settings«',
+	"srv_not_default_setting"					=> 'You have selected your own settings that differ from the default 1KA settings.',
 	"srv_dataIcons_write"						=> 'Export survey',
 	"srv_dataIcons_labels"						=> 'Labels',
 	"srv_dataIcons_note"						=> 'Icons',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index dc458b738..3694b39f4 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5467,7 +5467,7 @@ span.faicon.export::before {
 }
 
 span.faicon.file-import::before {
-  content: "";
+  content: "\f56f";
   transform: scaleX(-1);
 }
 
@@ -8157,6 +8157,30 @@ div#div_time_profiles div#renameProfileDiv .setting_holder .setting_item input.t
   width: 469px;
 }
 
+div#div_variable_profiles div#newProfile .setting_holder,
+div#div_variable_profiles div#renameProfileDiv .setting_holder {
+  margin-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+}
+div#div_variable_profiles div#newProfile .setting_holder:first-of-type,
+div#div_variable_profiles div#renameProfileDiv .setting_holder:first-of-type {
+  margin-top: 0;
+}
+div#div_variable_profiles div#newProfile .setting_holder .setting_item,
+div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item {
+  margin-top: 8px;
+}
+div#div_variable_profiles div#newProfile .setting_holder .setting_item label,
+div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item label {
+  margin-right: 0;
+}
+div#div_variable_profiles div#newProfile .setting_holder .setting_item input.text,
+div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item input.text {
+  margin-left: 4px;
+  width: 469px;
+}
+
 /* 
     Header scss - top line, menu...
 */
diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss
index 6c2edd3f8..fd435b5af 100644
--- a/resources/sass/admin_new/components/popup/page_specific.scss
+++ b/resources/sass/admin_new/components/popup/page_specific.scss
@@ -1,4 +1,4 @@
-//STATUS
+/////// STATUS //////////
 
 // Povzetek > Nastavitev obdobja
 div#div_time_profiles {
@@ -64,8 +64,37 @@ div#div_time_profiles {
                     width: 469px;
                 }
             }
-
-
         }
     }
-}
\ No newline at end of file
+}
+
+//Neodgovor spremenljivke >Filtri zgoraj desno
+div#div_variable_profiles {
+    div#newProfile,
+    div#renameProfileDiv {
+
+        .setting_holder {
+            margin-bottom: 16px;
+            display: flex;
+            flex-direction: column;
+    
+            &:first-of-type{
+                margin-top: 0;
+            }
+    
+            .setting_item {
+                margin-top: 8px;
+
+                label {
+                    margin-right: 0;
+                }
+
+                input.text {
+                    margin-left:  4px;
+                    width: 469px;
+                }
+            }
+        }
+    }
+}
+