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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Robert 2022-08-26 08:45:27 +02:00
commit 1ed7ea9720
48 changed files with 4215 additions and 2833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/survey/SurveyAdmin.php
View File

@ -2226,6 +2226,7 @@ class SurveyAdmin
|| $_GET['a'] == 'forma'
|| $_GET['a'] == 'metadata'
|| $_GET['a'] == 'mobile_settings'
|| $_GET['a'] == 'table_settings'
|| $_GET['a'] == A_PRIKAZ
|| $_GET['a'] == A_MISSING
|| $_GET['a'] == A_SKUPINE
@ -2554,6 +2555,7 @@ class SurveyAdmin
|| $_GET['a'] == 'forma'
|| $_GET['a'] == 'metadata'
|| $_GET['a'] == 'mobile_settings'
|| $_GET['a'] == 'table_settings'
|| $_GET['a'] == A_PRIKAZ
|| $_GET['a'] == A_EXPORTSETTINGS
|| $_GET['a'] == A_GDPR
@ -3127,6 +3129,11 @@ class SurveyAdmin
echo '<li ' . ($get == A_MOBILESETTINGS ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_MOBILESETTINGS . '" title="' . $lang['srv_mobile_settings'] . '">' . $lang['srv_mobile_settings'] . '</a></li> ';
# prikaz tabel
echo '<li ' . ($get == A_TABLESETTINGS ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TABLESETTINGS . '" title="' . $lang['srv_table_settings'] . '">' . $lang['srv_table_settings'] . '</a></li> ';
# prevajanje - jezik (standardne besede)
echo '<li ' . ($get == A_JEZIK ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_JEZIK . '" title="' . $lang['srv_standardne_besede'] . '">' . $lang['srv_standardne_besede'] . '</a></li> ';
@ -3546,6 +3553,9 @@ class SurveyAdmin
elseif($_GET['m'] == 'all'){
$sas->allUsersList();
}
elseif($_GET['m'] == 'add'){
$sas->dodeljeniUporabniki();
}
else {
$sas->assignedUsersList();
}
@ -3629,6 +3639,10 @@ class SurveyAdmin
$sas = new SurveyAdminSettings();
$sas->globalUserMyProfile();
}
if ($_GET['m'] == 'global_user_ChangeArchive') {
$sas = new SurveyAdminSettings();
$sas->globalUserChangeArchive();
}
echo '</div>';
}

95
admin/survey/SurveyAdminAjax.php
View File

@ -933,6 +933,10 @@ class SurveyAdminAjax {
if (isset($_POST['mobile_tables'])) {
SurveySetting::getInstance()->setSurveyMiscSetting('mobile_tables', $_POST['mobile_tables']);
}
if (isset($_POST['pc_tables'])) {
SurveySetting::getInstance()->setSurveyMiscSetting('pc_tables', $_POST['pc_tables']);
}
if (isset($_POST['export_font_size'])) {
SurveySetting::getInstance()->setSurveyMiscSetting('export_font_size', $_POST['export_font_size']);
@ -4325,6 +4329,74 @@ class SurveyAdminAjax {
echo '</div>';
}
elseif ($_GET['a'] == 'preview_spremenljivka_lib') {
global $site_path;
SurveyInfo :: getInstance()->SurveyInit($anketa);
$offset = 0;
$zaporedna = 0;
$count_type = SurveyInfo :: getInstance()->getSurveyCountType();
if ($count_type) {
// Preštejemo koliko vprašanj je bilo do sedaj
$sqlg = sisplet_query("SELECT vrstni_red FROM srv_grupa WHERE id = (SELECT gru_id FROM srv_spremenljivka WHERE id = '" . $_POST['spremenljivka'] . "')");
$rowg = mysqli_fetch_assoc($sqlg);
$vrstni_red = $rowg['vrstni_red'];
$sqlCountPast = sisplet_query("SELECT count(*) as cnt FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . $_POST['anketa'] . "' AND s.gru_id=g.id AND g.vrstni_red < '$vrstni_red' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
$rowCount = mysqli_fetch_assoc($sqlCountPast);
$offset = $rowCount['cnt'];
// poiscemo vprasanja / spremenljivke
$sql = sisplet_query("SELECT id FROM srv_spremenljivka WHERE gru_id=(SELECT gru_id FROM srv_spremenljivka WHERE id = '" . $_POST['spremenljivka'] . "') AND visible='1' ORDER BY vrstni_red ASC");
while ($row = mysqli_fetch_array($sql)) {
if ($row['id'] == $_POST['spremenljivka']) {
$zaporedna++;
break;
}
}
}
echo '<h2><span class="as_link" onClick="closePreviewVprasanje();"><span class="faicon arrow_back"></span>'.$lang['srv_deleted_vprasanja_back'].'</span></h2>';
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
echo '<div id="preview_spremenljivka">';
include_once('../../main/survey/app/global_function.php');
new \App\Controllers\SurveyController(true);
if (isset($_POST['lang_id'])) {
save('lang_id', (int)$_POST['lang_id']);
}
echo ' <div id="spremenljivka_preview">';
if ( $_POST['spremenljivka'] == -1 ) {
\App\Controllers\BodyController::getInstance()->displayIntroductionContent();
}
elseif ( $_POST['spremenljivka'] == -2 ) {
\App\Controllers\BodyController::getInstance()->displayKonecContent();
}
elseif ( $_POST['spremenljivka'] == -3 ) {
\App\Controllers\StatisticController::displayStatistika();
}
else {
save('forceShowSpremenljivka', true);
save('question_preview', true);
\App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_POST['spremenljivka'], $offset, $zaporedna);
}
echo ' </div>';
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="medium blue" onClick="closePreviewVprasanje(); return false;">'.$lang['srv_deleted_vprasanja_back'].'</button>';
echo '</div>';
}
else if ($_GET['a'] == 'preview_page') {
echo '<div id="preview_page">';
echo ' <div id="page_preview">';
@ -4336,23 +4408,7 @@ class SurveyAdminAjax {
echo ' <div class="clr"></div>';
echo ' </div>';
echo '</div>';
}
/*else if ($_GET['a'] == 'rename_variable') {
if ($_POST['show'] == 'true') {
echo '<input type="text" name="variable" id="variable_' . $spremenljivka . '" value="' . $_POST['value'] . '" class="variableinput variableinput_noborder" onkeyup="edit_spremenljivka_variable(\'' . $spremenljivka . '\');" ' . ' />';
echo '<script type="text/javascript">';
echo '$(document).ready(function() {';
echo ' $("#variable_' . $spremenljivka . '").keypress(function(e){if(e.which==13) rename_variable(\'' . $spremenljivka . '\', $(this).val()' . ', \'' . $_POST['variable_custom'] . '\', \'false\'); });';
echo '});';
echo '</script>';
} else {
echo $_POST['value'];
echo '<a href="#" onclick="rename_variable(\'' . $spremenljivka . '\', \'' . $_POST['value'] . '\', \'' . $_POST['variable_custom'] . '\', \'true\'); return false;" title="' . $lang['edit3'] . '"><img id="edit_variable_' . $spremenljivka . '" src="img_' . $this->skin . '/pencil.png" /></a>';
}
}*/
}
else if ($_GET['a'] == 'form_settings') {
Common::updateEditStamp();
@ -4860,6 +4916,11 @@ class SurveyAdminAjax {
sisplet_query("UPDATE post SET vsebina='$vsebina' WHERE id='$id'");
} elseif ($_GET['a'] == 'comment_delete') {
$id = $_POST['id'];
$sql = sisplet_query("DELETE FROM post WHERE id='$id'");
} elseif ($_GET['a'] == 'archivePopup') {
echo '<div class="survey_archive_popup">';
$sas = new SurveyAdminSettings();

1296
admin/survey/SurveyAdminSettings.php
View File

File diff suppressed because it is too large Load Diff

21
admin/survey/api/api_test.php
View File

@ -8,26 +8,30 @@
// Nastavimo url api-ja
//$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
//$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
// Nastavimo identifier in key userja
$identifier = 'a1c3b90fdae3c45d';
$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';
/*$identifier = 'a1c3b90fdae3c45d';
$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';*/
$api_url = 'http://localhost/admin/survey/api/api.php';
$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
$identifier = '3ccc9cbc90493d09';
$private_key = 'b8dbeceed3d0d7f80ca5d82ba352d9696c1804ff9b9d45272b8e99ea0a4987d6';
/*$api_url = 'http://localhost/admin/survey/api/api.php';
$identifier = '0d712128f7fe5707';
$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';
$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';*/
// Nastavimo parametre
//$ank_id = '8086';
$ank_id = '384751';
//$action = 'getSurveyQuestions';
$action = 'createSurvey';
//$action = 'createSurvey';
$action = 'getSurveyResponseData';
// Izvedemo klic (GET ali POST)
//$result = executeGET();
$result = executePOST();
//$result = executePOST();
@ -55,6 +59,7 @@ function executeGET(){
// GET params
$params = 'action='.$action; // Funkcija, ki jo želimo izvesti
$params .= '&ank_id='.$ank_id; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
$params .= '&usr_id=50666962'; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
// Pripravimo podatke za hashiranje
$request_method = 'GET';

12
admin/survey/classes/class.GDPR.php
View File

@ -64,10 +64,10 @@ class GDPR{
echo '<div class="box-container">';
echo '<div class= "num_box num_box1 checked" id="num_box1">';
echo '<div class= "num_box num_box1 checked" id="num_box1" onclick="gdpr_ankete()">';
echo '<div class="box_flex" id="box_flex">';
echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="test_function()">';
echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="gdpr_ankete()">';
echo '<div class="naslov_gdpr"> GDPR ANKETE</div>';
echo '</div>';
@ -83,10 +83,10 @@ class GDPR{
echo '</div>';
echo '<div class= "num_box num_box2 checked" id="num_box2">';
echo '<div class= "num_box num_box2 checked" id="num_box2" onclick="potenc_gdpr_ankete()">';
echo '<div class="box_flex" id="box_flex potenc_gdpr">';
echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="test_function()">';
echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="potenc_gdpr_ankete()">';
echo '<div class="naslov_gdpr"> POTENCIALNO GDPR ANKETE</div>';
echo '</div>';
@ -102,10 +102,10 @@ class GDPR{
echo '</div>';
echo '<div class= "num_box num_box3 checked" id="num_box3">';
echo '<div class= "num_box num_box3 checked" id="num_box3" onclick="ne_gdpr_ankete()">';
echo '<div class="box_flex" id="box_flex">';
echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="test_function()" >';
echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="ne_gdpr_ankete()" >';
echo '<div class="naslov_gdpr"> NE-GDPR ANKETE</div>';
echo '</div>';

8
admin/survey/classes/class.LibraryBranching.php
View File

@ -477,7 +477,10 @@ class LibraryBranching {
// Urejanje Vprasanja
if($this->tab == '0' && ($spremenljivka['folder_uid'] == $global_user_id || $admin_type == 0)){
// Preview
echo ' <span class="faicon monitor" onClick="previewVprasanje(\''.$spremenljivka['id'].'\');"></span>';
// Tri pikice za prikaz urejanja vprasanja
echo ' <span class="faicon dots_ver dots_ver_item" onClick="showLibraryItemEdit(this);"></span>';
@ -842,6 +845,9 @@ class LibraryBranching {
// Odpremo popup s knjiznico
if ($_GET['a'] == 'displayLibraryPopup') {
$this->displayLibrary();
// Div za dodaten popup za preview
echo '<div id="vprasanje_preview" class="displayNone"></div>';
}
// Preklopimo tab v kniznici

31
admin/survey/classes/class.SurveyList.php
View File

@ -247,11 +247,17 @@ class SurveyList {
if ($admin_type == 0) {
echo '<ul class="secondNavigation">';
#zavihek osnovni pregled uporabnikov
#zavihek moji uporabniki
echo '<li class="'.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
echo $lang['n_users_list'].'</a>';
echo '</li>';
#zavihek dodajanje uporabnikov
echo '<li class="'.($_GET['m'] == 'add' ? 'active' : '').'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki&m=add" title="'.$lang['n_users_list_add'].'">';
echo $lang['n_users_list_add'].'</a>';
echo '</li>';
#zavihek seznam vseh uporabnikov
echo '<li class="'.($_GET['m'] == 'all' ? 'active' : '').'">';
@ -291,9 +297,9 @@ class SurveyList {
echo '<ul class="secondNavigation">';
#zavihek osnovni pregled uporabnikov
#zavihek moji uporabniki
echo '<li class="active">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
echo $lang['n_users_list'].'</a>';
echo '</li>';
@ -416,8 +422,23 @@ class SurveyList {
echo '<a href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
echo $lang['edit_data'] . '</a>';
echo '</li>';
echo '</ul>';
echo '<div class="separator"></div>';
// Arhiv sprememb
echo '<ul class="secondNavigationArchive">';
echo '<li class="'.($tab == 'global_user_ChangeArchive' ? ' active' : '').'">';
echo '<a href="index.php?a=nastavitve&amp;m=global_user_ChangeArchive" title="' . $lang['srv_survey_archives_tracking_archive'] . '">';
echo $lang['srv_survey_archives_tracking_archive'] . '</a>';
echo '</li>';
echo '</ul>';
}
#podnavigacija za obvestila
if(($_GET['a']=='obvestila')) {

76
admin/survey/classes/class.SurveySkupine.php
View File

@ -76,46 +76,50 @@ class SurveySkupine {
}
else{
echo '<div class="setting_holder">';
echo '<label for="skupina">'.$lang['group_name'].':</label>';
echo '<div class="button_holder inline">';
echo '<input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
echo '<button class="medium blue" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
echo '</div>';
echo '</div>';
echo ' <label for="skupina">'.$lang['group_name'].':</label>';
echo ' <div class="button_holder inline">';
echo ' <input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
echo ' <button class="medium blue" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
echo ' </div>';
echo '</div>';
}
// izpis skupin za anketo
$vrednosti = $this->getVrednosti($spr_id);
echo '<table id="groups_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
// izpis skupin za anketo
$vrednosti = $this->getVrednosti($spr_id);
echo '<table id="groups_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
echo '<tr>';
echo '<th></th>';
echo '<th>'.$lang['group_name'].'</th>';
echo '<th>'.$lang['group_URL'].'</th>';
echo '<th>'.$lang['group_answer_count'].'</th>';
echo '</tr>';
echo '<tr>';
echo '<th></th>';
echo '<th>'.$lang['group_name'].'</th>';
echo '<th>'.$lang['group_URL'].'</th>';
echo '<th>'.$lang['group_answer_count'].'</th>';
echo '</tr>';
if($spr_id != 0){
foreach($vrednosti as $vrednost){
echo '<tr>';
echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span></a></td>';
echo '<td>'.$vrednost['naslov'].'</td>';
// Dobimo stevilo odgovorov za skupino
$count_answers = $this->countSkupinaAnswers($vrednost['id']);
$link = $vrednost['url'];
if(isset($vrednost['nice_url']))
$link = $vrednost['nice_url'];
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
echo '<td>'.$vrednost['#'].'</td>';
echo '</tr>';
echo '<tr>';
echo ' <td><a><span class="faicon trash empty" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span></a></td>';
echo ' <td>'.$vrednost['naslov'].'</td>';
$link = (isset($vrednost['nice_url'])) ? $vrednost['nice_url'] : $vrednost['url'];
echo ' <td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
echo ' <td class="right">'.$count_answers.'</td>';
echo '</tr>';
}
}
echo '</table>';
echo '</table>';
echo '</div>';
echo '</fieldset>';
}
@ -177,6 +181,23 @@ class SurveySkupine {
return 0;
}
// Prestejemo stevilo odgovorov za doloceno skupino
private function countSkupinaAnswers($vre_id){
$answer_count = 0;
$sql = sisplet_query("SELECT count(u.id) AS answer_count
FROM srv_user u, srv_data_vrednost_active v
WHERE v.vre_id='".$vre_id."' AND u.id=v.usr_id
");
$row = mysqli_fetch_array($sql);
$answer_count = $row['answer_count'];
return $answer_count;
}
// Vrnemo url za doloceno skupino
function getUrl($spr_id, $vre_id){
global $global_user_id;
@ -328,6 +349,7 @@ class SurveySkupine {
echo '<td>'.stripslashes($naslov_vrednost).'</td>';
$link = $this->getUrl($spr_id, $vre_id);
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
echo '<td class="right">0</td>';
}
//Gesla

17
admin/survey/classes/class.SurveyTheme.php
View File

@ -179,6 +179,7 @@ class SurveyTheme {
$groupId = 0;
echo '<div class="themes-content">';
echo '<div id="div_theme_groups">';
$this->displayGroupSelector($groupId);
@ -372,7 +373,12 @@ class SurveyTheme {
echo '<script src="/admin/survey/script/urejanje_oblika.js"> </script>';
echo '<div class="options option1" >';
echo '<button id="btn-1" onclick="teme_options()"> <img src="\public\img\icons\dots.svg"> </button>';
// echo '<button id="btn-1" class="faicon dots" onclick="teme_options()"> ';
echo '<span class="faicon dots" onclick="teme_options()" > </span>';
// echo '<img src="\public\img\icons\dots.svg">';
echo '<i class="fa-solid fa-ellipsis"></i>';
echo ' </button>';
echo '<div class= "buttons-window displayNone buttons-window1" id="buttons-window1">';
@ -424,7 +430,8 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
echo '<button id="btn-2" onclick="teme_options2()"> <img src="\public\img\icons\dots.svg"> </button>';
// echo '<button id="btn-2" onclick="teme_options2()"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="teme_options2()" > </span>';
echo '<div class= "buttons-window displayNone " id="buttons-window2">';
@ -600,7 +607,8 @@ class SurveyTheme {
echo '<div class="options options'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
// echo '<button onclick="show_settings(\''.$row['id'].'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="show_settings(\''.$row['id'].'\')" > </span>';
echo '<div class="buttons-window displayNone" id="additional_settings_'.$row['id'].'">';
@ -660,7 +668,8 @@ class SurveyTheme {
//Gumbi
echo '<div class="options options_mobile'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
// echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="show_settings_mobile(\''.$row['id'].'\')" > </span>';
echo '<div class="buttons-window" id="additional_settings_mobile_'.$row['id'].'">';

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

@ -62,7 +62,7 @@ class VprasanjeDeleted {
echo ' <span class="date">('.date("G:i d.m.Y", strtotime($row['delete_time'])).')</span>';
echo ' </div>';
echo ' <span class="faicon monitor" title="'.$lang['srv_predogled_spremenljivka'].'" onClick="previewVprasanjeDeleted(\''.$row['spr_id'].'\');"></span>';
echo ' <span class="faicon monitor" title="'.$lang['srv_predogled_spremenljivka'].'" onClick="previewVprasanje(\''.$row['spr_id'].'\');"></span>';
echo ' </div>';
@ -142,6 +142,9 @@ class VprasanjeDeleted {
// Odpremo popup s pobrisanimi vprasanji
if ($_GET['a'] == 'displayVprasanjeDeletedPopup') {
$this->displayDeletedVprasanja();
// Div za dodaten popup za preview
echo '<div id="vprasanje_preview" class="displayNone"></div>';
}
// Dodajanje pobrisanega vprasanja nazaj v vprasalnik

16
admin/survey/classes/mobile/class.MobileSurveyAdmin.php
View File

@ -368,6 +368,11 @@ class MobileSurveyAdmin{
'url' => 'index.php?a=diagnostics&t=uporabniki',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m'])? 'active' : '')
),
array(
'title' => $lang['n_users_list_add'],
'url' => 'index.php?a=diagnostics&t=uporabniki&m=add',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
),
array(
'title' => $lang['n_users_list_all'],
'url' => 'index.php?a=diagnostics&t=uporabniki&m=all',
@ -410,6 +415,11 @@ class MobileSurveyAdmin{
'url' => 'index.php?a=diagnostics&t=uporabniki',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m']) ? 'active' : '')
),
array(
'title' => $lang['n_users_list_add'],
'url' => 'index.php?a=diagnostics&t=uporabniki&m=add',
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
)
);
}
@ -493,6 +503,12 @@ class MobileSurveyAdmin{
'url' => 'index.php?a=nastavitve&m=global_user_myProfile',
'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_myProfile' ? 'active' : '')
),
array(
'title' => $lang['srv_survey_archives_tracking_archive'],
'url' => 'index.php?a=nastavitve&m=global_user_ChangeArchive',
'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_ChangeArchive' ? 'active' : '')
),
);
}

61
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -607,6 +607,7 @@ class SurveyAnalysis {
}
echo '<script src="\admin\survey\script\urejanje_oblika.js"> </script>';
echo '<table class="table_desc" >';
echo '<tr class="row1">';
@ -818,7 +819,8 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'desc');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
// echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'desc');
echo '</div>'; //options
@ -1008,6 +1010,7 @@ class SurveyAnalysis {
# tekst vprašanja
echo '<script src="\admin\survey\script\urejanje_oblika.js"> </script>';
echo '<table class="table_freq">';
# naslovna vrstica
@ -1047,7 +1050,8 @@ class SurveyAnalysis {
#variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'freq');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
// echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'freq');
echo '</div>'; //options
@ -1671,6 +1675,7 @@ class SurveyAnalysis {
}
# tekst vprašanja
// echo '<script src="https://kit.fontawesome.com/c5e58c7f60.js" crossorigin="anonymous"></script>';
echo '<table class="table_sums sums_vertical">';
# naslovna vrstica
@ -1708,7 +1713,7 @@ class SurveyAnalysis {
# variabla - en odgovor
echo '<td class="cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')" > <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -1936,7 +1941,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options
@ -2099,7 +2104,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options
@ -2324,7 +2329,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -2537,7 +2542,7 @@ class SurveyAnalysis {
# variabla - več odgovorov
echo '<td class="cell_icons cell_icons'.$spid.' vec_odgovorov sum" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options
@ -2695,7 +2700,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options
@ -2881,7 +2886,7 @@ class SurveyAnalysis {
# variabla - tabela en odgovor
echo '<td class="cell_icons cell_icons'.$spid.' tabela_en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -3197,7 +3202,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -3580,7 +3585,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -3816,7 +3821,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -4097,7 +4102,7 @@ class SurveyAnalysis {
# variabla - število
echo '<td class="cell_icons cell_icons'.$spid.' stevilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -4401,7 +4406,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -4758,7 +4763,7 @@ class SurveyAnalysis {
# variabla - besedilo
echo '<td class="cell_icons cell_icons'.$spid.' besedilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -5918,11 +5923,22 @@ class SurveyAnalysis {
echo '</div>';
}
if ($options['desc'] == true) {
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_DESCRIPTOR.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_freq" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> ';
echo '<div class="icon_text an_freq_text" > Osnovne frekvence</div> ';
echo '</a>';
echo '</div>';
}
if ($options['freq'] == true) {
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_FREQUENCY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_freq" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> ';
echo '<span class="faicon an_freqx" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> ';
echo '<div class="icon_text dop_frekv" > Dopolnjene frekvence</div> ';
echo '</a>';
@ -5950,7 +5966,7 @@ class SurveyAnalysis {
else {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
}
echo '<span class="faicon an_freqx" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '<span class="faicon an_stat" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '<div class="icon_text icon_text_margin" > Opisne statistike</div> ';
echo '</a>';
@ -5959,16 +5975,7 @@ class SurveyAnalysis {
echo '</div>';
}
if ($options['desc'] == true) {
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_DESCRIPTOR.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_stat" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> ';
echo '<div class="icon_text" > Osnovne frekvence</div> ';
echo '</a>';
echo '</div>';
}
// Ikona za prikaz grafa
if($showChart == true && in_array($spremenljivka['tip'],array(1,2,3,6,7,8,16,17,18,20,22)) && $_from != 'charts'){
@ -5976,7 +5983,7 @@ class SurveyAnalysis {
echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$spid.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';
echo '<span class="faicon an_chart_bar icon-blue_soft_link" title="' . $lang['6'] . '"></span> ';
echo '<div class="icon_text icon_text_margin" > Tortni grafikon</div> ';
echo '<div class="icon_text an_chart_bar_text" > Tortni grafikon</div> ';
echo '</a>';
echo '</div>';

1
admin/survey/classes/tracking/CrossRoad.php
View File

@ -145,6 +145,7 @@ class CrossRoad {
case A_MISSING:
case A_METADATA:
case A_MOBILESETTINGS:
case A_TABLESETTINGS:
case A_JEZIK: # nastavitve jezik
case A_UREJANJE: # nastavitve komentarjev
case A_PRIKAZ: # nastavitve komentarjev

2
admin/survey/classes/tracking/UserTrackingClass.php
View File

@ -40,7 +40,7 @@ class UserTrackingClass
echo '<div id="div_archive_content" class="tracking">';
echo '<fieldset>';
echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>';
echo '<legend>' . $lang['srv_survey_archives_tracking_history'] . '</legend>';
// Izvoz v Excel
echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';

1
admin/survey/definition.php
View File

@ -241,6 +241,7 @@
define('A_FORMA', 'forma'); # urejanje ankete - manjkajoče vrednosti
define('A_METADATA', 'metadata'); # urejanje ankete - prikaz metapodatkov
define('A_MOBILESETTINGS', 'mobile_settings'); # urejanje ankete - nastavitve prikaza pri mobitelih
define('A_TABLESETTINGS', 'table_settings'); # urejanje ankete - nastavitve prikaza tabel
define('A_PRIKAZ', 'prikaz'); # prikaz podatkov in analiz
define('A_MAILING', 'advanced_email'); # nastavitve email strežnika
define('A_SKUPINE', 'skupine'); # skupine

2
admin/survey/export/latexclasses/class.LatexDocument.php
View File

@ -1419,6 +1419,8 @@ class LatexDocument{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu

21
admin/survey/export/latexclasses/class.LatexSurvey.php
View File

@ -1481,16 +1481,21 @@ class LatexSurvey{
$findAt = '@';
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
//echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."</br>";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
//echo $posSpace2Mail."</br>";
//echo "pozicijo zadnjega presledka v besedilu pred e-naslovom: ".$posSpace2Mail."</br>";
//najdi prvi simbol za v novo vrstico "br" po afni
//echo substr($text, $posAt) ."</br>";
@ -1502,15 +1507,17 @@ class LatexSurvey{
}else{
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
}
//echo "posKonec: ".$posKonec."</br>";
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
$text = substr_replace($text, '}', $posKonec, 0);
//dodaj pred e-naslovom potrebno latex kodo za url
//substr_replace(string_name, replacement_string, start_pos, length)
$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
//substr_replace(string_name, replacement_string, start_pos, length)
$text = substr_replace($text, ' \url{', $posSpace2Mail, 0);
//echo $text."</br>";
}
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec

4
admin/survey/export/latexclasses/class.LatexSurveyElement.php
View File

@ -1060,11 +1060,13 @@ class LatexSurveyElement{
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$findNewline = 'br';
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
//echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."</br>";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom

66
admin/survey/script/GDPR_seznam_anket.js
View File

@ -21,42 +21,42 @@ var text_box3_p = document.getElementById("p_num_of_surveys3");
//green row
if (green_row_count == 1){
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span>anketa vsebuje GDPR občutljive podatke';
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span> anketa vsebuje GDPR občutljive podatke';
}
else if (green_row_count == 2){
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span>anketi vsebujeta GDPR občutljive podatke';
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span> anketi vsebujeta GDPR občutljive podatke';
}
else if (green_row_count == 3){
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span>ankete vsebujejo GDPR občutljive podatke';
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span> ankete vsebujejo GDPR občutljive podatke';
}
else {
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span>anket vsebuje GDPR občutljive podatke';
text_box1_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+green_row_count+' </span> anket vsebuje GDPR občutljive podatke';
}
//red row
if (red_row_count == 1){
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span>anketa lahko vsebuje GDPR občutljive podatke';
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span> anketa lahko vsebuje GDPR občutljive podatke';
}
else if (red_row_count == 2){
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span>anketi lahko vsebujeta GDPR občutljive podatke';
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span> anketi lahko vsebujeta GDPR občutljive podatke';
}
else if (red_row_count == 3){
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span>ankete lahko vsebujejo GDPR občutljive podatke';
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span> ankete lahko vsebujejo GDPR občutljive podatke';
}
else {
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span>anket lahko vsebuje GDPR občutljive podatke';
text_box2_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+red_row_count+' </span> anket lahko vsebuje GDPR občutljive podatke';
}
//grey row
if (grey_row_count == 1){
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anketa lahko vsebuje GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span> anketa ne vsebuje GDPR občutljivih podatkov';
}
else if (grey_row_count == 2){
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anketi lahko vsebujeta GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span> anketi ne vsebujeta GDPR občutljivih podatkov';
}
else if (grey_row_count == 3){
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>ankete lahko vsebujejo GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span> ankete ne vsebujejo GDPR občutljivih podatkov';
}
else {
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anket lahko vsebuje GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span> anket ne vsebuje GDPR občutljivih podatkov';
}
// Seznam anket - togle checkbox prikaz anket
@ -147,7 +147,49 @@ function test_function() {
}
}
function gdpr_ankete(){
var check_gdpr_ankete = document.getElementById('gdpr_ankete_check');
//GDOR ANKETE
if (check_gdpr_ankete.checked){
check_gdpr_ankete.checked = false;
test_function();
}
else {
check_gdpr_ankete.checked = true;
test_function();
}
}
function potenc_gdpr_ankete(){
var check_potenc_gdpr = document.getElementById('potenc_gdpr_ankete_check');
//POTENCGDOR ANKETE
if (check_potenc_gdpr.checked){
check_potenc_gdpr.checked = false;
test_function();
}
else {
check_potenc_gdpr.checked = true;
test_function();
}
}
function ne_gdpr_ankete(){
var check_negdpr_ankete = document.getElementById('ne_gdpr_ankete');
//NE GDPR ANKETE
if (check_negdpr_ankete.checked){
check_negdpr_ankete.checked = false;
test_function();
}
else {
check_negdpr_ankete.checked = true;
test_function();
}
}
function teme_options(){
var toggle = document.getElementsByClassName('buttons-window');

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

@ -205,6 +205,7 @@ lang('for');
lang('alternative_email_delete');
lang('srv_anketa_deleted_restore_confirm');
lang('srv_data_deleted_restore_confirm');
lang('more2');
//LOKACIJA

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

@ -1504,7 +1504,20 @@ function normalmode_spremenljivka (spremenljivka) {
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
function create_editor (id, focus) {
CKEDITOR.replace(id);
editor = CKEDITOR.replace(id);
// Dodamo gumb vec
editor.addCommand("advanced_editor_show", {
exec: function(edt) {
advanced_editor_show();
}
});
editor.ui.addButton('More', {
label: lang['more2'],
command: 'advanced_editor_show',
name: "More",
});
//namestitev editorja za tekst pri obveščanju
if(gup('a') == 'alert' && focus == false){
@ -1644,35 +1657,40 @@ function remove_editor (id) {
// prikaze editor za spremenljivko (definiran mora biti textarea za idjem naslov_$spremenljivka
function editor_display (spremenljivka) {
//if (editor_init != true) {
CKEDITOR.replace( 'naslov_'+spremenljivka );
editor = CKEDITOR.replace( 'naslov_'+spremenljivka );
//v kolikor je default vrednost potem naredimo selectAll
var def = $('#naslov_'+spremenljivka).attr("default");
if( def == 1) {
CKEDITOR.instances['naslov_' + spremenljivka].on('focus', function () {
this.execCommand('selectAll');
});
}
// editor_init = true;
//}
// Dodamo gumb vec
editor.addCommand("advanced_editor_show", {
exec: function(edt) {
advanced_editor_show();
}
});
editor.ui.addButton('More', {
label: lang['more2'],
command: 'advanced_editor_show',
name: "More",
});
//v kolikor je default vrednost potem naredimo selectAll
var def = $('#naslov_'+spremenljivka).attr("default");
if( def == 1) {
CKEDITOR.instances['naslov_' + spremenljivka].on('focus', function () {
this.execCommand('selectAll');
});
}
}
function editor_display_hotspot (vre_id) {
//if (editor_init != true) {
CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
//v kolikor je default vrednost potem naredimo selectAll
var def = $('#hotspot_image_'+vre_id).attr("default");
//if( def == 1) {
CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
this.execCommand('selectAll');
});
//}
// editor_init = true;
//}
//v kolikor je default vrednost potem naredimo selectAll
var def = $('#hotspot_image_'+vre_id).attr("default");
CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
this.execCommand('selectAll');
});
}
// odstrani editor (treba preden se odstrani html)
@ -5512,13 +5530,13 @@ function toggleParapodatki(){
if(survey_ip == '0') {
$("#save_IP_warning").removeClass('displayNone');
$("#save_IP").removeClass('no_margin');
$("#save_IP").removeClass('bottom0');
$("#connect_IP").removeClass('displayNone');
}
else {
$("#save_IP_warning").addClass('displayNone');
$("#save_IP").addClass('no_margin');
$("#save_IP").addClass('bottom0');
$("#connect_IP").addClass('displayNone');
}
@ -5656,4 +5674,15 @@ function show_gdpr_messeage(id_sporocila){
$("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id});
console.log(id_sporocila);
}
function toggleCommentOptions(id) {
$("#options_"+id).toggleClass("displayNone");
}
//Toggle za dodajanje uporabnika (admini in managerji)
function toggleAddUser(){
$("#new_user_option").toggleClass('displayNone');
$("#existing_user_option").toggleClass('displayNone');
}

5
admin/survey/script/vprasanje.js
View File

@ -759,6 +759,11 @@ function comment_on_comment (id, user, date, spr_id) {
'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'+
'</div>'
);
$(".options_dropdown").addClass("displayNone");
}
function comment_delete (id) {
$.post("ajax.php?a=comment_delete\', {id: \''+id+'\', anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false");
}

13
admin/survey/script/vprasanjeDeleted.js
View File

@ -72,10 +72,15 @@ function insertVprasanjeDeletedItemsIntoSurvey(){
}
// Predogled pobrisanega vprasanja
function previewVprasanjeDeleted(spr_id){
// Predogled pobrisanega vprasanjaoz. vprasanja iz knjiznice
function previewVprasanje(spr_id){
$('#vprasanje_preview').load('ajax.php?a=preview_spremenljivka_lib', {anketa: srv_meta_anketa_id, spremenljivka: spr_id, podstran: srv_meta_podstran}).removeClass('displayNone');
preview_spremenljivka(spr_id);
event.stopPropagation();
}
// Predogled pobrisanega vprasanja
function closePreviewVprasanje(){
$('#vprasanje_preview').addClass('displayNone').empty();
}

8
admin/survey/script/vprasanjeInline.js
View File

@ -954,6 +954,14 @@ function inline_load_editor (_this) {
}
}
// Prikazemo / skrijemo napredne gumbe za editor
function advanced_editor_show(){
/*$('#cke_43, #cke_47, #cke_51').show();
$('#cke_41').hide();*/
$('.cke_toolbar:nth-child(10)').hide();
$('.cke_toolbar:nth-child(12), .cke_toolbar:nth-child(13), .cke_toolbar:nth-child(14)').show();
}
function inline_load_editor_hotspot (_this, vre_id) {
$(_this).css('display', 'none');

3
editors/ckeditor_4_4/config.js
View File

@ -33,10 +33,11 @@ CKEDITOR.editorConfig = function (config) {
{name: 'align', items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']},
{name: 'list', items: ['NumberedList', 'BulletedList']},
{name: 'links', items: ['Link', 'Unlink', 'Image']},
{name: 'more', items: ['More']},
'/',
{name: 'other', items: ['Scayt', 'Strike', 'SpecialChar']},
{name: 'vec', items:['Styles', 'Format', 'Outdent', 'Indent', 'HorizontalRule']},
{name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']},
{name: 'insert', items: ['CreateDiv', 'Table', 'IFrame', 'Youtube', 'Abbr']},
];
/*config.toolbar = [

62
lang/1.php
View File

@ -726,7 +726,8 @@ $lang = array (
"n_list" => "Spisek prejemnikov",
"n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>Zahtevali ste spisek prejemnikov. Preverite ga, ter potrdite<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;oziroma popravite prejemnike.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Spisek prejemnikov</b></i><br><br>",
"n_list_users" => "Uporabniki",
"n_users_list" => "Pregled",
"n_users_list" => "Moji uporabniki",
"n_users_list_add" => "Dodajanje uporabnikov",
"n_users_list_all" => "Vsi",
"n_deleted_users" => "Izbrisani",
"n_unsigned_users" => "Odjavljeni",
@ -1990,12 +1991,12 @@ $lang = array (
"srv_settings_help" => "Pomoč",
"srv_settingsPersonal" => "Uporabni&#154;ke nastavitve",
"srv_nastavitveStevilcenje" => "&#352;tevil&#269;enje vpra&#353;anj",
"srv_nastavitveStevilcenjeType" => "Na&#269;in &#154;tevil&#269;enja",
"srv_nastavitveStevilcenjeType" => "Način številčenja za respondente",
"srv_nastavitveStevilcenjeType0" => "Brez &#154;tevil&#269;enja",
"srv_nastavitveStevilcenjeType1" => "Z zaporedno &#353;tevilko [ 1), 2) ... ]",
"srv_nastavitveStevilcenjeType1" => "Z zaporedno &#353;tevilko spremenljivke [ 1), 2) ... ]",
"srv_nastavitveStevilcenjeType2" => "Z imenom spremenljivke [ V1, V2 ... ]",
"srv_nastavitveStevilcenjeType3" => "Z imenom in zaporedno &#154;tevilko",
"srv_nastavitvePrestevilcevanje" => "Avtomatsko preštevilčevanje",
"srv_nastavitveStevilcenjeType3" => "Z imenom in zaporedno &#154;tevilko spremenljivke",
"srv_nastavitvePrestevilcevanje" => "Avtomatsko preštevilčevanje vprašanj ob spreminjanju vrstnega reda vprašanj",
"srv_nastavitveStevilcenjePDF" => "O&#353;tevil&#269;i vpra&#353;anja v PDF izvozih",
"srv_nastavitveStevilcenjeRTF" => "O&#353;tevil&#269;i vpra&#353;anja v DOC (Word) izvozih",
"srv_nastavitveStevilcenjeFrekvence" => "O&#353;tevil&#269;i vpra&#353;anja v Frekvencah",
@ -2430,7 +2431,8 @@ $lang = array (
"srv_library_add_to_lib_success_loop" => "Zanka je bila uspešno dodana v knjižnico.",
"srv_library_add_to_lib_success_err" => "Prišlo je do napake pri dodajanju v knjižnico!",
"srv_deleted_vprasanja" => "Pobrisana vprašanja",
"srv_deleted_vprasanja" => "Izbrisana vprašanja",
"srv_deleted_vprasanja_back" => "Nazaj na vsa vprašanja",
"srv_nadzor" => "Nadzor",
"srv_knjiznica_add" => "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",
@ -2984,8 +2986,8 @@ $lang = array (
"srv_podrobno_datoteke" => "Datoteke",
"srv_pregledovanje" => "Moje ankete",
"srv_seznam" => "Seznam",
"srv_javne_ankete" => "Javne ankete",
"srv_moje_ankete" => "Moje ankete",
"srv_javne_ankete" => "Dodaj anketo v javno knjižnico",
"srv_moje_ankete" => "Dodaj anketo v mojo knjižnico",
"srv_javna_knjiznica" => "Javna knjižnica",
"srv_moja_knjiznica" => "Moja knjižnica",
"srv_javna_vprasanja" => "Javna vpra&#154;anja",
@ -3269,7 +3271,7 @@ $lang = array (
"srv_slideshow_sett_autostart_opt_3" => "Animacijo zažene katerakoli od naštetih akcij (Gumb 'Naprej', Timer vprašanja, Klik na vprašanje)",
"srv_slideshow_sett_autostart_opt_3_short" => "Karkoli",
"srv_slideshow_sett_next_button_lbl" => "Prikaz gumba 'Naprej'",
"srv_slideshow_sett_back_button_lbl" => "Prikaz gumba 'Nazaj'",
"srv_slideshow_sett_back_button_lbl" => "Gumb 'Nazaj' je prikazan",
"srv_slideshow_sett_pause_button_lbl" => "Prikaz gumba 'Pavza'",
"srv_slideshow_sett_button_opt_0" => "Ne prikaži gumba",
"srv_slideshow_sett_button_opt_1" => "Prikaži gumb",
@ -3298,7 +3300,7 @@ $lang = array (
"srv_fieldwork_device_pass" => "Geslo naprave",
"srv_fieldwork_device_surveyID" => "ID te ankete na napravi",
"srv_fieldwork_sync_data" => "Sinhroniziraj podatke",
"srv_hint" => "Namig",
"srv_hint" => "Možnost namiga za respondente",
"srv_hint_datapiping" => "Pri urejanju zaključka ali vsebini e-pošte, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
"srv_missing_profile_title1" => "Označeni odgovori se <font class=\"red bold\">ne</font> upoštevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
"srv_missing_profile_title2" => "Manjkajoče vrednosti – neopredeljeni odgovori",
@ -4012,12 +4014,17 @@ $lang = array (
"srv_add_lang" => "Omogo&#269;i ve&#269;jezi&#269;no podporo v anketi",
"srv_prevajanje" => "Prevajanje",
"srv_mobile_settings" => "Mobilne nastavitve",
"srv_mobile_settings_title" => "Nastavitve prikaza pri mobilnih napravah",
"srv_mobile_settings_title" => "Prikaz ankete na mobilnih napravah",
"srv_mobile_survey" => "Anketa ustvarjena v mobilni aplikaciji",
"srv_mobile_add_question" => "Dodaj vprašanje",
"srv_table_settings" => "Nastavitve tabel",
"srv_table_settings_title" => "Prikaz vprašanj tipa tabela",
'srv_table_settings_mobile_tables' => "Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
'srv_table_settings_pc_tables' => "Prilagoditev vprašanj tipa 'Tabela' na računalniku",
"srv_standardne_besede" => "Standardne besede",
"srv_prevajanje_dodaj" => "Dodaj nov prevod za",
"srv_base_lang" => "Osnovni jezik",
"srv_multi_lang" => "Večjezične ankete",
"srv_lang_elements" => "Standardne besede",
"srv_trans_lang" => "Prevod",
"srv_trans_langs" => "Prikaži dodatni jezik",
@ -4249,6 +4256,8 @@ $lang = array (
"srv_survey_archives_ie_data" => "Vprašalnik in podatki",
"srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov",
"srv_survey_archives_tracking" => "Spremembe",
"srv_survey_archives_tracking_history" => "Zgodovina sprememb",
"srv_survey_archives_tracking_archive" => "Arhiv sprememb",
"srv_survey_archives_tracking_survey" => "Spremembe vprašalnika",
"srv_survey_archives_tracking_survey_text1" => "V spodnji tabeli je navedenih zadnjih 25 sprememb",
"srv_survey_archives_tracking_survey_text_appendmerge" => "povezanih z dodajanjem ali združevanjem podatkov",
@ -4580,9 +4589,9 @@ $lang = array (
"srv_comments_link" => "Pregled komentarjev",
"srv_comments_user" => "Uporabnik ",
"srv_comments_user2" => " je komentiral:",
"srv_comments_archive" => "Arhiviraj komentar",
"srv_comments_archive" => "Razreši",
"srv_comments_unarchive" => "Označi kot nerešeno",
"srv_comments_archived" => "Komentar je arhiviran",
"srv_comments_archived" => "Komentar je razrešen",
"srv_comments_new" => "Komentiraj",
"srv_zanka_profile_all" => "Brez",
"srv_zanka_profile_session" => "Za&#269;asno",
@ -4604,9 +4613,9 @@ $lang = array (
"srv_export_questionnare_2" => "Pozor: pri večjih anketah zaradi obsežnosti tovrsten izpis morda ni smiselen! Za več kot 300 izpisov morate zato imeti status administratorja.",
//"srv_export_pagebreak" => "Vsak respondent na novi strani",
"srv_export_pagebreak" => "Vsak respondent na novi strani (le za PDF)",
"srv_export_if" => "Prikaz if-ov",
"srv_export_if" => "Prikaz pogojev (IF)",
"srv_export_font" => "Velikost pisave (le za PDF)",
"srv_export_show_recnum" => "Prikaz recnuma",
"srv_export_show_recnum" => "Prikaz recnuma oz. zaporedne številke respondenta",
"srv_export_results_settings" => "Izpis odgovorov respondentov",
"srv_export_survey_settings" => "Izpis vprašalnika",
"srv_export_intro" => "Prikaz uvoda",
@ -4654,6 +4663,7 @@ $lang = array (
"srv_done" => "Končano",
"srv_not_relevant" => "Nerelevantno",
"srv_comment_comment" => "Odgovori",
"srv_comment_delete" => "Izbriši",
"srv_edit_data_title" => "Uredi podatke vprašanja",
"srv_edit_data_row" => "Uredi celotno anketo respondenta",
"srv_edit_data_row_quick" => "Hitro urejanje celotne ankete respondenta",
@ -6393,7 +6403,7 @@ $lang = array (
'srv_aapor_show_calculation' => 'Prikaz izračunov:',
'srv_aapor_show_approximate_calculation' => 'Prikaz približnih izračunov:',
'srv_aapor_show_approximate' => 'Prikaži približke',
'srv_show_continue_later' => 'Opcija za nadaljevanje kasneje',
'srv_show_continue_later' => 'Možnost kasnejšega nadaljevanja izpolnjevanja ankete',
'srv_themes_select' => 'Izbira teme',
'srv_themes_mod' => 'Prilagoditev teme',
'srv_themes_mod2' => 'Trenutno urejate temo',
@ -6411,7 +6421,7 @@ $lang = array (
'srv_new_theme_alert' => 'Dodana je nova prilagoditev teme <b>%s</b>. Uredite jo lahko spodaj.',
'srv_new_theme_alert_css' => 'Dodana je nova CSS tema <b>%s</b>. Uredite jo lahko spodaj.',
'srv_js_tracking' => 'JavaScript koda za sledenje',
'js_tracking_note' => 'Skopirajte celotno kodo (iz npr. Google Analytics), vključno s &lt;script&gt; blokom.',
'js_tracking_note' => 'Vnesite celotno kodo za sledenje (iz npr. Google Analytics) - vključno s &lt;script&gt; blokom.',
'srv_editing_mode' => 'Napredna 1KA',
'srv_editing_mode_0' => 'Enostavno',
'srv_editing_mode_1' => 'Napredno',
@ -6426,6 +6436,8 @@ $lang = array (
'srv_editing_mode_new_anketa_1' => 'Napredni način',
'srv_email_example_txt' => 'Če želite ta e-mail uporabljati za pošiljanje, je treba v naprednih nastavitvah nastaviti, da je spremenljivka sistemska.',
'srv_prikaz_default_valid' => 'Privzeta izbira ustreznih enot:',
'srv_prikaz_default_valid1' => 'Delno izpolnjene in končane enote/ankete (s statusoma 5, 6)',
'srv_prikaz_default_valid2' => 'Samo končane enote/ankete (s statusom 6)',
'srv_prikaz_showItime' => 'Prikaži datum respondenta:',
'srv_prikaz_showLineNumber' => 'Prikaži številko vrstice respondenta:',
'srv_global_settnig_access_respondents' => 'Dostop respondenti',
@ -6620,7 +6632,10 @@ $lang = array (
'srv_users_viewing2' => 'Trenutno aktivni uredniki',
'srv_users_viewing3' => 'Število aktivnih urednikov',
'srv_users_add_new' => 'Nov uporabnik',
"srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
'srv_users_add_new_type' => 'Način dodajanja uporabnika:',
'srv_users_add_new_type1' => 'Ustvarite novega uporabnika v sistemu <span class="gray">(Uporabnik bo obveščen na e-mail, da je bil registriran v sistem, in da je pod vašim pregledom)</span>',
'srv_users_add_new_type2' => 'Aktivirajte pregled nad obstoječim uporabnikom <span class="gray">(Uporabnik bo obveščen na e-mail, da je pod vašim pregledom)</span>',
"srv_users_add_new_title" => 'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem in, da je pod vašim pregledom.</span>',
'srv_users_add_assigned' => 'Dodajte pregled nad uporabniki',
'srv_users_add_assigned_current' => 'Trenutno dodeljenih dostopov:',
'srv_users_add_assigned_max_reached' => 'Dosegli ste maksimalno število uporabnikov v pregledu.',
@ -6822,7 +6837,6 @@ $lang = array (
'srv_parapodatki' => 'Napredni parapodatki',
'pasteFromWordAlert' => '<b>Kopiranje besedila močno odsvetujemo!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">Več >></a>',
'srv_interaktivni_elementi' => 'Interaktivni elementi',
'srv_hint' => 'Namig',
'srv_para_label_variables' => 'Spremenljivke',
'srv_para_label_details' => 'Podrobno',
'srv_para_label_breaks' => 'Prekinitve',
@ -7126,7 +7140,7 @@ $lang = array (
'one_click_create' => "Enklik kreiranje",
'edit_hide' => "Skrij",
'edit_show' => "Prikaži",
'srv_show_title' => "Naslov ankete za uporabnike",
'srv_show_title' => "Naslov ankete je viden respondentom",
'srv_create_show_intro' => "Uvod je viden respondentom",
'srv_create_show_concl' => "Zaključek je viden respondentom",
'srv_create_show_title' => "Naslov ankete je viden respondentom",
@ -7147,10 +7161,10 @@ $lang = array (
'srv_tip_sample_t6_5_v4' => "alergeni",
'srv_tip_sample_t6_5_c1' => "Najbolj pomemben",
'srv_tip_sample_t6_5_c2' => "Najmanj pomemben",
'srv_settings_mobile_img' => "Prikaz slik na mobilniku",
'srv_settings_mobile_tables' => "Prilagoditev tabel na mobilniku",
'srv_settings_mobile_img' => "Prikaz slik na mobilnih napravah",
'srv_settings_mobile_tables' => "Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
'srv_settings_mobile_tables_slide' => "Da, z razpiranjem",
'srv_settings_mobile_friendly' => "Prilagojen prikaz za mobilnike",
'srv_settings_mobile_friendly' => "Prilagojen prikaz ankete na mobilnih napravah",
'srv_settings_mobile_friendly_off' => "Prilagojen prikaz za mobilnike je izklopljen",
'srv_mySurvey_unallocated' => "Nerazporejene ankete",
'srv_mySurvey_delete_folder' => "Pobriši mapo",
@ -7190,7 +7204,7 @@ $lang = array (
'srv_orientacija_tabela_da_ne' => "Tabela DA/NE",
'srv_privacy_0' => "Brez potrditve (povezava v nogi ankete)",
'srv_privacy_1' => "Potrditev s klikom naprej",
'srv_privacy_2' => "Potrditev s checkboxom",
'srv_privacy_2' => "Potrditev s potrditvenim poljem (checkbox)",
'cookiePopupTitle' => 'Uporaba piškotkov',
'cookiePopupText' => '<p>Za izbolj&#154;anje uporabni&#154;ke izku&#154;nje, vam bomo kot prijavljenim uporabnikom dodelili pi&#154;kotke (<a target="_blank" href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-piskotkov" style="color: blue; text-decoration: underline;">pojasnilo</a>).</p><p>Ali se &#382;elite prijaviti?</p>',
'aaiPopupTitle' => 'AAI-prijava',

56
lang/2.php
View File

@ -715,7 +715,8 @@ $lang = array (
"n_n_users" => "Notify users",
"n_desc_list" => "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>You requested listing of recipients. Check it<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and confirm or change the receivers.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>List of email recipients</b></i><br><br>",
"n_list_users" => "Users",
"n_users_list" => "Overview",
"n_users_list" => "My users",
"n_users_list_add" => "Add users",
"n_users_list_all" => "All users",
"n_deleted_users" => "Deleted users",
"n_unsigned_users" => "Unsigned users",
@ -1978,12 +1979,12 @@ $lang = array (
"srv_settings_help" => "Help",
"srv_settingsPersonal" => "Personal setting",
"srv_nastavitveStevilcenje" => "Question numbering",
"srv_nastavitveStevilcenjeType" => "Numbering style",
"srv_nastavitveStevilcenjeType" => "Numbering style for respondents",
"srv_nastavitveStevilcenjeType0"=> "Without numbering",
"srv_nastavitveStevilcenjeType1"=> "With consecutive numbers [ 1), 2), ... ]",
"srv_nastavitveStevilcenjeType1"=> "With consecutive numbers of variables [ 1), 2), ... ]",
"srv_nastavitveStevilcenjeType2"=> "With variable names [ V1, V2, ... ]",
"srv_nastavitveStevilcenjeType3"=> "With names and consecutive numbers",
"srv_nastavitvePrestevilcevanje"=> "Automatic renumbering",
"srv_nastavitveStevilcenjeType3"=> "With names and consecutive numbers of variables",
"srv_nastavitvePrestevilcevanje"=> "Automatic renumbering of questions when changing the order of questions",
"srv_nastavitveStevilcenjePDF" => "Numbered questions in PDF",
"srv_nastavitveStevilcenjeRTF" => "Numbered questions in RTF",
"srv_nastavitveStevilcenjeFrekvence" => "Numbered questions in Frequency statistics",
@ -2413,6 +2414,7 @@ $lang = array (
"srv_library_add_to_lib" => "Add to library",
"srv_deleted_vprasanja" => "Deleted questions",
"srv_deleted_vprasanja_back" => "Back to all questions",
"srv_nadzor" => "Supervise",
"srv_knjiznica_add" => "To add a question to a library, drag it to this field",
@ -3239,8 +3241,8 @@ $lang = array (
"srv_slideshow_sett_autostart_opt_2_short" => "Click on first question",
"srv_slideshow_sett_autostart_opt_3" => "Start by any action (Button 'Forward', First question timer, Click on first question)",
"srv_slideshow_sett_autostart_opt_3_short" => "Any action",
"srv_slideshow_sett_next_button_lbl" => "Display 'Forward' option",
"srv_slideshow_sett_back_button_lbl" => "Display 'Back' option",
"srv_slideshow_sett_next_button_lbl" => "Display 'Forward' button",
"srv_slideshow_sett_back_button_lbl" => "Display 'Back' button",
"srv_slideshow_sett_pause_button_lbl" => "Display 'Pause' opiton",
"srv_slideshow_sett_button_opt_0" => "Don't show button",
"srv_slideshow_sett_button_opt_1" => "Show button",
@ -3269,7 +3271,7 @@ $lang = array (
"srv_fieldwork_device_pass" => "Device password",
"srv_fieldwork_device_surveyID" => "Survey ID on the device",
"srv_fieldwork_sync_data" => "Synchronise data",
"srv_hint" => "Hint",
"srv_hint" => "Hint option for respondents",
"srv_hint_datapiping" => "When editing conclusion or email, use <b>Data piping</b> to display final score.</p><p>Use question label for computed value, embraced with hash, <B>#score#</B>",
"srv_missing_profile_title1" => "Selected values are not used in the analysis and are treated as missing values!",
"srv_missing_profile_title2" => "Missing values - undefined answers",
@ -3982,10 +3984,15 @@ $lang = array (
"srv_prevajanje" => "Translations",
"srv_standardne_besede" => "Standard words",
"srv_mobile_settings" => "Mobile settings",
"srv_mobile_settings_title" => "Display settings for mobile devices",
"srv_mobile_settings_title" => "Survey display on mobile devices",
"srv_mobile_survey" => "Survey created with mobile app",
"srv_mobile_add_question" => "Add question",
"srv_table_settings" => "Table settings",
"srv_table_settings_title" => "Table questions settings",
'srv_table_settings_mobile_tables' => "Optimization of 'Table' type questions on mobile devices",
'srv_table_settings_pc_tables' => "Optimization of 'Table' type questions on desktop computer",
"srv_prevajanje_dodaj" => "Add translation for",
"srv_multi_lang" => "Multilanguage surveys",
"srv_base_lang" => "Basic language",
"srv_lang_elements" => "Standard text",
"srv_trans_lang" => "Translation",
@ -4229,6 +4236,8 @@ $lang = array (
"srv_survey_archives_ie_data" => "Survey and data",
"srv_survey_archives_ie_data_title" => "Survey and data import / export",
"srv_survey_archives_tracking" => "Changes",
"srv_survey_archives_tracking_history" => "Change history",
"srv_survey_archives_tracking_archive" => "Change archive",
"srv_survey_archives_tracking_survey" => "Survey changes",
"srv_survey_archives_tracking_survey_text1" => "The table below shows the last 25 changes",
"srv_survey_archives_tracking_survey_text_appendmerge" => "related to adding or merging data",
@ -4556,9 +4565,9 @@ $lang = array (
"srv_comments_anketa_resp" => "Respondent comments to the survey",
"srv_comments_user" => "User ",
"srv_comments_user2" => " commented:",
"srv_comments_archive" => "Archive comment",
"srv_comments_unarchive" => "Unarchive",
"srv_comments_archived" => "Comment has already been archived",
"srv_comments_archive" => "Resolve",
"srv_comments_unarchive" => "Mark as unresolved",
"srv_comments_archived" => "Comment has been resolved",
"srv_comments_new" => "Comment",
"srv_zanka_profile_all" => "Without",
"srv_zanka_profile_session" => "Temporary",
@ -4580,9 +4589,9 @@ $lang = array (
"srv_export_questionnare_2" => "Warning: Export for survey with more than 300 respondents is possible only for administrators!",
//"srv_export_pagebreak" => "Every respondent starts with a new page",
"srv_export_pagebreak" => "Every respondent starts with a new page (PDF only)",
"srv_export_if" => "Show if clauses",
"srv_export_if" => "Show conditions (IF)",
"srv_export_font" => "Font size (PDF only)",
"srv_export_show_recnum" => "Show recnum",
"srv_export_show_recnum" => "Show recnum (respondent's consecutive number)",
"srv_export_results_settings" => "Answers export",
"srv_export_survey_settings" => "Survey export",
"srv_export_intro" => "Show intro",
@ -4629,6 +4638,7 @@ $lang = array (
"srv_done" => "Done",
"srv_not_relevant" => "Not relevant",
"srv_comment_comment" => "Reply",
"srv_comment_delete" => "Delete",
"srv_edit_data_title" => "Edit question data",
"srv_edit_data_row" => "Edit respondents survey",
"srv_edit_data_row_quick" => "Quick edit respondents survey",
@ -6286,7 +6296,7 @@ $lang = array (
'srv_aapor_show_calculation' => 'Show calculations:',
'srv_aapor_show_approximate_calculation' => 'Show approximate calculations:',
'srv_aapor_show_approximate' => 'Show approximate',
'srv_show_continue_later' => 'Display continue later option',
'srv_show_continue_later' => 'Option to continue the survey at a later date',
'srv_themes_select' => 'Theme selection',
'srv_themes_mod' => 'Theme modifiation',
'srv_themes_mod2' => 'Currently editing',
@ -6304,7 +6314,7 @@ $lang = array (
'srv_new_theme_alert' => 'New modification theme <b>%s</b> has been added. You can edit it below.',
'srv_new_theme_alert_css' => 'New CSS theme <b>%s</b> has been added. You can edit it below.',
'srv_js_tracking' => 'JavaScript code for tracking',
'js_tracking_note' => 'Copy the entire code (e.g. from Google Analytics), including the &lt;script&gt; block.',
'js_tracking_note' => 'Enter the full tracking code (from e.g. Google Analytics), including the &lt;script&gt; block:',
'srv_editing_mode' => 'Advanced 1KA',
'srv_editing_mode_0' => 'Basic',
'srv_editing_mode_1' => 'Advanced',
@ -6319,6 +6329,8 @@ $lang = array (
'srv_editing_mode_new_anketa_1' => 'Advanced mode',
'srv_email_example_txt' => 'To use this e-mail for sending invitations, you need to mark it as system variable in advanced settings.',
'srv_prikaz_default_valid' => 'The default selection of appropriate units:',
'srv_prikaz_default_valid1' => 'Partially completed and completed units/surveys (with statuses 5, 6)',
'srv_prikaz_default_valid2' => 'Completed units/surveys only (with status 6)',
'srv_prikaz_showItime' => 'Show respondent date:',
'srv_prikaz_showLineNumber' => 'Display the row number of the respondent:',
'srv_global_settnig_access_respondents' => 'Respondent access',
@ -6508,6 +6520,9 @@ $lang = array (
'srv_users_viewing2' => 'Currently active editors',
'srv_users_viewing3' => 'Currently active editors',
'srv_users_add_new' => 'Add new user',
'srv_users_add_new_type' => 'Add user mode:',
'srv_users_add_new_type1' => 'Create a new user in the system <span class="gray">(The user will be notified via e-mail that they have been registered under your overview)</span>',
'srv_users_add_new_type2' => 'Activate an overview of an existing user <span class="gray">(The user will be notified via e-mail that they are under your overview)</span>',
"srv_users_add_new_title" => 'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>',
'srv_users_add_assigned' => 'Add assigned users',
'srv_users_add_assigned_current' => 'Number of assigned users:',
@ -6704,7 +6719,6 @@ $lang = array (
'srv_parapodatki' => 'Advanced paradata',
'pasteFromWordAlert' => '<b>Text copying is strongly discouraged!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">More >></a>',
'srv_interaktivni_elementi' => 'Interactive elements',
'srv_hint' => 'Hint',
'srv_para_label_variables' => 'Variables',
'srv_para_label_details' => 'Details',
'srv_para_label_breaks' => 'Breaks',
@ -7009,7 +7023,7 @@ $lang = array (
'one_click_create' => "Oneclick create",
'edit_hide' => "Hide",
'edit_show' => "Show",
'srv_show_title' => "Survey title for respondents",
'srv_show_title' => "Survey title is visible to respondents",
'srv_create_show_intro' => "Intro is visible to respondents",
'srv_create_show_concl' => "Conclusion is visible to respondents",
'srv_create_show_title' => "Title is visible to respondents",
@ -7031,9 +7045,9 @@ $lang = array (
'srv_tip_sample_t6_5_c1' => "Most important",
'srv_tip_sample_t6_5_c2' => "Least important",
'srv_settings_mobile_img' => "Display images on mobile devices",
'srv_settings_mobile_tables' => "Adjusted tables on mobile devices",
'srv_settings_mobile_tables' => "Optimization of 'Table' type questions on mobile devices",
'srv_settings_mobile_tables_slide' => "Yes, with expanding",
'srv_settings_mobile_friendly' => "Mobile friendly",
'srv_settings_mobile_friendly' => "Optimized survey display on mobile devices",
'srv_settings_mobile_friendly_off' => "Mobile friendly survey is turned off",
'srv_mySurvey_unallocated' => "Unallocated survey",
'srv_mySurvey_delete_folder' => "Deleter folder",
@ -7072,7 +7086,7 @@ $lang = array (
'srv_select_box_vse' => "all",
'srv_orientacija_tabela_da_ne' => "Table YES/NO",
'srv_privacy_0' => "Without confirmation (link in footer)",
'srv_privacy_1' => "Confirmation with button next",
'srv_privacy_1' => "Confirmation with 'Next' button",
'srv_privacy_2' => "Confirmation with checkbox",
'cookiePopupTitle' => 'Cookie usage',
'cookiePopupText' => '<p>This site uses cookies to improve user experience for logged in users.</p><p>Do you wish to proceed?</p>',

36
main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
View File

@ -61,7 +61,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -95,7 +95,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -169,14 +169,14 @@ class MultigridMobileController extends Controller{
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2)
if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
// IZPOLNJENA VREDNOST, ce obstaja in ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2){
if($tables_setting == 2){
echo '<div class="grid_mobile_result">'.($grid_id != '' ? $grid_data_value : '').'</div>';
}
@ -386,7 +386,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -439,7 +439,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
echo '<div class="grid_mobile radio double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile radio double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -512,7 +512,7 @@ class MultigridMobileController extends Controller{
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
/*if($mobile_tables == 2)
/*if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
echo '</div>';
@ -714,7 +714,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -750,7 +750,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobitel
echo '<div class="grid_mobile checkbox '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile checkbox '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -819,7 +819,7 @@ class MultigridMobileController extends Controller{
echo '</div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2)
if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
@ -931,7 +931,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -985,7 +985,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobietl
echo '<div class="grid_mobile checkbox double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile checkbox double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -1059,11 +1059,7 @@ class MultigridMobileController extends Controller{
echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
}
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
/*if($mobile_tables == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
echo ' </div>';
echo '</div>';
@ -1269,7 +1265,7 @@ class MultigridMobileController extends Controller{
// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@ -1325,7 +1321,7 @@ class MultigridMobileController extends Controller{
// Izrisemo celotno vsebino tabele za mobitel
echo '<div class="grid_mobile text '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
echo '<div class="grid_mobile text '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@ -1397,7 +1393,7 @@ class MultigridMobileController extends Controller{
echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
if($mobile_tables == 2)
if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';

15
main/survey/app/Controllers/Vprasanja/VprasanjaController.php
View File

@ -231,7 +231,9 @@ class VprasanjaController extends Controller
// JS za mobilno razpiranje tabel
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
if($mobile_tables == 2){
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
if(($mobile_tables == 2 && get('mobile') == 1) || ($pc_tables == 2 && get('mobile') != 1)){
echo '<script>
$(document).ready(
@ -704,7 +706,8 @@ class VprasanjaController extends Controller
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
// Izris multigrida s postopnim resevanjem
if($row['dynamic_mg'] > 0 && !get('printPreview')){
@ -714,7 +717,7 @@ class VprasanjaController extends Controller
Dynamic::getInstance()->verticalMultigrid($spremenljivka);
}
// Izris radio multigrida na mobitelu
elseif (get('mobile') == 1 && $mobile_tables > 0) {
elseif ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
// Dvojni multigrid
if($row['enota'] == 3)
@ -778,9 +781,10 @@ class VprasanjaController extends Controller
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
// Izris checkbox multigrida na mobitelu
if (get('mobile') == 1 && $mobile_tables > 0) {
if ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
// Dvojni multigrid
if($row['enota'] == 3)
@ -823,9 +827,10 @@ class VprasanjaController extends Controller
SurveySetting::getInstance()->Init(get('anketa'));
$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
// Izris text in number multigrida na mobitelu
if (get('mobile') == 1 && $mobile_tables > 0) {
if ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
MultigridMobile::getInstance()->textMultigrid($spremenljivka);
}
// Izris navadnega text in number multigrida

4013
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

150
public/css/main.css
View File

@ -5751,6 +5751,9 @@ span.enka-custom-radio:before,
padding: 3px;
margin-bottom: 20px !important;
}
.spremenljivka.tip_6, .spremenljivka.tip_16, .spremenljivka.tip_19, .spremenljivka.tip_20, .spremenljivka.tip_24 {
/* Mobilno rzpiranje tabel */
}
.spremenljivka.tip_6 input[type=text], .spremenljivka.tip_6 textarea, .spremenljivka.tip_6 select, .spremenljivka.tip_16 input[type=text], .spremenljivka.tip_16 textarea, .spremenljivka.tip_16 select, .spremenljivka.tip_19 input[type=text], .spremenljivka.tip_19 textarea, .spremenljivka.tip_19 select, .spremenljivka.tip_20 input[type=text], .spremenljivka.tip_20 textarea, .spremenljivka.tip_20 select, .spremenljivka.tip_24 input[type=text], .spremenljivka.tip_24 textarea, .spremenljivka.tip_24 select {
padding: 5px 7px;
}
@ -5791,6 +5794,153 @@ span.enka-custom-radio:before,
.spremenljivka.tip_6 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_16 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_19 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_20 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_24 table.dynamicmultigrid tbody tr:nth-child(2n+1) {
background-color: #ffffff !important;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question {
margin: 10px 0 15px;
/*line-height: 24px;*/
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_title {
padding: 7px 9px;
font-weight: 500;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables {
width: 100%;
box-sizing: border-box;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 7px 9px;
margin: 2px 0;
color: #333333;
border: 1px #fff solid;
border-radius: 3px;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label {
vertical-align: baseline;
}
.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle {
padding: 5px 8px;
}
.spremenljivka.tip_6 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_6 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_6 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_6 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_16 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_16 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_16 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_16 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_19 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_19 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_19 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_19 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_20 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_20 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_20 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_20 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_24 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_24 .grid_mobile.checkbox .grid_mobile_variable.checked,
.spremenljivka.tip_24 .grid_mobile.radio .grid_mobile_variable:hover,
.spremenljivka.tip_24 .grid_mobile.radio .grid_mobile_variable.checked {
background-color: #efefef;
border: 1px #E2E2E2 solid;
}
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable {
display: inline-block;
border: 0;
}
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked {
background-color: #fff;
border: 0;
}
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table {
display: inline-block !important;
}
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable input[type=text],
.spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable input[type=email],
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable input[type=text],
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable input[type=email] {
box-sizing: border-box;
width: 100%;
padding: 10px;
}
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable textarea,
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable textarea {
box-sizing: border-box;
width: 100%;
max-width: 100% !important;
padding: 10px;
}
.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable .category > div,
.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable .category > div {
max-height: 60px;
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title {
cursor: pointer;
display: flex;
justify-content: space-between;
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow {
font-family: "Font Awesome 5 Free";
font-weight: 700;
font-size: 18px;
padding-left: 10px;
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before {
content: "";
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before {
content: "";
}
.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_result {
display: none;
margin: 0px 30px 0 10px;
font-size: 13px;
color: #999;
line-height: 20px;
font-weight: 500;
}
.spremenljivka.tip_17 select {
padding: 8px 12px;
margin-right: 15px;

77
resources/sass/admin_new/components/ckeditor/ckeditor.scss Normal file
View File

@ -0,0 +1,77 @@
.cke_1.cke_chrome {
border-bottom: 1px $gray solid !important;
border-radius: 2px 2px 0 0;
}
#cke_1_top{
border-bottom: 1px $gray solid;
}
.cke_dialog{
border: 1px $gray solid !important;
}
div.button_holder.editor_button_holder{
margin: 0;
padding: 8px 16px;
border-bottom: 1px rgb(204, 204, 204) solid;
border-left: 1px rgb(204, 204, 204) solid;
border-right: 1px rgb(204, 204, 204) solid;
border-radius: 0 0 2px 2px;
}
.cke_dialog table tr td,
.cke_dialog table tr th{
border-bottom: 0 !important;
}
.cke_toolbox span:nth-child(1),
.cke_toolbox span:nth-child(2),
.cke_toolbox span:nth-child(3),
.cke_toolbox span:nth-child(4),
.cke_toolbox span:nth-child(5),
.cke_toolbox span:nth-child(6),
.cke_toolbox span:nth-child(7),
.cke_toolbox span:nth-child(8),
.cke_toolbox span:nth-child(9){
}
.cke_toolbox span:nth-child(10){
.cke_button_icon{
display: none;
}
.cke_button_label{
display: inline;
padding-left: 0;
}
}
//.cke_toolbox span:nth-child(11),
.cke_toolbox span:nth-child(12),
.cke_toolbox span:nth-child(13),
.cke_toolbox span:nth-child(14){
display: none;
}
/*
#cke_43,
#cke_47,
#cke_51{
display: none;
}
// Gumb vec
#cke_42{
.cke_button_icon{
display: none;
}
.cke_button_label{
display: inline;
padding-left: 0;
}
}*/

5
resources/sass/admin_new/components/components.scss
View File

@ -15,4 +15,7 @@
@import "table/table";
// Payments
@import "payments/payments";
@import "payments/payments";
// CKEditor
@import "ckeditor/ckeditor";

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

@ -234,13 +234,4 @@ div.button_holder {
margin-right: 0;
}
}
&.editor_button_holder{
margin: 0;
padding: 8px 16px;
border-bottom: 1px rgb(204, 204, 204) solid;
border-left: 1px rgb(204, 204, 204) solid;
border-right: 1px rgb(204, 204, 204) solid;
}
}

16
resources/sass/admin_new/components/form/seznam_anket.scss
View File

@ -13,6 +13,7 @@
border: 1px solid #E5E5E5;
background-color: #FFFF;
border-radius: 2px;
cursor: pointer;
margin: 0px;
padding: 0px;
@ -57,7 +58,6 @@
color: #333;
font-weight: 400;
margin-right: 5px;
}
}
@ -78,7 +78,7 @@
background-color: rgba(255, 0, 0, 0.05);
}
#num_box3{
//
background-color: #FFFFFF;
}
}
@ -89,10 +89,14 @@ table.gdpr_surveys{
}
table.gdpr_surveys tr.green_row td {
background-color: rgba(20, 255, 0, 0.05) !important;
table.gdpr_surveys tr.green_row {
background-color: #F3FFF2 !important;
}
table.gdpr_surveys tr.red_row td{
table.gdpr_surveys tr.red_row {
// background-color: #FF0000 !important;
background-color: rgba(255, 0, 0, 0.05) !important;
background-color: #FFEFEF !important;
}
table.gdpr_surveys tr.grey_row {
background-color: #ffffff !important;
}

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

@ -5,6 +5,9 @@ textarea {
&.wauto {
width: auto;
}
&.w800{
width: 800px;
}
border: 1px solid $dark-gray;
box-sizing: border-box;

86
resources/sass/admin_new/components/table/table.scss
View File

@ -39,13 +39,13 @@ table {
}
tr {
height: 40px;
&:last-of-type,
&.show_as_last_row{
td, th {
td, th {
border-bottom: 1px solid $gray;
}
}
@ -107,48 +107,72 @@ div {
//testiranje --> avtomatski vnosi
.page_num_fieldset{
padding-top: 0px;
padding-bottom: 0px;
#anketa_edit .page_num_fieldset{
border: unset;
border-top: 1px dashed #E5E5E5;
padding: 0px;
margin: 12px 0px;
}
.page_num{
margin-left: 39%;
color: #333333;
}
#anketa_edit {
.page_num_fieldset{
padding-top: 0px;
padding-bottom: 0px;
margin: 0px;
}
.page_num{
text-align: center;
color: #333333;
position: relative;
.table_header{
width: 100%;
margin: 16px 0px 0px 0px;
font-size: 16px;
font-weight: 600;
tr{
margin: 4px 0px;
}
.table_header{
width: 100%;
margin: 16px 0px 0px 0px;
background-color: #F8F8F8;
font-size: 16px;
font-weight: 600;
tr{
width: 100%;
td:first-of-type {
width: 46%;
padding-left: 16px;
}
td:last-of-type {
width: 54%;
padding-left: 16px;
}
}
}
.avt_vnosi_table{
margin: 0px;
td:first-of-type {
width: 40%;
padding-left: 48px;
width: 46%;
}
td:last-of-type {
width: 60%;
padding-left: 25px;
width: 54%;
}
}
}
.avt_vnosi_table{
td:first-of-type {
width: 40%;
}
td:last-of-type {
width: 60%;
}
}

4
resources/sass/admin_new/pages/settings/uporabniki.scss
View File

@ -78,12 +78,14 @@ div.subpage_uporabniki {
}
}
//Pregled in dodajanje
//Moji uporabniki
div.users_list_box {
padding: 0 12px;
}
// Dodajanje
div.add_user {
margin-bottom: 32px;

69
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -1,32 +1,36 @@
// Ikone (frekvenca, suma...)
#div_analiza_data{
.cell_icons {
//
}
.row2{
position: relative;
}
.options{
width: 200px;
width: 220px;
z-index: 9999;
position: absolute;
left: 17px;
top: 40px;
box-shadow: 0px 0px 7px 0px #0000001F;
}
.faicon.dots {
cursor: pointer;
color: #1e88e5;
}
.faicon.dots:hover{
color: #0059ab;
}
// .displayNone{
// background-color: blue;
// }
}
// .cell_icons {
// position: relative;
// }
.cell_icons {
position: relative;
}
// .options{
// border: 1px solid red;
@ -43,6 +47,8 @@
// justify-content: center;
background-color: white;
border-radius: 2px;
box-shadow: 0px 0px 7px 0px #0000001F;
@ -65,20 +71,27 @@
color: #333333;
font-weight: 400;
margin-left: 14px;
margin-right: 16px;
}
.icon_text_margin{
margin-left: 9px;
margin-left: 15px;
}
.dop_frekv{
margin-left: 16px;
margin-left: 9px;
}
.sum_frekv{
margin-left: 11px;
margin-left: 13px;
}
.star_icon{
margin-left: 9px;
}
.an_freq_text{
margin-left: 17px;
}
.an_chart_bar_text{
margin-left: 10px;
}
&:last-of-type{
margin-right: 0;
@ -112,4 +125,32 @@
padding-bottom: 16px;
}
}
@media only screen and (max-width: 850px) {
.analysis_icons_holder {
display: block !important;
}
}
// span.faicon{
// font-family: "Source Sans Pro",sans-serif;
// font-weight: 700;
// font-style: italic;
// content: "f*";
// }
.cell_icons button::before{
font-weight: 700;
// content: "f*";
content: "\f141";
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button {
background-color: #f8f8f8 !important;
background: unset;
border: unset;
}

12
resources/sass/admin_new/pages/survey_edit/library.scss
View File

@ -298,7 +298,8 @@
&:hover{
background-color: $light-gray;
.dots_ver{
.dots_ver,
.monitor{
display: block;
}
}
@ -337,6 +338,15 @@
}
}
.monitor{
display: none;
position: absolute;
right: 22px;
padding: 7px 8px;
margin-right: 0;
}
.folder_empty:before{
color: $dark-gray2;
}

32
resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
View File

@ -2,6 +2,11 @@
display: none;
}
.faicon.dots{
cursor: pointer;
color: #1e88e5;
}
// Oblika - prva stran, meni s temami
@ -76,7 +81,7 @@ div.page_tema {
bottom: 20px;
max-width: 113px;
// display: none;
filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.25));
box-shadow: 0px 0px 7px 0px #0000001F;
border-radius: 2px;
@ -198,7 +203,7 @@ div.page_tema {
div.theme_label {
width: 259px;
height: 240px;
max-height: 265px;
box-sizing: border-box;
background-color: $light-gray;
@ -209,17 +214,21 @@ div.page_tema {
margin-bottom: 16px;
.theme_label_content{
border-bottom: 1px solid $gray;
max-height: 169px;
// padding-bottom: 15px;
box-sizing: border-box;
button{
padding: 0px;
}
img {
display: block;
clear: both;
width: 100%;
margin-bottom: 15px;
border: none;
}
@ -228,7 +237,7 @@ div.page_tema {
font-weight: $semi-bold;
// font-family: 'Roboto';
font-weight: 500;
font-weight: 600;
}
@ -239,13 +248,13 @@ div.page_tema {
flex-direction: row;
justify-content: space-between;
box-sizing: border-box;
margin-bottom: 16px;
margin-top: 16px;
margin-bottom: 2px;
span.theme_name {
font-weight: 500;
font-weight: 600;
text-transform: uppercase;
// font-family: 'Roboto';
font-size: 14px;
font-size: 16px;
display: flex;
align-items: center;
@ -540,4 +549,5 @@ fieldset#theme-upload {
.fa-desktop{
color: #0059AB;
}
}

1
resources/sass/admin_new/pages/survey_edit/popups/popups.scss
View File

@ -2,6 +2,7 @@
@import "survey_edit";
@import "title_edit";
@import "preview_question";
@import "vprasanje_deleted";
@import "import_from_text";
@import "archive";

4
resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
View File

@ -27,7 +27,9 @@ $progress_bar_background: black;
*/
//Preview spremenljivka
#fullscreen {
#fullscreen,
#vprasanje_preview{
#preview_spremenljivka {
@include popup_general();

58
resources/sass/admin_new/pages/survey_edit/vprasanje_deleted.scss → resources/sass/admin_new/pages/survey_edit/popups/vprasanje_deleted.scss
View File

@ -30,7 +30,7 @@
height: 440px;
max-height: 440px;
overflow-y: auto;
padding: 16px;
padding: 0 16px 16px 16px;
border-bottom: 1px $gray solid;
@ -79,7 +79,8 @@
&:hover{
background-color: $light-gray;
.dots_ver{
.dots_ver,
.monitor{
display: block;
}
}
@ -124,6 +125,7 @@
}
.monitor{
display: none;
margin-right: 0;
}
}
@ -141,4 +143,54 @@
margin: 0 16px 16px 0;
}
}
}
}
/* Dodaten popup za preview */
#vprasanje_preview{
position: absolute;
z-index: 9999;
top: 0;
left: 0;
height: 100%;
width: 100%;
background-color: $white;
h2 .as_link{
text-decoration: none;
text-transform: none;
}
#preview_spremenljivka{
width: 100%;
height: calc(100% - 140px);
max-height: none;
box-sizing: border-box;
padding-top: 0;
#spremenljivka_preview .spremenljivka{
padding: 0;
.naslov{
padding: 0;
font-weight: 600;
font-size: 20px;
p{
font-weight: 600;
}
}
}
}
.button_holder{
padding: 16px;
margin: 0;
border-top: 1px $gray solid;
}
}

1
resources/sass/admin_new/pages/survey_edit/survey_edit.scss
View File

@ -12,7 +12,6 @@
@import "library";
@import "jquery";
@import "top_center_settings";
@import "vprasanje_deleted";
// Urejanje -> Nastavitve

325
resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

@ -54,90 +54,183 @@ div.page_komentarji_anketa {
margin-top: 32px;
display: flex;
flex-direction: row;
gap: 32px;
width: 100%;
div.komentarji_anketa {
width: 50%;
fieldset {
padding: 32px 24px;
&.komentarji_ured {
border-right: 1px solid $gray;
padding-right: 32px;
margin-right: 32px;
}
div.add_comment_toggle {
transition: 0.3s;
border: 1px solid $gray;
border-radius: 2px;
width: 100%;
padding: 9px 8px;
margin-bottom: 16px;
color: $very-dark-gray;
cursor: text;
}
div.comment_type {
font-weight: $semi-bold;
margin-bottom: 16px;
text-transform: uppercase;
display: flex;
flex-direction: row;
justify-content: space-between;
.fa-sort-amount-up {
display: none;
}
}
div.comment_box {
width: 100%;
display: flex;
flex-direction: column;
border-bottom: 1px solid $gray;
margin-bottom: 16px;
&.archived {
color: $very-dark-gray !important
}
.by {
.user {
font-weight: $semi-bold;
}
p {
font-size: 14px !important;
}
div.comment_box {
width: 100%;
display: flex;
flex-direction: column;
flex-direction: row;
justify-content: space-between;
border-bottom: 1px solid $gray;
margin-bottom: 16px;
.by {
margin-bottom: 4px;
.user {
font-weight: $semi-bold;
}
}
.date {
font-size: 14px;
color: $very-dark-gray2;
}
.content {
margin: 16px 0;
}
.bottom_options {
.options {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
.archive_comment,
.unarchive_comment {
.solve {
margin-right: 16px;
cursor: pointer;
color: $blue;
}
transition: 0.2s;
&:hover {
$color: darken ($blue, 3%);
color: $blue;
position: relative;
.options_dropdown {
position: absolute;
right:0;
top: 24px;
display: flex;
z-index: 99;
width: auto;
padding: 20px 16px;
background: $white;
border: 1px solid $gray;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
flex-direction: column;
.line {
&:not(:last-of-type) {
margin-bottom: 12px;
}
white-space: nowrap;
transition: 0.2s;
&:hover{
color: $dark-blue;
}
cursor: pointer;
a {
white-space: nowrap;
text-decoration: none;
}
p {
font-size: 14px !important;
}
}
}
.archived_comment {
color: $very-dark-gray2
}
}
}
div.add_comment_toggle {
transition: 0.3s;
.date {
font-size: 14px;
color: $very-dark-gray2;
}
div.comment_wrapper {
display: none;
transition: 0.3s;
.content {
margin: 16px 0;
}
div.new_comment {
display: flex;
flex-direction: column;
textarea {
width: 100%;
height: 100px;
}
button {
width: fit-content;
margin-top: 8px;
.bottom_options {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
.archive_comment,
.unarchive_comment {
cursor: pointer;
color: $blue;
transition: 0.2s;
&:hover {
$color: darken ($blue, 3%);
}
}
}
.archived_comment {
color: $very-dark-gray2
}
}
}
div.comment_wrapper {
display: none;
transition: 0.3s;
div.new_comment {
display: flex;
flex-direction: column;
margin-bottom: 16px;
textarea {
width: 100%;
height: 100px;
}
button {
width: fit-content;
margin-top: 8px;
}
}
}
}
}
@ -269,10 +362,31 @@ div.page_komentarji_anketa {
margin-right: 62px;
}
div.add_comment_toggle {
transition: 0.3s;
border: 1px solid $gray;
border-radius: 2px;
width: 100%;
padding: 9px 8px;
margin-bottom: 16px;
color: $very-dark-gray;
cursor: text;
}
div.comment_type {
font-weight: $semi-bold;
margin-bottom: 16px;
text-transform: uppercase;
display: flex;
flex-direction: row;
justify-content: space-between;
.fa-sort-amount-up {
display: none;
}
}
div.comment_box {
@ -284,11 +398,80 @@ div.page_komentarji_anketa {
margin-bottom: 16px;
&.archived {
color: $very-dark-gray !important
}
.by {
margin-bottom: 4px;
.user {
font-weight: $semi-bold;
}
p {
font-size: 14px !important;
}
display: flex;
flex-direction: row;
justify-content: space-between;
.options {
display: flex;
flex-direction: row;
.solve {
margin-right: 16px;
cursor: pointer;
}
color: $blue;
position: relative;
.options_dropdown {
position: absolute;
right:0;
top: 24px;
display: flex;
z-index: 99;
width: auto;
padding: 20px 16px;
background: $white;
border: 1px solid $gray;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
flex-direction: column;
.line {
&:not(:last-of-type) {
margin-bottom: 12px;
}
white-space: nowrap;
transition: 0.2s;
&:hover{
color: $dark-blue;
}
cursor: pointer;
a {
white-space: nowrap;
text-decoration: none;
}
p {
font-size: 14px !important;
}
}
}
}
}
.date {
@ -298,6 +481,22 @@ div.page_komentarji_anketa {
.content {
margin: 16px 0;
blockquote {
font-size: 14px !important;
border-left: 1px solid $gray;
padding-left: 8px;
margin-block-start: 0;
margin-block-end: 0;
&:not(:last-of-type) {
padding-bottom: 16px;
}
&:first-of-type {
margin-top: 16px;
}
}
}
.bottom_options {
@ -354,6 +553,10 @@ div.page_komentarji_anketa {
margin-top: 8px;
}
}
.new_comment {
margin-bottom: 16px;
}
}
}
}

152
resources/sass/main/main/content.scss
View File

@ -230,7 +230,7 @@
&.tip_16,
&.tip_19,
&.tip_20,
&.tip_24{
&.tip_24{
input[type="text"], textarea, select {
padding: 5px 7px;
@ -282,6 +282,156 @@
table.dynamicmultigrid tbody tr:nth-child(2n+1) {
background-color: #ffffff !important;
}
.grid_mobile{
.grid_mobile_question{
margin: 10px 0 15px;
/*line-height: 24px;*/
.grid_mobile_title{
padding: 7px 9px;
font-weight: 500;
}
.grid_mobile_variables{
width: 100%;
box-sizing: border-box;
.grid_mobile_variable{
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 7px 9px;
margin: 2px 0;
color: #333333;
border: 1px #fff solid;
border-radius: 3px;
label{
vertical-align: baseline;
}
.grid_mobile_variable_title{
}
}
}
.grid_mobile_double_subtitle{
padding: 5px 8px;
}
}
}
.grid_mobile.checkbox,
.grid_mobile.radio{
.grid_mobile_variable{
&:hover,
&.checked{
background-color: #efefef;
border: 1px #E2E2E2 solid;
}
}
}
.grid_mobile.radio.visual_scale,
.grid_mobile.radio.smiley_scale{
.grid_mobile_variables{
//width: auto !important;
.grid_mobile_variable{
display: inline-block;
//width: auto !important;
border: 0;
&:hover,
&.checked{
background-color: #fff;
border: 0;
}
.visual-radio-table,
.custom-radio-table{
display: inline-block !important;
}
}
}
}
.grid_mobile.text,
.grid_mobile.number{
.grid_mobile_variable{
input[type="text"],
input[type="email"]{
box-sizing: border-box;
width: 100%;
padding: 10px;
}
textarea{
box-sizing: border-box;
width: 100%;
max-width: 100% !important;
padding: 10px;
}
.category > div{
max-height: 60px;
}
}
}
/* Mobilno rzpiranje tabel */
.grid_mobile.mobile_expanding{
.grid_mobile_title{
cursor: pointer;
display: flex;
justify-content: space-between;
.faicon.mobile_expanding_arrow{
font-family: $fontawesome;
font-weight: 700;
font-size: 18px;
padding-left: 10px;
&.arrow_down::before{
content: "\f078";
}
&.arrow_up::before{
content: "\f077";
}
}
}
.grid_mobile_result{
display: none;
margin: 0px 30px 0 10px;
font-size: 13px;
color: #999;
line-height: 20px;
font-weight: 500;
}
}
}
/* END TIP TABELA */

4
sql/update2.sql
View File

@ -9656,3 +9656,7 @@ CREATE TABLE IF NOT EXISTS srv_spremenljivka_deleted (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
UPDATE misc SET value='22.08.05' WHERE what="version";
INSERT INTO srv_misc (what, value) VALUES ('pc_tables', '1');
UPDATE misc SET value='22.08.25' WHERE what="version";