may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - popravki knjiznice znotraj ankete

Browse Source
This commit is contained in:
pero1203 2022-04-17 11:56:44 +02:00
parent 835c162a87
commit 3c8f914e15
6 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/classes/class.LibraryBranching.php
View File

@ -222,7 +222,7 @@ class LibraryBranching {
while ($rowSurvey = mysqli_fetch_array($sqlSurvey)) { 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 // Levi item - anketa
private function displayFolderItemSurvey($id, $title) { private function displayFolderItemSurvey($id, $title, $uid) {
global $lang; global $lang;
echo '<li id="survey_item_'.$id.'" class="folder_item survey_item '.($this->folder_id == $id ? 'active' : '').'" onClick="openLibrarySurvey(\''.$id.'\');">'; // Javne ankete
$type = ($uid == '0') ? 'public' : 'my';
echo '<li id="'.$type.'_survey_item_'.$id.'" class="folder_item survey_item '.($this->folder_id == $id ? 'active' : '').'" onClick="openLibrarySurvey(\''.$id.'\', \''.$type.'\');">';
// Ikoni puscice in mape // Ikoni puscice in mape
@ -434,7 +437,7 @@ class LibraryBranching {
// Naslov ankete // Naslov ankete
SurveyInfo :: getInstance()->SurveyInit($this->folder_id); SurveyInfo :: getInstance()->SurveyInit($this->folder_id);
echo '<div class="folder_title"><span class="faicon folder"></span>'.SurveyInfo::getSurveyTitle().'</div>'; echo '<div class="folder_title"><span class="faicon clipboard"></span>'.SurveyInfo::getSurveyTitle().'</div>';
$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"); $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)) { while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {

4
admin/survey/script/library.js
View File

@ -275,10 +275,10 @@ function openLibraryFolder(folder_id){
} }
// Odpremo anketo - na desni prikazemo vprasanja // Odpremo anketo - na desni prikazemo vprasanja
function openLibrarySurvey(folder_id){ function openLibrarySurvey(folder_id, type){
$('.folder_item').removeClass('active'); $('.folder_item').removeClass('active');
$('#survey_item_'+folder_id).addClass('active'); $('#'+type+'_survey_item_'+folder_id).addClass('active');
var tab = $('#active_tab').val(); var tab = $('#active_tab').val();

18
lang/1.php
View File

@ -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_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_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_m" => "Elementi so bili dodani",
"action_note_lib_add_to_survey_1" => "Vprašanje je bilo dodano na konec ankete", "action_note_lib_add_to_survey_1" => "Vprašanje je bilo dodano",
"action_note_lib_add_to_survey_1m" => "Vprašanja so bila dodana na konec ankete", "action_note_lib_add_to_survey_1m" => "Vprašanja so bila dodana",
"action_note_lib_add_to_survey_2_0" => "Pogoj je bil dodan na konec ankete", "action_note_lib_add_to_survey_2_0" => "Pogoj je bil dodan",
"action_note_lib_add_to_survey_2_0m" => "Pogoji so bili dodani na konec ankete", "action_note_lib_add_to_survey_2_0m" => "Pogoji so bili dodani",
"action_note_lib_add_to_survey_2_1" => "Blok je bil dodan na konec ankete", "action_note_lib_add_to_survey_2_1" => "Blok je bil dodan",
"action_note_lib_add_to_survey_2_1m" => "Bloki so bili dodani na konec ankete", "action_note_lib_add_to_survey_2_1m" => "Bloki so bili dodani",
"action_note_lib_add_to_survey_2_2" => "Zanka je bil dodana na konec ankete", "action_note_lib_add_to_survey_2_2" => "Zanka je bil dodana",
"action_note_lib_add_to_survey_2_2m" => "Zanke so bile dodane na konec ankete", "action_note_lib_add_to_survey_2_2m" => "Zanke so bile dodane",
"action_note_link_copied" => 'Povezava je bila kopirana', "action_note_link_copied" => 'Povezava je bila kopirana',
"action_note_success_save" => "Nastavitve so bile shranjene", "action_note_success_save" => "Nastavitve so bile shranjene",

18
lang/2.php
View File

@ -8443,15 +8443,15 @@ GDPR introduction preview",
"action_note_lib_add_to_lib_type1" => "Question added to library", "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_lib_type2" => "Block added to library",
"action_note_lib_add_to_survey_m" => "Elements were added to survey", "action_note_lib_add_to_survey_m" => "Elements were added",
"action_note_lib_add_to_survey_1" => "Question was added to survey", "action_note_lib_add_to_survey_1" => "Question was added",
"action_note_lib_add_to_survey_1m" => "Questions were added to survey", "action_note_lib_add_to_survey_1m" => "Questions were added",
"action_note_lib_add_to_survey_2_0" => "Condition was added to survey", "action_note_lib_add_to_survey_2_0" => "Condition was added",
"action_note_lib_add_to_survey_2_0m" => "Conditions were added to survey", "action_note_lib_add_to_survey_2_0m" => "Conditions were added",
"action_note_lib_add_to_survey_2_1" => "Block was added to survey", "action_note_lib_add_to_survey_2_1" => "Block was added",
"action_note_lib_add_to_survey_2_1m" => "Blocks were added to survey", "action_note_lib_add_to_survey_2_1m" => "Blocks were added",
"action_note_lib_add_to_survey_2_2" => "Loop was added to survey", "action_note_lib_add_to_survey_2_2" => "Loop was added",
"action_note_lib_add_to_survey_2_2m" => "Loops were added to survey", "action_note_lib_add_to_survey_2_2m" => "Loops were added",
"action_note_link_copied" => 'The link has been copied', "action_note_link_copied" => 'The link has been copied',
"action_note_success_save" => "The settings have been saved", "action_note_success_save" => "The settings have been saved",

8
public/css/admin_new.css
View File

@ -17417,7 +17417,8 @@ and open the template in the editor.
.tab_content .content_left ul li.folder_item .faicon.arrow:before { .tab_content .content_left ul li.folder_item .faicon.arrow:before {
content: ""; 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; font-weight: 400;
color: #D3D3D3; color: #D3D3D3;
} }
@ -17425,7 +17426,8 @@ and open the template in the editor.
border-color: #1E88E5; border-color: #1E88E5;
background-color: #F8F8F8; 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; font-weight: 600;
color: #1E88E5; color: #1E88E5;
} }
@ -26208,7 +26210,7 @@ ul.vrednost_sort input[type=text] {
.subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before { .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
padding-right: 8px; padding-right: 8px;
font-family: "Font Awesome 5 Free"; font-family: "Font Awesome 5 Free";
content: "\f071"; content: "";
font-size: 14px; font-size: 14px;
color: #FFC700; color: #FFC700;
} }

6
resources/sass/admin_new/pages/survey_edit/library.scss
View File

@ -83,7 +83,8 @@
.faicon.arrow:before{ .faicon.arrow:before{
content: "\f078"; content: "\f078";
} }
.faicon.folder:before{ .faicon.folder:before,
.faicon.clipboard:before{
font-weight: 400; font-weight: 400;
color: $dark-gray2; color: $dark-gray2;
} }
@ -91,7 +92,8 @@
border-color: $blue; border-color: $blue;
background-color: $light-gray; background-color: $light-gray;
.faicon.folder:before{ .faicon.folder:before,
.faicon.clipboard:before{
font-weight: 600; font-weight: 600;
color: $blue; color: $blue;
} }