Drupal: AAI prijava in nov modal z besedilom.
This commit is contained in:
Robert
parent
ca2ebdd00a
commit
125e1a9008
@ -25,6 +25,10 @@ function prijava_1ka_block_info()
|
||||
'info' => t('Prijava z ostalimi (Google, FB, AAI) računi 1ka - modal'),
|
||||
];
|
||||
|
||||
$blocks['prijava_arnes_aai'] = [
|
||||
'info' => t('ArnesAAI popup - modal'),
|
||||
];
|
||||
|
||||
return $blocks;
|
||||
}
|
||||
|
||||
@ -437,6 +441,56 @@ function prijava_1ka_block_view($delta = '')
|
||||
$block['content'] = $html;
|
||||
break;
|
||||
|
||||
case 'prijava_arnes_aai':
|
||||
$html = '';
|
||||
// Modul izpišemo samo če uporabnik ni prijavljen
|
||||
if(empty($_COOKIE['unam'])) {
|
||||
$html = '<div class="rexister-modal" id="modal-aai-obvestilo">
|
||||
<div class="modal-box"><img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
|
||||
|
||||
// Naslov
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<h3>' . $lang['login_with_aai_title'] . '</h3>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '<p class="aai-obvestilo" style="display: none;">'.$lang['cms_aai_login_redirect_text'].'</p>';
|
||||
|
||||
|
||||
for($i=2; $i<5; $i++) {
|
||||
$html .= '<div class="w-clearfix">
|
||||
<div class="col _4-4-12-12">
|
||||
<p>' . $lang['cms_aai_login_redirect_text_' . $i] . '</p>
|
||||
</div>
|
||||
</div>';
|
||||
}
|
||||
|
||||
|
||||
$html .= '<div>
|
||||
<div class="col w-clearfix">
|
||||
<button class="submit-btn w-button prijava-ostale-nazaj" style="float: left;">'.$lang['back'].'</button>
|
||||
<a href="https://1ka.arnes.si" class="submit-btn w-button gumb-aai">'.$lang['cms_aai_login_redirect_button'] .'</a>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '</div>';
|
||||
|
||||
// Poročilo o napaki
|
||||
$html .= '<div class="w-form-fail" id="error-lost-password">
|
||||
<div>'.$lang['cms_error_password'].'</div>
|
||||
</div>';
|
||||
|
||||
// Uspšeno poslan email
|
||||
$html .='<div class="w-form-done"></div>';
|
||||
|
||||
$html .= '</div></div>';
|
||||
}
|
||||
|
||||
|
||||
$block['content'] = $html;
|
||||
break;
|
||||
|
||||
|
||||
|
||||
case 'user_1ka':
|
||||
@ -514,19 +568,20 @@ function ostale_prijave_gumbi(){
|
||||
$text = '<div class="ostale-prijave">';
|
||||
$text .= '<div class="ikona ikona-custom-login ikona-facebook" data-login="facebook">
|
||||
<div class="gumb">
|
||||
<img alt="" src="/tema1ka/svg/prijava-facebook.svg"/>
|
||||
<img alt="Facebook prijava" src="/tema1ka/svg/prijava-facebook.svg"/>
|
||||
'.$lang['login_with_facebook'].'
|
||||
</div>
|
||||
</div>';
|
||||
$text .= '<div class="ikona ikona-custom-login ikona-google" data-login="google">
|
||||
<div class="gumb">
|
||||
<img alt="" src="/tema1ka/svg/prijava-gmail.svg"/>
|
||||
<img alt="Gmail prijava" src="/tema1ka/svg/prijava-gmail.svg" style="height: 1.5rem;"/>
|
||||
'.$lang['login_with_google'].'
|
||||
</div>
|
||||
</div>';
|
||||
$text .= '<div class="aai-prijava-small">'.$lang['login_with_aai_small_text'].'</div>';
|
||||
$text .= '<div class="ikona ikona-custom-login ikona-aai" data-login="aai">
|
||||
<div class="gumb">
|
||||
<img alt="" src="/tema1ka/svg/prijava-aai.svg"/>
|
||||
<div class="gumb gumb-aai">
|
||||
<img alt="Arnes AAI prijava - 1ka.arnes.si" src="/tema1ka/svg/prijava-aai.svg"/>
|
||||
'.$lang['login_with_aai'].'
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -497,7 +497,6 @@
|
||||
jQuery('.ikona-custom-login').on('click', function () {
|
||||
var atribut = jQuery(this).attr('data-login');
|
||||
|
||||
|
||||
jQuery('.aai-obvestilo').hide();
|
||||
jQuery('#submit-other-login').hide();
|
||||
|
||||
@ -514,6 +513,7 @@
|
||||
|
||||
if (atribut == 'aai') {
|
||||
jQuery('.aai-obvestilo').show();
|
||||
return jQuery('#modal-aai-obvestilo').show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -13,8 +13,13 @@
|
||||
|
||||
.aai-obvestilo{
|
||||
margin: 1rem;
|
||||
background: #dedede;
|
||||
background: $oranzna;
|
||||
padding: 1rem;
|
||||
color: white;
|
||||
|
||||
a:hover{
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,6 +44,15 @@
|
||||
flex-direction: column;
|
||||
width: 300px;
|
||||
|
||||
.aai-prijava-small{
|
||||
font-size: 0.8rem;
|
||||
line-height: 1.2;
|
||||
color: #666;
|
||||
padding-top: 1rem;
|
||||
border-top: 1px solid $siva;
|
||||
margin: 1rem 1rem 0;
|
||||
}
|
||||
|
||||
.ikona {
|
||||
margin: 1rem;
|
||||
|
||||
@ -58,6 +72,14 @@
|
||||
background: $modra;
|
||||
}
|
||||
|
||||
&.gumb-aai{
|
||||
background: #e35205;
|
||||
|
||||
&:hover{
|
||||
background: #fa6c21;
|
||||
}
|
||||
}
|
||||
|
||||
img {
|
||||
height: 1.6rem;
|
||||
width: 52px;
|
||||
@ -81,6 +103,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
.gumb-aai{
|
||||
background: #e35205;
|
||||
|
||||
&:hover{
|
||||
background: #fa6c21;
|
||||
}
|
||||
}
|
||||
|
||||
.error-field {
|
||||
border-color: #ff00008a !important;
|
||||
}
|
||||
|
||||
@ -136,6 +136,10 @@
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
.aai-prijava-small{
|
||||
display: none;
|
||||
}
|
||||
|
||||
.li-logo {
|
||||
width: 50%;
|
||||
height: 170px;
|
||||
|
||||
@ -7,19 +7,13 @@
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
inkscape:version="1.0 (6e3e5246a0, 2020-05-07)"
|
||||
height="192"
|
||||
width="307.20001"
|
||||
sodipodi:docname="google-plus-g-brands.svg"
|
||||
id="svg4"
|
||||
height="1536"
|
||||
viewBox="0 0 1505 1536"
|
||||
width="1505"
|
||||
version="1.1"
|
||||
viewBox="0 0 307.20001 192"
|
||||
role="img"
|
||||
class="svg-inline--fa fa-google-plus-g fa-w-20"
|
||||
data-icon="google-plus-g"
|
||||
data-prefix="fab"
|
||||
focusable="false"
|
||||
aria-hidden="true">
|
||||
id="svg4"
|
||||
sodipodi:docname="prijava_gmail.svg"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
||||
<metadata
|
||||
id="metadata10">
|
||||
<rdf:RDF>
|
||||
@ -34,28 +28,27 @@
|
||||
<defs
|
||||
id="defs8" />
|
||||
<sodipodi:namedview
|
||||
inkscape:current-layer="svg4"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:window-y="25"
|
||||
inkscape:window-x="0"
|
||||
inkscape:cy="96"
|
||||
inkscape:cx="126.96416"
|
||||
inkscape:zoom="1.6894531"
|
||||
showgrid="false"
|
||||
id="namedview6"
|
||||
inkscape:window-height="1030"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0"
|
||||
guidetolerance="10"
|
||||
gridtolerance="10"
|
||||
objecttolerance="10"
|
||||
borderopacity="1"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff" />
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1763"
|
||||
inkscape:window-height="895"
|
||||
id="namedview6"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.2884459"
|
||||
inkscape:cx="430.38407"
|
||||
inkscape:cy="917.02903"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="50"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg4" />
|
||||
<path
|
||||
style="fill:#ffffff;stroke-width:0.499999"
|
||||
d="m 768,658 h 725 q 12,67 12,128 0,217 -91,387.5 Q 1323,1344 1154.5,1440 986,1536 768,1536 611,1536 469,1475.5 327,1415 224,1312 121,1209 60.5,1067 0,925 0,768 0,611 60.5,469 121,327 224,224 327,121 469,60.5 611,0 768,0 1068,0 1283,201 L 1074,402 Q 951,283 768,283 639,283 529.5,348 420,413 356,524.5 292,636 292,768 q 0,132 64,243.5 64,111.5 173.5,176.5 109.5,65 238.5,65 87,0 160,-24 73,-24 120,-60 47,-36 82,-82 35,-46 51.5,-87 16.5,-41 22.5,-78 H 768 Z"
|
||||
id="path2"
|
||||
d="m 186.63052,82.24802 c 0.91703,4.846 1.57149,9.69196 1.57149,15.97801 C 188.20201,153.10249 151.39952,192 96,192 42.958,192 0,149.04247 0,96 0,42.9575 42.958,0 96,0 c 25.932,0 47.5415,9.4295 64.30549,25.146 L 134.24251,50.16098 C 127.16997,43.35051 114.72848,35.3615 96,35.3615 63.258,35.3615 36.54,62.47198 36.54,96 c 0,33.52801 26.718,60.63848 59.46,60.63848 37.98052,0 52.25654,-27.3725 54.48245,-41.38647 H 96 v -33.0045 h 90.63052 z m 92.70297,3.21849 V 57.6 h -28.00047 v 27.86651 h -27.86653 v 28.00046 h 27.86653 v 27.86653 h 28.00047 V 113.46697 H 307.2 V 85.46651 Z"
|
||||
fill="currentColor" />
|
||||
style="fill:#ffffff" />
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1639,7 +1639,11 @@ $lang = array (
|
||||
"cms_activation_error_all_field" => "Vsa polja so obvezna in morajo biti izpolnjena.",
|
||||
"cms_login_module_title" => '<span class="strong">PRIJAVA</span> in <br /><span class="strong">REGISTRACIJA</span>',
|
||||
"cms_login_title" => 'Prijava uporabnika 1KA',
|
||||
"cms_aai_login_redirect_text" => 'Uporabniki z <b>ArnesAAI dostopom</b> se lahko od 15.6.2020 z AAI uporabniškim računom prijavite oz. registrirate na <a href="https://1ka.arnes.si">1KA.ARNES.SI</a>, kjer lahko <b>brezplačno</b> uporabljate vse <b>napredne 1KA nastavitve</b>',
|
||||
"cms_aai_login_redirect_text" => '<b>Študenti, raziskovalci, učitelji</b> in drugi z <b>ArnesAAI računom</b> se lahko prijavite na <a href="https://1ka.arnes.si">1KA.ARNES.SI</a>, kjer lahko <b>brezplačno in neomejeno uporabljate vse napredne 1KA nastavitve</b>.',
|
||||
"cms_aai_login_redirect_text_2" => 'Na <b>1KA.ARNES.SI</b> se prijavite z vašim »uporabniškim imenom ArnesAAI«, ki ga dobite od organizacije, kjer ste zaposleni ali se izobražujete. Običajno ima obliko <b>uporabnik@domenaorganizacije.si</b>.',
|
||||
"cms_aai_login_redirect_text_3" => '<b>Študenti Univerze v Ljubljani</b> ste ob začetku študija prejeli <b>avtomatsko dodeljen AAI račun (digitalna identiteta na UL)</b>. Za prijavo uporabite <b>uporabniško ime (npr. up1234@student.uni-lj.si)</b> in geslo vaše digitalne identitete na UL.',
|
||||
"cms_aai_login_redirect_text_4" => 'V primeru nejasnosti si lahko ogledate pogosta vprašanja glede:<ul><li>pridobivanja in delovanja <a href="https://www.arnes.si/pomoc-uporabnikom/aai/odgovori-na-pogosto-zastavljena-vprasanja/">AAI računa</a>,</li><li>uporabe 1KA z <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka">ARNES AAI računom (digitalno identiteto)</a>.</li></ul>',
|
||||
"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',
|
||||
"step1" => "Korak 1",
|
||||
@ -6491,7 +6495,8 @@ $lang = array (
|
||||
'login_with_google' => 'Gmail prijava',
|
||||
'login_with_facebook' => 'Facebook prijava',
|
||||
'login_with_aai' => 'AAI prijava',
|
||||
'login_with_aai_title' => 'Prijava za AAI uporabnike',
|
||||
'login_with_aai_title' => 'PRIJAVA Z AAI NA 1KA.ARNES.SI ZA BREZPLAČNO NEOMEJENO UPORABO 1KA',
|
||||
'login_with_aai_small_text' => '<b>Študenti, raziskovalci, učitelji</b> in drugi z AAI dostopom se lahko za <b> brezplačno uporabo</b> vseh funkcionalnosti orodja 1KA prijavite s svojim <b>obstoječim AAI računom</b> oz. <b>digitalno identiteto</b>.',
|
||||
'login_with_yahoo' => 'Prijava z Yahoo računom',
|
||||
'login_with_msn' => 'Prijava z MSN računom',
|
||||
'login_register' => 'Registrirajte se',
|
||||
|
||||
11
lang/2.php
11
lang/2.php
@ -1622,8 +1622,12 @@ $lang = array (
|
||||
"cms_activation_error_all_field" => "All fields are required.",
|
||||
"cms_login_module_title" => '<span class="strong">LOGIN</span> and <br /><span class="strong">REGISTRATION</span>',
|
||||
"cms_login_title" => 'Login 1KA user',
|
||||
"cms_aai_login_redirect_text" => 'Users with <b>ArnesAAI access</b> can log in or register with an AAI user account on <a href="https://1ka.arnes.si/index.php?lang_id=2">1KA.ARNES.SI</a> from 15.6.2020, where you can use <b>all advanced 1KA settings for free</b>.',
|
||||
"cms_buy_login_description" => 'You need to be logged in to continue purchasing.',
|
||||
"cms_aai_login_redirect_text" => '<b>Students, researchers, teachers</b> and others with an <b> ArnesAAI account </b> can log in to <a href="https://1ka.arnes.si/index.php?lang_id=2">1KA.ARNES.SI </a>, where you can <b> use all advanced 1KA settings </b> for free and unlimited </b>.',
|
||||
"cms_aai_login_redirect_text_2" => 'Log in to <b> 1KA.ARNES.SI </b> with your "ArnesAAI username", which you get from the organization where you are employed or educated. It usually takes the form <b> user@domainorganization.si </b>. ',
|
||||
"cms_aai_login_redirect_text_3" => '<b> Students of the University of Ljubljana </b> received an <b> automatically assigned AAI account (digital identity at UL) </b> at the beginning of their studies </b>. Use the <b> username (eg up1234@student.uni-lj.si) </b> and the password of your digital identity on UL to log in. ',
|
||||
"cms_aai_login_redirect_text_4" => 'In case of ambiguity, you can see frequently asked questions regarding: <ul> <li> obtaining and operating <a href = "https://www.arnes.si/services/arnesaai/"> AAI account </a>, </li> <li> using 1KA with <a href ="https://www.1ka.si/d/en/help/faq/frequently-asked-questions-about-private-business-and-aai-use-of-1ka-tool"> ARNES AAI accounts (digital identity) </a>. </li> </ul> ',
|
||||
"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',
|
||||
"step1" => "Step 1",
|
||||
"root_search" => "Root search",
|
||||
@ -6374,7 +6378,8 @@ $lang = array (
|
||||
'login_with_google' => 'Gmail account',
|
||||
'login_with_facebook' => 'Facebook account',
|
||||
'login_with_aai' => 'AAI-account',
|
||||
'login_with_aai_title' => 'Login with AAI-account',
|
||||
'login_with_aai_title' => 'REGISTRATION WITH AAI ON 1KA.ARNES.SI FOR FREE UNLIMITED USE OF 1KA',
|
||||
'login_with_aai_small_text' => '<b>Students, researchers, teachers</b> and others with AAI access can sign up for <b> free use </b> of all 1KA functionality with their <b> existing AAI account </b> or <b> digital identity </b>.',
|
||||
'login_with_yahoo' => 'Login with Yahoo account',
|
||||
'login_with_msn' => 'Login with MSN account',
|
||||
'login_register' => 'Register',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user