diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c0b5e1278..b959cb92b 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -1999,115 +1999,6 @@ class SurveyAdmin echo ''; echo '
  • '; - /*# usable respondents - echo '
  • '; - echo ''; - echo $lang['srv_usable_respondents'] . ''; - echo '
    • '; - echo '
  • '; - - # kakovost resp - V DELU - ZAENKRAT SAMO ADMINI - if ($admin_type === '0') { - echo '
  • '; - echo ''; - echo $lang['srv_kakovost'] . ''; - echo '
    • '; - echo '
  • '; - } - - # speeder index - V DELU - ZAENKRAT SAMO ADMINI - if ($admin_type === '0') { - echo '
  • '; - echo ''; - echo $lang['srv_speeder_index'] . ''; - echo '
    • '; - echo '
  • '; - } - - # text analysis - if ($admin_type === '0' || $admin_type === '1') { - echo '
  • '; - echo ''; - echo $lang['srv_text_analysis'] . ''; - echo '
    • '; - echo '
  • '; - } - - # IP analiza lokacij - gorenje ima to ugasnjeno, volitve imajo tudi ugasnjeno - if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) { - echo '
  • '; - echo ''; - echo $lang['srv_geoip_location'] . ''; - echo '
    • '; - echo '
  • '; - } - - # Analize urejanja - V DELU - ZAENKRAT SAMO ADMINI - if ($admin_type === '0') { - echo '
  • '; - echo ''; - echo $lang['srv_edits_analysis'] . ''; - echo '
    • '; - echo '
  • '; - } - - # reminder tracking - pokazi, ce je admin in so vklopljeni napredni parapodatki - $survey_track_reminders = SurveySetting::getInstance()->getSurveyMiscSetting('survey_track_reminders'); - if ($survey_track_reminders == '') $survey_track_reminders = 0; - if (($admin_type === '0' || $admin_type === '1') && SurveyInfo::getInstance()->checkSurveyModule('advanced_paradata')) { - echo '
  • '; - echo ''; - echo $lang['srv_reminder_tracking'] . ''; - echo '
    • '; - echo '
  • '; - } - - # ul evalvacija - if (Common::checkModule('evalvacija') == '1') { - echo '
  • '; - echo ''; - echo 'UL evalvacije'; - echo '
    • '; - echo '
  • '; - } - - # AAPOR - #aapor naj bo viden samo če so vabila - if (SurveyInfo::getSurveyColumn('user_base') == 1 || SurveyInfo::getInstance()->checkSurveyModule('email')) { - echo '
  • '; - echo ''; - echo $lang['srv_aapor'] . ''; - echo '
    • '; - echo '
  • '; - } - - # langStatistic - #langStatistic naj bo viden samo če imamo različne jezike in nimamo volitev - if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) { - - $qry_string = "SELECT language FROM srv_user WHERE ank_id = '" . $this->anketa . "' AND preview = '0' AND deleted='0' group by language"; - $qry = (sisplet_query($qry_string)); - $cntLang = mysqli_num_rows($qry); - - if ($cntLang > 1) { - echo '
  • '; - echo ''; - echo $lang['srv_languages_statistics'] . ''; - echo '
    • '; - echo '
  • '; - } - }*/ - echo ''; } diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php index 126a11d55..094fe696c 100644 --- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php +++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php @@ -11,14 +11,19 @@ class MobileSurveyAdmin{ var $surveyAdminClass; + var $first_action; + var $second_action; function __construct($surveyAdminClass){ global $site_url; $this->surveyAdminClass = $surveyAdminClass; - } + $navigationArray = CrossRoad::MainNavigation($this->surveyAdminClass->anketa, true); + $this->first_action = $navigationArray['first_action']; + $this->second_action = $navigationArray['second_action']; + } // Izris glave z menijem - znotraj ankete public function displayHeaderMobile(){ @@ -178,12 +183,12 @@ class MobileSurveyAdmin{ // MOJE ANKETE - $this->displayMenuItem($lang['srv_pregledovanje'], $url='index.php?a=pregledovanje'); + $this->displayMenuItem($lang['srv_pregledovanje'], $url='index.php?a=pregledovanje', (!isset($_GET['a']) && !isset($_GET['anketa'])) || ($_GET['a'] == 'pregledovanje') ? 'active': ''); // TELEFONSKA ANKETA if ($SLCountPhone > 0 && $admin_type != '0') { - $this->displayMenuItem($lang['srv_telephone_surveys'], $url='index.php?a=phoneSurveys'); + $this->displayMenuItem($lang['srv_telephone_surveys'], $url='index.php?a=phoneSurveys', ($_GET['a'] == 'phoneSurveys') ? 'active': ''); } @@ -193,31 +198,37 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_ankete'], - 'url' => 'index.php?a=diagnostics' + 'url' => 'index.php?a=diagnostics', + 'active' => ($_GET['a'] == 'diagnostics' && !isset ($_GET['t']) ? 'active' : '') ), array( 'title' => $lang['srv_weekly_diagnostics'], - 'url' => 'index.php?a=diagnostics&t=time_span_daily' + 'url' => 'index.php?a=diagnostics&t=time_span_daily', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'time_span_daily' ? 'active' : '') ), array( 'title' => $lang['srv_monthly_diagnostics'], - 'url' => 'index.php?a=diagnostics&t=time_span_monthly' + 'url' => 'index.php?a=diagnostics&t=time_span_monthly', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'time_span_monthly' ? 'active' : '') ), array( 'title' => $lang['srv_yearly_diagnostics'], - 'url' => 'index.php?a=diagnostics&t=time_span_yearly' + 'url' => 'index.php?a=diagnostics&t=time_span_yearly', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'time_span_yearly' ? 'active' : '') ), array( 'title' => $lang['srv_all_diagnostics'], - 'url' => 'index.php?a=diagnostics&t=time_span&uvoz=0&ustrezni=1&delnoustrezni=1&neustrezni=0' + 'url' => 'index.php?a=diagnostics&t=time_span&uvoz=0&ustrezni=1&delnoustrezni=1&neustrezni=0', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'time_span' ? 'active' : '') ), array( 'title' => $lang['srv_metapodatki'], - 'url' => 'index.php?a=diagnostics&t=paradata' + 'url' => 'index.php?a=diagnostics&t=paradata', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'paradata' ? 'active' : '') ) ); - $this->displayMenuItemWithSubmenu($name='diagnostics', $lang['srv_diagnostics'], $submenu); + $this->displayMenuItemWithSubmenu($name='diagnostics', $lang['srv_diagnostics'], $submenu, ($_GET['a'] == 'diagnostics' && $_GET['t'] != 'uporabniki') ? 'active' : ''); } @@ -230,27 +241,38 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['n_users_list'], - 'url' => 'index.php?a=diagnostics&t=uporabniki' + 'url' => 'index.php?a=diagnostics&t=uporabniki', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m'])? 'active' : '') ), array( 'title' => $lang['n_users_list_all'], - 'url' => 'index.php?a=diagnostics&t=uporabniki&m=all' + 'url' => 'index.php?a=diagnostics&t=uporabniki&m=all', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'all' ? 'active' : '') + ), array( 'title' => $lang['n_deleted_users'], - 'url' => 'index.php?a=diagnostics&t=uporabniki&m=izbrisani' + 'url' => 'index.php?a=diagnostics&t=uporabniki&m=izbrisani', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'izbrisani' ? 'active' : '') + ), array( 'title' => $lang['n_unconfirmed_users'], - 'url' => 'index.php?a=diagnostics&t=uporabniki&m=nepotrjeni' + 'url' => 'index.php?a=diagnostics&t=uporabniki&m=nepotrjeni', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'nepotrjeni' ? 'active' : '') + ), array( 'title' => $lang['n_unsigned_users'], - 'url' => 'index.php?a=diagnostics&t=uporabniki&m=odjavljeni' + 'url' => 'index.php?a=diagnostics&t=uporabniki&m=odjavljeni', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'odjavljeni' ? 'active' : '') + ), array( 'title' => $lang['srv_hierarchy_users_access'], - 'url' => 'index.php?a=diagnostics&t=uporabniki&m=sa-modul' + 'url' => 'index.php?a=diagnostics&t=uporabniki&m=sa-modul', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'sa-modul' ? 'active' : '') + ), ); } @@ -261,12 +283,14 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['n_users_list'], - 'url' => 'index.php?a=diagnostics&t=uporabniki' + 'url' => 'index.php?a=diagnostics&t=uporabniki', + 'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m']) ? 'active' : '') + ) ); } - $this->displayMenuItemWithSubmenu($name='uporabniki', $lang['hour_users'], $submenu); + $this->displayMenuItemWithSubmenu($name='uporabniki', $lang['hour_users'], $submenu, ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' ? 'active' : '')); } @@ -274,15 +298,19 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_javna_knjiznica'], - 'url' => 'index.php?a=knjiznica' + 'url' => 'index.php?a=knjiznica', + 'active' => ($_GET['a'] == 'knjiznica' && !isset($_GET['t']) ? 'active' : '') + ), array( 'title' => $lang['srv_moja_knjiznica'], - 'url' => 'index.php?a=knjiznica&t=moje_ankete' + 'url' => 'index.php?a=knjiznica&t=moje_ankete', + 'active' => ($_GET['a'] == 'knjiznica' && $_GET['t'] == 'moje_ankete' ? 'active' : '') + ) ); - $this->displayMenuItemWithSubmenu($name='knjiznica', $lang['srv_library'], $submenu); + $this->displayMenuItemWithSubmenu($name='knjiznica', $lang['srv_library'], $submenu, ($_GET['a'] == 'knjiznica' ? 'active' : '')); // NASTAVITVE @@ -290,39 +318,57 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_settingsSystem'], - 'url' => 'index.php?a=nastavitve&m=system' + 'url' => 'index.php?a=nastavitve&m=system', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'system' ? 'active' : '') + ), array( 'title' => $lang['srv_testiranje_predvidenicas'], - 'url' => 'index.php?a=nastavitve&m=predvidenicasi' + 'url' => 'index.php?a=nastavitve&m=predvidenicasi', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'predvidenicasi' ? 'active' : '') + ), array( 'title' => $lang['srv_collectData'], - 'url' => 'index.php?a=nastavitve&m=collectData' + 'url' => 'index.php?a=nastavitve&m=collectData', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'collectData' ? 'active' : '') + ), array( 'title' => $lang['srv_nice_url'], - 'url' => 'index.php?a=nastavitve&m=nice_links' + 'url' => 'index.php?a=nastavitve&m=nice_links', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'nice_links' ? 'active' : '') + ), array( 'title' => $lang['srv_anketa_admin'], - 'url' => 'index.php?a=nastavitve&m=anketa_admin' + 'url' => 'index.php?a=nastavitve&m=anketa_admin', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'anketa_admin' ? 'active' : '') + ), array( 'title' => $lang['srv_anketa_deleted'], - 'url' => 'index.php?a=nastavitve&m=anketa_deleted' + 'url' => 'index.php?a=nastavitve&m=anketa_deleted', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'anketa_deleted' ? 'active' : '') + ), array( 'title' => $lang['srv_data_deleted'], - 'url' => 'index.php?a=nastavitve&m=data_deleted' + 'url' => 'index.php?a=nastavitve&m=data_deleted', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'data_deleted' ? 'active' : '') + ), array( 'title' => $lang['srv_user_settings'], - 'url' => 'index.php?a=nastavitve&m=global_user_settings' + 'url' => 'index.php?a=nastavitve&m=global_user_settings', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_settings' ? 'active' : '') + ), array( 'title' => $lang['edit_data'], - 'url' => 'index.php?a=nastavitve&m=global_user_myProfile' + 'url' => 'index.php?a=nastavitve&m=global_user_myProfile', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_myProfile' ? 'active' : '') + ), ); } @@ -330,16 +376,20 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_user_settings'], - 'url' => 'index.php?a=nastavitve&m=global_user_settings' + 'url' => 'index.php?a=nastavitve&m=global_user_settings', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_settings' ? 'active' : '') + ), array( 'title' => $lang['edit_data'], - 'url' => 'index.php?a=nastavitve&m=global_user_myProfile' + 'url' => 'index.php?a=nastavitve&m=global_user_myProfile', + 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_myProfile' ? 'active' : '') + ), ); } - $this->displayMenuItemWithSubmenu($name='nastavitve', $lang['settings'], $submenu); + $this->displayMenuItemWithSubmenu($name='nastavitve', $lang['settings'], $submenu, ($_GET['a'] == 'nastavitve' ? 'active' : '')); // NAROCILA @@ -374,19 +424,27 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_gdpr_user_settings'], - 'url' => 'index.php?a=gdpr' + 'url' => 'index.php?a=gdpr', + 'active' => ($_GET['a'] == 'gdpr' && !isset($_GET['m']) ? 'active' : '') + ), array( 'title' => $lang['srv_gdpr_survey_list'], - 'url' => 'index.php?a=gdpr&m=gdpr_survey_list' + 'url' => 'index.php?a=gdpr&m=gdpr_survey_list', + 'active' => ($_GET['a'] == 'gdpr' && $_GET['m'] == 'gdpr_survey_list' ? 'active' : '') + ), array( 'title' => $lang['srv_gdpr_dpa'], - 'url' => 'index.php?a=gdpr&m=gdpr_dpa' + 'url' => 'index.php?a=gdpr&m=gdpr_dpa', + 'active' => ($_GET['a'] == 'gdpr' && $_GET['m'] == 'gdpr_dpa' ? 'active' : '') + ), array( 'title' => $lang['srv_gdpr_requests'].' ('.$request_counter.')', - 'url' => 'index.php?a=gdpr&m=gdpr_requests' + 'url' => 'index.php?a=gdpr&m=gdpr_requests', + 'active' => ($_GET['a'] == 'gdpr' && $_GET['m'] == 'gdpr_requests' ? 'active' : '') + ) ); @@ -394,11 +452,13 @@ class MobileSurveyAdmin{ if($admin_type == '0'){ $submenu[] = array( 'title' => $lang['srv_gdpr_requests_all'], - 'url' => 'index.php?a=gdpr&m=gdpr_requests_all' + 'url' => 'index.php?a=gdpr&m=gdpr_requests_all', + 'active' => ($_GET['a'] == 'gdpr' && $_GET['m'] == 'gdpr_requests_all' ? 'active' : '') + ); } - $this->displayMenuItemWithSubmenu($name='gdpr', 'GDPR', $submenu); + $this->displayMenuItemWithSubmenu($name='gdpr', 'GDPR', $submenu, ($_GET['a'] == 'gdpr' ? 'active' : '')); echo ''; @@ -441,15 +501,25 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_status_summary'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_REPORTI + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_REPORTI, + 'active' => ($_GET['a'] == A_REPORTI ? ' active' : '') ), array( 'title' => $lang['srv_metapodatki'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_PARA_GRAPH + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_PARA_GRAPH, + 'active' => ($_GET['a'] == A_PARA_GRAPH ? ' active' : '') ) ); - $this->displayMenuItemWithSubmenu($name='dashboard', $lang['srv_navigation_status'], $submenu); + $this->displayMenuItemWithSubmenu($name='dashboard', $lang['srv_navigation_status'], $submenu, ($this->first_action == NAVI_STATUS + || $this->first_action == 'para_graph' + || $this->first_action == 'nonresponse_graph' + || $this->first_action == 'AAPOR' + || $this->first_action == 'langStatistic' + || $this->first_action == 'usable_resp' + || $this->first_action == 'speeder_index' + || $this->first_action == 'reminder_tracking' + || $this->first_action == 'status_advanced') ? ' active' : ''); } } @@ -460,23 +530,27 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_editirajanketo2'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . ($this->surveyAdminClass->survey_type > 1 ? '&a=' . A_BRANCHING : '') + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . ($this->surveyAdminClass->survey_type > 1 ? '&a=' . A_BRANCHING : ''), + 'active' => ($this->second_action == NAVI_UREJANJE_BRANCHING ? ' active' : '') ), array( 'title' => $lang['srv_nastavitve_ankete'] , - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_SETTINGS + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_SETTINGS, + 'active' => ($this->second_action == NAVI_UREJANJE_ANKETA ? ' active' : '') ), array( 'title' => $lang['srv_themes'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TEMA + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TEMA, + 'active' => ($this->second_action == NAVI_UREJANJE_TEMA ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiv'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_ARHIVI + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_ARHIVI, + 'active' => ($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '') ), ); - $this->displayMenuItemWithSubmenu($name='edit', $lang['srv_vprasalnik'], $submenu); + $this->displayMenuItemWithSubmenu($name='edit', $lang['srv_vprasalnik'], $submenu, ($this->first_action == NAVI_UREJANJE ? ' active' : '')); } @@ -486,19 +560,22 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_testiranje_diagnostika'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TESTIRANJE . '&m=' . M_TESTIRANJE_DIAGNOSTIKA + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TESTIRANJE . '&m=' . M_TESTIRANJE_DIAGNOSTIKA, + 'active' => ($this->second_action == M_TESTIRANJE_DIAGNOSTIKA ? ' active' : '') ), array( 'title' => $lang['srv_testiranje_komentarji'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_KOMENTARJI + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_KOMENTARJI, + 'active' => ($this->second_action == NAVI_TESTIRANJE_KOMENTARJI || $this->second_action == NAVI_TESTIRANJE_KOMENTARJI_ANKETA ? ' active' : '') ), array( 'title' => $lang['srv_testiranje_vnosi'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TESTIRANJE . '&m=' . M_TESTIRANJE_VNOSI + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TESTIRANJE . '&m=' . M_TESTIRANJE_VNOSI, + 'active' => ($this->second_action == NAVI_TESTIRANJE_VNOSI ? ' active' : '') ), ); - $this->displayMenuItemWithSubmenu($name='test', $lang['srv_testiranje'], $submenu); + $this->displayMenuItemWithSubmenu($name='test', $lang['srv_testiranje'], $submenu, ($this->first_action == NAVI_TESTIRANJE ? ' active' : '')); } @@ -508,19 +585,22 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_publication_base'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=settings' + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=settings', + 'active' => ($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? ' active' : '') ), array( 'title' => $lang['srv_publication_url'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=url' + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=url', + 'active' => ($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? ' active' : '') ), array( 'title' => $lang['srv_inv_nav_invitations'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_INVITATIONS . '&m=settings' + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_INVITATIONS . '&m=settings', + 'active' => ($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? ' active' : '') ), ); - $this->displayMenuItemWithSubmenu($name='publish', $lang['srv_vabila'], $submenu); + $this->displayMenuItemWithSubmenu($name='publish', $lang['srv_vabila'], $submenu, ($this->first_action == NAVI_OBJAVA ? ' active' : '')); } @@ -530,26 +610,30 @@ class MobileSurveyAdmin{ $submenu = array( array( 'title' => $lang['srv_link_data_browse'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA, + 'active' => ((($_GET['m'] == 'view' || $_GET['m'] == '' || $_GET['m'] == M_COLLECT_DATA_QUICKEDIT || $_GET['m'] == M_COLLECT_DATA_VARIABLE_VIEW || $_GET['m'] == M_COLLECT_DATA_QUICKEDIT) && $_GET['a'] != A_COLLECT_DATA_EXPORT) ? ' active' : '') ), array( 'title' => $lang['srv_data_navigation_calculate'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA . '&m=calculation' + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA . '&m=calculation', + 'active' => ($_GET['m'] == M_COLLECT_DATA_CALCULATION || $_GET['m'] == M_COLLECT_DATA_CODING || $_GET['m'] == 'coding_auto' || $_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' active' : '') ), array( 'title' => $lang['srv_data_navigation_import'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA . '&m=append' + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA . '&m=append', + 'active' => ($_GET['m'] == 'append' || $_GET['m'] == 'merge' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' active' : '') ) ); if ($d->checkDostopSub('export')) { $submenu[] = array( 'title' => $lang['srv_export_tab'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA_EXPORT + 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA_EXPORT, + 'active' => ($this->second_action == NAVI_DATA_EXPORT ? ' active' : '') ); } - $this->displayMenuItemWithSubmenu($name='data', $lang['srv_results'], $submenu); + $this->displayMenuItemWithSubmenu($name='data', $lang['srv_results'], $submenu, ($this->first_action == NAVI_RESULTS ? ' active' : '')); } @@ -569,49 +653,59 @@ class MobileSurveyAdmin{ 'submenu' => array( array( 'title' => $lang['srv_analiza_arhiviraj_type_0'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_SUMMARY + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_SUMMARY, + 'active' => ($_GET['m'] == M_ANALYSIS_SUMMARY ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiviraj_type_1'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_DESCRIPTOR + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_DESCRIPTOR, + 'active' => ($_GET['m'] == M_ANALYSIS_DESCRIPTOR ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiviraj_type_2'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_FREQUENCY + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_FREQUENCY, + 'active' => ($_GET['m'] == M_ANALYSIS_FREQUENCY ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiviraj_type_3'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_CROSSTAB + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_CROSSTAB, + 'active' => ($_GET['m'] == M_ANALYSIS_CROSSTAB ? ' active' : ''), ), array( 'title' => $lang['srv_multicrosstabs'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_MULTICROSSTABS + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_MULTICROSSTABS, + 'active' => ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiviraj_type_4'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_MEANS + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_MEANS, + 'active' => ($_GET['m'] == M_ANALYSIS_MEANS ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiviraj_type_5'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_TTEST + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_TTEST, + 'active' => ($_GET['m'] == M_ANALYSIS_TTEST ? ' active' : '') ), array( 'title' => $lang['srv_analiza_arhiviraj_type_6'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_BREAK + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_BREAK, + 'active' => ($_GET['m'] == M_ANALYSIS_BREAK ? ' active' : '') ) ) ), array( 'title' => $lang['srv_analiza_charts'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_CHARTS + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_CHARTS, + 'active' => ($_GET['m'] == M_ANALYSIS_CHARTS ? ' active' : '') ), array( 'title' => $lang['srv_reporti'], - 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_LINKS + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_LINKS, + 'active' => ($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? ' active' : '') ), ); - $this->displayMenuItemWithSubmenu($name='analyse', $lang['srv_analiza'], $submenu); + $this->displayMenuItemWithSubmenu($name='analyse', $lang['srv_analiza'], $submenu, ($this->first_action == NAVI_ANALYSIS ? ' active' : '')); } } @@ -642,11 +736,11 @@ class MobileSurveyAdmin{ - private function displayMenuItemWithSubmenu($name, $title, $submenu){ + private function displayMenuItemWithSubmenu($name, $title, $submenu, $active=""){ global $lang; echo '
  • '; - echo ' '.$title.''; + echo ' '.$title.''; echo '
    • '; // Podmeni @@ -672,10 +766,10 @@ class MobileSurveyAdmin{ // Dodaten podmeni if(isset($submenu_item['name'])){ //$this->displaySubmenuItem($submenu_item['name'], $submenu_item['title'], $submenu_item['submenu']); - $this->displayMenuItemWithSubmenu($submenu_item['name'], $submenu_item['title'], $submenu_item['submenu']); + $this->displayMenuItemWithSubmenu($submenu_item['name'], $submenu_item['title'], $submenu_item['submenu'], $submenu_item['active']); } else{ - $this->displayMenuItem($submenu_item['title'], $submenu_item['url']); + $this->displayMenuItem($submenu_item['title'], $submenu_item['url'], $submenu_item['active']); } } echo ''; @@ -683,10 +777,10 @@ class MobileSurveyAdmin{ echo ''; } - private function displayMenuItem($title, $url){ + private function displayMenuItem($title, $url, $active=""){ echo '
  • '; - echo ''.$title.''; + echo ''.$title.''; echo '
    • '; } diff --git a/public/css/admin.css b/public/css/admin.css index 18de2f8bd..7a6c77788 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -28710,6 +28710,10 @@ fieldset textarea { top: 18px; transform: rotate(180deg); } + .mobile_menu ul > li a.active { + color: #ffa608; + background-color: inherit; + } .mobile_menu ul > li:not(:last-child) > a { border-bottom: 1px solid #efefef; } diff --git a/resources/sass/admin/mobile/header.scss b/resources/sass/admin/mobile/header.scss index 8fca82054..8153d7222 100644 --- a/resources/sass/admin/mobile/header.scss +++ b/resources/sass/admin/mobile/header.scss @@ -138,6 +138,11 @@ } } + a.active { + color: $orange; + background-color: inherit; + } + &:not(:last-child) > a { border-bottom: 1px solid $grey_super_light; }