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

Dodani arhivi v mobilno navigacijo in breadcrumbse

Browse Source
This commit is contained in:
pero1203 2021-08-02 14:34:09 +02:00
parent bd4800851f
commit 46870c08e8
9 changed files with 163 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,13 +551,45 @@ class MobileSurveyAdmin{
'active' => ($this->second_action == NAVI_UREJANJE_TEMA ? 'active' : '') 'active' => ($this->second_action == NAVI_UREJANJE_TEMA ? 'active' : '')
), ),
array( array(
'title' => $lang['srv_analiza_arhiv'], 'title' => $lang['srv_archive'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_ARHIVI, 'name' => 'edit_submenu',
'active' => ($_GET['a'] == A_ARHIVI || $GET_A == A_TRACKING ? 'active' : '') 'submenu' => array(
array(
'title' => $lang['srv_archive_survey'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ARHIVI,
'active' => ($_GET['a'] == A_ARHIVI && $_GET['m'] == '' ? 'active' : '')
), ),
array(
'title' => $lang['srv_survey_archives_ie_title'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ARHIVI.'&m=survey',
'active' => ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' ? 'active' : '')
),
array(
'title' => $lang['srv_survey_archives_ie_data_title'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_ARHIVI.'&m=survey_data',
'active' => ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? 'active' : '')
),
array(
'title' => $lang['srv_survey_archives_tracking_survey'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_TRACKING,
'active' => ($_GET['a'] == A_TRACKING && $_GET['m'] == '' ? 'active' : '')
),
array(
'title' => $lang['srv_survey_archives_tracking_data'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_TRACKING.'&m=tracking_data',
'active' => ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? 'active' : '')
),
array(
'title' => $lang['srv_survey_archives_tracking_append'],
'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_TRACKING.'&appendMerge=1',
'active' => ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? 'active' : '')
)
),
'active' => ((($_GET['a'] == A_ARHIVI || $_GET['a'] == A_TRACKING) && $_GET['m'] != 'data') ? '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 && $_GET['m'] != 'data' ? 'active' : ''));
} }
@ -605,6 +637,11 @@ class MobileSurveyAdmin{
'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' : '') 'active' => ($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? 'active' : '')
), ),
array(
'title' => $lang['srv_archive'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_INVITATIONS . '&m=view_archive',
'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' : ''));
@ -640,7 +677,15 @@ class MobileSurveyAdmin{
); );
} }
$this->displayMenuItemWithSubmenu($name='data', $lang['srv_results'], $submenu, ($this->first_action == NAVI_RESULTS ? 'active' : '')); if ($d->checkDostopSub('edit')) {
$submenu[] = array(
'title' => $lang['srv_archive'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_ARHIVI . '&m=data',
'active' => ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? 'active' : '')
);
}
$this->displayMenuItemWithSubmenu($name='data', $lang['srv_results'], $submenu, ($this->first_action == NAVI_RESULTS || ($this->first_action == NAVI_UREJANJE && $_GET['m'] == 'data') ? 'active' : ''));
} }
@ -699,7 +744,7 @@ class MobileSurveyAdmin{
'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' && $_GET['m'] != 'anal_arch') ? 'active' : '')
), ),
array( array(
@ -712,6 +757,11 @@ class MobileSurveyAdmin{
'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' : '') 'active' => ($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? 'active' : '')
), ),
array(
'title' => $lang['srv_archive'],
'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_ANALYSIS . '&m=anal_arch',
'active' => ($_GET['a'] == A_ANALYSIS && $_GET['m'] == 'anal_arch' ? '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' : ''));

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

