Redesign - popravki urejanja vprasalnika - V DELU

This commit is contained in:
pero1203 2022-01-05 13:33:56 +01:00
parent 49f236536a
commit cfeda4c01e
14 changed files with 1091 additions and 1547 deletions

View File

@ -1809,11 +1809,14 @@ class Branching {
// napis uvod na začetku // napis uvod na začetku
echo '<li id="droppable_0-0" class="nodrop">'; echo '<li id="droppable_0-0" class="nodrop">';
echo '<span class="pb_on permanent"><span>'.$lang['srv_intro_page'].'</span></span>'; echo ' <div class="pb_on permanent">';
echo ' <div class="pb_page">'.$lang['srv_intro_page'].'</div>';
echo ' <div class="pb_line"></div>';
echo ' </div>';
echo '</li>'; echo '</li>';
echo '<li id="droppable_0-0" class="nodrop">'; echo '<li id="droppable_0-0" class="nodrop">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
// Ce imamo slucajno GDPR preduvod // Ce imamo slucajno GDPR preduvod
@ -1830,7 +1833,7 @@ class Branching {
echo '</li>'; echo '</li>';
echo '<li id="droppable_0-0" class="nodrop">'; echo '<li id="droppable_0-0" class="nodrop">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
} }
} }
@ -1869,7 +1872,7 @@ class Branching {
if ($this->survey_type != 1) { if ($this->survey_type != 1) {
echo '<li id="droppable_0-0-2" class="nodrop" spr="0" if="0" endif="0">'; echo '<li id="droppable_0-0-2" class="nodrop" spr="0" if="0" endif="0">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
$first = $this->find_first_spr(); $first = $this->find_first_spr();
@ -1877,19 +1880,22 @@ class Branching {
// Zaenkrat imamo vedno isti text za strani // Zaenkrat imamo vedno isti text za strani
if ($first > 0){ if ($first > 0){
/*$gr = $this->getGrupa4Spremenljivka($first);*/
$gr = $this->getGrupa4Spremenljivka($first); $gr = $this->getGrupa4Spremenljivka($first);
$naslov = $lang['srv_stran'].' '.$gr['vrstni_red']; $naslov = $lang['srv_stran'].' '.$gr['vrstni_red'];
} }
else else
$naslov = $lang['srv_stran'].' 1'; $naslov = $lang['srv_stran'].' 1';
echo '<span class="pb_on permanent"><span>'.$naslov.'</span></span>'; echo ' <div class="pb_on permanent">';
echo ' <div class="pb_page">'.$naslov.'</div>';
echo ' <div class="pb_line"></div>';
echo ' </div>';
echo '</li>'; echo '</li>';
} }
echo '<li id="droppable_0-0-0" class="drop" spr="0" if="0" endif="0">'; echo '<li id="droppable_0-0-0" class="drop" spr="0" if="0" endif="0">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
} }
@ -1903,11 +1909,14 @@ class Branching {
// napis zakljucek prikazemo tukaj in ne za zadnjo spremenljivko da je lepse // napis zakljucek prikazemo tukaj in ne za zadnjo spremenljivko da je lepse
echo '<li id="droppable_'.'0'.'-'.'0'.'-1" class="nodrop" spr="'.'0'.'" if="0" endif="0">'; echo '<li id="droppable_'.'0'.'-'.'0'.'-1" class="nodrop" spr="'.'0'.'" if="0" endif="0">';
echo '<span class="pb_on permanent"><span>'.$lang['srv_end_page'].'</span></span>'; echo ' <div class="pb_on permanent">';
echo ' <div class="pb_page">'.$lang['srv_end_page'].'</div>';
echo ' <div class="pb_line"></div>';
echo ' </div>';
echo '</li>'; echo '</li>';
echo '<li id="droppable_'.'0'.'-'.'0'.'-0" class="nodrop" spr="'.'0'.'" if="0" endif="0">'; echo '<li id="droppable_'.'0'.'-'.'0'.'-0" class="nodrop" spr="'.'0'.'" if="0" endif="0">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
echo '<li id="-2" class="spr">'; echo '<li id="-2" class="spr">';
@ -1970,7 +1979,6 @@ class Branching {
global $lang; global $lang;
$row = SurveyInfo::getInstance()->getSurveyRow(); $row = SurveyInfo::getInstance()->getSurveyRow();
#$this->survey_type = SurveyAdmin::getSurvey_type($this->anketa);
$this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type"); $this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type");
if ($row['flat'] == 0) if ($row['flat'] == 0)
@ -1989,76 +1997,75 @@ class Branching {
} }
echo '</li>'; echo '</li>';
//echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">';
if ($this->pagebreak($spremenljivka)) { if ($this->pagebreak($spremenljivka)) {
$gr = $this->getGrupa4Spremenljivka($this->find_next_spr($spremenljivka)); $gr = $this->getGrupa4Spremenljivka($this->find_next_spr($spremenljivka));
if ($gr['id'] > 0) { if ($gr['id'] > 0) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2" class="drop" spr="'.$row['id'].'" if="0" endif="0" drop="2">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2" class="drop" spr="'.$row['id'].'" if="0" endif="0" drop="2">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
// ++ zadnji pagebreak prikazan izven ifa // // ++ zadnji pagebreak prikazan izven ifa //
// ce je spremenljivka zadnja v IFu, ne prikazemo PB, ker ga bomo za ENDIFom // ce je spremenljivka zadnja v IFu, ne prikazemo PB, ker ga bomo za ENDIFom
$rows = Cache::srv_branching($spremenljivka, 0); $rows = Cache::srv_branching($spremenljivka, 0);
if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) { if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-1" class="nodrop" spr="'.$row['id'].'" if="0" endif="0">';
//echo '<span class="pb_on" title="'.$lang['srv_rem_pagebreak'].'"><span>'.$gr['naslov'].'</span></span>'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-1" class="nodrop" spr="'.$row['id'].'" if="0" endif="0">';
echo '<span class="pb_on" title="'.$lang['srv_rem_pagebreak'].'"><span>'.$lang['srv_stran'].' '.$gr['vrstni_red'].'</span></span>'; echo ' <div class="pb_on" title="'.$lang['srv_rem_pagebreak'].'">';
echo ' <div class="pb_page">'.$lang['srv_stran'].' '.$gr['vrstni_red'].'</div>';
echo ' <div class="pb_icon"><span class="favicon delete"></span></div>';
echo ' <div class="pb_line"></div>';
echo ' </div>';
echo '</li>'; echo '</li>';
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-0" class="drop" spr="'.$row['id'].'" if="0" endif="0">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-0" class="drop" spr="'.$row['id'].'" if="0" endif="0">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
} }
// -- zadnji pagebreak prikazan izven ifa //
} elseif($this->survey_type != 1) { }
// -- zadnji pagebreak prikazan izven ifa //
elseif($this->survey_type != 1) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2" class="drop" spr="'.$row['id'].'" if="0" endif="0" drop="2">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2" class="drop" spr="'.$row['id'].'" if="0" endif="0" drop="2">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
/*echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-1" class="nodrop" spr="'.$row['id'].'" if="0" endif="0">';
echo '<span class="pb_on">'.$lang['srv_end_label'].'</span>';
echo '</li>';
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-0" class="nodrop" spr="'.$row['id'].'" if="0" endif="0">';
echo '<span class="pb_off"></span>';
echo '</li>';*/
} }
} elseif ($spremenljivka == $this->find_last_spr() && $this->survey_type != 1) { // zadnja spremenljivka - zakljucek }
elseif ($spremenljivka == $this->find_last_spr() && $this->survey_type != 1) { // zadnja spremenljivka - zakljucek
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2" class="drop" spr="'.$row['id'].'" if="0" endif="0" drop="2">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2" class="drop" spr="'.$row['id'].'" if="0" endif="0" drop="2">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
/*echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-1" class="nodrop" spr="'.$row['id'].'" if="0" endif="0">'; }
echo '<span class="pb_on">'.$lang['srv_end_label'].'</span>'; // pri formi ne dovolimo dodajanja page-breakov
echo '</li>'; elseif ($this->survey_type != 1) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-0" class="nodrop" spr="'.$row['id'].'" if="0" endif="0">';
echo '<span class="pb_off"></span>';
echo '</li>';*/
} elseif ($this->survey_type != 1) { //pri formi ne dovolimo dodajanja page-breakov
// tuki pustimo, da se PB lahko dodaja za spremenljivko in za ifom (pol se prikaze za ifom) // tuki pustimo, da se PB lahko dodaja za spremenljivko in za ifom (pol se prikaze za ifom)
// -- v zadnji spremenljivki za ifom ne prikazemo dodajanja // -- v zadnji spremenljivki za ifom ne prikazemo dodajanja
$rows = Cache::srv_branching($spremenljivka, 0); $rows = Cache::srv_branching($spremenljivka, 0);
if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) { if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">';
echo '<span class="pb_new" title="'.$lang['srv_add_pagebreak'].'"></span>'; echo ' <div class="pb_new" title="'.$lang['srv_add_pagebreak'].'">';
echo '</li>'; echo ' <div class="pb_icon"><span class="favicon page_break"></span></div>';
} else { // zadnji spremenljivki v ifu izpisemo PB izven ifa (da je bolj pregledno in lepse) echo ' <div class="pb_line"></div>';
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">'; echo ' </div>';
echo '<span class="pb_off"></span>';
echo '</li>'; echo '</li>';
} }
} elseif ($this->survey_type == 1) { // forma // zadnji spremenljivki v ifu izpisemo PB izven ifa (da je bolj pregledno in lepse)
else {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">';
echo ' <div class="pb_off"></div>';
echo '</li>';
}
}
// forma
elseif ($this->survey_type == 1) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="'.$row['id'].'" if="0" endif="0">';
echo '</li>'; echo '</li>';
} }
//echo '</li>';
} }
function display_if_label($if) { function display_if_label($if) {
@ -2129,11 +2136,16 @@ class Branching {
if ($gr['id'] > 0) { if ($gr['id'] > 0) {
echo '<li './*id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-2"*/' class="nodrop" spr="'.$spr.'" if="0" endif="0">'; echo '<li class="nodrop" spr="'.$spr.'" if="0" endif="0">';
echo '<span class="pb_off"></span>'; echo ' <div class="pb_off"></div>';
echo '</li>'; echo '</li>';
echo '<li './*id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'-1"*/' class="nodrop" spr="'.$spr.'" if="0" endif="0">';
echo '<span class="pb_on" title="'.$lang['srv_rem_pagebreak'].'">'.$lang['srv_stran'].' '.$gr['vrstni_red'].'</span>'; echo '<li class="nodrop" spr="'.$spr.'" if="0" endif="0">';
echo ' <div class="pb_on" title="'.$lang['srv_rem_pagebreak'].'">';
echo ' <div class="pb_page">'.$lang['srv_stran'].' '.$gr['vrstni_red'].'</div>';
echo ' <div class="pb_icon"><span class="favicon delete"></span></div>';
echo ' <div class="pb_line"></div>';
echo ' </div>';
echo '</li>'; echo '</li>';
} }
@ -2142,9 +2154,13 @@ class Branching {
// zadnji spremenljivki v ifu, tudi dodamo PB izven pagebreaka (da se doda, tam kjer se potem prikaže) // zadnji spremenljivki v ifu, tudi dodamo PB izven pagebreaka (da se doda, tam kjer se potem prikaže)
if ($rows['pagebreak'] == 0 AND (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) { if ($rows['pagebreak'] == 0 AND (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1" spr_pb="'.$spr.'">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1" spr_pb="'.$spr.'">';
echo '<span class="pb_new" title="'.$lang['srv_add_pagebreak'].'"></span>'; echo ' <div class="pb_new" title="'.$lang['srv_add_pagebreak'].'">';
echo ' <div class="pb_icon"><span class="favicon page_break"></span></div>';
echo ' <div class="pb_line"></div>';
echo ' </div>';
echo '</li>'; echo '</li>';
} else { }
else {
echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1">'; echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1">';
echo '</li>'; echo '</li>';
} }

View File

@ -364,15 +364,20 @@ function branching_click(event) {
} }
// pagebreak (klik na celo vrstico) // pagebreak (klik na celo vrstico)
td = $(event.target).closest('li.drop span, li.nodrop span'); td = $(event.target).closest('li.drop > div, li.nodrop > div');
if (td.hasClass('pb_new') || td.hasClass('pb_on')) { if (td.hasClass('pb_new') || td.hasClass('pb_on')) {
var spr;
if (td.parent().attr('spr_pb')) if (!td.hasClass('permanent')){
spr = td.parent().attr('spr_pb'); var spr;
else
spr = td.parent().attr('spr'); if (td.parent().attr('spr_pb'))
if (!td.hasClass('permanent')) spr = td.parent().attr('spr_pb');
else
spr = td.parent().attr('spr');
pagebreak(spr); pagebreak(spr);
}
return false; return false;
} }

View File

@ -2609,55 +2609,6 @@ function show_tip_preview(spr, value) {
$("#tip_preview_sub_"+value).show(); $("#tip_preview_sub_"+value).show();
} }
function show_tip_preview_first(value) {
if(value < 5 || value == 7 || value == 21)
stolpec = 1;
else if(value == 6 || value == 16 || value == 19 || value == 20)
stolpec = 2;
else if(value == 5 || value == 8 || value == 17 || value == 18)
stolpec = 3;
else if(value > 8 && value < 16)
stolpec = 'SN';
else
stolpec = 4;
//pozicioniramo div
var pos = $(".questions"+stolpec).offset();
var width = $(".questions"+stolpec).width();
var height = $(".questions"+stolpec).height();
if(stolpec == 1 || stolpec == 3)
$("#tip_preview").css( { "left": (10+pos.left + width) + "px", "right":"auto", "top":(10+pos.top) + "px" } );
else if(stolpec == 2 || stolpec == 4)
$("#tip_preview").css( { "left": (pos.left - 200) + "px", "right":"auto", "top":(10+pos.top+height) + "px" } );
else
$("#tip_preview").css( { "left": (pos.left - 250) + "px", "right":"auto", "top":(10+pos.top+height) + "px" } );
// prikažemo glevni div
$("#tip_preview").show();
// priredimo še vsebino
$("[name=tip_preview_sub]:visible").hide();
$("#tip_preview_sub_"+value).show();
}
function nova_spremenljivka_type(type) {
$("#tip_preview").hide();
if (srv_meta_branching == 1) {
$('#branching').load('ajax.php?t=branching&a=spremenljivka_new', {anketa: srv_meta_anketa_id, q_type:type}, function() {
refreshRight();
refreshBottomIcons('gray');
});
} else {
$('#vprasanja').load('ajax.php?a=nova_spremenljivka', {anketa: srv_meta_anketa_id, grupa: srv_meta_grupa, q_type:type}, function() {
$("#grupe").load('ajax.php?a=refresh_grupe', {anketa: srv_meta_anketa_id, grupa: srv_meta_grupa});
refreshBottomIcons('gray');
});
}
}
//preview pri design, orientation in grid subtype dropdownu (ranking, radio b, multigrid) //preview pri design, orientation in grid subtype dropdownu (ranking, radio b, multigrid)
function show_tip_preview_subtype(spr, design, tip) { function show_tip_preview_subtype(spr, design, tip) {
@ -2797,29 +2748,33 @@ function show_tip_preview_subtype(spr, design, tip) {
var pos = $("#spremenljivka_podtip_"+spr).offset(); var pos = $("#spremenljivka_podtip_"+spr).offset();
var width = $("#spremenljivka_podtip_"+spr).width(); var width = $("#spremenljivka_podtip_"+spr).width();
var body = $('body').width(); var body = $('body').width();
//$("#tip_preview").css( { "left": (pos.left) + "px", "right":"auto", "top":(100+pos.top) + "px" } );
$("#tip_preview").css( { "left":"auto", "right": (body - pos.left + 10) + "px", "top":(pos.top) + "px" } ); $("#tip_preview").css( { "left":"auto", "right": (body - pos.left + 10) + "px", "top":(pos.top) + "px" } );
// pri popuupu za dodajanje advanced tipov vprasanj // prikažemo glavni div
} else { $("#tip_preview").show();
//pozicioniramo div // priredimo še vsebino
var pos = $("#toolbox_add_advanced div[tip="+tip+"][podtip="+design+"]").offset(); $("[name=tip_preview_sub]:visible").hide();
var width = $("#toolbox_add_advanced div[tip="+tip+"][podtip="+design+"]").width(); $("#tip_preview_sub_" + val).show();
$("#tip_preview").css( { "left": (10+pos.left + width) + "px", "right":"auto", "top":(10+pos.top) + "px" } );
// Na koncu zamaknemo gor za visino diva (pri nizkih ekranih)
var height = $("#tip_preview").height();
$("#tip_preview").css( { "top":(30+pos.top-height) + "px" } );
} }
// pri popuupu za dodajanje advanced tipov vprasanj
else {
// prikažemo glavni div // pozicioniramo div
$("#tip_preview").show(); $("#tip_preview").css({"left":"520px"});
// prikažemo glavni div
$("#tip_preview").show();
// priredimo še vsebino // priredimo še vsebino
$("[name=tip_preview_sub]:visible").hide(); $("[name=tip_preview_sub]:visible").hide();
$("#tip_preview_sub_" + val).show(); $("#tip_preview_sub_" + val).show();
}
// Na koncu zamaknemo gor za visino diva (pri nizkih ekranih)
var height = $("#tip_preview").height();
$("#tip_preview").css( { "top":(30+pos.top-height) + "px" } );
} }
// skrijemo div za preview // skrijemo div za preview

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,218 @@
/*
Osnova za branching
*/
#placeholder{
display: flex;
width: calc(100vw - 328px);
//max-width: 1500px;
margin: 0 0 0 308px;
}
#branching {
min-height: 400px;
width: calc(96% - 315px);
margin: 0;
background-color: white;
ul {
display: flex;
flex-direction: column;
padding: 0;
margin: 0;
/*> ul{
padding-left: 25px;
> ul{
padding-left: 25px;
ul{
padding-left: 25px;
}
}
}*/
li {
box-sizing: border-box;
width: 100%;
margin: 0;
padding: 0;
list-style: none;
// Drop in no drop polja
&.drop{
height: 16px;
&:hover{
.pb_new {
display: flex;
}
.pb_icon{
display: block;
}
}
}
&.nodrop{
height: 16px;
&:hover{
.pb_new {
display: flex;
}
.pb_icon{
display: block;
}
}
}
// Page break polje in dodajanje page breaka
.pb_on,
.pb_new{
cursor: pointer;
display: flex;
align-items: center;
&.pb_new{
display: none;
}
&.permanent{
cursor: default;
}
.pb_page{
width: 130px;
font-size: 16px;
font-weight: 600;
line-height: 20px;
color: #A9A9A9;
}
.pb_line{
width: 100%;
height: 1px;
border-bottom: 1px #D3D3D3 solid;
}
.pb_icon{
display: none;
&:before{
content: "A";
}
}
}
// Brez page breaka
.pb_off {
}
}
}
li.spr.ui-draggable-dragging {
z-index: 99999;
}
li.drop.branchinghover {
background-color: $gray !important;
a {
display: none;
}
}
li.nodrop.branchinghover {
background-color: $gray !important;
a {
display: none;
}
}
.variable_name {
cursor: move;
}
#bottom_icons_holder{
display: none;
}
}
.branchinghover {
background: url('../../../admin/survey/img_0/hover_background.png') repeat-x top left !important;
}
.blockSwitch {
position: relative;
margin: 10px auto 0;
text-align: center;
p {
display: inline;
font-size: 14px;
}
}
/* Okno za drop vprasanja, ko je anketa prazna */
.empty_vrivanje {
display: flex;
flex-direction: column;
align-items: flex-start;
margin: 20px 0px 20px 45px !important;
padding: 60px 0 !important;
text-align: center;
font-weight: 600;
border: 1px solid $blue;
.empty_vrivanje_title {
margin: 0 auto;
padding: 8px 20px;
font-size: 16px;
font-weight: 500;
color: $blue;
background-color: $blue;
border: 1px solid $blue;
}
.empty_vrivanje_subtitle{
margin: 15px auto 0 auto;
font-size: 14px;
font-weight: 400;
a{
font-weight: 500;
}
}
}
.empty_vrivanje.branchinghover {
color: white;
background: 0 !important;
background-color: $gray;
a{
display: inline !important;
color: white;
}
.empty_vrivanje_title{
color: white;
background-color: $gray;
border-color: white;
}
}

