Moje ankete direktoriji - prenova - V DELU

admin/survey/classes/class.SurveyListFolders.php

@@ -37,6 +37,10 @@ class SurveyListFolders extends SurveyList{
         echo '  </div>';
 
         echo '</div>';
+
+
+        // JS za drag/drop
+        echo '<script type="text/javascript">mySurvey_folder_init();</script>';
 	}
 
 
@@ -48,7 +52,33 @@ class SurveyListFolders extends SurveyList{
         echo '<div class="title">'.$lang['srv_mySurvey_your_folders'].'</div>';
 
         // Izpisemo seznam folder s seznamom childov v rootu
+        echo '<ul id="folder_list_0" class="folder_list">';
         $this->displayFolderList(0);
+        echo '</ul>';
+
+        // Prikazemo se skrit div za dodaten popup (rename, add - title)
+        echo '<div id="mySurvey_additional_popup" class="divPopUp"></div>';
+
+        // Klik izven "Vec" - zapremo okno
+        echo '<script>
+            $(document).mouseup(function(e){
+                var container = $(".folder_item_settings, .dots_ver");
+            
+                if (!container.is(e.target) && container.has(e.target).length === 0){
+                    $(".folder_item_settings").addClass("displayNone");
+                    $(".dots_ver_folder").removeClass("active");
+                }
+
+                var container2 = $(".item_settings, .dots_ver");
+            
+                if (!container.is(e.target) && container.has(e.target).length === 0){
+                    $(".item_settings").addClass("displayNone");
+                    $(".dots_ver_item").removeClass("active");
+                }
+            });
+
+            initHideLibraryArrows();
+        </script>';
     } 
 
     // Izpisemo seznam folderjev za posameznega parenta
@@ -100,21 +130,70 @@ class SurveyListFolders extends SurveyList{
 
 
         // Izrisemo folder box
-        echo '<div id="folder_item_'.$folder_id.'" class="folder_item" onClick="mysurvey_folder_activate(\''.$folder_id.'\');">';
-        
-        echo '<span class="faicon arrow"></span>';
-        echo '<span class="faicon folder"></span>';
-
         // Ce je root
         if($folder_id == '0'){
-            echo $lang['srv_mySurvey_all_surveys'];
+            echo '<li id="folder_item_'.$folder_id.'" class="folder_item mySurvey_droppable" onClick="mySurvey_folder_activate(\''.$folder_id.'\');">';
-            
+        
+            echo '<span class="faicon arrow"></span>';
+            echo '<span class="faicon folder"></span>';
+
+            echo $lang['srv_mySurvey_all_surveys'];  
         }
         else{            
+            echo '<li id="folder_item_'.$folder_id.'" class="folder_item mySurvey_draggable mySurvey_droppable" onClick="mySurvey_folder_activate(\''.$folder_id.'\');">';
+        
+            echo '<span class="faicon arrow"></span>';
+            echo '<span class="faicon folder"></span>';
+
             echo $row['naslov'];
-            echo '<span class="survey_count">'.$row['survey_count'].'</span>';
+            echo '<span class="folder_item_child_count">'.$row['survey_count'].'</span>';
+
+            // Urejanje folderja
+            // Tri pikice za prikaz urejanja folderja
+            echo '  <span class="faicon dots_ver dots_ver_folder" onClick="mySurvey_folder_show_edit(this);"></span>';
+
+            // Skrit div za urejanje folderja
+            echo '  <div class="folder_item_settings displayNone">';
+            echo '      <ul>';
+            echo '          <li onClick="mySurvey_folder_add_popup(\''.$folder_id.'\');">'.$lang['srv_mySurvey_create_subfolder'].'</li>';
+            echo '          <li onClick="mySurvey_folder_rename_popup(\''.$folder_id.'\', \''.$row['naslov'].'\');">'.$lang['srv_mySurvey_rename_folder'].'</li>';
+            echo '          <li onClick="mySurvey_folder_delete(\''.$folder_id.'\');">'.$lang['srv_mySurvey_delete_folder'].'</li>';
+            echo '      </ul>';
+            echo '  </div>';
         }
 
+        echo '</li>';
+    }
+
+    // Dodaten popup za ime direktorija pri dodajanju
+    private function displayAddFolderPopup($folder_id){
+        global $lang;
+
+        echo '<h2>'.$lang['srv_library_folder_name'].'</h2>';
+
+        echo '<div>';
+        echo '  <input type="text" id="mySurvey_folder_name" class="large">';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '  <button class="medium white-blue" onClick="mySurvey_folder_close_popup();">'.$lang['edit1338'].'</button>';
+        echo '  <button class="medium blue" onClick="mySurvey_folder_add(\''.$folder_id.'\');">'.$lang['srv_mySurvey_create_subfolder'].'</button>';
+        echo '</div>';
+    }
+
+    // Dodaten popup za ime direktorija pri preimenovanju
+    private function displayRenameFolderPopup($folder_id, $folder_name){
+        global $lang;
+
+        echo '<h2>'.$lang['srv_library_folder_name'].'</h2>';
+
+        echo '<div>';
+        echo '  <input type="text" id="mySurvey_folder_name" class="large" value="'.$folder_name.'">';
+        echo '</div>';
+
+        echo '<div class="button_holder">';
+        echo '  <button class="medium white-blue" onClick="mySurvey_folder_close_popup();">'.$lang['edit1338'].'</button>';
+        echo '  <button class="medium blue" onClick="mySurvey_folder_rename(\''.$folder_id.'\');">'.$lang['srv_mySurvey_rename_folder'].'</button>';
         echo '</div>';
     }
 
