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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2022-02-17 14:30:29 +01:00
commit 7cef39131d
9 changed files with 1472 additions and 1433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/SurveyAdmin.php
View File

@ -375,7 +375,8 @@ class SurveyAdmin
// Loading ikona // Loading ikona
echo ' <div id="loading">'; echo ' <div id="loading">';
echo ' <span class="faicon spinner fa-spin spaceRight"></span> '.$lang['srv_saving']; echo ' <span class="faicon spinner fa-spin"></span>';
echo ' <span class="text">'.$lang['srv_saving'].'</span>';
echo ' </div> <!-- /loading -->'; echo ' </div> <!-- /loading -->';
echo ' <div id="clipboard">'; echo ' <div id="clipboard">';

14
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,10 +844,13 @@ 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 { }
$sub_q1 .= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : ''); 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 .= '</a>'; $sub_q1 .= '</a>';
$sub_q1 .= '</span>' . NEW_LINE; $sub_q1 .= '</span>' . NEW_LINE;
@ -878,8 +882,10 @@ 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 { }
$sub_q2.= '<br/>' . strip_tags($variable['naslov']) . ($show_variables_values == true ? '&nbsp;(' . strip_tags($variable['variable']) . ')' : ''); 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 .= '</a>'; $sub_q2 .= '</a>';
$sub_q2 .= '</span>' . NEW_LINE; $sub_q2 .= '</span>' . NEW_LINE;

2
lang/1.php
View File

@ -5232,7 +5232,7 @@ $lang = array (
"srv_analiza_archive_note1" => "Arhiv lahko generirate s klikom na ikono <span class=\"faicon arhiv blue\"></span> pri posameznih analizah.", "srv_analiza_archive_note1" => "Arhiv lahko generirate s klikom na ikono <span class=\"faicon arhiv blue\"></span> pri posameznih analizah.",
"srv_analiza_archive_list" => "Seznam arhivov analiz", "srv_analiza_archive_list" => "Seznam arhivov analiz",
"srv_wait_a_moment" => "Prosimo počakajte trenutek.", "srv_wait_a_moment" => "Prosimo počakajte trenutek.",
"srv_saving" => "Obdelujem...", "srv_saving" => "Nalaganje",
"srv_grid_defaults_1_1" => "Sploh ne velja", "srv_grid_defaults_1_1" => "Sploh ne velja",
"srv_grid_defaults_1_2" => "Ne velja", "srv_grid_defaults_1_2" => "Ne velja",
"srv_grid_defaults_1_3" => "Niti niti", "srv_grid_defaults_1_3" => "Niti niti",

2
lang/2.php
View File

@ -5196,7 +5196,7 @@ $lang = array (
"srv_analiza_archive_note1" => "You can generate an archive by clicking on the <span class=\"faicon archive blue\"></span> icon for each analysis.", "srv_analiza_archive_note1" => "You can generate an archive by clicking on the <span class=\"faicon archive blue\"></span> icon for each analysis.",
"srv_analiza_archive_list" => "List of analysis archives", "srv_analiza_archive_list" => "List of analysis archives",
"srv_wait_a_moment" => "Please wait a moment.", "srv_wait_a_moment" => "Please wait a moment.",
"srv_saving" => "Processing...", "srv_saving" => "Loading",
"srv_grid_defaults_1_1" => "Not true at all", "srv_grid_defaults_1_1" => "Not true at all",
"srv_grid_defaults_1_2" => "Not true", "srv_grid_defaults_1_2" => "Not true",
"srv_grid_defaults_1_3" => "Neutral", "srv_grid_defaults_1_3" => "Neutral",

2827
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

3
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -562,7 +562,8 @@ span.faicon.minus_orange::before{
/* Spinner */ /* Spinner */
span.faicon.spinner::before{ span.faicon.spinner::before{
font-size: 18px; font-size: 18px;
content: "\f110"; //content: "\f110";
content: "\f1ce";
} }

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;
} }
} }

29
resources/sass/admin_new/components/popup/loader.scss
View File

@ -14,10 +14,6 @@ body.waitlong {
top: 45%; top: 45%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
padding: 15px 25px;
border: 1px solid $blue;
} }
} }
@ -32,16 +28,29 @@ body.waitlong {
box-sizing: border-box; box-sizing: border-box;
width: 275px; width: 275px;
height: 38px; height: 38px;
padding-left: 16px;
line-height: 35px;
font-size: 14px;
background-color: $white; background-color: $white;
border: 1px solid $blue; border: 1px solid $black;
border-radius: 2px; border-radius: 2px;
.spinner::before{
span.spinner{
position: absolute;
top: 10px;
left: 16px;
font-size: 14px;
&::before{
font-size: 14px;
}
}
span.text{
position: absolute;
top: 8px;
left: 40px;
font-size: 14px; font-size: 14px;
} }
} }

4
resources/sass/admin_new/pages/survey_analysis/page_desc.scss
View File

@ -11,6 +11,10 @@
tr.row_question td{ tr.row_question td{
background-color: $light-gray2; background-color: $light-gray2;
&.cell_value{
font-weight: 400;
}
} }
tr.row_grid td, tr.row_grid td,