From f6fd572cd57825418ad3aee1d440c57dc732a2ce Mon Sep 17 00:00:00 2001 From: pero1203 Date: Thu, 23 Dec 2021 11:14:06 +0100 Subject: [PATCH] Urejen layout glede na navigacijo (wide, fullwidth, narrow in ce imamo meni ali ne) - dodano nastavljanje v CrossRoad class --- admin/survey/SurveyAdmin.php | 78 +- .../mobile/class.MobileSurveyAdmin.php | 1 - admin/survey/classes/tracking/CrossRoad.php | 249 +- public/css/admin_new.css | 2718 ++++++++--------- resources/sass/admin_new/basic/layout.scss | 7 - 5 files changed, 1638 insertions(+), 1415 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 9393e38bb..c4f350822 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -110,6 +110,14 @@ class SurveyAdmin var $full_screen_edit = false; # ali ima uporabnik nastavljeno da ureja vprašanja v fullscreen načinu var $isAnketar = false; # Ali je uporabnik anketar ankete privzeto je ne + var $first_action = ''; // Prvi nivo navigacije kjer se nahajamo + var $second_action = ''; // Drugi nivo navigacije kjer se nahajamo + var $third_action = ''; // Tretji nivo navigacije kjer se nahajamo + + var $layout_width = ''; // Layout strani kjer se nahajamo - "fullwidth", "wide" ali "narrow" + var $layout_menu = ''; // Layout strani kjer se nahajamo - "menu_lef" (prisoten levi meni) + + /** * @desc konstruktor */ @@ -266,6 +274,17 @@ class SurveyAdmin global $site_domain; + // 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']; + + // Layout strani + $this->layout_width = $navigationArray['layout_width']; + $this->layout_menu = $navigationArray['layout_menu']; + + echo '
'; @@ -325,7 +344,7 @@ class SurveyAdmin echo '
'; - echo '