View File

@ -1,509 +0,0 @@
/*
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 : 07-Aug-2018, 09:43:11
Author : podkrizniku
*/
$loop_background: #eef9ff;
$block_background: #f1f1ff;
$if_background: $blue;
#placeholder{
display: flex;
width: calc(100vw - 328px);
//max-width: 1500px;
margin: 0 0 0 308px;
}
#branching {
min-height: 400px;
width: calc(96% - 315px);
margin: 0;
background-color: white;
ul {
padding: 0;
margin: 0;
}
li {
list-style: none;
div.if_remove {
display: none;
}
}
li.spr {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
div.spr_edit {
display: none;
}
&:hover {
div.spr_edit {
display: block;
}
}
}
li.if {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
span.conditions_display {
background-color: $if_background;
cursor: pointer;
}
div.if_remove {
display: block;
}
}
}
li.block {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
span.conditions_display {
background-color: $block_background;
cursor: pointer;
}
div.if_remove {
display: block;
}
}
}
li.loop {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
span.conditions_display {
background-color: $loop_background;
cursor: pointer;
}
div.if_remove {
display: block;
}
}
}
li.endif {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
background-color: $if_background;
cursor: pointer;
}
}
li.endblock {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
background-color: $block_background;
cursor: pointer;
}
}
li.endloop {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
background-color: $loop_background;
cursor: pointer;
}
}
li.inout {
margin-left: 40px;
position: relative;
border-left: 2.5px solid transparent;
&:hover {
background-color: $block_background;
cursor: pointer;
}
}
li.if.if_editing {
border-color: $blue;
background-color: $if_background;
div.if_remove {
display: block;
}
}
li.block.if_editing {
border-color: $blue;
background-color: $block_background;
div.if_remove {
display: block;
}
}
li.loop.if_editing {
border-color: $blue;
background-color: $loop_background;
div.if_remove {
display: block;
}
}
ul.if_editing {
li.spr {
border-color: $blue;
}
li.if {
border-color: $blue;
}
li.block {
border-color: $blue;
}
li.loop {
border-color: $blue;
}
li.endif {
border-color: $blue;
}
li.endblock {
border-color: $blue;
}
li.endloop {
border-color: $blue;
}
li.inout {
border-color: $blue;
}
li.drop {
border-color: $blue;
}
li.nodrop {
border-color: $blue;
}
}
li.if.if_hovering {
border-color: $blue;
background-color: $if_background;
}
li.block.if_hovering {
border-color: $blue;
background-color: $block_background;
}
li.loop.if_hovering {
border-color: $blue;
background-color: $loop_background;
}
ul.if_hovering {
li.spr {
border-color: $blue;
}
li.if {
border-color: $blue;
}
li.block {
border-color: $blue;
}
li.loop {
border-color: $blue;
}
li.endif {
border-color: $blue;
}
li.endblock {
border-color: $blue;
}
li.endloop {
border-color: $blue;
}
li.inout {
border-color: $blue;
}
li.drop {
border-color: $blue;
}
li.nodrop {
border-color: $blue;
}
li.endloop {
background-color: $loop_background;
}
li.endblock {
background-color: $block_background;
}
li.endif {
background-color: $if_background;
}
}
li.spr.ui-draggable-dragging {
z-index: 99999;
}
div.spr_edit {
cursor: pointer;
color: $gray;
cursor: pointer;
display: inline-block;
height: 26px;
a.arhiv {
background-position: -16px -30px;
}
a {
cursor: pointer;
display: inline-block;
margin-left: 9px;
width: 20px;
height: 20px;
}
span.scale_ordnom {
vertical-align: 2px;
margin-right: 20px;
color: $blue;
a {
cursor: pointer;
display: inline-block;
height: 20px;
width: auto;
margin: 0;
background-image: none;
color: $blue;
&:hover {
color: $yellow;
}
}
}
a.hide {
cursor: pointer;
display: inline-block;
margin-right: 5px;
width: 20px;
height: 20px;
}
}
li.spr.spr_editing {
div.spr_edit {
display: block;
padding-top: 9px;
}
}
li.drop.branchinghover {
background-color: $yellow !important;
a {
display: none;
}
}
li.nodrop.branchinghover {
background-color: $yellow !important;
a {
display: none;
}
}
a.pm {
position: absolute;
left: auto;
float: none;
margin: 9px 0 0 -15px;
cursor: pointer;
}
a.pm.minus {
margin-top: 12px;
}
.spr_editing {
.spremenljivka_content {
background-color: white;
border: 1px solid transparent;
.spremenljivka_settings {
background-color: $yellow !important;
border: 1px solid $yellow;
.spr_settings{
span.red {
color: white !important;
}
}
#spr_settings_intro_concl{
div.red{
color: white !important;
}
}
}
.content_div_normalmode{
border: 1px solid $yellow;
}
.comment_container_inline {
border-top: none;
border-left: 1px solid $blue;
border-right: 1px solid $blue;
border-bottom: 1px solid $blue;
}
.spremenljivka_tekst_form {
border: 1px solid $yellow;
}
}
.variable_name {
color: white;
}
}
.variable_name {
cursor: move;
}
div.if_remove {
a {
cursor: pointer;
display: inline-block;
margin-left: 9px;
width: 20px;
height: 20px;
/*background-image: url(../../../admin/survey/img_new/sprites.png);
background-repeat: no-repeat;*/
}
padding-top: 0px;
margin-top: 4px;
}
li.spr_editing {
div.spr_edit {
span.scale_ordnom {
color: white;
a {
color: white;
}
}
a.faicon{
color: white !important;
}
}
}
}
#branching.expanded {
li.spr {
padding-top: 1px;
padding-bottom: 1px;
}
li.if {
padding-top: 1px;
padding-bottom: 1px;
}
li.block {
padding-top: 1px;
padding-bottom: 1px;
}
li.loop {
padding-top: 1px;
padding-bottom: 1px;
}
li.drop {
min-height: 16px;
margin: 2px 0 2px 50px;
margin: 0px 0 0px 40px;
padding: 2px 0px 2px 10px;
//border-left: 2px solid transparent;
span.pb_on {
display: inline-block;
width: 100%;
height: 16px;
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 100px 10px;
color: $gray;
font-size: 14px;
font-weight: 600;
height: 20px;
line-height: 20px;
margin-top: 0;
}
span.pb_off {
display: inline-block;
width: 100%;
height: 16px;
}
span.pb_new {
display: inline-block;
width: 100%;
height: 16px;
}
&:hover {
span.pb_on {
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 100px -52px;
cursor: pointer;
}
span.pb_new {
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 0px -23px;
cursor: pointer;
}
}
}
li.nodrop {
min-height: 16px;
margin: 2px 0 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: 16px;
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 100px 10px;
color: $gray;
font-size: 14px;
font-weight: 600;
height: 20px;
line-height: 20px;
margin-top: 0;
}
span.pb_off {
display: inline-block;
width: 100%;
height: 16px;
}
span.pb_new {
display: inline-block;
width: 100%;
height: 16px;
}
&:hover {
span.pb_on {
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 100px -52px;
cursor: pointer;
}
span.pb_new {
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 0px -23px;
cursor: pointer;
}
span.permanent {
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 100px 10px;
cursor: default;
}
}
}
span.pb_on {
span {
background-color: white;
padding-right: 20px;
pointer-events: none;
}
}
}
.branchinghover {
background: url('../../../admin/survey/img_0/hover_background.png') repeat-x top left !important;
}
.blockSwitch {
position: relative;
margin: 10px auto 0;
text-align: center;
p {
display: inline;
font-size: 14px;
}
}
#spremenljivka_content_-1 {
position: relative;
span.display_editor {
top: 40px;
}
}
#spremenljivka_content_-2 {
position: relative;
span.display_editor {
top: 40px;
}
}

