diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index ba025639f..2444245a2 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; diff --git a/admin/survey/classes/class.SurveyListFolders.php b/admin/survey/classes/class.SurveyListFolders.php index f7bc2d206..4101b95c2 100644 --- a/admin/survey/classes/class.SurveyListFolders.php +++ b/admin/survey/classes/class.SurveyListFolders.php @@ -125,14 +125,14 @@ class SurveyListFolders extends SurveyList{ // Nastavimo, ce je to trenutno odprt folder if($row['active'] == '1') - $this->current_folder = $row; + $this->current_folder = $row; } // Izrisemo folder box // Ce je root if($folder_id == '0'){ - echo '
  • '; + echo '
  • '; echo ''; echo ''; @@ -140,7 +140,7 @@ class SurveyListFolders extends SurveyList{ echo $lang['srv_mySurvey_all_surveys']; } else{ - echo '
  • '; + echo '
  • '; echo ''; echo ''; @@ -856,6 +856,9 @@ class SurveyListFolders extends SurveyList{ // Na novo prikazemo desno stran $this->displayRightContent(); + + // JS za drag/drop + echo ''; } @@ -881,6 +884,9 @@ class SurveyListFolders extends SurveyList{ $new_folder_id = mysqli_insert_id($GLOBALS['connect_db']); $this->displayLeftContent(); + + // JS za drag/drop + echo ''; } // Pokazemo popup za preimenovanje folderja @@ -902,6 +908,9 @@ class SurveyListFolders extends SurveyList{ $sql = sisplet_query("UPDATE srv_mysurvey_folder SET naslov='".$folder_name."' WHERE id='".$folder_id."' AND usr_id='".$global_user_id."'"); $this->displayLeftContent(); + + // JS za drag/drop + echo ''; } // Pobrisemo folder @@ -934,6 +943,41 @@ class SurveyListFolders extends SurveyList{ } } + + // Drop folderja + if($_GET['a'] == 'mysurvey_folder_drop'){ + + $drag_folder_id = isset($_POST['drag_folder_id']) ? $_POST['drag_folder_id'] : 0; + $parent_folder_id = isset($_POST['parent_folder_id']) ? $_POST['parent_folder_id'] : 0; + + if($drag_folder_id > 0){ + + // Nastavimo folderju novega parenta + $sql = sisplet_query("UPDATE srv_mysurvey_folder SET parent='".$parent_folder_id."' WHERE id='".$drag_folder_id."' AND usr_id='".$global_user_id."'"); + } + + $this->getSurveys(); + } + + // Drop ankete + if($_GET['a'] == 'mysurvey_survey_drop'){ + + $drag_survey_id = isset($_POST['drag_survey_id']) ? $_POST['drag_survey_id'] : 0; + $parent_folder_id = isset($_POST['parent_folder_id']) ? $_POST['parent_folder_id'] : 0; + + if($drag_survey_id > 0){ + + // Prestavimo anketo v folder + $sql = sisplet_query("INSERT INTO srv_mysurvey_anketa + (ank_id, usr_id, folder) + VALUES + ('".$drag_survey_id."', '".$global_user_id."', '".$parent_folder_id."') + ON DUPLICATE KEY UPDATE + folder='".$parent_folder_id."'"); + } + + $this->getSurveys(); + } } } diff --git a/admin/survey/index.php b/admin/survey/index.php index a252abbcf..c2fa5b851 100644 --- a/admin/survey/index.php +++ b/admin/survey/index.php @@ -176,12 +176,23 @@ /**************** BODY ****************/ // za css - barve ozadja - if (isset($_GET['anketa'])) + if(isset($_GET['anketa'])){ $cssBodyClass = 'body_anketa'; - else if (isset($_GET['a']) && $_GET['a'] == 'knjiznica' ) + } + elseif(isset($_GET['a']) && $_GET['a'] == 'knjiznica'){ $cssBodyClass = 'body_library'; - else - $cssBodyClass = 'body_folders'; + } + elseif(!isset($_GET['a']) || $_GET['a'] == 'pregledovanje'){ + + // Pogled s folderji + if(SurveyList::hasFolders()){ + $cssBodyClass = 'body_mySurveys_folders'; + } + // Klasicne moje ankete + else{ + $cssBodyClass = 'body_mySurveys'; + } + } // Class za jezik $langBodyClass = ($lang['id'] != "1") ? 'eng' : 'slo'; diff --git a/admin/survey/script/surveyList.js b/admin/survey/script/surveyList.js index 1c1a5d69c..e1247c5d1 100644 --- a/admin/survey/script/surveyList.js +++ b/admin/survey/script/surveyList.js @@ -75,6 +75,8 @@ function switchFolder(show){ $('#survey_list').load('ajax.php?a=surveyList_folders', {show_folders:show_folders}, function(){ $('#moje_ankete_edit').toggleClass('moje_ankete_folders'); + $('body').toggleClass('body_mySurveys_folders'); + $('body').toggleClass('body_mySurveys'); }); } @@ -89,22 +91,20 @@ function mySurvey_folder_init() { // Drop folderja if($(ui.draggable).hasClass('folder_item')){ - /*var drag_folder = $(ui.draggable).attr('folder_id'); - var parent = $(this).attr('folder_id'); + + var drag_folder_id = $(ui.draggable).attr('folder_id'); + var parent_folder_id = $(this).attr('folder_id'); - $.post('ajax.php?t=surveyList&a=folder_dropped', {parent: parent, drag_folder: drag_folder}, function(){ - window.location.reload(); - });*/ + $('#survey_list').load('ajax.php?t=surveyListFolders&a=mysurvey_folder_drop', {parent_folder_id: parent_folder_id, drag_folder_id: drag_folder_id}); } // 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(); - });*/ + var drag_survey_id = $(ui.draggable).attr('anketa_id'); + var parent_folder_id = $(this).attr('folder_id'); + + $('#survey_list').load('ajax.php?t=surveyListFolders&a=mysurvey_survey_drop', {parent_folder_id: parent_folder_id, drag_survey_id: drag_survey_id}); } } }); diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 4bf55a70e..7fa901a1f 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -11067,35 +11067,40 @@ body.eng #survey_list .filters #folderSwitch { /* Seznam anket pri mojih anketah z vklopljenimi mapami */ -.moje_ankete_folders { +body.body_mySurveys_folders { + overflow-y: hidden; +} +body.body_mySurveys_folders .moje_ankete_folders { margin-top: -64px !important; padding: 0 !important; max-width: 100% !important; + overflow-y: hidden; } -.moje_ankete_folders #survey_list .survey_list_folders { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders { display: flex; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content { flex-shrink: 0; width: 320px; - height: 100vh; + height: calc(100vh - 210px); + overflow-y: auto; padding: 32px 16px; border-right: 1px #E5E5E5 solid; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content .title { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content .title { margin-bottom: 16px; font-weight: 600; font-size: 14px; text-transform: uppercase; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content > ul { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content > ul { margin-left: 0 !important; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul { margin: 0 0 0 16px; padding: 0; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item { cursor: pointer; position: relative; display: flex; @@ -11110,58 +11115,58 @@ body.eng #survey_list .filters #folderSwitch { border-radius: 2px; transition: 0.2s; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.arrow:before { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.arrow:before { content: ""; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.folder:before, -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.clipboard:before { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.folder:before, +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .faicon.clipboard:before { font-weight: 400; color: #D3D3D3; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active { border-color: #1E88E5; background-color: #F8F8F8; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.folder:before, -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.clipboard:before { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.folder:before, +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.active .faicon.clipboard:before { font-weight: 600; color: #1E88E5; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.open .faicon.arrow:before { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.open .faicon.arrow:before { content: ""; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.no_arrow .faicon.arrow:before { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.no_arrow .faicon.arrow:before { display: none; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.droppable_folder.drag-hover { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item.mySurvey_droppable.folderhover { background-color: #E5E5E5; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item:hover { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item:hover { background-color: #F8F8F8; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item:hover .dots_ver { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item:hover .dots_ver { display: block; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item span { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item span { margin-right: 8px; font-size: 14px; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_child_count { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_child_count { margin-left: 8px; font-size: 12px; color: #777777; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver { display: none; position: absolute; right: 0; padding: 7px 8px; margin-right: 0; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver.active { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .dots_ver.active { display: block !important; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings { padding: 16px; color: #333333; font-weight: 400; @@ -11177,35 +11182,35 @@ body.eng #survey_list .filters #folderSwitch { top: 38px; border-radius: 2px; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings a { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings a { text-decoration: none; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul { margin: 0; padding: 0; list-style-type: none; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li { margin-bottom: 16px; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:last-of-type { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:last-of-type { margin-bottom: 0; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span { cursor: pointer; color: #333333; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span:hover { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li span:hover { color: #1E88E5; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li { color: #1E88E5; transition: 0.2s; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:hover { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul li:hover { color: #0059ab; } -.moje_ankete_folders #survey_list .survey_list_folders .left_content #mySurvey_additional_popup { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content #mySurvey_additional_popup { display: none; z-index: 9999; position: absolute !important; @@ -11215,59 +11220,60 @@ body.eng #survey_list .filters #folderSwitch { border: 1px solid #C4C4C4; box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07); } -.moje_ankete_folders #survey_list .survey_list_folders .left_content #mySurvey_additional_popup input[type=text] { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .left_content #mySurvey_additional_popup input[type=text] { width: 100%; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content { - width: auto; +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content { + width: 100%; padding: 32px 16px; + height: calc(100vh - 210px); + overflow-y: auto; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title { margin-bottom: 24px; font-weight: 600; font-size: 16px; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title .faicon.folder:before { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .folder_title .faicon.folder:before { margin-right: 8px; font-weight: 600; color: #1E88E5; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line { display: flex; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .create_buttons { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .create_buttons { display: flex; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters { width: auto; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys { width: auto; margin-left: 16px; } -.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys #searchMySurvey, -.moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys button { +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys #searchMySurvey, +body.body_mySurveys_folders .moje_ankete_folders #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys button { height: 40px; } - -#survey_list .div_sl_new.folders table#surveyList_new tr.sl_header_new td { +body.body_mySurveys_folders #survey_list .div_sl_new.folders table#surveyList_new tr.sl_header_new td { background-color: #FFFFFF; } -#survey_list .div_sl_new.folders .folder_add_first a { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_add_first a { font-size: 16px; font-weight: 600; text-decoration: none; } -#survey_list .div_sl_new.folders .folder_add_first a .faicon { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_add_first a .faicon { margin-right: 8px; } -#survey_list .div_sl_new.folders > .folder_holder .folder_holder { +body.body_mySurveys_folders #survey_list .div_sl_new.folders > .folder_holder .folder_holder { margin-left: 36px; } -#survey_list .div_sl_new.folders .folder_holder { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder { margin-top: 16px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title { display: flex; justify-content: flex-start; align-items: center; @@ -11278,101 +11284,101 @@ body.eng #survey_list .filters #folderSwitch { border: 1px solid #D3D3D3; border-radius: 4px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon { cursor: pointer; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_arrow_icon::before { content: ""; font-size: 14px; color: #333333; margin-right: 8px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_icon::before { content: ""; font-size: 16px; font-weight: 400; color: #1E88E5; margin-right: 8px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title.open { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title.open { background-color: #F8F8F8; } -#survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_arrow_icon::before { content: ""; } -#survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title.open .folder_icon::before { font-weight: 600; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_text { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_text { margin-right: 8px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_text a { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_text a { cursor: text; text-decoration: none; color: #333333; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_text input[type=text] { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_text input[type=text] { font-size: 16px; padding: 2px 3px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_edit { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_title_edit { margin: 0; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .map_holder_control { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .map_holder_control { display: none; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .map_holder_control .faicon::before { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .map_holder_control .faicon::before { font-size: 16px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title .folder_clickable { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title .folder_clickable { cursor: pointer; flex-grow: 1; height: 100%; } -#survey_list .div_sl_new.folders .folder_holder .folder_title:hover .map_holder_control { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title:hover .map_holder_control { display: flex; } -#survey_list .div_sl_new.folders .folder_holder .folder_title:hover .map_holder_control a { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title:hover .map_holder_control a { margin-left: 8px; } -#survey_list .div_sl_new.folders .folder_holder .folder_title span.folder_blue { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_title span.folder_blue { cursor: move; } -#survey_list .div_sl_new.folders .folder_holder .folder_content.closed { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_content.closed { display: none; } -#survey_list .div_sl_new.folders .folder_holder .folder_content.subfolder { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder .folder_content.subfolder { margin-bottom: 5px; } -#survey_list .div_sl_new.folders .folder_holder table#surveyList_new { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder table#surveyList_new { margin-bottom: 20px; } -#survey_list .div_sl_new.folders .folder_holder table#surveyList_new tr.anketa_list td.col3 { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folder_holder table#surveyList_new tr.anketa_list td.col3 { cursor: move; } -#survey_list .div_sl_new.folders .folderhover { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .folderhover { background-color: #E5E5E5 !important; border: 1px solid #E5E5E5 !important; border-radius: 5px 5px 5px 5px; } -#survey_list .div_sl_new.folders .mySurvey_draggable_helper { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .mySurvey_draggable_helper { cursor: move; } -#survey_list .div_sl_new.folders .mySurvey_draggable_helper .map_holder_control { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .mySurvey_draggable_helper .map_holder_control { display: none; } -#survey_list .div_sl_new.folders .mySurvey_draggable_helper td { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .mySurvey_draggable_helper td { display: none; border: 0; } -#survey_list .div_sl_new.folders .mySurvey_draggable_helper td.col3 { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .mySurvey_draggable_helper td.col3 { display: inline-block; border: 0 !important; } -#survey_list .div_sl_new.folders .mySurvey_draggable_helper span.minus { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .mySurvey_draggable_helper span.minus { display: none !important; } -#survey_list .div_sl_new.folders .mySurvey_draggable_helper span.map_holder_control { +body.body_mySurveys_folders #survey_list .div_sl_new.folders .mySurvey_draggable_helper span.map_holder_control { display: none !important; } diff --git a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss index 0c8845523..3b6a6ebc4 100644 --- a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss +++ b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss @@ -2,384 +2,393 @@ Seznam anket pri mojih anketah z vklopljenimi mapami */ -.moje_ankete_folders{ - margin-top: -64px !important; - padding: 0 !important; +body.body_mySurveys_folders{ + overflow-y: hidden; - max-width: 100% !important; + .moje_ankete_folders{ + margin-top: -64px !important; + padding: 0 !important; - #survey_list .survey_list_folders{ - display: flex; + max-width: 100% !important; + overflow-y: hidden; + + #survey_list .survey_list_folders{ + display: flex; - // Meni na levi - .left_content{ - flex-shrink: 0; + // Meni na levi + .left_content{ + flex-shrink: 0; - width: 320px; - height: 100vh; + width: 320px; + height: calc(100vh - 210px); + overflow-y: auto; - padding: 32px 16px; + padding: 32px 16px; - border-right: 1px $gray solid; + border-right: 1px $gray solid; - .title{ - margin-bottom: 16px; + .title{ + margin-bottom: 16px; - font-weight: 600; - font-size: 14px; - text-transform: uppercase; - } + font-weight: 600; + font-size: 14px; + text-transform: uppercase; + } - > ul { - margin-left: 0 !important; - } - - ul{ - margin: 0 0 0 16px; - padding: 0; - - li.folder_item{ - cursor: pointer; - position: relative; + > ul { + margin-left: 0 !important; + } - display: flex; - align-items: center; - justify-content: flex-start; + ul{ + margin: 0 0 0 16px; + padding: 0; - box-sizing: border-box; - height: 40px; - width: 100%; - padding: 0 8px; - margin-bottom: 8px; - - 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; - + 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 $gray; + border-radius: 2px; + + transition: 0.2s; + + .faicon.arrow:before{ + content: "\f078"; + } .faicon.folder:before, .faicon.clipboard:before{ - font-weight: 600; - color: $blue; + font-weight: 400; + color: $dark-gray2; } - } - &.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; + border-color: $blue; + background-color: $light-gray; + + .faicon.folder:before, + .faicon.clipboard:before{ + font-weight: 600; + color: $blue; + } } - } - - .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; + &.open{ + .faicon.arrow:before{ + content: "\f077"; + } + } + + &.no_arrow .faicon.arrow:before{ + display: none; + } + + &.mySurvey_droppable.folderhover{ + //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%; + } + } } - // 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%; + // Vsebina na desni + .right_content{ + width: 100%; + padding: 32px 16px; + + height: calc(100vh - 210px); + overflow-y: auto; + + .folder_title{ + margin-bottom: 24px; + + font-weight: 600; + font-size: 16px; + + .faicon.folder:before{ + margin-right: 8px; + + font-weight: 600; + color: $blue; + } + } + + .second_line{ + display: flex; + + .create_buttons{ + display: flex; + } + + .filters{ + width: auto; + + #searchMySurveys{ + width: auto; + margin-left: 16px; + + #searchMySurvey, + button{ + height: 40px; + } + } + } + } + } + } + } + + + #survey_list .div_sl_new.folders{ + + table#surveyList_new{ + + tr.sl_header_new td{ + background-color: $white; + } + + } + + .folder_add_first{ + + a{ + font-size: 16px; + font-weight: 600; + text-decoration: none; + + .faicon{ + margin-right: 8px; } } } + >.folder_holder .folder_holder{ + margin-left: 36px; + } - // Vsebina na desni - .right_content{ - width: auto; - padding: 32px 16px; + .folder_holder { + margin-top: 16px; - .folder_title{ - margin-bottom: 24px; + .folder_title { + display: flex; + justify-content: flex-start; + align-items: center; - font-weight: 600; - font-size: 16px; + box-sizing: border-box; + padding: 0 16px; + height: 40px; + + background-color: $white; + border: 1px solid $dark-gray2; + + border-radius: 4px; - .faicon.folder:before{ + .folder_arrow_icon{ + cursor: pointer; + } + .folder_arrow_icon::before{ + content: "\f078"; + font-size: 14px; + color: $black; + + margin-right: 8px; + } + .folder_icon::before{ + content: "\f07b"; + font-size: 16px; + font-weight: 400; + color: $blue; + + margin-right: 8px; + } + + &.open{ + background-color: $light-gray; + + .folder_arrow_icon::before{ + content: "\f077"; + } + .folder_icon::before{ + font-weight: 600; + } + } + + .folder_title_text { margin-right: 8px; - font-weight: 600; - color: $blue; - } - } + a { + cursor: text; - .second_line{ - display: flex; + text-decoration: none; + color: $black; + } - .create_buttons{ - display: flex; + input[type="text"] { + font-size: 16px; + padding: 2px 3px; + } } - .filters{ - width: auto; + .folder_title_edit{ + margin: 0; + } - #searchMySurveys{ - width: auto; - margin-left: 16px; + .map_holder_control { + display: none; - #searchMySurvey, - button{ - height: 40px; + .faicon::before{ + font-size: 16px; + } + } + + .folder_clickable{ + cursor: pointer; + flex-grow: 1; + height: 100%; + } + + &:hover { + .map_holder_control { + display: flex; + + a{ + margin-left: 8px; } } } - } - } - } -} - -#survey_list .div_sl_new.folders{ - - table#surveyList_new{ - - tr.sl_header_new td{ - background-color: $white; - } - - } - - .folder_add_first{ - - a{ - font-size: 16px; - font-weight: 600; - text-decoration: none; - - .faicon{ - margin-right: 8px; - } - } - } - - >.folder_holder .folder_holder{ - margin-left: 36px; - } - - .folder_holder { - margin-top: 16px; - - .folder_title { - display: flex; - justify-content: flex-start; - align-items: center; - - box-sizing: border-box; - padding: 0 16px; - height: 40px; - - background-color: $white; - border: 1px solid $dark-gray2; - - border-radius: 4px; - - .folder_arrow_icon{ - cursor: pointer; - } - .folder_arrow_icon::before{ - content: "\f078"; - font-size: 14px; - color: $black; - - margin-right: 8px; - } - .folder_icon::before{ - content: "\f07b"; - font-size: 16px; - font-weight: 400; - color: $blue; - - margin-right: 8px; - } - - &.open{ - background-color: $light-gray; - - .folder_arrow_icon::before{ - content: "\f077"; - } - .folder_icon::before{ - font-weight: 600; - } - } - - .folder_title_text { - margin-right: 8px; - - a { - cursor: text; - - text-decoration: none; - color: $black; - } - - input[type="text"] { - font-size: 16px; - padding: 2px 3px; - } - } - - .folder_title_edit{ - margin: 0; - } - - .map_holder_control { - display: none; - - .faicon::before{ - font-size: 16px; - } - } - - .folder_clickable{ - cursor: pointer; - flex-grow: 1; - height: 100%; - } - - &:hover { - .map_holder_control { - display: flex; - - a{ - margin-left: 8px; - } - } - } - - span.folder_blue { - cursor: move; - } - } - - .folder_content { - - &.closed { - display: none; - } - - &.subfolder { - margin-bottom: 5px; - } - } - - table#surveyList_new { - margin-bottom: 20px; - tr.anketa_list { - td.col3 { + span.folder_blue { cursor: move; } } - } - } - .folderhover{ - background-color: $gray !important; - border: 1px solid $gray !important; - border-radius: 5px 5px 5px 5px; - } + .folder_content { - .mySurvey_draggable_helper { - .map_holder_control { - display: none; + &.closed { + display: none; + } + + &.subfolder { + margin-bottom: 5px; + } + } + + table#surveyList_new { + margin-bottom: 20px; + tr.anketa_list { + td.col3 { + cursor: move; + } + } + } } - cursor: move; - td { - display: none; - border: 0; + + .folderhover{ + background-color: $gray !important; + border: 1px solid $gray !important; + border-radius: 5px 5px 5px 5px; } - td.col3 { - display: inline-block; - border: 0 !important; - } - span.minus { - display: none !important; - } - span.map_holder_control { - display: none !important; + + .mySurvey_draggable_helper { + .map_holder_control { + display: none; + } + cursor: move; + td { + display: none; + border: 0; + } + td.col3 { + display: inline-block; + border: 0 !important; + } + span.minus { + display: none !important; + } + span.map_holder_control { + display: none !important; + } } } -} \ No newline at end of file +}