@@ -780,157 +859,83 @@ class SurveyListFolders extends SurveyList{
 		}
 
 
+        // Pokazemo popup za poimenovanje novega subfolderja
+		if($_GET['a'] == 'mysurvey_folder_add_popup'){
+               
+            $folder_id = $_POST['folder_id'];
 
+            $this->displayAddFolderPopup($folder_id);
+        }
+        
+        // Ustvarimo nov subfolder
+		if($_GET['a'] == 'mysurvey_folder_add'){
 
-		/*switch ($_GET['a']) {
+            $folder_id = $_POST['folder_id'];
-
+            $folder_name = $_POST['folder_name'];
-			case 'survey_dropped':
-			case 'folder_dropped':
-			case 'folder_create':
-			case 'folder_delete':
-			case 'folder_toggle':
-			case 'folder_rename':
-			case 'folder_copy':
-				$this->updateMySurveyFolders();
-				break;
-			default:
-				print_r($_POST);
-				print_r($_GET);
-			break;
-		}*/
-	}
-
-    // ajax, ki poskrbi za vse update glelde razvrscanja mojih anket v folderje
-	/*private function updateMySurveyFolders(){
-		global $global_user_id, $site_url, $lang;
-
-		// Prenesli smo anketo v drug folder
-		if($_GET['a'] == 'survey_dropped'){
-			$parent = isset($_POST['parent']) ? $_POST['parent'] : '0';
-			$drag_survey = isset($_POST['drag_survey']) ? $_POST['drag_survey'] : '0';
-			
-			// Ce smo spustili v root folder samo pobrisemo anketo
-			if($parent == '0'){
-				$sql = sisplet_query("DELETE FROM srv_mysurvey_anketa WHERE ank_id='".$drag_survey."' AND usr_id='$global_user_id'");
-			}
-			else{
-				// Razpremo parent folder
-				$sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='1' WHERE id='".$parent."' AND usr_id='$global_user_id'");
-
-				$sql = sisplet_query("INSERT INTO srv_mysurvey_anketa (ank_id, usr_id, folder) VALUES ('".$drag_survey."', '".$global_user_id."', '".$parent."') ON DUPLICATE KEY UPDATE folder='".$parent."'");
-			}
-		}
-		
-		// Prenesli smo celoten folder v drug folder
-		elseif($_GET['a'] == 'folder_dropped'){
-			$parent = isset($_POST['parent']) ? $_POST['parent'] : '0';
-			$drag_folder = isset($_POST['drag_folder']) ? $_POST['drag_folder'] : '0';
-		
-			// Preverimo da nismo slucajno prenesli v child folder - ne pustimo, ker drugace se zadeva porusi
-			$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE id='".$parent."' AND parent='".$drag_folder."' AND usr_id='$global_user_id'");
-			if(mysqli_num_rows($sql) == 0){
-				// Razpremo parent folder
-				$sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='1' WHERE id='".$parent."' AND usr_id='$global_user_id'");
-
-				$sql = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$parent."' WHERE id='".$drag_folder."' AND usr_id='$global_user_id'");
-			}
-		}
-		
-		// prikazemo/skrijemo ankete znotraj folderja
-		elseif($_GET['a'] == 'folder_toggle'){
-			$folder = isset($_POST['folder']) ? $_POST['folder'] : '0';
-			$open = isset($_POST['open']) ? $_POST['open'] : '0';
-			
-			$sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='".$open."' WHERE id='".$folder."' AND usr_id='$global_user_id'");
-		}
-		
-		// Ustvarili smo nov folder
-		elseif($_GET['a'] == 'folder_create'){
-			$parent = isset($_POST['parent']) ? $_POST['parent'] : '0';
 			
 			// Razpremo parent folder
-			$sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='1' WHERE id='".$parent."' AND usr_id='$global_user_id'");
+			$sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='1' WHERE id='".$folder_id."' AND usr_id='$global_user_id'");
 			
-			$sql = sisplet_query("INSERT INTO srv_mysurvey_folder (usr_id, parent, naslov) VALUES ('".$global_user_id."','".$parent."', '".$lang['srv_mySurvey_new_folder']."')");
+			$sql = sisplet_query("INSERT INTO srv_mysurvey_folder (usr_id, parent, naslov) VALUES ('".$global_user_id."','".$folder_id."', '".$folder_name."')");
 
             $new_folder_id = mysqli_insert_id($GLOBALS['connect_db']);
            
-            $SL = new SurveyList();
+            $this->displayLeftContent();
-			$SL->getSurveys();
+        }
-            
-            echo '<input type="hidden" id="new_added_folder" value="'.$new_folder_id.'">';
-		}
-		
-		// Pobrisali smo obstojec folder
-		elseif($_GET['a'] == 'folder_delete'){
-			$folder = isset($_POST['folder']) ? $_POST['folder'] : '0';
-						
-			//Pobrisemo ankete ki so bile znotraj folderja
-			$sql = sisplet_query("DELETE FROM srv_mysurvey_anketa WHERE folder='".$folder."' AND usr_id='$global_user_id'");
-			
-			// Na koncu se pobrisemo prazen folder
-			$sql = sisplet_query("DELETE FROM srv_mysurvey_folder WHERE id='".$folder."' AND usr_id='$global_user_id'");
-			
-			// Rekurzivno pobrisemo vse poddirektorije z anketami - TODO!!!
-		}
-		
-		// Preimenovali smo obstojec folder
-		elseif($_GET['a'] == 'folder_rename'){
-			$folder = isset($_POST['folder']) ? $_POST['folder'] : '0';
-			$text = isset($_POST['text']) ? $_POST['text'] : '';
-			$text = strip_tags($text);
-			
-			$sql = sisplet_query("UPDATE srv_mysurvey_folder SET naslov='".$text."' WHERE id='".$folder."' AND usr_id='$global_user_id'");
-		}
-		
-		// Kopiramo obstojec folder z vsemi anketami
-		elseif($_GET['a'] == 'folder_copy'){
-			
-			$folder = isset($_POST['folder']) ? $_POST['folder'] : '0';
-			if($folder > 0)
-				$this->copyMySurveyFolder($folder);
-		}
-	}
-	
-	// Kopiramo obstojec folder z vsemi folderji in anketami (rekurzivno)
-	private function copyMySurveyFolder($folder_id, $parent=0){
-		global $global_user_id;
-		
-		$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
-		if(mysqli_num_rows($sql) == 0)
-			return;
-		
-		$row = mysqli_fetch_array($sql);
-		
-		// Najprej ustvarimo kopijo folderja
-		if($parent == 0)
-			$sql2 = sisplet_query("INSERT INTO srv_mysurvey_folder (usr_id, parent, naslov, open) VALUES ('".$global_user_id."', '".$row['parent']."', '".$row['naslov']."_copy', '1')");
-		else
-			$sql2 = sisplet_query("INSERT INTO srv_mysurvey_folder (usr_id, parent, naslov, open) VALUES ('".$global_user_id."', '".$parent."', '".$row['naslov']."_copy', '1')");
-		
-		$new_folder_id = mysqli_insert_id($GLOBALS['connect_db']);
-				
-		// Loop cez ankete v folderju
-		$sqlA = sisplet_query("SELECT * FROM srv_mysurvey_anketa WHERE folder='".$folder_id."'");
-		while($rowA = mysqli_fetch_array($sqlA)){
-			
-			// Kopiramo anketo
-			$sas = new SurveyAdminSettings();
-			$ank_id = $sas->anketa_copy($rowA['ank_id']);
-			
-			// Kopirano anketo vstavimo v nov folder
-			$sql2 = sisplet_query("INSERT INTO srv_mysurvey_anketa (ank_id, usr_id, folder) VALUES ('".$ank_id."', '".$global_user_id."', '".$new_folder_id."')");
-		}		
-		
-		// Na koncu rekurzivno kopiramo se vse notranje folderje
-		$sqlF = sisplet_query("SELECT id FROM srv_mysurvey_folder WHERE parent='".$folder_id."' AND usr_id='".$global_user_id."'");
-		while($rowF = mysqli_fetch_array($sqlF)){
-		
-			$this->copyMySurveyFolder($rowF['id'], $new_folder_id);			
-		}
-		
-		return;
-	}*/
 
