diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 9e385d3e5..2bb00fe53 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3837,7 +3837,7 @@ class SurveyAdmin echo ''; - echo ''; + echo ''; echo ' '; echo ''; @@ -5935,8 +5935,7 @@ class SurveyAdmin echo '
'; if ($row['active'] == 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) { - echo ''.$link.''; - + echo ''.$link.''; } elseif (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) { echo ''.$site_url.'sa'; @@ -5964,14 +5963,14 @@ class SurveyAdmin # V kolikor gre za hierarhijo in uporabnik ni administrator hierarhije if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){ if ($hierarhija_type == 1) { - echo ''; + echo ''; } else{ - echo ''; + echo ''; } } else { - echo ''; + echo ''; } echo '
ON
'; @@ -5984,13 +5983,13 @@ class SurveyAdmin //Preden anketo aktiviramo preverimo, če gre tudi za izgradnjo hierarhije in če anketa še ni bila aktivirana if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){ if ($hierarhija_type == 1) { - echo '
'; + echo ''; } else{ - echo ''; + echo ''; } } else { - echo ''; + echo ''; } if ((int)$_last_active > 0) { @@ -6019,17 +6018,17 @@ class SurveyAdmin $prevent_unlock = (SurveyInfo::getSurveyModules('hierarhija') == 2 || $d->checkDostopSub('lock') && $row['locked'] == 1 && ($admin_type != 0 && $admin_type != 1)) ? 1 : 0; if ($prevent_unlock == 1) { echo ''; - echo ''; + echo ''; echo ''; echo ''; } else { # zaklepanje if ($hierarhija_type == 10) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } echo ''; echo ''; @@ -6048,7 +6047,7 @@ class SurveyAdmin echo '
'; - echo ' '; + echo ' '; echo '
'; $this->tooltip_test_data(); @@ -6061,7 +6060,7 @@ class SurveyAdmin // Predogled in testiranje (ikona monitor) echo '
'; - echo ' '.$lang['srv_poglejanketo2'].' '; + echo ' '.$lang['srv_poglejanketo2'].' '; echo '
'; $this->tooltip_preview_data(); diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php index 39f905ded..9d6d893a8 100644 --- a/admin/survey/classes/class.SurveyStaticHtml.php +++ b/admin/survey/classes/class.SurveyStaticHtml.php @@ -448,20 +448,21 @@ class SurveyStaticHtml echo '
'; $borderLeft = ' class="borderLeft"'; - } // Link nazaj na podatke - Spremenljivke + } + // Link nazaj na podatke - Spremenljivke elseif ($podstran == 'para_analysis_graph') { // Info o neodgovorih echo '
'; echo $lang['srv_para_graph_text2']; echo '
'; - $borderLeft = ' class="borderLeft"'; - echo '
'; + echo ''; + $borderLeft = ' class="borderLeft"'; } elseif ($podstran == 'aapor') { diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 7d1b3775f..4223ae3df 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -6916,6 +6916,7 @@ a.help { background: #FFFFFF; border: 1px solid #C4C4C4; box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07); + cursor: auto; margin-top: 14px; padding: 12px; border-radius: 2px; @@ -8612,8 +8613,8 @@ header #topSettingsHolder { border-bottom: 1px #E5E5E5 solid; } header #topSettingsHolder .borderLeft { - padding-left: 20px; - border-left: 1px dotted #E5E5E5; + padding-left: 32px; + border-left: 1px solid #E5E5E5; } header #topSettingsHolder .left_options_holder { display: flex; @@ -8644,6 +8645,11 @@ header #topSettingsHolder .left_options_holder #additional_navigation span span. line-height: 0px; margin-right: 32px; } +header #topSettingsHolder .left_options_holder #additional_navigation.nonresponse { + margin-left: 32px; + padding-left: 0; + border-left: 1px #E5E5E5 solid; +} header #topSettingsHolder .left_options_holder #dataOnlyValid { position: relative; display: flex; diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss index ecd24ea43..1bf123acf 100644 --- a/resources/sass/admin_new/components/header/navigation.scss +++ b/resources/sass/admin_new/components/header/navigation.scss @@ -258,8 +258,8 @@ header{ border-bottom: 1px $gray solid; .borderLeft { - padding-left: 20px; - border-left: 1px dotted $gray; + padding-left: 32px; + border-left: 1px solid $gray; } @@ -301,6 +301,13 @@ header{ margin-right: 32px; } } + + &.nonresponse{ + margin-left: 32px; + padding-left: 0; + + border-left: 1px $gray solid; + } } // Veljavni/ustrezni diff --git a/resources/sass/admin_new/components/hover/qtip.scss b/resources/sass/admin_new/components/hover/qtip.scss index b8b45f207..7cf855b31 100644 --- a/resources/sass/admin_new/components/hover/qtip.scss +++ b/resources/sass/admin_new/components/hover/qtip.scss @@ -175,6 +175,7 @@ .expanded-tooltip-box{ @include hover_basic(); + cursor: auto; margin-top: 14px; padding: 12px;