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

[Redizajn 1KA] - Urejanje --> Arhiv --> Arhivi vprašalnika - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-01-13 07:36:39 +01:00
parent de02951ad0
commit a6f0e7d5fe
10 changed files with 109 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/SurveyAdmin.php
View File

@ -2201,6 +2201,7 @@ class SurveyAdmin
// Prikazemo levi meni po potrebi // Prikazemo levi meni po potrebi
private function displayLeftMenu(){ private function displayLeftMenu(){
global $lang;
$hierarhija_type = (!empty($_SESSION['hierarhija'][$this->anketa]['type']) ? $_SESSION['hierarhija'][$this->anketa]['type'] : null); $hierarhija_type = (!empty($_SESSION['hierarhija'][$this->anketa]['type']) ? $_SESSION['hierarhija'][$this->anketa]['type'] : null);
@ -2298,14 +2299,14 @@ class SurveyAdmin
// Arhiv levi meni // Arhiv levi meni
elseif(in_array($_GET['a'], ['arhivi', 'tracking', 'tracking-hierarhija']) || in_array($_GET['m'], ['anal_arch', 'view_archive'])){ elseif(in_array($_GET['a'], ['arhivi', 'tracking', 'tracking-hierarhija']) || in_array($_GET['m'], ['anal_arch', 'view_archive'])){
echo '<div class="anketa_edit_left">'; echo '<span class="menu_left-title">'.$lang['srv_arhivi'].'</span>';
echo '<div id="globalSetingsLinks" class="globalSetingsLinks archive">'; echo '<div id="globalSetingsLinks" class="globalSetingsLinks archive">';
$SSH = new SurveyStaticHtml($this->anketa); $SSH = new SurveyStaticHtml($this->anketa);
$SSH->displayArchiveNavigation(); $SSH->displayArchiveNavigation();
echo '</div>'; echo '</div>';
echo '</div>';
} }
} }

52
admin/survey/SurveyAdminSettings.php
View File

