diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php index 93b720ceb..ded8e4ff0 100644 --- a/admin/survey/classes/class.LibraryBranching.php +++ b/admin/survey/classes/class.LibraryBranching.php @@ -222,7 +222,7 @@ class LibraryBranching { while ($rowSurvey = mysqli_fetch_array($sqlSurvey)) { - $this->displayFolderItemSurvey($rowSurvey['id'], $rowSurvey['naslov']); + $this->displayFolderItemSurvey($rowSurvey['id'], $rowSurvey['naslov'], $uid); } } } @@ -274,10 +274,13 @@ class LibraryBranching { } // Levi item - anketa - private function displayFolderItemSurvey($id, $title) { + private function displayFolderItemSurvey($id, $title, $uid) { global $lang; - echo '
  • '; + // Javne ankete + $type = ($uid == '0') ? 'public' : 'my'; + + echo '
  • '; // Ikoni puscice in mape @@ -434,7 +437,7 @@ class LibraryBranching { // Naslov ankete SurveyInfo :: getInstance()->SurveyInit($this->folder_id); - echo '
    '.SurveyInfo::getSurveyTitle().'
    '; + echo '
    '.SurveyInfo::getSurveyTitle().'
    '; $sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$this->folder_id."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC"); while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) { diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js index 358a95bb9..0d6189539 100644 --- a/admin/survey/script/library.js +++ b/admin/survey/script/library.js @@ -275,10 +275,10 @@ function openLibraryFolder(folder_id){ } // Odpremo anketo - na desni prikazemo vprasanja -function openLibrarySurvey(folder_id){ +function openLibrarySurvey(folder_id, type){ $('.folder_item').removeClass('active'); - $('#survey_item_'+folder_id).addClass('active'); + $('#'+type+'_survey_item_'+folder_id).addClass('active'); var tab = $('#active_tab').val(); diff --git a/lang/1.php b/lang/1.php index 8123099da..b18f76ed4 100644 --- a/lang/1.php +++ b/lang/1.php @@ -8550,15 +8550,15 @@ $lang = array ( "action_note_lib_add_to_lib_type2_1" => "Blok je bil dodan v knjižnico", "action_note_lib_add_to_lib_type2_2" => "Zanka je bila dodana v knjižnico", - "action_note_lib_add_to_survey_m" => "Elementi so bili dodani na konec ankete", - "action_note_lib_add_to_survey_1" => "Vprašanje je bilo dodano na konec ankete", - "action_note_lib_add_to_survey_1m" => "Vprašanja so bila dodana na konec ankete", - "action_note_lib_add_to_survey_2_0" => "Pogoj je bil dodan na konec ankete", - "action_note_lib_add_to_survey_2_0m" => "Pogoji so bili dodani na konec ankete", - "action_note_lib_add_to_survey_2_1" => "Blok je bil dodan na konec ankete", - "action_note_lib_add_to_survey_2_1m" => "Bloki so bili dodani na konec ankete", - "action_note_lib_add_to_survey_2_2" => "Zanka je bil dodana na konec ankete", - "action_note_lib_add_to_survey_2_2m" => "Zanke so bile dodane na konec ankete", + "action_note_lib_add_to_survey_m" => "Elementi so bili dodani", + "action_note_lib_add_to_survey_1" => "Vprašanje je bilo dodano", + "action_note_lib_add_to_survey_1m" => "Vprašanja so bila dodana", + "action_note_lib_add_to_survey_2_0" => "Pogoj je bil dodan", + "action_note_lib_add_to_survey_2_0m" => "Pogoji so bili dodani", + "action_note_lib_add_to_survey_2_1" => "Blok je bil dodan", + "action_note_lib_add_to_survey_2_1m" => "Bloki so bili dodani", + "action_note_lib_add_to_survey_2_2" => "Zanka je bil dodana", + "action_note_lib_add_to_survey_2_2m" => "Zanke so bile dodane", "action_note_link_copied" => 'Povezava je bila kopirana', "action_note_success_save" => "Nastavitve so bile shranjene", diff --git a/lang/2.php b/lang/2.php index 9875a0a88..31050fd43 100644 --- a/lang/2.php +++ b/lang/2.php @@ -8443,15 +8443,15 @@ GDPR introduction preview", "action_note_lib_add_to_lib_type1" => "Question added to library", "action_note_lib_add_to_lib_type2" => "Block added to library", - "action_note_lib_add_to_survey_m" => "Elements were added to survey", - "action_note_lib_add_to_survey_1" => "Question was added to survey", - "action_note_lib_add_to_survey_1m" => "Questions were added to survey", - "action_note_lib_add_to_survey_2_0" => "Condition was added to survey", - "action_note_lib_add_to_survey_2_0m" => "Conditions were added to survey", - "action_note_lib_add_to_survey_2_1" => "Block was added to survey", - "action_note_lib_add_to_survey_2_1m" => "Blocks were added to survey", - "action_note_lib_add_to_survey_2_2" => "Loop was added to survey", - "action_note_lib_add_to_survey_2_2m" => "Loops were added to survey", + "action_note_lib_add_to_survey_m" => "Elements were added", + "action_note_lib_add_to_survey_1" => "Question was added", + "action_note_lib_add_to_survey_1m" => "Questions were added", + "action_note_lib_add_to_survey_2_0" => "Condition was added", + "action_note_lib_add_to_survey_2_0m" => "Conditions were added", + "action_note_lib_add_to_survey_2_1" => "Block was added", + "action_note_lib_add_to_survey_2_1m" => "Blocks were added", + "action_note_lib_add_to_survey_2_2" => "Loop was added", + "action_note_lib_add_to_survey_2_2m" => "Loops were added", "action_note_link_copied" => 'The link has been copied', "action_note_success_save" => "The settings have been saved", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 7d8a4364d..614052db5 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -17417,7 +17417,8 @@ and open the template in the editor. .tab_content .content_left ul li.folder_item .faicon.arrow:before { content: ""; } -.tab_content .content_left ul li.folder_item .faicon.folder:before { +.tab_content .content_left ul li.folder_item .faicon.folder:before, +.tab_content .content_left ul li.folder_item .faicon.clipboard:before { font-weight: 400; color: #D3D3D3; } @@ -17425,7 +17426,8 @@ and open the template in the editor. border-color: #1E88E5; background-color: #F8F8F8; } -.tab_content .content_left ul li.folder_item.active .faicon.folder:before { +.tab_content .content_left ul li.folder_item.active .faicon.folder:before, +.tab_content .content_left ul li.folder_item.active .faicon.clipboard:before { font-weight: 600; color: #1E88E5; } @@ -26208,7 +26210,7 @@ ul.vrednost_sort input[type=text] { .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before { padding-right: 8px; font-family: "Font Awesome 5 Free"; - content: "\f071"; + content: ""; font-size: 14px; color: #FFC700; } diff --git a/resources/sass/admin_new/pages/survey_edit/library.scss b/resources/sass/admin_new/pages/survey_edit/library.scss index 1fe9b8ebe..2ac102059 100644 --- a/resources/sass/admin_new/pages/survey_edit/library.scss +++ b/resources/sass/admin_new/pages/survey_edit/library.scss @@ -83,7 +83,8 @@ .faicon.arrow:before{ content: "\f078"; } - .faicon.folder:before{ + .faicon.folder:before, + .faicon.clipboard:before{ font-weight: 400; color: $dark-gray2; } @@ -91,7 +92,8 @@ border-color: $blue; background-color: $light-gray; - .faicon.folder:before{ + .faicon.folder:before, + .faicon.clipboard:before{ font-weight: 600; color: $blue; }