From f6cd18e91b4ac679e640c04b1a87f405b53c4777 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 12 Aug 2021 10:59:00 +0200 Subject: [PATCH] Odstranitev pogojev v lang datotekah --- admin/survey/SurveyAdmin.php | 5 ++++- lang/1.php | 6 ++++-- lang/2.php | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c1ab3ab60..3f136b573 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -323,8 +323,11 @@ class SurveyAdmin // breadcrumbs echo '
'; + + if ((isset($_GET['a']) && $this->first_action == 'NAVI_STATUS')? $breadcrumbs_a = '_' . $_GET['a'] : $breadcrumbs_a = ''); + if ((isset($_GET['m']) && $this->first_action == 'NAVI_ANALYSIS' && $_GET['m'] == 'charts')? $breadcrumbs_m = '_' . $_GET['m'] : $breadcrumbs_m = ''); - echo $lang['navigation_'.$this->first_action].' > '.$lang['navigation_'.$this->second_action]; + echo $lang['navigation_'.$this->first_action] . ' > ' . $lang['navigation_'.$this->second_action.$breadcrumbs_a.$breadcrumbs_m]; if (isset($this->third_action)) { echo ' > '.$lang['navigation_'.$this->third_action]; } diff --git a/lang/1.php b/lang/1.php index 5c9e8307f..fb74f5927 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7869,7 +7869,8 @@ $lang = array ( //Breadcrumbs - mobilna navigacija "navigation_NAVI_STATUS" => 'Status', - "navigation_NAVI_STATUS_OSNOVNI" => $_GET['a'] == 'reporti' ? 'Povzetek' : 'Parapodatki', + "navigation_NAVI_STATUS_OSNOVNI_reporti" => 'Povzetek', + "navigation_NAVI_STATUS_OSNOVNI_para_graph" => 'Parapodatki', "navigation_NAVI_UREJANJE" => 'Urejanje', "navigation_NAVI_UREJANJE_BRANCHING" => 'Vprašalnik', "navigation_NAVI_UREJANJE_ANKETA" => 'Nastavitve', @@ -7912,7 +7913,8 @@ $lang = array ( "navigation_NAVI_DATA_IMPORT_MERGE" => 'Združi podatke', "navigation_NAVI_ANALYSIS" => 'Analize', - "navigation_NAVI_STATISTIC_ANALYSIS" => ($_GET['m'] == 'charts' ? 'Grafi' : 'Statistike'), + "navigation_NAVI_STATISTIC_ANALYSIS_charts" => 'Grafi', + "navigation_NAVI_STATISTIC_ANALYSIS" => 'Statistike', "navigation_NAVI_STATISTIC_ANALYSIS_SUMARNIK" => 'Sumarnik', "navigation_NAVI_STATISTIC_ANALYSIS_DESCRIPTOR" => 'Opisne statistike', "navigation_NAVI_STATISTIC_ANALYSIS_FREQUENCY" => 'Frekvence', diff --git a/lang/2.php b/lang/2.php index 55902ab4b..98a4bd3b6 100644 --- a/lang/2.php +++ b/lang/2.php @@ -7767,7 +7767,8 @@ GDPR introduction preview", //Breadcrumbs - mobilna navigacija "navigation_NAVI_STATUS" => 'Dashboard', - "navigation_NAVI_STATUS_OSNOVNI" => $_GET['a'] == 'reporti' ? 'Summary' : 'Paradata', + "navigation_NAVI_STATUS_OSNOVNI_reporti" => 'Summary', + "navigation_NAVI_STATUS_OSNOVNI_para_graph" => 'Paradata', "navigation_NAVI_UREJANJE" => 'Edit', "navigation_NAVI_UREJANJE_BRANCHING" => 'Questionnaire', "navigation_NAVI_UREJANJE_ANKETA" => 'Settings', @@ -7790,7 +7791,8 @@ GDPR introduction preview", "navigation_NAVI_ANALYSIS" => 'Analyse', - "navigation_NAVI_STATISTIC_ANALYSIS" => ($_GET['m'] == 'charts' ? 'Charts' : 'Statistics'), + "navigation_NAVI_STATISTIC_ANALYSIS_charts" => 'Charts', + "navigation_NAVI_STATISTIC_ANALYSIS" => 'Statistics', "navigation_NAVI_STATISTIC_ANALYSIS_SUMARNIK" => 'Summary', "navigation_NAVI_STATISTIC_ANALYSIS_DESCRIPTOR" => 'Descriptives', "navigation_NAVI_STATISTIC_ANALYSIS_FREQUENCY" => 'Frequencies',