From d57dde2abeec17a421c7179b470b2ea6e0354de7 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Sun, 24 Jul 2022 18:46:35 +0200
Subject: [PATCH] Simple frontend - podatki v footerju se morajo crpati
 dinamicno glede na lastnika lastne instalacije

---
 frontend/simple/classes/DisplayController.php | 125 +++++++++---------
 1 file changed, 60 insertions(+), 65 deletions(-)

diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 73160d9c2..94da3444e 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -316,84 +316,90 @@ class DisplayController{
 
         // Stolpec 1
         echo '<div class="col col1">';
+
         echo '  <h2>'.$lang['simple_footer_about'].'</h2>';
-        echo '<div class="col1-flex">';
-            echo '  <span>'.$lang['simple_footer_about_1ka'].'</span>';
-            if(isAAI())
-                echo '  <span>'.$lang['simple_footer_about_faq'].'</span>';
-            echo '  <span>'.$lang['simple_footer_about_general'].'</span>';
-            echo '  <span>'.$lang['simple_footer_about_privacy'].'</span>';
-            echo '  <span>'.$lang['simple_footer_about_cookies'].'</span>';
-            echo '  <span>'.$lang['simple_footer_about_antispam'].'</span>';
-            // echo '  <div class="follow">'.$lang['simple_footer_about_follow'].': ';
-            // echo '      <a href="https://twitter.com/enklikanketa" target="_blank"><span class="icon twitter"></span></a>';
-            // echo '      <a href="https://www.facebook.com/1KA-123545614388521/" target="_blank"><span class="icon fb"></span></a>';
-            // echo '  </div>';
-        echo '</div>';
+        echo '  <div class="col1-flex">';
+        echo '  <span>'.$lang['simple_footer_about_1ka'].'</span>';
+        if(isAAI())
+            echo '  <span>'.$lang['simple_footer_about_faq'].'</span>';
+        echo '  <span>'.$lang['simple_footer_about_general'].'</span>';
+        echo '  <span>'.$lang['simple_footer_about_privacy'].'</span>';
+        echo '  <span>'.$lang['simple_footer_about_cookies'].'</span>';
+        echo '  <span>'.$lang['simple_footer_about_antispam'].'</span>';
+        // echo '  <div class="follow">'.$lang['simple_footer_about_follow'].': ';
+        // echo '      <a href="https://twitter.com/enklikanketa" target="_blank"><span class="icon twitter"></span></a>';
+        // echo '      <a href="https://www.facebook.com/1KA-123545614388521/" target="_blank"><span class="icon fb"></span></a>';
+        // echo '  </div>';
+        echo '  </div>';
+
         echo '</div>';
 
 
-        
-        if(!isAAI()) {
-            // Stolpec 2
-            echo '<div class="col col2">';
-            echo '  <h2>'.$lang['simple_footer_company'].'</h2>';   
-            echo ' <a href="https://www.1ka.si/">'.$lang['simple_footer_company_1ka'].' </a>';        
-            echo '</div>';
-
-            // stolpec 3 - spremljajte nas
-            echo '<div class="col col3">';
-            echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
-                echo ' <div class= "social_logo_flex">';                    
-                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/FB_blue_new.svg " alt="Facebook logo"> </a>';
-                    echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_blue_new.svg" alt="Twitter logo"> </a>';
-                echo ' </div>';
-            echo '</div>';
-
-
-        }
-
         // samo za AAI
         if(isAAI()){
-        // Stolpec 2
+
+            // Stolpec 2
             echo '<div class="col col2">';
+
             echo '  <h2>'.$lang['simple_footer_company'].'</h2>';
+            echo '  <a href="https://1ka.arnes.si/"> Arnes </a>';
 
-            echo ' <a href="https://1ka.arnes.si/"> Arnes </a>';
-
-            // echo '  <span class="semi-bold">'.AppSettings::getInstance()->getSetting('app_settings-owner').'</span>';
-            // echo '  <span><a href="mailto:'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'">'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'</a></span>';
-            // echo '  <span><a href="'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'" target="_blank">'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'</a></span>';
+            echo '</div>';
 
             
-            echo '</div>';
-
-
             // stolpec 3 - spremljajte nas
             echo '<div class="col col3">';
+
             echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
-                echo ' <div class= "social_logo_flex">';
-                    echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_orange.svg" alt="Facebook logo"> </a>';
-                    echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_orange.svg" alt="Twitter logo"> </a>';
-                echo ' </div>';
+            echo '  <div class= "social_logo_flex">';
+            echo '      <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_orange.svg" alt="Facebook logo"> </a>';
+            echo '      <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_orange.svg" alt="Twitter logo"> </a>';
+            echo '  </div>';
+
             echo '</div>';
+
+
             // Stolpec 4 - logotipi
             echo '<div class="col col4">';
+
             echo '  <h2>'.$lang['simple_footer_namestitev'].'</h2>';
 
             // Logotipa FDV in CDI - samo pri virtualkah
             if(isVirtual() || isAAI()){
-                echo '<div class="logo_holder">';
+                echo '  <div class="logo_holder">';
                 
-                echo ' <img src="public/img/logo/ministrstvo.svg" alt="ministrstvo za izobraževanje znanost in šport">';
-                echo '  <img class="arnes-logo" src="'.$site_url.'/public/img/logo/Arnes.svg">';
-                echo '  <img src="'.$site_url.'/public/img/logo/fdv.png">';
+                echo '      <img src="public/img/logo/ministrstvo.svg" alt="ministrstvo za izobraževanje znanost in šport">';
+                echo '      <img class="arnes-logo" src="'.$site_url.'/public/img/logo/Arnes.svg">';
+                echo '      <img src="'.$site_url.'/public/img/logo/fdv.png">';
                 
-                
-                
-                echo '</div>';
+                echo '  </div>';
             }
 
+            echo '</div>';
+        }
+        else{
+
+            // Stolpec 2
+            echo '<div class="col col2">';
+
+            echo '  <h2>'.$lang['simple_footer_company'].'</h2>';   
+            //echo '  <a href="https://www.1ka.si/">'.$lang['simple_footer_company_1ka'].' </a>';      
+            echo '  <span>'.AppSettings::getInstance()->getSetting('app_settings-owner').'</span>';
+            echo '  <span><a href="mailto:'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'">'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'</a></span>';
+            echo '  <span><a href="'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'" target="_blank">'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'</a></span>';
+
+            echo '</div>';
+
+
+            // stolpec 3 - spremljajte nas
+            echo '<div class="col col3">';
+
+            echo '  <h2>'.$lang['simple_footer_about_follow'].'</h2>';
+            echo '  <div class= "social_logo_flex">';                    
+            echo '      <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/FB_blue_new.svg " alt="Facebook logo"> </a>';
+            echo '      <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_blue_new.svg" alt="Twitter logo"> </a>';
+            echo '  </div>';
+
             echo '</div>';
         }
     }
@@ -414,10 +420,8 @@ class DisplayController{
         global $lang;
 		global $site_url;
 
-
-        echo '<div class="app_title">'.AppSettings::getInstance()->getSetting('app_settings-app_name').'</div>';
         echo '<div class="landing_page_content"> ';
-        echo '<div class="landing_page_title"> TEST 1KA </div>';    
+        echo '<div class="landing_page_title">'.AppSettings::getInstance()->getSetting('app_settings-app_name').'</div>';    
         
         // APP SUBTITLE
         echo '<div class="app_subtitle">';
@@ -467,15 +471,6 @@ class DisplayController{
         
         echo '</div>';
         echo '</div>';
-        
-
-        // // APP SUBTITLE
-        // echo '<div class="app_subtitle">';
-        // if(isVirtual())
-        //     echo $lang['app_virtual_domain'];
-        // else
-        //     echo $lang['app_installation'];
-        // echo '</div>';
     }
 
     // Izris okna na prvi strani - AAI