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

Drupal: dodan intro tudi za registracijo in prevod.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module
View File

@ -54,9 +54,10 @@ function prijava_1ka_block_view($delta = '')
switch ($delta) { switch ($delta) {
case 'prijava_1ka_izbira': case 'prijava_1ka_izbira':
//$html = ''; $html = '';
// Modul izpišemo samo če uporabnik ni prijavljen // Modul izpišemo samo če uporabnik ni prijavljen
if(empty($_COOKIE['unam'])) {
$html = '<div class="rexister-modal" id="modal-info-login"> $html = '<div class="rexister-modal" id="modal-info-login">
<div class="modal-box"> <div class="modal-box">
<img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">'; <img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
@ -73,30 +74,29 @@ function prijava_1ka_block_view($delta = '')
$html .= '<div class="row"> $html .= '<div class="row">
<div class="col"> <div class="col">
<h4>PRIJAVA ZA ŠTUDENTE RAZISKOVALCE IN UČITELJE</h4> <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>
</div>'; </div>';
$html .= '<div class="row"> $html .= '<div class="row">
<div class="col"> <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> <p>'.$lang['cms_intro_modal_aai_text'].'</p>
<div class="ikona ikona-custom-login ikona-aai" data-login="aai"> <div class="ikona ikona-custom-login ikona-aai" data-login="aai">
<div class="w-button submit-btn gumb-aai"> <div class="w-button submit-btn gumb-aai">'.$lang['next1'].'</div>
NAPREJ
</div>
</div> </div>
<div class="row pojasnilo"> <div class="row pojasnilo">
<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka"> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka">
<div class="ikona"> <div class="ikona"><img src="/tema1ka/svg/arnes-pogosta-vprasanja.svg"></div>
<img alt="KAJ JE AAI RAČUN IN DIGITALNA IDENTITETA?" src="/tema1ka/svg/arnes-pogosta-vprasanja.svg"> <div class="tekst">'.$lang['cms_intro_modal_aai_qa'].'</div>
</div>
<div class="tekst">
KAJ JE AAI RAČUN IN<br /> DIGITALNA IDENTITETA?
</div>
</a> </a>
</div> </div>
</div> </div>
</div>'; </div>';
@ -104,46 +104,40 @@ function prijava_1ka_block_view($delta = '')
$html .= '<div class="intro-modal intro-1ka">'; $html .= '<div class="intro-modal intro-1ka">';
$html .= '<div class="row siv-url"> $html .= '<div class="row siv-url">
<div class="col"> <div class="col">
www.1ka.si www.1ka.si
</div> </div>
</div>'; </div>';
$html .= '<div class="row"> $html .= '<div class="row">
<div class="col"> <div class="col">
<h4>PRIJAVA ZA SPLOŠNE UPORABNIKE</h4> <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>
</div>'; </div>';
$html .= '<div class="row"> $html .= '<div class="row">
<div class="col"> <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> <p>'.$lang['cms_intro_modal_1ka_text'].'</p>
<div class="submit-btn w-button" id="modal-open-1ka">'.$lang['next1'].'</div>
<div class="submit-btn w-button modal-open-login-obrazec">
NADALJUJ
</div>
</div> </div>
</div>'; </div>';
$html .= '</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>';
$html .= ' </div> $html .= ' </div>
</div>'; </div>';
}
$block['content'] = $html; $block['content'] = $html;
break; break;

4
frontend/drupal/sites/all/modules/registracija_1ka/registracija_1ka.module
View File

@ -53,6 +53,10 @@ function registracija_1ka_block_view($delta = '')
$prikaz = '<div class="rexister-modal" id="modal-registration"> $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">'; <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"> $prikaz .= '<div class="row glavni-naslov">
<div class="col"> <div class="col">
<h3 class="modra center">' . $lang['cms_register_title'] . '</h3> <h3 class="modra center">' . $lang['cms_register_title'] . '</h3>

2
frontend/drupal/sites/all/themes/pro1ka/css/pro1ka_compiled.css
View File

File diff suppressed because one or more lines are too long

30
frontend/drupal/sites/all/themes/pro1ka/js/script.js
View File

@ -172,7 +172,34 @@
// Nova 1ka // Nova 1ka
// Prijava modal // 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-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(); jQuery('#modal-info-login').show();
}); });
@ -188,7 +215,8 @@
}); });
//Registracija modal //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(); jQuery('#modal-registration').show();
}); });

4
frontend/drupal/sites/all/themes/pro1ka/sass/parts/prijava-registracija.scss
View File

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

5
lang/1.php
View File

@ -1647,6 +1647,11 @@ $lang = array (
"cms_aai_login_redirect_button" => 'Prijava na 1ka.arnes.si', "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_buy_login_description" => 'Za nadaljevanje nakupa morate biti najprej prijavljeni v 1KA sistem.',
"cms_registration_title" => 'Registracija novega uporabnika 1KA', "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", "step1" => "Korak 1",
"root_search" => "Po korenu besede", "root_search" => "Po korenu besede",
"s_basic" => "Enostavno iskanje", "s_basic" => "Enostavno iskanje",

5
lang/2.php
View File

@ -1630,6 +1630,11 @@ $lang = array (
"cms_aai_login_redirect_button" => 'Login to 1ka.arnes.si', "cms_aai_login_redirect_button" => 'Login to 1ka.arnes.si',
"cms_buy_login_description" => 'You need to be logged in to continue purchasing.', "cms_buy_login_description" => 'You need to be logged in to continue purchasing.',
"cms_registration_title" => 'Registration of a new 1KA user', "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", "step1" => "Step 1",
"root_search" => "Root search", "root_search" => "Root search",
"s_basic" => "Basic search", "s_basic" => "Basic search",