From 125e1a90081768c17adc24c3ffd2d295b89db276 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 1 Dec 2020 15:50:56 +0100 Subject: [PATCH] Drupal: AAI prijava in nov modal z besedilom. --- .../modules/prijava_1ka/prijava_1ka.module | 63 +++++++++++++++++-- .../all/themes/pro1ka/css/pro1ka_compiled.css | 2 +- .../sites/all/themes/pro1ka/js/script.js | 2 +- .../sass/parts/prijava-registracija.scss | 32 +++++++++- .../all/themes/pro1ka/sass/pro1ka_mobile.scss | 4 ++ .../all/themes/pro1ka/svg/prijava-gmail.svg | 59 ++++++++--------- lang/1.php | 9 ++- lang/2.php | 11 +++- 8 files changed, 137 insertions(+), 45 deletions(-) diff --git a/frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module b/frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module index d8a2ba450..44abd92a1 100644 --- a/frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module +++ b/frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module @@ -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 = ''; + } + + + $block['content'] = $html; + break; + case 'user_1ka': @@ -514,19 +568,20 @@ function ostale_prijave_gumbi(){ $text = '
'; $text .= ''; $text .= ''; + $text .= '
'.$lang['login_with_aai_small_text'].'
'; $text .= '