From 2f74d2cec89b6de5cd0af12ee4c1cda61a94e6ba Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 24 Feb 2022 13:04:26 +0100 Subject: [PATCH 1/3] [Redizajn 1KA] - Nastavitve --> Izbrisane ankete / Izbrisani podatki - v2 --- admin/survey/SurveyAdminSettings.php | 28 +++++++++---------- public/css/admin_new.css | 8 ++++++ .../admin_new/components/form/button.scss | 7 +++++ 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index bc1e71f1f..9ddb7d52e 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -2313,18 +2313,18 @@ class SurveyAdminSettings { echo '

'.$lang['srv_anketa_deleted_note'].'

'; echo ''; echo ''; - echo ''; + echo ''; + echo ''; echo ''; $table_exists = 1; } echo ''; - echo ''; + echo ''; + echo ''; echo ''; } @@ -2355,20 +2355,20 @@ class SurveyAdminSettings { echo '

'.$lang['srv_data_deleted_note'].'

'; echo '
'.$lang['srv_data_deleted_surveyname'].''; - echo ''.$lang['srv_data_deleted_user'].''; - echo ''; + echo ''.$lang['srv_data_deleted_surveyname'].''.$lang['srv_data_deleted_user'].'
'.$row['naslov'].''; - echo ''.$row['email'].''; - echo ''; + echo ''.$row['naslov'].''.$row['email'].'
'; echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; $table_exists = 1; } echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; } diff --git a/public/css/admin_new.css b/public/css/admin_new.css index f8e854081..60e5490b9 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8703,6 +8703,14 @@ submit.table-inline { margin-left: 16px; white-space: nowrap; } +button.table, +submit.table { + padding: 4px 20px; + width: fit-content; + font-size: 14px; + border-radius: 2px; + white-space: nowrap; +} button.blue, submit.blue { color: #FFFFFF; diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss index 28c93ad44..d2d3de6e0 100644 --- a/resources/sass/admin_new/components/form/button.scss +++ b/resources/sass/admin_new/components/form/button.scss @@ -36,6 +36,13 @@ submit{ margin-left: 16px; white-space: nowrap; } + &.table{ + padding: 4px 20px; + width: fit-content; + font-size: 14px; + border-radius: 2px; + white-space: nowrap; + } // Button colors From 0b7871669f4b273a51450f530d7244c50db96327 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 24 Feb 2022 13:15:36 +0100 Subject: [PATCH 2/3] [Redizajn 1KA] - Podatki --> Uvozi --> Dodaj podatke - v3 --- admin/survey/classes/class.SurveyAppendMerge.php | 5 ++--- lang/1.php | 6 +++--- lang/2.php | 4 ++-- resources/sass/admin_new/components/form/button.scss | 2 ++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/admin/survey/classes/class.SurveyAppendMerge.php b/admin/survey/classes/class.SurveyAppendMerge.php index 85d2ad738..6d940e52a 100644 --- a/admin/survey/classes/class.SurveyAppendMerge.php +++ b/admin/survey/classes/class.SurveyAppendMerge.php @@ -481,13 +481,12 @@ class SurveyAppendMerge { echo '

'.$lang['srv_append-merge_fin'].'

'; echo '
'; - echo ''; + echo ''; echo ''; echo '
'; } if ($import_type == 1){ - echo '

'; echo ''; } } @@ -1042,7 +1041,7 @@ class SurveyAppendMerge { // shranjeno, prikazemo resultat } else { - echo '

'.$lang['fin_import_ok'].'

'; + echo '

'.$lang['fin_import_ok'].'

'; echo '

'.$output.'

'; echo '

'.$lang['fin_import_ok_text'].'

'; diff --git a/lang/1.php b/lang/1.php index 1c9baa0b7..9514237aa 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2643,8 +2643,8 @@ $lang = array ( "bruto" => "Bruto", "cost_label" => "Oznaka stroška", "fin_import_3_of_3" => "Korak 3 od 3: Opravljeno", - "fin_import_ok" => "Podatki so bili uspešno uvoženi", - "fin_import_ok_text" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran)", + "fin_import_ok" => "Podatki so bili uspešno uvoženi", + "fin_import_ok_text" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran).", "fin_show_substm" => "Prikaži tudi podstroškovna mesta", "texts" => "Teksti", "logotype" => "Logotip", @@ -6016,7 +6016,7 @@ $lang = array ( "srv_append-merge_process_o_1" => "V postopku bo združenih", "srv_append-merge_process_o_2" => "vrstic podatkov. Obstoječe vrednosti se bodo prepisale!", "srv_append-merge_error_value" => "Pri združevanju po ključu se nobena od vrednosti ne ujema.", - "srv_append-merge_fin" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran)", + "srv_append-merge_fin" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran).", "srv_question_respondent_comment" => "Vaš komentar k vprašanju", "1cul_select_file" => "Izberite datoteko iz svojega računalnika", diff --git a/lang/2.php b/lang/2.php index 81f3667db..896b76c73 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2621,7 +2621,7 @@ $lang = array ( "cost_label" => "Cosr Label", "fin_import_3_of_3" => "Step 3 of 3: Done", "fin_import_ok" => "The data has been imported successfully", - "fin_import_ok_text" => "New lines are at the bottom of the table (if there are multiple pages of data, select last page)", + "fin_import_ok_text" => "New lines are at the bottom of the table (if there are multiple pages of data, select last page).", "fin_show_substm" => "Show sub-stm", "texts" => "Texts", "logotype" => "Logotype", @@ -5914,7 +5914,7 @@ $lang = array ( "srv_append-merge_process_o_1" => "In the process there will be merged", "srv_append-merge_process_o_2" => "lines of data. Existing values will be overwritten!", "srv_append-merge_error_value" => "There is no match for chosen identifier.", - "srv_append-merge_fin" => "New lines are at the bottom of the table (if data is displayed on multiple pages select last page)", + "srv_append-merge_fin" => "New lines are at the bottom of the table (if data is displayed on multiple pages select last page).", "1cul_select_file" => "Browse and select file from your computer", "1cul_browse" => "Browse", diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss index d2d3de6e0..3587fa37b 100644 --- a/resources/sass/admin_new/components/form/button.scss +++ b/resources/sass/admin_new/components/form/button.scss @@ -28,6 +28,7 @@ submit{ min-width: 160px; font-size: 20px; } + //Gumb v polju zraven teksta ali ikon &.table-inline{ padding: 4px 20px; width: fit-content; @@ -36,6 +37,7 @@ submit{ margin-left: 16px; white-space: nowrap; } + //Sam gumb v polju &.table{ padding: 4px 20px; width: fit-content; From a884433514bf5b25d75f7630fbbaf209577d713b Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 24 Feb 2022 13:42:50 +0100 Subject: [PATCH 3/3] [Redizajn 1KA] - Nastavitve --> Lep URL - v1 --- admin/survey/SurveyAdminSettings.php | 30 ++++++++++++++++++++++++---- lang/1.php | 3 +++ lang/2.php | 5 ++++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 9ddb7d52e..02fd02c4b 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -2261,15 +2261,37 @@ class SurveyAdminSettings { } function anketa_nice_links () { + global $lang; echo '
'; + + echo '
'.$lang['srv_nice_url'].''; $sql = sisplet_query("SELECT l.link, a.id, a.naslov FROM srv_nice_links l, srv_anketa a WHERE a.id=l.ank_id ORDER BY l.link ASC"); - while ($row = mysqli_fetch_array($sql)) { - echo '

'.$row['link'].' '.$row['naslov'].'

'; - } - + $table_exists = 0; + while ($row = mysqli_fetch_array($sql)) { + if ($table_exists == 0) { + echo '

'.$lang['srv_nice_url_note'].'

'; + echo '
'.$lang['srv_data_deleted_surveyname'].''; - echo ''.$lang['srv_data_deleted_user'].''; - echo ''.$lang['srv_data_deleted'].''; - echo ''; + echo ''.$lang['srv_data_deleted_surveyname'].''.$lang['srv_data_deleted_user'].''.$lang['srv_data_deleted'].'
'.$row['naslov'].''; - echo ''.$row['email'].''; - echo ''.$row['deleted'].''; - echo ''; + echo ''.$row['naslov'].''.$row['email'].''.$row['deleted'].'
'; + echo ''; + echo ''; + echo ''; + echo ''; + + $table_exists = 1; + } + + echo ''; + echo ''; + echo ''; + echo ''; + } + + if ($table_exists == 1) + echo '
'.$lang['srv_nice_url_extension'].''.$lang['srv_nice_url_surveyname'].'
'.$row['link'].''.$row['naslov'].'
'; + + echo ''; echo ''; } diff --git a/lang/1.php b/lang/1.php index 9514237aa..1252e2aca 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4495,6 +4495,9 @@ $lang = array ( "srv_nice_url_short" => "je prekratek! Minimalna dolžina so 3 znaki.", "srv_nice_url_long" => "je predolg! Maksimalna dolžina je 20 znakov.", "srv_nice_url_title" => "Anketa ima naslednji URL naslov:", + "srv_nice_url_note" => "V spodnji tabeli je seznam vseh lepih URL povezav na tej namestitvi in povezave do anket, za katere so bile ustvarjene.", + "srv_nice_url_surveyname" => "Ime ankete", + "srv_nice_url_extension" => "Končnica lepe URL povezave", "activate_this_cat_in_edit_db" => "Filter je potrebno aktivirati v urejanju baze, saj trenutno ni obkljukan.", "srv_undecided" => "Nedoločen", "srv_todo" => "Za narediti", diff --git a/lang/2.php b/lang/2.php index 896b76c73..b05df0ee4 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4474,7 +4474,10 @@ $lang = array ( "srv_nice_url_short" => "is too short! Minimal length is 3 characters.", "srv_nice_url_long" => "is too long! Maximal length is 20 characters.", "srv_nice_url_title" => "Survey has the following URL address:", - "activate_this_cat_in_edit_db" => "Filter needs to be activated using 'edit database' as it is currently not checked.", + "srv_nice_url_note" => "The table below lists all the custom URLs on this installation, and the links to the surveys for which they were created." + "srv_nice_url_surveyname" => "Survey name", + "srv_nice_url_extension" => "Custom URl extension", + "activate_this_cat_in_edit_db" => "Filter needs to be activated using 'edit database' as it is currently not checked.", "srv_undecided" => "Undecided", "srv_todo" => "To do", "srv_done" => "Done",