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

[Redizajn 1KA] - Podatki --> Uvozi --> Dodaj podatke - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-02-24 00:07:06 +01:00
parent a110e352da
commit 25a6ded227
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/classes/class.SurveyAppendMerge.php
View File

@ -381,7 +381,6 @@ class SurveyAppendMerge {
$import_type = (int)$_POST['inv_import_type']; $import_type = (int)$_POST['inv_import_type'];
if ($_POST['do']=='1') $do = true; else $do = false; if ($_POST['do']=='1') $do = true; else $do = false;
// ce uploadamo datoteko // ce uploadamo datoteko
if ($import_type == 1) { if ($import_type == 1) {
@ -444,6 +443,7 @@ class SurveyAppendMerge {
// napaka // napaka
if ($result <= 0) { if ($result <= 0) {
echo '<h2>'.$lang['error'].'</h2>'; echo '<h2>'.$lang['error'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
if ($result < 0) if ($result < 0)
echo '<p>'.$output.'</p>'; echo '<p>'.$output.'</p>';
@ -457,6 +457,7 @@ class SurveyAppendMerge {
} else { } else {
echo '<h2>'.$lang['srv_potrditev'].'</h2>'; echo '<h2>'.$lang['srv_potrditev'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
if ($do_merge == 0) if ($do_merge == 0)
echo '<p>'.$lang['srv_append-merge_process_1'].' '.$result.' '.$lang['srv_append-merge_process_2'].'. '.'</p>'; echo '<p>'.$lang['srv_append-merge_process_1'].' '.$result.' '.$lang['srv_append-merge_process_2'].'. '.'</p>';
@ -474,11 +475,13 @@ class SurveyAppendMerge {
} else { } else {
echo '<h2>'.$lang['fin_import_ok'].'</h2>'; echo '<h2>'.$lang['fin_import_ok'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
echo '<p>'.$output.'</p>'; echo '<p>'.$output.'</p>';
echo '<p>'.$lang['srv_append-merge_fin'].'</p>'; echo '<p>'.$lang['srv_append-merge_fin'].'</p>';
echo '<div class="button_holder">'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['back'].'</button>';
echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'\'">'.$lang['data_show'].'</button>'; echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'\'">'.$lang['data_show'].'</button>';
echo '</div>'; echo '</div>';
} }

5
public/css/admin_new.css
View File

@ -15471,6 +15471,9 @@ div.appendmerge_indent ul {
margin: 0; margin: 0;
list-style-position: inside; list-style-position: inside;
} }
div.appendmerge_indent ul li.inv_field_enabled label {
cursor: default;
}
div.appendmerge_indent div.setting_holder input[type=number] { div.appendmerge_indent div.setting_holder input[type=number] {
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
box-sizing: border-box; box-sizing: border-box;
@ -15519,7 +15522,7 @@ div.appendmerge_indent div.setting_holder input[type=number]:focus {
min-width: 200px; min-width: 200px;
box-sizing: border-box; box-sizing: border-box;
padding: 12px 16px; padding: 12px 16px;
margin: 8px; margin: 4px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
background-color: #F8F8F8; background-color: #F8F8F8;

8
resources/sass/admin_new/pages/survey_data/append_merge.scss
View File

@ -9,6 +9,12 @@ div.appendmerge_indent{
padding: 0; padding: 0;
margin: 0; margin: 0;
list-style-position: inside; list-style-position: inside;
li.inv_field_enabled {
label {
cursor: default;
}
}
} }
div.setting_holder { div.setting_holder {
@ -73,7 +79,7 @@ div.appendmerge_indent{
box-sizing: border-box; box-sizing: border-box;
padding: 12px 16px; padding: 12px 16px;
margin: 8px; margin: 4px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;