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

admin/survey/classes/class.VprasanjeDeleted.php

@@ -142,6 +142,9 @@ class VprasanjeDeleted {
         // Odpremo popup s pobrisanimi vprasanji
     	if ($_GET['a'] == 'displayVprasanjeDeletedPopup') {
             $this->displayDeletedVprasanja();
+
+            // Div za dodaten popup za preview
+            echo '<div id="vprasanje_deleted_preview" class="displayNone"></div>';
         } 
 
         // Dodajanje pobrisanega vprasanja nazaj v vprasalnik

admin/survey/script/vprasanjeDeleted.js

@@ -75,7 +75,15 @@ function insertVprasanjeDeletedItemsIntoSurvey(){
 // Predogled pobrisanega vprasanja
 function previewVprasanjeDeleted(spr_id){
 
-    preview_spremenljivka(spr_id);
+	$('#vprasanje_deleted_preview').load('ajax.php?a=preview_spremenljivka', {anketa: srv_meta_anketa_id, spremenljivka: spr_id, podstran: srv_meta_podstran}).removeClass('displayNone');
+
+    //preview_spremenljivka(spr_id);
     
     event.stopPropagation();
 }
+
+// Predogled pobrisanega vprasanja
+function closePreviewVprasanjeDeleted(){
+
+	$('#vprasanje_deleted_preview').html().addClass('displayNone');
+}

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

@@ -27,7 +27,10 @@ $progress_bar_background: black;
 */
 
 //Preview spremenljivka
-#fullscreen {
+#fullscreen,
+#vprasanje_deleted_preview,
+#library_preview{
+
     #preview_spremenljivka {
 		@include popup_general();
 

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

@@ -141,4 +141,23 @@
             margin: 0 16px 16px 0;
         }
     }
+
+
+    /* Dodaten popup za preview */
+    #vprasanje_deleted_preview{
+        position: absolute;
+        z-index: 9999;
+        top: 0;
+        left: 0;
+
+        height: 100%;
+        width: 100%;
+
+        background-color: $white;
+        
+        #preview_spremenljivka{
+            box-sizing: border-box;
+            width: 100%;
+        }
+    }
 }