Merge branch 'master' of https://git.1ka.si/git/1ka

# Conflicts:
#	public/css/admin_new.css

admin/survey/SurveyAdmin.php

@@ -3019,26 +3019,28 @@ class SurveyAdmin
             $_GET['m'] = M_EXPORT_SPSS;
         }
 
-        echo '<ul>';
+        echo '<ul class="menu_left-list">';
+
+        echo '<span class="menu_left-title">'.$lang['srv_survey_archives'].'</span>';
 
         # SPSS
-        echo '<li ' . ($_GET['m'] == M_EXPORT_SPSS ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_SPSS ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_SPSS . '" title="' . $lang['srv_lnk_spss'] . '"><span>' . $lang['srv_lnk_spss'] . '</span></a></li> ';
 
         # SPSS SAV
-        echo '<li ' . ($_GET['m'] == M_EXPORT_SAV ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_SAV ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_SAV . '" title="' . $lang['srv_lnk_sav'] . '"><span>' . $lang['srv_lnk_sav'] . '</span></a></li> ';
 
         # EXCEL - XLS
-        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL_XLS ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL_XLS ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_EXCEL_XLS . '" title="' . $lang['srv_lnk_excel_xls'] . '"><span>' . $lang['srv_lnk_excel_xls'] . '</span></a></li> ';
 
         # EXCEL - CSV
-        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_EXCEL . '" title="' . $lang['srv_lnk_excel'] . '"><span>' . $lang['srv_lnk_excel'] . '</span></a></li> ';
 
         # TXT
-        echo '<li ' . ($_GET['m'] == M_EXPORT_TXT ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_TXT ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_TXT . '" title="' . $lang['srv_lnk_txt'] . '"><span>' . $lang['srv_lnk_txt'] . '</span></a></li> ';
 
         echo '</ul>';
@@ -3053,19 +3055,19 @@ class SurveyAdmin
 
         echo '<ul>';
         # kalkulacija - nove spremenljivke
-        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_CALCULATION ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_CALCULATION ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=' . M_COLLECT_DATA_CALCULATION . '" title="' . $lang['srv_data_subnavigation_calculaion'] . '"><span>' . $lang['srv_data_subnavigation_calculaion'] . '</span></a></li> ';
 
         # kodiranje - coding
-        echo '<li ' . ($_GET['m'] == 'coding_auto' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'coding_auto' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=coding_auto" title="' . $lang['srv_auto_coding'] . '"><span>' . $lang['srv_auto_coding'] . '</span></a></li> ';
 
         # kodiranje - coding
-        echo '<li ' . ($_GET['m'] == 'coding' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'coding' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=coding" title="' . $lang['srv_hand_coding'] . '"><span>' . $lang['srv_hand_coding'] . '</span></a></li> ';
 
         # rekodiranje - recoding
-        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=' . M_COLLECT_DATA_RECODING . '" title="' . $lang['srv_data_subnavigation_recode'] . '"><span>' . $lang['srv_data_subnavigation_recode'] . '</span></a></li> ';
 
         echo '</ul>';
@@ -3081,11 +3083,11 @@ class SurveyAdmin
         echo '<ul>';
 
         # append
-        echo '<li ' . ($_GET['m'] == 'append' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'append' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=append" title="' . $lang['srv_data_subnavigation_append'] . '"><span>' . $lang['srv_data_subnavigation_append'] . '</span></a></li> ';
 
         # merge
-        echo '<li ' . ($_GET['m'] == 'merge' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'merge' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=merge" title="' . $lang['srv_data_subnavigation_merge'] . '"><span>' . $lang['srv_data_subnavigation_merge'] . '</span></a></li> ';
 
         echo '</ul>';
@@ -3301,7 +3303,7 @@ class SurveyAdmin
             # Volitve
             global $mysql_database_name;
             if ($admin_type == 0 || $mysql_database_name == 'test1kasi') {
-                echo '<li ' . ($get == A_VOTING ? 'class="active"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($get == A_VOTING ? 'class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_VOTING.'" title="' . $lang['srv_vrsta_survey_type_18'] . '" '.(!$userAccess->checkUserAccess($what='voting') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_18'] . '</a></li> ';
             }
 

admin/survey/SurveyAdminSettings.php

@@ -4633,7 +4633,7 @@ class SurveyAdminSettings {
     				   
 		$row = SurveyInfo::getInstance()->getSurveyRow();
 		
-		echo '<div id="div_analiza_filtri_right" class="floatRight export">';
+		/**echo '<div id="div_analiza_filtri_right" class="floatRight export">';
 		echo '<ul>';
 
 		if($_GET['m'] != 'export_PDF'){
@@ -4657,7 +4657,7 @@ class SurveyAdminSettings {
 		SurveyTimeProfiles::DisplayLink(false,true);
 		
 		echo '</ul>';
-		echo '</div>';
+		echo '</div>';**/ //----- zakomentirano, ker se je pri izvotih prikazovalo dvojno @TG
 		
 
 		if($_GET['m'] != 'export_PDF'){
@@ -4704,17 +4704,31 @@ class SurveyAdminSettings {
 		
 			echo '<fieldset><legend>'.$lang['srv_lnk_excel'].'</legend>';
 		
-			echo $lang['srv_izvoz_Excel_note'];	
+			echo $lang['srv_izvoz_Excel_note_a'];
-			echo $lang['srv_izvoz_Excel_note_2'];
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="doExcelExport(); return false;">'.$lang['srv_izvoz_Excel_file'].'</button>';              
+            echo '</div>';
+			echo '<p class="top16">'.$lang['srv_izvoz_Excel_note_b'].'</p>';
 			
-			echo '<p class="strong">'.$lang['srv_izvoz_Excel_settings'].'</p>';
+			echo '<p class="top16 bottom16">'.$lang['srv_izvoz_Excel_note_2'].'</p>';
-			echo '<p>';
-			echo '<label>'.$lang['srv_expor_excel_cell_delimiter'].'</label>';			
-			echo '<label><input type="radio" name="export_delimit" id="export_delimit_semicolon" value="0" onchange="excelExportChangeDelimit(); return false;" checked="checked"/>'.$lang['srv_expor_excel_cell_delimiter1'].'</label>';
-			echo '<label><input type="radio" name="export_delimit" id="export_delimit_coma" value="1" onchange="excelExportChangeDelimit(); return false;"/>'.$lang['srv_expor_excel_cell_delimiter2'].'</label>';
-			echo '</p>';
 			
-			echo '<p>';
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_expor_excel_cell_delimiter'].'</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_delimit" id="export_delimit_semicolon" value="0" onchange="excelExportChangeDelimit(1); return false;" checked="checked"/>';
+			echo '<label for="export_delimit_semicolon">'.$lang['srv_expor_excel_cell_delimiter1'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_delimit" id="export_delimit_coma" value="1" onchange="excelExportChangeDelimit(2); return false;"/>';
+			echo '<label for="export_delimit_coma">'.$lang['srv_expor_excel_cell_delimiter2'].'</label>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="setting_holder">';
+			
+			/**echo '<p>';
 			echo '<div id="replace_export_delimit_semicolon">';
 			echo '<span>';
 			echo $lang['srv_export_replace1'].' <input type="text" value=";" name="replace_what0[]" id="replace_what_0" size="1">';			
@@ -4728,10 +4742,13 @@ class SurveyAdminSettings {
 			echo '</span>';			
 			echo '</div>';
 			echo '</p>';
+			echo '</div>'**/ //zakomentirano - za odsranit nastavitev @TG
 
-			echo '<p>';	
+
-			echo '<label><input type="checkbox" name="export_labels" id="export_labels" checked="checked" value="1"/>'.$lang['srv_export_texts'].'</label>';
+			echo '<div class="setting_holder">';
-			echo '<p>';
+			echo '<input type="checkbox" name="export_labels" id="export_labels" checked="checked" value="1"/>';
+			echo '<label for="export_labels">'.$lang['srv_export_texts'].'</label>';
+			echo '</div>';
 			
 			echo '</fieldset>';
 			
@@ -4745,20 +4762,69 @@ class SurveyAdminSettings {
 		elseif ($_GET['m'] == M_EXPORT_SPSS) {		
 		
 			echo '<fieldset><legend>'.$lang['srv_lnk_spss'].'</legend>';			
-			echo $lang['srv_izvoz_SPSS_faq'];
+			echo '<p class="bottom16">'.$lang['srv_izvoz_SPSS_faq'].'</p>';
-			echo $lang['srv_izvoz_SPSS_note'];		
+			echo '<p class="bottom16">'.$lang['srv_izvoz_SPSS_note'].'</p>';
+
+				
+			echo '<p class="bold">'.$lang['srv_izvoz_step1'].'</p>';
+			echo '<div class="export_indent">';
+			echo '<p>'.$lang['srv_izvoz_step1_SPSS'].'</p>';
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="doSpssExport(\'yes\'); return false;">'.$lang['srv_izvoz_step1_SPSS_file'].'</button>';              
+			echo '</div>';
+			echo '</div>';
+
+			echo '<p class="bold">'.$lang['srv_izvoz_step2'].'</p>';
+			echo '<div class="export_indent">';
+			echo '<p>'.$lang['srv_izvoz_step2a_SPSS'].'</p>';
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="doSpssExport(\'no\'); return false;">'.$lang['srv_izvoz_step2_SPSS_file'].'</button>';              
+			echo '</div>';
+			echo '<p class="top16">'.$lang['srv_izvoz_step2b_SPSS'].'</p>';
+			echo '</div>';
+
+			echo '<p class="bold">'.$lang['srv_izvoz_step3'].'</p>';
+			echo '<div class="export_indent">';
+			echo '<ul>';
+			echo '<li>'.$lang['srv_izvoz_step3a_SPSS'].'</li>';
+			echo '<li>'.$lang['srv_izvoz_step3b_SPSS'].'</li>';
+			echo '<li class="no_bullet top16">'.$lang['srv_izvoz_step3c_SPSS'].'</li>';
+			echo '</ul>';
+			echo '</div>';
+
+			echo '<p class="bold">'.$lang['srv_izvoz_step4'].'</p>';
+			echo '<div class="export_indent">';
+			echo '<p>'.$lang['srv_izvoz_step4_SPSS'].'</p>';
+			echo '</div>';
+
+			echo '<p class="bold">'.$lang['srv_izvoz_step5'].'</p>';
+			echo '<div class="export_indent">';
+			echo '<p>'.$lang['srv_izvoz_step5_SPSS'].'</p>';
+			echo '</div>';
+
+		
+
 			echo '</fieldset>';
 		} 
 		elseif ($_GET['m'] == M_EXPORT_SAV) {	
 		
 			echo '<fieldset><legend>'.$lang['srv_lnk_sav'].'</legend>';	
-			echo $lang['srv_izvoz_SAV_note'];			
+			echo $lang['srv_izvoz_SAV_note1'];
+			echo '<div class="button_holder">';
+            echo '<button class="medium blue" onclick="doSAVExport(); return false;">'.$lang['srv_izvoz_SAV_file'].'</button>';              
+            echo '</div>';
+			echo '<p class="top16">'.$lang['srv_izvoz_SAV_note2a'].'<a href="index.php?anketa=' . $this->anketa . '&a=export&m=spss">'.$lang['srv_izvoz_SAV_note2b'].'</a>'.$lang['srv_izvoz_SAV_note2c'].'</p>';
+
 			echo '</fieldset>';
 		} 
 		elseif ($_GET['m'] == M_EXPORT_TXT) {
 		
 			echo '<fieldset><legend>'.$lang['srv_lnk_txt'].'</legend>';
 			echo $lang['srv_izvoz_txt_note'];
+			echo '<div class="button_holder">';
+            echo '<button class="medium blue" onclick="doTxtExport(); return false;">'.$lang['srv_izvoz_txt_file'].'</button>';              
+            echo '</div>';
+	
 			echo '</fieldset>';	
 		} 
 		elseif ($_GET['m'] == 'export_PDF') {

admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php

@@ -3566,67 +3566,55 @@ class SurveyInvitationsNew {
 
 		if (mysqli_num_rows($sql_query) > 0 || count($simple_recipents) > 0) {
 
-			echo '<h2>'.$lang['srv_archive_invitation'].'</h2>';	
+			echo '<fieldset><legend>'.$lang['srv_archive_invitation'].'</legend>';
+
+			echo '<p class="bottom16">'.$lang['srv_archive_invitation_text'].'</p>';
+
+			echo '<p class="bold">'.$lang['srv_archive_invitation_text2'].'</p>';
+			
+			echo '<div class="table-horizontal-scroll-wrapper1">';
+			echo '<div class="table-horizontal-scroll-wrapper2">';
 			
 			echo '<table id="tbl_archive_list">';
 			echo '<tr>';
-			echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_date_send'].'">'.$lang['srv_inv_archive_date_send'].'</th>';
+			echo '<th class="lead_column" title="'.$lang['srv_inv_archive_date_send'].'">'.$lang['srv_inv_archive_date_send'].'</th>';
-			echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_hour_send'].'">'.$lang['srv_inv_archive_hour_send'].'</th>';
 			echo '<th title="'.$lang['srv_inv_archive_subject_text'].'">'.$lang['srv_inv_archive_naslov'].'</th>';
 			echo '<th title="'.$lang['srv_inv_archive_subject_text'].'">'.$lang['srv_inv_archive_subject_text'].'</th>';
-			#echo '<th title="'.$lang['srv_inv_archive_body_text'].'">'.$lang['srv_inv_archive_body_text'].'</th>';
+			echo '<th title="'.$lang['srv_inv_archive_cnt_succsess'].'">'.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').'</th>';
-			echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_message_type'].'">'.$lang['srv_inv_message_type'].'</th>';
+			echo '<th title="'.$lang['srv_inv_archive_cnt_error'].'">'.$lang['srv_inv_archive_cnt_error'].'</th>';
-			echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_cnt_succsess'].'">'.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').'</th>';
-			echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_cnt_error'].'">'.$lang['srv_inv_archive_cnt_error'].'</th>';
 			echo '<th title="'.$lang['srv_inv_archive_sender'].'">'.$lang['srv_inv_archive_sender'].'</th>';
 			echo '<th title="'.$lang['srv_inv_archive_comment'].'">'.$lang['srv_inv_archive_comment'].'</th>';
-			#echo '<th >&nbsp;</th>';
 			echo '</tr>';
+			
 			while ($row = mysqli_fetch_assoc($sql_query)) {
 				echo '<tr>';
 				
-				// Datum
+				// Datum in ura
-				echo '<td class="tbl_inv_center">'.$row['ds'].'</td>';
+				echo '<td class="lead_column">'.$row['ds'].' '.$row['hs'].'</td>';
-				
-				// Ura
-				echo '<td class="tbl_inv_center">'.$row['hs'].'</td>';
 				
 				// Email sporocilo
-				echo '<td class="tbl_inv_lef inv_arch_subject" title="'.$row['naslov'].'">';
+				echo '<td title="'.$row['naslov'].'">';
 				echo '<a href="#" onclick="inv_arch_edit_details(\''.$row['id'].'\'); return false;">'.$row['naslov'].'</a>';
 				echo '</td>';
 				
 				// Subject
-				echo '<td class="tbl_inv_lef inv_arch_subject" title="'.$row['naslov'].'">';
+				echo '<td title="'.$row['naslov'].'">';
 				echo $row['subject_text'];
 				echo '</td>';
-				#echo '<td class="tbl_inv_left inv_arch_text" title="'.$row['body_text'].'">'.$row['body_text'].'</td>';
-				
-				// Nacin posiljanja (email, posta, sms...)
-				echo '<td class="tbl_inv_center">';
-				if ($row['tip'] == '0')
-					echo '<span>'.$lang['srv_inv_message_noemailing_type1'].'</span>';
-				elseif($row['tip'] == '1')
-					echo '<span>'.$lang['srv_inv_message_noemailing_type2'].'</span>';
-				elseif($row['tip'] == '2')
-					echo '<span>'.$lang['srv_inv_message_noemailing_type3'].'</span>';
-				else
-					echo '<span>'.$lang['email'].'</span>';
-				echo '</td>';				
 				
 				# uspešno poslani
-				echo '<td class="tbl_inv_center">';
+				echo '<td class="right">';
 				if ((int)$row['cnt_succsess'] > 0 ) {
-					echo '<span class="as_link as_view strong" id="inv_arch_1_'.$row['id'].'" data-archtype="succ">'.$row['cnt_succsess'].'</span>';
+					echo '<span class="as_link as_view" id="inv_arch_1_'.$row['id'].'" data-archtype="succ">'.$row['cnt_succsess'].'</span>';
 				} else {
 					echo '<span>'.$row['cnt_succsess'].'</span>';
 				}
 				echo '</td>';
 				
 				# neuspešno poslani
-				echo '<td class="tbl_inv_center">';
+				echo '<td class="right">';
 				if ((int)$row['cnt_error'] > 0 ) {
-					echo '<span class="as_link as_view strong" id="inv_arch_0_'.$row['id'].'" data-archtype="err">'.$row['cnt_error'].'</span>';
+					echo '<span class="as_link as_view" id="inv_arch_0_'.$row['id'].'" data-archtype="err">'.$row['cnt_error'].'</span>';
 				} else {
 					echo '<span>'.$row['cnt_error'].'</span>';
 				}
@@ -3647,7 +3635,7 @@ class SurveyInvitationsNew {
 				
 				# komentar
 				echo '<td>';
-				echo '<a href="#" onclick="inv_arch_edit_details(\''.$row['id'].'\'); return false;">'.$row['comment'];
+				echo (($row['comment'] == "") ? '/' : $row['comment']);
 				echo '</td>';
 				
 				echo '</tr>';
@@ -3655,6 +3643,9 @@ class SurveyInvitationsNew {
 			echo '</tr>';
 			echo '</table>';
 
+			echo '</div>';
+			echo '</div>';
+				
 			# dodamo simpl pošiljanje
 			if ( count($simple_recipents) > 0 ) {
 				if (mysqli_num_rows($sql_query) > 0) {
@@ -3693,19 +3684,15 @@ class SurveyInvitationsNew {
 				echo '</table>';
 			}
 
-		} else {
+		} else { //Če ni še nobenih poslanih vabil
-			echo '<fieldset>';
-			echo '<legend>'.$lang['srv_archive_invitation'].'</legend>';
 		
 			echo $lang['srv_invitation_note4'].'';
 			
-			echo '</fieldset>';
 		}
 
-		
+		echo '</fieldset>';
 			
 		echo '</div>'; # id="div_archive_content">';
-		echo '<br class="clr">';
 
 	}
 
@@ -4685,9 +4672,11 @@ class SurveyInvitationsNew {
 		echo '</div>'; // id="arc_content"
 		echo '<div class="inv_FS_btm">';
 		echo '<div id="navigationBottom" class="printHide">';
-		echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
+
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+		echo '<div class="button_holder">';
-		echo '<div class="clr" />';
+		echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';              
+		echo '<button class="medium blue" onclick="inv_arch_save_comment(); return false;">'.$lang['save'].'</button>';
+		echo '</div>';
 		echo '</div>';
 
 		echo '</div>';
@@ -6694,9 +6683,9 @@ class SurveyInvitationsNew {
 		echo '</div>'; // id="arc_content"
 		echo '<div class="inv_FS_btm">';
 		echo '<div id="navigationBottom" class="printHide">';
-		#echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
+		echo '<div class="button_holder">';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+		echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';              
-		echo '<div class="clr" />';
+		echo '</div>';
 		echo '</div>';
 		
 		echo '</div>';
@@ -6872,9 +6861,9 @@ class SurveyInvitationsNew {
 		
 		echo '<div class="inv_FS_btm">';
 		echo '<div id="navigationBottom" class="printHide">';
-		#echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
+		echo '<div class="button_holder">';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+		echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';              
-		echo '<div class="clr" />';
+		echo '</div>';
 		echo '</div>';
 
 		echo '</div>';
@@ -6917,9 +6906,10 @@ class SurveyInvitationsNew {
 		echo '</div>'; // id="arc_content"
 		echo '<div class="inv_FS_btm">';
 		echo '<div id="navigationBottom" class="printHide">';
-		echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
+		echo '<div class="button_holder">';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+		echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';              
-		echo '<div class="clr" />';
+		echo '<button class="medium blue" onclick="inv_arch_save_comment(); return false;">'.$lang['save'].'</button>';
+		echo '</div>';
 		echo '</div>';
 
 		echo '</div>';
@@ -6958,11 +6948,10 @@ class SurveyInvitationsNew {
 		echo '</div>'; // id="arc_content"
 		echo '<div class="inv_FS_btm">';
 		echo '<div id="navigationBottom" class="printHide">';
-		#echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
+		echo '<div class="button_holder">';
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
+		echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';              
-		echo '<div class="clr" />';
+		echo '</div>';
 		echo '</div>';
-
 		echo '</div>';
 	}
 

admin/survey/classes/tracking/CrossRoad.php

@@ -268,6 +268,9 @@ class CrossRoad {
 
                     $layout_width = 'wide';
                     
+                    if ($_GET['m'] == 'view_archive')
+                        $layout_menu = "menu_left";
+
                     $status = 5;
 
                     break;

admin/survey/classes/tracking/TrackingClass.php

@@ -120,12 +120,6 @@ class TrackingClass
         echo '<fieldset>';
         echo '<legend>' . $lang['srv_survey_archives_tracking_' . $this->sub] . '</legend>';
 
-        // Izvoz v Excel
-        echo '<p><a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">Download Excel</a></p>';
-
-
-        echo '<table id="tracking">';
-
         // Tabela s podatki o spremembah podatkov
         if ($this->sub == 'data') {
 
@@ -138,20 +132,33 @@ class TrackingClass
 							OR (`get` LIKE \'%urejanje: "1"%\' AND status=\'4\')
 						)';
 
+            
+            // Vrstice s podatki
+            $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
+            
+            if(!empty(mysqli_fetch_array($sql))) {
+
+                echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1b'].' <a href="index.php?anketa=' . $this->anketa . '&a=data">\'<span class="caps">'.$lang['navigation_NAVI_RESULTS'].'</span>\' - \''.$lang['navigation_NAVI_DATA'].'\'</a> '.$lang['srv_survey_archives_tracking_survey_text1c'].'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
+
+                // Izvoz v Excel
+                echo '<div class="izvoz_nad_tabelo">';
+                echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
+                echo '</div>';
+
+                echo '<table id="tracking">';
                 // Prva vrstica
                 echo '<tr>';
                 echo '	<th>' . $lang['date'] . '</th>';
-            echo '	<th>User</th>';
+                echo '	<th>' . $lang['user'] . '</th>';
-            echo '	<th class="center">IP</th>';
+                echo '	<th>IP</th>';
-            echo '	<th class="center">Recnum</th>';
+                echo '	<th>Respondent</th>';
                 echo '	<th>GET</th>';
                 echo '	<th>POST</th>';
                 echo '</tr>';
 
-            // Vrstice s podatki
+                $count = 0;
-            $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
                 while ($row = mysqli_fetch_array($sql)) {
-                echo '<tr>';
+                    echo '<tr '.($count > 24 ? 'class="displayNone"' : '').'>';
 
                     $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
                     $rowu = mysqli_fetch_array($sqlu);
@@ -197,15 +204,24 @@ class TrackingClass
                     } else
                         $recnum = 0;
 
-                echo '	<td>' . datetime($row['datetime']) . '</td>';
+                    echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
-                echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
+                    echo '	<td><div class="no_wrap">' . $rowu['name'] . ' ' . $rowu['surname'] . '</div></td>';
-                echo '	<td class="center">' . $row['ip'] . '</td>';
+                    echo '	<td>' . $row['ip'] . '</td>';
-                echo '	<td class="center">' . $recnum . '</td>';
+                    echo '	<td>' . $recnum . '</td>';
-                echo '	<td>' . $row['get'] . '</td>';
+                    echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
-                echo '	<td>' . $row['post'] . '</td>';
+                    echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
                     echo '</tr>';
+
+                    $count++;
                 }
+            }
+            else {
+                echo '<p class="bottom16">'.ucfirst($lang['srv_survey_archives_tracking_survey_text1b']).' <a href="index.php?anketa=' . $this->anketa . '&a=data">\'<span class="caps">'.$lang['navigation_NAVI_RESULTS'].'</span>\' - \''.$lang['navigation_NAVI_DATA'].'\'</a> '.$lang['srv_survey_archives_tracking_survey_text1d'].'.</p>';
+
+            }
+            
+            
         } // Tabela s podatki o spremembah - vse oz. merge/append
         else {
 
@@ -230,32 +246,47 @@ class TrackingClass
             else
                 $appendMerge = "";
 
+
+            // Vrstice s podatki
+            $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
+            
+            if(!empty(mysqli_fetch_array($sql))) {
+
+                echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].'. '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
+
+                // Izvoz v Excel
+                echo '<div class="izvoz_nad_tabelo">';
+                echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
+                echo '</div>';
+                
+                echo '<table id="tracking">';
                 // Prva vrstica
                 echo '<tr>';
                 echo '	<th>' . $lang['date'] . '</th>';
-            echo '	<th>User</th>';
+                echo '	<th>' . $lang['user'] . '</th>';
-            echo '	<th class="center">IP</th>';
+                echo '	<th>IP</th>';
-            echo '	<th class="center">Podstran</th>';
+                echo '	<th>Podstran</th>';
                 echo '	<th>GET</th>';
                 echo '	<th>POST</th>';
                 echo '</tr>';
             
-            // Vrstice s podatki
+                $count = 0;
-            $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
                 while ($row = mysqli_fetch_array($sql)) {
-                echo '<tr>';
+                    echo '<tr '.($count > 24 ? 'class="displayNone"' : '').'>';
 
                     $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
                     $rowu = mysqli_fetch_array($sqlu);
 
-                echo '	<td>' . datetime($row['datetime']) . '</td>';
+                    echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
-                echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
+                    echo '	<td><div class="no_wrap">' . $rowu['name'] . ' ' . $rowu['surname'] . '</div></td>';
-                echo '	<td class="center">' . $row['ip'] . '</td>';
+                    echo '	<td>' . $row['ip'] . '</td>';
-                echo '	<td class="center">' . $statuses[$row['status']] . '</td>';
+                    echo '	<td>' . $statuses[$row['status']] . '</td>';
-                echo '	<td>' . $row['get'] . '</td>';
+                    echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
-                echo '	<td>' . $row['post'] . '</td>';
+                    echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
                     echo '</tr>';
+                    $count++;
+                }
             }
         }
 

admin/survey/classes/tracking/UserTrackingClass.php

@@ -65,10 +65,10 @@ class UserTrackingClass
         while ($row = mysqli_fetch_array($sql)) {
             echo '<tr>';
 
-            echo '	<td><div class="myprofile_date_wrap">' . datetime($row['datetime']) . '</div></td>';
+            echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
             echo '	<td class="center">' . $row['ip'] . '</td>';
-            echo '	<td><div class="myprofile_postget_wrap">' . $row['get'] . '</div></td>';
+            echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
-            echo '	<td><div class="myprofile_postget_wrap">' . $row['post'] . '</div></td>';
+            echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
             echo '</tr>';
         }

admin/survey/script/script.js

@@ -3767,9 +3767,16 @@ function doExcelExport() {
 	//return false;
 	*/
 }
-function excelExportChangeDelimit() {
+function excelExportChangeDelimit($param) {
-	$('#replace_export_delimit_semicolon').toggle();
+	if ($param == 1) {
-	$('#replace_export_delimit_comma').toggle();
+		$('#replace_export_delimit_semicolon').removeClass('displayNone');
+		$('#replace_export_delimit_comma').addClass('displayNone');
+	}
+	else if ($param == 2) {
+		$('#replace_export_delimit_semicolon').addClass('displayNone');
+		$('#replace_export_delimit_comma').removeClass('displayNone');
+	}
+	
     return false;
 }
 

lang/1.php

@@ -1567,23 +1567,45 @@ $lang = array (
 	"export_all_excel"		=>	"Izvozi vsa polja v Excel",
 	"export_s_excel"		=>	"Izvozi v Excel",
 	"srv_lnk_excel"			=>	"CSV",
-	"srv_lnk_excel_xls"		=>	"Excel (xls)",
+	"srv_lnk_excel_xls"		=>	"EXCEL (XLS)",
 	"srv_lnk_spss"			=>	"SPSS SYNTAX",
 	"srv_lnk_sav"   		=>	"SPSS SAV",
 	"srv_lnk_PDF/RTF"		=>	"Zaporedni izpis vseh respodentov",
 	"srv_lnk_txt"			=>	"Tekstovna datoteka",					
 	"srv_lnk_data_view"		=>	"Pregled",					
 	"srv_lnk_data_edit"		=>	"Urejanje",
+	"srv_izvoz_step1"		=>	"1. korak:",
+	"srv_izvoz_step2"		=>	"2. korak:",
+	"srv_izvoz_step3"		=>	"3. korak:",
+	"srv_izvoz_step4"		=>	"4. korak:",
+	"srv_izvoz_step5"		=>	"5. korak:",
 	"srv_izvoz_Excel_xls_note"		=>	"<p>Podatke v Excel (xls) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelXlsExport(); return false;\" ><span class=\"bold\">\"Izvoz v Excel\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
 	"srv_izvoz_Excel_xls_note_2"	=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\"https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",	
-	"srv_izvoz_Excel_note"			=>	"<p>Podatke v CSV (comma separated values) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelExport(); return false;\" ><span class=\"bold\">\"Izvoz v CSV\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
+	"srv_izvoz_Excel_note_a"			=>	"Podatke v CSV (angl. <span class=\"italic\">comma separated values</span>) izvozite s klikom na spodnji ukaz:",
-	"srv_izvoz_Excel_note_2"		=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",
+	"srv_izvoz_Excel_file"			=>	"Izvoz v CSV",
+	"srv_izvoz_Excel_note_b"			=>	"V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.",
+	"srv_izvoz_Excel_note_2"		=>	"<span class=\"red\">Opozorilo!</span> Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\">Težave pri izvozu v Excel</a>.",
 	"srv_izvoz_Excel_settings"		=>	"Nastavitve",
-	"srv_izvoz_SPSS_note"			=>	"<p>Podatke va&#353;e ankete izvozite v SPSS/PASW v petih kratkih korakih:</p><p><dl class=\"dl_spss\"><dt>1. korak:</dt><dd>Naprej s klikom spodaj shranimo datoteko v izbrano mapo:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('yes'); return false;\" target=\"_blank\">Datoteka s podatki (.txt)</a></span></dd><br/><dt>2. korak:</dt><dd>Nato v isto mapo shranimo &#353;e datoteko s sintakso:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('no'); return false;\" target=\"_blank\">Datoteka s sintakso (.sps)</a></span></dd><dd>Z dvojnim klikom na datoteko sedaj odpremo sintakso v programu SPSS/PASW.</dd><br/><dt>3. korak:</dt><dd>V odprti datoteki s sintakso poi&#353;&#269;emo DATA LIST vrstico <i>(»primer: DATA LIST FILE=\"C:\anketa_podatki.txt\"«)</i>.</dd><dd>Da bi povezali sintakso in podatke, namesto »C:« vpi&#353;emo lokacijo na&#353;e datoteke s podatki <i>(zgled: &#269;e smo podatke shranili npr. v mapo Prenosi znotraj My Documents: DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\")</i>.</dd><dd>&nbsp;</dd><dd><i>Natan&#269;no lokacijo datoteke s podatki lahko poi&#353;&#269;emo na naslednji na&#269;in: uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties)- Mesto (Location) in to lokacijo vpi&#353;emo namesto »C:«.</i></dd><br/><dt>4. korak:</dt><dd>Datoteko s sintakso nato po&#382;enemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko – bazo podatkov (.sav), ki jo lahko shranimo.</dd><br/><dt>5. korak:</dt><dd>Po izvozu v SPSS/PASW lahko dolo&#269;imo tudi manjkajo&#269;e vrednosti. Postavimo se v zavihek <i>Variable View</i> in v stolpcu Missing ozna&#269;imo <i>Range plus one optional discrete missing value; Low: -99; High: -1;</i> v 1KA so namre&#269; manjkajo&#269;e vse negativne vrednosti s slede&#269;imi pomeni:</dd><dd>&nbsp;&nbsp;<i>(-1) Ni odgovoril</i></dd><dd>&nbsp;&nbsp;<i>(-2) Preskok (if)</i></dd><dd>&nbsp;&nbsp;<i>(-3) Prekinjeno</i></dd><dd>&nbsp;&nbsp;<i>(-4) Naknadno vpra&#353;anje</i></dd><dd>&nbsp;&nbsp;<i>(-97) Neustrezno</i></dd><dd>&nbsp;&nbsp;<i>(-98) Zavrnil</i></dd><dd>&nbsp;&nbsp;<i>(-99) Ne vem.</i></dd></dl></p>",		
+	"srv_izvoz_SPSS_note"			=>	"Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:",		
-	"srv_izvoz_txt_note"			=>	"<p>Podatke lahko izvozite tudi v <a href=\"#\" onclick=\"doTxtExport(); return false;\" target=\"_blank\"><span class=\"bold\">tekstovno</span></a> ASCII datoteko</p>",	
+	"srv_izvoz_step1_SPSS"			=>	"Naprej s klikom spodaj shranimo datoteko s podatki (format .txt) v izbrano mapo:",
-	"srv_izvoz_SPSS_complex_note"	=>	"<p>Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.</p>",		
+	"srv_izvoz_step1_SPSS_file"			=>	"Datoteka s podatki TXT",
-	"srv_izvoz_SPSS_faq"			=>	"<p>V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. Posebej priporočamo pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v <span class=\"bold\"><a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">FAQ</a></span>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\"><span class=\"bold\">Pomoč uporabnikom</span></a>.</p>",		
+	"srv_izvoz_step2a_SPSS"		=>	"Nato v isto mapo shranimo še datoteko s sintakso (format .sps):",
-	"srv_izvoz_SAV_note"			=>	"<p>Podatke v SPSS (SAV) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doSAVExport(); return false;\" ><span class=\"bold\">\"Izvoz v SPSS (SAV)\"</span></a>.</p><p>Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov. </p><p class=\"semibold\">Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.<br />Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve lo&#269;eni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).</p>",
+	"srv_izvoz_step2b_SPSS"		=>	"Nato z dvojnim klikom na datoteko odpremo sintakso v programu SPSS/PASW.",
+	"srv_izvoz_step2_SPSS_file"		=>	"Datoteka s sintakso SPS",
+	"srv_izvoz_step3a_SPSS"		=>	"V datoteki s sintakso poiščemo DATA LIST vrstico (primer: »DATA LIST FILE=\C:\anketa_podatki.txt\"«).",
+	"srv_izvoz_step3b_SPSS"		=>	"Za povezavo sintakse in podatkov namesto »C:« vpišemo natančno lokacijo naše datoteke s podatki (primer: Če smo podatke shranili v mapo 'Prenosi', ki se nahaja v mapi 'My Documents' vpišemo naslednje: DATA LIST FILE=\"C:\My Documents\Prenosi\anketa_podatki.txt\").",
+	"srv_izvoz_step3c_SPSS"		=>	"Natančno lokacijo datoteke s podatki lahko poiščemo na naslednji način: Uporabimo desni klik na datoteko s podatki in v meniju izberemo Lastnosti (Properties) - Mesto (Location) in to lokacijo vpišemo namesto »C:«.",
+	"srv_izvoz_step4_SPSS"			=>	"Datoteko s sintakso nato poženemo z ukazom RUN ALL (najdemo ga v spustnem meniju RUN) in tako kreiramo novo datoteko - bazo podatkov (.sav), ki jo lahko shranimo.",
+	"srv_izvoz_step5_SPSS"			=>	"Po izvozu v SPSS/PASW lahko določimo tudi manjkajoče vrednosti. Postavimo se v zavihek Variable View in v stolpcu Missing označimo 'Range plus one optional discrete missing value; Low: -99; High: -1;' v 1KA so namreč manjkajoče vse negativne vrednosti s sledečimi pomeni:<br>(-1) Ni odgovoril<br>(-2) Preskok (if)<br>(-3) Prekinjeno<br>(-4) Naknadno vprašanje<br>(-97) Neustrezno<br>(-98) Zavrnil<br>(-99) Ne vem.",
+	"srv_izvoz_txt_note"			=>	"Podatke lahko izvozite v tekstovno ASCII datoteko s klikom na spodnji ukaz:",	
+	"srv_izvoz_txt_file"			=>	"Izvoz v tekstovno datoteko",	
+	"srv_izvoz_SPSS_complex_note"	=>	"Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.",		
+	"srv_izvoz_SPSS_faq"			=>	"V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku <a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">Izvoz v SPSS</a>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\">Pomoč uporabnikom</a>.",		
+	"srv_izvoz_SAV_note1"			=>	"Podatke izvozite v SPSS SAV s klikom na spodnji ukaz:",
+	"srv_izvoz_SAV_file"			=>	"Izvoz v SPSS SAV",
+	"srv_izvoz_SAV_note2a"			=>	"<span class=\"red\">Opozorilo!</span> Izvoz ne omogoča izvoza label vrednosti odgovorov. Funkcionalnost je še v razvoju, zato so možne težave pri izvozu. Priporočamo uporabo ",
+	"srv_izvoz_SAV_note2b"			=>	"izvoza SPSS SYNTAX",
+	"srv_izvoz_SAV_note2c"			=>	", ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).",
 	"s_sortby_A"			=>	"Sortiraj po ",
 	"s_sortby_B"			=>	"&#269;asu",
 	"s_sortby_C"			=>	" / ",
@@ -4095,6 +4117,13 @@ $lang = array (
 	"srv_survey_archives_ie_data_title"		=>	"Izvoz vprašalnika in podatkov",
 	"srv_survey_archives_tracking"		=>	"Spremembe",
 	"srv_survey_archives_tracking_survey"	=>	"Spremembe vprašalnika",
+	"srv_survey_archives_tracking_survey_text1"	=>	"V spodnji tabeli je navedenih zadnjih 25 sprememb",
+	"srv_survey_archives_tracking_survey_text1a"	=>	"v vprašalniku",
+	"srv_survey_archives_tracking_survey_text1b"	=>	"v zavihku",
+	"srv_survey_archives_tracking_survey_text1c"	=>	"za vprašalnik",
+	"srv_survey_archives_tracking_survey_text1d"	=>	"še ni bilo sprememb",
+	"srv_survey_archives_tracking_survey_text2"	=>	"Za vpogled v vse spremembe prenesite",
+	"srv_survey_archives_tracking_survey_text3"	=>	"Excel datoteko",
 	"srv_survey_archives_tracking_data"		=>	"Spremembe podatkov",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (uvozi)",
     "srv_survey_archives_tracking_hierarchy"            =>	"Spremembe samoevalvacije v šolah",
@@ -4926,14 +4955,14 @@ $lang = array (
 	'srv_inv_archive_heading' 					=> "Arhivi pošiljanja",									
 	'srv_inv_archive_date_send' 				=> "Datum pošiljanja",									
 	'srv_inv_archive_hour_send' 				=> "Ura pošiljanja",									
-	'srv_inv_archive_subject_text' 				=> "Naslov sporočila",									
+	'srv_inv_archive_subject_text' 				=> "Zadeva sporočila",									
-	'srv_inv_archive_naslov' 					=> "Email sporočilo",									
+	'srv_inv_archive_naslov' 					=> "Ime sporočila",									
 	'srv_inv_archive_subject' 					=> "Naslov sporočila",									
 	'srv_inv_archive_body_text' 				=> "Vsebina sporočila",									
 	'srv_inv_archive_cnt_succsess' 				=> "Uspešno poslanih",									
 	'srv_inv_archive_cnt_error' 				=> "Napak",									
 	'srv_inv_archive_comment' 					=> "Komentar",									
-	'srv_inv_archive_sender' 					=> "Poslal",
+	'srv_inv_archive_sender' 					=> "Poslal/-a",
 	'srv_inv_archive_email_address' 			=> "Email prejemnika",
 	'srv_inv_archive_status' 					=> "Status",
 	'srv_inv_archive_edit' 						=> "Uredi",
@@ -5576,7 +5605,7 @@ $lang = array (
 	"srv_data_delete_not_selected"				=>	"Niste izbrali nobenega respondenta!",
 	"srv_if_error"								=>	"Dopolnite ali odstranite pogoj!",
 	"srv_export_spss"							=>	"Izvozi v spss",
-	"srv_export_excel"							=>	"Izvozi v excel",
+	"srv_export_excel"							=>	"Izvozi v Excel",
 	"srv_export_txt"							=>	"Izvozi v tekstovno datoteko",
 	"srv_expaned_text"							=>	"Priporočamo vam tudi uporabo skrčenega pogleda",
 	"srv_library_q_added"						=>	"Vprašanje uspešno dodano v knjižnico!",
@@ -5762,6 +5791,8 @@ $lang = array (
 	"srv_deleteSurveyDataFile_success_note"		=>	"Datoteka s podatki je bila uspešno izbrisana!",
 	"srv_archive_survey"						=>	"Arhivi vprašalnika",
 	"srv_archive_invitation"					=>	"Arhivi vabil",
+	"srv_archive_invitation_text"				=>	"Vsako poslano email vabilo se avtomatsko shrani v spodnji seznam, kjer je navedena tudi statistika pošiljanja.",
+	"srv_archive_invitation_text2"				=>	"Seznam poslanih email vabil",
 	"srv_archive_analysis"						=>	"Arhivi analiz",
 	"srv_toolbox_if"							=>	"Določite pogoje za prikaz vprašanja",
 	"srv_toolbox_block"							=>	"Bloki za strukturiranje daljših vprašalnikov",

lang/2.php

@@ -1555,23 +1555,45 @@ $lang = array (
 	"export_all_excel"		=>	"Export all fields to Excel",
 	"export_s_excel"		=>	"Export to Excel",
 	"srv_lnk_excel"			=>	"CSV",
-	"srv_lnk_excel_xls"		=>	"Excel (xls)",
+	"srv_lnk_excel_xls"		=>	"EXCEL (XLS)",
 	"srv_lnk_spss"			=>	"SPSS SYNTAX",
 	"srv_lnk_sav"   		=>	"SPSS SAV",
 	"srv_lnk_PDF/RTF"		=>	"Respondent results",
 	"srv_lnk_txt"			=>	"Text file",
 	"srv_lnk_data_view"		=>	"Preview",					
 	"srv_lnk_data_edit"		=>	"Editing",		
+	"srv_izvoz_step1"		=>	"Step 1:",
+	"srv_izvoz_step2"		=>	"Step 2:",
+	"srv_izvoz_step3"		=>	"Step 3:",
+	"srv_izvoz_step4"		=>	"Step 4:",
+	"srv_izvoz_step5"		=>	"Step 5:",
 	"srv_izvoz_Excel_xls_note"		=>	"<p>Export data to Excel (xls) by clicking on the <a href=\"#\" onclick=\"doExcelXlsExport(); return false;\" ><span class=\"bold\">\"Export to Excel\"</span></a> option.</p><p>Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.</p>",
 	"srv_izvoz_Excel_xls_note_2"	=>	"<p>Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this <a href=\"https://www.1ka.si/d/en/help/faq/export-to-excel-why-are-answers-incomplete-when-i-export-the-data-to-excel\" target=\"_blank\"><span class=\"bold\">manual</span></a>.</p>",		
-	"srv_izvoz_Excel_note"			=>	"<p>Export data to CSV (comma separated values) by clicking on the <a href=\"#\" onclick=\"doExcelExport(); return false;\" ><span class=\"bold\">\"Export to CSV\"</span></a> option.</p><p>Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.</p>",
+	"srv_izvoz_Excel_note_a"			=>	"Export data to CSV (comma separated values) by clicking the button below:",
-	"srv_izvoz_Excel_note_2"		=>	"<p>Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this <a href=\"https://www.1ka.si/d/en/help/faq/export-to-excel-why-are-answers-incomplete-when-i-export-the-data-to-excel\" target=\"_blank\"><span class=\"bold\">manual</span></a>.</p>",	
+	"srv_izvoz_Excel_file"			=>	"CSV file export",
+	"srv_izvoz_Excel_note_b"			=>	"Excel versions 2003 and older support the export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.",
+	"srv_izvoz_Excel_note_2"		=>	"<span class=\"red\">Warning!</span> When exporting to Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this <a href=\"https://www.1ka.si/d/en/help/faq/export-to-excel-why-are-answers-incomplete-when-i-export-the-data-to-excel\" target=\"_blank\">manual</a>.",	
 	"srv_izvoz_Excel_settings"		=>	"Settings",
-	"srv_izvoz_SPSS_note"			=>	"<p>Data can be exported to SPSS/PASW by following five short steps:</p><p><dl class=\"dl_spss\"><dt>1. step:</dt><dd>Click on the link below and save the file into selected folder:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('yes'); return false;\" target=\"_blank\">Data file (.txt)</a></span></dd><br/><dt>2. step:</dt><dd>Next, save the syntax file into the same folder:</dd><dd><span class=\"bold\"><a href=\"#\" onclick=\"doSpssExport('no'); return false;\" target=\"_blank\">SPSS syntax file (.sps)</a></span></dd><dd>Open the syntax file in the SPSS/PASW syntax editor.</dd><br/><dt>3. step:</dt><dd>In the opened syntax file find the line beginning with DATA LIST <i>(»example: DATA LIST FILE=\"C:\anketa_podatki.txt\"«)</i>.</dd><dd>To link syntax and data, replace »C:« with location of the data file <i>(example: if we exported data into Downloads folder within My Documents, the line will be: DATA LIST FILE=\"C:\My Documents\Downloads\anketa_podatki.txt\")</i>.</dd><dd>&nbsp;</dd><dd><i>The exact location of the data file can be find by clicking the right mouse button on the data file; in the menu that appears select Properties - Location and replace »C:« with this location.</i></dd><br/><dt>4. step:</dt><dd>Run the syntax file by selecting Run menu in the syntax editor and then Run All. This will create an SPSS/PASW data file that can be saved in native SPSS format (.sav).</dd><br/><dt>5. step:</dt><dd>After export we can define missing values. In SPSS/PASW we open the <i>Variable View</i>, find the column Missing and select <i>Range plus one optional discrete missing value; Low: -99; High: -1;</i> Default missing values in 1KA are:</dd><dd>&nbsp;&nbsp;<i>(-1) Not answered</i></dd><dd>&nbsp;&nbsp;<i>(-2) Skipped (condition)</i></dd><dd>&nbsp;&nbsp;<i>(-3) Drop-out</i></dd><dd>&nbsp;&nbsp;<i>(-4) Subsequently added question</i></dd><dd>&nbsp;&nbsp;<i>(-97) Not applicable</i></dd><dd>&nbsp;&nbsp;<i>(-98) Refused</i></dd><dd>&nbsp;&nbsp;<i>(-99) Don’t know.</i></dd></dl></p>",
+	"srv_izvoz_SPSS_note"			=>	"Data can be exported to SPSS/PASW by following five short steps:",
-	"srv_izvoz_txt_note"			=>	"<p>Data can be exported in <a href=\"#\" onclick=\"doTxtExport(); return false;\" target=\"_blank\"><span class=\"bold\">text</span></a> ASCII file</p>",
+	"srv_izvoz_step1_SPSS"			=>	"Click on the button below and save the file (.txt format) into the selected folder:",
-	"srv_izvoz_SPSS_complex_note"	=>	"<p>If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.</p>",			
+	"srv_izvoz_step1_SPSS_file"			=>	"TXT data file",
-	"srv_izvoz_SPSS_faq"			=>	"<p>In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. Specifically recommended for multiple tables. You can find more information about SPSS exports in <span class=\"bold\"><a href=\"https://www.1ka.si/d/en/help/manuals/export-to-spss\" target=\"_blank\">MANUAL</a></span>. In case of any problems please contact <a href=\"https://www.1ka.si/d/en/help\" target=\"_blank\"><span class=\"bold\">Help center</span></a>.</p>",			
+	"srv_izvoz_step2a_SPSS"		=>	"Next, save the syntax file (.sps format) into the same folder:",
-	"srv_izvoz_SAV_note"		=>	"<p>Export data in SPSS (SAV) by clicking the command <a href=\"#\" onclick=\"doSAVExport(); return false;\" ><span class=\"bold\">\"Export to SPSS (SAV)\"</span></a>.</p><p class=\"semibold\">If you encounter any problems, use the (old) export in SPSS, which generates two separate files - file syntax (.SPS) and data file (.txt).</p>",
+	"srv_izvoz_step2b_SPSS"		=>	"Open the syntax file in the SPSS/PASW syntax editor.",
+	"srv_izvoz_step2_SPSS_file"		=>	"SPS syntax file",
+	"srv_izvoz_step3a_SPSS"		=>	"In the opened syntax file, find the line beginning with DATA LIST (»example: DATA LIST FILE=\"C:\anketa_podatki.txt\"«).",
+	"srv_izvoz_step3b_SPSS"		=>	"To link syntax and data, replace »C:« with location of the data file (example: if we exported data into the 'Downloads' folder within 'My Documents', the line will be: DATA LIST FILE=\"C:\My Documents\Downloads\anketa_podatki.txt\").",
+	"srv_izvoz_step3c_SPSS"		=>	"The exact location of the data file can be find by clicking the right mouse button on the data file; in the menu that appears select 'Properties' - 'Location' and replace »C:« with this location.",
+	"srv_izvoz_step4_SPSS"			=>	"Run the syntax file by selecting Run menu in the syntax editor and then Run All. This will create an SPSS/PASW data file that can be saved in native SPSS format (.sav).",
+	"srv_izvoz_step5_SPSS"			=>	"After export we can define missing values. In SPSS/PASW we open the Variable View, find the column Missing and select 'Range plus one optional discrete missing value; Low: -99; High: -1.' Default missing values in 1KA are:<br>(-1) Not answered<br>(-2) Skipped (condition)<br>(-3) Drop-out<br>(-4) Subsequently added question<br>(-97) Not applicable<br>(-98) Refused<br>(-99) Don't know.",
+	"srv_izvoz_txt_note"			=>	"Data can be exported in a text ASCII file by clicking the button below:",
+	"srv_izvoz_txt_file"			=>	"Text file export",	
+	"srv_izvoz_SPSS_complex_note"	=>	"If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.",			
+	"srv_izvoz_SPSS_faq"			=>	"In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. We specifically recommended for multiple tables. You can find more information about SPSS exports in the <a href=\"https://www.1ka.si/d/en/help/manuals/export-to-spss\" target=\"_blank\">SPSS Export</a> manual. In case of any problems please contact <a href=\"https://www.1ka.si/d/en/help\" target=\"_blank\">Help center</a>.",			
+	"srv_izvoz_SAV_note1"			=>	"Export data in SPSS (SAV) format by clicking the button below:",
+	"srv_izvoz_SAV_file"			=>	"SPSS SAV export",
+	"srv_izvoz_SAV_note2a"			=>	"<span class=\"red\">Warning!</span> This functionality does not support the export of answer value labels. If you encounter any problems, please use the ",
+	"srv_izvoz_SAV_note2b"			=>	"SPSS SYNTAX export option",
+	"srv_izvoz_SAV_note2c"			=>	", which generates two separate files - syntax file (.SPS) and data file (.txt).",
 	"s_sortby_A"			=>	"Sort by ",
 	"s_sortby_B"			=>	"date",
 	"s_sortby_C"			=>	" / ",
@@ -4076,6 +4098,13 @@ $lang = array (
 	"srv_survey_archives_ie_data_title"		=>	"Survey and data import / export",
 	"srv_survey_archives_tracking"		=>	"Changes",
 	"srv_survey_archives_tracking_survey"	=>	"Survey changes",
+	"srv_survey_archives_tracking_survey_text1"	=>	"The table below shows the last 25 changes",
+	"srv_survey_archives_tracking_survey_text1a"	=>	"to the survey",
+	"srv_survey_archives_tracking_survey_text1b"	=>	"on the page",
+	"srv_survey_archives_tracking_survey_text1c"	=>	"for the survey",
+	"srv_survey_archives_tracking_survey_text1d"	=>	"there haven't been any changes yet.",
+	"srv_survey_archives_tracking_survey_text2"	=>	"To see all the changes, download the",
+	"srv_survey_archives_tracking_survey_text3"	=>	"Excel file",
 	"srv_survey_archives_tracking_data"		=>	"Data changes",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (imports)",
     "srv_survey_archives_tracking_hierarchy"            =>	"Changes in self-evaluation in schools",
@@ -4898,7 +4927,7 @@ $lang = array (
 	'srv_inv_archive_date_send' 				=> "Sending date",									
 	'srv_inv_archive_hour_send' 				=> "Sending time",									
 	'srv_inv_archive_subject_text' 				=> "Message subject",									
-	'srv_inv_archive_naslov' 					=> "Subject",									
+	'srv_inv_archive_naslov' 					=> "Message name",									
 	'srv_inv_archive_subject' 					=> "Message title",									
 	'srv_inv_archive_body_text' 				=> "Message content",									
 	'srv_inv_archive_cnt_succsess' 				=> "Successfully sent",									
@@ -5532,7 +5561,7 @@ $lang = array (
 	"srv_data_delete_not_selected"				=>	"You have not selected respondent!",
 	"srv_if_error"								=>	"Edit or remove condition!",
 	"srv_export_spss"							=>	"Export to spss",
-	"srv_export_excel"							=>	"Export to excel",
+	"srv_export_excel"							=>	"Export to Excel",
 	"srv_export_txt"							=>	"Export to text file",
 	"srv_expaned_text"							=>	"We recommend switching to collapsed view",
 	"srv_library_q_added"						=>	"Question added to library!",
@@ -5662,6 +5691,8 @@ $lang = array (
 	"srv_deleteSurveyDataFile_success_note"		=>	"Data file was successfully deleted.",
 	"srv_archive_survey"						=>	"Survey archive",
 	"srv_archive_invitation"					=>	"Invitation archive",
+	"srv_archive_invitation_text"				=>	"Each sent email invitation is automatically saved in the list below, where you can also see the sending statistics.",
+	"srv_archive_invitation_text2"				=>	"List of sent email invitations",
 	"srv_archive_analysis"						=>	"Analysis archive",
 	"srv_data_emailstatus_0"					=>	"No",
 	"srv_data_emailstatus_1"					=>	"Yes",

public/css/admin_new.css

@@ -5075,6 +5075,12 @@ p, span {
   font-style: italic;
 }
 
+.as_link {
+  text-decoration: underline;
+  color: #1E88E5;
+  cursor: pointer;
+}
+
 .bold {
   font-weight: 800;
 }
@@ -5190,6 +5196,10 @@ span.faicon.ultra_dark_gray,
 a.faicon.ultra_dark_gray {
   color: #555555;
 }
+span.faicon.green,
+a.faicon.green {
+  color: #00C437;
+}
 span.faicon.fa-stack,
 a.faicon.fa-stack {
   height: 1em;
@@ -8754,6 +8764,64 @@ dl.arch_email dd {
   height: 150px;
 }
 
+#inv_view_arch_recipients {
+  /*max-height: 90vh;
+  overflow-y: scroll;*/
+  max-width: 90vw;
+  padding: 16px;
+  font-size: 16px;
+  line-height: 20px;
+  background-color: white;
+  height: auto;
+  width: auto;
+}
+#inv_view_arch_recipients .popup_close {
+  position: absolute !important;
+  top: 10px;
+  right: 10px;
+  z-index: 9999;
+  font-size: 12px !important;
+  color: #777777;
+}
+#inv_view_arch_recipients .popup_close:hover {
+  color: #333333;
+}
+#inv_view_arch_recipients .popup_close a {
+  color: #777777;
+  text-decoration: none;
+}
+#inv_view_arch_recipients .popup_close a:hover {
+  color: #333333;
+}
+#inv_view_arch_recipients h2,
+#inv_view_arch_recipients .divPopUp_top {
+  width: 100%;
+  margin-top: 3px;
+  margin-bottom: 16px;
+  padding-bottom: 8px;
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: uppercase;
+  border-bottom: 1px #E5E5E5 solid;
+}
+#inv_view_arch_recipients p {
+  line-height: 20px;
+}
+#inv_view_arch_recipients .button_holder {
+  justify-content: end !important;
+  margin: 16px 0 0 0;
+}
+#inv_view_arch_recipients .button_holder button:last-child {
+  margin-right: 0;
+}
+#inv_view_arch_recipients.warning_popup h2::before {
+  padding-right: 8px;
+  font-family: "Font Awesome 5 Free";
+  content: "";
+  font-size: 14px;
+  color: #FFC700;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -10717,20 +10785,28 @@ table {
   border-collapse: collapse;
   text-align: left;
 }
-table td, table th {
+table td,
+table th {
   padding: 8px 16px;
   border-top: 1px solid #E5E5E5;
   vertical-align: middle;
 }
-table td.center, table th.center {
+table td.center,
+table th.center {
   text-align: center;
 }
-table td.right, table th.right {
+table td.right,
+table th.right {
   text-align: right;
 }
-table td.wrap, table th.wrap {
+table td.wrap,
+table th.wrap {
   white-space: normal;
 }
+table td.lead_column,
+table th.lead_column {
+  border-right: 3px solid #E5E5E5;
+}
 table th {
   font-weight: 600;
   background-color: #F8F8F8;
@@ -11067,6 +11143,25 @@ div#gdrp_requests_unresolved {
   border-bottom: 1px #D3D3D3 solid;
 }
 
+div.izvoz_nad_tabelo {
+  display: flex;
+  justify-content: flex-end;
+}
+
+div.export_indent {
+  margin: 4px 0 16px 16px;
+}
+div.button_holder {
+  margin: 16px 0 0 0;
+}
+
+li.no_bullet {
+  list-style-type: none;
+}
+li.top16 {
+  margin-top: 16px;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */
@@ -14274,16 +14369,14 @@ div #user_info_segment .user_info {
 div #user_info_segment .user_info.text {
   margin-right: 50px;
 }
-div .myprofile_postget_wrap {
+div .postget_wrap {
   max-width: 320px;
-  min-width: 320px;
   overflow-wrap: break-word;
   white-space: normal;
-  padding: 8px 0px;
   font-family: "Courier";
   font-size: 12px;
 }
-div .myprofile_date_wrap {
+div .no_wrap {
   width: auto;
   white-space: nowrap;
 }

resources/sass/admin_new/basic/colors.scss

@@ -22,5 +22,6 @@ $light-gray: #F8F8F8;
 $yellow: #FFC700;
 $red: #FF0000;
 $light-red: #FFEFEF;
+$green: #00C437;
 $light-green: #a8eea8;
 

resources/sass/admin_new/basic/icons/icons.scss

@@ -52,6 +52,9 @@ a.faicon{
     &.ultra_dark_gray {
         color: $ultra-dark-gray;
     }
+    &.green {
+        color: $green;
+    }
 
     //STACKING
     &.fa-stack {

resources/sass/admin_new/basic/typography.scss

@@ -22,6 +22,12 @@ p,span {
 	font-style: italic;
 }
 
+.as_link {
+	text-decoration: underline;
+	color: $blue;
+	cursor: pointer;
+}
+
 .bold {
 	font-weight: $extra-bold;
 }

resources/sass/admin_new/components/popup/page_specific/archive.scss

@@ -95,3 +95,9 @@ dl.arch_email {
 #email_archive_text {
 	height: 150px;
 }
+#inv_view_arch_recipients {
+    @include popup_general();
+
+	height: auto;
+	width: auto;
+}

resources/sass/admin_new/components/table/table.scss

@@ -4,7 +4,8 @@ table {
     border-collapse: collapse;
     text-align: left;
 
-    td, th {
+    td,
+    th {
         padding: 8px 16px;
         border-top: 1px solid $gray;
         vertical-align: middle;
@@ -19,6 +20,10 @@ table {
         &.wrap {
             white-space: normal;
         }
+
+        &.lead_column {
+            border-right: 3px solid $gray;
+        }
     }
 
     th {

resources/sass/admin_new/pages/my_surveys/archives.scss

@@ -0,0 +1,4 @@
+div.izvoz_nad_tabelo {
+    display:flex;
+    justify-content: flex-end;
+}

resources/sass/admin_new/pages/my_surveys/import_export.scss

@@ -0,0 +1,20 @@
+div {
+    
+    &.export_indent{
+    margin: 4px 0 16px 16px;
+    }
+    
+    &.button_holder {
+        margin: 16px 0 0 0;
+    }
+}
+
+li{
+    &.no_bullet {
+    list-style-type: none;
+    }
+
+    &.top16 {
+        margin-top: 16px;
+    }
+}

resources/sass/admin_new/pages/my_surveys/my_surveys.scss

@@ -1,3 +1,6 @@
 @import "top_buttons";
 @import "top_filters";
 @import "survey_list";
+
+@import "archives";
+@import "import_export";

resources/sass/admin_new/pages/my_surveys/survey_list.scss

@@ -10,12 +10,17 @@
         tr{
             
             td{
+                padding-left: 16px;
+                padding-right: 16px;
+
                 vertical-align: middle;
 
                 border-bottom: 1px $dark-gray2 solid;
             }
 
             &.sl_header_new td{
+                cursor: pointer;
+                
                 height: 62px;
                 padding: 0 8px;
 

resources/sass/admin_new/pages/settings/moj_profil.scss

@@ -31,18 +31,16 @@ div {
     }
 
 
-    .myprofile_postget_wrap {
+    .postget_wrap {
         max-width: 320px;
-        min-width: 320px;
         overflow-wrap: break-word;
         white-space: normal;
-        padding: 8px 0px;
 
         font-family: "Courier";
         font-size: 12px;
     }
 
-    .myprofile_date_wrap {
+    .no_wrap {
         width: auto;
         white-space: nowrap;
     }