From 96478bb2ccb980411f88fd97bcd2b389e768ee91 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Thu, 28 Jan 2021 22:00:36 +0100
Subject: [PATCH] Drupal: popravek pri angleski prijavi in registraciji, da
 direktno odpre modal brez AAI obvestila

---
 .../modules/prijava_1ka/prijava_1ka.module    |  4 ++--
 .../pro1ka/templates/page--front.tpl.php      | 23 ++++++++++++++++---
 .../all/themes/pro1ka/templates/page.tpl.php  | 23 ++++++++++++++++---
 lang/2.php                                    |  4 ++--
 4 files changed, 44 insertions(+), 10 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 8f630a30a..d3740ac38 100644
--- a/frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module
@@ -718,14 +718,14 @@ function ostale_prijave_gumbi(){
 
       $text .= '<div class="ikona ikona-custom-login ikona-facebook" data-login="facebook">
                    <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'].'
                    </div>
                  </div>';
 
       $text .= '<div class="ikona ikona-custom-login  ikona-google" data-login="google">
                       <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'].'
                        </div>
                  </div>';
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/page--front.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/page--front.tpl.php
index b80f76116..9ca123bb3 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/page--front.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/page--front.tpl.php
@@ -154,9 +154,26 @@
               </div>
             </li>
           <?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"><a href="#" id="modal-open-registration"
-                                    class="navlink-a"><?php print t('Registration'); ?></a></li>
+            <li class="nav-li-a">
+              <a href="#"
+                <?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; ?>
         </ul>
 
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/page.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/page.tpl.php
index 2147ea362..cacb355d5 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/page.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/page.tpl.php
@@ -69,9 +69,26 @@
               </div>
             </li>
           <?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"><a href="#" id="modal-open-registration"
-                                    class="navlink-a"><?php print t('Registration'); ?></a></li>
+            <li class='nav-li-a'>
+              <a href='#'
+                <?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; ?>
         </ul>
 
diff --git a/lang/2.php b/lang/2.php
index 30bb2311d..8f97e51d5 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6395,8 +6395,8 @@ $lang = array (
 	'login_create_own'							=> 	'Create own',
 	'login_create_right'						=> 	'<span class="strong">LOGIN</span><br /> and <br /><span class="strong">REGISTRATION</span>',
 	'login_with_account'						=> 	'Login with account',
-	'login_with_google'							=> 	'Gmail account',
-	'login_with_facebook'						=> 	'Facebook account',
+	'login_with_google'							=> 	'Gmail',
+	'login_with_facebook'						=> 	'Facebook',
 	'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_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>.',