diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 40a03b9e7..0d7756a6a 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -1675,7 +1675,7 @@ class Branching { echo '
'; // Arhiviraj - ENKLIK ARHIV - echo '
'; + echo '
'; echo ''; echo $lang['srv_analiza_arhiviraj']; echo '
'; diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index 7dfc9cce5..4b343c4cc 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -7238,6 +7238,32 @@ class SurveyAdminAjax { } echo '
'; } + + // Enklikarhiv popup + private function ajax_oneClickArchive(){ + global $lang; + + $anketa = $_POST['anketa']; + + echo '

'.$lang['srv_analiza_arhiviraj'].'

'; + echo '
✕
'; + + + echo '
'; + echo '

'.$lang['srv_questionnaire_archives_text_popup'].'

'; + + echo '
'; + echo $lang['srv_questionnaire_archives_note'].':'; + echo ''; + echo '
'; + + echo '
'; + + echo '
'; + echo ''; + echo ''; + echo '
'; + } } ?> \ No newline at end of file diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 9187c562a..65faa9537 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -5629,4 +5629,13 @@ function toggleSurveyTopSettings() { $("#top_napredne_icon").toggleClass("fa-angle-up"); $("#top_napredne_gumb").toggleClass("border_blue"); $("#top_napredne_dropdown").toggleClass("displayNone"); +} + +//Vprašalnik - enklikarhiv gumb +function oneClickArchive(){ + + $('#fade').fadeTo('slow', 1); + $('#general_popup').addClass('PopUpNarrow'); + $('#general_popup').html('').fadeIn('slow'); + $("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id}); } \ No newline at end of file diff --git a/lang/1.php b/lang/1.php index e7046ce63..7623396df 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4226,6 +4226,7 @@ $lang = array ( "srv_archival_version_q" => "Arhivske verzije vprašalnika", "srv_questionnaire_archives" => "Arhivi vprašalnika", "srv_questionnaire_archives_text" => "Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.", + "srv_questionnaire_archives_text_popup" => "Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate v zavihku 'UREJANJE' - 'Arhiv'. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.", "srv_questionnaire_archives_note" => "Opomba k arhivski verziji", "srv_questionnaire_archives_date" => "Datum arhiviranja", "srv_questionnaire_archives_by" => "Arhiviral/-a", diff --git a/lang/2.php b/lang/2.php index 92fc0e255..0a92bc3b2 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4205,6 +4205,7 @@ $lang = array ( "srv_archival_version_q" => "Questionnaire archive", "srv_questionnaire_archives" => "Questionnaire archive", "srv_questionnaire_archives_text" => "Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire in the list below. Each archive version of the questionnaire can be activated. When activated, the archive version is automatically created as a new survey.", + "srv_questionnaire_archives_text_popup" => "Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire. Each archive version of the questionnaire can be activated from the 'EDIT' - 'Archive' tab. When activated, the archive version is automatically created as a new survey.", "srv_questionnaire_archives_note" => "Archive version note", "srv_questionnaire_archives_date" => "Archive date", "srv_questionnaire_archives_by" => "Archived by", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 000108396..f22d6bae7 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -20506,7 +20506,7 @@ img.mapster_el { position: absolute; z-index: 99; width: auto; - padding: 8px 16px; + padding: 8px 0; background: #FFFFFF; border: 1px solid #E5E5E5; box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); @@ -20517,7 +20517,7 @@ img.mapster_el { .top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option { cursor: pointer; white-space: nowrap; - padding: 5px 0; + padding: 5px 16px; font-size: 14px; line-height: 18px; transition: 0.2s; diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss index 506c0392b..119d50834 100644 --- a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss +++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss @@ -47,7 +47,7 @@ z-index: 99; width: auto; - padding: 8px 16px; + padding: 8px 0; background: $white; border: 1px solid $gray; @@ -60,7 +60,7 @@ cursor: pointer; white-space: nowrap; - padding: 5px 0; + padding: 5px 16px; font-size: 14px; line-height: 18px;