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

Mobile breadcrumbs - v2

Browse Source 
(dodan bold modri font | manjka še za arhive)
This commit is contained in:
tejagerjovic 2021-07-30 16:00:25 +02:00
parent fcf0ff85dd
commit 5d83d3349e
7 changed files with 97 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/SurveyAdmin.php
View File

@ -323,8 +323,12 @@ class SurveyAdmin
// breadcrumbs
echo '<div class="breadcrumbs">';
echo $lang['navigation_'.$this->first_action].' > '.$lang['navigation_'.$this->second_action];
//echo $this->first_action .' - '.$this->second_action;
if (isset($this->third_action)) {
echo ' > '.$lang['navigation_'.$this->third_action];
}
//echo '<br>'.$this->first_action .' > '.$this->second_action. ' > '.$this->third_action;
echo '</div>';
@ -921,10 +925,12 @@ class SurveyAdmin
# vse tri nivoje akcij pohendlamo tukaj, da bo lažje ob kakih spremnjanjih
# prvi in drugi nivo
# prvi in drugi nivo (tretji samo za mobilno navigacijo)
$navigationArray = CrossRoad::MainNavigation($this->anketa, true);
$this->first_action = $navigationArray['first_action'];
$this->second_action = $navigationArray['second_action'];
$this->third_action = $navigationArray['third_action'];
$css_status = 'off';
$css_urejanje = 'off';

69
admin/survey/classes/mobile/class.MobileSurveyAdmin.php
View File

