Drupal: dodan intro tudi za registracijo in prevod.

This commit is contained in:
Robert 2021-01-14 16:28:53 +01:00
parent 73bdbbeb7f
commit 6e37f3f671
7 changed files with 201 additions and 161 deletions

View File

@ -54,95 +54,89 @@ function prijava_1ka_block_view($delta = '')
switch ($delta) {
case 'prijava_1ka_izbira':
//$html = '';
$html = '';
// Modul izpišemo samo če uporabnik ni prijavljen
$html = '<div class="rexister-modal" id="modal-info-login">
<div class="modal-box">
<img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
if(empty($_COOKIE['unam'])) {
$html = '<div class="rexister-modal" id="modal-info-login">
<div class="modal-box">
<img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
// Naslov
$html .= '<div class="dva-stolpca">';
$html .= '<div class="intro-modal intro-aai crta">';
// Naslov
$html .= '<div class="dva-stolpca">';
$html .= '<div class="intro-modal intro-aai crta">';
$html .= '<div class="row siv-url">
<div class="col">
1ka.arnes.si
</div>
</div>';
$html .= '<div class="row siv-url">
<div class="col">
1ka.arnes.si
</div>
</div>';
$html .= '<div class="row">
<div class="col">
<h4>PRIJAVA ZA ŠTUDENTE RAZISKOVALCE IN UČITELJE</h4>
</div>
</div>';
$html .= '<div class="row">
<div class="col">
<h4>
<span class="modal-intro-title modal-intro-login-text">'.$lang['cms_login_link'].'</span>
<span class="modal-intro-title modal-intro-registration-text"> '.$lang['cms_register_link'].'</span> '
.$lang['cms_intro_modal_aai_title'].'
</h4>
</div>
</div>';
$html .= '<div class="row">
<div class="col">
<p><b>Študenti, raziskovalci, učitelji</b> in drugi z AAI dostopom lahko 1KA uporabljate <b>brezplačno in neomejeno.</b></p>
$html .= '<div class="row">
<div class="col">
<p>'.$lang['cms_intro_modal_aai_text'].'</p>
<div class="ikona ikona-custom-login ikona-aai" data-login="aai">
<div class="w-button submit-btn gumb-aai">
NAPREJ
</div>
<div class="ikona ikona-custom-login ikona-aai" data-login="aai">
<div class="w-button submit-btn gumb-aai">'.$lang['next1'].'</div>
</div>
<div class="row pojasnilo">
<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka">
<div class="ikona"><img src="/tema1ka/svg/arnes-pogosta-vprasanja.svg"></div>
<div class="tekst">'.$lang['cms_intro_modal_aai_qa'].'</div>
</a>
</div>
<div class="row pojasnilo">
<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka">
<div class="ikona">
<img alt="KAJ JE AAI RAČUN IN DIGITALNA IDENTITETA?" src="/tema1ka/svg/arnes-pogosta-vprasanja.svg">
</div>
<div class="tekst">
KAJ JE AAI RAČUN IN<br /> DIGITALNA IDENTITETA?
</div>
</a>
</div>
</div>
</div>';
</div>
</div>';
$html .= '</div>';
$html .= '<div class="intro-modal intro-1ka">';
$html .= '<div class="row siv-url">
<div class="col">
www.1ka.si
</div>
</div>';
$html .= '<div class="row">
<div class="col">
<h4>
<span class="modal-intro-title modal-intro-login-text">'.$lang['cms_login_link'].'</span>
<span class="modal-intro-title modal-intro-registration-text"> '.$lang['cms_register_link'].'</span> '
.$lang['cms_intro_modal_1ka_title'].'
</h4>
</div>
</div>';
$html .= '<div class="row">
<div class="col">
<p>'.$lang['cms_intro_modal_1ka_text'].'</p>
<div class="submit-btn w-button" id="modal-open-1ka">'.$lang['next1'].'</div>
</div>
</div>';
$html .= '</div>';
$html .= '</div>';
$html .= '<div class="intro-modal intro-1ka">';
$html .= '<div class="row siv-url">
<div class="col">
www.1ka.si
</div>
</div>';
$html .= '<div class="row">
<div class="col">
<h4>PRIJAVA ZA SPLOŠNE UPORABNIKE</h4>
</div>
</div>';
$html .= ' </div>
</div>';
$html .= '<div class="row">
<div class="col">
<p>Splošni uporabniki se lahko prijavite s svojim elektronskim naslovom ali z <b>uporabniškim računom za Facebook ali Gmail.</b></p>
<div class="submit-btn w-button modal-open-login-obrazec">
NADALJUJ
</div>
</div>
</div>';
$html .= '</div>';
//$html .= '<div class="w-clearfix">
// <div class="col _4-4-12-12">
// <p>Prosimo, da pred klicem pregledate spodnja pogosta vprašanja, posebej študenti in drugi z AAI (Arnes) računom.</p>
// </div>
// </div>';
//
//$html .= '<div class="w-clearfix">
// <div class="col _4-4-12-12">
// <p>Za razjasnjevanja glede plačljive pomoči nas lahko kontaktirate po telefonu <b>030/702-788</b> ali pa izpolnete <a href="https://www.1ka.si/help1KA">OBRAZEC 1KA CENTRA ZA POMOČ UPORABNIKOM</a>.</p>
// </div>
// </div>';
$html .= '</div>';
$html .= ' </div>
</div>';
}
$block['content'] = $html;
break;

View File

@ -53,6 +53,10 @@ function registracija_1ka_block_view($delta = '')
$prikaz = '<div class="rexister-modal" id="modal-registration">
<div class="modal-box w-max-1024"><img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
$prikaz .= '<div class="vrni-na-intro-page modal-open-intro-obrazec">
<< '.$lang['back'].'
</div>';
$prikaz .= '<div class="row glavni-naslov">
<div class="col">
<h3 class="modra center">' . $lang['cms_register_title'] . '</h3>
@ -65,105 +69,105 @@ function registracija_1ka_block_view($delta = '')
//Registracija
$prikaz .= '<div class="registracija forma">';
$prikaz .= '<div class="row">
<div class="col">
<h4>' . $lang['cms_register_new_user_email'] . '</h4>
</div>
</div>';
$lang['cms_register_user_text'] = str_replace("GOOGLE_URL", variable_get('1ka_google_prijava'), $lang['cms_register_user_text']);
$lang['cms_register_user_text'] = str_replace("FACEBOOK_URL", variable_get('1ka_facebook_prijava'), $lang['cms_register_user_text']);
$prikaz .= '<div class="w-form">';
$prikaz .= '<form name="registracija" id="registracija-uporabnika" class="'.nalozi_ustrezen_jezik(true).'" action="' . $register_url . '" method="post">';
$prikaz .= '<input type="hidden" name="jezik" value="'.nalozi_ustrezen_jezik(true).'"/>';
$prikaz .= '<div class="w-clearfix">
<div class="col _6-6-6-12">
<input type="email" class="input-field w-input ' . ($obvestila['error_email'] ? "error-field" : NULL) . '" name="email" placeholder="' . $lang['email'] . '" onchange="InsertName();" onblur="CheckEmail(\''.$lang['cms_register_user_email_incorrect'].'\');CheckEmailTypo(\''.$lang['cms_register_user_typo_email'].'\')" value="' . (!empty($parametri['email']) ? $parametri['email'] : '') . '">
</div>
<div class="col _6-6-6-12">
<input type="text" id="registracija-vzdevek" class="input-field w-input ' . ($obvestila['error_ime'] ? "error-field" : NULL) . '" name="ime" placeholder="' . $lang['cms_register_user_nickname'] . '" value="' . (!empty($parametri['ime']) ? $parametri['ime'] : '') .'">
</div>
</div>';
$prikaz .= '<div class="w-clearfix">
<div class="col _6-6-6-12">
<input type="password" class="input-field w-input ' . ($obvestila['error_geslo'] ? "error-field" : NULL) . '" value="" id="geslo" name="geslo" placeholder="' . $lang['cms_register_user_password'] . '">
</div>
<div class="col _6-6-6-12">
<input type="password" class="input-field w-input ' . ($obvestila['error_geslo'] ? "error-field" : NULL) . '" value="" id="geslo2" name="geslo2" placeholder="' . $lang['cms_register_user_repeat_password'] . '">
</div>
</div>';
if (!empty($recaptcha_sitekey)) {
$prikaz .= '<div class="w-clearfix">
<div class="col _6-6-6-12">
<div class="g-recaptcha" data-sitekey="'.$recaptcha_sitekey.'"></div>
</div>
$prikaz .= '<div class="row">
<div class="col">
<h4>' . $lang['cms_register_new_user_email'] . '</h4>
</div>
</div>';
}
// SPAM protection, če nimamo reCaptcha
$prikaz .= '<div class="form_row">
<input type="text" class="varnostno-polje" name="varnostno-polje" value="" style="display: none;"/>
</div>';
$lang['cms_register_user_text'] = str_replace("GOOGLE_URL", variable_get('1ka_google_prijava'), $lang['cms_register_user_text']);
$lang['cms_register_user_text'] = str_replace("FACEBOOK_URL", variable_get('1ka_facebook_prijava'), $lang['cms_register_user_text']);
$prikaz .= '<div>
<div class="col toppadding">';
// Pogoji uporabe
$prikaz .= '<div class="checkbox-field w-checkbox">
<input type="checkbox" id="IAgree" name="agree" value="1" class="cb w-checkbox-input" required="required">
<span class="checkbox-display ' . (!empty($parametri['missing_agree']) ? "error-field" : NULL) . '"></span>
<span id="agreelabel" ' . (!empty($parametri['missing_agree']) ? "class='error-field'" : NULL) . '><label for="IAgree" class="checkbox-label w-form-label"> '.$lang['cms_register_user_terms_of_use'].'</label></span>
</div>';
$prikaz .= '<div class="w-form">';
$prikaz .= '<form name="registracija" id="registracija-uporabnika" class="'.nalozi_ustrezen_jezik(true).'" action="' . $register_url . '" method="post">';
$prikaz .= '<input type="hidden" name="jezik" value="'.nalozi_ustrezen_jezik(true).'"/>';
// GDPR strinjanje za email obveščanje - v bazi vse nove zahtevke postavimo na 2 ali 0, če se ne strinja
$prikaz .= '<div class="checkbox-field w-checkbox">
<input type="checkbox" id="GdprAgree" name="gdpr-agree" value="1" class="cb w-checkbox-input" '.(!empty($parametri['gdpr']) && $parametri['gdpr'] == 1 ? 'checked="checked"' : null).'>
<span class="checkbox-display"></span>
<span><label for="GdprAgree" class="checkbox-label w-form-label"> '.$lang['cms_register_gdpr_agree']. '<a id="gdpr-more"> '.$lang['srv_invitation_nonActivated_more'].'</a></label></span>
<div id="gdpr-vec-text">'.$lang['cms_register_gdpr_agree_explain'].'</div>
</div>';
$prikaz .= ' </div>
</div>';
$prikaz .= '<div class="w-clearfix">
<div class="col _6-6-6-12">
<input type="email" class="input-field w-input ' . ($obvestila['error_email'] ? "error-field" : NULL) . '" name="email" placeholder="' . $lang['email'] . '" onchange="InsertName();" onblur="CheckEmail(\''.$lang['cms_register_user_email_incorrect'].'\');CheckEmailTypo(\''.$lang['cms_register_user_typo_email'].'\')" value="' . (!empty($parametri['email']) ? $parametri['email'] : '') . '">
</div>
<div class="col _6-6-6-12">
<input type="text" id="registracija-vzdevek" class="input-field w-input ' . ($obvestila['error_ime'] ? "error-field" : NULL) . '" name="ime" placeholder="' . $lang['cms_register_user_nickname'] . '" value="' . (!empty($parametri['ime']) ? $parametri['ime'] : '') .'">
</div>
</div>';
$prikaz .= '<div class="w-clearfix">
<div class="col _6-6-6-12">
<input type="password" class="input-field w-input ' . ($obvestila['error_geslo'] ? "error-field" : NULL) . '" value="" id="geslo" name="geslo" placeholder="' . $lang['cms_register_user_password'] . '">
</div>
<div class="col _6-6-6-12">
<input type="password" class="input-field w-input ' . ($obvestila['error_geslo'] ? "error-field" : NULL) . '" value="" id="geslo2" name="geslo2" placeholder="' . $lang['cms_register_user_repeat_password'] . '">
</div>
</div>';
if (!empty($recaptcha_sitekey)) {
$prikaz .= '<div class="w-clearfix">
<div class="col _6-6-6-12">
<div class="g-recaptcha" data-sitekey="'.$recaptcha_sitekey.'"></div>
</div>
</div>';
}
// SPAM protection, če nimamo reCaptcha
$prikaz .= '<div class="form_row">
<input type="text" class="varnostno-polje" name="varnostno-polje" value="" style="display: none;"/>
</div>';
$prikaz .= '<div>
<div class="col toppadding">';
// Pogoji uporabe
$prikaz .= '<div class="checkbox-field w-checkbox">
<input type="checkbox" id="IAgree" name="agree" value="1" class="cb w-checkbox-input" required="required">
<span class="checkbox-display ' . (!empty($parametri['missing_agree']) ? "error-field" : NULL) . '"></span>
<span id="agreelabel" ' . (!empty($parametri['missing_agree']) ? "class='error-field'" : NULL) . '><label for="IAgree" class="checkbox-label w-form-label"> '.$lang['cms_register_user_terms_of_use'].'</label></span>
</div>';
// GDPR strinjanje za email obveščanje - v bazi vse nove zahtevke postavimo na 2 ali 0, če se ne strinja
$prikaz .= '<div class="checkbox-field w-checkbox">
<input type="checkbox" id="GdprAgree" name="gdpr-agree" value="1" class="cb w-checkbox-input" '.(!empty($parametri['gdpr']) && $parametri['gdpr'] == 1 ? 'checked="checked"' : null).'>
<span class="checkbox-display"></span>
<span><label for="GdprAgree" class="checkbox-label w-form-label"> '.$lang['cms_register_gdpr_agree']. '<a id="gdpr-more"> '.$lang['srv_invitation_nonActivated_more'].'</a></label></span>
<div id="gdpr-vec-text">'.$lang['cms_register_gdpr_agree_explain'].'</div>
</div>';
$prikaz .= ' </div>
</div>';
$prikaz .= '<div>
<div class="col w-clearfix">
<a href="#" class="submit-btn w-button">'.$lang['next1'].'</a>
<p class="paragraph" class="odpri-prijavo">'.str_replace('#URL#', "#", $lang['cms_register_login_link']).'</p>
</div>
</div>';
$prikaz .= '<div>
<div class="col w-clearfix">
<a href="#" class="submit-btn w-button">'.$lang['next1'].'</a>
<p class="paragraph" class="odpri-prijavo">'.str_replace('#URL#', "#", $lang['cms_register_login_link']).'</p>
</div>
</div>';
$prikaz .= '</form>';
$prikaz .= '</div>';
// Prijava preko socjačnih omrežij
//$prikaz .= '<div class="col w-clearfix">
// <h5>'.$lang['reg_can_social'].'</h5>';
//$prikaz .= ostale_prijave();
//$prikaz .= '</div>';
// Vse obstoječe napake, damo v list
$prikaz .= '<div class="w-form-fail napaka-registracija"></div>';
$prikaz .= '</form>';
$prikaz .= '</div>';
// Konec diva za registracijo
// Prijava preko socjačnih omrežij
//$prikaz .= '<div class="col w-clearfix">
// <h5>'.$lang['reg_can_social'].'</h5>';
//$prikaz .= ostale_prijave();
//$prikaz .= '</div>';
// Vse obstoječe napake, damo v list
$prikaz .= '<div class="w-form-fail napaka-registracija"></div>';
$prikaz .= '</div>';
// Konec diva za registracijo
// Prijava preko računov
$prikaz .= '<div class="preko-racunov">';
$prikaz .= '<div class="row">
<div class="col">
<h4>' . $lang['cms_register_other_email'] . '</h4>
</div>
</div>';
$prikaz .= '<div class="row">
<div class="col">
<h4>' . $lang['cms_register_other_email'] . '</h4>
</div>
</div>';
$prikaz .= ostale_prijave_gumbi();
$prikaz .= ostale_prijave_gumbi();
$prikaz .= '</div>';

File diff suppressed because one or more lines are too long

View File

@ -172,7 +172,34 @@
// Nova 1ka
// Prijava modal
jQuery('#modal-open-1ka').on('click', function () {
jQuery('.rexister-modal').hide();
if(jQuery(this).hasClass('modal-goto-registration')){
jQuery('#modal-registration').show();
} else {
jQuery('#modal-login').show();
}
});
jQuery('#modal-open-login').on('click', function () {
jQuery('.modal-intro-title').hide();
jQuery('.modal-intro-login-text').show();
jQuery('#modal-open-1ka').removeClass('modal-goto-registration').addClass('modal-open-login-obrazec');
jQuery('#modal-info-login').show();
});
jQuery('#modal-open-registration').on('click', function () {
jQuery('.modal-intro-title').hide();
jQuery('.modal-intro-registration-text').show();
jQuery('#modal-open-1ka').removeClass('modal-open-login-obrazec').addClass('modal-goto-registration');
jQuery('#modal-info-login').show();
});
@ -188,7 +215,8 @@
});
//Registracija modal
jQuery('#modal-open-registration, .brezplacni-nakup-samo-registracija').on('click', function () {
jQuery('.modal-goto-registration, .brezplacni-nakup-samo-registracija').on('click', function () {
jQuery('.rexister-modal').hide();
jQuery('#modal-registration').show();
});

View File

@ -167,6 +167,10 @@
}
}
.modal-intro-title{
display: none;
}
.color-arnes{
color: $arnes;
}

