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

Redesign - urejanje vprasalnika - skrcen pogled

Browse Source
This commit is contained in:
pero1203 2022-04-26 11:49:32 +02:00
parent 047189ab39
commit 41e09922fd
3 changed files with 239 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/Branching.php
View File

@ -2225,15 +2225,15 @@ class Branching {
// Kvota // Kvota
if($tip == 25){ if($tip == 25){
$SQ = new SurveyQuotas($this->anketa); $SQ = new SurveyQuotas($this->anketa);
echo '<span class="quotavariable">('.$variable.')</span> '.$SQ->quota_display(-$spremenljivka).' <span class="spr_comment">( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )</span>'; echo '<span class="quotavariable">('.$variable.')</span> '.$SQ->quota_display(-$spremenljivka).' <span class="spr_comment">('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')</span>';
} }
// Kalkulacija // Kalkulacija
else if($tip == 22){ else if($tip == 22){
echo '<span class="calculationvariable">('.$variable.')</span> '.$this->calculations_display(-$spremenljivka).' <span class="spr_comment">( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )</span>'; echo '<span class="calculationvariable">('.$variable.')</span> '.$this->calculations_display(-$spremenljivka).' <span class="spr_comment">('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')</span>';
} }
// Navadne spremenljivke // Navadne spremenljivke
else{ else{
echo '<span class="colorvariable">('.$variable.')</span> '.$spanred.skrajsaj(strip_tags($naslov), 80).($spanred!=''?'</span>':'').' <span class="spr_comment">( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )</span>'; echo '<span class="colorvariable">('.$variable.')</span> '.$spanred.skrajsaj(strip_tags($naslov), 80).($spanred!=''?'</span>':'').' <span class="spr_comment">('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')</span>';
} }
} }
@ -2413,12 +2413,12 @@ class Branching {
// kalkulacija // kalkulacija
if ($row['tip'] == 22) { if ($row['tip'] == 22) {
$row['naslov'] = ''.$this->calculations_display(-$spremenljivka).' <span class="spr_comment">( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )</span>'; $row['naslov'] = ''.$this->calculations_display(-$spremenljivka).' <span class="spr_comment">('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')</span>';
} }
// Kvota // Kvota
else if($row['tip'] == 25){ else if($row['tip'] == 25){
$SQ = new SurveyQuotas($this->anketa); $SQ = new SurveyQuotas($this->anketa);
$row['naslov'] = ''.$SQ->quota_display(-$spremenljivka).' <span class="spr_comment">( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )</span>'; $row['naslov'] = ''.$SQ->quota_display(-$spremenljivka).' <span class="spr_comment">('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')</span>';
} }
// Inline ifi so disablani ce nimamo ustreznega paketa // Inline ifi so disablani ce nimamo ustreznega paketa

248
public/css/admin_new.css
View File

@ -13407,123 +13407,171 @@ div#variabla_new span.correct {
} }
/* /*
To change this license header, choose License Headers in Project Properties. Skrcen nacin pri urejanju vprasalnika
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 06-Aug-2018, 11:37:12
Author : podkrizniku
*/ */
#branching.collapsed { #branching.collapsed {
min-height: 317px; /*min-height: 317px;
margin-top: 10px; margin-top: 10px;
div.spr,
li.spr {
line-height: 28px;
&:hover {
background-color: $blue;
cursor: pointer;
}
div.spr_edit {
padding-top: 0px;
margin-top: 0px;
margin-right: 10px;
}
}
div.spr.spr_editing,
li.spr.spr_editing {
line-height: inherit;
&:hover {
background: none;
cursor: auto;
}
div.spr_edit{
padding-top: 2px;
margin-top: 5px;
margin-right: 30px;
}
}
li.drop {
height: 6px;
margin: 2px 0px 2px 50px;
margin: 0px 0 0px 40px;
padding: 2px 0px 2px 10px;
border-left: 2.5px solid transparent;
span.pb_on {
display: inline-block;
width: 100%;
height: 10px;
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px 0px;
text-align: right;
font-size: 10px;
color: $gray;
}
span.pb_off {
display: inline-block;
width: 100%;
height: 10px;
}
span.pb_new {
display: inline-block;
width: 100%;
height: 10px;
}
&:hover {
span.pb_on {
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px -62px;
cursor: pointer;
}
span.pb_new {
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px -31px;
cursor: pointer;
}
}
}
li.nodrop {
height: 6px;
margin: 2px 0px 2px 50px;
margin: 0px 0 0px 40px;
padding: 2px 0px 2px 0px;
border-left: 2.5px solid transparent;
span.pb_on {
display: inline-block;
width: 100%;
height: 10px;
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px 0px;
text-align: right;
font-size: 10px;
color: $gray;
}
span.pb_off {
display: inline-block;
width: 100%;
height: 10px;
}
span.pb_new {
display: inline-block;
width: 100%;
height: 10px;
}
&:hover {
span.pb_on {
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px -62px;
cursor: pointer;
}
span.pb_new {
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px -31px;
cursor: pointer;
}
span.permanent {
background: url('../../../admin/survey/img_0/sprites_pb.png') no-repeat 0px 0px;
cursor: default;
}
}
}
div.if_remove {
padding-top: 0px;
margin-top: 3px;
}*/
} }
#branching.collapsed div.spr, #branching.collapsed ul li:not(.spr_editing):not(.if_editing):nth-child(3), #branching.collapsed ul li:not(.spr_editing):not(.if_editing):last-child {
#branching.collapsed li.spr { font-weight: 600;
line-height: 28px;
} }
#branching.collapsed div.spr:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).spr, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).if, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).endif, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).block, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).endblock, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).loop, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).endloop {
#branching.collapsed li.spr:hover {
background-color: #1E88E5;
cursor: pointer; cursor: pointer;
display: flex;
align-items: center;
height: 28px;
padding-left: 8px;
} }
#branching.collapsed div.spr div.spr_edit, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).spr:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).if:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).endif:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).block:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).endblock:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).loop:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).endloop:hover {
#branching.collapsed li.spr div.spr_edit { background-color: #EEF7FF;
padding-top: 0px;
margin-top: 0px;
margin-right: 10px;
} }
#branching.collapsed div.spr.spr_editing, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).drop {
#branching.collapsed li.spr.spr_editing { height: 16px;
line-height: inherit;
} }
#branching.collapsed div.spr.spr_editing:hover, #branching.collapsed ul li:not(.spr_editing):not(.if_editing).drop .pb_new {
#branching.collapsed li.spr.spr_editing:hover { height: 16px;
background: none;
cursor: auto;
} }
#branching.collapsed div.spr.spr_editing div.spr_edit, #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pm {
#branching.collapsed li.spr.spr_editing div.spr_edit { padding-top: 0;
padding-top: 2px;
margin-top: 5px;
margin-right: 30px;
} }
#branching.collapsed li.drop { #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pb_on {
height: 6px; flex-direction: row-reverse;
margin: 2px 0px 2px 50px;
margin: 0px 0 0px 40px;
padding: 2px 0px 2px 10px;
border-left: 2.5px solid transparent;
} }
#branching.collapsed li.drop span.pb_on { #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pb_on .pb_page {
display: inline-block; justify-content: flex-end;
width: 100%; flex-shrink: 0;
height: 10px; width: auto;
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px 0px; margin-left: 8px;
text-align: right; font-weight: 600;
font-size: 10px; font-size: 10px;
color: #E5E5E5;
}
#branching.collapsed li.drop span.pb_off {
display: inline-block;
width: 100%;
height: 10px;
}
#branching.collapsed li.drop span.pb_new {
display: inline-block;
width: 100%;
height: 10px;
}
#branching.collapsed li.drop:hover span.pb_on {
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px -62px;
cursor: pointer;
}
#branching.collapsed li.drop:hover span.pb_new {
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px -31px;
cursor: pointer;
}
#branching.collapsed li.nodrop {
height: 6px;
margin: 2px 0px 2px 50px;
margin: 0px 0 0px 40px;
padding: 2px 0px 2px 0px;
border-left: 2.5px solid transparent;
}
#branching.collapsed li.nodrop span.pb_on {
display: inline-block;
width: 100%;
height: 10px;
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px 0px;
text-align: right; text-align: right;
font-size: 10px;
color: #E5E5E5;
} }
#branching.collapsed li.nodrop span.pb_off { #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pb_on .pb_page_hover {
display: inline-block; order: 1;
width: 100%;
height: 10px;
} }
#branching.collapsed li.nodrop span.pb_new { #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .spr_edit {
display: inline-block; padding: 2px 6px;
width: 100%;
height: 10px;
} }
#branching.collapsed li.nodrop:hover span.pb_on { #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .colorvariable,
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px -62px; #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .calculationvariable {
cursor: pointer; margin-right: 8px;
font-weight: 600;
} }
#branching.collapsed li.nodrop:hover span.pb_new { #branching.collapsed ul li:not(.spr_editing):not(.if_editing) .spr_comment {
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px -31px; margin: 0 8px;
cursor: pointer; font-style: normal;
} color: #A9A9A9;
#branching.collapsed li.nodrop:hover span.permanent {
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px 0px;
cursor: default;
}
#branching.collapsed div.if_remove {
padding-top: 0px;
margin-top: 3px;
} }
/* /*

95
resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss
View File

@ -1,15 +1,92 @@
/* /*
To change this license header, choose License Headers in Project Properties. Skrcen nacin pri urejanju vprasalnika
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 06-Aug-2018, 11:37:12
Author : podkrizniku
*/ */
#branching.collapsed { #branching.collapsed {
min-height: 317px;
ul{
li:not(.spr_editing):not(.if_editing){
&:nth-child(3),
&:last-child{
font-weight: 600;
}
&.spr,
&.if,
&.endif,
&.block,
&.endblock,
&.loop,
&.endloop{
cursor: pointer;
display: flex;
align-items: center;
height: 28px;
padding-left: 8px;
&:hover{
background-color: $medium-blue;
}
}
&.drop{
height: 16px;
.pb_new{
height: 16px;
}
}
.pm{
padding-top: 0;
}
.pb_on{
flex-direction: row-reverse;
.pb_page{
justify-content: flex-end;
flex-shrink: 0;
width: auto;
margin-left: 8px;
font-weight: 600;
font-size: 10px;
text-align: right;
}
.pb_page_hover{
order: 1;
}
}
.spr_edit{
padding: 2px 6px;
}
.colorvariable,
.calculationvariable{
margin-right: 8px;
font-weight: 600;
}
.spr_comment{
margin: 0 8px;
font-style: normal;
color: #A9A9A9;
}
}
}
/*min-height: 317px;
margin-top: 10px; margin-top: 10px;
div.spr, div.spr,
@ -120,5 +197,5 @@ and open the template in the editor.
div.if_remove { div.if_remove {
padding-top: 0px; padding-top: 0px;
margin-top: 3px; margin-top: 3px;
} }*/
} }