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

[Redizajn 1KA] - Urejanje --> Nastavitve --> Standardne besede - v7

Browse Source
This commit is contained in:
tejagerjovic 2022-02-15 15:45:40 +01:00
parent 8652b8637e
commit 913840ce4a
7 changed files with 1472 additions and 1436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/SurveyAdminSettings.php
View File

@ -2252,7 +2252,7 @@ class SurveyAdminSettings {
echo '<td><div class="standardna-beseda"><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
if($editor == 1)
echo '<span class="faicon edit2 sb-edit blue"'.$onclick.' style="display:none;"></span>';
echo '<span class="faicon edit-vprasanje sb-edit blue"'.$onclick.' style="display:none;"></span>';
echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'" style="display:none;">'.$value.'</textarea>';
echo '</div></td>';
@ -4267,9 +4267,11 @@ class SurveyAdminSettings {
function arhivi_testdata() {
global $lang;
$str_testdata = "SELECT count(*) FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2')";
$str_testdata = "SELECT count(*) as cnt, day(time_insert) as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2') GROUP BY day(time_insert)";
$query_testdata = sisplet_query($str_testdata);
list($testdata) = mysqli_fetch_row($query_testdata);
while ($testdata = mysqli_fetch_array($query_testdata)) {
echo $testdata[cnt] . $testdata[time];
}
$str_testdata_auto = "SELECT count(*), add_date, add_uid FROM srv_testdata_archive WHERE ank_id='".$this->anketa."' GROUP BY add_date";
$query_testdata_auto = sisplet_query($str_testdata_auto);

1
admin/survey/script/js-lang.php
View File

@ -194,6 +194,7 @@ lang('srv_trans_lang');
lang('srv_manager_remove_alert');
lang('srv_resevanje_foto_pre_result');
lang('srv_vrednost_correct');
lang('srv_editor_title');
//LOKACIJA

14
admin/survey/script/script.js
View File

@ -4795,17 +4795,21 @@ function inline_jezik_edit(id_value){
id.siblings('.sb-edit').hide();
id.replaceWith('<div class="fixed-position"><div id="vrednost_edit">'+
'<h2><span class="faicon edit-vprasanje st-besede-popup blue"></span><span>'+lang['srv_editor_title']+'</span></h2>'+
'<div class="popup_close"><a href="#" onclick="inline_jezik_reset(\''+id_value+'\');">✕</a></div>'+
'<br><textarea name="'+id_value+'" id="'+id_value+'">'+id.html()+'</textarea>'+
'<textarea name="'+id_value+'" id="'+id_value+'">'+id.html()+'</textarea>'+
// Hidden textarea kamor shranimo staro vrednost, da jo lahko ponastavimo
'<textarea name="old_val_'+id_value+'" style="visibility:hidden; display:none;">'+id.html()+'</textarea><br />'+
'<textarea name="old_val_'+id_value+'" style="visibility:hidden; display:none;">'+id.html()+'</textarea>'+
// Gumb shrani / zapri
'<div class="button_holder">'+
'<button class="medium white-blue" onclick="inline_jezik_reset(\''+id_value+'\');">'+lang['srv_zapri']+'</button>'+
'<button class="medium blue" onclick="inline_jezik_save(\''+id_value+'\');">'+lang['save']+'</button>'+
'<div class="button_holder popup">'+
'<button class="white-blue popup_button" onclick="inline_jezik_reset(\''+id_value+'\');">'+lang['srv_zapri']+'</button>'+
'<button class="blue popup_button" onclick="inline_jezik_save(\''+id_value+'\');">'+lang['save']+'</button>'+
'</div>'+
'</div></div>');

2849
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

20
resources/sass/admin_new/components/form/button.scss
View File

@ -13,14 +13,6 @@ submit{
// Button sizes
&.table-inline{
padding: 4px 20px;
width: fit-content;
font-size: 14px;
border-radius: 2px;
margin-left: 16px;
}
&.small{
padding: 5px 32px;
min-width: 160px;
@ -36,6 +28,18 @@ submit{
min-width: 160px;
font-size: 20px;
}
&.table-inline{
padding: 4px 20px;
width: fit-content;
font-size: 14px;
border-radius: 2px;
margin-left: 16px;
}
&.popup_button{
padding: 4px 8px;
min-width: 128px;
font-size: 16px;
}
// Button colors

2
resources/sass/admin_new/components/popup/basic.scss
View File

@ -109,7 +109,7 @@
.button_holder{
justify-content: end !important;
margin: 16px 0 0 0;
margin: 20px 0 0 0;
button:last-child{
margin-right: 0;

14
resources/sass/admin_new/pages/my_surveys/standardne_besede.scss
View File

@ -14,7 +14,7 @@ table#standard_words_table {
box-sizing: border-box;
border-radius: 2px;
padding: 8px 20px 8px 8px;
padding: 4px 8px;
width: 92%;
min-height: 32px;
@ -26,9 +26,14 @@ table#standard_words_table {
}
}
span.faicon.sb-edit {
span.faicon.edit-vprasanje {
margin-left: 8px;
cursor: pointer;
transition: 0.2s;
&:hover{
color: $dark-blue;
}
}
}
@ -42,3 +47,8 @@ table#standard_words_table {
}
}
}
span.faicon.st-besede-popup {
margin-right: 6px;
pointer-events: none;
}