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

Redesign - popravki napak - drag dodajanja vprasanja, komentarji

Browse Source
This commit is contained in:
pero1203 2022-05-27 12:02:31 +02:00
parent 15473f33da
commit 146bc5b1de
7 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin/survey/SurveyAdminSettings.php
View File

@ -1131,7 +1131,17 @@ class SurveyAdminSettings {
$preview_disable_test_insert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disable_test_insert'); $preview_disable_test_insert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disable_test_insert');
if ( isset($_GET['show']) && $_GET['show']=='on_alert' ) { if ( isset($_GET['show']) && $_GET['show']=='on_alert' ) {
echo '<div class="comments_on_alert google_yellow">'.$lang['srv_comments_on_alert'].' <a href="ajax.php?anketa='.$this->anketa.'&a=comments_onoff&do=off">'.$lang['srv_off'].'.</a> '.$lang['srv_comments_on_alert2'].' <a href="https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/komentarji/?from1ka=1" target="_blank">'.$lang['srv_anl_more'].'</a></div>'; echo '<div class="comments_on_alert google_yellow">';
echo ' <div class="title"><span class="faicon success"></span>'.$lang['srv_comments_on_alert'].'</div>';
echo ' <div class="text">';
echo $lang['srv_comments_on_alert1'].' <a href="ajax.php?anketa='.$this->anketa.'&a=comments_onoff&do=off">'.$lang['srv_here'].'</a>. ';
echo $lang['srv_comments_on_alert2'];
echo ' <a href="https://www.1ka.si/d/sl/pomoc/vodic-za-uporabnike/testiranje/komentarji/?from1ka=1" target="_blank">'.$lang['srv_more_info'].'</a>.';
echo ' </div>';
echo '</div>';
} }
$css_width = ''; $css_width = '';
@ -10577,10 +10587,10 @@ class SurveyAdminSettings {
if ($admin_type == '0' || $admin_type == '1') { if ($admin_type == '0' || $admin_type == '1') {
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<input type="checkbox" onclick="changeSurveyLock(this)" '.($lockSurvey == 1 ? ' checked="checekd"' : '').'>'; echo ' <input type="checkbox" id="change_survey_lock" onclick="changeSurveyLock(this)" '.($lockSurvey == 1 ? ' checked="checekd"' : '').'>';
echo '<label>'; echo ' <label for="change_survey_lock">';
echo $lang['srv_survey_lock_note']; echo $lang['srv_survey_lock_note'];
echo '</label>'; echo ' </label>';
echo '</div>'; echo '</div>';
} }

12
admin/survey/script/branching.js
View File

@ -636,7 +636,7 @@ function branching_struktura() {
// nastavimo droppable // nastavimo droppable
$('li.drop', $('#branching')).droppable({ $('li.drop', $('#branching')).droppable({
accept: '.spr, .if, .block, .endif, .endblock, .new_spr, .new_adv, .new_if, .new_block, .new_loop, .new_pb, .loop, .endloop', accept: '.spr, .if, .block, .endif, .endblock, .new_spr, .new_if, .new_block, .new_loop, .new_pb, .loop, .endloop',
hoverClass: 'branchinghover', hoverClass: 'branchinghover',
tolerance: 'pointer', tolerance: 'pointer',
drop: function (e, ui) { drop: function (e, ui) {
@ -658,9 +658,6 @@ function branching_struktura() {
spremenljivka_new(spr, _if, endif, copy, tip, podtip, drop); spremenljivka_new(spr, _if, endif, copy, tip, podtip, drop);
} }
} else if ($(ui.draggable).hasClass('new_adv')) { // nova advanced spremenljivka (odpre se popup za izbiro)
toolbox_add_advanced();
} else if ($(ui.draggable).hasClass('new_if')) { // nov if iz toolbox } else if ($(ui.draggable).hasClass('new_if')) { // nov if iz toolbox
var spr = $(this).attr('spr'); var spr = $(this).attr('spr');
var _if = $(this).attr('if'); var _if = $(this).attr('if');
@ -718,7 +715,7 @@ var is_new_spr_dragable = false; // gledamo ali vlečemo new_spr da skrbimo za s
// inicializira toolbox na levi strani // inicializira toolbox na levi strani
function init_toolbox() { function init_toolbox() {
$('.new_spr:not(.user_access_locked), .new_adv:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({ $('.new_spr:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({
start: function (e, ui) { start: function (e, ui) {
is_new_spr_dragable = true; is_new_spr_dragable = true;
$('#toolbox_add_advanced').addClass('dragging'); $('#toolbox_add_advanced').addClass('dragging');
@ -739,7 +736,7 @@ function init_toolbox() {
}).bind('click', function (event) { }).bind('click', function (event) {
var ta = $(event.target); var ta = $(event.target);
ta = $(ta).closest('.new_spr, .new_adv, .new_if, .new_block, .new_loop'); ta = $(ta).closest('.new_spr, .new_if, .new_block, .new_loop');
if (ta.hasClass('new_spr')) { // nova spremenljivka (iz toolboxa) if (ta.hasClass('new_spr')) { // nova spremenljivka (iz toolboxa)
@ -758,9 +755,6 @@ function init_toolbox() {
} }
} }
else if (ta.hasClass('new_adv')) { // nova spremenljivka advanced (prikaze se popup z vsemi tipi vprasanj)
toolbox_add_advanced();
}
else if (ta.hasClass('new_if')) { // nov if iz toolbox else if (ta.hasClass('new_if')) { // nov if iz toolbox
$('html, body').animate({scrollTop: $('body').height() + $('#branching').height()}); // scrollamo na dno zaslona $('html, body').animate({scrollTop: $('body').height() + $('#branching').height()}); // scrollamo na dno zaslona
if_new(0, 0, 1, 0); if_new(0, 0, 1, 0);

6
lang/1.php
View File

@ -3001,6 +3001,7 @@ $lang = array (
"srv_orientacija_horizontalna_3" => "Vodoravno", "srv_orientacija_horizontalna_3" => "Vodoravno",
"srv_orientacija_expand" => "Z razpiranjem", "srv_orientacija_expand" => "Z razpiranjem",
"srv_dynamic_multigrid" => "Postopno reševanje", "srv_dynamic_multigrid" => "Postopno reševanje",
"srv_more_info" => "Več informacij",
"srv_more" => "ve&#269", "srv_more" => "ve&#269",
"srv_less" => "manj", "srv_less" => "manj",
"user_tracker" => "Nadzor uporabnika", "user_tracker" => "Nadzor uporabnika",
@ -3697,7 +3698,7 @@ $lang = array (
"srv_language_admin" => "Jezik za urednike", "srv_language_admin" => "Jezik za urednike",
"srv_language_admin_0" => "Jezik", "srv_language_admin_0" => "Jezik",
"srv_language_admin_1" => "Osnovni jezik", "srv_language_admin_1" => "Osnovni jezik",
"srv_language_admin_survey" => "jezik administrativnega vmesnika", "srv_language_admin_survey" => "Jezik administrativnega vmesnika",
"srv_language_admin_surveyA" => "Trenutni ", "srv_language_admin_surveyA" => "Trenutni ",
"srv_language_admin_surveyB" => " je Slovenščina.", "srv_language_admin_surveyB" => " je Slovenščina.",
"srv_language_std_bes1" => "Standardne besede lahko urejate v ", "srv_language_std_bes1" => "Standardne besede lahko urejate v ",
@ -6658,7 +6659,8 @@ $lang = array (
'srv_data_column_naslov_map' => 'Naslov', 'srv_data_column_naslov_map' => 'Naslov',
'srv_data_column_vrednost_map' => 'Vrednost', 'srv_data_column_vrednost_map' => 'Vrednost',
'srv_data_column_koordinate_map' => 'Koordinate', 'srv_data_column_koordinate_map' => 'Koordinate',
'srv_comments_on_alert' => 'Komentarji so sedaj vklopljeni.', 'srv_comments_on_alert' => 'Komentarji so sedaj vklopljeni',
'srv_comments_on_alert1' => 'Če vklop komentarjev ni bil storjen namerno, lahko komentarje izklopite',
'srv_comments_on_alert2' => 'Dodatne nastavitve lahko uredite spodaj.', 'srv_comments_on_alert2' => 'Dodatne nastavitve lahko uredite spodaj.',
'srv_off' => 'Izklopi', 'srv_off' => 'Izklopi',
'srv_para_neodgovori' => 'Neodgovor spremenljivke', 'srv_para_neodgovori' => 'Neodgovor spremenljivke',

6
lang/2.php
View File

@ -2973,6 +2973,7 @@ $lang = array (
"srv_orientacija_expand" => "Expanding", "srv_orientacija_expand" => "Expanding",
"srv_dynamic_multigrid" => "Step by step mode", "srv_dynamic_multigrid" => "Step by step mode",
"srv_analiza_filter_all" => "All entries", "srv_analiza_filter_all" => "All entries",
"srv_more_info" => "More information",
"srv_more" => "more", "srv_more" => "more",
"srv_less" => "less", "srv_less" => "less",
"user_tracker" => "Tracker", "user_tracker" => "Tracker",
@ -3665,7 +3666,7 @@ $lang = array (
"srv_language_admin" => "Language for editors", "srv_language_admin" => "Language for editors",
"srv_language_admin_0" => "Language", "srv_language_admin_0" => "Language",
"srv_language_admin_1" => "Basic language for ", "srv_language_admin_1" => "Basic language for ",
"srv_language_admin_survey" => "language for survey editors", "srv_language_admin_survey" => "Language for survey editors",
"srv_language_admin_surveyA" => "The current ", "srv_language_admin_surveyA" => "The current ",
"srv_language_admin_surveyB" => " is English.", "srv_language_admin_surveyB" => " is English.",
"srv_language_std_bes1" => "Standard words can be edited in the ", "srv_language_std_bes1" => "Standard words can be edited in the ",
@ -6541,7 +6542,8 @@ $lang = array (
'srv_data_column_naslov_map' => 'Address', 'srv_data_column_naslov_map' => 'Address',
'srv_data_column_vrednost_map' => 'Value', 'srv_data_column_vrednost_map' => 'Value',
'srv_data_column_koordinate_map' => 'Coordinates', 'srv_data_column_koordinate_map' => 'Coordinates',
'srv_comments_on_alert' => 'Comments are now enabled.', 'srv_comments_on_alert' => 'Comments are now enabled',
'srv_comments_on_alert1' => 'If the enabling of comments was not done intentionally, you can turn off the comments',
'srv_comments_on_alert2' => 'You can edit extra settings below.', 'srv_comments_on_alert2' => 'You can edit extra settings below.',
'srv_off' => 'Turn off', 'srv_off' => 'Turn off',
'srv_para_neodgovori' => 'Item nonresponse', 'srv_para_neodgovori' => 'Item nonresponse',

29
public/css/admin_new.css
View File

@ -13348,17 +13348,17 @@ div.drop_setting_transition {
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option { .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option {
padding: 8px 16px 8px 16px; padding: 8px 16px 8px 16px;
} }
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a, .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help),
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover { .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) {
color: #333333; color: #333333;
text-decoration: none; text-decoration: none;
} }
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a .faicon, .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help) .faicon,
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover .faicon { .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) .faicon {
margin-right: 8px; margin-right: 8px;
} }
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a .faicon:before, .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help) .faicon:before,
.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover .faicon:before { .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) .faicon:before {
font-size: 14px; font-size: 14px;
color: #1E88E5; color: #1E88E5;
} }
@ -22615,7 +22615,22 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
} }
.comments_on_alert { .comments_on_alert {
margin-bottom: 10px; margin-bottom: 32px;
padding: 16px 32px;
border: 1px solid #E5E5E5;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
}
.comments_on_alert .title {
font-weight: 600;
font-size: 16px;
text-transform: uppercase;
padding-bottom: 8px;
margin-bottom: 8px;
border-bottom: 1px #E5E5E5 solid;
}
.comments_on_alert .title .faicon {
margin-right: 8px;
color: #1E88E5;
} }
.comments_on_alert a { .comments_on_alert a {
font-weight: 500; font-weight: 500;

4
resources/sass/admin_new/pages/survey_edit/toolbox.scss
View File

@ -333,8 +333,8 @@
.segment_option{ .segment_option{
padding: 8px 16px 8px 16px; padding: 8px 16px 8px 16px;
a, a:not(.help),
a:hover{ a:hover:not(.help){
color: $black; color: $black;
text-decoration: none; text-decoration: none;

26
resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

@ -313,7 +313,31 @@ div.page_komentarji_anketa {
} }
} }
.comments_on_alert { .comments_on_alert {
margin-bottom: 10px; margin-bottom: 32px;
padding: 16px 32px;
border: 1px solid $gray;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
.title{
font-weight: 600;
font-size: 16px;
text-transform: uppercase;
padding-bottom: 8px;
margin-bottom: 8px;
border-bottom: 1px $gray solid;
.faicon{
margin-right: 8px;
color: $blue;
}
}
.text{
}
a{ a{
//color: white; //color: white;