Merge branch 'master' of https://git.1ka.si/git/1ka
This commit is contained in:
pero1203
commit
3d41f415ee
File diff suppressed because it is too large
Load Diff
@ -5656,4 +5656,8 @@ 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");
|
||||
}
|
||||
@ -759,6 +759,7 @@ 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");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1187,7 +1187,7 @@ class ApiLogin
|
||||
// Preverimo ReCaptcha
|
||||
if (AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) {
|
||||
$recaptchaResponse = $this->data['g-recaptcha-response'];
|
||||
$requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $secret_captcha . '&response=' . $recaptchaResponse);
|
||||
$requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse);
|
||||
|
||||
if (!strstr($requestReCaptcha, 'true')) {
|
||||
$error['invalid_recaptcha'] = '1';
|
||||
|
||||
@ -106,6 +106,8 @@ function prijava_1ka_theme()
|
||||
'prijava_z_racuni_modal_block' => [
|
||||
'variables' => [
|
||||
'lang' => $lang,
|
||||
'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false),
|
||||
'url_google' => $url_google
|
||||
]
|
||||
]
|
||||
];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{#{% if(prijavljen) %}#}
|
||||
<div class="rexister-modal" id="modal-aai-obvestilo">
|
||||
s <div class="rexister-modal" id="modal-other-login">
|
||||
|
||||
<div class="modal-box"><img src="/tema1ka/img/ikone/zapri.svg" class="closemodal">
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
<div class="w-clearfix">
|
||||
<div class="col _4-4-12-12">
|
||||
<p>{{ lang['srv_gdpr_frontend_external_login'] }}</p>
|
||||
<p>{{ lang['srv_gdpr_frontend_external_login'] | raw }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="w-clearfix">
|
||||
<div class="col _4-4-12-12">
|
||||
<p>{{ lang['srv_gdrp_frontend_cookie'] }}</p>
|
||||
<p>{{ lang['srv_gdrp_frontend_cookie'] | raw }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
<div>
|
||||
<div class="col w-clearfix">
|
||||
<button class="submit-btn w-button prijava-ostale-nazaj" style="float: left;">{{ lang['back'] }}</button>
|
||||
<input type="submit" value="{{ lang['srv_custom_report_alert_yes'] }}" class="submit-btn w-button" id="submit-other-login">
|
||||
<input type="submit" value="{{ lang['srv_custom_report_alert_yes'] }}" class="submit-btn w-button" id="submit-other-login" style="float:right;">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1123,6 +1123,22 @@ body {
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
ul.seznam-tem {
|
||||
ist-style: none;
|
||||
}
|
||||
ul.seznam-tem li.prirocnik {
|
||||
padding: 13px 0px;
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
}
|
||||
ul.seznam-tem li.prirocnik:first-child {
|
||||
border-top: 1px solid #e5e5e5;
|
||||
}
|
||||
ul.seznam-tem li.prirocnik a {
|
||||
color: #333333;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.modal, .rexister-modal {
|
||||
position: fixed;
|
||||
left: 0%;
|
||||
|
||||
@ -491,3 +491,142 @@ function odpriAaiLoginObvestilo(){
|
||||
jQuery('#modal-open-login-obrazec').css('display', 'flex');
|
||||
}
|
||||
}
|
||||
|
||||
function CookieAlert(link, jezik, url) {
|
||||
var link = link || '/';
|
||||
var jezik = jezik || 'sl';
|
||||
var url = url || false;
|
||||
|
||||
if (link == 'fb') {
|
||||
link = '/frontend/api/api.php?action=login_facebook';
|
||||
// link = 'https://www.1ka.si/fb_login.php';
|
||||
}
|
||||
|
||||
// if (link == 'google') {
|
||||
// link = '/frontend/api/api.php?action=login_google';
|
||||
// }
|
||||
|
||||
if (link == 'aai') {
|
||||
link = 'https://aai.1ka.si/Shibboleth.sso/Login';
|
||||
}
|
||||
|
||||
var da = 'Nadaljuj';
|
||||
var ne = 'Prekliči';
|
||||
if (jezik == 'en') {
|
||||
var da = 'Continue';
|
||||
var ne = 'Cancel';
|
||||
}
|
||||
|
||||
jQuery('#kuki').dialog({
|
||||
height: "auto",
|
||||
width: 520,
|
||||
dialogClass: 'pojavno-okno-1ka',
|
||||
modal: true,
|
||||
buttons: [{
|
||||
text: da,
|
||||
class: "gumbi-pri-zunanji-prijavi",
|
||||
click: function () {
|
||||
jQuery(this).dialog("close");
|
||||
|
||||
document.location.href = link;
|
||||
}
|
||||
}, {
|
||||
text: ne,
|
||||
click: function () {
|
||||
jQuery(this).dialog("close");
|
||||
if (url) {
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
document.location.href = '/';
|
||||
}
|
||||
|
||||
}
|
||||
}]
|
||||
});
|
||||
|
||||
// Če strinjanje ne obstaja, prikažemo vse gumbe
|
||||
if(jQuery('#pogoji-strinjanje').length == 0)
|
||||
jQuery('.gumbi-pri-zunanji-prijavi').show();
|
||||
}
|
||||
|
||||
// Za google prijavo moramo postati formo - kar sestavimo direktno url
|
||||
/*
|
||||
<form id="googleLoginForm" action="https://accounts.google.com/o/oauth2/auth" method="get" style="display: none;">
|
||||
<input type="hidden" name="response_type" value="code" />
|
||||
<input type="hidden" name="client_id" value="<?=$google_login_client_id?>" />
|
||||
<input type="hidden" name="redirect_uri" value="https://www.1ka.si/utils/google-oauth2.php" />
|
||||
<input type="hidden" name="state" value="<?=(isset ($_GET['regFromEnglish']) && $_GET['regFromEnglish']=="1"?'regFromEnglish':'')?>" />
|
||||
<input type="hidden" name="scope" value="email" />
|
||||
<input type="hidden" name="access_type" value="online" />
|
||||
<input type="hidden" name="prompt" value="consent" />
|
||||
<input type="hidden" name="openid.realm" value="https://www.1ka.si" />
|
||||
</form>
|
||||
*/
|
||||
function CookieAlertGoogle(jezik, url) {
|
||||
//console.log('sa', link, jezik);
|
||||
|
||||
//var link = link || '/';
|
||||
var jezik = jezik || 'sl';
|
||||
var url = url || false;
|
||||
|
||||
// Sestavimo url
|
||||
var url = 'https://accounts.google.com/o/oauth2/auth?';
|
||||
|
||||
url += 'response_type=code';
|
||||
url += '&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com';
|
||||
url += '&redirect_uri=https://www.1ka.si/frontend/api/google-oauth2.php';
|
||||
|
||||
if(jezik == 'en')
|
||||
url += '&state=regFromEnglish';
|
||||
else
|
||||
url += '&state=';
|
||||
|
||||
url += '&scope=email';
|
||||
url += '&access_type=online';
|
||||
url += '&prompt=consent';
|
||||
url += '&openid.realm=https://www.1ka.si';
|
||||
|
||||
|
||||
var da = 'Nadaljuj';
|
||||
var ne = 'Prekliči';
|
||||
if (jezik == 'en') {
|
||||
var da = 'Continue';
|
||||
var ne = 'Cancel';
|
||||
}
|
||||
|
||||
jQuery('#kuki').dialog({
|
||||
height: "auto",
|
||||
width: 520,
|
||||
dialogClass: 'pojavno-okno-1ka',
|
||||
modal: true,
|
||||
buttons: [{
|
||||
text: da,
|
||||
class: "gumbi-pri-zunanji-prijavi",
|
||||
click: function () {
|
||||
jQuery(this).dialog("close");
|
||||
|
||||
document.location.href = url;
|
||||
}
|
||||
}, {
|
||||
text: ne,
|
||||
click: function () {
|
||||
|
||||
jQuery('#pogoji-strinjanje').attr('checked', false);
|
||||
jQuery(this).dialog("close");
|
||||
|
||||
if (url) {
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
document.location.href = '/';
|
||||
}
|
||||
|
||||
}
|
||||
}]
|
||||
});
|
||||
|
||||
// Če strinjanje ne obstaja, prikažemo vse gumbe
|
||||
if(jQuery('#pogoji-strinjanje').length == 0)
|
||||
jQuery('.gumbi-pri-zunanji-prijavi').show();
|
||||
}
|
||||
|
||||
@ -331,7 +331,7 @@
|
||||
|
||||
jQuery('#modal-other-login #login-' + atribut + '-title').show();
|
||||
jQuery('#submit-other-login').attr('data-redirect', 'url-' + atribut);
|
||||
jQuery('#modal-other-login').show();
|
||||
jQuery('#modal-other-login').css('display', 'flex');
|
||||
});
|
||||
|
||||
jQuery('#modal-other-login #submit-other-login').on('click', function () {
|
||||
@ -349,38 +349,17 @@
|
||||
/**end prijava z ostalimi računi **/
|
||||
|
||||
// Če uporabnik ni prijavljen potem moje ankete odprejo možnost za prijavo
|
||||
if (jQuery('[href*="/admin/survey/index.php?lang="]').length > 0 || jQuery('[data-href*="/admin/survey/index.php?lang="]').length > 0) {
|
||||
|
||||
// preverimo če obstaja piškot, da je uporabnik prijavljen
|
||||
// preverimo če obstaja piškot, da je uporabnik prijavljen
|
||||
if (document.cookie.indexOf('unam=') > 0) {
|
||||
var dataHref = jQuery('[data-href*="/admin/survey/index.php?lang="]');
|
||||
|
||||
if (dataHref.length > 0) {
|
||||
dataHref.attr('href', dataHref.attr('data-href'));
|
||||
|
||||
jQuery('#gumb-spletna-uporaba').attr('href', dataHref.attr('data-href')).attr('id', '');
|
||||
|
||||
dataHref.attr('data-href', '');
|
||||
}
|
||||
|
||||
var href = jQuery('[href*="/admin/survey/index.php?lang="]');
|
||||
if (href.length > 0 && dataHref.length < 1) {
|
||||
jQuery('#gumb-spletna-uporaba').attr('href', href.attr('href')).attr('id', '');
|
||||
}
|
||||
|
||||
|
||||
jQuery('[href*="/admin/survey/index.php?lang="]').removeClass('gumb-spletna-uporaba');
|
||||
jQuery('[href="/d/admin/survey"]').attr('href', '/admin/survey/index.php?lang='+lang()).removeClass('gumb-spletna-uporaba');
|
||||
|
||||
} else {
|
||||
var href = jQuery('[href*="/admin/survey/index.php?lang="]');
|
||||
|
||||
if (href.length > 0) {
|
||||
href.attr('data-href', href.attr('href')).attr('href', '#');
|
||||
}
|
||||
jQuery('[href="/d/admin/survey"]').attr('href', '#').addClass('gumb-spletna-uporaba');
|
||||
|
||||
jQuery('[data-href*="/admin/survey/index.php?lang="]').addClass('gumb-spletna-uporaba');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Meni za mobilnike
|
||||
|
||||
@ -56,3 +56,22 @@
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ul.seznam-tem{
|
||||
ist-style: none;
|
||||
|
||||
li.prirocnik{
|
||||
padding: 13px 0px;
|
||||
border-bottom: 1px solid $siva-5;
|
||||
|
||||
&:first-child{
|
||||
border-top: 1px solid $siva-5;
|
||||
}
|
||||
|
||||
a{
|
||||
color: #333333;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -294,7 +294,7 @@
|
||||
{# Gumb #}
|
||||
<div class="row flex-desna flex">
|
||||
<div class="gumb">
|
||||
<a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button shrink main-button w-inline-block" class="ustvari-anketo">
|
||||
<a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button shrink main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
|
||||
<div class="button-label">Ustvarite anketo</div>
|
||||
<img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" class="button-right-arrow">
|
||||
<div class="button-flyin"></div>
|
||||
@ -356,7 +356,7 @@
|
||||
<div class="row flex">
|
||||
<div class="col c-33 gumb">
|
||||
<div class="buttons-row buttons-center" style="width: 200px">
|
||||
<a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button w-inline-block">
|
||||
<a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
|
||||
<div class="button-label">Ustvarite anketo</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d;">
|
||||
<div class="button-flyin" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div>
|
||||
</a>
|
||||
|
||||
39
lang/1.php
39
lang/1.php
@ -1990,12 +1990,12 @@ $lang = array (
|
||||
"srv_settings_help" => "Pomoč",
|
||||
"srv_settingsPersonal" => "Uporabniške nastavitve",
|
||||
"srv_nastavitveStevilcenje" => "Številčenje vprašanj",
|
||||
"srv_nastavitveStevilcenjeType" => "Način številčenja",
|
||||
"srv_nastavitveStevilcenjeType" => "Način številčenja za respondente",
|
||||
"srv_nastavitveStevilcenjeType0" => "Brez številčenja",
|
||||
"srv_nastavitveStevilcenjeType1" => "Z zaporedno številko [ 1), 2) ... ]",
|
||||
"srv_nastavitveStevilcenjeType1" => "Z zaporedno številko spremenljivke [ 1), 2) ... ]",
|
||||
"srv_nastavitveStevilcenjeType2" => "Z imenom spremenljivke [ V1, V2 ... ]",
|
||||
"srv_nastavitveStevilcenjeType3" => "Z imenom in zaporedno številko",
|
||||
"srv_nastavitvePrestevilcevanje" => "Avtomatsko preštevilčevanje",
|
||||
"srv_nastavitveStevilcenjeType3" => "Z imenom in zaporedno številko spremenljivke",
|
||||
"srv_nastavitvePrestevilcevanje" => "Avtomatsko preštevilčevanje vprašanj ob spreminjanju vrstnega reda vprašanj",
|
||||
"srv_nastavitveStevilcenjePDF" => "Oštevilči vprašanja v PDF izvozih",
|
||||
"srv_nastavitveStevilcenjeRTF" => "Oštevilči vprašanja v DOC (Word) izvozih",
|
||||
"srv_nastavitveStevilcenjeFrekvence" => "Oštevilči vprašanja v Frekvencah",
|
||||
@ -2984,8 +2984,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šanja",
|
||||
@ -3269,7 +3269,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 +3298,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 števila točk <b>Prenos vrednosti</b>.</p><p>Vpišite labelo spremenljivke z izrač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če vrednosti!",
|
||||
"srv_missing_profile_title2" => "Manjkajoče vrednosti – neopredeljeni odgovori",
|
||||
@ -4012,12 +4012,13 @@ $lang = array (
|
||||
"srv_add_lang" => "Omogoči večjezič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_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",
|
||||
@ -4580,9 +4581,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časno",
|
||||
@ -4654,6 +4655,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 +6395,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 +6413,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 <script> blokom.',
|
||||
'js_tracking_note' => 'Vnesite celotno kodo za sledenje (iz npr. Google Analytics) - vključno s <script> blokom.',
|
||||
'srv_editing_mode' => 'Napredna 1KA',
|
||||
'srv_editing_mode_0' => 'Enostavno',
|
||||
'srv_editing_mode_1' => 'Napredno',
|
||||
@ -6822,7 +6824,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 +7127,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 +7148,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 +7191,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šanje uporabniške izkušnje, vam bomo kot prijavljenim uporabnikom dodelili piš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 želite prijaviti?</p>',
|
||||
'aaiPopupTitle' => 'AAI-prijava',
|
||||
|
||||
37
lang/2.php
37
lang/2.php
@ -1978,12 +1978,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",
|
||||
@ -3239,8 +3239,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 +3269,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 +3982,11 @@ $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_prevajanje_dodaj" => "Add translation for",
|
||||
"srv_multi_lang" => "Multilanguage surveys",
|
||||
"srv_base_lang" => "Basic language",
|
||||
"srv_lang_elements" => "Standard text",
|
||||
"srv_trans_lang" => "Translation",
|
||||
@ -4556,9 +4557,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",
|
||||
@ -4629,6 +4630,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 +6288,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 +6306,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 <script> block.',
|
||||
'js_tracking_note' => 'Enter the full tracking code (from e.g. Google Analytics), including the <script> block:',
|
||||
'srv_editing_mode' => 'Advanced 1KA',
|
||||
'srv_editing_mode_0' => 'Basic',
|
||||
'srv_editing_mode_1' => 'Advanced',
|
||||
@ -6704,7 +6706,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 +7010,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 +7032,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 +7073,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>',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,6 +5,9 @@ textarea {
|
||||
&.wauto {
|
||||
width: auto;
|
||||
}
|
||||
&.w800{
|
||||
width: 800px;
|
||||
}
|
||||
|
||||
border: 1px solid $dark-gray;
|
||||
box-sizing: border-box;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user