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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-02-24 13:42:55 +01:00
commit 3c47f08ae6
6 changed files with 71 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
admin/survey/SurveyAdminSettings.php
View File

@ -2261,15 +2261,37 @@ class SurveyAdminSettings {
} }
function anketa_nice_links () { function anketa_nice_links () {
global $lang;
echo '<div id="anketa_edit">'; echo '<div id="anketa_edit">';
echo '<fieldset><legend>'.$lang['srv_nice_url'].'</legend>';
$sql = sisplet_query("SELECT l.link, a.id, a.naslov FROM srv_nice_links l, srv_anketa a WHERE a.id=l.ank_id ORDER BY l.link ASC"); $sql = sisplet_query("SELECT l.link, a.id, a.naslov FROM srv_nice_links l, srv_anketa a WHERE a.id=l.ank_id ORDER BY l.link ASC");
$table_exists = 0;
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
echo '<p><strong style="display:inline-block; width:300px;">'.$row['link'].'</strong> <a href="index.php?anketa='.$row['id'].'&a=vabila&m=url">'.$row['naslov'].'</a></p>'; if ($table_exists == 0) {
echo '<p class="bottom16">'.$lang['srv_nice_url_note'].'</p>';
echo '<table>';
echo '<tr>';
echo '<th>'.$lang['srv_nice_url_extension'].'</th>';
echo '<th>'.$lang['srv_nice_url_surveyname'].'</th>';
echo '</tr>';
$table_exists = 1;
} }
echo '<tr>';
echo '<td>'.$row['link'].'</td>';
echo '<td><a href="index.php?anketa='.$row['id'].'&a=vabila&m=url">'.$row['naslov'].'</a></td>';
echo '</tr>';
}
if ($table_exists == 1)
echo '</table>';
echo '</fieldset>';
echo '</div>'; echo '</div>';
} }
@ -2313,18 +2335,18 @@ class SurveyAdminSettings {
echo '<p class="bottom16">'.$lang['srv_anketa_deleted_note'].'</p>'; echo '<p class="bottom16">'.$lang['srv_anketa_deleted_note'].'</p>';
echo '<table>'; echo '<table>';
echo '<tr>'; echo '<tr>';
echo '<th>'.$lang['srv_data_deleted_surveyname'].'<th>'; echo '<th>'.$lang['srv_data_deleted_surveyname'].'</th>';
echo '<th class="nowrap">'.$lang['srv_data_deleted_user'].'<th>'; echo '<th class="nowrap">'.$lang['srv_data_deleted_user'].'</th>';
echo '<th><th>'; echo '<th></th>';
echo '</tr>'; echo '</tr>';
$table_exists = 1; $table_exists = 1;
} }
echo '<tr>'; echo '<tr>';
echo '<td><a href="index.php?anketa='.$row['id'].'">'.$row['naslov'].'</a><td>'; echo '<td><a href="index.php?anketa='.$row['id'].'">'.$row['naslov'].'</a></td>';
echo '<td>'.$row['email'].'<td>'; echo '<td>'.$row['email'].'</td>';
echo '<td><button class="table-inline white-black caps" type="button" onclick="anketa_restore(\''.$row['id'].'\'); return false;">'.$lang['srv_anketa_deleted_restore'].'</button><td>'; echo '<td><button class="table white-black caps" type="button" onclick="anketa_restore(\''.$row['id'].'\'); return false;">'.$lang['srv_anketa_deleted_restore'].'</button></td>';
echo '</tr>'; echo '</tr>';
} }
@ -2355,20 +2377,20 @@ class SurveyAdminSettings {
echo '<p class="bottom16">'.$lang['srv_data_deleted_note'].'</p>'; echo '<p class="bottom16">'.$lang['srv_data_deleted_note'].'</p>';
echo '<table>'; echo '<table>';
echo '<tr>'; echo '<tr>';
echo '<th>'.$lang['srv_data_deleted_surveyname'].'<th>'; echo '<th>'.$lang['srv_data_deleted_surveyname'].'</th>';
echo '<th class="nowrap">'.$lang['srv_data_deleted_user'].'<th>'; echo '<th class="nowrap">'.$lang['srv_data_deleted_user'].'</th>';
echo '<th class="nowrap">'.$lang['srv_data_deleted'].'<th>'; echo '<th class="nowrap">'.$lang['srv_data_deleted'].'</th>';
echo '<th><th>'; echo '<th></th>';
echo '</tr>'; echo '</tr>';
$table_exists = 1; $table_exists = 1;
} }
echo '<tr>'; echo '<tr>';
echo '<td><a href="index.php?anketa='.$row['id'].'">'.$row['naslov'].'</a><td>'; echo '<td><a href="index.php?anketa='.$row['id'].'">'.$row['naslov'].'</a></td>';
echo '<td>'.$row['email'].'<td>'; echo '<td>'.$row['email'].'</td>';
echo '<td class="right">'.$row['deleted'].'<td>'; echo '<td class="right">'.$row['deleted'].'</td>';
echo '<td><button class="table-inline white-black caps" type="button" onclick="data_restore(\''.$row['id'].'\'); return false;">'.$lang['srv_data_deleted_restore'].'</button><td>'; echo '<td><button class="table white-black caps" type="button" onclick="data_restore(\''.$row['id'].'\'); return false;">'.$lang['srv_data_deleted_restore'].'</button></td>';
echo '</tr>'; echo '</tr>';
} }

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

