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

Nastavitve tabel - dodan segment nastavitev, dodane nastavitve tudi za pc

Browse Source
This commit is contained in:
pero1203 2022-08-25 12:27:38 +02:00
parent 45830f8fa9
commit 12641e683a
12 changed files with 412 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/survey/SurveyAdmin.php
View File

@ -2226,6 +2226,7 @@ class SurveyAdmin
|| $_GET['a'] == 'forma'
|| $_GET['a'] == 'metadata'
|| $_GET['a'] == 'mobile_settings'
|| $_GET['a'] == 'table_settings'
|| $_GET['a'] == A_PRIKAZ
|| $_GET['a'] == A_MISSING
|| $_GET['a'] == A_SKUPINE
@ -2554,6 +2555,7 @@ class SurveyAdmin
|| $_GET['a'] == 'forma'
|| $_GET['a'] == 'metadata'
|| $_GET['a'] == 'mobile_settings'
|| $_GET['a'] == 'table_settings'
|| $_GET['a'] == A_PRIKAZ
|| $_GET['a'] == A_EXPORTSETTINGS
|| $_GET['a'] == A_GDPR
@ -3127,6 +3129,11 @@ class SurveyAdmin
echo '<li ' . ($get == A_MOBILESETTINGS ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_MOBILESETTINGS . '" title="' . $lang['srv_mobile_settings'] . '">' . $lang['srv_mobile_settings'] . '</a></li> ';
# prikaz tabel
echo '<li ' . ($get == A_TABLESETTINGS ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TABLESETTINGS . '" title="' . $lang['srv_table_settings'] . '">' . $lang['srv_table_settings'] . '</a></li> ';
# prevajanje - jezik (standardne besede)
echo '<li ' . ($get == A_JEZIK ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_JEZIK . '" title="' . $lang['srv_standardne_besede'] . '">' . $lang['srv_standardne_besede'] . '</a></li> ';

4
admin/survey/SurveyAdminAjax.php
View File

@ -933,6 +933,10 @@ class SurveyAdminAjax {
if (isset($_POST['mobile_tables'])) {
SurveySetting::getInstance()->setSurveyMiscSetting('mobile_tables', $_POST['mobile_tables']);
}
if (isset($_POST['pc_tables'])) {
SurveySetting::getInstance()->setSurveyMiscSetting('pc_tables', $_POST['pc_tables']);
}
if (isset($_POST['export_font_size'])) {
SurveySetting::getInstance()->setSurveyMiscSetting('export_font_size', $_POST['export_font_size']);

61
admin/survey/SurveyAdminSettings.php
View File

@ -1771,7 +1771,7 @@ class SurveyAdminSettings {
echo '</div>';
// Prilagoditev tabel pri mobilnikih
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
/*$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
echo '<div class="setting_holder">';
echo '<span class="setting_title" >'.$lang['srv_settings_mobile_tables'].':</span>';
@ -1788,12 +1788,69 @@ class SurveyAdminSettings {
echo '<label for="mobile_tables_0">'.$lang['no'].'</label> ';
echo '</div>';
echo '</div>';
echo '</div>';*/
echo '</div>';
echo '</fieldset>';
}
/*Nastavitve prikaza za tabele*/
if ($_GET['a'] == 'table_settings') {
SurveySetting::getInstance()->Init($this->anketa);
echo '<fieldset>';
echo '<legend>'.$lang['srv_table_settings_title'].'</legend>';
// Prilagoditev tabel na pc-ju
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
echo '<div class="setting_holder">';
echo '<span class="setting_title" >'.$lang['srv_table_settings_pc_tables'].':</span>';
echo '<div class="setting_item">';
echo '<input type="radio" name="pc_tables" id="pc_tables_1" '.($pc_tables==='1'?' checked':'').' value="1">';
echo '<label for="pc_tables_1">'.$lang['yes'].'</label> ';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="pc_tables" id="pc_tables_2" '.($pc_tables==='2'?' checked':'').' value="2">';
echo '<label for="pc_tables_2">'.$lang['srv_settings_mobile_tables_slide'].'</label> ';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="pc_tables" id="pc_tables_0" '.($pc_tables==='0'?' checked':'').' value="0">';
echo '<label for="pc_tables_0">'.$lang['no'].'</label> ';
echo '</div>';
echo '</div>';
// Prilagoditev tabel pri mobilnikih
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
echo '<div class="setting_holder">';
echo '<span class="setting_title" >'.$lang['srv_table_settings_mobile_tables'].':</span>';
echo '<div class="setting_item">';
echo '<input type="radio" name="mobile_tables" id="mobile_tables_1" '.($mobile_tables==='1'?' checked':'').' value="1">';
echo '<label for="mobile_tables_1">'.$lang['yes'].'</label> ';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="mobile_tables" id="mobile_tables_2" '.($mobile_tables==='2'?' checked':'').' value="2">';
echo '<label for="mobile_tables_2">'.$lang['srv_settings_mobile_tables_slide'].'</label> ';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="mobile_tables" id="mobile_tables_0" '.($mobile_tables==='0'?' checked':'').' value="0">';
echo '<label for="mobile_tables_0">'.$lang['no'].'</label> ';
echo '</div>';
echo '</div>';
echo '</fieldset>';
}
/*Metapodatki (Parapodatki)*/
if ($_GET['a'] == 'metadata') {

1
admin/survey/classes/tracking/CrossRoad.php
View File

@ -145,6 +145,7 @@ class CrossRoad {
case A_MISSING:
case A_METADATA:
case A_MOBILESETTINGS:
case A_TABLESETTINGS:
case A_JEZIK: # nastavitve jezik
case A_UREJANJE: # nastavitve komentarjev
case A_PRIKAZ: # nastavitve komentarjev

1
admin/survey/definition.php
View File

@ -241,6 +241,7 @@
define('A_FORMA', 'forma'); # urejanje ankete - manjkajoče vrednosti
define('A_METADATA', 'metadata'); # urejanje ankete - prikaz metapodatkov
define('A_MOBILESETTINGS', 'mobile_settings'); # urejanje ankete - nastavitve prikaza pri mobitelih
define('A_TABLESETTINGS', 'table_settings'); # urejanje ankete - nastavitve prikaza tabel
define('A_PRIKAZ', 'prikaz'); # prikaz podatkov in analiz
define('A_MAILING', 'advanced_email'); # nastavitve email strežnika
define('A_SKUPINE', 'skupine'); # skupine

4
lang/1.php
View File

@ -4016,6 +4016,10 @@ $lang = array (
"srv_mobile_settings_title" => "Prikaz ankete na mobilnih napravah",
"srv_mobile_survey" => "Anketa ustvarjena v mobilni aplikaciji",
"srv_mobile_add_question" => "Dodaj vprašanje",
"srv_table_settings" => "Nastavitve tabel",
"srv_table_settings_title" => "Prikaz vprašanj tipa tabela",
'srv_table_settings_mobile_tables' => "Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
'srv_table_settings_pc_tables' => "Prilagoditev vprašanj tipa 'Tabela' na računalniku",
"srv_standardne_besede" => "Standardne besede",
"srv_prevajanje_dodaj" => "Dodaj nov prevod za",
"srv_base_lang" => "Osnovni jezik",

6
lang/2.php
View File

@ -3986,8 +3986,12 @@ $lang = array (
"srv_mobile_settings_title" => "Survey display on mobile devices",
"srv_mobile_survey" => "Survey created with mobile app",
"srv_mobile_add_question" => "Add question",
"srv_table_settings" => "Table settings",
"srv_table_settings_title" => "Table questions settings",
'srv_table_settings_mobile_tables' => "Optimization of 'Table' type questions on mobile devices",
'srv_table_settings_pc_tables' => "Optimization of 'Table' type questions on desktop computer",
"srv_prevajanje_dodaj" => "Add translation for",
"srv_multi_lang" => "Multilanguage surveys",
"srv_multi_lang" => "Multilanguage surveys",
"srv_base_lang" => "Basic language",
"srv_lang_elements" => "Standard text",
"srv_trans_lang" => "Translation",

36
main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
View File

@ -61,7 +61,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -95,7 +95,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -169,14 +169,14 @@ class MultigridMobileController extends Controller{
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2)
if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
// IZPOLNJENA VREDNOST, ce obstaja in ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2){
if($tables_setting == 2){
echo '<div class="grid_mobile_result">'.($grid_id != '' ? $grid_data_value : '').'</div>';
}
@ -386,7 +386,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -439,7 +439,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
echo '<div class="grid_mobile radio double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile radio double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -512,7 +512,7 @@ class MultigridMobileController extends Controller{
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
/*if($mobile_tables == 2)
/*if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
echo '</div>';
@ -714,7 +714,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -750,7 +750,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobitel
echo '<div class="grid_mobile checkbox '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile checkbox '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -819,7 +819,7 @@ class MultigridMobileController extends Controller{
echo '</div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2)
if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
@ -931,7 +931,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -985,7 +985,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
echo '<div class="grid_mobile checkbox double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile checkbox double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -1059,11 +1059,7 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
}
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
/*if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
echo ' </div>';
echo '</div>';
@ -1269,7 +1265,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -1325,7 +1321,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobitel
echo '<div class="grid_mobile text '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile text '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -1397,7 +1393,7 @@ class MultigridMobileController extends Controller{
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2)
if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';

15
main/survey/app/Controllers/Vprasanja/VprasanjaController.php
View File

@ -231,7 +231,9 @@ class VprasanjaController extends Controller
// JS za mobilno razpiranje tabel
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
if($mobile_tables == 2){
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
if(($mobile_tables == 2 && get('mobile') == 1) || ($pc_tables == 2 && get('mobile') != 1)){
echo '<script>
$(document).ready(
@ -704,7 +706,8 @@ class VprasanjaController extends Controller
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
// Izris multigrida s postopnim resevanjem
if($row['dynamic_mg'] > 0 && !get('printPreview')){
@ -714,7 +717,7 @@ class VprasanjaController extends Controller
Dynamic::getInstance()->verticalMultigrid($spremenljivka);
}
// Izris radio multigrida na mobitelu
elseif (get('mobile') == 1 && $mobile_tables > 0) {
elseif ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
// Dvojni multigrid
if($row['enota'] == 3)
@ -778,9 +781,10 @@ class VprasanjaController extends Controller
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
// Izris checkbox multigrida na mobitelu
if (get('mobile') == 1 && $mobile_tables > 0) {
if ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
// Dvojni multigrid
if($row['enota'] == 3)
@ -823,9 +827,10 @@ class VprasanjaController extends Controller
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
// Izris text in number multigrida na mobitelu
if (get('mobile') == 1 && $mobile_tables > 0) {
if ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
MultigridMobile::getInstance()->textMultigrid($spremenljivka);
}
// Izris navadnega text in number multigrida

150
public/css/main.css
View File

@ -5751,6 +5751,9 @@ span.enka-custom-radio:before,
padding: 3px;
margin-bottom: 20px !important;
}
.spremenljivka.tip_6, .spremenljivka.tip_16, .spremenljivka.tip_19, .spremenljivka.tip_20, .spremenljivka.tip_24 {
/* Mobilno rzpiranje tabel */
}
.spremenljivka.tip_6 input[type=text], .spremenljivka.tip_6 textarea, .spremenljivka.tip_6 select, .spremenljivka.tip_16 input[type=text], .spremenljivka.tip_16 textarea, .spremenljivka.tip_16 select, .spremenljivka.tip_19 input[type=text], .spremenljivka.tip_19 textarea, .spremenljivka.tip_19 select, .spremenljivka.tip_20 input[type=text], .spremenljivka.tip_20 textarea, .spremenljivka.tip_20 select, .spremenljivka.tip_24 input[type=text], .spremenljivka.tip_24 textarea, .spremenljivka.tip_24 select {
padding: 5px 7px;
}
@ -5791,6 +5794,153 @@ span.enka-custom-radio:before,
.spremenljivka.tip_6 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_16 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_19 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_20 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_24 table.dynamicmultigrid tbody tr:nth-child(2n+1) {
background-color: #ffffff !important;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question {
margin: 10px 0 15px;
/*line-height: 24px;*/
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_title {
padding: 7px 9px;
font-weight: 500;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables {
width: 100%;
box-sizing: border-box;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 7px 9px;
margin: 2px 0;
color: #333333;
border: 1px #fff solid;
border-radius: 3px;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label {
vertical-align: baseline;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle {
padding: 5px 8px;
}
.spremenljivka.tip_6 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_6 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_6 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_6 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_16 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_16 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_16 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_16 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_19 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_19 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_19 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_19 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_20 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_20 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_20 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_20 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_24 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_24 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_24 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_24 .grid_mobile.radio .grid_mobile_variable.checked {
background-color: #efefef;
border: 1px #E2E2E2 solid;
}
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable {
display: inline-block;
border: 0;
}
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked {
background-color: #fff;
border: 0;
}
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table {
display: inline-block !important;
}
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable input[type=email] {
box-sizing: border-box;
width: 100%;
padding: 10px;
}
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable textarea {
box-sizing: border-box;
width: 100%;
max-width: 100% !important;
padding: 10px;
}
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable .category > div {
max-height: 60px;
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title {
cursor: pointer;
display: flex;
justify-content: space-between;
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow {
font-family: "Font Awesome 5 Free";
font-weight: 700;
font-size: 18px;
padding-left: 10px;
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before {
content: "";
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before {
content: "";
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_result {
display: none;
margin: 0px 30px 0 10px;
font-size: 13px;
color: #999;
line-height: 20px;
font-weight: 500;
}
.spremenljivka.tip_17 select {
padding: 8px 12px;
margin-right: 15px;

152
resources/sass/main/main/content.scss
View File

@ -230,7 +230,7 @@
&.tip_16,
&.tip_19,
&.tip_20,
&.tip_24{
&.tip_24{
input[type="text"], textarea, select {
padding: 5px 7px;
@ -282,6 +282,156 @@
table.dynamicmultigrid tbody tr:nth-child(2n+1) {
background-color: #ffffff !important;
}
.grid_mobile{
.grid_mobile_question{
margin: 10px 0 15px;
/*line-height: 24px;*/
.grid_mobile_title{
padding: 7px 9px;
font-weight: 500;
}
.grid_mobile_variables{
width: 100%;
box-sizing: border-box;
.grid_mobile_variable{
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 7px 9px;
margin: 2px 0;
color: #333333;
border: 1px #fff solid;
border-radius: 3px;
label{
vertical-align: baseline;
}
.grid_mobile_variable_title{
}
}
}
.grid_mobile_double_subtitle{
padding: 5px 8px;
}
}
}
.grid_mobile.checkbox,
.grid_mobile.radio{
.grid_mobile_variable{
&:hover,
&.checked{
background-color: #efefef;
border: 1px #E2E2E2 solid;
}
}
}
.grid_mobile.radio.visual_scale,
.grid_mobile.radio.smiley_scale{
.grid_mobile_variables{
//width: auto !important;
.grid_mobile_variable{
display: inline-block;
//width: auto !important;
border: 0;
&:hover,
&.checked{
background-color: #fff;
border: 0;
}
.visual-radio-table,
.custom-radio-table{
display: inline-block !important;
}
}
}
}
.grid_mobile.text,
.grid_mobile.number{
.grid_mobile_variable{
input[type="text"],
input[type="email"]{
box-sizing: border-box;
width: 100%;
padding: 10px;
}
textarea{
box-sizing: border-box;
width: 100%;
max-width: 100% !important;
padding: 10px;
}
.category > div{
max-height: 60px;
}
}
}
/* Mobilno rzpiranje tabel */
.grid_mobile.mobile_expanding{
.grid_mobile_title{
cursor: pointer;
display: flex;
justify-content: space-between;
.faicon.mobile_expanding_arrow{
font-family: $fontawesome;
font-weight: 700;
font-size: 18px;
padding-left: 10px;
&.arrow_down::before{
content: "\f078";
}
&.arrow_up::before{
content: "\f077";
}
}
}
.grid_mobile_result{
display: none;
margin: 0px 30px 0 10px;
font-size: 13px;
color: #999;
line-height: 20px;
font-weight: 500;
}
}
}
/* END TIP TABELA */

4
sql/update2.sql
View File

@ -9656,3 +9656,7 @@ CREATE TABLE IF NOT EXISTS srv_spremenljivka_deleted (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
UPDATE misc SET value='22.08.05' WHERE what="version";
INSERT INTO srv_misc (what, value) VALUES ('pc_tables', '1');
UPDATE misc SET value='22.08.25' WHERE what="version";