diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 0fceb9aa7..547679c3e 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -6823,7 +6823,7 @@ class SurveyAdminSettings { echo '
'.$lang['srv_frekvencna_porazdelitev'].''; - echo '
'; + echo '
'; echo '
'; echo ''; @@ -6870,10 +6870,10 @@ class SurveyAdminSettings { if ($_GET['pages'] == '1') { $sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'"); $row = mysqli_fetch_array($sql); - echo '

'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'

'; + echo '

'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'

'; } - echo ''; + echo '
'; $histogram = array(); for ($t=0; $t<=$max_time; $t++) $histogram[$t] = 0; @@ -6892,10 +6892,9 @@ class SurveyAdminSettings { for ($t=$t_min; $t<=$max_time; $t++) { - echo ''; } } @@ -6905,16 +6904,16 @@ class SurveyAdminSettings { if ($max_time <= 20) { for ($t=$t_min; $t<=$max_time; $t++) { - echo ''; + echo ''; } } else { if ($t_min == 0) - echo ''; + echo ''; else - echo ''; + echo ''; for ($t=10; $t<=$max_time; $t+=10) { - echo ''; + echo ''; } } diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index e8b5947c7..933352e64 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -108,6 +108,11 @@ class CrossRoad { $layout_width = 'narrow'; + if ($_GET['m'] == 'cas' || $_GET['m'] == 'predvidenicas') { + $layout_width = 'wide'; + + } + $status = 4; break; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index f9678a3a2..5a400a241 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10131,6 +10131,36 @@ div.subpage_predvidenicas table td.predvideni, div.subpage_cas table td.predvideni { color: #C4C4C4; } +div.subpage_predvidenicas table#casi_histogram, +div.subpage_cas table#casi_histogram { + padding: 0; + margin: 0; +} +div.subpage_predvidenicas table#casi_histogram td.histogram, +div.subpage_cas table#casi_histogram td.histogram { + vertical-align: bottom; + margin: 0; + padding: 0; + border: none; +} +div.subpage_predvidenicas table#casi_histogram td.histogram div.histogram, +div.subpage_cas table#casi_histogram td.histogram div.histogram { + background-color: #E5E5E5; + border: 1px solid transparent; + text-align: right; + width: 100%; + margin: 0; + padding: 0; + min-height: 1px; +} +div.subpage_predvidenicas table#casi_histogram td.histogram_time, +div.subpage_cas table#casi_histogram td.histogram_time { + padding: 0; + text-align: left; + vertical-align: top; + color: #777777; + border: none; +} div.subpage_predvidenicas div.graph_full, div.subpage_cas div.graph_full { background-color: #1E88E5; diff --git a/resources/sass/admin_new/pages/my_surveys/testiranje.scss b/resources/sass/admin_new/pages/my_surveys/testiranje.scss index c8193f093..9a9effebe 100644 --- a/resources/sass/admin_new/pages/my_surveys/testiranje.scss +++ b/resources/sass/admin_new/pages/my_surveys/testiranje.scss @@ -132,6 +132,37 @@ div.subpage_cas { td.predvideni { color: $dark-gray; } + + &#casi_histogram { + padding: 0; + margin: 0; + + td.histogram { + vertical-align: bottom; + margin: 0; + padding: 0; + border: none; + + div.histogram { + background-color: $gray; + border: 1px solid transparent; + text-align: right; + width: 100%; + margin: 0; + padding: 0; + min-height: 1px; + } + } + + td.histogram_time { + padding: 0; + text-align: left; + vertical-align: top; + color: $very-dark-gray; + + border: none; + } + } } div.graph_full {
'; + echo ''; - echo '
'; - //echo ''.$t.''; + echo '
'; echo '
'.$t.($minute?'min':'s').''.$t.($minute?'min':'s').'0'.($minute?'min':'s').'0'.($minute?'min':'s').'2'.($minute?'min':'s').'2'.($minute?'min':'s').''.$t.''.$t.'