From 8b49cc72ea7b8e31679c7d95ef17990b7d957659 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 2 Jun 2022 01:36:24 +0200 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Urejanje=20>=20Vpr?= =?UTF-8?q?a=C5=A1alnik=20-=20Preview=20spremenljivke=20-=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/survey/Branching.php | 31 +- .../Vprasanja/NumberController.php | 5 +- .../Controllers/Vprasanja/TextController.php | 2 +- public/css/admin_new.css | 2933 +++++++++-------- .../survey_edit/popups/preview_question.scss | 96 + 5 files changed, 1620 insertions(+), 1447 deletions(-) diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 15ba7dc6a..15f490cae 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -1632,28 +1632,28 @@ class Branching { echo '
'; if ($lang['id'] == '1') { - echo '

check_demografija_exists('XSPOL')?'checked':'').' value="XSPOL" id="XSPOL">

'; - echo '

check_demografija_exists('XSTAR2a4')?'checked':'').' value="XSTAR2a4" id="XSTAR2a4">

'; - echo '

check_demografija_exists('XZST1surs4')?'checked':'').' value="XZST1surs4" id="XZST1surs4">

'; + echo '

check_demografija_exists('XSPOL')?'checked':'').' value="XSPOL" id="XSPOL">

'; + echo '

check_demografija_exists('XSTAR2a4')?'checked':'').' value="XSTAR2a4" id="XSTAR2a4">

'; + echo '

check_demografija_exists('XZST1surs4')?'checked':'').' value="XZST1surs4" id="XZST1surs4">

'; echo '
'; - echo '

check_demografija_exists('XDS2a4')?'checked':'').' value="XDS2a4" id="XDS2a4">

'; - echo '

check_demografija_exists('XIZ1a2')?'checked':'').' value="XIZ1a2" id="XIZ1a2">

'; - echo '

check_demografija_exists('XLOKACREGk')?'checked':'').' value="XLOKACREGk" id="XLOKACREGk">

'; + echo '

check_demografija_exists('XDS2a4')?'checked':'').' value="XDS2a4" id="XDS2a4">

'; + echo '

check_demografija_exists('XIZ1a2')?'checked':'').' value="XIZ1a2" id="XIZ1a2">

'; + echo '

check_demografija_exists('XLOKACREGk')?'checked':'').' value="XLOKACREGk" id="XLOKACREGk">

'; //echo '

'; } if ($lang['id'] == '2') { - echo '

check_demografija_exists('XSEX')?'checked':'').' value="XSEX" id="XSEX">

'; - echo '

check_demografija_exists('XAGE')?'checked':'').' value="XAGE" id="XAGE">

'; - echo '

check_demografija_exists('XMRSTS')?'checked':'').' value="XMRSTS" id="XMRSTS">

'; + echo '

check_demografija_exists('XSEX')?'checked':'').' value="XSEX" id="XSEX">

'; + echo '

check_demografija_exists('XAGE')?'checked':'').' value="XAGE" id="XAGE">

'; + echo '

check_demografija_exists('XMRSTS')?'checked':'').' value="XMRSTS" id="XMRSTS">

'; echo '
'; - echo '

check_demografija_exists('XSTS')?'checked':'').' value="XSTS" id="XSTS">

'; - echo '

check_demografija_exists('XEDU')?'checked':'').' value="XEDU" id="XEDU">

'; - echo '

check_demografija_exists('XLOC')?'checked':'').' value="XLOC" id="XLOC">

'; //echo '

'; + echo '

check_demografija_exists('XSTS')?'checked':'').' value="XSTS" id="XSTS">

'; + echo '

check_demografija_exists('XEDU')?'checked':'').' value="XEDU" id="XEDU">

'; + echo '

check_demografija_exists('XLOC')?'checked':'').' value="XLOC" id="XLOC">

'; //echo '

'; } echo '
'; @@ -2805,9 +2805,8 @@ class Branching { } elseif($row['orientation'] == 9){ echo '
-
'; @@ -5566,11 +5565,11 @@ class Branching { $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY $orderby"); while ($row1 = mysqli_fetch_array($sql1)) { - echo '

'; + echo '

'; } if ($row['textfield'] == 1) { - echo '

'; + echo '

'; } } diff --git a/main/survey/app/Controllers/Vprasanja/NumberController.php b/main/survey/app/Controllers/Vprasanja/NumberController.php index 3e26780bf..ecfc02325 100644 --- a/main/survey/app/Controllers/Vprasanja/NumberController.php +++ b/main/survey/app/Controllers/Vprasanja/NumberController.php @@ -130,8 +130,6 @@ class NumberController extends Controller echo '
'; } - echo '