may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - analiza - popravki tabel

Browse Source
This commit is contained in:
pero1203 2022-02-17 10:33:08 +01:00
parent 0986b0fd17
commit 156872100a
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
View File

@ -836,6 +836,7 @@ class SurveyCrosstabs {
$sub_q1 = '<span class="anl_variabla'.$sccFloat.'">'; $sub_q1 = '<span class="anl_variabla'.$sccFloat.'">';
$sub_q1 .= '<a href="/" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $v_first['spr'] . '\'); return false;">'; $sub_q1 .= '<a href="/" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\'' . $v_first['spr'] . '\'); return false;">';
$sub_q1 .= strip_tags($spr1['naslov']); $sub_q1 .= strip_tags($spr1['naslov']);
if ($show_variables_values == true ) { if ($show_variables_values == true ) {
$sub_q1 .= '<span class="anl_variabla'.$sccFloat.'">'; $sub_q1 .= '<span class="anl_variabla'.$sccFloat.'">';
@ -843,9 +844,12 @@ class SurveyCrosstabs {
$sub_q1 .= '</span>'; $sub_q1 .= '</span>';
} }
if ($spr1['tip'] == '16') { if ($spr1['tip'] == '16') {
$sub_q1 .= '<br/>' . strip_tags($grid1['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid1['variable']) . ')' : ''); $sub_q1 .= '<br/>' . strip_tags($grid1['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid1['variable']) . ')' : '');
} else { }
else {
if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje'])
$sub_q1 .= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : ''); $sub_q1 .= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
} }
$sub_q1 .= '</a>'; $sub_q1 .= '</a>';
@ -878,7 +882,9 @@ class SurveyCrosstabs {
} }
if ($spr2['tip'] == '16') { if ($spr2['tip'] == '16') {
$sub_q2.= '<br/>' . strip_tags($grid2['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid2['variable']) . ')' : ''); $sub_q2.= '<br/>' . strip_tags($grid2['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($grid2['variable']) . ')' : '');
} else { }
else {
if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje'])
$sub_q2.= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : ''); $sub_q2.= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : '');
} }
$sub_q2 .= '</a>'; $sub_q2 .= '</a>';

9
public/css/admin_new.css
View File

@ -8759,6 +8759,12 @@ select.dropdown {
margin-top: 4px; margin-top: 4px;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
select.dropdown option {
color: #333333;
}
select.dropdown option:disabled {
color: #A0A0A0;
}
select.dropdown.large { select.dropdown.large {
width: 229px; width: 229px;
height: 40px; height: 40px;
@ -8768,7 +8774,6 @@ select.dropdown.large {
select.dropdown.large option { select.dropdown.large option {
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
color: #333333;
padding: 0; padding: 0;
} }
select.dropdown.medium { select.dropdown.medium {
@ -8780,7 +8785,6 @@ select.dropdown.medium {
select.dropdown.medium option { select.dropdown.medium option {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: #333333;
} }
select.dropdown.small { select.dropdown.small {
width: 229px; width: 229px;
@ -8791,7 +8795,6 @@ select.dropdown.small {
select.dropdown.small option { select.dropdown.small option {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: #333333;
} }
select.dropdown.w200 { select.dropdown.w200 {
width: 200px; width: 200px;

11
resources/sass/admin_new/components/form/dropdown.scss
View File

@ -14,6 +14,14 @@ select.dropdown {
background-color: $white; background-color: $white;
option {
color: $black;
&:disabled{
color: #A0A0A0;
}
}
&.large { &.large {
width: 229px; width: 229px;
height: 40px; height: 40px;
@ -23,7 +31,6 @@ select.dropdown {
option { option {
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
color: $black;
padding: 0; padding: 0;
} }
} }
@ -36,7 +43,6 @@ select.dropdown {
option { option {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: $black;
} }
} }
&.small { &.small {
@ -48,7 +54,6 @@ select.dropdown {
option { option {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: $black;
} }
} }