@ -127,9 +127,35 @@ class CrossRoad {
break; break;
case A_NAGOVORI: case A_NAGOVORI:
$first_action = NAVI_UREJANJE;
$status = 0;
break;
case A_ARHIVI: case A_ARHIVI:
$first_action = ($_GET['m'] == 'data') ? NAVI_RESULTS : NAVI_UREJANJE;
$second_action = NAVI_ARHIVI;
if($_GET['m'] == 'survey')
$third_action = NAVI_UREJANJE_ARHIVI_EXPORT1;
elseif($_GET['m'] == 'survey_data')
$third_action = NAVI_UREJANJE_ARHIVI_EXPORT2;
elseif($_GET['m'] != 'data')
$third_action = NAVI_UREJANJE_ARHIVI;
$status = 0;
break;
case A_TRACKING: case A_TRACKING:
$first_action = NAVI_UREJANJE; $first_action = NAVI_UREJANJE;
$second_action = NAVI_ARHIVI;
if($_GET['appendMerge'] == '1')
$third_action = NAVI_UREJANJE_ARHIVI_TRACKING3;
elseif($_GET['m'] == 'tracking_data')
$third_action = NAVI_UREJANJE_ARHIVI_TRACKING2;
else
$third_action = NAVI_UREJANJE_ARHIVI_TRACKING1;
$status = 0; $status = 0;
break; break;
@ -148,7 +174,7 @@ class CrossRoad {
case 'invitations': case 'invitations':
$first_action = NAVI_OBJAVA; $first_action = NAVI_OBJAVA;
$second_action = 'invitations'; $second_action = ($_GET['m'] == 'view_archive') ? NAVI_ARHIVI : 'invitations';
$status = 5; $status = 5;
break; break;
@ -160,6 +186,9 @@ class CrossRoad {
if ($_GET['m'] == M_ANALYSIS_LINKS) { if ($_GET['m'] == M_ANALYSIS_LINKS) {
$second_action = NAVI_ANALYSIS_LINKS; $second_action = NAVI_ANALYSIS_LINKS;
} }
elseif($_GET['m'] == 'anal_arch'){
$second_action = NAVI_ARHIVI;
}
if ($_GET['m'] == 'sumarnik') { if ($_GET['m'] == 'sumarnik') {
$third_action = NAVI_STATISTIC_ANALYSIS_SUMARNIK; $third_action = NAVI_STATISTIC_ANALYSIS_SUMARNIK;

11
admin/survey/definition.php
View File

@ -24,14 +24,23 @@
define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI"); define("NAVI_TESTIRANJE_VNOSI", "NAVI_TESTIRANJE_VNOSI");
define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY"); define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY");
define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD"); define("NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD", "NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD");
define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA");
define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING"); define("NAVI_UREJANJE_BRANCHING", "NAVI_UREJANJE_BRANCHING");
define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA"); define("NAVI_UREJANJE_ANKETA", "NAVI_UREJANJE_ANKETA");
define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA"); define("NAVI_UREJANJE_TEMA", "NAVI_UREJANJE_TEMA");
define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT"); define("NAVI_UREJANJE_ALERT", "NAVI_UREJANJE_ALERT");
define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE"); define("NAVI_UREJANJE_TESTIRANJE", "NAVI_UREJANJE_TESTIRANJE");
define("NAVI_TESTIRANJE_KOMENTARJI_ANKETA", "NAVI_TESTIRANJE_KOMENTARJI_ANKETA");
define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE"); define("NAVI_UREJANJE_PREVAJANJE", "NAVI_UREJANJE_PREVAJANJE");
define("NAVI_UREJANJE_ARHIVI", "NAVI_UREJANJE_ARHIVI");
define("NAVI_UREJANJE_ARHIVI_TRACKING1", "NAVI_UREJANJE_ARHIVI_TRACKING1");
define("NAVI_UREJANJE_ARHIVI_TRACKING2", "NAVI_UREJANJE_ARHIVI_TRACKING2");
define("NAVI_UREJANJE_ARHIVI_TRACKING3", "NAVI_UREJANJE_ARHIVI_TRACKING3");
define("NAVI_UREJANJE_ARHIVI_EXPORT1", "NAVI_UREJANJE_ARHIVI_EXPORT1");
define("NAVI_UREJANJE_ARHIVI_EXPORT2", "NAVI_UREJANJE_ARHIVI_EXPORT2");
define("NAVI_OBJAVA", "NAVI_OBJAVA"); define("NAVI_OBJAVA", "NAVI_OBJAVA");
define("NAVI_ANALYSIS", "NAVI_ANALYSIS"); define("NAVI_ANALYSIS", "NAVI_ANALYSIS");
define("NAVI_RESULTS", "NAVI_RESULTS"); define("NAVI_RESULTS", "NAVI_RESULTS");
define("NAVI_ADVANCED", "NAVI_ADVANCED"); define("NAVI_ADVANCED", "NAVI_ADVANCED");

11
lang/1.php
View File

@ -399,6 +399,7 @@ $lang = array (
"archive1" => "arhiv >>", "archive1" => "arhiv >>",
"news_archive" => "Arhiv novic", "news_archive" => "Arhiv novic",
"m2w_archive" => "Arhiv novic članov", "m2w_archive" => "Arhiv novic članov",
"srv_archive" => "Arhiv",
"cat1" => "Kat 1", "cat1" => "Kat 1",
"cat2" => "Kat 2", "cat2" => "Kat 2",
"cat1_archive" => "Kategorija 1 - arhiv", "cat1_archive" => "Kategorija 1 - arhiv",
@ -7873,6 +7874,13 @@ $lang = array (
"navigation_NAVI_UREJANJE_BRANCHING" => 'Vprašalnik', "navigation_NAVI_UREJANJE_BRANCHING" => 'Vprašalnik',
"navigation_NAVI_UREJANJE_ANKETA" => 'Nastavitve', "navigation_NAVI_UREJANJE_ANKETA" => 'Nastavitve',
"navigation_NAVI_UREJANJE_TEMA" => 'Oblika', "navigation_NAVI_UREJANJE_TEMA" => 'Oblika',
"navigation_NAVI_UREJANJE_ARHIVI" => 'Arhivi vprašalnika',
"navigation_NAVI_UREJANJE_ARHIVI_EXPORT1" => 'Izvoz vprašalnika',
"navigation_NAVI_UREJANJE_ARHIVI_EXPORT2" => 'Izvoz vprašalnika in podatkov',
"navigation_NAVI_UREJANJE_ARHIVI_TRACKING1" => 'Spremembe vprašalnika',
"navigation_NAVI_UREJANJE_ARHIVI_TRACKING2" => 'Spremembe podatkov',
"navigation_NAVI_UREJANJE_ARHIVI_TRACKING3" => 'Append/Merge (uvozi)',
"navigation_NAVI_TESTIRANJE" => 'Testiranje', "navigation_NAVI_TESTIRANJE" => 'Testiranje',
"navigation_diagnostika" => 'Diagnostika', "navigation_diagnostika" => 'Diagnostika',
"navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Komentarji', "navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Komentarji',
@ -7895,6 +7903,9 @@ $lang = array (
"navigation_NAVI_STATISTIC_ANALYSIS_TTEST" => 'T-test', "navigation_NAVI_STATISTIC_ANALYSIS_TTEST" => 'T-test',
"navigation_NAVI_STATISTIC_ANALYSIS_BREAK" => 'Razbitje', "navigation_NAVI_STATISTIC_ANALYSIS_BREAK" => 'Razbitje',
"navigation_NAVI_ANALYSIS_LINKS" => 'Poročila', "navigation_NAVI_ANALYSIS_LINKS" => 'Poročila',
"navigation_NAVI_ARHIVI" => 'Arhiv',
// 1KA NAMESTITEV // // 1KA NAMESTITEV //
'install_title' => '1KA namestitev', 'install_title' => '1KA namestitev',

9
lang/2.php
View File

@ -387,6 +387,7 @@ $lang = array (
"archive1" => "archive >>", "archive1" => "archive >>",
"news_archive" => "News archive", "news_archive" => "News archive",
"m2w_archive" => "Users news archive", "m2w_archive" => "Users news archive",
"srv_archive" => "Archive",
"cat1" => "Cat 1", "cat1" => "Cat 1",
"cat2" => "Cat 2", "cat2" => "Cat 2",
"cat1_archive" => "Category 1 - archive", "cat1_archive" => "Category 1 - archive",
@ -7771,6 +7772,13 @@ GDPR introduction preview",
"navigation_NAVI_UREJANJE_BRANCHING" => 'Questionnaire', "navigation_NAVI_UREJANJE_BRANCHING" => 'Questionnaire',
"navigation_NAVI_UREJANJE_ANKETA" => 'Settings', "navigation_NAVI_UREJANJE_ANKETA" => 'Settings',
"navigation_NAVI_UREJANJE_TEMA" => 'Design', "navigation_NAVI_UREJANJE_TEMA" => 'Design',
"navigation_NAVI_UREJANJE_ARHIVI" => 'Survey archives',
"navigation_NAVI_UREJANJE_ARHIVI_EXPORT1" => 'Survey export',
"navigation_NAVI_UREJANJE_ARHIVI_EXPORT2" => 'Survey and data export',
"navigation_NAVI_UREJANJE_ARHIVI_TRACKING1" => 'Survey changes',
"navigation_NAVI_UREJANJE_ARHIVI_TRACKING2" => 'Data changes',
"navigation_NAVI_UREJANJE_ARHIVI_TRACKING3" => 'Append/Merge (imports)',
"navigation_NAVI_TESTIRANJE" => 'Test', "navigation_NAVI_TESTIRANJE" => 'Test',
"navigation_diagnostika" => 'Diagnostics', "navigation_diagnostika" => 'Diagnostics',
"navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Comments', "navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Comments',
@ -7793,6 +7801,7 @@ GDPR introduction preview",
"navigation_NAVI_STATISTIC_ANALYSIS_TTEST" => 'T-test', "navigation_NAVI_STATISTIC_ANALYSIS_TTEST" => 'T-test',
"navigation_NAVI_STATISTIC_ANALYSIS_BREAK" => 'Break', "navigation_NAVI_STATISTIC_ANALYSIS_BREAK" => 'Break',
"navigation_NAVI_ANALYSIS_LINKS" => 'Reports', "navigation_NAVI_ANALYSIS_LINKS" => 'Reports',
"navigation_NAVI_ARHIVI" => 'Archive',
// 1KA NAMESTITEV // // 1KA NAMESTITEV //
'install_title' => '1KA installation', 'install_title' => '1KA installation',

26
public/css/admin.css
View File

@ -28614,7 +28614,7 @@ fieldset textarea {
display: block; display: block;
padding: 15px; padding: 15px;
color: #1e88e5; color: #1e88e5;
font-weight: bold; font-weight: 600;
} }
.desktop_header { .desktop_header {
@ -29699,6 +29699,30 @@ table.analysis_reports > tbody > tr > td {
overflow-x: auto; overflow-x: auto;
white-space: nowrap; white-space: nowrap;
} }
.page_arhivi,
.page_tracking,
.subpage_anal_arch,
.subpage_view_archive,
.subpage_anal_arch {
flex-direction: column !important;
}
.page_arhivi .anketa_edit_left,
.page_tracking .anketa_edit_left,
.subpage_anal_arch .anketa_edit_left,
.subpage_view_archive .anketa_edit_left,
.subpage_anal_arch .anketa_edit_left {
display: none !important;
}
.page_arhivi .anketa_edit_main,
.page_tracking .anketa_edit_main,
.subpage_anal_arch .anketa_edit_main,
.subpage_view_archive .anketa_edit_main,
.subpage_anal_arch .anketa_edit_main {
width: 100% !important;
box-sizing: border-box;
margin: 0 !important;
}
} }
/*# sourceMappingURL=admin.css.map */ /*# sourceMappingURL=admin.css.map */

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

@ -55,5 +55,5 @@ div.breadcrumbs {
display: block; display: block;
padding: 15px; padding: 15px;
color: $strong_blue; color: $strong_blue;
font-weight: bold; font-weight: 600;
} }

1
resources/sass/admin/mobile/mobile.scss
View File

@ -28,5 +28,6 @@ $breakpoint-mobile: 850px;
@import "pages/analysis"; @import "pages/analysis";
@import "pages/no_survey"; @import "pages/no_survey";
@import "pages/settings_profile"; @import "pages/settings_profile";
@import "pages/archive";
} }

19
resources/sass/admin/mobile/pages/archive.scss Normal file
View File

@ -0,0 +1,19 @@
.page_arhivi,
.page_tracking,
.subpage_anal_arch,
.subpage_view_archive,
.subpage_anal_arch{
flex-direction: column !important;
.anketa_edit_left{
display: none !important;
}
.anketa_edit_main{
width: 100% !important;
box-sizing: border-box;
margin: 0 !important;
}
}