From a1d34e683a4122fe5d49c308a4b7fd5d3849b3d1 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Tue, 18 Jan 2022 17:02:47 +0100
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20Urejanje=20-->=20Nastavi?=
 =?UTF-8?q?tve=20-->=20Manjkajo=C4=8De=20vrednosti=20-=20v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

V delu.
---
 .../classes/class.SurveyMissingValues.php     | 60 +++++++------------
 lang/1.php                                    | 17 +++---
 lang/2.php                                    |  6 +-
 public/css/admin_new.css                      | 55 +++++++++++------
 .../admin_new/components/form/button.scss     |  4 ++
 .../admin_new/components/table/table.scss     |  4 +-
 .../sass/admin_new/pages/gdpr_pages/gdpr.scss |  2 +
 .../gdpr_pages}/gdpr_tables.scss              |  0
 .../pages/my_surveys/missing_values.scss      | 25 ++++++++
 .../pages/my_surveys/my_surveys.scss          |  2 +
 10 files changed, 104 insertions(+), 71 deletions(-)
 rename resources/sass/admin_new/{components/table => pages/gdpr_pages}/gdpr_tables.scss (100%)
 create mode 100644 resources/sass/admin_new/pages/my_surveys/missing_values.scss

diff --git a/admin/survey/classes/class.SurveyMissingValues.php b/admin/survey/classes/class.SurveyMissingValues.php
index 56c7cdf98..6c4b99ce3 100644
--- a/admin/survey/classes/class.SurveyMissingValues.php
+++ b/admin/survey/classes/class.SurveyMissingValues.php
@@ -472,6 +472,10 @@ class SurveyMissingValues
 
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_survey_missing_title'].':</legend>';
+
+		echo '<p class="bottom16">'.$lang['srv_survey_missing_text'].':</p>';
+
+
 		$_survey_missing_values = self::GetSurveyMissingValues();
 		
 		if (self::$mySqlErrNo == '1062') {
@@ -479,26 +483,21 @@ class SurveyMissingValues
 		}
 		
 		if ( count($_survey_missing_values) > 0 ) {
-			echo '<table class="mv_tbl">';
-			echo '<tr>';
 			
-			echo '<th style="width:50px;">';
-			echo '  <i style="color:gray;text-align:right">'.$lang['srv_filter_vrednost'].'</i>';
-			echo '</th>';
-			echo '<th style="width:250px;">';
-			echo '  <i style="color:gray;">'.$lang['srv_label'].'</i>';
-			echo '</th>';
-			echo '<th style="width:20px;">';
-			echo '  <i style="color:gray;text-align:right">'.'</i>';
-			echo '</th>';
-			echo '<th>&nbsp;</th>';
+			echo '<table id="missing_value_table">';
+			//Table header
+			echo '<tr>';
+			echo '<th class="vrednost">'.$lang['srv_filter_vrednost'].'</th>';
+			echo '<th>'.$lang['srv_label'].'</th>';
+			echo '<th></th>';
 			echo '</tr>';
+			
 			foreach ( $_survey_missing_values as $type => $type_missing_values) {
 				foreach ($type_missing_values AS $type_missing_value) {
 					$key = $type_missing_value['value'];
 					$text = $type_missing_value['text'];
 					$sysValue = $type_missing_value['defSysVal'];
-					echo '<tr class="spr_sysFilter'.$type.'">';
+					echo '<tr>';
 					
 					echo '<td>';
 					echo '<input name="mv_value_input" id="mv_value_'.$type.'_'.$key.'" type="text" value="'.$key.'" class="mv_value_input">';
@@ -506,30 +505,22 @@ class SurveyMissingValues
 					echo '<td>';
 					echo '<input name="mv_text_input" id="mv_text_'.$type.'_'.$key.'" type="text" value="'.$text.'" class="mv_text_input">';
 					echo '</td>';
-					echo '<td class="anl_ac">';
-					if ($sysValue != null) {
-						echo '['.$sysValue.']';
-					}
-					echo '</td>';
 					echo '<td>';
-					echo '&nbsp;<span class="faicon remove smaller orange pointer" name="mv_delete_img" id="mv_img_'.$type.'_'.$key.'" title="'.$lang['srv_filtri_izbrisi_filter'].'"/>';
+					echo '<span class="faicon trash empty blue" name="mv_delete_img" id="mv_img_'.$type.'_'.$key.'" title="'.$lang['srv_filtri_izbrisi_filter'].'"/>';
 					echo '</td>';
 					echo '</tr>';
 				}
 			}
-			echo '<tr class="spr_sysFilter3">';
-			echo '<td>&nbsp;</td>';
-			echo '<td>&nbsp;</td>';
-			echo '<td>';
-			echo '&nbsp;<span name="mv_add_img" id="mv_add_img" class="faicon add icon-blue smaller pointer"></span>';
-			echo '</td>';
-			echo '</tr>';
 			echo '</table>';	
 		}		
 		if ($si_mv == '0') {
 			echo '<span class="mv_link_disabled">'.$lang['srv_survey_missing_default'].'</span><br/>';
 		} else {
-			echo '<span id="link_use_sistem_mv" onclick="useSystemMissingValues(); return false;" class="as_link">'.$lang['srv_survey_missing_default'].'</span><br/>';
+			echo '<span class="pointer blue" name="mv_add_img" id="mv_add_img"><span class="faicon plus_circle link-right"></span>'.$lang['srv_survey_missing_add'].'</span>';
+
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button id="link_use_sistem_mv" class="medium white-black" onClick="useSystemMissingValues(); return false;">'.$lang['srv_survey_missing_default'].'</button>';				
+			echo '</div>';
 		}
 		echo '</div>';
 		
