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

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

Browse Source
This commit is contained in:
tejagerjovic 2022-02-24 13:15:36 +01:00
parent 2f74d2cec8
commit 0b7871669f
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,13 +481,12 @@ class SurveyAppendMerge {
echo '<p>'.$lang['srv_append-merge_fin'].'</p>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['back'].'</button>';
echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['srv_zapri'].'</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>';
}
if ($import_type == 1){
echo '<br /><br />';
echo '</fieldset>';
}
}
@ -1042,7 +1041,7 @@ class SurveyAppendMerge {
// shranjeno, prikazemo resultat
} else {
echo '<h2>'.$lang['fin_import_ok'].'</h2>';
echo '<p class="bold bottom16">'.$lang['fin_import_ok'].'</p>';
echo '<p>'.$output.'</p>';
echo '<p>'.$lang['fin_import_ok_text'].'</p>';

6
lang/1.php
View File

@ -2643,8 +2643,8 @@ $lang = array (
"bruto" => "Bruto",
"cost_label" => "Oznaka stro&#154;ka",
"fin_import_3_of_3" => "Korak 3 od 3: Opravljeno",
"fin_import_ok" => "Podatki so bili uspe&#154;no uvo&#382;eni",
"fin_import_ok_text" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran)",
"fin_import_ok" => "Podatki so bili uspešno uvoženi",
"fin_import_ok_text" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na več straneh, izberite zadnjo stran).",
"fin_show_substm" => "Prika&#382;i tudi podstro&#154;kovna mesta",
"texts" => "Teksti",
"logotype" => "Logotip",
@ -6016,7 +6016,7 @@ $lang = array (
"srv_append-merge_process_o_1" => "V postopku bo združenih",
"srv_append-merge_process_o_2" => "vrstic podatkov. Obstoječe vrednosti se bodo prepisale!",
"srv_append-merge_error_value" => "Pri združevanju po ključu se nobena od vrednosti ne ujema.",
"srv_append-merge_fin" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran)",
"srv_append-merge_fin" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran).",
"srv_question_respondent_comment" => "Vaš komentar k vprašanju",
"1cul_select_file" => "Izberite datoteko iz svojega ra&#269;unalnika",

4
lang/2.php
View File

@ -2621,7 +2621,7 @@ $lang = array (
"cost_label" => "Cosr Label",
"fin_import_3_of_3" => "Step 3 of 3: Done",
"fin_import_ok" => "The data has been imported successfully",
"fin_import_ok_text" => "New lines are at the bottom of the table (if there are multiple pages of data, select last page)",
"fin_import_ok_text" => "New lines are at the bottom of the table (if there are multiple pages of data, select last page).",
"fin_show_substm" => "Show sub-stm",
"texts" => "Texts",
"logotype" => "Logotype",
@ -5914,7 +5914,7 @@ $lang = array (
"srv_append-merge_process_o_1" => "In the process there will be merged",
"srv_append-merge_process_o_2" => "lines of data. Existing values will be overwritten!",
"srv_append-merge_error_value" => "There is no match for chosen identifier.",
"srv_append-merge_fin" => "New lines are at the bottom of the table (if data is displayed on multiple pages select last page)",
"srv_append-merge_fin" => "New lines are at the bottom of the table (if data is displayed on multiple pages select last page).",
"1cul_select_file" => "Browse and select file from your computer",
"1cul_browse" => "Browse",

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

@ -28,6 +28,7 @@ submit{
min-width: 160px;
font-size: 20px;
}
//Gumb v polju zraven teksta ali ikon
&.table-inline{
padding: 4px 20px;
width: fit-content;
@ -36,6 +37,7 @@ submit{
margin-left: 16px;
white-space: nowrap;
}
//Sam gumb v polju
&.table{
padding: 4px 20px;
width: fit-content;