diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index b959cb92b..f0f68623d 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -319,7 +319,14 @@ class SurveyAdmin } // ZNOTRAJ ANKETE else{ - echo '
'; + echo '
'; + + // breadcrumbs + echo ''; + echo '
'; $this->displayAnketa(); diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php index 9b651bb56..5644d0d15 100644 --- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php +++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php @@ -695,8 +695,10 @@ class MobileSurveyAdmin{ 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_BREAK, 'active' => ($_GET['m'] == M_ANALYSIS_BREAK ? ' active' : '') ) - ) + ), + 'active' => (($_GET['a'] == 'analysis' && $_GET['m'] != 'charts' && $_GET['m'] != 'analysis_links') ? ' active' : '') ), + array( 'title' => $lang['srv_analiza_charts'], 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_CHARTS, diff --git a/lang/1.php b/lang/1.php index e779709c1..d1de86675 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7866,6 +7866,26 @@ $lang = array ( 'srv_gdpr_frontend_login' => 'Prijava obstoječega uporabnika', 'srv_gdpr_frontend_login_text' => 'Strinjam se s splošnimi pogoji uporabe uporabe in namestitvijo piškotkov.', + //Breadcrumbs - mobilna navigacija + "navigation_NAVI_STATUS" => 'Status', + "navigation_NAVI_STATUS_OSNOVNI" => $_GET['a'] == 'reporti' ? 'Povzetek' : 'Parapodatki', + "navigation_NAVI_UREJANJE" => 'Urejanje', + "navigation_NAVI_UREJANJE_BRANCHING" => 'Vprašalnik', + "navigation_NAVI_UREJANJE_ANKETA" => 'Nastavitve', + "navigation_NAVI_UREJANJE_TEMA" => 'Oblika', + "navigation_NAVI_TESTIRANJE" => 'Testiranje', + "navigation_diagnostika" => 'Diagnostika', + "navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Komentarji', + "navigation_NAVI_TESTIRANJE_VNOSI" => 'Avtomatski vnosi', + "navigation_NAVI_OBJAVA" => 'Objava', + "navigation_invitations" => 'Vabila', + "navigation_NAVI_RESULTS" => 'Podatki', + "navigation_NAVI_DATA" => isset($_GET['m']) ? ($_GET['m'] == 'calculation' ? 'Izračuni' : ($_GET['m'] == 'append' ? 'Uvoz' : '')) : ($_GET['a'] == 'data' ? 'Pregledovanje' : ''), + "navigation_NAVI_DATA_EXPORT" => 'Izvoz', + "navigation_NAVI_ANALYSIS" => 'Analize', + "navigation_NAVI_STATISTIC_ANALYSIS" => ($_GET['m'] == 'charts' ? 'Grafi' : 'Statistike'), + "navigation_NAVI_ANALYSIS_LINKS" => 'Poročila', + // 1KA NAMESTITEV // 'install_title' => '1KA namestitev', diff --git a/lang/2.php b/lang/2.php index 8fd8b7bbb..d12dc6eb6 100644 --- a/lang/2.php +++ b/lang/2.php @@ -7764,6 +7764,25 @@ GDPR introduction preview", 'srv_gdpr_frontend_login' => 'Login', 'srv_gdpr_frontend_login_text' => 'I agree with the general terms of use and cookie policy.', + //Breadcrumbs - mobilna navigacija + "navigation_NAVI_STATUS" => 'Dashboard', + "navigation_NAVI_STATUS_OSNOVNI" => $_GET['a'] == 'reporti' ? 'Summary' : 'Paradata', + "navigation_NAVI_UREJANJE" => 'Edit', + "navigation_NAVI_UREJANJE_BRANCHING" => 'Questionnaire', + "navigation_NAVI_UREJANJE_ANKETA" => 'Settings', + "navigation_NAVI_UREJANJE_TEMA" => 'Design', + "navigation_NAVI_TESTIRANJE" => 'Test', + "navigation_diagnostika" => 'Diagnostics', + "navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Comments', + "navigation_NAVI_TESTIRANJE_VNOSI" => 'Test responses', + "navigation_NAVI_OBJAVA" => 'Publish', + "navigation_invitations" => 'Invitations', + "navigation_NAVI_RESULTS" => 'Data', + "navigation_NAVI_DATA" => isset($_GET['m']) ? ($_GET['m'] == 'calculation' ? 'Computations' : ($_GET['m'] == 'append' ? 'Import' : '')) : ($_GET['a'] == 'data' ? 'Browse' : ''), + "navigation_NAVI_DATA_EXPORT" => 'Export', + "navigation_NAVI_ANALYSIS" => 'Analyse', + "navigation_NAVI_STATISTIC_ANALYSIS" => ($_GET['m'] == 'charts' ? 'Charts' : 'Statistics'), + "navigation_NAVI_ANALYSIS_LINKS" => 'Reports', // 1KA NAMESTITEV // 'install_title' => '1KA installation', diff --git a/public/css/admin.css b/public/css/admin.css index 7100494d6..1d95194a6 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -6707,6 +6707,10 @@ ul.secondNavigationArchive li.aactive { border-bottom: 2px solid #ffa608; } +div.breadcrumbs { + display: none; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -28606,6 +28610,11 @@ fieldset textarea { -webkit-appearance: none; } + div.breadcrumbs { + display: block; + padding: 15px; + } + .desktop_header { display: none; } diff --git a/resources/sass/admin/mobile/basic.scss b/resources/sass/admin/mobile/basic.scss index 849fb843f..1ba5a229a 100644 --- a/resources/sass/admin/mobile/basic.scss +++ b/resources/sass/admin/mobile/basic.scss @@ -49,4 +49,9 @@ fieldset { select { -webkit-appearance: none; +} + +div.breadcrumbs { + display: block; + padding: 15px; } \ No newline at end of file diff --git a/resources/sass/admin/navigation.scss b/resources/sass/admin/navigation.scss index df4fd6a30..8416b7228 100644 --- a/resources/sass/admin/navigation.scss +++ b/resources/sass/admin/navigation.scss @@ -467,3 +467,8 @@ ul.secondNavigationArchive { border-bottom: 2px solid $orange; } } + +// skrijemo breadcrumbs na desktopu +div.breadcrumbs { + display: none; +}