diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 3110a1704..f9f97e6cb 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -1809,11 +1809,14 @@ class Branching { // napis uvod na začetku echo '
  • '; - echo ''.$lang['srv_intro_page'].''; + echo '
    '; + echo '
    '.$lang['srv_intro_page'].'
    '; + echo '
    '; + echo '
    '; echo '
    • '; echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; // Ce imamo slucajno GDPR preduvod @@ -1830,7 +1833,7 @@ class Branching { echo ''; echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; } } @@ -1869,7 +1872,7 @@ class Branching { if ($this->survey_type != 1) { echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; $first = $this->find_first_spr(); @@ -1877,19 +1880,22 @@ class Branching { // Zaenkrat imamo vedno isti text za strani if ($first > 0){ - /*$gr = $this->getGrupa4Spremenljivka($first);*/ $gr = $this->getGrupa4Spremenljivka($first); $naslov = $lang['srv_stran'].' '.$gr['vrstni_red']; } else $naslov = $lang['srv_stran'].' 1'; - echo ''.$naslov.''; + echo '
    '; + echo '
    '.$naslov.'
    '; + echo '
    '; + echo '
    '; + echo ''; } echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; } @@ -1903,11 +1909,14 @@ class Branching { // napis zakljucek prikazemo tukaj in ne za zadnjo spremenljivko da je lepse echo '
  • '; - echo ''.$lang['srv_end_page'].''; + echo '
    '; + echo '
    '.$lang['srv_end_page'].'
    '; + echo '
    '; + echo '
    '; echo '
    • '; echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; echo '
  • '; @@ -1970,7 +1979,6 @@ class Branching { global $lang; $row = SurveyInfo::getInstance()->getSurveyRow(); - #$this->survey_type = SurveyAdmin::getSurvey_type($this->anketa); $this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type"); if ($row['flat'] == 0) @@ -1989,76 +1997,75 @@ class Branching { } echo '
    • '; - //echo '
  • '; if ($this->pagebreak($spremenljivka)) { + $gr = $this->getGrupa4Spremenljivka($this->find_next_spr($spremenljivka)); + if ($gr['id'] > 0) { echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; // ++ zadnji pagebreak prikazan izven ifa // // ce je spremenljivka zadnja v IFu, ne prikazemo PB, ker ga bomo za ENDIFom $rows = Cache::srv_branching($spremenljivka, 0); if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) { - echo '
  • '; - //echo ''.$gr['naslov'].''; - echo ''.$lang['srv_stran'].' '.$gr['vrstni_red'].''; + + echo '
  • '; + echo '
    '; + echo '
    '.$lang['srv_stran'].' '.$gr['vrstni_red'].'
    '; + echo '
    '; + echo '
    '; + echo '
    '; echo '
    • '; + echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; } - // -- zadnji pagebreak prikazan izven ifa // - } elseif($this->survey_type != 1) { + + } + // -- zadnji pagebreak prikazan izven ifa // + elseif($this->survey_type != 1) { echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; - - /*echo '
  • '; - echo ''.$lang['srv_end_label'].''; - echo '
    • '; - - echo '
  • '; - echo ''; - echo '
    • ';*/ } - } 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 '
  • '; - echo ''; + echo '
    '; echo '
    • '; - /*echo '
  • '; - echo ''.$lang['srv_end_label'].''; - echo '
    • '; - - echo '
  • '; - echo ''; - echo '
    • ';*/ - - } elseif ($this->survey_type != 1) { //pri formi ne dovolimo dodajanja page-breakov + } + // pri formi ne dovolimo dodajanja page-breakov + elseif ($this->survey_type != 1) { // 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 $rows = Cache::srv_branching($spremenljivka, 0); if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) { echo '
  • '; - echo ''; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; echo '
    • '; - } else { // zadnji spremenljivki v ifu izpisemo PB izven ifa (da je bolj pregledno in lepse) + } + // zadnji spremenljivki v ifu izpisemo PB izven ifa (da je bolj pregledno in lepse) + else { echo '
  • '; - echo ''; + echo '
    '; echo '
    • '; } - } elseif ($this->survey_type == 1) { // forma + } + // forma + elseif ($this->survey_type == 1) { echo '
  • '; echo '
    • '; } - - //echo ''; - } function display_if_label($if) { @@ -2129,11 +2136,16 @@ class Branching { if ($gr['id'] > 0) { - echo '
  • '; - echo ''; + echo '
  • '; + echo '
    '; echo '
    • '; - echo '
  • '; - echo ''.$lang['srv_stran'].' '.$gr['vrstni_red'].''; + + echo '
  • '; + echo '
    '; + echo '
    '.$lang['srv_stran'].' '.$gr['vrstni_red'].'
    '; + echo '
    '; + echo '
    '; + echo '
    '; echo '
    • '; } @@ -2142,9 +2154,13 @@ class Branching { // 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) ) { echo '
  • '; - echo ''; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; echo '
    • '; - } else { + } + else { echo '
  • '; echo '
    • '; } diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js index 96575ae68..a883a609b 100644 --- a/admin/survey/script/branching.js +++ b/admin/survey/script/branching.js @@ -364,15 +364,20 @@ function branching_click(event) { } // 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')) { - var spr; - if (td.parent().attr('spr_pb')) - spr = td.parent().attr('spr_pb'); - else - spr = td.parent().attr('spr'); - if (!td.hasClass('permanent')) + + if (!td.hasClass('permanent')){ + var spr; + + if (td.parent().attr('spr_pb')) + spr = td.parent().attr('spr_pb'); + else + spr = td.parent().attr('spr'); + pagebreak(spr); + } + return false; } diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 10f070a0f..beac4970d 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -2609,55 +2609,6 @@ function show_tip_preview(spr, value) { $("#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) 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 width = $("#spremenljivka_podtip_"+spr).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" } ); + // prikažemo glavni div + $("#tip_preview").show(); + + // priredimo še vsebino + $("[name=tip_preview_sub]:visible").hide(); + $("#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" } ); + } // pri popuupu za dodajanje advanced tipov vprasanj - } else { + else { - //pozicioniramo div - var pos = $("#toolbox_add_advanced div[tip="+tip+"][podtip="+design+"]").offset(); - var width = $("#toolbox_add_advanced div[tip="+tip+"][podtip="+design+"]").width(); - $("#tip_preview").css( { "left": (10+pos.left + width) + "px", "right":"auto", "top":(10+pos.top) + "px" } ); - } + // pozicioniramo div + $("#tip_preview").css({"left":"520px"}); - // prikažemo glavni div - $("#tip_preview").show(); + // prikažemo glavni div + $("#tip_preview").show(); - - // priredimo še vsebino - $("[name=tip_preview_sub]:visible").hide(); - $("#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" } ); + // priredimo še vsebino + $("[name=tip_preview_sub]:visible").hide(); + $("#tip_preview_sub_" + val).show(); + } } // skrijemo div za preview diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 5ae55f746..6a98a3d75 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10844,7 +10844,6 @@ and open the template in the editor. position: fixed; z-index: 9999; top: 220px; - left: 245px; box-sizing: border-box; width: 450px; max-height: 520px; @@ -11140,50 +11139,6 @@ and open the template in the editor. Created on : 03-Aug-2018, 13:12:19 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 #1E88E5; -} -.empty_vrivanje .empty_vrivanje_title { - margin: 0 auto; - padding: 8px 20px; - font-size: 16px; - font-weight: 500; - color: #1E88E5; - background-color: #1E88E5; - border: 1px solid #1E88E5; -} -.empty_vrivanje .empty_vrivanje_subtitle { - margin: 15px auto 0 auto; - font-size: 14px; - font-weight: 400; -} -.empty_vrivanje .empty_vrivanje_subtitle a { - font-weight: 500; -} - -.empty_vrivanje.branchinghover { - color: white; - background: 0 !important; - background-color: #FFC700; -} -.empty_vrivanje.branchinghover a { - display: inline !important; - color: white; -} -.empty_vrivanje.branchinghover .empty_vrivanje_title { - color: white; - background-color: #FFC700; - border-color: white; -} - .editmenu { float: right; margin: 2px 0px 0px 0px; @@ -11382,13 +11337,7 @@ 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 : 07-Aug-2018, 09:43:11 - Author : podkrizniku + Osnova za branching */ #placeholder { display: flex; @@ -11403,422 +11352,103 @@ and open the template in the editor. background-color: white; } #branching ul { + display: flex; + flex-direction: column; padding: 0; margin: 0; + /*> ul{ + padding-left: 25px; + + > ul{ + padding-left: 25px; + + ul{ + padding-left: 25px; + } + } + }*/ } -#branching li { +#branching ul li { + box-sizing: border-box; + width: 100%; + margin: 0; + padding: 0; list-style: none; } -#branching li div.if_remove { +#branching ul li.drop { + height: 16px; +} +#branching ul li.drop:hover .pb_new { + display: flex; +} +#branching ul li.drop:hover .pb_icon { + display: block; +} +#branching ul li.nodrop { + height: 16px; +} +#branching ul li.nodrop:hover .pb_new { + display: flex; +} +#branching ul li.nodrop:hover .pb_icon { + display: block; +} +#branching ul li .pb_on, +#branching ul li .pb_new { + cursor: pointer; + display: flex; + align-items: center; +} +#branching ul li .pb_on.pb_new, +#branching ul li .pb_new.pb_new { display: none; } -#branching li.spr { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; +#branching ul li .pb_on.permanent, +#branching ul li .pb_new.permanent { + cursor: default; } -#branching li.spr div.spr_edit { +#branching ul li .pb_on .pb_page, +#branching ul li .pb_new .pb_page { + width: 130px; + font-size: 16px; + font-weight: 600; + line-height: 20px; + color: #A9A9A9; +} +#branching ul li .pb_on .pb_line, +#branching ul li .pb_new .pb_line { + width: 100%; + height: 1px; + border-bottom: 1px #D3D3D3 solid; +} +#branching ul li .pb_on .pb_icon, +#branching ul li .pb_new .pb_icon { display: none; } -#branching li.spr:hover div.spr_edit { - display: block; -} -#branching li.if { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.if:hover span.conditions_display { - background-color: #1E88E5; - cursor: pointer; -} -#branching li.if:hover div.if_remove { - display: block; -} -#branching li.block { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.block:hover span.conditions_display { - background-color: #f1f1ff; - cursor: pointer; -} -#branching li.block:hover div.if_remove { - display: block; -} -#branching li.loop { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.loop:hover span.conditions_display { - background-color: #eef9ff; - cursor: pointer; -} -#branching li.loop:hover div.if_remove { - display: block; -} -#branching li.endif { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.endif:hover { - background-color: #1E88E5; - cursor: pointer; -} -#branching li.endblock { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.endblock:hover { - background-color: #f1f1ff; - cursor: pointer; -} -#branching li.endloop { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.endloop:hover { - background-color: #eef9ff; - cursor: pointer; -} -#branching li.inout { - margin-left: 40px; - position: relative; - border-left: 2.5px solid transparent; -} -#branching li.inout:hover { - background-color: #f1f1ff; - cursor: pointer; -} -#branching li.if.if_editing { - border-color: #1E88E5; - background-color: #1E88E5; -} -#branching li.if.if_editing div.if_remove { - display: block; -} -#branching li.block.if_editing { - border-color: #1E88E5; - background-color: #f1f1ff; -} -#branching li.block.if_editing div.if_remove { - display: block; -} -#branching li.loop.if_editing { - border-color: #1E88E5; - background-color: #eef9ff; -} -#branching li.loop.if_editing div.if_remove { - display: block; -} -#branching ul.if_editing li.spr { - border-color: #1E88E5; -} -#branching ul.if_editing li.if { - border-color: #1E88E5; -} -#branching ul.if_editing li.block { - border-color: #1E88E5; -} -#branching ul.if_editing li.loop { - border-color: #1E88E5; -} -#branching ul.if_editing li.endif { - border-color: #1E88E5; -} -#branching ul.if_editing li.endblock { - border-color: #1E88E5; -} -#branching ul.if_editing li.endloop { - border-color: #1E88E5; -} -#branching ul.if_editing li.inout { - border-color: #1E88E5; -} -#branching ul.if_editing li.drop { - border-color: #1E88E5; -} -#branching ul.if_editing li.nodrop { - border-color: #1E88E5; -} -#branching li.if.if_hovering { - border-color: #1E88E5; - background-color: #1E88E5; -} -#branching li.block.if_hovering { - border-color: #1E88E5; - background-color: #f1f1ff; -} -#branching li.loop.if_hovering { - border-color: #1E88E5; - background-color: #eef9ff; -} -#branching ul.if_hovering li.spr { - border-color: #1E88E5; -} -#branching ul.if_hovering li.if { - border-color: #1E88E5; -} -#branching ul.if_hovering li.block { - border-color: #1E88E5; -} -#branching ul.if_hovering li.loop { - border-color: #1E88E5; -} -#branching ul.if_hovering li.endif { - border-color: #1E88E5; -} -#branching ul.if_hovering li.endblock { - border-color: #1E88E5; -} -#branching ul.if_hovering li.endloop { - border-color: #1E88E5; -} -#branching ul.if_hovering li.inout { - border-color: #1E88E5; -} -#branching ul.if_hovering li.drop { - border-color: #1E88E5; -} -#branching ul.if_hovering li.nodrop { - border-color: #1E88E5; -} -#branching ul.if_hovering li.endloop { - background-color: #eef9ff; -} -#branching ul.if_hovering li.endblock { - background-color: #f1f1ff; -} -#branching ul.if_hovering li.endif { - background-color: #1E88E5; +#branching ul li .pb_on .pb_icon:before, +#branching ul li .pb_new .pb_icon:before { + content: "A"; } #branching li.spr.ui-draggable-dragging { z-index: 99999; } -#branching div.spr_edit { - cursor: pointer; - color: #E5E5E5; - cursor: pointer; - display: inline-block; - height: 26px; -} -#branching div.spr_edit a.arhiv { - background-position: -16px -30px; -} -#branching div.spr_edit a { - cursor: pointer; - display: inline-block; - margin-left: 9px; - width: 20px; - height: 20px; -} -#branching div.spr_edit span.scale_ordnom { - vertical-align: 2px; - margin-right: 20px; - color: #1E88E5; -} -#branching div.spr_edit span.scale_ordnom a { - cursor: pointer; - display: inline-block; - height: 20px; - width: auto; - margin: 0; - background-image: none; - color: #1E88E5; -} -#branching div.spr_edit span.scale_ordnom a:hover { - color: #FFC700; -} -#branching div.spr_edit a.hide { - cursor: pointer; - display: inline-block; - margin-right: 5px; - width: 20px; - height: 20px; -} -#branching li.spr.spr_editing div.spr_edit { - display: block; - padding-top: 9px; -} #branching li.drop.branchinghover { - background-color: #FFC700 !important; + background-color: #E5E5E5 !important; } #branching li.drop.branchinghover a { display: none; } #branching li.nodrop.branchinghover { - background-color: #FFC700 !important; + background-color: #E5E5E5 !important; } #branching li.nodrop.branchinghover a { display: none; } -#branching a.pm { - position: absolute; - left: auto; - float: none; - margin: 9px 0 0 -15px; - cursor: pointer; -} -#branching a.pm.minus { - margin-top: 12px; -} -#branching .spr_editing .spremenljivka_content { - background-color: white; - border: 1px solid transparent; -} -#branching .spr_editing .spremenljivka_content .spremenljivka_settings { - background-color: #FFC700 !important; - border: 1px solid #FFC700; -} -#branching .spr_editing .spremenljivka_content .spremenljivka_settings .spr_settings span.red { - color: white !important; -} -#branching .spr_editing .spremenljivka_content .spremenljivka_settings #spr_settings_intro_concl div.red { - color: white !important; -} -#branching .spr_editing .spremenljivka_content .content_div_normalmode { - border: 1px solid #FFC700; -} -#branching .spr_editing .spremenljivka_content .comment_container_inline { - border-top: none; - border-left: 1px solid #1E88E5; - border-right: 1px solid #1E88E5; - border-bottom: 1px solid #1E88E5; -} -#branching .spr_editing .spremenljivka_content .spremenljivka_tekst_form { - border: 1px solid #FFC700; -} -#branching .spr_editing .variable_name { - color: white; -} #branching .variable_name { cursor: move; } -#branching div.if_remove { - padding-top: 0px; - margin-top: 4px; -} -#branching 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;*/ -} -#branching li.spr_editing div.spr_edit span.scale_ordnom { - color: white; -} -#branching li.spr_editing div.spr_edit span.scale_ordnom a { - color: white; -} -#branching li.spr_editing div.spr_edit a.faicon { - color: white !important; -} - -#branching.expanded li.spr { - padding-top: 1px; - padding-bottom: 1px; -} -#branching.expanded li.if { - padding-top: 1px; - padding-bottom: 1px; -} -#branching.expanded li.block { - padding-top: 1px; - padding-bottom: 1px; -} -#branching.expanded li.loop { - padding-top: 1px; - padding-bottom: 1px; -} -#branching.expanded li.drop { - min-height: 16px; - margin: 2px 0 2px 50px; - margin: 0px 0 0px 40px; - padding: 2px 0px 2px 10px; -} -#branching.expanded li.drop 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: #E5E5E5; - font-size: 14px; - font-weight: 600; - height: 20px; - line-height: 20px; - margin-top: 0; -} -#branching.expanded li.drop span.pb_off { - display: inline-block; - width: 100%; - height: 16px; -} -#branching.expanded li.drop span.pb_new { - display: inline-block; - width: 100%; - height: 16px; -} -#branching.expanded li.drop:hover span.pb_on { - background: url("../../../admin/survey/img_0/sprites_pb_expanded.png") no-repeat 100px -52px; - cursor: pointer; -} -#branching.expanded li.drop:hover span.pb_new { - background: url("../../../admin/survey/img_0/sprites_pb_expanded.png") no-repeat 0px -23px; - cursor: pointer; -} -#branching.expanded 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; -} -#branching.expanded li.nodrop 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: #E5E5E5; - font-size: 14px; - font-weight: 600; - height: 20px; - line-height: 20px; - margin-top: 0; -} -#branching.expanded li.nodrop span.pb_off { - display: inline-block; - width: 100%; - height: 16px; -} -#branching.expanded li.nodrop span.pb_new { - display: inline-block; - width: 100%; - height: 16px; -} -#branching.expanded li.nodrop:hover span.pb_on { - background: url("../../../admin/survey/img_0/sprites_pb_expanded.png") no-repeat 100px -52px; - cursor: pointer; -} -#branching.expanded li.nodrop:hover span.pb_new { - background: url("../../../admin/survey/img_0/sprites_pb_expanded.png") no-repeat 0px -23px; - cursor: pointer; -} -#branching.expanded li.nodrop:hover span.permanent { - background: url("../../../admin/survey/img_0/sprites_pb_expanded.png") no-repeat 100px 10px; - cursor: default; -} -#branching.expanded span.pb_on span { - background-color: white; - padding-right: 20px; - pointer-events: none; +#branching #bottom_icons_holder { + display: none; } .branchinghover { @@ -11835,18 +11465,48 @@ and open the template in the editor. font-size: 14px; } -#spremenljivka_content_-1 { - position: relative; +/* 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 #1E88E5; } -#spremenljivka_content_-1 span.display_editor { - top: 40px; +.empty_vrivanje .empty_vrivanje_title { + margin: 0 auto; + padding: 8px 20px; + font-size: 16px; + font-weight: 500; + color: #1E88E5; + background-color: #1E88E5; + border: 1px solid #1E88E5; +} +.empty_vrivanje .empty_vrivanje_subtitle { + margin: 15px auto 0 auto; + font-size: 14px; + font-weight: 400; +} +.empty_vrivanje .empty_vrivanje_subtitle a { + font-weight: 500; } -#spremenljivka_content_-2 { - position: relative; +.empty_vrivanje.branchinghover { + color: white; + background: 0 !important; + background-color: #E5E5E5; } -#spremenljivka_content_-2 span.display_editor { - top: 40px; +.empty_vrivanje.branchinghover a { + display: inline !important; + color: white; +} +.empty_vrivanje.branchinghover .empty_vrivanje_title { + color: white; + background-color: #E5E5E5; + border-color: white; } /* @@ -12235,13 +11895,7 @@ and open the template in the editor. Author : podkrizniku */ /* -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 : 03-Aug-2018, 09:55:43 - Author : podkrizniku + Branching element z vprasanjem */ .editor_display { width: 98%; @@ -12296,119 +11950,263 @@ and open the template in the editor. display: none !important; } -.spremenljivka_content { - margin: 2px 0px 10px 0px; - padding: 0px; - color: #E5E5E5; - background-color: white; - border: 1px solid #1E88E5; +li.spr { + color: #333333; } -.spremenljivka_content:hover { - background-color: white; +li.spr .spr_edit { + cursor: pointer; + display: none; + position: absolute; + z-index: 5; + top: 0; + right: 0; + color: #333333; + height: 45px; + padding: 10px 14px; } -.spremenljivka_content:hover .add-variable { +li.spr .spr_edit a { + display: inline-block; + margin-left: 8px; + width: 20px; + height: 20px; + color: #333333; +} +li.spr .spr_edit a:before, li.spr .spr_edit a:after { + color: #333333; +} +li.spr .spr_edit a .arhiv { + background-position: -16px -30px; +} +li.spr .spr_edit a .hide { + cursor: pointer; + display: inline-block; + margin-right: 5px; + width: 20px; + height: 20px; +} +li.spr .spr_edit span.scale_ordnom { + vertical-align: 2px; + margin-right: 20px; +} +li.spr .spr_edit span.scale_ordnom a { + display: inline-block; + height: 20px; + width: auto; + margin: 0; +} +li.spr:hover .spr_edit { display: block; } -.spremenljivka_content h3 { +li.spr .spremenljivka_content { + margin: 0px; + padding: 0px; + color: #333333; + background-color: white; + border: 1px solid #E5E5E5; +} +li.spr .spremenljivka_content:hover { + background-color: white; +} +li.spr .spremenljivka_content:hover .add-variable { + display: block; +} +li.spr .spremenljivka_content .spremenljivka_settings { + cursor: pointer; + display: flex; + justify-content: left; + align-items: center; + box-sizing: border-box; + height: 45px; + padding-left: 14px; + background-color: #F8F8F8; +} +li.spr .spremenljivka_content .spremenljivka_settings .variable_name { + font-size: 16px; + font-weight: 600; + line-height: 20px; + color: #333333; +} +li.spr .spremenljivka_content .spremenljivka_settings .spr_settings { + display: flex; + font-size: 14px; +} +li.spr .spremenljivka_content .spremenljivka_settings .spr_settings span { + padding-left: 16px; + font-size: 14px; +} +li.spr .spremenljivka_content .spremenljivka_settings .spr_settings .lock_holder { + position: absolute; + right: 15px; + top: 6px; +} +li.spr .spremenljivka_content .content_div_normalmode { + position: relative; + padding: 24px 32px 32px 32px; + overflow: hidden; +} +li.spr .spremenljivka_content .content_div_normalmode .naslov { + display: block; + width: 100%; + min-width: 100px; +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder { + display: flex; + flex-direction: column; + margin: 0px; + padding: 0px; +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder .variabla { + padding: 0; + min-height: 20px; + margin: 8px 0 0 0; +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder .variabla .move_updown_orange { + margin-top: 5px; +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder .variabla input { + float: left; + margin-top: 5px; +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder .vrednost_inline { + float: left; + width: calc(100% - 190px); + /*max-width: 80%; + min-width: 160px;*/ +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder select { + margin-top: 5px; +} +li.spr .spremenljivka_content .content_div_normalmode .variable_holder .variabla_limit { + width: auto !important; + color: #1E88E5; + margin-top: 6px; + display: inline-block; +} +li.spr .spremenljivka_content .spremenljivka_tekst_form { + position: relative; + padding: 24px 32px 32px 32px; +} +li.spr .spremenljivka_content .spremenljivka_tekst_form .naslov { + display: block; + width: auto; + min-width: 100px; +} +li.spr .spremenljivka_content h3 { margin: 0; padding: 0; border: 0; } -.spremenljivka_content h3 p { +li.spr .spremenljivka_content h3 p { margin: 0; padding: 0; border: 0; } -.spremenljivka_content form { +li.spr .spremenljivka_content form { margin: 0; padding: 0; border: 0; } -.spremenljivka_content p { +li.spr .spremenljivka_content p { margin: 0; padding: 0; border: 0; padding: 3px; } -.spremenljivka_content input { +li.spr .spremenljivka_content input { vertical-align: text-top; } -.spremenljivka_content div[contenteditable] { +li.spr .spremenljivka_content .grid_inline, +li.spr .spremenljivka_content .vrednost_inline, +li.spr .spremenljivka_content .naslov { + box-sizing: border-box; + padding: 4px 8px; + font-size: 14px; +} +li.spr .spremenljivka_content .grid_inline p, +li.spr .spremenljivka_content .vrednost_inline p, +li.spr .spremenljivka_content .naslov p { + padding: 0; + font-size: 14px; +} +li.spr .spremenljivka_content div[contenteditable] { cursor: text; - min-height: 16px; + min-height: 26px; } -.spremenljivka_content div[contenteditable] p { - margin: 0 0; - padding: 3px 0; -} -.spremenljivka_content div[contenteditable=true] { +li.spr .spremenljivka_content div[contenteditable=true] { border: 1px solid transparent; + border-radius: 4px; } -.spremenljivka_content div[contenteditable=true]:hover { - background-color: #1E88E5; +li.spr .spremenljivka_content div[contenteditable=true]:hover { + background-color: #FFFFFF; + border: 1px solid #E5E5E5; +} +li.spr .spremenljivka_content div[contenteditable=true]:focus { + background-color: #FFFFFF; + border: 1px solid #E5E5E5; +} +li.spr .spremenljivka_content .display_editor { + cursor: pointer; + visibility: hidden; + position: absolute; + right: 40px; + top: 25px; +} + +li.spr_editing .spr_edit { + display: block; +} +li.spr_editing .spr_edit a, +li.spr_editing .spr_edit span { + color: white !important; +} +li.spr_editing .spr_edit a:before, li.spr_editing .spr_edit a:after, +li.spr_editing .spr_edit span:before, +li.spr_editing .spr_edit span:after { + color: white !important; +} +li.spr_editing .spremenljivka_content { + background-color: white; +} +li.spr_editing .spremenljivka_content .spremenljivka_settings { + color: white !important; + background-color: #1E88E5 !important; border: 1px solid #1E88E5; } -.spremenljivka_content div[contenteditable=true]:focus { - background-color: #1E88E5; - border: 1px dashed silver; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +li.spr_editing .spremenljivka_content .spremenljivka_settings .spr_settings span.red { + color: white !important; } - -.spr_editing .spremenljivka_content .add-variable { +li.spr_editing .spremenljivka_content .spremenljivka_settings #spr_settings_intro_concl div.red { + color: white !important; +} +li.spr_editing .spremenljivka_content .content_div_normalmode { + border: 1px solid #1E88E5; +} +li.spr_editing .spremenljivka_content .comment_container_inline { + border-top: none; + border-left: 1px solid #1E88E5; + border-right: 1px solid #1E88E5; + border-bottom: 1px solid #1E88E5; +} +li.spr_editing .spremenljivka_content .spremenljivka_tekst_form { + border: 1px solid #1E88E5; +} +li.spr_editing .spremenljivka_content .add-variable { display: none; } -.spr_editing .content_div_normalmode { +li.spr_editing .content_div_normalmode { padding-bottom: 10px; } -.spr_editing .grid-plus-minus { +li.spr_editing .grid-plus-minus { visibility: visible; } -.spr_editing .sub-table { +li.spr_editing .sub-table { display: table-row; } -.spr_editing div[contenteditable][default="1"] { - color: #E5E5E5; +li.spr_editing div[contenteditable][default="1"] { + color: #333333; } - -.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: #FFC700; - margin-top: 6px; - display: inline-block; -} - -.variable_holder { - padding: 0px 0px 0px 30px; - vertical-align: top; - margin: 0px; - display: block; - clear: both; -} -.variable_holder select { - margin-top: 5px; +li.spr_editing .variable_name { + color: white; } .variable_holder.clr { @@ -12434,18 +12232,6 @@ div.spremenljivka_content span.inline { cursor: pointer; float: left; } -div.spremenljivka_content div.variabla { - clear: both; - padding: 2px 5px; - min-height: 22px; -} -div.spremenljivka_content div.variabla input { - float: left; - margin-top: 5px; -} -div.spremenljivka_content div.variabla .move_updown_orange { - margin-top: 5px; -} div.spremenljivka_content span.inline_edit { float: right; margin: 0 3px; @@ -12514,12 +12300,6 @@ li.spr.spr_editing div.stolpci span.inline_edit { padding: 2px 15px; } -div.naslov_inline { - min-width: 50px; - padding: 2px 15px; - margin-bottom: 2px; -} - div.variable_inline { display: none; float: left; @@ -12528,14 +12308,6 @@ div.variable_inline { font-weight: bold; } -span.display_editor { - position: absolute; - right: 10px; - top: 11px; - cursor: pointer; - visibility: hidden; -} - .spr.spr_editing span.display_editor { visibility: visible; } @@ -12544,30 +12316,6 @@ span.display_editor { 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.variabla { clear: none; } @@ -12592,26 +12340,6 @@ li div.spremenljivka_content span.image_upload { float: left; } -/*settings marks of question in top left corner (reminders, system,...)*/ -#spr_settings { - float: left; - width: auto; - padding-top: 4px; - vertical-align: bottom; -} -#spr_settings .lock_holder { - position: absolute; - right: 15px; - top: 6px; -} -#spr_settings span { - vertical-align: bottom; -} -#spr_settings span img { - padding-left: 5px; - vertical-align: bottom; -} - #spr_settings_intro_concl { float: left; width: auto; @@ -12628,49 +12356,11 @@ table.text_vrednost { 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: #1E88E5; - min-height: 24px; -} - -.spremenljivka_settings.movable { - cursor: pointer; -} - -.spremenljivka_settings_active { - background-color: #1E88E5; -} - -.variable_name { - float: left; - font-size: 14px; - padding: 2px 10px 2px 5px; - color: #E5E5E5; - font-weight: 500; -} - .variable { color: #E5E5E5; font-weight: 500; } -.spr_edit { - z-index: 5; - position: absolute; - top: 0; - right: 0; - margin-right: 10px; - padding-top: 7px; -} - .comment_container_inline { margin: 0px; padding: 4px 15px; @@ -12910,10 +12600,10 @@ and open the template in the editor. padding-bottom: 3px; } .grid_header_table tbody tr:nth-child(odd) { - background-color: #1E88E5; + background-color: #F8F8F8; } .grid_header_table tbody tr:nth-child(odd) td { - background-color: #1E88E5; + background-color: #F8F8F8; } .grid_header_table tbody tr:nth-child(odd) td div[contenteditable=true] { border: 1px solid transparent; @@ -13566,6 +13256,50 @@ and open the template in the editor. Created on : 13-Aug-2018, 12:32:48 Author : podkrizniku */ +li.if .if_remove, +li.block .if_remove, +li.loop .if_remove, +li.if .if_remove { + display: none; +} +li.if:hover span.conditions_display, +li.block:hover span.conditions_display, +li.loop:hover span.conditions_display, +li.if:hover span.conditions_display { + cursor: pointer; +} +li.if:hover div.if_remove, +li.block:hover div.if_remove, +li.loop:hover div.if_remove, +li.if:hover div.if_remove { + display: block; +} + +li.endif:hover, +li.endblock:hover, +li.endloop:hover, +li.inout:hover { + cursor: pointer; +} + +li.if.if_editing div.if_remove, +li.block.if_editing div.if_remove, +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 { background-color: #1E88E5; } @@ -13604,7 +13338,7 @@ span.endif { } .block > div > #div_condition_editing_container { - background-color: #f1f1ff; + background-color: #1E88E5; line-height: 28px; } diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss new file mode 100644 index 000000000..8f5e70314 --- /dev/null +++ b/resources/sass/admin_new/pages/survey_edit/branching.scss @@ -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; + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/branching_expanded.scss b/resources/sass/admin_new/pages/survey_edit/branching_expanded.scss deleted file mode 100644 index 03c760741..000000000 --- a/resources/sass/admin_new/pages/survey_edit/branching_expanded.scss +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss index f1e18e10a..acd10d6b7 100644 --- a/resources/sass/admin_new/pages/survey_edit/conditions.scss +++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss @@ -8,13 +8,63 @@ and open the template in the editor. 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 { background-color: $blue; } li.if_editing { div.if_content { &:before { - background-color: $if_background; + background-color: $blue; content: ""; display: block; height: 15px; @@ -48,7 +98,7 @@ span.endif { .block { >div { >#div_condition_editing_container { - background-color: $block_background; + background-color: $blue; line-height: 28px; } } diff --git a/resources/sass/admin_new/pages/survey_edit/form.scss b/resources/sass/admin_new/pages/survey_edit/forma.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_edit/form.scss rename to resources/sass/admin_new/pages/survey_edit/forma.scss diff --git a/resources/sass/admin_new/pages/survey_edit/voting.scss b/resources/sass/admin_new/pages/survey_edit/glasovanje.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_edit/voting.scss rename to resources/sass/admin_new/pages/survey_edit/glasovanje.scss diff --git a/resources/sass/admin_new/pages/survey_edit/other.scss b/resources/sass/admin_new/pages/survey_edit/other.scss index 883681b0c..28f1b5669 100644 --- a/resources/sass/admin_new/pages/survey_edit/other.scss +++ b/resources/sass/admin_new/pages/survey_edit/other.scss @@ -8,62 +8,6 @@ and open the template in the editor. 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 { float: right; diff --git a/resources/sass/admin_new/pages/survey_edit/question_settings.scss b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_edit/question_settings.scss rename to resources/sass/admin_new/pages/survey_edit/question_right_settings.scss diff --git a/resources/sass/admin_new/pages/survey_edit/questions/grids.scss b/resources/sass/admin_new/pages/survey_edit/questions/grids.scss index 4ef476dc2..52a162406 100644 --- a/resources/sass/admin_new/pages/survey_edit/questions/grids.scss +++ b/resources/sass/admin_new/pages/survey_edit/questions/grids.scss @@ -17,20 +17,25 @@ and open the template in the editor. width: 100%; text-align: center; border-collapse: collapse; - td.grid_header { + + td.grid_header { height: 18px; } + tbody { tr { td { padding-top: 3px; padding-bottom: 3px; } - &:nth-child(odd) { - background-color: $blue; - td { - background-color: $blue; - div[contenteditable=true] { + + &:nth-child(odd) { + background-color: $light-gray; + + td { + background-color: $light-gray; + + div[contenteditable=true] { border: 1px solid transparent; } } diff --git a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss index 150d8f858..ca5b5b20b 100644 --- a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss +++ b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss @@ -1,13 +1,8 @@ /* -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 : 03-Aug-2018, 09:55:43 - Author : podkrizniku + Branching element z vprasanjem */ + .editor_display { width: 98%; background-color: #eee; @@ -58,74 +53,322 @@ and open the template in the editor. display: none !important; } } -.spremenljivka_content { - margin: 2px 0px 10px 0px; - padding: 0px; - color: $gray; - - background-color: white; - border: 1px solid $blue; - &:hover { - .add-variable { - display: block; + +// Neaktiven element +li.spr{ + color: $black; + + // Nastavitve v naslovu vprasanja ki se prikazejo na hover + .spr_edit{ + cursor: pointer; + display: none; + + 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; + } } - background-color: white; - } - h3 { - margin: 0; - padding: 0; - border: 0; - p { - margin: 0; - padding: 0; - border: 0; + + span.scale_ordnom { + vertical-align: 2px; + margin-right: 20px; + + a { + display: inline-block; + height: 20px; + width: auto; + margin: 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] { - border: 1px solid transparent; - &:hover { - background-color: $blue; - border: 1px solid $blue; - } - &:focus { - background-color: $blue; - border: 1px dashed silver; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - } + } + + &: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 { - .add-variable { + +// Aktiven element - urejanje vprasanja +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; } - } + } + .content_div_normalmode { padding-bottom: 10px; } @@ -136,44 +379,18 @@ and open the template in the editor. display: table-row; } div[contenteditable][default="1"] { - color: $gray; - } -} -.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; + color: $black; } + + .variable_name { + color: white; + } } + + + + + .variable_holder.clr { height: auto; } @@ -200,18 +417,7 @@ div.spremenljivka_content { cursor: pointer; 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 { float: right; margin: 0 3px; @@ -284,11 +490,7 @@ li.spr.spr_editing { clear: both; padding: 2px 15px; } -div.naslov_inline { - min-width: 50px; - padding: 2px 15px; - margin-bottom: 2px; -} + div.variable_inline { display: none; float: left; @@ -296,13 +498,7 @@ div.variable_inline { padding: 2px 15px; font-weight: bold; } -span.display_editor { - position: absolute; - right: 10px; - top: 11px; - cursor: pointer; - visibility: hidden; -} + .spr.spr_editing { span.display_editor { visibility: visible; @@ -313,30 +509,7 @@ span.display_editor { 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.variabla { 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 { float: left; width: auto; @@ -407,42 +562,13 @@ table.text_vrednost { text-align: center; 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 { color: $gray; font-weight: 500; } -.spr_edit { - z-index: 5; - position: absolute; - top: 0; - right: 0; - margin-right: 10px; - padding-top: 7px; -} + .comment_container_inline { margin: 0px; padding: 4px 15px; diff --git a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss index 8d3138460..23f22b3da 100644 --- a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss +++ b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss @@ -45,14 +45,14 @@ color: $gray; } -// Urejanje anekte +// Urejanje ankete @import "toolbox"; -@import "voting"; -@import "form"; +@import "glasovanje"; +@import "forma"; @import "other"; -@import "branching_expanded"; +@import "branching"; @import "branching_collapsed"; -@import "question_settings"; +@import "question_right_settings"; @import "questions/questions"; @import "conditions"; @import "library";