@@ -657,7 +648,7 @@ class SurveyMissingValues
 		echo '<table class="mv_tbl">';
 		echo '<tr>';
 		echo '<th style="width:50px;">';
-		echo '  <i style="color:gray;text-align:right">'.$lang['srv_filter_vrednost'].'</i>';
+		echo '  <i style="color:gray;text-align:right">'.$lang['srv_filter_vrednost'].'test</i>';
 		echo '</th>';
 		echo '<th style="width:250px;">';
 		echo '  <i style="color:gray;">'.$lang['srv_filter_variabla'].'</i>';
@@ -708,21 +699,12 @@ class SurveyMissingValues
 		if ($_REQUEST['a'] != 'missing') {
 			if ($what == 'start') {
 				$sa=new SurveyAdmin(self::$anketa);
-				echo '<span class="floatLeft">';
-				echo '<div id="globalSetingsLinks" class="baseSettings">';
+				echo '<div class="layout_left_item">';
 				$sa->showGlobalSettingsLinks();
-				echo '</div>';
-				echo '<br class="clr"/><br/>';
-				echo '<div id="globalSetingsLinks" class="aditionalSettings">';
 				$sa->showAdditionalSettingsLinks();
 				echo '</div>';
-				echo '<br class="clr"/>';
-				echo '</span>';
-				echo '<div id="globalSetingsList" >';
-				
-			} else {
-				echo '</div>';
 			}
+		
 		}
 	}
 }