-}
+        // Pokazemo popup za preimenovanje folderja
+		if($_GET['a'] == 'mysurvey_folder_rename_popup'){
+
+            $folder_id = $_POST['folder_id'];
+            $folder_name = $_POST['folder_name'];
+
+            $this->displayRenameFolderPopup($folder_id, $folder_name);
+        }
+
+        // Preimenujemo folder
+		if($_GET['a'] == 'mysurvey_folder_rename'){
+
+            $folder_id = isset($_POST['folder_id']) ? $_POST['folder_id'] : '0';
+			$folder_name = isset($_POST['folder_name']) ? $_POST['folder_name'] : '';
+			$folder_name = strip_tags($folder_name);
+
+            $sql = sisplet_query("UPDATE srv_mysurvey_folder SET naslov='".$folder_name."' WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
+
+            $this->displayLeftContent();
+        }
+
+        // Pobrisemo folder
+		if($_GET['a'] == 'mysurvey_folder_delete'){
+
+            $folder_id = isset($_POST['folder_id']) ? $_POST['folder_id'] : 0;
+
+            if($folder_id > 0){
+
+                // Dobimo parent folderja
+                $sqlParent = sisplet_query("SELECT parent FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
+                $rowParent = mysqli_fetch_array($sqlParent);
+
+                // Ce je parent root, pobrisemo ankete ki so bile znotraj folderja
+                if($rowParent['parent'] == '0'){
+                    $sql = sisplet_query("DELETE FROM srv_mysurvey_anketa WHERE folder='".$folder_id."' AND usr_id='".$global_user_id."'");
+                }
+                // Drugace jih prestavimo v parenta
+                else{
+                    $sql = sisplet_query("UPDATE srv_mysurvey_anketa SET folder='".$rowParent['parent']."' WHERE folder='".$folder_id."' AND usr_id='".$global_user_id."'");
+                }  
+
+                // Nastavimo subfolderjem novega parenta
+                $sql = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$rowParent['parent']."' WHERE parent='".$folder_id."' AND usr_id='".$global_user_id."'");
+                
+                // Na koncu se pobrisemo prazen folder
+                $sql = sisplet_query("DELETE FROM srv_mysurvey_folder WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'");
+                
+                // Rekurzivno pobrisemo vse poddirektorije z anketami - TODO!!!
+            }
+
+            $this->displayLeftContent();
+		}
+
+    }
+    
 ?>