@ -4156,33 +4156,59 @@ class SurveyAdminSettings {
function arhivi() {//OSTANE function arhivi() {//OSTANE
global $lang; global $lang;
echo '<fieldset style="width:100%">'; echo '<fieldset>';
echo '<legend >' . $lang['srv_questionnaire_archives'] . '</legend>'; echo '<legend >' . $lang['srv_questionnaire_archives'] . '</legend>';
echo '<p style="margin-bottom:5px;"><span class="bold spaceRight" style="margin-top:5px;">' . $lang['srv_backup_label'] . '</span></p>'; echo '<p class="bottom16">'.$lang['srv_questionnaire_archives_text'].'</p>';
echo '<p style="margin-top:5px;margin-bottom:10px;">'.$lang['srv_note'].': <input class="" name="intro_opomba" id="intro_opomba" type="text" style="width:400px"></p>';
echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa=' . $this->anketa . '&a=backup_create" onclick="create_archive_survey(\'' . $this->anketa .'\',\'' . $lang['srv_wait_a_moment'] .'\'); return false;">'; echo '<div class="setting_holder">';
echo $lang['srv_backup_button']; echo $lang['srv_questionnaire_archives_note'].':';
echo '</a></div></span>'; echo '<input class="large w400" name="intro_opomba" id="intro_opomba" type="text"/>';
echo '</div>';
echo '<br /><br />'; echo '<div class="button_holder">';
echo '<button class="medium blue" type="button" href="index.php?anketa=' . $this->anketa . '&a=backup_create" onclick="create_archive_survey(\'' . $this->anketa .'\',\'' . $lang['srv_wait_a_moment'] .'\'); return false;">'.$lang['srv_backup_button'].'</button>';
echo '</div>';
// Seznam ustvarjenih arhivov // Seznam ustvarjenih arhivov
$sql = sisplet_query("SELECT a.id, a.naslov, a.intro_opomba, a.insert_time, a.edit_time, CONCAT(i.name, ' ', i.surname) AS insert_name, CONCAT(e.name, ' ', e.surname) AS edit_name FROM srv_anketa a, users i, users e WHERE a.insert_uid=i.id AND a.edit_uid=e.id AND a.backup = '$this->anketa' AND a.active>='0' ORDER BY a.insert_time DESC"); $sql = sisplet_query("SELECT a.id, a.naslov, a.intro_opomba, a.insert_time, a.edit_time, CONCAT(i.name, ' ', i.surname) AS insert_name, CONCAT(e.name, ' ', e.surname) AS edit_name FROM srv_anketa a, users i, users e WHERE a.insert_uid=i.id AND a.edit_uid=e.id AND a.backup = '$this->anketa' AND a.active>='0' ORDER BY a.insert_time DESC");
if (!$sql) echo mysqli_error($GLOBALS['connect_db']); if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
if (mysqli_num_rows($sql) > 0) if (mysqli_num_rows($sql) > 0) {
echo '<br /><strong>' . $lang['srv_backup_list'] . ':</strong>'; echo '<p class="bold">' . $lang['srv_backup_list'] . ':</p>';
echo '<table id="survey_archives_table">';
echo '<tr>';
echo '<th>'.$lang['srv_questionnaire_archives_date'].'</th>';
echo '<th>'.$lang['srv_questionnaire_archives_by'].'</th>';
echo '<th>'.$lang['srv_questionnaire_archives_note2'].'</th>';
echo '<th></th>';
echo '</tr>';
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
echo '<div style="margin: 5px 0 10px 10px;">'; echo '<tr>';
echo '<span class="bold"><a href="index.php?anketa=' . $row['id'] . '">' . $row['naslov'] . '</a></span> '.($row['intro_opomba']!='' ? ' - <i>'.$row['intro_opomba'].'</i>' : ''); echo '<td>'.datetime($row['insert_time']).'</td>';
echo '<br />(' . $lang['sent_by'] . ': <b>' . $row['insert_name'].'</b> ' . datetime($row['insert_time']) . ', ' . $lang['edit_by'] . ': <b>' . $row['edit_name'].'</b> ' . datetime($row['edit_time']) . ')'; echo '<td>'.$row['insert_name'].'</td>';
echo '<br /><a href="#" onclick="javascript:anketa_delete(\'' . $row['id'] . '\', \'' . $lang['srv_anketadeleteconfirm'] . '\'); return false;">' . $lang['srv_survey_archives_delete_survey'] . '</a>, <a href="index.php?anketa=' . $row['id'] . '&a=backup_restore">' . $lang['srv_anketarestore'] . '</a>'; echo '<td>'.($row['intro_opomba']!='' ? $row['intro_opomba'] : '/').'</td>';
//Ikone
echo '<td class="right">';
echo '<div class="icon_holder multiple">';
echo '<a class="faicon" href="#" onclick="javascript:anketa_delete(\'' . $row['id'] . '\', \'' . $lang['srv_anketadeleteconfirm'] . '\'); return false;"><span class="faicon trash empty"></span></a>';
echo '<button class="table-inline white-black caps" type="button" onclick="window.location.href=\'index.php?anketa=' . $row['id'] . '&a=backup_restore\'">'.$lang['srv_questionnaire_archives_activate'].'</button>';
echo '</div>'; echo '</div>';
echo '</td>';
echo '</tr>';
} }
echo '</table>';
}
echo '</fieldset>'; echo '</fieldset>';
} }