diff --git a/lang/1.php b/lang/1.php
index f27eb331a..213886c64 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -415,7 +415,7 @@ $lang = array (
 	"lurker"			=>	"Lurker",
 	"referer"			=>	"Referer",
 	"javascript"		=>	"Javascript",
-	"change"			=>	"Zadnja sprememba",
+	"change"			=>	"Sprememba",
 	"track1"			=>	"Brisanje povezave",
 	"track2"			=>	"Kreiranje povezave",
 	"track3"			=>	"Dodajanje povezave v kategorije novic",
@@ -2419,9 +2419,8 @@ $lang = array (
     "srv_cookie_continue_alert"     =>	 "Če želite izpolniti anketo, se morate strinjati z uporabo piškotka.",
     "srv_block_ip"        			=>	 "Blokiraj ponovni IP naslov",
     "srv_block_ip_warning"       	=>	 "Pozor! Vklop oziroma omejevanje IP naslova ima lahko negativne posledice. <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/uporaba-ip-naslovov-piskotkov-za-nadzor-nad-podvojenimi-vnosi?&from1ka=1\" target=\"_blank\">Več >></a>",
-    "srv_from_library"     		    =>	 "predloga",
-    "srv_last_insrt"                =>	 "Zadnji vnos",
-    "srv_created"                   =>	 "Ustvarjeno",
+    "srv_from_library"     		=>	 "predloga",
+    "srv_last_insrt"        =>	 "Zadnji vnos",
     "srv_anketarestore"        =>	 "Aktiviraj arhivsko verzijo vprašalnika",
     "srv_anketarestoredata"        =>	 "Aktiviraj arhiv podatkov",
     "srv_show_inserts"      =>	 "Enote",
@@ -2695,7 +2694,6 @@ $lang = array (
 	"show_menu_forum"		=>	"Prika&#382;i menu v forumu",
 	"using_mail_template"	=>	"Pri obve&#154;&#269;anju se uporablja predloga ki je definirana v skinu",
 	"SurveyMetaOnly"		=>	"Prika&#382;i survey samo meta adminom",
-	"other"		            =>	"Ostalo",
 	"srv_analiza_info"		=>	"Podatki",
 	"srv_analiza_stVprasanj"	=>	"Vpra&#353;anj",
 	"srv_analiza_stVariable"	=>	"Spremenljivk",
@@ -3047,7 +3045,7 @@ $lang = array (
 	"srv_h_sl_spreminjal"			=>	"Spremenil",
 	"srv_h_sl_trajanjeod"			=>	"Od",
 	"srv_h_sl_trajanjedo"			=>	"Do",
-	"srv_h_sl_stvprasanj"			=>	"št. vprašanj",
+	"srv_h_sl_stvprasanj"			=>	"Št. vprašanj",
 	"srv_h_sl_phone"				=>	"Telefonska anketa",
 	"srv_sl_error_msg"				=>	"Vidnost posameznih stolpcev lahko vklju&#269;ite s pomo&#269;jo potrditvenih polj.<br>Vrstni red pa nastavite s preme&#353;&#269;anjem posameznih elementov.",
 	"srv_sl_setting_show"			=>	"Prikaži ",					
@@ -3460,7 +3458,6 @@ $lang = array (
 	"srv_info_variables"			=>	"Spremenljivk",
 	"srv_info_pages"				=>	"Strani", 
 	"srv_info_answers"				=>	"Odgovorov",
-	"srv_info_answers_no"		    =>	"Št. odgovorov",
 	"srv_info_answers_valid"		=>	"Ustreznih",
 	"srv_info_type"					=>	"Tip ankete",
 	"srv_info_author"				=>	"Avtor",
@@ -4459,10 +4456,12 @@ $lang = array (
 	"srv_email_vabila_simple_popup_title"       =>	"Enostavna vabila - brez sledenja",
 	"srv_here"									=>	"tukaj",
 	"srv_email_simple_button"              		=>	"Oblikuj email sporočilo",
-	"srv_survey_missing_title"					=>	"Manjkajoče vrednosti uporabljene v anketi", 
+	"srv_survey_missing_title"					=>	"Manjkajoče vrednosti", 
+	"srv_survey_missing_text"					=>	"Po meri spremenite vrednosti in labele, ki so označene kot manjkajoče vrednosti.",
 	"srv_survey_missing_system"					=>	"Sistemske manjkajoče vrednosti", 
 	"srv_survey_missing_special"				=>	"Posebne manjkajoče vrednosti (na nivoju ankete)", 
-	"srv_survey_missing_default"				=>	"Uporabi privzeto (sistemske manjkajoče vrednosti)",
+	"srv_survey_missing_default"				=>	"Ponastavi na privzeto",
+	"srv_survey_missing_add"					=>	"Dodaj manjkajočo vrednost",
 	"srv_survey_missing_error1"					=>	"Napaka! Ta manjkajoča vrednost že obstaja!", 
 	"srv_survey_missing_error2"					=>	"Anketa še nima nastavljenih manjkajočih vrednosti.",
 	"srv_stolpci"								=>	"Prikaži kategorije v večih stolpcih",
diff --git a/lang/2.php b/lang/2.php
index 0de5788e8..91580fd38 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4436,10 +4436,12 @@ $lang = array (
 	"ShowLikeAbove_rec"							=>	"'Like' button <strong>above content</strong> enabled",
 	"srv_here"              					=>	"here",
 	"srv_email_simple_button"              	=>	"Format email invitation",
-	"srv_survey_missing_title"					=>	"Missing values used in survey",
+	"srv_survey_missing_title"					=>	"Missing values",
+	"srv_survey_missing_text"					=>	"Modify the values and labels marked as missing values.",
 	"srv_survey_missing_system"					=>	"System missing values",
 	"srv_survey_missing_special"				=>	"Special missing values!",
-	"srv_survey_missing_default"				=>	"Apply the default (system missing values)",					
+	"srv_survey_missing_add"					=>	"Add missing value",
+	"srv_survey_missing_default"				=>	"Reset to default",					
 	"srv_survey_missing_error1"					=>	"Error! This missing value already exists!",
 	"srv_survey_missing_error2"					=>	"There is not set any missing values for this survey.",
 	"srv_stolpci"								=>	"Display categories in multiple columns",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1413c09b3..9fd2393da 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10525,6 +10525,9 @@ div.button_holder button {
 div.button_holder.bottom16 {
   margin-bottom: 16px;
 }
+div.button_holder.top16 {
+  margin-top: 16px;
+}
 div.button_holder.bottom0 {
   margin-bottom: 0px;
 }
@@ -10876,24 +10879,6 @@ div .table-horizontal-scroll-wrapper2 table {
   margin: 0px;
 }
 
-table.gdpr_surveys tr.red_row td {
-  background-color: #FFEFEF !important;
-}
-table.gdpr_surveys tr.green_row td {
-  background-color: #a8eea8 !important;
-}
-table.gdpr_surveys.requests td div.gdpr_requests_wrap {
-  max-width: 204px;
-  min-width: 204px;
-  overflow-wrap: break-word;
-  white-space: normal;
-  padding: 8px 0px;
-}
-
-div#gdrp_requests_unresolved {
-  margin-bottom: 32px;
-}
-
 /* 
     Specific pages scss
 */
@@ -11458,6 +11443,22 @@ li.top16 {
   margin-top: 16px;
 }
 
+#missing_value_table td input {
+  border-radius: 4px;
+  height: 26px;
+  font-size: 16px;
+  padding: 9px 7px;
+}
+#missing_value_table td input.mv_value_input {
+  width: 64px;
+}
+#missing_value_table td input.mv_text_input {
+  width: 215px;
+}
+#missing_value_table td span.faicon {
+  font-size: 20px;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */
@@ -14628,6 +14629,24 @@ textarea#addusers, textarea#addusers_note {
   height: 120px;
 }
 
+table.gdpr_surveys tr.red_row td {
+  background-color: #FFEFEF !important;
+}
+table.gdpr_surveys tr.green_row td {
+  background-color: #a8eea8 !important;
+}
+table.gdpr_surveys.requests td div.gdpr_requests_wrap {
+  max-width: 204px;
+  min-width: 204px;
+  overflow-wrap: break-word;
+  white-space: normal;
+  padding: 8px 0px;
+}
+
+div#gdrp_requests_unresolved {
+  margin-bottom: 32px;
+}
+
 div.setting_holder.red label {
   color: red;
 }
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index e607f021c..16acc9960 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -115,6 +115,10 @@ div.button_holder {
         margin-bottom: 16px;
     }
 
+    &.top16 {
+        margin-top: 16px;
+    }
+
     &.bottom0 {
         margin-bottom: 0px;
     }
diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss
index 062057427..0a572142e 100644
--- a/resources/sass/admin_new/components/table/table.scss
+++ b/resources/sass/admin_new/components/table/table.scss
@@ -73,6 +73,4 @@ div {
         margin: 0px;
       }
   }
-}
-
-@import "gdpr_tables";
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/gdpr_pages/gdpr.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr.scss
index a682e1496..bbf1c8382 100644
--- a/resources/sass/admin_new/pages/gdpr_pages/gdpr.scss
+++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr.scss
@@ -1,3 +1,5 @@
+@import "gdpr_tables";
+
 //Obvezna polja obarvana z rdečo
 div.setting_holder.red {
     label {
diff --git a/resources/sass/admin_new/components/table/gdpr_tables.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
similarity index 100%
rename from resources/sass/admin_new/components/table/gdpr_tables.scss
rename to resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
diff --git a/resources/sass/admin_new/pages/my_surveys/missing_values.scss b/resources/sass/admin_new/pages/my_surveys/missing_values.scss
new file mode 100644
index 000000000..1aba48814
--- /dev/null
+++ b/resources/sass/admin_new/pages/my_surveys/missing_values.scss
@@ -0,0 +1,25 @@
+#missing_value_table {
+
+    td {
+        input {
+
+            border-radius: 4px;
+            height: 26px;
+            font-size: 16px;
+            padding: 9px 7px;
+
+            &.mv_value_input {
+                width: 64px;
+            }
+
+            &.mv_text_input {
+                width: 215px;
+            }
+        }
+
+        span.faicon {
+            font-size: 20px;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
index 4c73ccc23..5765cfa24 100644
--- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
+++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
@@ -5,3 +5,5 @@
 
 @import "archives";
 @import "import_export";
+@import "missing_values";
+