View File

@ -1647,6 +1647,11 @@ $lang = array (
"cms_aai_login_redirect_button" => 'Prijava na 1ka.arnes.si',
"cms_buy_login_description" => 'Za nadaljevanje nakupa morate biti najprej prijavljeni v 1KA sistem.',
"cms_registration_title" => 'Registracija novega uporabnika 1KA',
"cms_intro_modal_aai_title" => "za študente, raziskovalce in učitelje",
"cms_intro_modal_1ka_title" => "za splošne uporabnike",
"cms_intro_modal_aai_text" => "<b>Študenti, raziskovalci, učitelji</b> in drugi z AAI dostopom lahko 1KA uporabljate <b>brezplačno in neomejeno.</b>",
'cms_intro_modal_1ka_text' => "Splošni uporabniki se lahko prijavite s svojim elektronskim naslovom ali z <b>uporabniškim računom za Facebook ali Gmail.</b>",
"cms_intro_modal_aai_qa" => "KAJ JE AAI RAČUN IN<br /> DIGITALNA IDENTITETA?",
"step1" => "Korak 1",
"root_search" => "Po korenu besede",
"s_basic" => "Enostavno iskanje",

View File

@ -1630,6 +1630,11 @@ $lang = array (
"cms_aai_login_redirect_button" => 'Login to 1ka.arnes.si',
"cms_buy_login_description" => 'You need to be logged in to continue purchasing.',
"cms_registration_title" => 'Registration of a new 1KA user',
'cms_intro_modal_aai_title' => 'for research students and teachers',
'cms_intro_modal_1ka_title' => 'for general users',
'cms_intro_modal_aai_text' => '<b> Students, researchers, teachers</b> and others with AAI access can use 1KA <b>for free and unlimited.</b>',
'cms_intro_modal_1ka_text' => 'General users can sign in with their email address or <b> Facebook or Gmail account.</b>',
'cms_intro_modal_aai_qa' => 'WHAT IS AN AAI<br /> AND DIGITAL IDENTITY?',
"step1" => "Step 1",
"root_search" => "Root search",
"s_basic" => "Basic search",