38
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -168,52 +168,56 @@ class SurveyStaticHtml
$this->survey_type = $sa->getSurvey_type($this->sid); $this->survey_type = $sa->getSurvey_type($this->sid);
echo '<div id="globalSetingsLinks" class="archive">'; echo '<div id="globalSetingsLinks" class="archive">';
echo '<ul class="">'; echo '<ul class="menu_left-list">';
# arhivi vprasalnika # arhivi vprasalnika
if ($d->checkDostopSub('edit')) { if ($d->checkDostopSub('edit')) {
echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] != 'data' && $_GET['m'] != 'changes' && $_GET['m'] != 'survey' && $_GET['m'] != 'survey_data' && $_GET['m'] != 'testdata' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[1] . '>'; echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] != 'data' && $_GET['m'] != 'changes' && $_GET['m'] != 'survey' && $_GET['m'] != 'survey_data' && $_GET['m'] != 'testdata' ? ' class="active"' : '') . $_js_links[1] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '" title="' . $lang['srv_questionnaire_archives'] . '"><span>' . $lang['srv_questionnaire_archives'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '" title="' . $lang['srv_questionnaire_archives'] . '"><span>' . $lang['srv_questionnaire_archives'] . '</span></a>';
echo '</li>'; echo '</li>';
} }
# arhivi podatkov # arhivi podatkov
if ($d->checkDostopSub('edit') && $this->survey_type > 0) { if ($d->checkDostopSub('edit') && $this->survey_type > 0) {
echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[1] . '>'; echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' class="active"' : '') . $_js_links[1] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=data" title="' . $lang['srv_arhiv_data'] . '"><span>' . $lang['srv_arhiv_data'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=data" title="' . $lang['srv_arhiv_data'] . '"><span>' . $lang['srv_arhiv_data'] . '</span></a>';
echo '</li>'; echo '</li>';
} }
# arhivi objave # arhivi objave
if ($d->checkDostopSub('publish')) { if ($d->checkDostopSub('publish')) {
echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[2] . '>'; echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="active"' : '') . $_js_links[2] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_INVITATIONS . '&m=view_archive' . '" title="' . $lang['srv_archive_invitation'] . '"><span>' . $lang['srv_archive_invitation'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_INVITATIONS . '&m=view_archive' . '" title="' . $lang['srv_archive_invitation'] . '"><span>' . $lang['srv_archive_invitation'] . '</span></a>';
echo '</li>'; echo '</li>';
} }
# arhivi analiz # arhivi analiz
if ($d->checkDostopSub('analyse')) { if ($d->checkDostopSub('analyse')) {
echo '<li' . ($_GET['a'] == A_ANALYSIS && $_GET['m'] == M_ANALYSIS_ARCHIVE ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[3] . '>'; echo '<li' . ($_GET['a'] == A_ANALYSIS && $_GET['m'] == M_ANALYSIS_ARCHIVE ? ' class="active"' : '') . $_js_links[3] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_ARCHIVE . '" title="' . $lang['srv_archive_analysis'] . '"><span>' . $lang['srv_archive_analysis'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_ARCHIVE . '" title="' . $lang['srv_archive_analysis'] . '"><span>' . $lang['srv_archive_analysis'] . '</span></a>';
echo '</li>'; echo '</li>';
} }
echo '</ul>';
# uvoz/izvoz ankete ali ankete s podatki # uvoz/izvoz ankete ali ankete s podatki
if ($d->checkDostopSub('edit')) { if ($d->checkDostopSub('edit')) {
echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking highlightLineTab"' : ' class="navi_tracking nonhighlight"') . $_js_links[1] . '>'; echo '<ul class="menu_left-list">';
echo '<span class="menu_left-title">'.$lang['srv_survey_archives_other'].'</span>';
echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking active"' : ' class="navi_tracking"') . $_js_links[1] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives'] . '"><span>' . $lang['srv_survey_archives'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives'] . '"><span>' . $lang['srv_survey_archives'] . '</span></a>';
echo '</li>'; echo '</li>';
if ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data')) { if ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data')) {
echo '<ul id="sub_navi_tracking">'; echo '<ul class="menu_left-list second" id="sub_navi_tracking">';
// Uvoz/izvoz ankete // Uvoz/izvoz ankete
echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' && $_GET['appendMerge'] != '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' && $_GET['appendMerge'] != '1' ? ' class="active"' : ' ') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives_ie'] . '"><span>' . $lang['srv_survey_archives_ie'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives_ie'] . '"><span>' . $lang['srv_survey_archives_ie'] . '</span></a>';
echo '</li>'; echo '</li>';
// Uvoz/izvoz ankete in podatkov // Uvoz/izvoz ankete in podatkov
echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey_data" title="' . $lang['srv_survey_archives_ie_data'] . '"><span>' . $lang['srv_survey_archives_ie_data'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey_data" title="' . $lang['srv_survey_archives_ie_data'] . '"><span>' . $lang['srv_survey_archives_ie_data'] . '</span></a>';
echo '</li>'; echo '</li>';
@ -227,7 +231,7 @@ class SurveyStaticHtml
$query_testdata = sisplet_query($str_testdata); $query_testdata = sisplet_query($str_testdata);
list($testdata) = mysqli_fetch_row($query_testdata); list($testdata) = mysqli_fetch_row($query_testdata);
if ((int)$testdata > 0) { if ((int)$testdata > 0) {
echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>';
echo '</li>'; echo '</li>';
} }
@ -235,15 +239,15 @@ class SurveyStaticHtml
# arhivi sprememb # arhivi sprememb
if ($d->checkDostopSub('edit')) { if ($d->checkDostopSub('edit')) {
echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA ? ' class="navi_tracking highlightLineTab"' : ' class="navi_tracking nonhighlight"') . '>'; echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA ? ' class="navi_tracking active"' : ' class="navi_tracking"') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking'] . '"><span>' . $lang['srv_survey_archives_tracking'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking'] . '"><span>' . $lang['srv_survey_archives_tracking'] . '</span></a>';
echo '</li>'; echo '</li>';
if ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA) { if ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA) {
echo '<ul id="sub_navi_tracking">'; echo '<ul class="menu_left-list second" id="sub_navi_tracking">';
// Vse spremembe ankete // Vse spremembe ankete
echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] != 'tracking_data' && $_GET['appendMerge'] != '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] != 'tracking_data' && $_GET['appendMerge'] != '1' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking_survey'] . '"><span>' . $lang['srv_survey_archives_tracking_survey'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking_survey'] . '"><span>' . $lang['srv_survey_archives_tracking_survey'] . '</span></a>';
echo '</li>'; echo '</li>';
@ -257,23 +261,23 @@ class SurveyStaticHtml
if ($hierarhija) { if ($hierarhija) {
// Vsi podatki o gradnji hierarhije, šifrantov in ostalega // Vsi podatki o gradnji hierarhije, šifrantov in ostalega
echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'hierarhija' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'hierarhija' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA. '&m=hierarhija" title="' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA. '&m=hierarhija" title="' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '</span></a>';
echo '</li>'; echo '</li>';
// Vse spremembe pri dodajanju udeležencev // Vse spremembe pri dodajanju udeležencev
echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'udelezenci' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'udelezenci' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA . '&m=udelezenci" title="' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA . '&m=udelezenci" title="' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '</span></a>';
echo '</li>'; echo '</li>';
} }
// Spremembe na podatkih // Spremembe na podatkih
echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&m=tracking_data" title="' . $lang['srv_survey_archives_tracking_data'] . '"><span>' . $lang['srv_survey_archives_tracking_data'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&m=tracking_data" title="' . $lang['srv_survey_archives_tracking_data'] . '"><span>' . $lang['srv_survey_archives_tracking_data'] . '</span></a>';
echo '</li>'; echo '</li>';
// Append/Merge (uvozi) // Append/Merge (uvozi)
echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>'; echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? ' class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&appendMerge=1" title="' . $lang['srv_survey_archives_tracking_append'] . '"><span>' . $lang['srv_survey_archives_tracking_append'] . '</span></a>'; echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&appendMerge=1" title="' . $lang['srv_survey_archives_tracking_append'] . '"><span>' . $lang['srv_survey_archives_tracking_append'] . '</span></a>';
echo '</li>'; echo '</li>';

15
lang/1.php
View File

@ -2327,7 +2327,7 @@ $lang = array (
"srv_newfolder" => "Nova mapa", "srv_newfolder" => "Nova mapa",
"srv_deletefolder" => "Izbri&#154;i mapo", "srv_deletefolder" => "Izbri&#154;i mapo",
"srv_backup" => "Kreiraj arhivsko anketo", "srv_backup" => "Kreiraj arhivsko anketo",
"srv_backup_label" => "Izdelava arhivske verzije vpra&#353;alnika:", "srv_backup_label" => "Izdelava arhivske verzije vprašalnika:",
"srv_backup_data_label" => "Izdelava arhivske kopije podatkov:", "srv_backup_data_label" => "Izdelava arhivske kopije podatkov:",
"srv_backup_button" => "Izdelaj arhivsko verzijo vprašalnika", "srv_backup_button" => "Izdelaj arhivsko verzijo vprašalnika",
"srv_backup_data_button"=> "Izdelaj arhivsko kopijo podatkov", "srv_backup_data_button"=> "Izdelaj arhivsko kopijo podatkov",
@ -4081,13 +4081,19 @@ $lang = array (
"srv_printouts_q" => "Izpisi vpra&#353;alnika", "srv_printouts_q" => "Izpisi vpra&#353;alnika",
"srv_printouts_q" => "Izpisi vpra&#353;alnika", "srv_printouts_q" => "Izpisi vpra&#353;alnika",
"srv_archival_version_q" => "Arhivske verzije vpra&#353;alnika", "srv_archival_version_q" => "Arhivske verzije vpra&#353;alnika",
"srv_questionnaire_archives" => "Arhivi vpra&#353;alnika", "srv_questionnaire_archives" => "Arhivi vprašalnika",
"srv_survey_archives" => "Izvoz", "srv_questionnaire_archives_text" => "Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
"srv_questionnaire_archives_note" => "Opomba k arhivski verziji",
"srv_questionnaire_archives_date" => "Datum arhiviranja",
"srv_questionnaire_archives_by" => "Arhiviral/-a",
"srv_questionnaire_archives_note2" => "Opomba",
"srv_questionnaire_archives_activate" => "Aktivacija",
"srv_survey_archives" => "Izvozi",
"srv_survey_archives_ie" => "Vprašalnik", "srv_survey_archives_ie" => "Vprašalnik",
"srv_survey_archives_ie_title" => "Izvoz vprašalnika", "srv_survey_archives_ie_title" => "Izvoz vprašalnika",
"srv_survey_archives_ie_data" => "Vprašalnik in podatki", "srv_survey_archives_ie_data" => "Vprašalnik in podatki",
"srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov", "srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov",
"srv_survey_archives_tracking" => "Zgodovina sprememb", "srv_survey_archives_tracking" => "Spremembe",
"srv_survey_archives_tracking_survey" => "Spremembe vprašalnika", "srv_survey_archives_tracking_survey" => "Spremembe vprašalnika",
"srv_survey_archives_tracking_data" => "Spremembe podatkov", "srv_survey_archives_tracking_data" => "Spremembe podatkov",
"srv_survey_archives_tracking_append" => "Append/Merge (uvozi)", "srv_survey_archives_tracking_append" => "Append/Merge (uvozi)",
@ -4107,6 +4113,7 @@ $lang = array (
"srv_survey_archives_survey" => "<b>Shrani arhivsko datoteko vprašalnika</b>", "srv_survey_archives_survey" => "<b>Shrani arhivsko datoteko vprašalnika</b>",
"srv_survey_archives_data" => "<b>Shrani arhivsko datoteko vprašalnika s podatki</b>", "srv_survey_archives_data" => "<b>Shrani arhivsko datoteko vprašalnika s podatki</b>",
"srv_survey_archives_delete_survey" => "Izbriši arhivsko verzijo vprašalnika", "srv_survey_archives_delete_survey" => "Izbriši arhivsko verzijo vprašalnika",
"srv_survey_archives_other" => "Ostalo",
"srv_tracking_label" => "Sledenje spremembam (tracking)", "srv_tracking_label" => "Sledenje spremembam (tracking)",
"link_parent_content" => "Odpri meni, a ohrani vsebino star&#154;a", "link_parent_content" => "Odpri meni, a ohrani vsebino star&#154;a",
"link_prev_content" => "Odpri meni, a ohrani vsebino prej odprte strani", "link_prev_content" => "Odpri meni, a ohrani vsebino prej odprte strani",

11
lang/2.php
View File

@ -4063,12 +4063,18 @@ $lang = array (
"srv_printouts_q" => "Questionnaire printouts", "srv_printouts_q" => "Questionnaire printouts",
"srv_archival_version_q" => "Questionnaire archive", "srv_archival_version_q" => "Questionnaire archive",
"srv_questionnaire_archives" => "Questionnaire archive", "srv_questionnaire_archives" => "Questionnaire archive",
"srv_survey_archives" => "Export", "srv_questionnaire_archives_text" => "Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire in the list below. Each archive version of the questionnaire can be activated. When activated, the archive version is automatically created as a new survey.",
"srv_questionnaire_archives_note" => "Archive version note",
"srv_questionnaire_archives_date" => "Archive date",
"srv_questionnaire_archives_by" => "Archived by",
"srv_questionnaire_archives_note2" => "Note",
"srv_questionnaire_archives_activate" => "Activation",
"srv_survey_archives" => "Exports",
"srv_survey_archives_ie" => "Survey", "srv_survey_archives_ie" => "Survey",
"srv_survey_archives_ie_title" => "Survey import / export", "srv_survey_archives_ie_title" => "Survey import / export",
"srv_survey_archives_ie_data" => "Survey and data", "srv_survey_archives_ie_data" => "Survey and data",
"srv_survey_archives_ie_data_title" => "Survey and data import / export", "srv_survey_archives_ie_data_title" => "Survey and data import / export",
"srv_survey_archives_tracking" => "Change history", "srv_survey_archives_tracking" => "Changes",
"srv_survey_archives_tracking_survey" => "Survey changes", "srv_survey_archives_tracking_survey" => "Survey changes",
"srv_survey_archives_tracking_data" => "Data changes", "srv_survey_archives_tracking_data" => "Data changes",
"srv_survey_archives_tracking_append" => "Append/Merge (imports)", "srv_survey_archives_tracking_append" => "Append/Merge (imports)",
@ -4088,6 +4094,7 @@ $lang = array (
"srv_survey_archives_survey" => "<b>Save questionnaire archive file</b>", "srv_survey_archives_survey" => "<b>Save questionnaire archive file</b>",
"srv_survey_archives_data" => "<b>Save questionnaire and data archive file</b>", "srv_survey_archives_data" => "<b>Save questionnaire and data archive file</b>",
"srv_survey_archives_delete_survey" => "Delete archive survey", "srv_survey_archives_delete_survey" => "Delete archive survey",
"srv_survey_archives_other" => "Other",
"srv_tracking_label" => "Changes tracking", "srv_tracking_label" => "Changes tracking",
"link_parent_content" => "Open menu, but keep parent's content", "link_parent_content" => "Open menu, but keep parent's content",
"link_prev_content" => "Open menu, but keep previous page's content", "link_prev_content" => "Open menu, but keep previous page's content",

9
public/css/admin_new.css
View File

@ -5211,6 +5211,7 @@ div.icon_holder button.ui-datepicker-trigger {
} }
div.icon_holder.multiple span.faicon, div.icon_holder.multiple span.faicon,
div.icon_holder.multiple a.faicon { div.icon_holder.multiple a.faicon {
margin-left: 0;
margin-right: 16px; margin-right: 16px;
} }
div.icon_holder.multiple span.faicon:last-of-type, div.icon_holder.multiple span.faicon:last-of-type,
@ -5931,6 +5932,10 @@ span.faicon.vote-yes::before {
content: "\f772"; content: "\f772";
} }
span.faicon.file-preview::before {
content: "\f865";
}
/* /*
To change this license header, choose License Headers in Project Properties. To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates To change this template file, choose Tools | Templates
@ -7293,6 +7298,7 @@ submit.table-inline {
width: fit-content; width: fit-content;
font-size: 14px; font-size: 14px;
border-radius: 2px; border-radius: 2px;
margin-left: 16px;
} }
button.small, button.small,
submit.small { submit.small {
@ -7424,6 +7430,9 @@ input[type=text], input[type=password] {
input[type=text].w200, input[type=password].w200 { input[type=text].w200, input[type=password].w200 {
width: 200px; width: 200px;
} }
input[type=text].w400, input[type=password].w400 {
width: 400px;
}
input[type=text].wauto, input[type=password].wauto { input[type=text].wauto, input[type=password].wauto {
width: auto; width: auto;
} }

1
resources/sass/admin_new/basic/icons/icons.scss
View File

@ -81,6 +81,7 @@ div.icon_holder {
&.multiple { &.multiple {
span.faicon, span.faicon,
a.faicon{ a.faicon{
margin-left: 0;
margin-right: 16px; margin-right: 16px;
&:last-of-type { &:last-of-type {
margin-right: 0px; margin-right: 0px;

5
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -606,3 +606,8 @@ span.faicon.list-alt::before{
span.faicon.vote-yes::before{ span.faicon.vote-yes::before{
content: "\f772"; content: "\f772";
} }
//Preview
span.faicon.file-preview::before{
content: "\f865";
}

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

@ -18,6 +18,7 @@ submit{
width: fit-content; width: fit-content;
font-size: 14px; font-size: 14px;
border-radius: 2px; border-radius: 2px;
margin-left: 16px;
} }
&.small{ &.small{

3
resources/sass/admin_new/components/form/input.scss
View File

@ -30,6 +30,9 @@ input {
&.w200 { &.w200 {
width: 200px; width: 200px;
} }
&.w400 {
width: 400px;
}
&.wauto { &.wauto {
width: auto; width: auto;
} }