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

[Redizajn 1KA v2] Testiranje --> Komentarji - test survey dropdown - ostalo

Browse Source
This commit is contained in:
tejagerjovic 2022-09-29 21:52:04 +02:00
parent eebc4aa0a2
commit c20c58647a
6 changed files with 177 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/1.php
View File

@ -2190,8 +2190,8 @@ $lang = array (
"srv_hidden_text4" => "Skritih", "srv_hidden_text4" => "Skritih",
"srv_system_text" => "Sistemsko", "srv_system_text" => "Sistemsko",
"srv_visible_dostop" => "Vprašanje je vidno", "srv_visible_dostop" => "Vprašanje je vidno",
"srv_previewalert" => "Trenutno ste v predogledu ankete!<br>Odgovori se <b class=\"red\">ne bodo shranili</b> v bazo!", "srv_previewalert" => "Trenutno ste v predogledu ankete!<br>Odgovori se <b>ne bodo shranili</b> v bazo!",
"srv_testalert" => "Trenutno ste v testnem vnosu ankete!<br>Odgovori se <b class=\"red\">bodo shranili</b> in bodo posebej označeni.", "srv_testalert" => "Trenutno ste v testnem vnosu ankete!<br>Odgovori se <b>bodo shranili</b> in bodo posebej označeni.",
"srv_pagebreak_on" => "Prelom strani", "srv_pagebreak_on" => "Prelom strani",
"srv_pagebreak_off" => "Ni preloma strani", "srv_pagebreak_off" => "Ni preloma strani",
"srv_vrednost_correct" => "Pravilni odgovor v kvizu", "srv_vrednost_correct" => "Pravilni odgovor v kvizu",
@ -6081,7 +6081,7 @@ $lang = array (
"srv_data_subnavigation_recode" => "Rekodiranje", "srv_data_subnavigation_recode" => "Rekodiranje",
"srv_user_banned" => "Uporabnik je blokiran", "srv_user_banned" => "Uporabnik je blokiran",
"srv_user_notbanned" => "Uporabnik je aktiven", "srv_user_notbanned" => "Uporabnik je aktiven",
"srv_displayifs" => "Prikaži pogoje in bloke pred vprašanjem", "srv_displayifs" => "Prikaži pogoje in bloke pred vpr.",
"srv_user_settings" => "Nastavitve uporabnika", "srv_user_settings" => "Nastavitve uporabnika",
"srv_lock_survey_when_activate" => "Zakleni urejanje ankete", "srv_lock_survey_when_activate" => "Zakleni urejanje ankete",
"srv_validation" => "Validacija", "srv_validation" => "Validacija",

2
lang/2.php
View File

@ -5975,7 +5975,7 @@ $lang = array (
"srv_data_subnavigation_recode" => "Recoding", "srv_data_subnavigation_recode" => "Recoding",
"srv_user_banned" => "User is banned", "srv_user_banned" => "User is banned",
"srv_user_notbanned" => "User is not banned", "srv_user_notbanned" => "User is not banned",
"srv_displayifs" => "Display conditions and blocks above the question", "srv_displayifs" => "Display conditions and blocks above quest.",
"srv_user_settings" => "User settings", "srv_user_settings" => "User settings",
"srv_lock_survey_when_activate" => "Lock survey editing", "srv_lock_survey_when_activate" => "Lock survey editing",
"srv_validation" => "Validation", "srv_validation" => "Validation",

10
main/survey/app/Controllers/BodyController.php
View File

@ -2170,7 +2170,7 @@ class BodyController extends Controller
// Preklop med preview-ji za mobilnik, tablico in pc // Preklop med preview-ji za mobilnik, tablico in pc
if(!get('displayAllPages')){ if(!get('displayAllPages')){
echo '<span id="preview_device"><span>' . self::$lang['srv_para_graph_device'] . ': </span>'; echo '<div id="preview_device"><span>' . self::$lang['srv_para_graph_device'] . ': </span>';
if (isset($_GET['mobile']) && $_GET['mobile'] == '1') if (isset($_GET['mobile']) && $_GET['mobile'] == '1')
$device_value = 1; $device_value = 1;
@ -2179,16 +2179,16 @@ class BodyController extends Controller
else else
$device_value = 0; $device_value = 0;
echo '<a href="#" title="PC" onClick="$(\'#device_value\').val(\'0\'); document.change_diable.submit();"><span class="faicon monitor ' . ($device_value == 0 ? ' active' : '') . '"></span></a>'; echo '<a href="#" title="PC" onClick="$(\'#device_value\').val(\'0\'); document.change_diable.submit();"><div id="monitor" class="' . ($device_value == 0 ? ' active' : '') . '"><span class="faicon monitor"></span></div></a>';
// Ce imamo izklopljene mobilne prilagoditve ne pustimo preview-ja na mobile, ker itak ne prikaze scalano // Ce imamo izklopljene mobilne prilagoditve ne pustimo preview-ja na mobile, ker itak ne prikaze scalano
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly'); $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if($mobile_friendly != '0'){ if($mobile_friendly != '0'){
echo '<a href="#" title="' . self::$lang['srv_preview_tablet'] . '" onClick="$(\'#device_value\').val(\'2\'); document.change_diable.submit();"><span class="faicon tablet ' . ($device_value == 2 ? ' active' : '') . '"></span></a>'; echo '<a href="#" title="' . self::$lang['srv_preview_tablet'] . '" onClick="$(\'#device_value\').val(\'2\'); document.change_diable.submit();"><div id="tablet" class="' . ($device_value == 2 ? ' active' : '') . ' ' . ($device_value == 1 ? ' mobile' : '') . ' ' . ($device_value == 0 ? ' monitor' : '') . '"><span class="faicon tablet"></span></div></a>';
echo '<a href="#" title="' . self::$lang['srv_preview_mobile'] . '" onClick="$(\'#device_value\').val(\'1\'); document.change_diable.submit();"><span class="faicon mobile ' . ($device_value == 1 ? ' active' : '') . '"></span></a>'; echo '<a href="#" title="' . self::$lang['srv_preview_mobile'] . '" onClick="$(\'#device_value\').val(\'1\'); document.change_diable.submit();"><div id="mobile" class="' . ($device_value == 1 ? ' active' : '') . '"><span class="faicon mobile"></span></div></a>';
} }
echo '</span>'; echo '</div>';
} }

95
public/css/main.css
View File

@ -7301,6 +7301,7 @@ button.ui-datepicker-trigger::before {
background-color: white; background-color: white;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 2px; border-radius: 2px;
padding: 16px;
} }
#preview-window.closed { #preview-window.closed {
background-color: transparent; background-color: transparent;
@ -7338,15 +7339,12 @@ button.ui-datepicker-trigger::before {
content: "\f139"; content: "\f139";
} }
#preview-window span.faicon.monitor::before { #preview-window span.faicon.monitor::before {
font-size: 22px;
content: "\f108"; content: "\f108";
} }
#preview-window span.faicon.tablet::before { #preview-window span.faicon.tablet::before {
font-size: 22px;
content: "\f3fa"; content: "\f3fa";
} }
#preview-window span.faicon.mobile::before { #preview-window span.faicon.mobile::before {
font-size: 22px;
content: "\f3cd"; content: "\f3cd";
} }
#preview-window span.faicon.comment::before { #preview-window span.faicon.comment::before {
@ -7364,9 +7362,9 @@ button.ui-datepicker-trigger::before {
font-family: Open Sans, Arial, Sans-Serif !important; font-family: Open Sans, Arial, Sans-Serif !important;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
padding: 21px 16px; padding-bottom: 16px;
font-size: 12px; font-size: 12px;
border-bottom: 1px #1e88e5 solid; border-bottom: 1px #E5E5E5 solid;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@ -7385,6 +7383,10 @@ button.ui-datepicker-trigger::before {
color: #1E88E5; color: #1E88E5;
border-color: #1E88E5; border-color: #1E88E5;
} }
#preview-window #preview_switch #nacina #normalni span.faicon,
#preview-window #preview_switch #nacina #celostranski span.faicon {
font-size: 16px !important;
}
#preview-window #preview_switch #nacina #normalni a, #preview-window #preview_switch #nacina #normalni a,
#preview-window #preview_switch #nacina #celostranski a { #preview-window #preview_switch #nacina #celostranski a {
color: inherit; color: inherit;
@ -7433,7 +7435,6 @@ button.ui-datepicker-trigger::before {
#preview-window #preview-holder #preview { #preview-window #preview-holder #preview {
text-align: left; text-align: left;
padding: 0; padding: 0;
margin: 15px;
border: 0; border: 0;
} }
#preview-window #preview-holder #preview select { #preview-window #preview-holder #preview select {
@ -7444,7 +7445,7 @@ button.ui-datepicker-trigger::before {
width: 100px; width: 100px;
} }
#preview-window #preview-holder #preview p { #preview-window #preview-holder #preview p {
margin: 18px 0 !important; margin: 16px 0 !important;
padding: 0 !important; padding: 0 !important;
line-height: 15px !important; line-height: 15px !important;
} }
@ -7452,19 +7453,73 @@ button.ui-datepicker-trigger::before {
font-size: 15px !important; font-size: 15px !important;
} }
#preview-window #preview-holder #preview #preview_device { #preview-window #preview-holder #preview #preview_device {
display: block; display: flex;
flex-direction: row;
align-items: center;
height: 25px; height: 25px;
margin: 0 0 15px 0; margin: 0 0 15px 0;
} }
#preview-window #preview-holder #preview #preview_device span { #preview-window #preview-holder #preview #preview_device #monitor,
display: inline-block; #preview-window #preview-holder #preview #preview_device #tablet,
vertical-align: middle; #preview-window #preview-holder #preview #preview_device #mobile {
line-height: 20px; border: 1px solid #E5E5E5;
color: #A5A5A5;
padding: 6px 9px;
width: 35px;
display: flex;
justify-content: center;
align-items: center;
} }
#preview-window #preview-holder #preview #preview_device a { #preview-window #preview-holder #preview #preview_device #monitor span.faicon,
margin-left: 20px; #preview-window #preview-holder #preview #preview_device #tablet span.faicon,
vertical-align: middle; #preview-window #preview-holder #preview #preview_device #mobile span.faicon {
color: inherit;
}
#preview-window #preview-holder #preview #preview_device #monitor.active,
#preview-window #preview-holder #preview #preview_device #tablet.active,
#preview-window #preview-holder #preview #preview_device #mobile.active {
color: #1E88E5;
background: #EEF7FF;
border-color: #1E88E5;
}
#preview-window #preview-holder #preview #preview_device #monitor {
margin-left: 24px;
border-radius: 2px 0 0 2px;
}
#preview-window #preview-holder #preview #preview_device #monitor:not(.active) {
border-right: none;
}
#preview-window #preview-holder #preview #preview_device #tablet.monitor {
border-left: none;
}
#preview-window #preview-holder #preview #preview_device #tablet.tablet {
border-right: none;
}
#preview-window #preview-holder #preview #preview_device #mobile {
border-radius: 0 2px 2px 0;
}
#preview-window #preview-holder #preview #preview_device #mobile:not(.active) {
border-left: none;
}
#preview-window #preview-holder #preview form p select {
border: 1px solid #D3D3D3;
box-sizing: border-box;
border-radius: 2px;
cursor: pointer;
background-color: #FFFFFF;
height: 30px;
font-size: 12px;
padding: 6px 7px;
margin-left: 22px;
}
#preview-window #preview-holder #preview form p select option {
color: #333;
font-size: 12px;
line-height: 20px; line-height: 20px;
padding: 0;
}
#preview-window #preview-holder #preview form p select option:disabled {
color: #A0A0A0;
} }
#preview-window #preview a, #preview-window #preview a,
#preview-window #preview_switch a, #preview-window #preview_switch a,
@ -7479,7 +7534,7 @@ button.ui-datepicker-trigger::before {
} }
#preview-window #preview_switch input[type=radio] + span.enka-checkbox-radio:before, #preview-window #preview_switch input[type=radio] + span.enka-checkbox-radio:before,
#preview-window #preview-holder input[type=checkbox] + span.enka-checkbox-radio:before { #preview-window #preview-holder input[type=checkbox] + span.enka-checkbox-radio:before {
color: #42A5F5; color: #C4C4C4;
vertical-align: -2px !important; vertical-align: -2px !important;
font-size: 18px !important; font-size: 18px !important;
line-height: 18px !important; line-height: 18px !important;
@ -7615,7 +7670,6 @@ span.faicon.empty {
flex-direction: row; flex-direction: row;
align-content: center; align-content: center;
justify-content: space-between; justify-content: space-between;
margin: 0 15px 15px 15px;
} }
#comments_bottom_line .open_comment_box { #comments_bottom_line .open_comment_box {
display: flex; display: flex;
@ -7658,8 +7712,11 @@ span.faicon.empty {
line-height: 17px !important; line-height: 17px !important;
} }
#comment_dropdown_test_survey {
margin-top: 16px;
}
#comment_dropdown_test_survey .first_holder_div { #comment_dropdown_test_survey .first_holder_div {
margin: 0 15px 15px 15px; margin-bottom: 16px;
} }
#comment_dropdown_test_survey .first_holder_div textarea { #comment_dropdown_test_survey .first_holder_div textarea {
height: 130px; height: 130px;
@ -7680,7 +7737,7 @@ span.faicon.empty {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
margin: 0 15px 15px 15px; margin-bottom: 0;
} }
#comment_dropdown_test_survey .button_holder button { #comment_dropdown_test_survey .button_holder button {
min-width: 0 !important; min-width: 0 !important;