View File

@ -8,13 +8,63 @@ and open the template in the editor.
Author : podkrizniku Author : podkrizniku
*/ */
li.if,
li.block,
li.loop,
li.if{
.if_remove{
display: none;
}
&:hover {
span.conditions_display {
cursor: pointer;
}
div.if_remove {
display: block;
}
}
}
li.endif,
li.endblock,
li.endloop,
li.inout{
&:hover {
cursor: pointer;
}
}
li.if.if_editing,
li.block.if_editing,
li.loop.if_editing{
div.if_remove {
display: block;
}
}
a.pm {
position: absolute;
left: auto;
float: none;
margin: 9px 0 0 -15px;
cursor: pointer;
}
a.pm.minus {
margin-top: 12px;
}
.endif_editing { .endif_editing {
background-color: $blue; background-color: $blue;
} }
li.if_editing { li.if_editing {
div.if_content { div.if_content {
&:before { &:before {
background-color: $if_background; background-color: $blue;
content: ""; content: "";
display: block; display: block;
height: 15px; height: 15px;
@ -48,7 +98,7 @@ span.endif {
.block { .block {
>div { >div {
>#div_condition_editing_container { >#div_condition_editing_container {
background-color: $block_background; background-color: $blue;
line-height: 28px; line-height: 28px;
} }
} }

View File

@ -8,62 +8,6 @@ and open the template in the editor.
Author : podkrizniku Author : podkrizniku
*/ */
/* Okno za drop vprasanja, ko je anketa prazna */
.empty_vrivanje {
display: flex;
flex-direction: column;
align-items: flex-start;
margin: 20px 0px 20px 45px !important;
padding: 60px 0 !important;
text-align: center;
font-weight: 600;
border: 1px solid $blue;
.empty_vrivanje_title {
margin: 0 auto;
padding: 8px 20px;
font-size: 16px;
font-weight: 500;
color: $blue;
background-color: $blue;
border: 1px solid $blue;
}
.empty_vrivanje_subtitle{
margin: 15px auto 0 auto;
font-size: 14px;
font-weight: 400;
a{
font-weight: 500;
}
}
}
.empty_vrivanje.branchinghover {
color: white;
background: 0 !important;
background-color: $yellow;
a{
display: inline !important;
color: white;
}
.empty_vrivanje_title{
color: white;
background-color: $yellow;
border-color: white;
}
}
.editmenu { .editmenu {
float: right; float: right;

View File

@ -17,20 +17,25 @@ and open the template in the editor.
width: 100%; width: 100%;
text-align: center; text-align: center;
border-collapse: collapse; border-collapse: collapse;
td.grid_header {
td.grid_header {
height: 18px; height: 18px;
} }
tbody { tbody {
tr { tr {
td { td {
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
} }
&:nth-child(odd) {
background-color: $blue; &:nth-child(odd) {
td { background-color: $light-gray;
background-color: $blue;
div[contenteditable=true] { td {
background-color: $light-gray;
div[contenteditable=true] {
border: 1px solid transparent; border: 1px solid transparent;
} }
} }

View File

@ -1,13 +1,8 @@
/* /*
To change this license header, choose License Headers in Project Properties. Branching element z vprasanjem
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 03-Aug-2018, 09:55:43
Author : podkrizniku
*/ */
.editor_display { .editor_display {
width: 98%; width: 98%;
background-color: #eee; background-color: #eee;
@ -58,74 +53,322 @@ and open the template in the editor.
display: none !important; display: none !important;
} }
} }
.spremenljivka_content {
margin: 2px 0px 10px 0px;
padding: 0px;
color: $gray;
background-color: white;
border: 1px solid $blue;
&:hover { // Neaktiven element
.add-variable { li.spr{
display: block; color: $black;
}
background-color: white;
}
h3 {
margin: 0;
padding: 0;
border: 0;
p {
margin: 0;
padding: 0;
border: 0;
}
}
form {
margin: 0;
padding: 0;
border: 0;
}
p {
margin: 0;
padding: 0;
border: 0;
padding: 3px;
}
input {
vertical-align: text-top;
}
div[contenteditable] {
cursor: text;
min-height: 16px;
p {
margin: 0 0;
padding: 3px 0;
}
}
div[contenteditable=true] { // Nastavitve v naslovu vprasanja ki se prikazejo na hover
border: 1px solid transparent; .spr_edit{
&:hover { cursor: pointer;
background-color: $blue; display: none;
border: 1px solid $blue;
position: absolute;
z-index: 5;
top: 0;
right: 0;
color: $black;
height: 45px;
padding: 10px 14px;
a{
display: inline-block;
margin-left: 8px;
width: 20px;
height: 20px;
color: $black;
&:before,
&:after{
color: $black;
}
.arhiv {
background-position: -16px -30px;
}
.hide {
cursor: pointer;
display: inline-block;
margin-right: 5px;
width: 20px;
height: 20px;
}
} }
&:focus {
background-color: $blue; span.scale_ordnom {
border: 1px dashed silver; vertical-align: 2px;
-webkit-border-radius: 3px; margin-right: 20px;
-moz-border-radius: 3px;
border-radius: 3px; a {
display: inline-block;
height: 20px;
width: auto;
margin: 0;
}
} }
} }
&:hover {
.spr_edit {
display: block;
}
}
.spremenljivka_content{
margin: 0px;
padding: 0px;
color: $black;
background-color: white;
border: 1px solid $gray;
&:hover {
.add-variable {
display: block;
}
background-color: white;
}
// Glava v vprasanju
.spremenljivka_settings{
cursor: pointer;
display: flex;
justify-content: left;
align-items: center;
box-sizing: border-box;
height: 45px;
padding-left: 14px;
background-color: $light-gray;
.variable_name{
font-size: 16px;
font-weight: 600;
line-height: 20px;
color: $black;
}
.spr_settings{
display: flex;
font-size: 14px;
span{
padding-left: 16px;
font-size: 14px;
}
.lock_holder {
position: absolute;
right: 15px;
top: 6px;
}
}
}
// Vsebina pod glavo
.content_div_normalmode {
position: relative;
padding: 24px 32px 32px 32px;
overflow: hidden;
.naslov {
display: block;
width: 100%;
min-width: 100px;
}
.variable_holder{
display: flex;
flex-direction: column;
margin: 0px;
padding: 0px;
.variabla {
padding: 0;
min-height: 20px;
margin: 8px 0 0 0;
.move_updown_orange {
margin-top: 5px;
}
input {
float: left;
margin-top: 5px;
}
}
.vrednost_inline {
float: left;
width: calc(100% - 190px);
/*max-width: 80%;
min-width: 160px;*/
}
select {
margin-top: 5px;
}
.variabla_limit{
width:auto !important;
color: $blue;
margin-top: 6px;
display:inline-block;
}
}
}
// Vsebina - uvod in zakljucek
.spremenljivka_tekst_form {
position: relative;
padding: 24px 32px 32px 32px;
.naslov {
display: block;
width: auto;
min-width: 100px;
}
}
h3 {
margin: 0;
padding: 0;
border: 0;
p {
margin: 0;
padding: 0;
border: 0;
}
}
form {
margin: 0;
padding: 0;
border: 0;
}
p {
margin: 0;
padding: 0;
border: 0;
padding: 3px;
}
input {
vertical-align: text-top;
}
.grid_inline,
.vrednost_inline,
.naslov{
box-sizing: border-box;
padding: 4px 8px;
font-size: 14px;
p{
padding: 0;
font-size: 14px;
}
}
div[contenteditable] {
cursor: text;
min-height: 26px;
}
div[contenteditable=true] {
border: 1px solid transparent;
border-radius: 4px;
&:hover {
background-color: $white;
border: 1px solid $gray;
}
&:focus {
background-color: $white;
border: 1px solid $gray;
}
}
.display_editor {
cursor: pointer;
visibility: hidden;
position: absolute;
right: 40px;
top: 25px;
}
}
} }
.spr_editing {
.spremenljivka_content { // Aktiven element - urejanje vprasanja
.add-variable { li.spr_editing {
.spr_edit {
display: block;
a,
span{
color: white !important;
&:before,
&:after{
color: white !important;
}
}
}
.spremenljivka_content {
background-color: white;
.spremenljivka_settings {
color: white !important;
background-color: $blue !important;
border: 1px solid $blue;
.spr_settings{
span.red {
color: white !important;
}
}
#spr_settings_intro_concl{
div.red{
color: white !important;
}
}
}
.content_div_normalmode{
border: 1px solid $blue;
}
.comment_container_inline {
border-top: none;
border-left: 1px solid $blue;
border-right: 1px solid $blue;
border-bottom: 1px solid $blue;
}
.spremenljivka_tekst_form {
border: 1px solid $blue;
}
.add-variable {
display: none; display: none;
} }
} }
.content_div_normalmode { .content_div_normalmode {
padding-bottom: 10px; padding-bottom: 10px;
} }
@ -136,44 +379,18 @@ and open the template in the editor.
display: table-row; display: table-row;
} }
div[contenteditable][default="1"] { div[contenteditable][default="1"] {
color: $gray; color: $black;
}
}
.spremenljivka_tekst_form {
padding: 10px 5px 5px 10px;
}
.spremenljivka_tip_content {
padding: 5px 5px 5px 10px;
}
.content_div_normalmode {
position: relative;
padding: 10px 5px 20px;
overflow: hidden;
}
.naslov {
width: auto;
min-width: 100px;
display: block;
padding-top: 3px;
}
#variable_holder {
.variabla_limit{
width:auto !important;
color: $yellow;
margin-top: 6px;
display:inline-block;
}
}
.variable_holder {
padding: 0px 0px 0px 30px;
vertical-align: top;
margin: 0px;
display: block;
clear: both;
select {
margin-top: 5px;
} }
.variable_name {
color: white;
}
} }
.variable_holder.clr { .variable_holder.clr {
height: auto; height: auto;
} }
@ -200,18 +417,7 @@ div.spremenljivka_content {
cursor: pointer; cursor: pointer;
float: left; float: left;
} }
div.variabla {
input {
float: left;
margin-top: 5px;
}
clear: both;
padding: 2px 5px;
min-height: 22px;
.move_updown_orange {
margin-top: 5px;
}
}
span.inline_edit { span.inline_edit {
float: right; float: right;
margin: 0 3px; margin: 0 3px;
@ -284,11 +490,7 @@ li.spr.spr_editing {
clear: both; clear: both;
padding: 2px 15px; padding: 2px 15px;
} }
div.naslov_inline {
min-width: 50px;
padding: 2px 15px;
margin-bottom: 2px;
}
div.variable_inline { div.variable_inline {
display: none; display: none;
float: left; float: left;
@ -296,13 +498,7 @@ div.variable_inline {
padding: 2px 15px; padding: 2px 15px;
font-weight: bold; font-weight: bold;
} }
span.display_editor {
position: absolute;
right: 10px;
top: 11px;
cursor: pointer;
visibility: hidden;
}
.spr.spr_editing { .spr.spr_editing {
span.display_editor { span.display_editor {
visibility: visible; visibility: visible;
@ -313,30 +509,7 @@ span.display_editor {
visibility: visible; visibility: visible;
} }
} }
/*div.naslov {
textarea.inline {
width: 99%;
}
}
div.variabla {
textarea.inline {
min-height: 11px;
min-width: 50%;
}
}
td.grid_question {
textarea.inline {
height: 11px;
width: 90%;
}
}
td.grid_header {
textarea.inline {
width: 99%;
height: 22px;
text-align: center;
}
}*/
div.spremenljivka_content.orientation_pod { div.spremenljivka_content.orientation_pod {
div.variabla { div.variabla {
clear: none; clear: none;
@ -374,25 +547,7 @@ li {
} }
} }
} }
/*settings marks of question in top left corner (reminders, system,...)*/
#spr_settings {
float: left;
width: auto;
padding-top: 4px;
vertical-align: bottom;
.lock_holder {
position: absolute;
right: 15px;
top: 6px;
}
span {
img {
padding-left: 5px;
vertical-align: bottom;
}
vertical-align: bottom;
}
}
#spr_settings_intro_concl { #spr_settings_intro_concl {
float: left; float: left;
width: auto; width: auto;
@ -407,42 +562,13 @@ table.text_vrednost {
text-align: center; text-align: center;
font-size: 10px; font-size: 10px;
} }
div.vrednost_inline {
float: left;
max-width: 80%;
min-width: 160px;
padding: 2px 15px;
}
.spremenljivka_settings {
padding: 3px 5px 3px 5px;
background-color: $blue;
min-height: 24px;
}
.spremenljivka_settings.movable {
cursor: pointer;
}
.spremenljivka_settings_active {
background-color: $blue;
}
.variable_name {
float: left;
font-size: 14px;
padding: 2px 10px 2px 5px;
color: $gray;
font-weight: 500;
}
.variable { .variable {
color: $gray; color: $gray;
font-weight: 500; font-weight: 500;
} }
.spr_edit {
z-index: 5;
position: absolute;
top: 0;
right: 0;
margin-right: 10px;
padding-top: 7px;
}
.comment_container_inline { .comment_container_inline {
margin: 0px; margin: 0px;
padding: 4px 15px; padding: 4px 15px;

View File

@ -45,14 +45,14 @@
color: $gray; color: $gray;
} }
// Urejanje anekte // Urejanje ankete
@import "toolbox"; @import "toolbox";
@import "voting"; @import "glasovanje";
@import "form"; @import "forma";
@import "other"; @import "other";
@import "branching_expanded"; @import "branching";
@import "branching_collapsed"; @import "branching_collapsed";
@import "question_settings"; @import "question_right_settings";
@import "questions/questions"; @import "questions/questions";
@import "conditions"; @import "conditions";
@import "library"; @import "library";