diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 09d6c5ac9..2f6167553 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3551,7 +3551,7 @@ class SurveyAdmin // VSEBINA POSAMEZNEGA TABA PRI MOJIH ANKETAH - echo '
'; + echo '
'; // izpis pregledovanja if ((!isset($_GET['a']) && !isset($_GET['anketa'])) || ($_GET['a'] == 'pregledovanje')) { diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index ba025639f..a3d2a1614 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -237,8 +237,10 @@ class SurveyList { $userAccess = UserAccess::getInstance($global_user_id); $detect = New Mobile_Detect(); - if($userAccess->checkUserAccess('my_survey_folders') && !$detect->isMobile() && !$detect->isTablet()) + if($userAccess->checkUserAccess('my_survey_folders') && !$detect->isMobile() && !$detect->isTablet()){ + UserSetting::getInstance()->Init($global_user_id); $show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders'); + } if($show_folders == '1') return true; @@ -1756,7 +1758,8 @@ class SurveyList { echo ''; echo ' '; echo ''; diff --git a/admin/survey/classes/class.SurveyListFolders.php b/admin/survey/classes/class.SurveyListFolders.php index fd9412b2b..eb930b747 100644 --- a/admin/survey/classes/class.SurveyListFolders.php +++ b/admin/survey/classes/class.SurveyListFolders.php @@ -37,6 +37,10 @@ class SurveyListFolders extends SurveyList{ echo '
'; echo '
'; + + + // JS za drag/drop + echo ''; } @@ -48,7 +52,33 @@ class SurveyListFolders extends SurveyList{ echo '
'.$lang['srv_mySurvey_your_folders'].'
'; // Izpisemo seznam folder s seznamom childov v rootu + echo ''; + + // Prikazemo se skrit div za dodaten popup (rename, add - title) + echo '
'; + + // Klik izven "Vec" - zapremo okno + echo ''; } // Izpisemo seznam folderjev za posameznega parenta @@ -56,10 +86,10 @@ class SurveyListFolders extends SurveyList{ global $global_user_id; // Izpisemo folder box - $this->displayFolder($folder_id); + $folder_open = $this->displayFolder($folder_id); // Izpisemo se vse subfolderje - echo '