v240301

diff --git a/.gitignore b/.gitignore
index 243c4aa..e2b51c8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 old/*
 old/*

+public_html\2022\lib\vendor\*
+public_html\2022\newcms\lib\vendor\*

diff --git a/public_html/2022/index.php b/public_html/2022/index.php
index 0db1f0b..6ff9cac 100644 (file)
--- a/public_html/2022/index.php
+++ b/public_html/2022/index.php
@@ -355,10 +355,9 @@ break;
                                <div>
                                 <ol><?php
 
                                <div>
                                 <ol><?php
 

-                                $abfrage = "SELECT * FROM editioun_2024 WHERE active = '1' ORDER BY date DESC LIMIT 5";
-
-         $result = $conn->query($abfrage);
-         $count = 0;
+        $abfrage = "SELECT * FROM editioun_2024 WHERE active = '1' ORDER BY date DESC LIMIT 5";
+        $result = $conn->query($abfrage);
+        $count = 0;

 
         while($info = $result->fetch_assoc())  {
 
 
         while($info = $result->fetch_assoc())  {
 

diff --git a/public_html/2022/lib/mainmenu.php b/public_html/2022/lib/mainmenu.php
index 2305bb8..e8df646 100644 (file)
--- a/public_html/2022/lib/mainmenu.php
+++ b/public_html/2022/lib/mainmenu.php
@@ -124,7 +124,7 @@ ul.nav.uppercase.normal.alegreya.big-texts > li > a:hover {color:#b8246d;}
      </ul>
      </li>
      <?php
      </ul>
      </li>
      <?php

-if ($page == 'literatour-concours-textes-year') {
+if ($page == 'literatour-concours-textes-year' || $page == 'gallery') {

   ?>
 <li class="dropdown-toggle nav-toggle"> <a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=<?php echo $lang; ?>"><img src="<?php echo $cfg['basepath']; ?>images/<?php echo $lang;?>.png" style="width:40px; height:auto; vertical-align: middle;border: 0px;"></a>
      <ul class="dropdown-menu pull-right clearfix">
   ?>
 <li class="dropdown-toggle nav-toggle"> <a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=<?php echo $lang; ?>"><img src="<?php echo $cfg['basepath']; ?>images/<?php echo $lang;?>.png" style="width:40px; height:auto; vertical-align: middle;border: 0px;"></a>
      <ul class="dropdown-menu pull-right clearfix">


@@ -134,7 +134,6 @@ if ($page == 'literatour-concours-textes-year') {
          <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=en"><img src="<?php echo $cfg['basepath']; ?>images/en.png" style="width:40px; height:auto; margin:5px;border: 0px;"> English</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=pt"><img src="<?php echo $cfg['basepath']; ?>images/pt.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Portugues</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=it"><img src="<?php echo $cfg['basepath']; ?>images/it.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Italiano</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=en"><img src="<?php echo $cfg['basepath']; ?>images/en.png" style="width:40px; height:auto; margin:5px;border: 0px;"> English</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=pt"><img src="<?php echo $cfg['basepath']; ?>images/pt.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Portugues</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=it"><img src="<?php echo $cfg['basepath']; ?>images/it.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Italiano</a></li>

-         <!-- <li><a href="<?php echo $cfg['basepath']; ?>index.php?<?php echo $page_url; ?>&lang=lt"><img src="<?php echo $cfg['basepath']; ?>images/lt.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Lietuviškai</a></li> -->

      </ul>
      </li>
      <?php
      </ul>
      </li>
      <?php


@@ -150,7 +149,6 @@ else {
          <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/en/"><img src="<?php echo $cfg['basepath']; ?>images/en.png" style="width:40px; height:auto; margin:5px;border: 0px;"> English</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/pt/"><img src="<?php echo $cfg['basepath']; ?>images/pt.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Portugues</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/it/"><img src="<?php echo $cfg['basepath']; ?>images/it.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Italiano</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/en/"><img src="<?php echo $cfg['basepath']; ?>images/en.png" style="width:40px; height:auto; margin:5px;border: 0px;"> English</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/pt/"><img src="<?php echo $cfg['basepath']; ?>images/pt.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Portugues</a></li>
          <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/it/"><img src="<?php echo $cfg['basepath']; ?>images/it.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Italiano</a></li>

-         <!-- <li><a href="<?php echo $cfg['basepath']; ?><?php echo $page; ?>/<?php echo $id; ?>/lt/"><img src="<?php echo $cfg['basepath']; ?>images/lt.png" style="width:40px; height:auto; margin:5px;border: 0px;"> Lietuviškai</a></li> -->

      </ul>
      </li>
 <?php
      </ul>
      </li>
 <?php