From ee66e33c62545ffd2251ec958447fdc1c2599a70 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Mon, 23 May 2022 11:46:26 +0200 Subject: [PATCH] Redesign - popravki napak --- admin/survey/script/library.js | 11 +++-------- main/survey/app/Controllers/HeaderController.php | 12 ++++++------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/admin/survey/script/library.js b/admin/survey/script/library.js index 0d6189539..14a6ea303 100644 --- a/admin/survey/script/library.js +++ b/admin/survey/script/library.js @@ -124,14 +124,9 @@ function add_to_my_library () { } -function anketa_copy (ank_id, text) { - var lib_prva = $("input#lib_prva").val(); - if (lib_prva == 1 ) { - var naslov = $("#novaanketa_naslov").val(); - $.redirect('ajax.php?t=library&a=anketa_copy_new', {ank_id: ank_id, naslov: naslov}); - } else { - $.redirect('ajax.php?t=library&a=anketa_copy', {anketa:srv_meta_anketa_id, ank_id: ank_id}); - } +function anketa_copy (ank_id) { + var naslov = $("#novaanketa_naslov").val(); + $.redirect('ajax.php?t=library&a=anketa_copy_new', {ank_id: ank_id, naslov: naslov}); } function anketa_copy_top (ank_id, hierarhija) { diff --git a/main/survey/app/Controllers/HeaderController.php b/main/survey/app/Controllers/HeaderController.php index e844e5c05..fbe375c3d 100644 --- a/main/survey/app/Controllers/HeaderController.php +++ b/main/survey/app/Controllers/HeaderController.php @@ -668,15 +668,15 @@ class HeaderController extends Controller break; case '3': - echo '.variable_holder, .variable_holder .variabla label'; + echo '.variable_holder .variabla'; break; case '4': - echo 'table.grid_table tbody tr:nth-child(2n+1)'; + echo 'table.grid_table tbody tr:nth-child(2n+1), .variable_holder .variabla'; break; case '5': - echo '.spremenljivka'; + echo 'div.spremenljivka'; break; case '7': @@ -721,12 +721,12 @@ class HeaderController extends Controller case '5': if ($rowt['value'] == '0') { - echo 'border: 0;'; + echo 'border: 0 !important;'; } elseif ($rowt['value'] == '2') { - echo 'border: 1px #B9C5D9 solid;'; + echo 'border: 1px #B9C5D9 solid !important;'; } else { echo 'border: 0;'; - echo 'border-top: 1px #B9C5D9 solid;'; + echo 'border-top: 1px #B9C5D9 solid !important;'; } break;