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

Redesign - manjsi popravki urejanja vprasalnika

Browse Source
This commit is contained in:
pero1203 2022-04-21 14:39:51 +02:00
parent 857400f6b2
commit 49ad6b047e
5 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
admin/survey/Branching.php
View File

@ -4570,17 +4570,18 @@ class Branching {
</script>
<?
}
//Zadnja bela celica kjer se nahajajo ikone za mouseover, ko je slider
if($slider_VmesneDescrLabel){
$mouseOverStyle = '';
}else{
}
else{
$mouseOverStyle = 'style="min-width:80px;"';
}
echo '<td class="white" '.$mouseOverStyle.'></td>';
//echo ' </tr>';
//Zadnja bela celica kjer se nahajajo ikone za mouseover, ko je slider - konec
}else{
echo '<td class="white" '.$mouseOverStyle.'></td>';
}
else{
echo ' <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="text" style="width:'.$taWidth.'em;" name="foo_' . $row1['id'] . '" value="" />';
}
@ -5072,10 +5073,8 @@ class Branching {
</script>
<?
}
echo '<br />';
echo '<br />';
echo '<br />';
//tabela za labele podrocij in podrocja
echo '<table '.$display_labele_podrocij.' style="width:85%">';
@ -5270,7 +5269,7 @@ class Branching {
// n=k
if ($row['design'] == 2) {
echo '<div id="half_' . $row['podpora'] . '" class="dropzone '.($this->lang_id==null?'allow_new':'').'" style="min-height:' . $size . 'px;">';
echo '<div id="half_' . $row['podpora'] . '" class="dropzone '.($this->lang_id==null?'allow_new':'').'">';
while ($row1 = mysqli_fetch_array($sql1)) {
@ -5330,7 +5329,7 @@ class Branching {
elseif ($row['design'] == 0) {
//zaslon razdelimo na dva dela - izris leve strani
echo '<div id="half" class="dropzone '.($this->lang_id==null ? 'allow_new' : '').'" style="min-height:'.$size.'px;">';
echo '<div id="half" class="dropzone '.($this->lang_id==null ? 'allow_new' : '').'">';
while ($row1 = mysqli_fetch_array($sql1)) {
@ -5387,7 +5386,7 @@ class Branching {
// izris desne strani
echo '<div id="half2" class="dropzone" style="min-height:'.$size.'px;">';
echo '<div id="half2" class="dropzone">';
if($row['ranking_k'] == 0)
$max = mysqli_num_rows($sql1);
@ -6120,7 +6119,6 @@ class Branching {
echo ' </tbody>';
echo ' </table>';
}

34
public/css/admin_new.css
View File

@ -15365,6 +15365,21 @@ div.div.jezik_row.tip_21.spr_tip_7 .variable_holder .calendar_icon:before,
div.div.jezik_row.tip_21.spr_tip_8 .variable_holder .calendar_icon:before {
color: #1E88E5;
}
li.spr_tip_4.spr_tip_8 .variable_holder .variabla input,
li.spr_tip_7.spr_tip_8 .variable_holder .variabla input,
li.spr_tip_8.spr_tip_8 .variable_holder .variabla input,
li.spr_tip_21.spr_tip_8 .variable_holder .variabla input,
div.spr_tip_4.spr_tip_8 .variable_holder .variabla input,
div.spr_tip_7.spr_tip_8 .variable_holder .variabla input,
div.spr_tip_8.spr_tip_8 .variable_holder .variabla input,
div.spr_tip_21.spr_tip_8 .variable_holder .variabla input,
div.div.jezik_row.tip_4.spr_tip_8 .variable_holder .variabla input,
div.div.jezik_row.tip_7.spr_tip_8 .variable_holder .variabla input,
div.div.jezik_row.tip_8.spr_tip_8 .variable_holder .variabla input,
div.div.jezik_row.tip_21.spr_tip_8 .variable_holder .variabla input {
width: 160px;
padding: 6px 8px;
}
/*
Tabele v urejanju vprasanja - vrednosti pri tabelah
@ -16658,7 +16673,7 @@ and open the template in the editor.
box-sizing: border-box;
width: 150px;
margin-left: 8px;
padding: 12px 8px;
padding: 6px 8px;
color: #a9a9a9;
border: 1px solid #E5E5E5;
border-radius: 4px;
@ -16669,6 +16684,11 @@ and open the template in the editor.
}
.variabla_vsota .variabla_vsota_inline {
word-break: break-all;
box-sizing: border-box;
flex-grow: 1;
padding: 4px 6px;
margin-left: 15px;
font-size: 14px;
}
/* Zadnja vrsticas pri urejanju vsote - "skupaj" */
@ -16901,12 +16921,17 @@ div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half .variabla {
margin-bottom: 16px;
}
li.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla:last-child,
div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla:last-child,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half .variabla:last-child {
margin-bottom: 0;
}
li.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla .ranking,
div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla .ranking,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half .variabla .ranking {
overflow: hidden;
box-sizing: border-box;
flex-grow: 0;
flex-grow: 1;
width: calc(100% - 120px);
max-width: 250px;
min-height: 36px;
@ -16968,6 +16993,11 @@ div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_f
border: 1px dashed #E5E5E5;
border-radius: 4px;
}
li.spr_tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_frame:last-child,
div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_frame:last-child,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_frame:last-child {
margin-bottom: 0;
}
li.spr_tip_17 .variable_holder .ranking_holder.design_1 .icons_holder,
div.spr_tip_17 .variable_holder .ranking_holder.design_1 .icons_holder,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_1 .icons_holder {

10
resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
View File

@ -33,10 +33,14 @@ div.jezik_row.tip_17{
.variabla{
margin-bottom: 16px;
&:last-child{
margin-bottom: 0;
}
.ranking {
overflow: hidden;
box-sizing: border-box;
flex-grow: 0;
flex-grow: 1;
width: calc(100% - 120px);
max-width: 250px;
@ -106,6 +110,10 @@ div.jezik_row.tip_17{
background-color: $light-gray;
border: 1px dashed $gray;
border-radius: 4px;
&:last-child{
margin-bottom: 0;
}
}
}
}

10
resources/sass/admin_new/pages/survey_edit/questions/sum.scss
View File

@ -21,7 +21,7 @@ and open the template in the editor.
box-sizing: border-box;
width: 150px;
margin-left: 8px;
padding: 12px 8px;
padding: 6px 8px;
color: #a9a9a9;
@ -36,6 +36,14 @@ and open the template in the editor.
.variabla_vsota_inline{
word-break:break-all;
box-sizing: border-box;
flex-grow: 1;
padding: 4px 6px;
margin-left: 15px;
font-size: 14px;
}
}

5
resources/sass/admin_new/pages/survey_edit/questions/text.scss
View File

@ -211,4 +211,9 @@ div.div.jezik_row.tip_21{
}
}
}
&.spr_tip_8 .variable_holder .variabla input{
width: 160px;
padding: 6px 8px;
}
}