Napredne nastavitve v sredino vsebine - v3 - arhiv popup

admin/survey/Branching.php

@@ -1675,7 +1675,7 @@ class Branching {
 		
 		echo '<div class="left_settings">';
 		// Arhiviraj - ENKLIK ARHIV
-		echo '<div class="button" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">';
+		echo '<div class="button" onclick="oneClickArchive();">';
 		echo '<span class="faicon arhiv blue"></span>';
 		echo $lang['srv_analiza_arhiviraj'];
 		echo '</div>';

admin/survey/SurveyAdminAjax.php

@@ -7238,6 +7238,32 @@ class SurveyAdminAjax {
 		}
 		echo '</div>';
 	}
+
+	// Enklikarhiv popup
+	private function ajax_oneClickArchive(){
+	    global $lang;
+
+		$anketa = $_POST['anketa'];
+		
+		echo '<h2>'.$lang['srv_analiza_arhiviraj'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
+		
+		
+		echo '<div class="popup_content">';
+		echo '<p class="bottom16">'.$lang['srv_questionnaire_archives_text_popup'].'</p>';
+
+		echo '<div class="setting_holder">';
+		echo $lang['srv_questionnaire_archives_note'].':';
+		echo '<input class="large w400" name="intro_opomba" id="intro_opomba" type="text"/>';
+		echo '</div>';
+		
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="popupClose(); return false;">'.$lang['edit1338'].'</button>';
+        echo '<button class="medium blue" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">'.$lang['srv_backup_button'].'</button>';
+        echo '</div>';
+	}
 }
 
 ?>

admin/survey/script/script.js

@@ -5630,3 +5630,12 @@ function toggleSurveyTopSettings() {
 	$("#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});
+}

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",

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",

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;

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;