diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 3996dd255..544e87dd0 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -1983,7 +1983,7 @@ class Branching { $this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type"); if ($row['flat'] == 0) - $zamik = ( $this->level($spremenljivka,0) > 0 ? ' style="padding-left:'.(10+$this->level($spremenljivka,0)*20).'px"' : '' ); + $zamik = ( $this->level($spremenljivka,0) > 0 ? ' style="padding-left:'.($this->level($spremenljivka,0)*32).'px"' : '' ); else $zamik = ''; @@ -2080,7 +2080,7 @@ class Branching { if ($rowb['tip'] == 0) { $this->conditions_display($if); } elseif ($rowb['tip'] == 1) { - echo 'BLOCK ('.$rowb['number'].')'.($rowb['enabled']==2?' FALSE ':'').($rowb['label']!=''?' ( '.$rowb['label'].' )':'').''; + echo 'BLOCK ('.$rowb['number'].')'.($rowb['enabled']==2?' FALSE ':'').($rowb['label']!=''?' ( '.$rowb['label'].' )':'').''; } elseif ($rowb['tip'] == 2) { $this->loop_display($if); } @@ -2097,7 +2097,7 @@ class Branching { $rowb = Cache::srv_if($if); if ($row['flat'] == 0) - $zamik = ( $this->level(0,$if) > 0 ? ' style="padding-left:'.(10+$this->level(0,$if)*20).'px"' : '' ); + $zamik = ( $this->level(0,$if) > 0 ? ' style="padding-left:'.($this->level(0,$if)*32).'px"' : '' ); else $zamik = ''; @@ -2106,7 +2106,7 @@ class Branching { // plusminus if ($row['flat'] == 0) - echo ''; + echo ''; $this->display_if_label($if); @@ -2177,8 +2177,8 @@ class Branching { $rowb = Cache::srv_if($if); if ($row['flat'] == 0) { - $zamik = ($this->level(0, $if) > 0 ? ' style="padding-left:' . (10 + $this->level(0, $if) * 20) . 'px"' : ''); - $zaklepaj = ($this->level(0, $if) > 0 ? 'margin-left:-' . (10 + $this->level(0, $if) * 20) . 'px;width:' . (15 + $this->level(0, $if) * 20) . 'px;' : ''); + $zamik = ($this->level(0, $if) > 0 ? ' style="padding-left:' . ($this->level(0, $if) * 32) . 'px"' : ''); + $zaklepaj = ($this->level(0, $if) > 0 ? 'margin-left:-' . ($this->level(0, $if) * 32) . 'px;width:' . ($this->level(0, $if) * 32) . 'px;' : ''); } else { $zamik = ''; @@ -2193,7 +2193,7 @@ class Branching { } echo '
  • '; - echo ''.($rowb['tip']==0?'ENDIF':($rowb['tip']==1?'ENDBLOCK':'ENDLOOP')).' ('.$rowb['number'].')'."\n\r"; + echo ''.($rowb['tip']==0?'ENDIF':($rowb['tip']==1?'ENDBLOCK':'ENDLOOP')).' ('.$rowb['number'].')'."\n\r"; // Dodajanje komentarjev na if/blok if ($this->displayKomentarji !== false) { @@ -2675,10 +2675,14 @@ class Branching { echo ' '; echo ''; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; + echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; //koda za notranji IF if ($row1['if_id'] > 0) { @@ -2694,15 +2698,20 @@ class Branching { } else{ if ($length > 30) $class = 'ranking_long'; $class = 'ranking'; - //echo '
    '; + echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; + echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - //koda za notranji IF + + // koda za notranji IF if ($row1['if_id'] > 0) { echo ' *'; @@ -2782,13 +2791,13 @@ class Branching { } if ($row['tip'] == 1 && $row['orientation'] != 8 && $row['orientation'] != 10) { - //echo '
    '; + if($row['orientation'] == 6){ echo '
    '.$row1['variable'].'
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; } elseif($row['orientation'] == 7){ - //echo '
    '.$row1['variable'].'
    ' . $row1['naslov'] . '
    '; - echo '
    '.$row1['variable'].'
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; + + echo '
    '.$row1['variable'].'
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; if ($row1['other'] == 1){ $otherWidth = ($spremenljivkaParams->get('otherWidth') ? $spremenljivkaParams->get('otherWidth') : -1); @@ -2812,17 +2821,18 @@ class Branching { echo ' '; } - echo ' '; - echo ' '; + echo '
    '; + echo ' '; + echo ' '; if($row['tip'] == 1) - echo ' '; - echo ' '; - echo ' '; - + echo ' '; + echo ' '; + echo ' '; + echo '
    '; echo ''; echo ''; - echo'
    '; + echo '
    '; } elseif($row['orientation'] == 9){ echo '
    @@ -2899,13 +2909,14 @@ class Branching { echo ' '; } + echo '
    '; echo ' '; echo ' '; if($row['tip'] == 1) - echo ' '; + echo ' '; echo ' '; echo ' '; - + echo '
    '; echo''; echo ''; @@ -2958,21 +2969,24 @@ class Branching { if ($this->condition_check($row1['if_id']) != 0) echo ' '; } + + echo '
    '; echo ' '; // Kljukica za kviz if(SurveyInfo::getInstance()->checkSurveyModule('quiz')){ - $sqlQ = sisplet_query("SELECT * FROM srv_quiz_vrednost WHERE spr_id='".$row['id']."' AND vre_id='".$row1['id']."'"); + $sqlQ = sisplet_query("SELECT * FROM srv_quiz_vrednost WHERE spr_id='".$row['id']."' AND vre_id='".$row1['id']."'"); echo ' '; } echo ' '; - - if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 3) - echo ' '; + + if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 3) + echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    '; @@ -3161,10 +3175,13 @@ class Branching { echo ''; echo ''; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -3351,10 +3368,13 @@ class Branching { echo ''; echo ''; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -3609,10 +3629,13 @@ class Branching { echo ' '; echo ' '; echo ''; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -3906,11 +3929,13 @@ class Branching { //sredinski del z besedilom echo ' '; echo ''; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; - + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -4021,16 +4046,20 @@ class Branching { if ($length > 30) $class = 'ranking_long'; $class = 'ranking'; - //echo '
    '; + echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - //koda za notranji IF + + // koda za notranji IF if ($row1['if_id'] > 0) { echo ' *'; @@ -4439,10 +4468,13 @@ class Branching { echo ' '; echo ' '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; if($row['enota'] != 9){ @@ -4823,10 +4855,13 @@ class Branching { echo '
    '; echo ' '; echo '
    ' . $_other['naslov'] . '
    '; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    '; @@ -5198,8 +5233,11 @@ class Branching { echo ''; echo '
    ' . $row1['naslov'] . '
    '; + echo '
    '; echo ' '; echo ' '; + echo '
    '; + echo '
    '; } } @@ -5239,10 +5277,14 @@ class Branching { echo '
    '; echo ''; echo '
    ' . $row1['naslov'] . '
    '; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; + echo '
    '; } @@ -5283,10 +5325,13 @@ class Branching { echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; @@ -5339,10 +5384,13 @@ class Branching { echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; @@ -5398,10 +5446,13 @@ class Branching { echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; //echo ' '; echo ''+ - ' '+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    '; + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + + '
    '; } } else if(tip <= 2 && orientation == 8){ //ce imamo radio ali checkbox z drag-drop @@ -749,20 +761,30 @@ function inline_nova_vrednost (_this) { if($(_this).closest('.variabla').parent().find('.image_upload').length){ new_div += ''+ ''+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    '+lang['srv_new_vrednost']+'
    '+ + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + + '
    '+lang['srv_new_vrednost']+'
    '+ + '
    '; } else{ new_div += ''+ - ' '+ - ' '+ - ' '+ - ' '+ - '
    '+lang['srv_new_vrednost']+'
    '+ - '
    '; + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + + '
    '+lang['srv_new_vrednost']+'
    '+ + + '
    '; } } //} else if(tip == 6 && enota == 9){ //ce imamo drag-drop v gridu @@ -770,12 +792,17 @@ function inline_nova_vrednost (_this) { //drag and drop grid var new_div = '
    '+ ''+ - ' '+ - ' '+ - ' '+ - ' '+ + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + '
    '+lang['srv_new_vrednost']+'
    '+ - '
    '; + + '
    '; // ranking } else if (tip == 17) { @@ -784,14 +811,19 @@ function inline_nova_vrednost (_this) { var new_div = '
    '+ ''+ - ' '+ - ' '+ - ' '+ - ' '+ + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + ' '+ '
    '+lang['srv_new_vrednost']+'
    '+ + '
    '; } @@ -800,10 +832,14 @@ function inline_nova_vrednost (_this) { var new_div = '
    '+ ''+ - ' '+ - ' '+ - ' '+ - ' '+ + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + '
    '+lang['srv_new_vrednost']+'
    '+ '
    '; } @@ -813,10 +849,14 @@ function inline_nova_vrednost (_this) { var new_div = '
    '+ ''+ - ' '+ - ' '+ - ' '+ - ' '+ + + '
    '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    '+ + '
    '+lang['srv_new_vrednost']+'
    '+ ' '+ '
    '; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 3470de023..cb66f22b4 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10739,6 +10739,70 @@ and open the template in the editor. /* Specific pages scss */ +/* + Branching ikone, radio, checkboxi... +*/ +#branching { + /* font awesom za admin */ + /* select, checked */ +} +#branching #variable_holder input[type=checkbox].enka-admin-custom, +#branching #variable_holder input[type=radio].enka-admin-custom { + display: none !important; +} +#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before, +#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { + font-family: "Font Awesome 5 Free"; + display: inline-block; + font-size: 16px; + color: #D3D3D3; + font-weight: 400; +} +#branching #variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before, +#branching #variable_holder input[type=radio].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before { + display: inline-block; + float: left; + padding-top: 4px; + padding-left: 4px; + font-weight: 400; +} +#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before { + /*content: "\f096";*/ + content: ""; + letter-spacing: 10px; +} +#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { + /*content: "\f10c";*/ + content: ""; + letter-spacing: 8px; +} +#branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before { + /*content: "\f046";*/ + content: ""; + color: #D3D3D3; + letter-spacing: 8px; +} +#branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before { + /*content: "\f192";*/ + content: ""; + color: #D3D3D3; +} +#branching span.faicon.delete_circle::before { + font-size: 14px; +} +#branching span.faicon.add::before { + font-size: 14px; +} +#branching span.faicon.plus::before, +#branching span.faicon.minus::before { + cursor: pointer; + font-size: 12px; + color: #1E88E5; +} +#branching span.faicon.inline::before { + font-size: 14px !important; +} + /* Osnova za branching */ @@ -13259,78 +13323,144 @@ 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 { +#branching { + /*if condition variable select*/ +} +#branching li.if, +#branching li.block, +#branching li.loop { + display: flex; +} +#branching li.if .if_remove, +#branching li.block .if_remove, +#branching li.loop .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 { + z-index: 5; position: absolute; - left: auto; - float: none; - margin: 9px 0 0 -15px; + top: 8px; + right: 16px; +} +#branching li.if .if_remove a, +#branching li.block .if_remove a, +#branching li.loop .if_remove a { + margin-left: 16px; +} +#branching li.if .pm.faicon, +#branching li.block .pm.faicon, +#branching li.loop .pm.faicon { + padding: 3px 8px 0 0; + margin-left: -20px; +} +#branching li.if .if_content .clr_if, +#branching li.if .if_content .clr_bl, +#branching li.if .if_content .clr_lp, +#branching li.block .if_content .clr_if, +#branching li.block .if_content .clr_bl, +#branching li.block .if_content .clr_lp, +#branching li.loop .if_content .clr_if, +#branching li.loop .if_content .clr_bl, +#branching li.loop .if_content .clr_lp { + color: #1E88E5; + font-weight: 600; +} +#branching li.if .if_content .colorif, +#branching li.if .if_content .colorblock, +#branching li.if .if_content .colorif, +#branching li.block .if_content .colorif, +#branching li.block .if_content .colorblock, +#branching li.block .if_content .colorif, +#branching li.loop .if_content .colorif, +#branching li.loop .if_content .colorblock, +#branching li.loop .if_content .colorif { + color: #1E88E5; + font-weight: 400; +} +#branching li.if:hover span.conditions_display, +#branching li.block:hover span.conditions_display, +#branching li.loop:hover span.conditions_display { cursor: pointer; } - -a.pm.minus { - margin-top: 12px; -} - -.endif_editing { - background-color: #1E88E5; -} - -li.if_editing div.if_content:before { - background-color: #1E88E5; - content: ""; +#branching li.if:hover div.if_remove, +#branching li.block:hover div.if_remove, +#branching li.loop:hover div.if_remove { display: block; - height: 15px; - left: 0; - position: absolute; - top: 0; - width: 100%; - z-index: -1; } - -span.IF_title_start { +#branching li.if.if_editing div.if_remove, +#branching li.block.if_editing div.if_remove, +#branching li.loop.if_editing div.if_remove { + display: block; +} +#branching li.if.if_editing .if_content, +#branching li.block.if_editing .if_content, +#branching li.loop.if_editing .if_content { + padding: 12px 16px 16px 16px; + background-color: #F2F2F2; + border-left: 2px #1E88E5 solid; +} +#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body, +#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body, +#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body { + max-height: 50vh; + overflow-y: auto; + margin: 20px 0; + padding: 10px 5px 5px 5px; +} +#branching li.if.if_editing .if_content #div_condition_editing_inner .condition_editing_body .tbl_condition_editing, +#branching li.block.if_editing .if_content #div_condition_editing_inner .condition_editing_body .tbl_condition_editing, +#branching li.loop.if_editing .if_content #div_condition_editing_inner .condition_editing_body .tbl_condition_editing { + margin-bottom: 5px; +} +#branching li.endif:hover, +#branching li.endblock:hover, +#branching li.endloop:hover, +#branching li.inout:hover { + cursor: pointer; +} +#branching li.endif .clr_if, +#branching li.endif .clr_bl, +#branching li.endif .clr_lp, +#branching li.endblock .clr_if, +#branching li.endblock .clr_bl, +#branching li.endblock .clr_lp, +#branching li.endloop .clr_if, +#branching li.endloop .clr_bl, +#branching li.endloop .clr_lp, +#branching li.inout .clr_if, +#branching li.inout .clr_bl, +#branching li.inout .clr_lp { + color: #1E88E5; + font-weight: 600; +} +#branching li.endif .colorif, +#branching li.endif .colorblock, +#branching li.endif .colorif, +#branching li.endblock .colorif, +#branching li.endblock .colorblock, +#branching li.endblock .colorif, +#branching li.endloop .colorif, +#branching li.endloop .colorblock, +#branching li.endloop .colorif, +#branching li.inout .colorif, +#branching li.inout .colorblock, +#branching li.inout .colorif { + color: #1E88E5; + font-weight: 400; +} +#branching li.endif_editing { + padding: 12px; + background-color: #F2F2F2; + border-left: 2px #1E88E5 solid; +} +#branching span.IF_title_start { font-weight: 900; color: #1E88E5; margin-right: 8px; } - -span.IF_title { +#branching span.IF_title { font-weight: 600; text-transform: uppercase; } - -span.IF_title_line { +#branching span.IF_title_line { content: ""; display: inline-block; height: 0.5em; @@ -13339,73 +13469,49 @@ span.IF_title_line { margin-top: 8px; border-top: 1px solid #C4C4C4; } - -span.conditions_display { +#branching span.conditions_display { display: block; line-height: 28px; } - -/*if condition variable select*/ -select.spremenljivka_select option { +#branching select.spremenljivka_select option { max-width: 500px; } - -.condition { +#branching .condition { position: relative; left: -21px; } - -span.endif { +#branching span.endif { position: relative; left: -29px; font-weight: bold; } - -.block > div > #div_condition_editing_container { +#branching .block > div > #div_condition_editing_container { background-color: #1E88E5; line-height: 28px; } - -.loop > div > #div_condition_editing_container { +#branching .loop > div > #div_condition_editing_container { padding-top: 6px; } - -#div_condition_editing_inner { - background-color: #F2F2F2; - padding: 16px; -} -#div_condition_editing_inner .condition_editing_body { - max-height: 50vh; - overflow-y: auto; - margin: 20px 0; - padding: 10px 5px 5px 5px; -} -#div_condition_editing_inner .condition_editing_body .tbl_condition_editing { - margin-bottom: 5px; -} - -#div_condition_editing_operators { +#branching #div_condition_editing_operators { padding: 5px 0; } - -#div_condition_editing { +#branching #div_condition_editing { display: none; height: auto; width: 800px; } -#div_condition_editing div#div_condition_editing_container { +#branching #div_condition_editing div#div_condition_editing_container { margin-bottom: 44px; } -#div_condition_editing .error_display { +#branching #div_condition_editing .error_display { background-color: transparent; } -#div_condition_editing .condition_editing_vrednost_title { +#branching #div_condition_editing .condition_editing_vrednost_title { margin: -5px 0 15px 5px; font-size: 14px; font-weight: 600; } - -#div_condition_editing_float { +#branching #div_condition_editing_float { position: absolute; top: 0; right: -335px; @@ -13414,98 +13520,80 @@ span.endif { background-color: white; border: 1px solid #1E88E5; } -#div_condition_editing_float h2 { +#branching #div_condition_editing_float h2 { margin-top: 0; padding: 10px; border-bottom: 0; margin: 0 -10px 0 -10px; background-color: #1E88E5; } -#div_condition_editing_float p { +#branching #div_condition_editing_float p { padding: 3px; margin: 10px 0; } -#div_condition_editing_float p.heading { +#branching #div_condition_editing_float p.heading { border: 0; background: none; padding: 0; } -#div_condition_editing_float span.content { +#branching #div_condition_editing_float span.content { float: right; } -#div_condition_editing_float fieldset { +#branching #div_condition_editing_float fieldset { margin: 11px 0; padding: 0; border: 0; border-top: 1px solid #1E88E5; } -#div_condition_editing_float legend { +#branching #div_condition_editing_float legend { background-color: transparent; color: #1E88E5; font-weight: 500; margin: 0; padding: 0 10px 0 5px; } - -.error_display { +#branching .error_display { display: block; line-height: 24px; } - -.tbl_ce_bck_blue { +#branching .tbl_ce_bck_blue { background-color: #1E88E5; } - -.tbl_ce_lol { +#branching .tbl_ce_lol { border-top: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5; border-left: 1px solid #E5E5E5; } - -.tbl_ce_tb { +#branching .tbl_ce_tb { border-top: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5; } - -.tbl_ce_lor { +#branching .tbl_ce_lor { border-top: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5; border-right: 1px solid #E5E5E5; } - -.if_remove { - z-index: 5; - position: absolute; - top: 0; - right: 0; - margin-right: 20px; - padding-top: 9px; -} - -.endif a.surveycomment { +#branching .endif a.surveycomment { padding-right: 15px; font-size: 10px; } - -.endblock a.surveycomment { +#branching .endblock a.surveycomment { padding-right: 15px; font-size: 10px; } - -#condition_editing_bottom_placeholder { +#branching #condition_editing_bottom_placeholder { display: block; height: 1px; margin-bottom: 15px; border-top: 1px solid #1E88E5; } - -.tbl_condition_editing { +#branching .tbl_condition_editing { width: 98%; border-spacing: 0px; margin: 0px 1% 0px 1%; border-collapse: collapse; } -.tbl_condition_editing th { +#branching .tbl_condition_editing th { color: #E5E5E5; font-weight: normal; } diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss index fa846fca2..1e417911f 100644 --- a/resources/sass/admin_new/pages/survey_edit/conditions.scss +++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss @@ -8,272 +8,294 @@ and open the template in the editor. Author : podkrizniku */ +#branching{ + li.if, + li.block, + li.loop{ + display: flex; -li.if, -li.block, -li.loop, -li.if{ + .if_remove{ + display: none; + + z-index: 5; + position: absolute; + top: 8px; + right: 16px; - .if_remove{ - display: none; + a{ + margin-left: 16px; + } + } + + .pm.faicon{ + padding: 3px 8px 0 0; + margin-left: -20px; + } + + .if_content { + + .clr_if, + .clr_bl, + .clr_lp{ + color: $blue; + font-weight: 600; + } + + .colorif, + .colorblock, + .colorif{ + color: $blue; + font-weight: 400; + } + } + + &:hover { + span.conditions_display { + cursor: pointer; + } + div.if_remove { + display: block; + } + } } - &:hover { - span.conditions_display { - cursor: pointer; - } + li.if.if_editing, + li.block.if_editing, + li.loop.if_editing{ div.if_remove { display: block; } - } -} -li.endif, -li.endblock, -li.endloop, -li.inout{ - &:hover { - cursor: pointer; - } -} + .if_content { + padding: 12px 16px 16px 16px; -li.if.if_editing, -li.block.if_editing, -li.loop.if_editing{ - div.if_remove { - display: block; - } -} + background-color: $light-gray2; + border-left: 2px $blue solid; + #div_condition_editing_inner { -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: $blue; - content: ""; - display: block; - height: 15px; - left: 0; - position: absolute; - top: 0; - width: 100%; - z-index: -1; - } - } -} - -// Naslov popupa, črta pod naslovom -span.IF_title_start { - font-weight: $heavy; - color: $blue; - margin-right: 8px; -} - -span.IF_title { - font-weight: $semi-bold; - text-transform: uppercase; -} - -span.IF_title_line { - content: ""; - display: inline-block; - height: 0.5em; - vertical-align: bottom; - width: 100%; - margin-top: 8px; - border-top: 1px solid $dark-gray; -} - -span.conditions_display { - display: block; - line-height: 28px; -} -/*if condition variable select*/ -select.spremenljivka_select { - option { - max-width: 500px; - } -} -.condition { - position: relative; - left: -21px; -} -span.endif { - position: relative; - left: -29px; - font-weight: bold; -} -.block { - >div { - >#div_condition_editing_container { - background-color: $blue; - line-height: 28px; - } - } -} -.loop { - >div { - >#div_condition_editing_container { - padding-top: 6px; - } - } -} -#div_condition_editing_inner { - - background-color: $light-gray2; - padding: 16px; - - >.condition_editing_preview { - } - - .condition_editing_body{ - max-height: 50vh; - overflow-y: auto; - - margin: 20px 0; - padding: 10px 5px 5px 5px; - - - .tbl_condition_editing{ - margin-bottom: 5px; + >.condition_editing_preview { + } + + .condition_editing_body{ + max-height: 50vh; + overflow-y: auto; + + margin: 20px 0; + padding: 10px 5px 5px 5px; + + + .tbl_condition_editing{ + margin-bottom: 5px; + } + } + } } - } -} -#div_condition_editing_operators { - padding: 5px 0; -} -#div_condition_editing { - display: none; + } - height: auto; - width: 800px; - - div#div_condition_editing_container { - margin-bottom: 44px; - } - .error_display { - background-color: transparent; - } - .condition_editing_vrednost_title { - margin: -5px 0 15px 5px; - font-size: 14px; - font-weight: 600; - } -} -#div_condition_editing_float { - position: absolute; - top: 0; - right: -335px; - - width: 290px; - padding: 0 10px 15px 10px; - - background-color: white; - - border: 1px solid $blue; + li.endif, + li.endblock, + li.endloop, + li.inout{ + &:hover { + cursor: pointer; + } - h2 { - margin-top: 0; - padding: 10px; - border-bottom: 0; - margin: 0 -10px 0 -10px; - background-color: $blue; - } - p { - padding: 3px; - margin: 10px 0; - } - p.heading { - border: 0; - background: none; - padding: 0; - } - span.content { - float: right; - } - fieldset { - margin: 11px 0; - padding: 0; - border: 0; - border-top: 1px solid $blue; - } - legend { - background-color: transparent; - color: $blue; - font-weight: 500; - margin: 0; - padding: 0 10px 0 5px; - } -} -.error_display { - display: block; - line-height: 24px; -} -.tbl_ce_bck_blue { - background-color: $blue; -} -.tbl_ce_lol { - border-top: 1px solid $gray; - border-bottom: 1px solid $gray; - border-left: 1px solid $gray; -} -.tbl_ce_tb { - border-top: 1px solid $gray; - border-bottom: 1px solid $gray; -} -.tbl_ce_lor { - border-top: 1px solid $gray; - border-bottom: 1px solid $gray; - border-right: 1px solid $gray; -} -.if_remove { - z-index: 5; - position: absolute; - top: 0; - right: 0; - margin-right: 20px; - padding-top: 9px; -} -.endif { - a.surveycomment { - padding-right: 15px; - font-size: 10px; - } -} -.endblock { - a.surveycomment { - padding-right: 15px; - font-size: 10px; - } -} -#condition_editing_bottom_placeholder { - display: block; - height: 1px; - margin-bottom: 15px; - border-top: 1px solid $blue; -} -.tbl_condition_editing { - width: 98%; - border-spacing: 0px; - margin: 0px 1% 0px 1%; - border-collapse: collapse; - th { - color: $gray; - font-weight: normal; - } + .clr_if, + .clr_bl, + .clr_lp{ + color: $blue; + font-weight: 600; + } + + .colorif, + .colorblock, + .colorif{ + color: $blue; + font-weight: 400; + } + } + + li.endif_editing { + padding: 12px; + + background-color: $light-gray2; + border-left: 2px $blue solid; + } + + + + // Naslov popupa, črta pod naslovom + span.IF_title_start { + font-weight: $heavy; + color: $blue; + margin-right: 8px; + } + + span.IF_title { + font-weight: $semi-bold; + text-transform: uppercase; + } + + span.IF_title_line { + content: ""; + display: inline-block; + height: 0.5em; + vertical-align: bottom; + width: 100%; + margin-top: 8px; + border-top: 1px solid $dark-gray; + } + + span.conditions_display { + display: block; + line-height: 28px; + } + /*if condition variable select*/ + select.spremenljivka_select { + option { + max-width: 500px; + } + } + .condition { + position: relative; + left: -21px; + } + span.endif { + position: relative; + left: -29px; + font-weight: bold; + } + .block { + >div { + >#div_condition_editing_container { + background-color: $blue; + line-height: 28px; + } + } + } + .loop { + >div { + >#div_condition_editing_container { + padding-top: 6px; + } + } + } + + #div_condition_editing_operators { + padding: 5px 0; + } + #div_condition_editing { + display: none; + + height: auto; + width: 800px; + + div#div_condition_editing_container { + margin-bottom: 44px; + } + .error_display { + background-color: transparent; + } + .condition_editing_vrednost_title { + margin: -5px 0 15px 5px; + font-size: 14px; + font-weight: 600; + } + } + #div_condition_editing_float { + position: absolute; + top: 0; + right: -335px; + + width: 290px; + padding: 0 10px 15px 10px; + + background-color: white; + + border: 1px solid $blue; + + h2 { + margin-top: 0; + padding: 10px; + border-bottom: 0; + margin: 0 -10px 0 -10px; + background-color: $blue; + } + p { + padding: 3px; + margin: 10px 0; + } + p.heading { + border: 0; + background: none; + padding: 0; + } + span.content { + float: right; + } + fieldset { + margin: 11px 0; + padding: 0; + border: 0; + border-top: 1px solid $blue; + } + legend { + background-color: transparent; + color: $blue; + font-weight: 500; + margin: 0; + padding: 0 10px 0 5px; + } + } + .error_display { + display: block; + line-height: 24px; + } + .tbl_ce_bck_blue { + background-color: $blue; + } + .tbl_ce_lol { + border-top: 1px solid $gray; + border-bottom: 1px solid $gray; + border-left: 1px solid $gray; + } + .tbl_ce_tb { + border-top: 1px solid $gray; + border-bottom: 1px solid $gray; + } + .tbl_ce_lor { + border-top: 1px solid $gray; + border-bottom: 1px solid $gray; + border-right: 1px solid $gray; + } + + .endif { + a.surveycomment { + padding-right: 15px; + font-size: 10px; + } + } + .endblock { + a.surveycomment { + padding-right: 15px; + font-size: 10px; + } + } + #condition_editing_bottom_placeholder { + display: block; + height: 1px; + margin-bottom: 15px; + border-top: 1px solid $blue; + } + .tbl_condition_editing { + width: 98%; + border-spacing: 0px; + margin: 0px 1% 0px 1%; + border-collapse: collapse; + th { + color: $gray; + font-weight: normal; + } + } } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/icons.scss b/resources/sass/admin_new/pages/survey_edit/icons.scss index 68ddd3b67..9052fd024 100644 --- a/resources/sass/admin_new/pages/survey_edit/icons.scss +++ b/resources/sass/admin_new/pages/survey_edit/icons.scss @@ -52,6 +52,7 @@ color: $dark-gray2; } + // Dodajanje, brisanje span.faicon.delete_circle::before { font-size: 14px; } @@ -59,4 +60,17 @@ font-size: 14px; } + // Plus, minus + span.faicon.plus::before, + span.faicon.minus::before{ + cursor: pointer; + + font-size: 12px; + color: $blue; + } + + span.faicon.inline::before{ + font-size: 14px !important; + } + } diff --git a/resources/sass/admin_new/pages/survey_edit/questions/questions.scss b/resources/sass/admin_new/pages/survey_edit/questions/questions.scss index f3b5ac4de..4b4059bd7 100644 --- a/resources/sass/admin_new/pages/survey_edit/questions/questions.scss +++ b/resources/sass/admin_new/pages/survey_edit/questions/questions.scss @@ -18,4 +18,4 @@ and open the template in the editor. @import "preview"; @import "ranking"; @import "location"; -@import "take_picture"; \ No newline at end of file +@import "take_picture"; 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 115812e90..031400bb7 100644 --- a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss +++ b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss @@ -1,4 +1,5 @@ // Urejanje ankete +@import "icons"; @import "branching"; @import "toolbox"; @import "glasovanje";