may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] Popupi: Urejanje > Vprašalnik - Preview spremenljivke

Browse Source 
Manjka: styling spremenljivke v prvem popupu
This commit is contained in:
tejagerjovic 2022-05-05 13:32:45 +02:00
parent bd0313c61c
commit ba2acfb2ea
6 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/BranchingAjax.php
View File

@ -2698,11 +2698,11 @@ class BranchingAjax {
</head>
<body>
<?
echo '<div id="printIcon">';
echo '<a href="#" onclick="window.print(); return false;"><span class="faicon print_small icon-grey_dark_link"></span> '.$lang['hour_print2'].'</a>';
echo '</div>';
echo '<div class="button_holder print_button">';
echo '<button class="small blue" onclick="window.print(); return false;">'.$lang['hour_print2'].'</button>';
echo '</div>';
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']);
}
?>
</body>
</html>

12
admin/survey/SurveyAdminAjax.php
View File

@ -4303,14 +4303,12 @@ class SurveyAdminAjax {
\App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_POST['spremenljivka'], $offset, $zaporedna);
}
echo ' </div>';
echo '<div class="buttons_holder">';
echo '<span class="floatRight">';
echo ' <div class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="preview_spremenljivka_cancel(); return false;"><span>' . $lang['srv_zapri'] . '</span></a></div> ';
echo ' <div class="buttonwrapper spaceRight floatRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.open(\''.$site_url.'admin/survey/ajax.php?t=branching&a=spremenljivka_preview_print&anketa='.$this->anketa.'&spremenljivka='.$_POST['spremenljivka'].'\', \'print\', \'scrollbars=1\'); return false;"><span><img src="img_0/printer.png" /> ' . $lang['hour_print2'] . '</span></a></div> ';
echo '</span>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="preview_spremenljivka_cancel(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="window.open(\''.$site_url.'admin/survey/ajax.php?t=branching&a=spremenljivka_preview_print&anketa='.$this->anketa.'&spremenljivka='.$_POST['spremenljivka'].'\', \'print\', \'scrollbars=1\'); return false;">'.$lang['hour_print2'].'</button>';
echo '</div>';
echo '</div>';
}
else if ($_GET['a'] == 'preview_page') {

24
public/css/admin_new.css
View File

@ -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,

3
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -92,5 +92,4 @@ fieldset#missingProfileFieldset {
margin-bottom: 16px;
}
}
}

4
resources/sass/admin_new/components/popup/preview.scss
View File

@ -0,0 +1,4 @@
div.button_holder.print_button {
margin-top: 16px;
margin-bottom: 8px;
}

1
resources/sass/admin_new/pages/survey_edit/questions/variable.scss
View File

@ -4,6 +4,7 @@
div.spr,
div.spremenljivka,
li.spr,
.jezik_left,
.jezik_right{