Mobile breadcrumbs - v2

(dodan bold modri font | manjka še za arhive)

admin/survey/SurveyAdmin.php

@@ -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';

admin/survey/classes/mobile/class.MobileSurveyAdmin.php

@@ -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
@@ -550,7 +553,7 @@ class MobileSurveyAdmin{
                 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' : '')
                 ),
             );
 

admin/survey/classes/tracking/CrossRoad.php

@@ -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{

lang/1.php

@@ -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',
     

lang/2.php

@@ -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 //

public/css/admin.css

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

resources/sass/admin/mobile/basic.scss

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