admin/survey/script/surveyList.js

@@ -78,8 +78,51 @@ function switchFolder(show){
     });
 }
 
+// inicializiramo drag/drop anket in folderjev
+function mySurvey_folder_init() {
+
+	$('#survey_list .mySurvey_droppable').droppable({
+		accept: '#survey_list .mySurvey_draggable', 
+		hoverClass: 'folderhover', 
+		tolerance: 'pointer',
+        drop: function (e, ui) {
+
+			// Drop folderja
+			if($(ui.draggable).hasClass('folder_item')){
+				/*var drag_folder = $(ui.draggable).attr('folder_id');
+				var parent = $(this).attr('folder_id');
+				
+				$.post('ajax.php?t=surveyList&a=folder_dropped', {parent: parent, drag_folder: drag_folder}, function(){
+					window.location.reload();
+				});*/
+			}
+			
+			// Drop ankete
+			if($(ui.draggable).hasClass('anketa_list')){
+				/*var drag_survey = $(ui.draggable).attr('anketa_id');
+				var parent = $(this).attr('folder_id');
+
+				$.post('ajax.php?t=surveyList&a=survey_dropped', {parent: parent, drag_survey: drag_survey}, function(){
+					window.location.reload();
+				});*/
+			}
+        }
+    });
+	
+	$('#survey_list .mySurvey_draggable').draggable({
+		revert: 'invalid', 
+		opacitiy: '0.7', 
+		helper: 'clone',
+		cursor: 'move',
+		cursorAt: { left: 20 },
+		start: function(e, ui){
+			$(ui.helper).addClass('mySurvey_draggable_helper');
+		}
+	});
+}
+
 // Aktiviramo folder
