Redesign - urejanje vprasalnika - skrcen pogled
This commit is contained in:
pero1203
parent
047189ab39
commit
41e09922fd
@ -2225,15 +2225,15 @@ class Branching {
|
||||
// Kvota
|
||||
if($tip == 25){
|
||||
$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
|
||||
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
|
||||
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
|
||||
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
|
||||
else if($row['tip'] == 25){
|
||||
$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
|
||||
|
||||
@ -13407,123 +13407,171 @@ div#variabla_new span.correct {
|
||||
}
|
||||
|
||||
/*
|
||||
To change this license header, choose License Headers in Project Properties.
|
||||
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
|
||||
Skrcen nacin pri urejanju vprasalnika
|
||||
*/
|
||||
#branching.collapsed {
|
||||
min-height: 317px;
|
||||
margin-top: 10px;
|
||||
/*min-height: 317px;
|
||||
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 li.spr {
|
||||
line-height: 28px;
|
||||
#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 {
|
||||
font-weight: 600;
|
||||
}
|
||||
#branching.collapsed div.spr:hover,
|
||||
#branching.collapsed li.spr:hover {
|
||||
background-color: #1E88E5;
|
||||
#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 {
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 28px;
|
||||
padding-left: 8px;
|
||||
}
|
||||
#branching.collapsed div.spr div.spr_edit,
|
||||
#branching.collapsed li.spr div.spr_edit {
|
||||
padding-top: 0px;
|
||||
margin-top: 0px;
|
||||
margin-right: 10px;
|
||||
#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 {
|
||||
background-color: #EEF7FF;
|
||||
}
|
||||
#branching.collapsed div.spr.spr_editing,
|
||||
#branching.collapsed li.spr.spr_editing {
|
||||
line-height: inherit;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing).drop {
|
||||
height: 16px;
|
||||
}
|
||||
#branching.collapsed div.spr.spr_editing:hover,
|
||||
#branching.collapsed li.spr.spr_editing:hover {
|
||||
background: none;
|
||||
cursor: auto;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing).drop .pb_new {
|
||||
height: 16px;
|
||||
}
|
||||
#branching.collapsed div.spr.spr_editing div.spr_edit,
|
||||
#branching.collapsed li.spr.spr_editing div.spr_edit {
|
||||
padding-top: 2px;
|
||||
margin-top: 5px;
|
||||
margin-right: 30px;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pm {
|
||||
padding-top: 0;
|
||||
}
|
||||
#branching.collapsed 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;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pb_on {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
#branching.collapsed li.drop 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;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pb_on .pb_page {
|
||||
justify-content: flex-end;
|
||||
flex-shrink: 0;
|
||||
width: auto;
|
||||
margin-left: 8px;
|
||||
font-weight: 600;
|
||||
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;
|
||||
font-size: 10px;
|
||||
color: #E5E5E5;
|
||||
}
|
||||
#branching.collapsed li.nodrop span.pb_off {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
height: 10px;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .pb_on .pb_page_hover {
|
||||
order: 1;
|
||||
}
|
||||
#branching.collapsed li.nodrop span.pb_new {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
height: 10px;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .spr_edit {
|
||||
padding: 2px 6px;
|
||||
}
|
||||
#branching.collapsed li.nodrop:hover span.pb_on {
|
||||
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px -62px;
|
||||
cursor: pointer;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .colorvariable,
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .calculationvariable {
|
||||
margin-right: 8px;
|
||||
font-weight: 600;
|
||||
}
|
||||
#branching.collapsed li.nodrop:hover span.pb_new {
|
||||
background: url("../../../admin/survey/img_0/sprites_pb.png") no-repeat 0px -31px;
|
||||
cursor: pointer;
|
||||
}
|
||||
#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;
|
||||
#branching.collapsed ul li:not(.spr_editing):not(.if_editing) .spr_comment {
|
||||
margin: 0 8px;
|
||||
font-style: normal;
|
||||
color: #A9A9A9;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -1,15 +1,92 @@
|
||||
/*
|
||||
To change this license header, choose License Headers in Project Properties.
|
||||
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
|
||||
Skrcen nacin pri urejanju vprasalnika
|
||||
*/
|
||||
|
||||
#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;
|
||||
|
||||
div.spr,
|
||||
@ -120,5 +197,5 @@ and open the template in the editor.
|
||||
div.if_remove {
|
||||
padding-top: 0px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user