From ba2acfb2ea70549792e48d308e009ba1d8d29bde Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 5 May 2022 13:32:45 +0200 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20Popupi:=20Urejanje=20>=20Vpr?= =?UTF-8?q?a=C5=A1alnik=20-=20Preview=20spremenljivke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manjka: styling spremenljivke v prvem popupu --- admin/survey/BranchingAjax.php | 10 ++++---- admin/survey/SurveyAdminAjax.php | 12 ++++------ public/css/admin_new.css | 24 +++++++++++++++++++ .../components/popup/page_specific.scss | 3 +-- .../admin_new/components/popup/preview.scss | 4 ++++ .../pages/survey_edit/questions/variable.scss | 1 + 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php index 393a3e390..5adf6e06c 100644 --- a/admin/survey/BranchingAjax.php +++ b/admin/survey/BranchingAjax.php @@ -2698,11 +2698,11 @@ class BranchingAjax { '; - echo ' '.$lang['hour_print2'].''; - echo ''; + echo '
'; + echo ''; + echo '
'; + include_once('../../main/survey/app/global_function.php'); new \App\Controllers\SurveyController(true); @@ -2720,7 +2720,7 @@ class BranchingAjax { save('forceShowSpremenljivka', true); \App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_GET['spremenljivka']); } - + ?> diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index 11ff8bdfb..befaaa262 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -4303,14 +4303,12 @@ class SurveyAdminAjax { \App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_POST['spremenljivka'], $offset, $zaporedna); } echo ' '; - - echo '
'; - echo ''; - echo '
' . $lang['srv_zapri'] . '
'; - echo '
' . $lang['hour_print2'] . '
'; - echo ''; + + echo '
'; + echo ''; + echo ''; echo '
'; - + echo '
'; } else if ($_GET['a'] == 'preview_page') { diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 51f173607..5adc5c593 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8113,6 +8113,11 @@ div#success_save { display: none; } +div.button_holder.print_button { + margin-top: 16px; + margin-bottom: 8px; +} + div#newProfileDiv .setting_holder, div#newProfile .setting_holder, div#renameProfileDiv .setting_holder { @@ -14895,6 +14900,7 @@ table.text_vrednost { Vrstice v urejanju vprasanja - vrednosti pri radio, checkboxu */ div.spr .variable_holder, +div.spremenljivka .variable_holder, li.spr .variable_holder, .jezik_left .variable_holder, .jezik_right .variable_holder { @@ -14904,6 +14910,7 @@ li.spr .variable_holder, padding: 0px; } div.spr .variable_holder div.variabla, +div.spremenljivka .variable_holder div.variabla, li.spr .variable_holder div.variabla, .jezik_left .variable_holder div.variabla, .jezik_right .variable_holder div.variabla { @@ -14914,6 +14921,7 @@ li.spr .variable_holder div.variabla, margin: 0 0 4px 0; } div.spr .variable_holder div.variabla select, +div.spremenljivka .variable_holder div.variabla select, li.spr .variable_holder div.variabla select, .jezik_left .variable_holder div.variabla select, .jezik_right .variable_holder div.variabla select { @@ -14927,18 +14935,21 @@ li.spr .variable_holder div.variabla select, background-color: #FFFFFF; } div.spr .variable_holder div.variabla select option, +div.spremenljivka .variable_holder div.variabla select option, li.spr .variable_holder div.variabla select option, .jezik_left .variable_holder div.variabla select option, .jezik_right .variable_holder div.variabla select option { color: #333333; } div.spr .variable_holder div.variabla select option:disabled, +div.spremenljivka .variable_holder div.variabla select option:disabled, li.spr .variable_holder div.variabla select option:disabled, .jezik_left .variable_holder div.variabla select option:disabled, .jezik_right .variable_holder div.variabla select option:disabled { color: #A0A0A0; } div.spr .variable_holder div.variabla .vrednost_inline, +div.spremenljivka .variable_holder div.variabla .vrednost_inline, li.spr .variable_holder div.variabla .vrednost_inline, .jezik_left .variable_holder div.variabla .vrednost_inline, .jezik_right .variable_holder div.variabla .vrednost_inline { @@ -14948,6 +14959,7 @@ li.spr .variable_holder div.variabla .vrednost_inline, font-size: 14px; } div.spr .variable_holder div.variabla .vrednost_inline p, +div.spremenljivka .variable_holder div.variabla .vrednost_inline p, li.spr .variable_holder div.variabla .vrednost_inline p, .jezik_left .variable_holder div.variabla .vrednost_inline p, .jezik_right .variable_holder div.variabla .vrednost_inline p { @@ -14955,12 +14967,14 @@ li.spr .variable_holder div.variabla .vrednost_inline p, font-size: 16px; } div.spr .variable_holder div.variabla[other="1"] .vrednost_inline, +div.spremenljivka .variable_holder div.variabla[other="1"] .vrednost_inline, li.spr .variable_holder div.variabla[other="1"] .vrednost_inline, .jezik_left .variable_holder div.variabla[other="1"] .vrednost_inline, .jezik_right .variable_holder div.variabla[other="1"] .vrednost_inline { max-width: 200px; } div.spr .variable_holder div.variabla[other="1"] input[type=text], +div.spremenljivka .variable_holder div.variabla[other="1"] input[type=text], li.spr .variable_holder div.variabla[other="1"] input[type=text], .jezik_left .variable_holder div.variabla[other="1"] input[type=text], .jezik_right .variable_holder div.variabla[other="1"] input[type=text] { @@ -14972,12 +14986,14 @@ li.spr .variable_holder div.variabla[other="1"] input[type=text], border-radius: 2px; } div.spr .variable_holder div.variabla[other="1"] .icons_holder, +div.spremenljivka .variable_holder div.variabla[other="1"] .icons_holder, li.spr .variable_holder div.variabla[other="1"] .icons_holder, .jezik_left .variable_holder div.variabla[other="1"] .icons_holder, .jezik_right .variable_holder div.variabla[other="1"] .icons_holder { flex-grow: 1; } div.spr .variable_holder div.variabla#variabla_new .vrednost_inline, +div.spremenljivka .variable_holder div.variabla#variabla_new .vrednost_inline, li.spr .variable_holder div.variabla#variabla_new .vrednost_inline, .jezik_left .variable_holder div.variabla#variabla_new .vrednost_inline, .jezik_right .variable_holder div.variabla#variabla_new .vrednost_inline { @@ -14985,6 +15001,7 @@ li.spr .variable_holder div.variabla#variabla_new .vrednost_inline, max-width: 200px; } div.spr .variable_holder div.variabla#variabla_new .inline_other, +div.spremenljivka .variable_holder div.variabla#variabla_new .inline_other, li.spr .variable_holder div.variabla#variabla_new .inline_other, .jezik_left .variable_holder div.variabla#variabla_new .inline_other, .jezik_right .variable_holder div.variabla#variabla_new .inline_other { @@ -14995,6 +15012,7 @@ li.spr .variable_holder div.variabla#variabla_new .inline_other, border-left: 1px #E5E5E5 solid; } div.spr .variable_holder div.variabla#variabla_new .inline_other .faicon, +div.spremenljivka .variable_holder div.variabla#variabla_new .inline_other .faicon, li.spr .variable_holder div.variabla#variabla_new .inline_other .faicon, .jezik_left .variable_holder div.variabla#variabla_new .inline_other .faicon, .jezik_right .variable_holder div.variabla#variabla_new .inline_other .faicon { @@ -15003,12 +15021,14 @@ li.spr .variable_holder div.variabla#variabla_new .inline_other .faicon, font-size: 14px; } div.spr .variable_holder div.variabla#variabla_new .inline_other:hover, +div.spremenljivka .variable_holder div.variabla#variabla_new .inline_other:hover, li.spr .variable_holder div.variabla#variabla_new .inline_other:hover, .jezik_left .variable_holder div.variabla#variabla_new .inline_other:hover, .jezik_right .variable_holder div.variabla#variabla_new .inline_other:hover { color: #0059ab; } div.spr .variable_holder div.variabla#variabla_new .inline_other:hover .faicon:before, +div.spremenljivka .variable_holder div.variabla#variabla_new .inline_other:hover .faicon:before, li.spr .variable_holder div.variabla#variabla_new .inline_other:hover .faicon:before, .jezik_left .variable_holder div.variabla#variabla_new .inline_other:hover .faicon:before, .jezik_right .variable_holder div.variabla#variabla_new .inline_other:hover .faicon:before { @@ -15016,6 +15036,8 @@ li.spr .variable_holder div.variabla#variabla_new .inline_other:hover .faicon:be } div.spr .variable_holder div.variabla#variabla_new .inline_move, div.spr .variable_holder div.variabla#variabla_new .icons_holder .faicon, +div.spremenljivka .variable_holder div.variabla#variabla_new .inline_move, +div.spremenljivka .variable_holder div.variabla#variabla_new .icons_holder .faicon, li.spr .variable_holder div.variabla#variabla_new .inline_move, li.spr .variable_holder div.variabla#variabla_new .icons_holder .faicon, .jezik_left .variable_holder div.variabla#variabla_new .inline_move, @@ -15026,6 +15048,8 @@ li.spr .variable_holder div.variabla#variabla_new .icons_holder .faicon, } div.spr .variable_holder div.variabla#variabla_new:hover .inline_move, div.spr .variable_holder div.variabla#variabla_new:hover .icons_holder .faicon, +div.spremenljivka .variable_holder div.variabla#variabla_new:hover .inline_move, +div.spremenljivka .variable_holder div.variabla#variabla_new:hover .icons_holder .faicon, li.spr .variable_holder div.variabla#variabla_new:hover .inline_move, li.spr .variable_holder div.variabla#variabla_new:hover .icons_holder .faicon, .jezik_left .variable_holder div.variabla#variabla_new:hover .inline_move, diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index 9fe5daf7a..9ef6902d1 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -92,5 +92,4 @@ fieldset#missingProfileFieldset { margin-bottom: 16px; } -} - +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/popup/preview.scss b/resources/sass/admin_new/components/popup/preview.scss index e69de29bb..440467576 100644 --- a/resources/sass/admin_new/components/popup/preview.scss +++ b/resources/sass/admin_new/components/popup/preview.scss @@ -0,0 +1,4 @@ +div.button_holder.print_button { + margin-top: 16px; + margin-bottom: 8px; +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/questions/variable.scss b/resources/sass/admin_new/pages/survey_edit/questions/variable.scss index 9bfda435f..6f11846a7 100644 --- a/resources/sass/admin_new/pages/survey_edit/questions/variable.scss +++ b/resources/sass/admin_new/pages/survey_edit/questions/variable.scss @@ -4,6 +4,7 @@ div.spr, +div.spremenljivka, li.spr, .jezik_left, .jezik_right{