-function mysurvey_folder_activate(folder_id){
+function mySurvey_folder_activate(folder_id){
 
     $('#right_content').load('ajax.php?t=surveyListFolders&a=mysurvey_folder_activate', {folder_id: folder_id}, function(){
 
@@ -91,50 +134,79 @@ function mysurvey_folder_activate(folder_id){
 	});
 }
 
+// Prikazemo opcije za urejanje folderja
+function mySurvey_folder_show_edit(element){
+    
+    if($(element).parent().find('.folder_item_settings').hasClass('displayNone')){
+        $('.folder_item_settings').addClass('displayNone');
+        $('.dots_ver_folder').removeClass('active');
+        $(element).parent().find('.folder_item_settings').removeClass('displayNone');
+        $(element).addClass('active');
+    }
+    else{
+        $('.folder_item_settings').addClass('displayNone');
+        $('.dots_ver_folder').removeClass('active');
+        $(element).parent().find('.folder_item_settings').addClass('displayNone');
+        $(element).removeClass('active');
+    }
 
-// inicializiramo drag/drop anket in folderjev
+    event.stopPropagation();
-function surveyList_folder_init() {
-
-	$('#survey_list div.droppable').droppable({
-		accept: '.mySurvey_draggable', 
-		hoverClass: 'folderhover', 
-		tolerance: 'pointer',
-        drop: function (e, ui) {
-
-			// Drop folderja
-			if($(ui.draggable).hasClass('folder_title')){
-				var drag_folder = $(ui.draggable).attr('folder_id');
-				var parent = $(this).attr('folder_id');
-				
-				$.post('ajax.php?t=surveyList&a=folder_dropped', {parent: parent, drag_folder: drag_folder}, function(){
-					window.location.reload();
-				});
-			}
-			
-			// Drop ankete
-			if($(ui.draggable).hasClass('anketa_list')){
-				var drag_survey = $(ui.draggable).attr('anketa_id');
-				var parent = $(this).attr('folder_id');
-
-				$.post('ajax.php?t=surveyList&a=survey_dropped', {parent: parent, drag_survey: drag_survey}, function(){
-					window.location.reload();
-				});
-			}
-        }
-    });
-	
-	$('.mySurvey_draggable').draggable({
-		revert: 'invalid', 
-		opacitiy: '0.7', 
-		helper: 'clone',
-		cursor: 'move',
-		cursorAt: { left: 20 },
-		start: function(e, ui){
-			$(ui.helper).addClass('mySurvey_draggable_helper');
-		}
-	});
 }
 
+
+// Zaprtje dodatnega popupa
+function mySurvey_folder_close_popup(){
+    $('#fade').fadeOut('slow');
+    $("#mySurvey_additional_popup").fadeOut().html();
+}
+
+// Ime novega folderja
+function mySurvey_folder_add_popup(parent_folder_id){
+
+    $('#fade').fadeTo('slow', 1);
+    $("#mySurvey_additional_popup").fadeIn();
+    $("#mySurvey_additional_popup").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_add_popup', {folder_id: parent_folder_id});
+}
+
+// Dodamo nov folder
+function mySurvey_folder_add(parent_folder_id){
+
+    var folder_name = $("#mySurvey_folder_name").val();
+
+    $("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_add', {folder_id: parent_folder_id, folder_name: folder_name}, function(){
+        mySurvey_folder_close_popup();
+    });
+}
+
+// Ime obstojecega folderja
+function mySurvey_folder_rename_popup(folder_id, folder_name){
+
+    $('#fade').fadeTo('slow', 1);
+    $("#mySurvey_additional_popup").fadeIn();
+    $("#mySurvey_additional_popup").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_rename_popup', {folder_id: folder_id, folder_name: folder_name});
+}
+
+// Preimenujemo obstojeci folder
+function mySurvey_folder_rename(folder_id){
+
+    var folder_name = $("#mySurvey_folder_name").val();
+
+    $("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_rename', {folder_id: folder_id, folder_name: folder_name}, function(){
+        mySurvey_folder_close_popup();
+    });
+}
+
+// Pobrisemo obstojeci folder
+function mySurvey_folder_delete(folder_id){
+
+    $("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_delete', {folder_id: folder_id});
+}
+
+
+
+
+/*
+
 // prikazemo/skrijemo ankete v folderju
 function toggle_folder (folder) {
 	
@@ -159,41 +231,7 @@ function toggle_folder (folder) {
 	});
 }
 
-// Pobrisemo folder
-function delete_folder (folder) {
-	$.post('ajax.php?t=surveyList&a=folder_delete', {folder: folder}, function(){
-		window.location.reload();
-	});
-}
 
-// Ustvarimo folder
-function create_folder (parent) {
-	
-    $('#survey_list').load('ajax.php?t=surveyList&a=folder_create', {parent: parent}, function(){
-		
-        var added_folder_id = $('#new_added_folder').val();
-        
-        edit_title_folder(added_folder_id);    
-	});
-}
-
-// Urejamo ime folderja
-function edit_title_folder (folder) {	
-	
-	var text = $('#folder_title_text_'+folder).text();
-
-	$('#folder_title_text_'+folder).html('<input type="text" name="folder_title_edit" folder="'+folder+'" id="folder_title_edit_'+folder+'" class="folder_title_edit" value="'+text+'" onBlur="rename_folder(\''+folder+'\'); return false;" />');
-	$('#folder_title_edit_'+folder).select();
-}
-// Preimenujemo folder
-function rename_folder(folder){
-
-	var text = $('#folder_title_edit_'+folder).val();
-
-	$.post('ajax.php?t=surveyList&a=folder_rename', {folder: folder, text: text}, function(){
-		$('#folder_title_text_'+folder).html('<a href="#" onClick="edit_title_folder(\''+folder+'\'); return false;">'+text+'</a>');
-	});
-}
 // Kopiramo folder
 function copy_folder(folder){
 
@@ -202,7 +240,7 @@ function copy_folder(folder){
 	});
 }
 
-
+*/
 
 
 

lang/1.php

@@ -7183,6 +7183,7 @@ $lang = array (
 
 	'srv_mySurvey_unallocated'					=>	"Nerazporejene ankete",
 	'srv_mySurvey_delete_folder'				=>	"Pobriši mapo",
+	'srv_mySurvey_rename_folder'				=>	"Preimenuj mapo",
 	'srv_mySurvey_create_folder'				=>	"Ustvari novo mapo",
 	'srv_mySurvey_create_subfolder'				=>	"Ustvari novo podmapo",
 	'srv_mySurvey_copy_folder'					=>	"Kopiraj mapo",

lang/2.php

@@ -7065,6 +7065,7 @@ $lang = array (
 
 	'srv_mySurvey_unallocated'					=>	"Unallocated survey",
 	'srv_mySurvey_delete_folder'				=>	"Deleter folder",
+    'srv_mySurvey_rename_folder'				=>	"Rename folder",
 	'srv_mySurvey_create_folder'				=>	"Create new folder",
 	'srv_mySurvey_create_subfolder'				=>	"Create new subfolder",
 	'srv_mySurvey_copy_folder'					=>	"Copy folder",

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

@@ -31,16 +31,137 @@
                 text-transform: uppercase;
             }
 
-            .folder_list{
+            > ul {
-
+                margin-left: 0 !important;
-                
+            }
-                .folder_item{
+    
+            ul{
+                margin: 0 0 0 16px;
+                padding: 0;
+    
+                li.folder_item{
+                    cursor: pointer;
+                    position: relative;
+        
+                    display: flex;
+                    align-items: center;
+                    justify-content: flex-start;
+        
                     box-sizing: border-box;
                     height: 40px;
+                    width: 100%;
+                    padding: 0 8px;
                     margin-bottom: 8px;
-    
+        
-                    border: 1px solid $light-gray;
+                    border: 1px solid $gray;
                     border-radius: 2px;
+        
+                    transition: 0.2s;
+        
+                    .faicon.arrow:before{
+                        content: "\f078";
+                    }
+                    .faicon.folder:before,
+                    .faicon.clipboard:before{
+                        font-weight: 400;
+                        color: $dark-gray2;
+                    }
+                    &.active{
+                        border-color: $blue;
+                        background-color: $light-gray;
+    
+                        .faicon.folder:before,
+                        .faicon.clipboard:before{
+                            font-weight: 600;
+                            color: $blue;
+                        }
+                    }
+                    &.open{
+                        .faicon.arrow:before{
+                            content: "\f077";
+                        }
+                    }
+    
+                    &.no_arrow .faicon.arrow:before{
+                        display: none;
+                    }
+    
+                    &.droppable_folder.drag-hover{
+                        //border-color: $blue;
+                        background-color: $gray;
+                    }
+                    
+                    &:hover{
+                        background-color: $light-gray;
+    
+                        .dots_ver{
+                            display: block;
+                        }
+                    }
+        
+                    span{
+                        margin-right: 8px;
+                        font-size: 14px;
+                    }
+    
+                    .folder_item_child_count{
+                        margin-left: 8px;
+                        font-size: 12px;
+                        color: $very-dark-gray;
+                    }
+    
+                    .dots_ver{
+                        display: none;
+    
+                        position: absolute;
+                        right: 0;
+                        padding: 7px 8px;
+                        margin-right: 0;
+    
+                        &.active{
+                            display: block !important;
+                        }
+                    }
+    
+                    .folder_item_settings{
+                        @include hover_basic();
+    
+                        position: absolute;
+                        z-index: 9999;
+                        right: 0;
+                        top: 38px;
+    
+                        border-radius: 2px;
+    
+                        ul li{
+                            color: $blue;
+    
+                            transition: 0.2s;
+    
+                            &:hover{
+                                color: $dark-blue;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Dodaten popup za rename, dodajanje folderja
+            #mySurvey_additional_popup{
+                display: none;
+
+                z-index: 9999;
+                position: absolute !important;
+                top: 40%;
+                left: calc(50% - 200px);
+            
+                width: 400px;
+            
+                border: 1px solid $dark-gray;
+                box-shadow: 0px 4px 7px rgba(0,0,0,.07);
+            
+                input[type="text"]{
+                    width: 100%;
                 }
             }
         }
@@ -56,6 +177,13 @@
 
                 font-weight: 600;
                 font-size: 16px;
+
+                .faicon.folder:before{
+                    margin-right: 8px;
+
+                    font-weight: 600;
+                    color: $blue;
+                }
             }
 
             .second_line{