@ -481,13 +481,12 @@ class SurveyAppendMerge {
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 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 '<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>';
} }
if ($import_type == 1){ if ($import_type == 1){
echo '<br /><br />';
echo '</fieldset>'; echo '</fieldset>';
} }
} }
@ -1042,7 +1041,7 @@ class SurveyAppendMerge {
// shranjeno, prikazemo resultat // shranjeno, prikazemo resultat
} else { } else {
echo '<h2>'.$lang['fin_import_ok'].'</h2>'; echo '<p class="bold bottom16">'.$lang['fin_import_ok'].'</p>';
echo '<p>'.$output.'</p>'; echo '<p>'.$output.'</p>';
echo '<p>'.$lang['fin_import_ok_text'].'</p>'; echo '<p>'.$lang['fin_import_ok_text'].'</p>';

9
lang/1.php
View File

@ -2643,8 +2643,8 @@ $lang = array (
"bruto" => "Bruto", "bruto" => "Bruto",
"cost_label" => "Oznaka stro&#154;ka", "cost_label" => "Oznaka stro&#154;ka",
"fin_import_3_of_3" => "Korak 3 od 3: Opravljeno", "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" => "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_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", "fin_show_substm" => "Prika&#382;i tudi podstro&#154;kovna mesta",
"texts" => "Teksti", "texts" => "Teksti",
"logotype" => "Logotip", "logotype" => "Logotip",
@ -4495,6 +4495,9 @@ $lang = array (
"srv_nice_url_short" => "je prekratek! Minimalna dolžina so 3 znaki.", "srv_nice_url_short" => "je prekratek! Minimalna dolžina so 3 znaki.",
"srv_nice_url_long" => "je predolg! Maksimalna dolžina je 20 znakov.", "srv_nice_url_long" => "je predolg! Maksimalna dolžina je 20 znakov.",
"srv_nice_url_title" => "Anketa ima naslednji URL naslov:", "srv_nice_url_title" => "Anketa ima naslednji URL naslov:",
"srv_nice_url_note" => "V spodnji tabeli je seznam vseh lepih URL povezav na tej namestitvi in povezave do anket, za katere so bile ustvarjene.",
"srv_nice_url_surveyname" => "Ime ankete",
"srv_nice_url_extension" => "Končnica lepe URL povezave",
"activate_this_cat_in_edit_db" => "Filter je potrebno aktivirati v urejanju baze, saj trenutno ni obkljukan.", "activate_this_cat_in_edit_db" => "Filter je potrebno aktivirati v urejanju baze, saj trenutno ni obkljukan.",
"srv_undecided" => "Nedoločen", "srv_undecided" => "Nedoločen",
"srv_todo" => "Za narediti", "srv_todo" => "Za narediti",
@ -6016,7 +6019,7 @@ $lang = array (
"srv_append-merge_process_o_1" => "V postopku bo združenih", "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_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_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", "srv_question_respondent_comment" => "Vaš komentar k vprašanju",
"1cul_select_file" => "Izberite datoteko iz svojega ra&#269;unalnika", "1cul_select_file" => "Izberite datoteko iz svojega ra&#269;unalnika",

7
lang/2.php
View File

@ -2621,7 +2621,7 @@ $lang = array (
"cost_label" => "Cosr Label", "cost_label" => "Cosr Label",
"fin_import_3_of_3" => "Step 3 of 3: Done", "fin_import_3_of_3" => "Step 3 of 3: Done",
"fin_import_ok" => "The data has been imported successfully", "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", "fin_show_substm" => "Show sub-stm",
"texts" => "Texts", "texts" => "Texts",
"logotype" => "Logotype", "logotype" => "Logotype",
@ -4474,6 +4474,9 @@ $lang = array (
"srv_nice_url_short" => "is too short! Minimal length is 3 characters.", "srv_nice_url_short" => "is too short! Minimal length is 3 characters.",
"srv_nice_url_long" => "is too long! Maximal length is 20 characters.", "srv_nice_url_long" => "is too long! Maximal length is 20 characters.",
"srv_nice_url_title" => "Survey has the following URL address:", "srv_nice_url_title" => "Survey has the following URL address:",
"srv_nice_url_note" => "The table below lists all the custom URLs on this installation, and the links to the surveys for which they were created."
"srv_nice_url_surveyname" => "Survey name",
"srv_nice_url_extension" => "Custom URl extension",
"activate_this_cat_in_edit_db" => "Filter needs to be activated using 'edit database' as it is currently not checked.", "activate_this_cat_in_edit_db" => "Filter needs to be activated using 'edit database' as it is currently not checked.",
"srv_undecided" => "Undecided", "srv_undecided" => "Undecided",
"srv_todo" => "To do", "srv_todo" => "To do",
@ -5914,7 +5917,7 @@ $lang = array (
"srv_append-merge_process_o_1" => "In the process there will be merged", "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_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_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_select_file" => "Browse and select file from your computer",
"1cul_browse" => "Browse", "1cul_browse" => "Browse",

8
public/css/admin_new.css
View File

@ -8703,6 +8703,14 @@ submit.table-inline {
margin-left: 16px; margin-left: 16px;
white-space: nowrap; white-space: nowrap;
} }
button.table,
submit.table {
padding: 4px 20px;
width: fit-content;
font-size: 14px;
border-radius: 2px;
white-space: nowrap;
}
button.blue, button.blue,
submit.blue { submit.blue {
color: #FFFFFF; color: #FFFFFF;

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

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