diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php index 03e2125c3..456205ff3 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php @@ -444,9 +444,9 @@ class SurveyAnalysis { } - if (self::$dataFileStatus == FILE_STATUS_OLD && self::$podstran != M_ANALYSIS_ARCHIVE) { + /*if (self::$dataFileStatus == FILE_STATUS_OLD && self::$podstran != M_ANALYSIS_ARCHIVE) { echo "Posodobljeno: ".date("d.m.Y, H:i:s", strtotime(self::$dataFileUpdated)); - } + }*/ # krostabe naredimo if(self::$podstran == M_ANALYSIS_CROSSTAB ) { @@ -5912,8 +5912,8 @@ class SurveyAnalysis { echo '
'; - echo ''; - echo ''; + echo ''; + echo ''; echo'
'; } @@ -7717,13 +7717,11 @@ class SurveyAnalysis { echo '
'; if ($objectSkala->canChangeSkala()) { - echo ''; - echo ''; + echo ''; + echo ''; } else { - echo ''; - echo $lang['srv_skala_'.$objectSkala->getSkala()]; - echo ''; + echo ''; } echo '
'; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index b12d9928e..6772d2b9d 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -16110,6 +16110,7 @@ textarea#addusers, textarea#addusers_note { #ttestResults .div_analiza_holder .div_analiza_scale button:first-child, #ttestResults .div_analiza_holder .freq-p_holder button:first-child { border-radius: 2px 0px 0px 2px; + border-right: 1px #1E88E5 solid !important; } #div_analiza_data .div_analiza_holder .enote-navedbe_holder button:nth-child(2), #div_analiza_data .div_analiza_holder .div_analiza_scale button:nth-child(2), @@ -16124,6 +16125,7 @@ textarea#addusers, textarea#addusers_note { #ttestResults .div_analiza_holder .div_analiza_scale button:nth-child(2), #ttestResults .div_analiza_holder .freq-p_holder button:nth-child(2) { border-radius: 0px 2px 2px 0px; + border-left: 0 !important; } #div_analiza_data .div_analiza_holder .enote-navedbe_holder button.active, #div_analiza_data .div_analiza_holder .enote-navedbe_holder button:hover, #div_analiza_data .div_analiza_holder .div_analiza_scale button.active, @@ -16152,6 +16154,20 @@ textarea#addusers, textarea#addusers_note { background-color: #EAF9FE; border-color: #1E88E5; } +#div_analiza_data .div_analiza_holder .enote-navedbe_holder button.single, +#div_analiza_data .div_analiza_holder .div_analiza_scale button.single, +#div_analiza_data .div_analiza_holder .freq-p_holder button.single, +#div_means_data .div_analiza_holder .enote-navedbe_holder button.single, +#div_means_data .div_analiza_holder .div_analiza_scale button.single, +#div_means_data .div_analiza_holder .freq-p_holder button.single, +#div_break_data .div_analiza_holder .enote-navedbe_holder button.single, +#div_break_data .div_analiza_holder .div_analiza_scale button.single, +#div_break_data .div_analiza_holder .freq-p_holder button.single, +#ttestResults .div_analiza_holder .enote-navedbe_holder button.single, +#ttestResults .div_analiza_holder .div_analiza_scale button.single, +#ttestResults .div_analiza_holder .freq-p_holder button.single { + border-radius: 2px; +} #div_analiza_data .div_analiza_holder .div_analiza_scale, #div_means_data .div_analiza_holder .div_analiza_scale, #div_break_data .div_analiza_holder .div_analiza_scale, diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss index 06d1cbae2..b657116d1 100644 --- a/resources/sass/admin_new/pages/survey_analysis/basic.scss +++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss @@ -61,10 +61,14 @@ &:first-child{ border-radius: 2px 0px 0px 2px; + + border-right: 1px $blue solid !important; } &:nth-child(2){ border-radius: 0px 2px 2px 0px; + + border-left: 0 !important; } &.active, @@ -74,6 +78,10 @@ background-color: $light-blue; border-color: $blue; } + + &.single{ + border-radius: 2px; + } } }