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

Redesign - popravki urejanja vprasalnika

Browse Source
This commit is contained in:
pero1203 2022-04-20 11:51:03 +02:00
parent 8678e8856d
commit 4bf5fa27a9
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
admin/survey/Branching.php
View File

@ -2424,14 +2424,6 @@ class Branching {
echo '<div id="spremenljivka_contentdiv' . $spremenljivka . '" class="content_div_normalmode">';
if ( in_array($row['tip'], array(1,2,6,16,19,20)) ) {
if ($row['enota'] != 10 && $row['orientation'] != 10){
echo '<div class="add-variable tip_'.$row['tip'].'"><a href="#" onclick="vprasanje_fullscreen(\''.$spremenljivka.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add"></span> '.$lang['srv_novavrednost'].'</a></div>';
MobileSurveyAdmin::displayAddQuestionCategory($this->anketa, $spremenljivka, $row['tip']);
}
}
// kalkulacija
if ($row['tip'] == 22) {
echo '<div class="naslov '.($row['orientation']==0?'floatLeft':'').' calculation">';
@ -3025,7 +3017,8 @@ class Branching {
echo '</div>';
}
}
// multigrid, multicheckbox, multitext, multinumber prikaz
// multigrid, multicheckbox, multitext, multinumber prikaz
elseif ($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20 || $row['tip'] == 24) {
$spremenljivkaParams = new enkaParameters($row['params']);
@ -4723,8 +4716,11 @@ class Branching {
//ce je drsnik in moramo urediti opisne labele - konec ##################################################
}
// textbox -- not any more
} elseif ($row['tip'] == 4) {
// textbox -- not any more
}
elseif ($row['tip'] == 4) {
$taSize = ($spremenljivkaParams->get('taSize') ? $spremenljivkaParams->get('taSize') : 1);
$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
@ -5827,22 +5823,31 @@ class Branching {
elseif( ($row['tip'] == 27)){ //Heatmap
$this->vprasanje_heatmap($row['id'], $row['tip']);
}
//echo '<div id="clr" class="clr"></div>';
echo '</div>';
if ($row['orientation']==0 || $row['orientation']==2 || $row['tip'] == 17) echo '<div class="clr"></div>'; // kjer so vsi divi floatani, da se raztegne okvir vprasanja
// Add variable - hover
if ( in_array($row['tip'], array(1,2,6,16,19,20)) ) {
if ($row['enota'] != 10 && $row['orientation'] != 10){
echo '<div class="add-variable tip_'.$row['tip'].'"><a href="#" class="noline" onclick="vprasanje_fullscreen(\''.$spremenljivka.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add"></span>'.$lang['srv_novavrednost'].'</a></div>';
MobileSurveyAdmin::displayAddQuestionCategory($this->anketa, $spremenljivka, $row['tip']);
}
}
// kjer so vsi divi floatani, da se raztegne okvir vprasanja
if ($row['orientation']==0 || $row['orientation']==2 || $row['tip'] == 17)
echo '<div class="clr"></div>';
echo '</div><!-- end:variable_holder -->';
//echo ' </div>';
if ($this->displayKomentarji !== false) {
$this->vprasanje_komentarji($spremenljivka);
}
echo ' </div> <!-- spremenljivka_content_' . $spremenljivka . ' -->';
echo ' </div> <!-- spremenljivka_content_' . $spremenljivka . ' -->';
}
function vprasanje_grid_multiple ($spremenljivka) {
@ -6102,7 +6107,6 @@ class Branching {
echo ' <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="checkbox" class="enka-admin-custom" name="foo_' . $row1['id'] . '" value="" /><span class="enka-checkbox-radio"></span></td>';
} else {
echo ' <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="radio" class="enka-admin-custom" name="foo_' . $row1['id'] . '" value="" /><span class="enka-checkbox-radio"></span></td>';
// echo ' <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="text" style="width: 90%;" name="foo_' . $row1['id'] . '" value="" /></td>';
}
}

4
public/css/admin_new.css
View File

@ -14004,7 +14004,7 @@ div.spr .spremenljivka_content .content_div_normalmode .variable_holder .enka-ch
div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .enka-checkbox-radio:before,
.jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .enka-checkbox-radio:before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .enka-checkbox-radio:before {
margin-right: 16px;
margin-right: 8px;
padding: 0 !important;
letter-spacing: 0 !important;
}
@ -14105,9 +14105,11 @@ div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .varia
.jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .variable_inline,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .variable_inline {
display: none;
width: 40px;
box-sizing: border-box;
margin-right: 4px;
padding: 4px 6px;
text-align: center;
font-size: 14px;
font-weight: bold;
}

4
resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
View File

@ -287,7 +287,7 @@ div.spr,
.enka-checkbox-radio{
&:before{
margin-right: 16px;
margin-right: 8px;
padding: 0 !important;
letter-spacing: 0 !important;
}
@ -342,10 +342,12 @@ div.spr,
.variable_inline {
display: none;
width: 40px;
box-sizing: border-box;
margin-right: 4px;
padding: 4px 6px;
text-align: center;
font-size: 14px;
font-weight: bold;
}