From ee0b820dfc1ff565d3ce59de88b4e47b03ad3cb9 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Fri, 5 Mar 2021 11:21:24 +0100
Subject: [PATCH] Drupal: popravki pri odpiranju AAI pojavnega okna in prikazu
 optimiziranih slik.

---
 .../sites/all/themes/pro1ka/js/script.js      | 33 ++++++++++++++-----
 .../all/themes/pro1ka/templates/html.tpl.php  |  6 ++--
 ...vanje-1ka-cenik-zasebni-uporabniki.tpl.php |  7 ++--
 .../pro1ka/templates/page--front.tpl.php      | 25 ++++++++++++--
 4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index 8066225f9..d53744700 100755
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -187,15 +187,11 @@
 
         });
 
-        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-login, .odpri-login').on('click', function () {
+          odpriAaiLoginObvestilo();
         });
 
-        jQuery('#modal-open-registration').on('click', function () {
+        jQuery('#modal-open-registration, .brezplacni-nakup-samo-registracija').on('click', function () {
           jQuery('.modal-intro-title').hide();
           jQuery('.modal-intro-registration-text').show();
 
@@ -215,7 +211,7 @@
         });
 
         //Registracija modal
-        jQuery('.modal-goto-registration, .brezplacni-nakup-samo-registracija').on('click', function () {
+        jQuery('.modal-goto-registration, .brezplacni-nakup-samo-registracija-eng').on('click', function () {
           jQuery('.rexister-modal').hide();
           jQuery('#modal-registration').show();
         });
@@ -407,7 +403,12 @@
 
         jQuery(document).on('click', '#gumb-spletna-uporaba, .gumb-spletna-uporaba', function (e) {
           e.preventDefault();
-          jQuery('#spletna-uporaba-modal').show();
+
+          if(jQuery('[name="lang"]').val() == 'sl') {
+            odpriAaiLoginObvestilo();
+          } else {
+            jQuery('#spletna-uporaba-modal').show();
+          }
         });
         jQuery('#gumb-lastna-namestitev').on('click', function () {
           jQuery('#lastna-namestitev-modal').show();
@@ -1420,6 +1421,18 @@ function lang() {
   return jQuery('[name="lang"]').val();
 }
 
+function odpriAaiLoginObvestilo(){
+  jQuery('.modal-intro-title').hide();
+  jQuery('.modal-intro-login-text').show();
+
+  if(jQuery('[name="lang"]').val() == 'sl') {
+    jQuery('#modal-open-1ka').removeClass('modal-goto-registration').addClass('modal-open-login-obrazec');
+    jQuery('#modal-info-login').show();
+  } else {
+    jQuery('#modal-open-login-obrazec').show();
+  }
+}
+
 /**
  * Prikažemo polje za Slovenijo v kolikor je uporabnik proračunski uporabnik
  */
@@ -1438,3 +1451,5 @@ function prikaziPoljeEracun(){
   }
 
 }
+
+
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/html.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/html.tpl.php
index 3836ea752..eef55095c 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/html.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/html.tpl.php
@@ -36,7 +36,7 @@
   <?php print $styles; ?>
   <?php print $scripts; ?>
 
-  <script src="https://kit.fontawesome.com/c2623dceed.js" crossorigin="anonymous"></script>
+  <script src="https://kit.fontawesome.com/c2623dceed.js" crossorigin="anonymous" async></script>
 
 
   <link rel="stylesheet" type="text/css" href="/tema1ka/css/pro1ka_ie_fix.css" />
@@ -57,9 +57,9 @@
 <?php global $language; ?>
 <div class="ustvarianketo-btn w-clearfix">
     <?php if ($language->language == 'sl'): ?>
-      <a href="<?php print (!empty($_COOKIE['unam']) ? '/admin/survey' : '/d/cenik/zasebni-paketi' ); ?>">
+      <a href="<?php print (!empty($_COOKIE['unam']) ? '/admin/survey' : '#' ); ?>" class="<?php print (!empty($_COOKIE['unam']) ? '' : 'odpri-login' ); ?>">
     <?php else: ?>
-        <a href="<?php print (!empty($_COOKIE['unam']) ? '/admin/survey/index.php?lang=en' : '/d/en/price-list/private-packages' ); ?>">
+        <a href="<?php print (!empty($_COOKIE['unam']) ? '/admin/survey/index.php?lang=en' : '#' ); ?>" class="<?php print (!empty($_COOKIE['unam']) ? '' : 'modal-open-login-obrazec' ); ?>">
     <?php endif; ?>
       <div class="ustvari-inner">
         <div class="plus">+</div>
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-cenik-zasebni-uporabniki.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-cenik-zasebni-uporabniki.tpl.php
index 110b6c05c..0d508e92f 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-cenik-zasebni-uporabniki.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-cenik-zasebni-uporabniki.tpl.php
@@ -116,13 +116,16 @@ global $language;
               <?php endif; ?>
             </p>
             <?php if (empty($_COOKIE['unam'])): ?>
-              <button class="cta w-button brezplacni-nakup-samo-registracija">
                 <?php if ($language->language == 'sl'): ?>
+                <button class='cta w-button brezplacni-nakup-samo-registracija'>
                   Preizkusi brezplačno
+                </button>
                 <?php else: ?>
+                  <button
+                    class='cta w-button brezplacni-nakup-samo-registracija-eng'>
                   Try for free
+                </button>
                 <?php endif; ?>
-              </button>
             <?php else: ?>
               <a href="/admin/survey" class="cta w-button">
                 <?php if ($language->language == 'sl'): ?>
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 9ca123bb3..519292800 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
@@ -908,9 +908,17 @@
   <div class="flexcol _3c-center">
     <?php if ($language->language == 'sl'): ?>
     <a href="https://youtu.be/1OeaQErrPrc" target="_blank">
-      <img src="/tema1ka/img/delovanje-video-vodic-sl.png"
-           sizes="(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw"
-           alt="Ogled video vodiča">
+      <picture>
+        <source srcset='/tema1ka/img/delovanje-video-vodic-sl.webp' type='image/webp'
+                sizes='(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw'
+                alt='Ogled video vodiča'>
+        <source srcset='/tema1ka/img/delovanje-video-vodic-sl.png' type='image/png'
+                sizes='(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw'
+                alt='Ogled video vodiča'>
+        <img src='/tema1ka/img/delovanje-video-vodic-sl.png'
+             sizes='(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw'
+             alt='Ogled video vodiča'>
+      </picture>
     </a>
     <h3>ogled videovodiča</h3>
     <p>Video vodič prikazuje, kako v orodju 1KA ustvarimo in urejamo preprosto anketo. </p>
@@ -921,6 +929,17 @@
     <img src="/tema1ka/img/delovanje-video-vodic-en.png"
          sizes="(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw"
          alt="Ogled video vodiča">
+      <picture>
+        <source srcset='/tema1ka/img/delovanje-video-vodic-en.webp' type='image/webp'
+                sizes='(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw'
+                alt='Ogled video vodiča'>
+        <source srcset='/tema1ka/img/delovanje-video-vodic-en.png' type='image/png'
+                sizes='(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw'
+                alt='Ogled video vodiča'>
+        <img src='/tema1ka/img/delovanje-video-vodic-en.png'
+             sizes='(max-width: 479px) 92vw, (max-width: 767px) 95vw, (max-width: 991px) 29vw, 30vw'
+             alt='Video tutorials'>
+      </picture>
   </a>
   <h3>VIEW THE VIDEO GUIDE</h3>
   <p>Video guide shows hot to create and edit a simple survey in 1KA tool. </p>