@ -13,6 +13,7 @@ class MobileSurveyAdmin{
var $surveyAdminClass;
var $first_action;
var $second_action;
var $third_action;
function __construct($surveyAdminClass){
@ -23,6 +24,8 @@ class MobileSurveyAdmin{
$navigationArray = CrossRoad::MainNavigation($this->surveyAdminClass->anketa, true);
$this->first_action = $navigationArray['first_action'];
$this->second_action = $navigationArray['second_action'];
$this->third_action = $navigationArray['third_action'];
}
// Izris glave z menijem - znotraj ankete
@ -506,12 +509,12 @@ class MobileSurveyAdmin{
array(
'title' => $lang['srv_status_summary'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_REPORTI,
'active' => ($_GET['a'] == A_REPORTI ? ' active' : '')
'active' => ($_GET['a'] == A_REPORTI ? 'active' : '')
),
array(
'title' => $lang['srv_metapodatki'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_PARA_GRAPH,
'active' => ($_GET['a'] == A_PARA_GRAPH ? ' active' : '')
'active' => ($_GET['a'] == A_PARA_GRAPH ? 'active' : '')
)
);
@ -523,7 +526,7 @@ class MobileSurveyAdmin{
|| $this->first_action == 'usable_resp'
|| $this->first_action == 'speeder_index'
|| $this->first_action == 'reminder_tracking'
|| $this->first_action == 'status_advanced') ? ' active' : '');
|| $this->first_action == 'status_advanced') ? 'active' : '');
}
}
@ -535,26 +538,26 @@ class MobileSurveyAdmin{
array(
'title' => $lang['srv_editirajanketo2'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . ($this->surveyAdminClass->survey_type > 1 ? '&a=' . A_BRANCHING : ''),
'active' => ($this->second_action == NAVI_UREJANJE_BRANCHING ? ' active' : '')
'active' => ($this->second_action == NAVI_UREJANJE_BRANCHING ? 'active' : '')
),
array(
'title' => $lang['srv_nastavitve_ankete'] ,
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_SETTINGS,
'active' => ($this->second_action == NAVI_UREJANJE_ANKETA ? ' active' : '')
'active' => ($this->second_action == NAVI_UREJANJE_ANKETA ? 'active' : '')
),
array(
'title' => $lang['srv_themes'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TEMA,
'active' => ($this->second_action == NAVI_UREJANJE_TEMA ? ' active' : '')
'active' => ($this->second_action == NAVI_UREJANJE_TEMA ? 'active' : '')
),
array(
'title' => $lang['srv_analiza_arhiv'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_ARHIVI,
'active' => ($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '')
'active' => ($_GET['a'] == A_ARHIVI || $GET_A == A_TRACKING ? 'active' : '')
),
);
$this->displayMenuItemWithSubmenu($name='edit', $lang['srv_vprasalnik'], $submenu, ($this->first_action == NAVI_UREJANJE ? ' active' : ''));
$this->displayMenuItemWithSubmenu($name='edit', $lang['srv_vprasalnik'], $submenu, ($this->first_action == NAVI_UREJANJE ? 'active' : ''));
}
@ -565,21 +568,21 @@ class MobileSurveyAdmin{
array(
'title' => $lang['srv_testiranje_diagnostika'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_TESTIRANJE . '&m=' . M_TESTIRANJE_DIAGNOSTIKA,
'active' => ($this->second_action == M_TESTIRANJE_DIAGNOSTIKA ? ' active' : '')
'active' => ($this->second_action == M_TESTIRANJE_DIAGNOSTIKA ? 'active' : '')
),
array(
'title' => $lang['srv_testiranje_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' : '')
'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,
'active' => ($this->second_action == NAVI_TESTIRANJE_VNOSI ? ' active' : '')
'active' => ($this->second_action == NAVI_TESTIRANJE_VNOSI ? 'active' : '')
),
);
$this->displayMenuItemWithSubmenu($name='test', $lang['srv_testiranje'], $submenu, ($this->first_action == NAVI_TESTIRANJE ? ' active' : ''));
$this->displayMenuItemWithSubmenu($name='test', $lang['srv_testiranje'], $submenu, ($this->first_action == NAVI_TESTIRANJE ? 'active' : ''));
}
@ -590,21 +593,21 @@ class MobileSurveyAdmin{
array(
'title' => $lang['srv_publication_base'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=settings',
'active' => ($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? ' active' : '')
'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',
'active' => ($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? ' active' : '')
'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',
'active' => ($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? ' active' : '')
'active' => ($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? 'active' : '')
),
);
$this->displayMenuItemWithSubmenu($name='publish', $lang['srv_vabila'], $submenu, ($this->first_action == NAVI_OBJAVA ? ' active' : ''));
$this->displayMenuItemWithSubmenu($name='publish', $lang['srv_vabila'], $submenu, ($this->first_action == NAVI_OBJAVA ? 'active' : ''));
}
@ -615,17 +618,17 @@ class MobileSurveyAdmin{
array(
'title' => $lang['srv_link_data_browse'],
'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' : '')
'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',
'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' : '')
'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',
'active' => ($_GET['m'] == 'append' || $_GET['m'] == 'merge' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' active' : '')
'active' => ($_GET['m'] == 'append' || $_GET['m'] == 'merge' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? 'active' : '')
)
);
@ -633,11 +636,11 @@ class MobileSurveyAdmin{
$submenu[] = array(
'title' => $lang['srv_export_tab'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA_EXPORT,
'active' => ($this->second_action == NAVI_DATA_EXPORT ? ' active' : '')
'active' => ($this->second_action == NAVI_DATA_EXPORT ? 'active' : '')
);
}
$this->displayMenuItemWithSubmenu($name='data', $lang['srv_results'], $submenu, ($this->first_action == NAVI_RESULTS ? ' active' : ''));
$this->displayMenuItemWithSubmenu($name='data', $lang['srv_results'], $submenu, ($this->first_action == NAVI_RESULTS ? 'active' : ''));
}
@ -658,60 +661,60 @@ class MobileSurveyAdmin{
array(
'title' => $lang['srv_analiza_arhiviraj_type_0'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ANALYSIS.'&m='.M_ANALYSIS_SUMMARY,
'active' => ($_GET['m'] == M_ANALYSIS_SUMMARY ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_DESCRIPTOR ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_FREQUENCY ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_CROSSTAB ? ' active' : ''),
'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,
'active' => ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_MEANS ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_TTEST ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_BREAK ? ' active' : '')
'active' => ($_GET['m'] == M_ANALYSIS_BREAK ? 'active' : '')
)
),
'active' => (($_GET['a'] == 'analysis' && $_GET['m'] != 'charts' && $_GET['m'] != 'analysis_links') ? ' 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,
'active' => ($_GET['m'] == M_ANALYSIS_CHARTS ? ' active' : '')
'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,
'active' => ($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? ' active' : '')
'active' => ($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? 'active' : '')
),
);
$this->displayMenuItemWithSubmenu($name='analyse', $lang['srv_analiza'], $submenu, ($this->first_action == NAVI_ANALYSIS ? ' active' : ''));
$this->displayMenuItemWithSubmenu($name='analyse', $lang['srv_analiza'], $submenu, ($this->first_action == NAVI_ANALYSIS ? 'active' : ''));
}
}

30
admin/survey/classes/tracking/CrossRoad.php
View File

