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

Drupal: popravek pri angleski prijavi in registraciji, da direktno odpre modal brez AAI obvestila

Browse Source
This commit is contained in:
Robert 2021-01-28 22:00:36 +01:00
parent 367e78d00a
commit 96478bb2cc
4 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -718,14 +718,14 @@ function ostale_prijave_gumbi(){
$text .= '<div class="ikona ikona-custom-login ikona-facebook" data-login="facebook"> $text .= '<div class="ikona ikona-custom-login ikona-facebook" data-login="facebook">
<div class="gumb"> <div class="gumb">
<img alt="Facebook prijava" src="/tema1ka/svg/prijava-facebook.svg"/> <img alt="'.$lang['login_with_facebook'].'" src="/tema1ka/svg/prijava-facebook.svg"/>
'.$lang['login_with_facebook'].' '.$lang['login_with_facebook'].'
</div> </div>
</div>'; </div>';
$text .= '<div class="ikona ikona-custom-login ikona-google" data-login="google"> $text .= '<div class="ikona ikona-custom-login ikona-google" data-login="google">
<div class="gumb"> <div class="gumb">
<img alt="Gmail prijava" src="/tema1ka/svg/prijava-gmail.svg" style="height: 1.5rem;"/> <img alt="'.$lang['login_with_google'].'" src="/tema1ka/svg/prijava-gmail.svg" style="height: 1.5rem;"/>
'.$lang['login_with_google'].' '.$lang['login_with_google'].'
</div> </div>
</div>'; </div>';

23
frontend/drupal/sites/all/themes/pro1ka/templates/page--front.tpl.php
View File

@ -154,9 +154,26 @@
</div> </div>
</li> </li>
<?php else: ?> <?php else: ?>
<li class="nav-li-a"><a href="#" id="modal-open-login" class="navlink-a"><?php print t('Login'); ?></a></li> <li class="nav-li-a">
<li class="nav-li-a"><a href="#" id="modal-open-registration" <a href="#"
class="navlink-a"><?php print t('Registration'); ?></a></li> <?php if ($language->language == 'sl'): ?>
id="modal-open-login"
class='navlink-a'
<?php else: ?>
class='navlink-a modal-open-login-obrazec'
<?php endif; ?>
><?php print t('Login'); ?></a>
</li>
<li class="nav-li-a">
<a href="#"
<?php if ($language->language == 'sl'): ?>
id='modal-open-registration'
class='navlink-a'
<?php else: ?>
class='navlink-a modal-goto-registration'
<?php endif; ?>
><?php print t('Registration'); ?></a>
</li>
<?php endif; ?> <?php endif; ?>
</ul> </ul>

23
frontend/drupal/sites/all/themes/pro1ka/templates/page.tpl.php
View File

@ -69,9 +69,26 @@
</div> </div>
</li> </li>
<?php else: ?> <?php else: ?>
<li class="nav-li-a"><a href="#" id="modal-open-login" class="navlink-a"><?php print t('Login'); ?></a></li> <li class='nav-li-a'>
<li class="nav-li-a"><a href="#" id="modal-open-registration" <a href='#'
class="navlink-a"><?php print t('Registration'); ?></a></li> <?php if ($language->language == 'sl'): ?>
id="modal-open-login"
class='navlink-a'
<?php else: ?>
class='navlink-a modal-open-login-obrazec'
<?php endif; ?>
><?php print t('Login'); ?></a>
</li>
<li class="nav-li-a">
<a href="#"
<?php if ($language->language == 'sl'): ?>
id='modal-open-registration'
class='navlink-a'
<?php else: ?>
class='navlink-a modal-goto-registration'
<?php endif; ?>
><?php print t('Registration'); ?></a>
</li>
<?php endif; ?> <?php endif; ?>
</ul> </ul>

4
lang/2.php
View File

@ -6395,8 +6395,8 @@ $lang = array (
'login_create_own' => 'Create own', 'login_create_own' => 'Create own',
'login_create_right' => '<span class="strong">LOGIN</span><br /> and <br /><span class="strong">REGISTRATION</span>', 'login_create_right' => '<span class="strong">LOGIN</span><br /> and <br /><span class="strong">REGISTRATION</span>',
'login_with_account' => 'Login with account', 'login_with_account' => 'Login with account',
'login_with_google' => 'Gmail account', 'login_with_google' => 'Gmail',
'login_with_facebook' => 'Facebook account', 'login_with_facebook' => 'Facebook',
'login_with_aai' => 'ARNES AAI-account', 'login_with_aai' => 'ARNES AAI-account',
'login_with_aai_title' => 'REGISTRATION WITH AAI ON 1KA.ARNES.SI FOR FREE UNLIMITED USE OF 1KA', '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_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>.',