';
+ echo '
';
$sa->showGlobalSettingsLinks();
- echo '
';
- echo '
';
- echo '
';
$sa->showAdditionalSettingsLinks();
echo '
';
- echo '
';
- echo '';
- echo '
';
-
- } else {
- echo '
';
}
+
}
}
}
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.
Več >>",
- "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ži menu v forumu",
"using_mail_template" => "Pri obvečanju se uporablja predloga ki je definirana v skinu",
"SurveyMetaOnly" => "Prikaži survey samo meta adminom",
- "other" => "Ostalo",
"srv_analiza_info" => "Podatki",
"srv_analiza_stVprasanj" => "Vpraš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čite s pomočjo potrditvenih polj.
Vrstni red pa nastavite s premešč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
above content 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";
+