105
resources/sass/main/main/admin.scss
View File

@ -132,6 +132,8 @@
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 2px; border-radius: 2px;
padding: 16px;
&.closed{ &.closed{
background-color: transparent; background-color: transparent;
@ -173,15 +175,12 @@
content: "\f139"; content: "\f139";
} }
span.faicon.monitor::before{ span.faicon.monitor::before{
font-size: 22px;
content: "\f108"; content: "\f108";
} }
span.faicon.tablet::before{ span.faicon.tablet::before{
font-size: 22px;
content: "\f3fa"; content: "\f3fa";
} }
span.faicon.mobile::before{ span.faicon.mobile::before{
font-size: 22px;
content: "\f3cd"; content: "\f3cd";
} }
span.faicon.comment::before{ span.faicon.comment::before{
@ -206,11 +205,11 @@
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
padding: 21px 16px; padding-bottom: 16px;
font-size: 12px; font-size: 12px;
border-bottom: 1px #1e88e5 solid; border-bottom: 1px #E5E5E5 solid;
display:flex; display:flex;
flex-direction: row; flex-direction: row;
@ -232,6 +231,10 @@
border-color: #1E88E5; border-color: #1E88E5;
} }
span.faicon {
font-size: 16px !important;
}
a { a {
color: inherit; color: inherit;
} }
@ -299,7 +302,6 @@
text-align: left; text-align: left;
padding: 0; padding: 0;
margin: 15px;
border: 0; border: 0;
@ -313,7 +315,7 @@
} }
p{ p{
margin: 18px 0 !important; margin: 16px 0 !important;
padding: 0 !important; padding: 0 !important;
line-height: 15px !important; line-height: 15px !important;
@ -323,22 +325,91 @@
} }
#preview_device{ #preview_device{
display: block; display: flex;
flex-direction: row;
align-items: center;
height: 25px; height: 25px;
margin: 0 0 15px 0; margin: 0 0 15px 0;
span{ #monitor,
display: inline-block; #tablet,
#mobile {
border: 1px solid #E5E5E5;
color: #A5A5A5;
padding: 6px 9px;
width: 35px;
display: flex;
justify-content: center;
align-items: center;
span.faicon {
color: inherit;
}
&.active {
color: #1E88E5;
background: #EEF7FF;
border-color: #1E88E5;
}
vertical-align: middle;
line-height: 20px;
} }
a{
margin-left: 20px;
vertical-align: middle; #monitor {
line-height: 20px; margin-left: 24px;
border-radius: 2px 0 0 2px;
&:not(.active) {
border-right: none;
}
}
#tablet {
&.monitor {
border-left: none;
}
&.tablet {
border-right: none;
}
}
#mobile {
border-radius: 0 2px 2px 0;
&:not(.active) {
border-left: none;
}
}
}
form {
p {
select {
border: 1px solid #D3D3D3;
box-sizing: border-box;
border-radius: 2px;
cursor: pointer;
background-color: #FFFFFF;
height: 30px;
font-size: 12px;
padding: 6px 7px;
margin-left: 22px;
option {
color: #333;
font-size: 12px;
line-height: 20px;
padding: 0;
&:disabled{
color: #A0A0A0;
}
}
}
} }
} }
} }
@ -359,7 +430,7 @@
#preview_switch input[type="radio"] + span.enka-checkbox-radio:before, #preview_switch input[type="radio"] + span.enka-checkbox-radio:before,
#preview-holder input[type="checkbox"] + span.enka-checkbox-radio:before{ #preview-holder input[type="checkbox"] + span.enka-checkbox-radio:before{
color: #42A5F5; color: #C4C4C4;
vertical-align: -2px !important; vertical-align: -2px !important;
font-size: 18px !important; font-size: 18px !important;
line-height: 18px !important; line-height: 18px !important;

8
resources/sass/main/main/test_survey_comments.scss
View File

@ -53,8 +53,6 @@ $status-blue: #EAF9FE;
align-content: center; align-content: center;
justify-content: space-between; justify-content: space-between;
margin: 0 15px 15px 15px;
.open_comment_box { .open_comment_box {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -109,10 +107,12 @@ $status-blue: #EAF9FE;
#comment_dropdown_test_survey { #comment_dropdown_test_survey {
margin-top: 16px;
//Polje, ki se odpre //Polje, ki se odpre
.first_holder_div { .first_holder_div {
margin: 0 15px 15px 15px; margin-bottom: 16px;
textarea { textarea {
height: 130px; height: 130px;
@ -142,7 +142,7 @@ $status-blue: #EAF9FE;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
margin: 0 15px 15px 15px; margin-bottom: 0;
button { button {
min-width: 0 !important; min-width: 0 !important;