@ -136,6 +136,7 @@ class CrossRoad {
# objave, vabila
case A_VABILA:
$first_action = NAVI_OBJAVA;
$_GET['m'] == 'settings' ? $second_action = NAVI_OBJAVA_SETTINGS : ($_GET['m'] == 'url' ? $second_action = NAVI_OBJAVA_URL : $second_action = '');
$status = 5;
break;
@ -159,6 +160,33 @@ class CrossRoad {
if ($_GET['m'] == M_ANALYSIS_LINKS) {
$second_action = NAVI_ANALYSIS_LINKS;
}
if ($_GET['m'] == 'sumarnik') {
$third_action = NAVI_STATISTIC_ANALYSIS_SUMARNIK;
}
elseif ($_GET['m'] == 'descriptor') {
$third_action = NAVI_STATISTIC_ANALYSIS_DESCRIPTOR;
}
elseif ($_GET['m'] == 'frequency') {
$third_action = NAVI_STATISTIC_ANALYSIS_FREQUENCY;
}
elseif ($_GET['m'] == 'crosstabs') {
$third_action = NAVI_STATISTIC_ANALYSIS_CROSSTABS;
}
elseif ($_GET['m'] == 'multicrosstabs') {
$third_action = NAVI_STATISTIC_ANALYSIS_MULTICROSSTABS;
}
elseif ($_GET['m'] == 'means') {
$third_action = NAVI_STATISTIC_ANALYSIS_MEANS;
}
elseif ($_GET['m'] == 'ttest') {
$third_action = NAVI_STATISTIC_ANALYSIS_TTEST;
}
elseif ($_GET['m'] == 'break') {
$third_action = NAVI_STATISTIC_ANALYSIS_BREAK;
}
$status = 2;
break;
@ -240,7 +268,7 @@ class CrossRoad {
//shrani tracking
TrackingClass::update($anketa, $status);
//vrni podatke o navigaciji nazaj v SurveyAdmin
return array('first_action' => $first_action, 'second_action' => $second_action);
return array('first_action' => $first_action, 'second_action' => $second_action, 'third_action' => $third_action);
}
//nismo vezani na anketo, tracking uporabnika
else{

11
lang/1.php
View File

@ -7878,15 +7878,24 @@ $lang = array (
"navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Komentarji',
"navigation_NAVI_TESTIRANJE_VNOSI" => 'Avtomatski vnosi',
"navigation_NAVI_OBJAVA" => 'Objava',
"navigation_NAVI_OBJAVA_SETTINGS" => 'Pregled',
"navigation_NAVI_OBJAVA_URL" => 'Povezave',
"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_STATISTIC_ANALYSIS_SUMARNIK" => 'Sumarnik',
"navigation_NAVI_STATISTIC_ANALYSIS_DESCRIPTOR" => 'Opisne statistike',
"navigation_NAVI_STATISTIC_ANALYSIS_FREQUENCY" => 'Frekvence',
"navigation_NAVI_STATISTIC_ANALYSIS_CROSSTABS" => 'Tabele',
"navigation_NAVI_STATISTIC_ANALYSIS_MULTICROSSTABS" => 'Multitabele',
"navigation_NAVI_STATISTIC_ANALYSIS_MEANS" => 'Povprečja',
"navigation_NAVI_STATISTIC_ANALYSIS_TTEST" => 'T-test',
"navigation_NAVI_STATISTIC_ANALYSIS_BREAK" => 'Razbitje',
"navigation_NAVI_ANALYSIS_LINKS" => 'Poročila',
// 1KA NAMESTITEV //
'install_title' => '1KA namestitev',

10
lang/2.php
View File

@ -7776,12 +7776,22 @@ GDPR introduction preview",
"navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Comments',
"navigation_NAVI_TESTIRANJE_VNOSI" => 'Test responses',
"navigation_NAVI_OBJAVA" => 'Publish',
"navigation_NAVI_OBJAVA_SETTINGS" => 'Settings',
"navigation_NAVI_OBJAVA_URL" => 'Url',
"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_STATISTIC_ANALYSIS_SUMARNIK" => 'Summary',
"navigation_NAVI_STATISTIC_ANALYSIS_DESCRIPTOR" => 'Descriptives',
"navigation_NAVI_STATISTIC_ANALYSIS_FREQUENCY" => 'Frequencies',
"navigation_NAVI_STATISTIC_ANALYSIS_CROSSTABS" => 'Crosstabs',
"navigation_NAVI_STATISTIC_ANALYSIS_MULTICROSSTABS" => 'Multitables',
"navigation_NAVI_STATISTIC_ANALYSIS_MEANS" => 'Means',
"navigation_NAVI_STATISTIC_ANALYSIS_TTEST" => 'T-test',
"navigation_NAVI_STATISTIC_ANALYSIS_BREAK" => 'Break',
"navigation_NAVI_ANALYSIS_LINKS" => 'Reports',
// 1KA NAMESTITEV //

2
public/css/admin.css
View File

@ -28613,6 +28613,8 @@ fieldset textarea {
div.breadcrumbs {
display: block;
padding: 15px;
color: #1e88e5;
font-weight: bold;
}
.desktop_header {

2
resources/sass/admin/mobile/basic.scss
View File

@ -54,4 +54,6 @@ select {
div.breadcrumbs {
display: block;
padding: 15px;
color: $strong_blue;
font-weight: bold;
}