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

admin/survey/Branching.php

@@ -347,10 +347,8 @@ class Branching {
             // Pobrisana vprasanja
             $vd = new VprasanjeDeleted($this->anketa);
             $deleted_vrasanja_count = $vd->countDeletedVprasanja();
-            if($deleted_vrasanja_count > 0){
+            echo '<div id="vprasanje_deleted_border" class="toolbox_border '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'"></div>';
-                echo '<div class="toolbox_border"></div>';
+            echo '<div id="vprasanje_deleted_toolbox" class="toolbox_item open_deleted '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' (<span id="vprasanje_deleted_count">'.$deleted_vrasanja_count.'</span>)</span></div>';
-                echo '<div class="toolbox_item open_deleted"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' ('.$deleted_vrasanja_count.')</span></div>';
-            }
 		}
 		else {
 
@@ -403,10 +401,8 @@ class Branching {
             // Pobrisana vprasanja
             $vd = new VprasanjeDeleted($this->anketa);
             $deleted_vrasanja_count = $vd->countDeletedVprasanja();
-            if($deleted_vrasanja_count > 0){
+            echo '<div id="vprasanje_deleted_border" class="toolbox_border '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'"></div>';
-                echo '<div class="toolbox_border"></div>';
+            echo '<div id="vprasanje_deleted_toolbox" class="toolbox_item open_deleted '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'" onClick="displayVprasanjeDeletedPopup();"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' (<span id="vprasanje_deleted_count">'.$deleted_vrasanja_count.'</span>)</span></div>';
-                echo '<div class="toolbox_item open_deleted" onClick="displayVprasanjeDeletedPopup();"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' ('.$deleted_vrasanja_count.')</span></div>';
-            }
 		}
 
 		echo '</div>';

admin/survey/classes/class.VprasanjeDeleted.php

@@ -56,9 +56,13 @@ class VprasanjeDeleted {
             
             echo '  <div id="question_item_info_'.$row['spr_id'].'" item-id="'.$row['spr_id'].'" class="question_item_info">';
             
-            echo '      <span class="faicon list"></span>';
+            echo '      <div>';
-            echo '      <span class="title">'.substr(strip_tags($row['naslov']), 0, 40).'</span>';
+            echo '          <span class="faicon list"></span>';
-            echo '      <span class="date">('.date("G:i d.m.Y", strtotime($row['delete_time'])).')</span>';
+            echo '          <span class="title">'.substr(strip_tags($row['naslov']), 0, 40).'</span>';
+            echo '          <span class="date">('.date("G:i d.m.Y", strtotime($row['delete_time'])).')</span>';
+            echo '      </div>';
+            
+            echo '      <span class="faicon monitor" title="'.$lang['srv_predogled_spremenljivka'].'" onClick="previewVprasanjeDeleted(\''.$row['spr_id'].'\');"></span>';
             
             echo '  </div>';
             
@@ -105,6 +109,27 @@ class VprasanjeDeleted {
     }
 
 
+    // Dokoncno brisanje vprasanja
+    public static function permanentDeleteVprasanje($spremenljivka){
+
+        if ($spremenljivka > 0) {
+
+            $rowg = Cache::srv_spremenljivka($spremenljivka);
+
+            // pri brisanju multiple grid vprasanja, moramo pobrisate tudi vse child spremenljivke (ker kljuci niso nastavljeni)
+            if ($rowg['tip'] == 24) {
+                $sqld = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka'");
+                while ($rowd = mysqli_fetch_array($sqld)) {
+                    sisplet_query("DELETE FROM srv_spremenljivka WHERE id='$rowd[spr_id]'");
+                }
+            }
+
+            $sql = sisplet_query("DELETE FROM srv_vrednost WHERE spr_id='$spremenljivka'");
+            $sql = sisplet_query("DELETE FROM srv_grid WHERE spr_id='$spremenljivka'");
+            $sql = sisplet_query("DELETE FROM srv_spremenljivka WHERE id='$spremenljivka'");
+        }
+    }
+
 
     /**
     * @desc pohendla ajax klice

admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php

@@ -128,7 +128,7 @@ class Kolektor {
             echo '      <td>'.date('j.n.Y H:i:s', strtotime($response['insert_time'])).'</td>';
             echo '      <td>'.$this->statuses[$response['status']].'</td>';
             echo '      <td><a href="'.$site_url.'admin/survey/index.php?anketa='.$response['ank_id'].'&a=data">Preglej odgovore</a></td>';
-            echo '      <td>Pošlji opomnik</td>';       // TODO
+            echo '      <td><span onClick="kolektorSendRespondentNotificationPopup(\''.$response['respondent_id'].'\');">Pošlji opomnik</span></td>';       // TODO
             echo '  </tr>';
         }
         
@@ -223,7 +223,13 @@ class Kolektor {
         
         
         // Sporocilo respondentu
-        $text = 'Pozdravljeni,&#10;&#10;Prosimo vas, če lahko izpolnite anketo.&#10;&#10;Povezava do ankete: #URL#&#10;&#10;Lep pozdrav,&#10;&#10;Kolektor ETRA';
+        $text = 'Pozdravljeni,
+
+Prosimo vas, če lahko izpolnite anketo. Povezava do ankete: #URL#
+
+Lep pozdrav,
+
+Kolektor ETRA';
 
         echo '<div class="kolektor_setting '.(isset($error['respondent_message']) ? 'error' : '').'">';
         echo '  <div class="setting_line">Spremno besedilo:</div>';
@@ -243,6 +249,32 @@ class Kolektor {
 
         echo '</form>';
     }
+
+    // Prikaze formo za posiljanje opomnika respondentu
+	public function displaySendRespondentNotification($respondent_id){
+
+        echo '<div class="popup_close"><a href="#" onclick="kolektorCreateResponseClose();">✕</a></div>';
+
+        echo '<h2>Pošiljanje opomnika respondentu</h2>';
+
+        // Sporocilo respondentu - dobimo prvotnega
+        $sql = sisplet_query("SELECT respondent_message FROM kolektor_survey_response WHERE respondent_id='".$respondent_id."'");
+        $row = mysqli_fetch_array($sql);
+        $text = $row['respondent_message'];
+
+        echo '<div class="kolektor_setting">';
+        echo '  <div class="setting_line">Besedilo opomnika:</div>';
+        echo '  <textarea name="respondent_message">'.$text.'</textarea>';
+        echo '</div>';
+
+        echo '<input type="hidden" name="respondent_id" value="'.$respondent_id.'">';
+        
+        // Gumbi
+        echo '<div class="button_holder">';
+        echo '  <button class="medium white-blue" type="button" onClick="kolektorCreateResponseClose();">Zapri</button>';
+        echo '  <button class="medium blue" type="button" onClick="kolektorSendRespondentNotification();">Pošlji opomnik respondentu</button>';
+        echo '</div>';
+    }
     
     public function displayResponseDetails(){
 
@@ -264,6 +296,7 @@ class Kolektor {
             $this->displayAddResponse();
             echo '</div>';
         }
+
 		elseif($_GET['a'] == 'add_repsonse'){
 			
 			$response_data['ank_id'] = (isset($_POST['kolektor_survey'])) ? $_POST['kolektor_survey'] : '';
@@ -305,7 +338,38 @@ class Kolektor {
                 KolektorResponse::addResponse($response_data);
             }
 		}
-        
+
+        elseif($_GET['a'] == 'send_respondent_notification_popup'){
+
+            $respondent_id = (isset($_POST['respondent_id'])) ? $_POST['respondent_id'] : 0;
+
+            if($respondent_id > 0){
+                echo '<div id="kolektor_send_respondent_notification">';
+                $this->displaySendRespondentNotification($respondent_id);
+                echo '</div>';
+            }            
+        }  
+
+        elseif($_GET['a'] == 'send_respondent_notification'){
+
+            $respondent_id = (isset($_POST['respondent_id'])) ? $_POST['respondent_id'] : '';
+            $notification = (isset($_POST['notification'])) ? $_POST['notification'] : '';
+
+            $kn = new KolektorNotifications($respondent_id);
+            $kn->sendRespondentNotification($notification);
+
+             // Uspesno prozenje
+            echo '<div class="popup_close"><a href="#" onclick="window.location.reload();">✕</a></div>';
+
+            echo '<h2>Pošiljanje opomnika respondentu</h2>';
+
+            echo 'Opomnik uspešno poslan.';
+
+            // Gumb koncaj
+            echo '<div class="button_holder">';
+            echo '  <button class="medium white-blue" type="button" onClick="window.location.reload();">Zapri</button>';
+            echo '</div>';
+        }  
     }
 }
 	

admin/survey/modules/mod_KOLEKTOR/class.KolektorNotifications.php

@@ -71,7 +71,10 @@ class KolektorNotifications {
         $body = ($respondent_message != '') ? $respondent_message : $this->response['respondent_message'];
 
         // Zamenjamo line breake in #URL#
-        $body = nl2br(stripslashes($body));
+        //$body = nl2br(stripslashes($body));
+        $body = str_replace('\r\n', '<br>', $body);
+        $body = str_replace('\n', '<br>', $body);
+        $body = stripslashes($body);
         $body = str_replace('#URL#', '<a href="'.$url.'">Kolektor anketa</a>', $body);
 
 

admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php

@@ -136,7 +136,7 @@ class KolektorResponse {
 
         // Poslji email z vabilom na anketo
         $kn = new KolektorNotifications($respondent_id);
-        $kn->sendRespondentNotification();
+        $kn->sendRespondentNotification($response_data['respondent_message']);
                     
 
         // Uspesno prozenje

admin/survey/modules/mod_KOLEKTOR/script/script.js

@@ -67,3 +67,24 @@ function kolektorOtherFunction(){
 }
 
 
+// Popup za posiljanje opomnika respondentu
+function kolektorSendRespondentNotificationPopup(respondent_id){
+
+    $("#fullscreen").addClass('PopUpNarrow').addClass('divPopUp');
+	$("#fullscreen").load('ajax.php?t=kolektor&a=send_respondent_notification_popup', {respondent_id: respondent_id}, function() {
+
+		$('#fade').fadeTo('slow', 1);
+		$('#fullscreen').show();
+	});
+}
+
+// Posiljanje opomnika respondentu
+function kolektorSendRespondentNotification(){
+
+    var notification = $('textarea[name="respondent_message"]').val();
+    var respondent_id = $('input[name="respondent_id"]').val();
+
+	$('#kolektor_send_respondent_notification').load('ajax.php?t=kolektor&a=send_respondent_notification', {respondent_id:respondent_id, notification:notification});
+
+}
+

admin/survey/script/script.js

@@ -1014,6 +1014,11 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) {
     					//refreshLeft();
 		                $('#branching').html(data.output);
 		                refreshRight();
+
+                        // Prikazemo gumb za pobrisana vprasanja (toolbox na levi) in povecamo counter
+                        $('#vprasanje_deleted_border, #vprasanje_deleted_toolbox').removeClass('displayNone');
+                        var vprasanje_deleted_count = parseInt($('#vprasanje_deleted_count').html()) + 1;
+                        $('#vprasanje_deleted_count').html(vprasanje_deleted_count);
                     } 
                     else if (data.error == 1) {
                         $('#fade').fadeIn('slow');
@@ -1026,7 +1031,6 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) {
                         $('#fade').fadeIn('slow');
         				$('#dropped_alert').html(data.output).fadeIn('slow').css('width', '600px');
 					}
-
 				}
             }, 'json'
         );

admin/survey/script/vprasanjeDeleted.js

@@ -42,6 +42,7 @@ function deleteVprasanjeDeleted(item_id, item_type){
     event.stopPropagation();
 }
 
+// Restavriramo pobrisano vprasanje nazaj v anketo na konec
 function insertVprasanjeDeletedItemsIntoSurvey(){
 
     var items = [];
@@ -68,4 +69,13 @@ function insertVprasanjeDeletedItemsIntoSurvey(){
         popupClose();        
         actionNotePopup('lib_add_to_survey_'+note, 'success');
     });
-}
+}
+
+
+// Predogled pobrisanega vprasanja
+function previewVprasanjeDeleted(spr_id){
+
+    preview_spremenljivka(spr_id);
+    
+    event.stopPropagation();
+}

public/css/admin_new.css

@@ -10013,7 +10013,7 @@ textarea:focus {
 }
 .box-container .num_box {
   border: unset;
-  background-color: white;
+  background-color: #FFFF;
   margin: 0px;
   padding: 0px;
 }
@@ -12799,6 +12799,7 @@ div#no_survey div.no_survey_title {
 }
 div#no_survey div.no_survey_title img {
   margin-right: 8px;
+  align-self: flex-start;
 }
 div#no_survey div.no_survey_box {
   width: 800px;
@@ -12860,7 +12861,7 @@ div#no_survey #no_survey_features .features li:last-of-type {
 }
 
 div.page_ustvari_anketo {
-  margin: 0 !important;
+  margin: 0 auto !important;
   padding: 0 !important;
 }
 
@@ -20659,6 +20660,7 @@ img.mapster_el {
 .vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   position: relative;
   box-sizing: border-box;
   height: 36px;
@@ -20732,6 +20734,9 @@ img.mapster_el {
 .vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .item_settings ul li:hover {
   color: #0059ab;
 }
+.vprasanje_deleted_popup .content .question_list .question_item_holder .question_item_info .monitor {
+  margin-right: 0;
+}
 .vprasanje_deleted_popup .content .selected_items {
   align-self: flex-end;
   margin: 16px 16px 8px 0;
@@ -22103,6 +22108,8 @@ and open the template in the editor.
   height: auto;
   max-height: 500px;
   width: 60vw;
+  display: flex;
+  flex-direction: column;
 }
 #fullscreen #preview_spremenljivka .popup_close {
   position: absolute !important;
@@ -25363,6 +25370,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
+
   div#vabila div.more div.more_block {
     width: 89% !important;
   }
@@ -29756,15 +29764,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -33198,6 +33206,12 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
 .page_kolektor table.kolektor_reponses {
   width: 100%;
 }
+.page_kolektor table.kolektor_reponses tr td a,
+.page_kolektor table.kolektor_reponses tr td span {
+  cursor: pointer;
+  color: #1E88E5;
+  text-decoration: none;
+}
 
 #kolektor_add_response {
   max-height: 95vh;
@@ -33233,23 +33247,37 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   width: 100%;
 }
 
+#kolektor_send_respondent_notification {
+  max-height: 95vh;
+  overflow-y: auto;
+}
+#kolektor_send_respondent_notification textarea {
+  width: 100%;
+  height: 200px;
+}
+
 @media (max-width: 1100px) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -33289,6 +33317,32 @@ div.wrap1360.subpage_ div#three {
     display: none !important;
   }
 }
+@media (max-width: 1100px) {
+  .no_survey_title {
+    font-size: 24px !important;
+    width: 92vw !important;
+    margin-top: 16px;
+  }
+}
+@media (max-width: 1100px) {
+  .no_survey_box,
+#no_survey_features {
+    width: 92vw !important;
+  }
+}
+@media (max-width: 1100px) {
+  #no_survey_video {
+    width: 92vw !important;
+    aspect-ratio: 16/9;
+  }
+  #no_survey_video p {
+    height: 100%;
+  }
+  #no_survey_video p iframe {
+    width: 100%;
+    height: 100%;
+  }
+}
 @media (max-width: 850px) {
   body #main_holder #main {
     margin: 70px 0 0 0;
@@ -33317,6 +33371,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -33346,36 +33401,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -33631,6 +33694,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -33652,6 +33716,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -33662,6 +33727,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -33672,10 +33738,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33750,6 +33818,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33833,6 +33902,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33845,16 +33915,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -33959,9 +34032,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33981,6 +34056,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -34034,6 +34110,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -34086,6 +34163,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -34098,6 +34176,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -34113,15 +34192,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -34139,6 +34221,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -34165,6 +34248,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -34172,6 +34256,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -34192,6 +34277,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -34205,6 +34291,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -34212,6 +34299,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34236,6 +34324,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -34303,6 +34392,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -34386,6 +34476,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -34393,6 +34484,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -34431,6 +34523,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -34451,6 +34544,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -34462,6 +34556,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -34476,9 +34571,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -34490,6 +34587,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34560,9 +34658,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -34603,6 +34703,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -34622,6 +34723,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -34631,13 +34733,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -34660,6 +34765,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -34676,12 +34782,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -34703,11 +34811,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -34718,6 +34828,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,

resources/sass/admin_new/mobile/responsive_fixes.scss

@@ -73,3 +73,27 @@ div.wrap1360 {
         }
     }
 }
+
+//Oboarding screen
+.no_survey_title {
+    font-size: 24px !important;
+    width: 92vw !important;
+    margin-top: 16px;
+}
+.no_survey_box,
+#no_survey_features {
+    width: 92vw !important;
+}
+
+#no_survey_video  {
+    width: 92vw !important;
+    aspect-ratio: 16/9;
+
+    p {
+        height: 100%;
+        iframe {
+            width: 100%;
+            height: 100%
+        }
+    }
+}

resources/sass/admin_new/modules/kolektor.scss

@@ -8,10 +8,19 @@
     table.kolektor_reponses{
         width: 100%;
 
+        tr{
 
-
+            td{
+                a, 
+                span{
+                    cursor: pointer;
+                    
+                    color: $blue;
+                    text-decoration: none;
+                }
+            }
+        }
     }
-
 }
 
 
@@ -62,5 +71,15 @@
             width: 100%;
         }
     }
+}
 
-}
+// Popup za posiljanje opomnika respondentu
+#kolektor_send_respondent_notification{
+    max-height: 95vh;
+    overflow-y: auto;
+
+    textarea{
+        width: 100%;
+        height: 200px;
+    }
+}

resources/sass/admin_new/pages/new_survey_page/no_survey.scss

@@ -20,6 +20,7 @@ div#no_survey {
 
         img {
             margin-right: 8px;
+            align-self: flex-start;
         }
     }
 
@@ -96,6 +97,6 @@ div#no_survey {
 
 
 div.page_ustvari_anketo {
-    margin: 0!important;
+    margin: 0 auto!important;
     padding: 0!important;
 }

resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss

@@ -37,6 +37,9 @@ $progress_bar_background: black;
 		max-height: 500px;
 		width: 60vw;
 
+		display: flex;
+		flex-direction: column;
+
         #spremenljivka_preview {
             .spremenljivka {
                 box-sizing: border-box;

resources/sass/admin_new/pages/survey_edit/vprasanje_deleted.scss

@@ -63,6 +63,8 @@
                 .question_item_info{
                     display: flex;
                     align-items: center;
+                    justify-content: space-between;
+
                     position: relative;
 
                     box-sizing: border-box;
@@ -120,6 +122,10 @@
                             }
                         }
                     }
+
+                    .monitor{
+                        margin-right: 0;
+                    }
                 }
             }
         }

utils/1kaCron/class.CronJobs.php

@@ -42,6 +42,20 @@ class CronJobs {
 			$s->anketa_delete_from_db($row['id']);
 		}
 	}
+
+    // Brisanje pobrisanih vprasanj (vprasanja, ki so bila pobrisana vec kot 3 mesece nazaj)
+	private function vprasanjeDeleteFromDB(){
+	
+		// Loop po pobrisanih anketah, ki so bile nazadnje urejane vec kot 1 mesec nazaj
+		$sql = sisplet_query("SELECT * FROM srv_spremenljivka_deleted WHERE delete_time < NOW() - INTERVAL 3 MONTH");
+		if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
+		
+		$s = new SurveyAdmin();
+		
+		while ($row = mysqli_fetch_array($sql)) {
+            VprasanjeDeleted::permanentDeleteVprasanje($row['spr_id']);
+		}
+	}
 	
 	
 	// Brisanje pobrisanih podatkov anket (podatki, ki so bili pobrisani pred vec kot 3 meseci)

utils/crontab3am.php

@@ -24,6 +24,9 @@
     $SL->addMessage(SurveyLog::INFO, "CRONJOB 3am - brisanje pobrisanih anket (starejsih od 1 meseca)");
 	$cj->executeAction('surveyDeleteFromDB');
 	
+    $SL->addMessage(SurveyLog::INFO, "CRONJOB 3am - brisanje pobrisanih vprasanj (starejsih od 3 mesecev)");
+	$cj->executeAction('vprasanjeDeleteFromDB');
+
     // Brisanje pobrisanih podatkov anket (starejsi od 3 mesecev)
     $SL->addMessage(SurveyLog::INFO, "CRONJOB 3am - brisanje pobrisanih podatkov anket (starejsi od 3 mesecev)");
     $cj->executeAction('userDeleteFromDB');