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

Redesign - popravki urejanja kombinirane tabele (popupi), manjsi popravki knjiznice, textov

Browse Source
This commit is contained in:
pero1203 2022-11-03 11:44:42 +01:00
parent 09486b79d9
commit 2b15207533
6 changed files with 290 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/survey/BranchingAjax.php
View File

@ -694,11 +694,12 @@ class BranchingAjax {
echo '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
echo '<p>'.$lang['if_delete_data'].'</p>';
echo '<p>'.$lang['srv_brisiifconfirm_all'].'</p><br />';
echo '<p class="top16">'.$lang['srv_brisiifconfirm_all'].'</p>';
echo '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;"><span>'.$lang['srv_if_rem_all'].'</span></a></span>';
echo '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
//echo '<p><a href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;">'.$lang['srv_if_rem_all'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
echo '<div class="button_holder">';
echo ' <button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
echo ' <button class="medium blue" onclick="if_remove(\''.$if.'\', \'1\'); return false;">'.$lang['srv_if_rem_all'].'</button>';
echo '</div>';
return;
}

6
admin/survey/classes/class.LibraryBranching.php
View File

@ -540,6 +540,9 @@ class LibraryBranching {
echo ' <span class="faicon '.$icon.'"></span>';
echo ' <span class="title">'.$type_string.substr(strip_tags($if['label']), 0, 40).'</span>';
echo '<div class="right_icons">';
// Urejanje Vprasanja
if($this->tab == '0' && ($if['folder_uid'] == $global_user_id || $admin_type == 0)){
@ -555,6 +558,9 @@ class LibraryBranching {
echo ' </div>';
}
echo '</div>';
echo ' </div>';
echo '</div>';

245
admin/survey/classes/class.Vprasanje.php
View File

@ -7895,15 +7895,50 @@ class Vprasanje {
function ajax_grid_multiple_add () {
global $lang;
echo '<p><b>'.$lang['srv_gridmultiple_choose'].'</b></p>';
echo '<div class="popup_close"><a href="#" onClick="vrednost_cancel(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_gridmultiple_choose'].'</h2>';
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'6\');"><span class="sprites radio3"></span> '.$lang['srv_vprasanje_tip_1'].'</label></p>';
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'16\');"><span class="sprites checkbox3"></span> '.$lang['srv_vprasanje_tip_2'].'</label></p>';
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\');"><span class="sprites text"></span> '.$lang['srv_vprasanje_tip_21'].'</label></p>';
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'20\');"><span class="sprites text"></span> '.$lang['srv_vprasanje_tip_7'].'</label></p>';
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\', \'1\');"><span class="sprites text"></span> '.$lang['srv_vprasanje_datum'].'</label></p>';
echo '<a onclick="$(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#" style="position:absolute; right:10px; bottom:10px">'.$lang['srv_zapri'].'</a>';
echo '<div class="setting_holder multitable_answer_type">';
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'6\');">';
echo ' <span class="faicon radio_32"></span>';
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_1'].'</span>';
echo ' </div>';
echo '</div>';
echo '<div class="setting_holder multitable_answer_type">';
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'16\');">';
echo ' <span class="faicon check_32"></span>';
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_2'].'</span>';
echo ' </div>';
echo '</div>';
echo '<div class="setting_holder multitable_answer_type">';
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\');">';
echo ' <span class="faicon abc_32"></span>';
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_21'].'</span>';
echo ' </div>';
echo '</div>';
echo '<div class="setting_holder multitable_answer_type">';
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'20\');">';
echo ' <span class="faicon number_32"></span>';
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_7'].'</span>';
echo ' </div>';
echo '</div>';
echo '<div class="setting_holder multitable_answer_type">';
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\', \'1\');">';
echo ' <span class="faicon calendar_icon"></span>';
echo ' <span class="item_text">'.$lang['srv_vprasanje_datum'].'</span>';
echo ' </div>';
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="medium blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>';
}
function ajax_grid_multiple_addnew () {
@ -7959,59 +7994,71 @@ class Vprasanje {
$row = Cache::srv_spremenljivka($this->spremenljivka);
$spremenljivkaParams = new enkaParameters($row['params']);
echo '<p><b>'.$lang['srv_analiza_opisne_subquestion'].'</b></p>';
echo '<div class="popup_close"><a href="#" onClick="vrednost_cancel(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_analiza_opisne_subquestion'].'</h2>';
echo '<p><span class="title">'.$lang['srv_odgovorov'].':</span> ';
echo '<span class="content"><select name="multi_grids_count" id="multi_grids_count" onChange="change_selectbox_size(\'' . $row['id'] . '\', $(this).val(), \'' . $lang['srv_select_box_vse'] . '\');">';
//echo '<span class="content"><select name="multi_grids_count" id="multi_grids_count" onchange="">';
// Vedno imamo najmanj 2 grida (drugace so stvari cudne v analizah) - namesto 1 se uporabi navaden radio tip vprasanja
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_odgovorov'].':</span>';
// Vedno imamo najmanj 2 grida (drugace so stvari cudne v analizah) - namesto 1 se uporabi navaden radio tip vprasanja
// Pri number sliderju se rabi 1 (mogoče še kje - npr checkbox itd.... ) analize morajo delati tudi v tem primeru :P
echo ' <select name="multi_grids_count" id="multi_grids_count" class="dropdown medium w200" onChange="change_selectbox_size(\'' . $row['id'] . '\', $(this).val(), \'' . $lang['srv_select_box_vse'] . '\');">';
for ($i=1; $i<=20; $i++)
echo '<option value="'.$i.'"'.($row['grids']==$i?' selected':'').'>'.$i.'</option>';
echo '</select></span>';
echo '</p>';
echo ' </select>';
echo '</div>';
if ($row['tip'] == 6) {
echo '<p><span class="title">'.$lang['srv_orientacija'].': </span>';
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value);">';
echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota">';
echo '<option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
echo '<option value="2" '.(($row['enota'] == 2) ? ' selected="true" ' : '').'>'.$lang['srv_dropdown'].'</option>';
echo '<option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_radio'].'</option>';
echo '</select>';
echo '</span></p>';
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_orientacija'].':</span>';
echo ' <select id="spremenljivka_podtip" class="dropdown medium w200" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
echo ' <option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
echo ' <option value="2" '.(($row['enota'] == 2) ? ' selected="true" ' : '').'>'.$lang['srv_dropdown'].'</option>';
echo ' <option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_radio'].'</option>';
echo ' </select>';
echo '</div>';
$this->edit_selectbox_size ();
}
if ($row['tip'] == 16) {
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_orientacija'].':</span>';
echo '<p><span class="title">'.$lang['srv_orientacija'].': </span>';
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota">';
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value);">';
echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
echo '<option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
echo '<option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_check'].'</option>';
echo '</select>';
echo '</span></p>';
echo ' <select id="spremenljivka_podtip" class="dropdown medium w200" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
echo ' <option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
echo ' <option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_check'].'</option>';
echo ' </select>';
echo '</div>';
$this->edit_selectbox_size ();
}
if ($row['tip'] == 19) {
echo '<p>';
// Sirina polja
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_textAreaWidth'].':</span>';
$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
$taHeight = ($spremenljivkaParams->get('taHeight') ? $spremenljivkaParams->get('taHeight') : 1);
// Sirina polja
echo $lang['srv_textAreaWidth'].': ';
$size = $row['grids'];
$missing_count = 0;
# če imamo missinge size povečamo za 1 + številomissingov
@ -8021,92 +8068,94 @@ class Vprasanje {
$size += $missing_count + 1;
}
echo '<select name="taWidth" id="multi_taWidth">';
$maxWidth = round(50 / $size);
$maxWidth = round(50 / $size);
$maxWidth = 10;
echo '<option value="-1"' . ($taWidth == -1 ? ' selected="true"' : '') . '>'.$lang['default'].'</option>';
echo ' <select name="taWidth" id="multi_taWidth" class="dropdown medium w200">';
echo ' <option value="-1"' . ($taWidth == -1 ? ' selected="true"' : '') . '>'.$lang['default'].'</option>';
for($i=1; $i<$maxWidth; $i++){
echo '<option value="'.$i.'"' . ($taWidth == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
echo ' <option value="'.$i.'"' . ($taWidth == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
}
echo '</select>';
echo ' </select>';
echo '</div>';
// Visina polja
echo '<span class="spaceLeft">'.$lang['srv_textAreaHeight'].': <select name="taHeight" id="multi_taHeight">';
$maxHeight = 10;
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_textAreaHeight'].':</span>';
$maxHeight = 10;
echo ' <select name="taHeight" id="multi_taHeight" class="dropdown medium w200">';
for($i=1; $i<=$maxHeight; $i++){
echo '<option value="'.$i.'"' . ($taHeight == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
echo ' <option value="'.$i.'"' . ($taHeight == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
}
echo '</select></span>';
echo ' </select>';
echo '</p>';
echo '</div>';
}
if ($row['tip'] == 20) {
echo '<fieldset><legend>'.$lang['srv_num_limits'].'</legend>';
echo '<div class="setting_holder multitable_setting">';
$this->edit_number();
echo '</fieldset>';
echo '</div>';
}
// Prikaz podtabele glede na tip respondenta (admin, manager...)
echo '<p>';
echo '<span class="title">'.$lang['srv_visible_dostop'].': </span>';
echo '<span class="content"><select name="dostop" id="spremenljivka_dostop">';
echo '<option value="4"'.($row['dostop']==4?' selected':'').'>'.$lang['see_everybody'].'</option>';
echo '<option value="3"'.($row['dostop']==3?' selected':'').'>'.$lang['see_registered'].'</option>';
echo '<option value="2"'.($row['dostop']==2?' selected':'').'>'.$lang['see_member'].'</option>';
echo '<option value="1"'.($row['dostop']==1?' selected':'').'>'.$lang['see_manager'].'</option>';
echo '<option value="0"'.($row['dostop']==0?' selected':'').'>'.$lang['see_admin'].'</option>';
echo '</select></span>';
echo '</p>';
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_visible_dostop'].':</span>';
echo ' <select name="dostop" id="spremenljivka_dostop" class="dropdown medium w200">';
echo ' <option value="4"'.($row['dostop']==4?' selected':'').'>'.$lang['see_everybody'].'</option>';
echo ' <option value="3"'.($row['dostop']==3?' selected':'').'>'.$lang['see_registered'].'</option>';
echo ' <option value="2"'.($row['dostop']==2?' selected':'').'>'.$lang['see_member'].'</option>';
echo ' <option value="1"'.($row['dostop']==1?' selected':'').'>'.$lang['see_manager'].'</option>';
echo ' <option value="0"'.($row['dostop']==0?' selected':'').'>'.$lang['see_admin'].'</option>';
echo ' </select>';
echo '</div>';
// Ce imamo datum
if ($row['tip'] == 19){
$is_datum = $spremenljivkaParams->get('multigrid-datum');
if ($is_datum == 1)
if ($is_datum == 1){
echo '<div class="setting_holder multitable_setting">';
$this->edit_date_range();
echo '</div>';
}
}
// Sirina stolpca
echo '<div class="setting_holder multitable_setting">';
echo ' <span class="setting_title">'.$lang['srv_gridmultiple_width'].':</span>';
$grid_width = $spremenljivkaParams->get('gridmultiple_width');
echo '<p>';
echo '<span class="title">'.$lang['srv_gridmultiple_width'].': </span>';
echo '<span class="content"><select name="gridmultiple_width" id="gridmultiple_width">';
echo '<option value="0"'.($grid_width==0?' selected':'').'>'.$lang['default'].'</option>';
echo '<option value="10"'.($grid_width==10?' selected':'').'>10%</option>';
echo '<option value="20"'.($grid_width==20?' selected':'').'>20%</option>';
echo '<option value="30"'.($grid_width==30?' selected':'').'>30%</option>';
echo '<option value="40"'.($grid_width==40?' selected':'').'>40%</option>';
echo '<option value="50"'.($grid_width==50?' selected':'').'>50%</option>';
echo '<option value="60"'.($grid_width==60?' selected':'').'>60%</option>';
echo '</select></span>';
echo '</p>';
echo '<br />';
echo '<span class="buttonwrapper spaceLeft floatRight">
<a class="ovalbutton ovalbutton_orange" onclick="grid_multiple_save(\''.$this->spremenljivka.'\'); $(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#">
<span>'.$lang['srv_potrdi'].'</span>
</a>
</span>';
echo '<span class="buttonwrapper spaceLeft floatRight">
<a class="ovalbutton ovalbutton_gray" onclick="$(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#">
<span>'.$lang['srv_zapri'].'</span>
</a>
</span>';
echo '<span class="buttonwrapper spaceLeft floatRight">
<a class="ovalbutton ovalbutton_gray" onclick="brisi_spremenljivko(\''.$this->spremenljivka.'\', undefined, \'0\'); $(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#">
<span>'.$lang['srv_brisispremenljivko'].'</span>
</a>
</span>';
echo ' <select name="gridmultiple_width" id="gridmultiple_width" class="dropdown medium w200">';
echo ' <option value="0"'.($grid_width==0?' selected':'').'>'.$lang['default'].'</option>';
echo ' <option value="10"'.($grid_width==10?' selected':'').'>10%</option>';
echo ' <option value="20"'.($grid_width==20?' selected':'').'>20%</option>';
echo ' <option value="30"'.($grid_width==30?' selected':'').'>30%</option>';
echo ' <option value="40"'.($grid_width==40?' selected':'').'>40%</option>';
echo ' <option value="50"'.($grid_width==50?' selected':'').'>50%</option>';
echo ' <option value="60"'.($grid_width==60?' selected':'').'>60%</option>';
echo ' </select>';
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="medium white-blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_zapri'].'</button>';
echo ' <button class="medium white-blue" onclick="brisi_spremenljivko(\''.$this->spremenljivka.'\', undefined, \'0\'); vrednost_cancel(); return false;">'.$lang['srv_brisispremenljivko'].'</button>';
echo ' <button class="medium blue" onclick="grid_multiple_save(\''.$this->spremenljivka.'\'); vrednost_cancel(); return false;">'.$lang['srv_potrdi'].'</button>';
echo '</div>';
}
/**

2
lang/1.php
View File

@ -1888,7 +1888,7 @@ $lang = array (
"srv_show_intro_static_0" => "Ne",
"srv_show_intro_static_1" => "Da",
"srv_show_intro_static_2" => "Captcha",
"srv_show_concl" => "Prikaži zakljućek",
"srv_show_concl" => "Prikaži zaključek",
"srv_editirajspremenljivko" => "Uredi vprašanje",
"srv_chart_editirajspremenljivko" => "Napredne nastavitve",
"srv_movespremenljivko" => "Premakni",

97
public/css/admin_new.css
View File

@ -8034,7 +8034,7 @@ div#time_profile_content .setting_holder .setting_item input.text {
div#time_profile_content .setting_holder .setting_item span.faicon {
margin-right: 16px;
}
div#time_profile_content .setting_holder .setting_item select.dropdown {
div#time_profile_content .setting_holder .setting_item select.dropdown, div#time_profile_content #vrednost_edit .setting_holder.multitable_setting .setting_item .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit div#time_profile_content .setting_holder.multitable_setting .setting_item .vprasanje_setting_holder .vprasanje_setting_line select, div#time_profile_content #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .setting_item select, #vrednost_edit div#time_profile_content .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .setting_item select {
margin-left: 4px;
width: 130px;
}
@ -8161,7 +8161,7 @@ div#div_analiza_archive_name .setting_holder .setting_item.indent {
div#div_analiza_archive_name .setting_holder .setting_item.indent input.text {
margin-left: 4px;
}
div#div_analiza_archive_name .setting_holder .setting_item input.text.medium {
div#div_analiza_archive_name .setting_holder .setting_item input.text.medium, div#div_analiza_archive_name #vrednost_edit .setting_holder.multitable_setting .setting_item .vprasanje_setting_holder .vprasanje_setting_line input.text[type=number], #vrednost_edit div#div_analiza_archive_name .setting_holder.multitable_setting .setting_item .vprasanje_setting_holder .vprasanje_setting_line input.text[type=number], div#div_analiza_archive_name #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .setting_item input.text[type=number], #vrednost_edit div#div_analiza_archive_name .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .setting_item input.text[type=number] {
width: 40% !important;
margin-left: 4px;
margin-right: 4px;
@ -9755,7 +9755,7 @@ input[type=text], input[type=email], input[type=password], input[type=number] {
margin-top: 4px;
font-family: Source Sans Pro, sans-serif;
}
input[type=text].w200, input[type=email].w200, input[type=password].w200, input[type=number].w200 {
input[type=text].w200, input[type=email].w200, input[type=password].w200, input[type=number].w200, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line input[type=number] {
width: 200px;
}
input[type=text].w300, input[type=email].w300, input[type=password].w300, input[type=number].w300 {
@ -9772,7 +9772,7 @@ input[type=text].large, input[type=email].large, input[type=password].large, inp
font-size: 16px;
padding: 9px 7px;
}
input[type=text].medium, input[type=email].medium, input[type=password].medium, input[type=number].medium {
input[type=text].medium, input[type=email].medium, input[type=password].medium, input[type=number].medium, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line input[type=number] {
height: 32px;
font-size: 14px;
padding: 6px 7px;
@ -9952,7 +9952,7 @@ select, option {
font-family: Source Sans Pro, sans-serif;
}
select.dropdown {
select.dropdown, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select {
border: 1px solid #C4C4C4;
box-sizing: border-box;
border-radius: 2px;
@ -9961,63 +9961,63 @@ select.dropdown {
margin-top: 4px;
background-color: #FFFFFF;
}
select.dropdown option {
select.dropdown option, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select option {
color: #333333;
}
select.dropdown option:disabled {
select.dropdown option:disabled, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select option:disabled {
color: #A0A0A0;
}
select.dropdown.large {
select.dropdown.large, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.large {
width: 229px;
height: 40px;
font-size: 16px;
padding: 9px 7px;
}
select.dropdown.large option {
select.dropdown.large option, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.large option {
font-size: 16px;
line-height: 20px;
padding: 0;
}
select.dropdown.medium {
select.dropdown.medium, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select {
width: 229px;
height: 32px;
font-size: 14px;
padding: 6px 7px;
}
select.dropdown.medium option {
select.dropdown.medium option, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select option {
font-size: 14px;
line-height: 18px;
}
select.dropdown.small {
select.dropdown.small, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.small {
width: 229px;
height: 26px;
font-size: 14px;
padding: 3px 7px;
}
select.dropdown.small option {
select.dropdown.small option, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.small option {
font-size: 14px;
line-height: 18px;
}
select.dropdown.w200 {
select.dropdown.w200, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select {
width: 200px;
}
select.dropdown.w400 {
select.dropdown.w400, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.w400 {
width: 400px;
}
select.dropdown.w130 {
select.dropdown.w130, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.w130 {
width: 130px;
}
select.dropdown.inline {
select.dropdown.inline, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.inline {
margin-left: 16px;
margin-top: 0;
}
select.dropdown:focus {
select.dropdown:focus, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select:focus {
outline-style: none;
box-shadow: none;
border-color: transparent;
border-color: #1E88E5;
}
select.dropdown.disabled {
select.dropdown.disabled, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select.disabled {
border-color: #C4C4C4;
background-color: #E5E5E5;
color: #777777;
@ -11867,8 +11867,10 @@ div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.hor
flex-direction: column;
margin-bottom: 0;
}
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder select.dropdown,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder select.dropdown {
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder select.dropdown, div.subpage_uporabniki .users_list_box #new_user_option #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit div.subpage_uporabniki .users_list_box #new_user_option .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select,
div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder select.dropdown,
div.subpage_uporabniki .users_list_box #existing_user_option #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select,
#vrednost_edit div.subpage_uporabniki .users_list_box #existing_user_option .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select {
width: 500px;
}
div.subpage_uporabniki .users_list_box #new_user_option .setting_holder p.bottom4,
@ -12882,7 +12884,7 @@ and open the template in the editor.
#new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder input[type=text] {
width: 332px;
}
#new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder select.dropdown {
#new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder select.dropdown, #new_anketa_div .layout_right_item .layout_right_centering .fieldset #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit #new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select {
width: 332px;
}
#new_anketa_div .layout_right_item .layout_right_centering .fieldset .setting_holder span.charalimit {
@ -13421,7 +13423,7 @@ div.page_ustvari_anketo {
margin-left: 16px;
font-size: 14px;
}
.dashboard_top_settings .dashboard_top_filters .filter_setting select.dropdown {
.dashboard_top_settings .dashboard_top_filters .filter_setting select.dropdown, .dashboard_top_settings .dashboard_top_filters .filter_setting #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .dashboard_top_settings .dashboard_top_filters .filter_setting select {
width: auto;
margin: 0 0 0 8px;
}
@ -13482,7 +13484,7 @@ div.page_ustvari_anketo {
.dashboard_boxes .dashboard_box .box_top_settings label {
font-size: 14px;
}
.dashboard_boxes .dashboard_box .box_top_settings select.dropdown {
.dashboard_boxes .dashboard_box .box_top_settings select.dropdown, .dashboard_boxes .dashboard_box .box_top_settings #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .dashboard_boxes .dashboard_box .box_top_settings select {
width: auto;
margin: 0 0 0 8px;
}
@ -13582,7 +13584,7 @@ div.page_ustvari_anketo {
.dashboard_boxes .dashboard_box#div_statistic_referals #referal_detail table tr td:first-child {
width: 90px;
}
.dashboard_boxes .dashboard_box#div_statistic_visit .box_top_settings > div select.dropdown {
.dashboard_boxes .dashboard_box#div_statistic_visit .box_top_settings > div select.dropdown, .dashboard_boxes .dashboard_box#div_statistic_visit .box_top_settings > div #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line .dashboard_boxes .dashboard_box#div_statistic_visit .box_top_settings > div select {
width: 130px;
}
.dashboard_boxes .dashboard_box#div_statistic_visit .box_top_settings:nth-child(3) {
@ -21948,7 +21950,7 @@ fieldset.comments div.setting_holder.horizontal .setting_title {
fieldset.comments div.setting_holder.horizontal .setting_item {
margin-top: 0;
}
fieldset.comments div.setting_holder.horizontal .setting_item .dropdown {
fieldset.comments div.setting_holder.horizontal .setting_item .dropdown, fieldset.comments div.setting_holder.horizontal .setting_item #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line fieldset.comments div.setting_holder.horizontal .setting_item select {
margin-top: 0;
margin-right: 32px;
width: 210px;
@ -22222,7 +22224,44 @@ span.faicon.st-besede-popup {
width: 99%;
height: 60px;
}
#vrednost_edit .setting_holder.multitable_answer_type .item {
cursor: pointer;
position: relative;
box-sizing: border-box;
width: 300px;
height: 45px;
font-size: 16px;
font-weight: 500;
text-align: center;
background-color: #f5fafe;
border: 1px #dfeffb solid;
transition: 0.2s;
}
#vrednost_edit .setting_holder.multitable_answer_type .item:hover {
background-color: #dfeffb;
border: 1px #c8e3f8 solid;
}
#vrednost_edit .setting_holder.multitable_answer_type .item .faicon {
position: absolute;
left: 20px;
line-height: 42px;
}
#vrednost_edit .setting_holder.multitable_answer_type .item .item_text {
line-height: 42px;
}
#vrednost_edit .setting_holder.multitable_setting:last-child {
margin-bottom: 32px;
}
#vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder {
margin-bottom: 16px;
}
#vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder:last-child {
margin-bottom: 0;
}
#vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line {
display: flex;
flex-direction: column;
}
/* Calculation edit */
#calculation,
#quota {
@ -28373,7 +28412,7 @@ div.subpage_coding #coding fieldset div.variable_name div.osnovno p.faicon, div.
div.subpage_coding #coding fieldset div.variable_name div.urejanje {
font-size: 14px !important;
}
div.subpage_coding #coding fieldset div.variable_name div.urejanje select.dropdown {
div.subpage_coding #coding fieldset div.variable_name div.urejanje select.dropdown, div.subpage_coding #coding fieldset div.variable_name div.urejanje #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line div.subpage_coding #coding fieldset div.variable_name div.urejanje select {
margin: 0 16px 0 8px !important;
width: 140px;
}
@ -28394,7 +28433,7 @@ div.subpage_coding #coding fieldset div.variable_content div.setting_holder.hori
div.subpage_coding #coding fieldset div.variable_content div.setting_holder.horizontal div.setting_item label {
font-size: 14px;
}
div.subpage_coding #coding fieldset div.variable_content div.setting_holder.horizontal select.dropdown {
div.subpage_coding #coding fieldset div.variable_content div.setting_holder.horizontal select.dropdown, div.subpage_coding #coding fieldset div.variable_content div.setting_holder.horizontal #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line select, #vrednost_edit .setting_holder.multitable_setting .vprasanje_setting_holder .vprasanje_setting_line div.subpage_coding #coding fieldset div.variable_content div.setting_holder.horizontal select {
margin: 0;
}
div.subpage_coding #coding fieldset div.variable_content input.text {

63
resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss
View File

@ -25,6 +25,69 @@
width: 99%;
height: 60px;
}
// Kombinirana tabela
.setting_holder.multitable_answer_type{
.item{
cursor: pointer;
position: relative;
box-sizing: border-box;
width: 300px;
height: 45px;
font-size: 16px;
font-weight: 500;
text-align: center;
background-color: #f5fafe;
border: 1px #dfeffb solid;
transition: 0.2s;
&:hover{
background-color: #dfeffb;
border: 1px #c8e3f8 solid;
}
.faicon{
position: absolute;
left: 20px;
line-height: 42px;
}
.item_text{
line-height: 42px;
}
}
}
.setting_holder.multitable_setting{
.vprasanje_setting_holder{
margin-bottom: 16px;
&:last-child{
margin-bottom: 0;
}
.vprasanje_setting_line{
display: flex;
flex-direction: column;
select{
@extend .dropdown;
@extend .medium;
@extend .w200;
}
input[type="number"]{
@extend .medium;
@extend .w200;
}
}
}
}
}