From fb2b17c1551cde651eca3a870da3984af02c024c Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Mon, 3 Jan 2022 00:03:07 +0100 Subject: [PATCH] [Redizajn 1KA] - Moje ankete --> Uvoz .1ka datoteke - v1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manjka še placemetn za error message + custom upload gumb. --- admin/survey/classes/class.NewSurvey.php | 16 ++++++---------- lang/1.php | 6 +++--- lang/2.php | 6 +++--- public/css/admin_new.css | 5 ----- .../pages/new_survey_page/right_content.scss | 5 ----- 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php index 88f442cd3..a96008962 100644 --- a/admin/survey/classes/class.NewSurvey.php +++ b/admin/survey/classes/class.NewSurvey.php @@ -270,7 +270,6 @@ class NewSurvey{ echo ''; echo ''; echo ''; - echo '
'; } @@ -480,7 +479,8 @@ class NewSurvey{ // Naslov echo '
' . $lang['srv_newSurvey_survey_archive_title'] . '
'; - echo $lang['srv_newSurvey_survey_archive_text2']; + echo '

'.$lang['srv_newSurvey_survey_archive_text2'].'

'; + echo '

'.$lang['srv_newSurvey_survey_archive_text'].'

'; echo '
'; echo '
'; @@ -491,8 +491,6 @@ class NewSurvey{ echo $lang['srv_arhiv_datoteka_save_txt2'].'.'; - echo '

'.$lang['srv_newSurvey_survey_archive_text'].'.'; - echo '
'; echo '
'; @@ -508,12 +506,10 @@ class NewSurvey{ // Gumba naprej in preklici - echo '
'; - - echo '' . $lang['srv_cancel'] . ''; - echo '' . $lang['next1'] . ''; - - echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; } diff --git a/lang/1.php b/lang/1.php index ff8ac04c2..f85e7756f 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7058,11 +7058,11 @@ $lang = array ( 'srv_newSurvey_survey_copy_paragraph' => "Iz seznama izberi anketo in klikni gumb \"Naprej\". Ustvarila se bo kopija izbrane ankete.", 'srv_newSurvey_survey_copy_dropdown' => "-- Izberi anketo --", 'srv_newSurvey_survey_copy_text' => "Naslov obstoječe ankete", - 'srv_newSurvey_survey_archive' => "Uvoz \".1ka\" datoteke", + 'srv_newSurvey_survey_archive' => "Uvoz .1ka datoteke", 'srv_newSurvey_survey_archive2' => "Uvozi 1ka anketo iz arhiva", - 'srv_newSurvey_survey_archive_title' => "Uvozi 1ka anketo (restavriraj anketo iz arhivske datoteke)", + 'srv_newSurvey_survey_archive_title' => "Restavriraj anketo iz arhivske .1ka datoteke", 'srv_newSurvey_survey_archive_text' => "Iz arhivske datoteke se bo ustvarila kopija arhivirane ankete", - 'srv_newSurvey_survey_archive_text2' => "Uvozite lahko anketo, ki ste jo iz arhiva predhodno shranili kot datoteko v formatu .1ka.", + 'srv_newSurvey_survey_archive_text2' => "Uvozi se lahko anketa, ki je bila v arhivu predhodno shranjena kot datoteka s končnico .1ka.", 'srv_newSurvey_survey_archive_error1' => "Pri uvozu ankete je prišlo do napake. Preverite, če ste izbrali ustrezno datoteko s končnico .1ka.", 'srv_newSurvey_survey_archive_error2' => "Pri uvozu ankete je prišlo do napake. Zbrane datoteke ni mogoče uvoziti.", 'srv_newSurvey_survey_from_text' => "Uvoz besedila", diff --git a/lang/2.php b/lang/2.php index bea7b9581..6312509d6 100644 --- a/lang/2.php +++ b/lang/2.php @@ -6944,11 +6944,11 @@ $lang = array ( 'srv_newSurvey_survey_copy_paragraph' => "Select the survey from the list and click the \"Next\" button. A copy of the selected survey will be created.", 'srv_newSurvey_survey_copy_dropdown' => "-- Choose a survey --", 'srv_newSurvey_survey_copy_text' => "Existing survey title", - 'srv_newSurvey_survey_archive' => "\".1ka\" file import", + 'srv_newSurvey_survey_archive' => ".1ka file import", 'srv_newSurvey_survey_archive2' => "Import 1ka survey from archive", - 'srv_newSurvey_survey_archive_title' => "Import 1ka survey (restore survey from archive file)", + 'srv_newSurvey_survey_archive_title' => "Restore survey from the .1ka archive file", 'srv_newSurvey_survey_archive_text' => "Archived survey copy will be created from the archive file", - 'srv_newSurvey_survey_archive_text2' => "You can import survey from file in .1ka format.", + 'srv_newSurvey_survey_archive_text2' => "A survey can be imported if it was previously saved in the archive as a file with the extension .1ka.", 'srv_newSurvey_survey_archive_error1' => "Import error. Check your selected file for import.", 'srv_newSurvey_survey_archive_error2' => "Import error. Selected .1ka file cannot be imported.", 'srv_newSurvey_survey_from_text' => "Import text", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 109f18669..a1a2eced3 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -14205,11 +14205,6 @@ and open the template in the editor. #new_anketa_div #right_content .fieldset .setting .visual-radio-scale.checked .enka-vizualna-skala::before { color: #1E88E5; } -#new_anketa_div #right_content .fieldset .setting.archive { - margin-top: 20px; - font-weight: 500; - font-size: 14px; -} #new_anketa_div #right_content .fieldset .survey_title_text_holder { display: flex; flex-direction: row; diff --git a/resources/sass/admin_new/pages/new_survey_page/right_content.scss b/resources/sass/admin_new/pages/new_survey_page/right_content.scss index 13a71fc34..837d61e31 100644 --- a/resources/sass/admin_new/pages/new_survey_page/right_content.scss +++ b/resources/sass/admin_new/pages/new_survey_page/right_content.scss @@ -183,11 +183,6 @@ $skin_selector: $red; color: $radio_selector; } } - .setting.archive { - margin-top: 20px; - font-weight: 500; - font-size: 14px; - } .survey_title_text_holder{ display: flex; flex-direction: row;