https://github.com/WWBN/AVideo/issues/8853#issuecomment-1952611459

plugin/ADs/navBarButtons.php

@@ -8,7 +8,9 @@ if (ADs::canHaveCustomAds()) {
                style="border-radius: 0;"
                onclick="avideoModalIframeFull(webSiteRootURL+'plugin/ADs/editor.php?customAds=1');return false;">
                 <i class="fas fa-image"></i>
+                <span class="menuLabel">
                 <?php echo __('Custom ADs'); ?>
+                </span>
             </a>
         </div>
     </li>      

plugin/AVideoPlugin.php

@@ -1038,6 +1038,7 @@ class AVideoPlugin
             self::YPTstart();
             $p = static::loadPlugin($value['dirName']);
             if (is_object($p)) {
+                //_error_log("AVideoPlugin::getModeYouTube::{$value['dirName']}");
                 $p->getModeYouTube($videos_id);
             }
             self::YPTend("{$value['dirName']}::" . __FUNCTION__);

plugin/Gallery/view/themeSwitcher.php

@@ -16,12 +16,15 @@ if (!isset($themeSwitcherAdded)) {
             margin-top: -26px;
             overflow-x: visible;
         }
+
         .openThemeOptionsUL li .fas {
             display: none;
         }
+
         .openThemeOptionsUL li.active .far {
             display: none;
         }
+
         .openThemeOptionsUL li.active .fas {
             display: inline-block;
         }
@@ -36,16 +39,25 @@ if (!isset($themeSwitcherAdded)) {
             left: 50%;
             margin-left: -<?php echo $iframeWidth / 2; ?>px;
             background-color: #000;
-            -webkit-box-shadow: 0 0 5px 2px #000;  /* Safari 3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
+            -webkit-box-shadow: 0 0 5px 2px #000;
-            -moz-box-shadow:    0 0 5px 2px #000;  /* Firefox 3.5 - 3.6 */
+            /* Safari 3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
-            box-shadow:         0 0 5px 2px #000;  /* Opera 10.5, IE 9, Firefox 4+, Chrome 6+, iOS 5 */
+            -moz-box-shadow: 0 0 5px 2px #000;
+            /* Firefox 3.5 - 3.6 */
+            box-shadow: 0 0 5px 2px #000;
+            /* Opera 10.5, IE 9, Firefox 4+, Chrome 6+, iOS 5 */
             z-index: 2000;
             width: <?php echo $iframeWidth; ?>px;
             height: <?php echo $iframeHeight; ?>px;
             padding: 0;
             overflow: hidden;
         }
-        #frame { width: <?php echo $iframeWidth/$zoom; ?>px; height: <?php echo $iframeHeight/$zoom; ?>px; border: 1px solid black; }
+
+        #frame {
+            width: <?php echo $iframeWidth / $zoom; ?>px;
+            height: <?php echo $iframeHeight / $zoom; ?>px;
+            border: 1px solid black;
+        }
+
         #frame {
             -ms-zoom: <?php echo $zoom; ?>;
             -moz-transform: scale(<?php echo $zoom; ?>);
@@ -108,7 +120,12 @@ if ($navBarButtons) {
 }
 ?>
 <li class="dropdown-submenu" style="position: relative;">
-    <a class="openThemeOptions <?php echo $aClass; ?>" tabindex="-1" href="#"><i class="fas fa-adjust"></i> <?php echo __("Change theme"); ?> </a>
+    <a class="openThemeOptions <?php echo $aClass; ?>" tabindex="-1" href="#">
+        <i class="fas fa-adjust"></i>
+        <span class="menuLabel">
+            <?php echo __("Change theme"); ?>
+        </span>
+    </a>
     <ul class="dropdown-menu openThemeOptionsUL">
         <?php
         $themes = Gallery::getThemes();

plugin/MobileYPT/HTMLMenuLeft.php

@@ -19,9 +19,9 @@ $url = addQueryStringParameter($url, 'qrcode', 1);
 </li>
 <li>
     <a href="#" onclick="avideoModalIframeXSmall('<?php echo $url; ?>');return false;">
-        <i class="fas fa-qrcode"></i> <?php echo __('Connect Mobile App'); ?>
+        <i class="fas fa-qrcode"></i>
+        <span class="menuLabel">
+            <?php echo __('Connect Mobile App'); ?>
+        </span>
     </a>
 </li>
-
-
-

plugin/NextButton/script.js

@@ -15,7 +15,11 @@ $(document).ready(function () {
                 this.controlText("Next");
             }
             handleClick() {
-                document.location = autoPlayVideoURL;
+                var url = getNextPlaylistUrl();
+                if (empty(url)) {
+                    url = autoPlayVideoURL;
+                } 
+                document.location = url;
             }
         }
 
@@ -24,3 +28,22 @@ $(document).ready(function () {
         player.getChild('controlBar').addChild('NextButton', {}, getPlayerButtonIndex('PlayToggle')+1);
     }, 30); 
 });
+function getNextPlaylistUrl() {
+    // Check if '.playlist-nav' exists
+    if ($('.playlist-nav').length === 0) {
+        // If '.playlist-nav' does not exist, return false
+        return false;
+    }
+    
+    // Find the active list item
+    var activeLi = $('.playlist-nav .navbar-nav li.active');
+    
+    // Determine the next list item; if the active item is the last, wrap to the first list item
+    var nextLi = activeLi.is(':last-child') ? $('.playlist-nav .navbar-nav li').first() : activeLi.next();
+    
+    // Get the URL from the 'a' element inside the next list item
+    var nextUrl = nextLi.find('a').attr('href');
+    
+    // Return the URL, or false if it's not found
+    return nextUrl || false;
+}

plugin/PlayLists/PlayLists.php

@@ -336,7 +336,7 @@ class PlayLists extends PluginAbstract
                 //$url = $global['webSiteRootURL'] . "plugin/PlayLists/player.php?playlists_id=" . $playlists_id;
                 $url = $global['webSiteRootURL'] . "play/" . $playlists_id;
             } else {                
-                $url = $global['webSiteRootURL'] . "program/" . $playlists_id;
+                $url = PlayLists::getURL($playlists_id);
             }
         }
         if (isset($playlist_index)) {
@@ -376,7 +376,9 @@ class PlayLists extends PluginAbstract
                         <div>
                             <a href="' . self::getWatchLaterLink() . '" class="btn btn-default btn-block" style="border-radius: 0;">
                                 <i class="fas fa-clock"></i>
+                                <span class="menuLabel">
                                 ' . __("Watch Later") . '
+                                </span>
                             </a>
                         </div>
                     </li>';
@@ -386,7 +388,9 @@ class PlayLists extends PluginAbstract
                         <div>
                             <a href="' . self::getFavoriteLink() . '" class="btn btn-default btn-block" style="border-radius: 0;">
                                 <i class="fas fa-heart"></i>
+                                <span class="menuLabel">
                                 ' . __("Favorite") . '
+                                </span>
                             </a>
                         </div>
                     </li>';
@@ -395,7 +399,9 @@ class PlayLists extends PluginAbstract
                     <div>
                         <a href="' . "{$global['webSiteRootURL']}plugin/PlayLists/managerPlaylists.php" . '" class="btn btn-default btn-block" style="border-radius: 0;">
                             <i class="fas fa-list"></i>
+                            <span class="menuLabel">
                             ' . __("Organize") . ' ' . __($obj->name) . '
+                            </span>
                         </a>
                     </div>
                 </li>';
@@ -872,7 +878,6 @@ class PlayLists extends PluginAbstract
         return '';
     }
 
-
     static function scheduleLiveButton($playlists_id, $showLabel = true, $class = 'btn btn-xs btn-default')
     {
         // can the user live?
@@ -1081,6 +1086,30 @@ class PlayLists extends PluginAbstract
         }
         return false;
     }
+
+    static function getURL($playlist_id, $count=0, $PLChannelName = '', $plName = '', $current_video_clean_title = '')
+    {
+        global $global;
+        if (empty($PLChannelName)) {
+            $pl = new PlayList($playlist_id);
+            $users_id = $pl->getUsers_id();
+            $user = new User($users_id);
+            $PLChannelName = $user->getChannelName();
+        }
+        if (empty($plName)) {
+            if (empty($pl)) {
+                $pl = new PlayList($playlist_id);
+            }
+            $plName = $user->getName();
+        }
+        if (empty($current_video_clean_title)) {
+            $playlistVideos = PlayList::getVideosFromPlaylist($playlist_id);
+            $current_video_clean_title = $playlistVideos[$count];
+        }
+        $plURL = "{$global['webSiteRootURL']}program/{$playlist_id}/{$count}/" . urlencode(cleanURLName($PLChannelName)) . '/' . urlencode(cleanURLName($plName)) . '/' . urlencode(cleanURLName($current_video_clean_title));
+        
+        return $plURL;
+    }
 }
 
 class PlayListPlayer
@@ -1115,7 +1144,6 @@ class PlayListPlayer
         return $this->videos;
     }
 
-
     public function canSee()
     {
         return !empty($this->playlists_id) && PlayList::canSee($this->playlists_id, $this->users_id);

plugin/VideosStatistics/navBarButtons.php

@@ -5,7 +5,9 @@ if (User::isLogged()) {
         <div>
             <button onclick="avideoModalIframe(webSiteRootURL + 'plugin/VideosStatistics/history.php');" class="btn btn-default btn-block" style="border-radius: 0;">
                 <i class="fas fa-history"></i>
+                <span class="menuLabel">
                     <?php echo __("Videos History"); ?>
+                </span>
             </button>
         </div>
     </li>

view/channelPlaylistItems.php

@@ -206,7 +206,8 @@ unset($_POST['current']);
                             $count++;
                             continue;
                         }
-                        $episodeLink = "{$global['webSiteRootURL']}program/{$playlist['id']}/{$count}/{$channelName}/" . urlencode(cleanURLName($playlist['name'])) . "/" . cleanURLName($value['clean_title']);
+                        
+                $episodeLink = PlayLists::getURL($playlist['id'], $count, $channelName, $playlist['name'], $value['clean_title']);
                         $count++;
                         $name = User::getNameIdentificationById($value['users_id']);
                         $class = '';

view/channelProgram.php

@@ -37,14 +37,16 @@ if (empty($programs)) {
 $playListsObj = AVideoPlugin::getObjectData("PlayLists");
 //var_dump($_GET['program_id']);exit;
 PlayLists::loadScripts();
-?>
-<!DOCTYPE html>
-<html lang="<?php echo getLanguage(); ?>">
 
-<head>
+
-    <title><?php echo __("Program") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?></title>
+$_page = new Page(array("Program"));
-    <?php
+$_page->setExtraStyles(
-    include $global['systemRootPath'] . 'view/include/head.php';
+    array(
+        'node_modules/video.js/dist/video-js.min.css',
+        'plugin/Gallery/style.css'
+    )
+);
+
 ?>
 <style>
     .galleryVideo .panel {
@@ -56,17 +58,6 @@ PlayLists::loadScripts();
         padding: 5px;
     }
 </style>
-    <?php
-    if (!empty($videos_id)) {
-        getOpenGraph($videos_id);
-    }
-    ?>
-</head>
-
-<body class="<?php echo $global['bodyClass']; ?>">
-    <?php
-    include $global['systemRootPath'] . 'view/include/navbar.php';
-    ?>
 <div class="container-fluid gallery">
     <?php
     $channelName = @$_GET['channelName'];
@@ -151,13 +142,12 @@ PlayLists::loadScripts();
                         $count = 0;
                         $realCount = 0;
                         foreach ($videosP as $value) {
-                                $episodeLink = "{$global['webSiteRootURL']}program/{$program['id']}/{$count}";
+                            $episodeLink = PlayLists::getURL($program['id'], $count, $value["channelName"], $program['name'], $value['clean_title']);
                             $count++;
                             if (empty($value['created'])) {
                                 continue;
                             }
                             $realCount++;
-                                $img_portrait = ($value['rotation'] === "90" || $value['rotation'] === "270") ? "img-portrait" : "";
                             $name = User::getNameIdentificationById($value['users_id']);
 
                             $class = '';
@@ -522,8 +512,5 @@ PlayLists::loadScripts();
 </div><!--/.container-->
 
 <?php
-    include $global['systemRootPath'] . 'view/include/footer.php';
+$_page->print();
 ?>
-</body>
-
-</html>

view/css/main.css

@@ -644,29 +644,6 @@ img.rotate-90 {
     background-size: cover;
 }
 
-#sidebar {
-    width: 300px;
-    position: absolute;
-    top: 0;
-    height: 100vh;
-    margin-top: 50px;
-}
-
-#sideBarContainer {
-    overflow: hidden;
-    position: absolute;
-    left: 0;
-    padding: 10px;
-    height: 100%;
-    width: 100%;
-    overflow-y: auto;
-    padding-right: 10px;
-}
-
-#sideBarContainer ul {
-    margin-bottom: 150px;
-}
-
 .navbar-brand {
     padding: 0px;
     /* firefox bug fix */

view/css/navbar.css

@@ -2,10 +2,61 @@
 @media all and (-ms-high-contrast:none) {
     nav ul.items-container li:first-child {
         display: block;
-        flex: 0 1 auto; /* Default */
+        flex: 0 1 auto;
+        /* Default */
     }
 }
 
+
+#sidebar {
+    width: 300px;
+    position: absolute;
+    top: 0;
+    height: 100vh;
+    margin-top: 50px;
+}
+
+
+body.youtube.compressedMenu #sidebar {
+    width: 100px;
+}
+
+body.youtube.compressedMenu #sidebar .menuLabel {
+    display: none;
+}
+
+#sideBarContainer {
+    overflow: hidden;
+    position: absolute;
+    left: 0;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+    overflow-y: auto;
+    padding-right: 10px;
+    overflow: hidden;
+    padding-right: 12px;
+}
+
+#sideBarContainer:hover {
+    overflow: auto;
+    padding-right: 0;
+}
+
+#sideBarContainer ul {
+    margin-bottom: 150px;
+}
+
+#sideBarContainer>ul>li>strong, .singleLineMenu {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+body.youtube.compressedMenu #sideBarContainer li a{
+    text-align: center;
+}
+
 #buttonMyNavbar {
     display: none;
 }
@@ -14,22 +65,27 @@
 #mysearch.collapsing {
     display: block !important;
 }
+
 #myNavbar {
     display: block;
 }
+
 #myNavbar.in,
 #myNavbar.collapsing {
     display: block !important;
 }
+
 #searchForm {
     width: 100%;
     margin: 0 5px;
     white-space: nowrap;
 }
+
 #searchForm>span.input-group-prepend>button {
 
     border-right-width: 0;
 }
+
 #searchForm>span.input-group-append>button {
 
     border-left-width: 0;
@@ -46,6 +102,7 @@
     margin-left: -5px;
     margin-right: -5px;
 }
+
 #filterDropdown.show .dropdown-menu {
     display: block;
 }
@@ -82,17 +139,22 @@
 #navbarRegularButtons::-webkit-scrollbar {
     height: 4px;
 }
+
 #lastItemOnMenu {
     padding-right: 40px;
 }
+
 #mysearch {
     height: auto !important;
 }
-#searchNavItem, #lastItemOnMenu{
+
+#searchNavItem,
+#lastItemOnMenu {
     display: flex;
     justify-content: center;
     align-items: center;
 }
+
 #lastItemOnMenu ul {
     padding: 0;
 }
@@ -103,14 +165,19 @@
         top: 50px;
         left: 10px;
     }
+
     #searchForm {
         margin: 0;
         display: flex;
-        justify-content: center; /* center horizontally */
+        justify-content: center;
-        align-items: center; /* center vertically */
+        /* center horizontally */
+        align-items: center;
+        /* center vertically */
         padding: 0 5px;
     }
-    #rightLoginButton, #rightProfileButton{
+
+    #rightLoginButton,
+    #rightProfileButton {
         margin-right: 5px;
         margin-left: 0;
     }
@@ -125,7 +192,8 @@
         right: 5px;
     }
 
-    #buttonMyNavbar, #searchNavItem{
+    #buttonMyNavbar,
+    #searchNavItem {
         display: block;
     }
 
@@ -155,10 +223,12 @@
         padding: 4px;
         width: 50%;
     }
+
     #mainNavBar .navbar-brand {
         width: 100% !important;
         text-align: center;
     }
+
     #mainNavBar .navbar-brand>img {
         display: unset;
     }
@@ -171,33 +241,44 @@
         margin: 0;
         padding: 0;
     }
-    #myNavbar ul.right-menus .btn, #myNavbar ul.right-menus .btn-group{
+
+    #myNavbar ul.right-menus .btn,
+    #myNavbar ul.right-menus .btn-group {
         margin: 2px;
         width: 100%;
     }
+
     #myNavbar ul.right-menus .btn-group {
         margin: 0;
     }
+
     nav ul.items-container li:first-child {
         display: list-item;
     }
+
     #navbarRegularButtons span.hidden-mdx {
         max-width: 100vw;
     }
+
     .searchli {
         width: 100%;
         margin-right: 0;
         margin-left: 0;
 
     }
+
     .navbar-toggle {
         margin-right: 5px !important;
 
 
     }
-    #navbarRegularButtons, #lastItemOnMenu, .left-side {
+
+    #navbarRegularButtons,
+    #lastItemOnMenu,
+    .left-side {
         padding: 0 5px;
     }
+
     .searchul {
         padding-left: 0px;
     }
@@ -206,6 +287,7 @@
 li.navsub-toggle .badge {
     float: right;
 }
+
 li.navsub-toggle a+ul {
     padding-left: 15px;
 }
@@ -213,6 +295,7 @@ li.navsub-toggle a + ul {
 .navbar-lang-btn .select2-container {
     margin: 8px 0;
 }
+
 .navbar-lang-btn .select2-selection {
     border-color: #00000077 !important;
 }
@@ -222,9 +305,14 @@ li.navsub-toggle a + ul {
     body.youtube {
         margin-left: 300px;
     }
+
     body.youtube div.container-fluid .col-sm-10.col-sm-offset-1.list-group-item {
         margin-left: 0;
         margin-right: 0;
         width: 100%;
     }
+
+    body.youtube.compressedMenu {
+        margin-left: 100px;
+    }
 }

view/include/forKids.php

@@ -153,7 +153,7 @@ if (!empty($_COOKIE['forKids'])) {
     $checked = 'checked';
 }
 ?>
-<label for="forKids" class="row-label">
+<label for="forKids" class="row-label singleLineMenu">
     <?php
     echo createColorfulTextSpans(__('For Kids'));
     ?>

view/include/navbarSidebar.php

@@ -11,8 +11,10 @@ global $avideoLayout;
                 <li>
                     <div>
                         <a href="<?php echo getHomePageURL(); ?>" class="btn btn-primary btn-block  " style="border-radius: 4px 4px 0 0;">
-                            <span class="fa fa-home"></span>
+                            <i class="fa-solid fa-house"></i>
+                            <span class="menuLabel">
                                 <?php echo __("Home"); ?>
+                            </span>
                         </a>
                     </div>
                 </li>
@@ -24,7 +26,9 @@ global $avideoLayout;
                     <div>
                         <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'epg');return false;" class="btn btn-primary btn-block " style="border-radius:  0 0 0 0;">
                             <i class="fas fa-stream"></i>
+                            <span class="menuLabel">
                                 <?php echo __("EPG"); ?>
+                            </span>
                         </a>
 
                     </div>
@@ -33,7 +37,9 @@ global $avideoLayout;
                     <div>
                         <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'tv');return false;" class="btn btn-primary btn-block " style="border-radius:  0 0 0 0;">
                             <i class="fas fa-tv"></i>
+                            <span class="menuLabel">
                                 <?php echo __("TV"); ?>
+                            </span>
                         </a>
 
                     </div>
@@ -47,7 +53,9 @@ global $avideoLayout;
                     <div>
                         <a href="<?php echo $global['webSiteRootURL']; ?>trending" class="btn btn-primary btn-block " style="border-radius:  0 0 4px 4px;">
                             <i class="fas fa-fire"></i>
+                            <span class="menuLabel">
                                 <?php echo __("Trending"); ?>
+                            </span>
                         </a>
 
                     </div>
@@ -58,7 +66,12 @@ global $avideoLayout;
             ?>
                 <li>
                     <button type="button" class="btn btn-success btn-block" onclick="swapUser(0);">
-                        <i class="fas fa-backspace"></i> <i class="fas fa-user-friends"></i> <?php echo __("Back to"); ?> <?php echo User::getNameIdentificationById(User::isSwapBackActive()); ?>
+                        <i class="fas fa-backspace"></i>
+                        <i class="fas fa-user-friends"></i>
+                        <span class="menuLabel">
+                            <?php echo __("Back to"); ?>
+                            <?php echo User::getNameIdentificationById(User::isSwapBackActive()); ?>
+                        </span>
                     </button>
                 </li>
             <?php
@@ -100,7 +113,10 @@ global $avideoLayout;
                                         <i class="fas fa-lock-open text-muted" style="opacity: 0.2;"></i>
                                     <?php }
                                     ?>
-                                    <i class="fas fa-sign-out-alt"></i> <?php echo __("Sign out"); ?>
+                                    <i class="fas fa-sign-out-alt"></i>
+                                    <span class="menuLabel">
+                                        <?php echo __("Sign out"); ?>
+                                    </span>
                                 </a>
                             </div>
                         <?php }
@@ -111,10 +127,9 @@ global $avideoLayout;
                         <div class="pull-left" style="margin-left: 10px;">
                             <img src="<?php echo User::getPhoto(); ?>" style="max-width: 55px;" class="img img-thumbnail img-responsive img-circle" />
                         </div>
-                        <div style="margin-left: 80px;">
+                        <div style="margin-left: 80px;" class="menuLabel">
                             <strong class="text-danger"><?php echo User::getName(); ?></strong>
                             <div><small><?php echo User::getMail(); ?></small></div>
-
                         </div>
                     </li>
                     <li>
@@ -122,7 +137,9 @@ global $avideoLayout;
                         <div>
                             <a href="<?php echo $global['webSiteRootURL']; ?>user" class="btn btn-primary btn-block" style="border-radius: 4px 4px 0 0;">
                                 <span class="fa fa-user-circle"></span>
+                                <span class="menuLabel">
                                     <?php echo __("My Account"); ?>
+                                </span>
                             </a>
 
                         </div>
@@ -137,7 +154,9 @@ global $avideoLayout;
                                                     return false;" class="btn btn-success btn-block" style="border-radius: 0;">
                                     <i class="fa-solid fa-film"></i>
                                     <i class="fa-solid fa-headphones"></i>
+                                    <span class="menuLabel">
                                         <?php echo __("My videos"); ?>
+                                    </span>
                                 </a>
                             </div>
                         </li>
@@ -149,7 +168,9 @@ global $avideoLayout;
                             <a href="#" onclick="avideoModalIframeFull('<?php echo User::getChannelLink(); ?>');
                                             return false;" class="btn btn-danger btn-block" style="border-radius: 0;">
                                 <span class="fas fa-play-circle"></span>
+                                <span class="menuLabel">
                                     <?php echo __($advancedCustomUser->MyChannelLabel); ?>
+                                </span>
                             </a>
 
                         </div>
@@ -164,7 +185,9 @@ global $avideoLayout;
                                 <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'charts');
                                                     return false;" class="btn btn-default btn-block" style="border-radius: 0;">
                                     <span class="fas fa-tachometer-alt"></span>
+                                    <span class="menuLabel">
                                         <?php echo __("Dashboard"); ?>
+                                    </span>
                                 </a>
                             </div>
                         </li>
@@ -177,7 +200,9 @@ global $avideoLayout;
                                 <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'subscribes');
                                                     return false;" class="btn btn-default btn-block" style="border-radius: 0">
                                     <span class="fa fa-check"></span>
+                                    <span class="menuLabel">
                                         <?php echo __("My Subscribers"); ?>
+                                    </span>
                                 </a>
                             </div>
                         </li>
@@ -190,6 +215,7 @@ global $avideoLayout;
                                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'categories');
                                                             return false;" class="btn btn-default btn-block" style="border-radius: 0;">
                                         <i class="fa-solid fa-list"></i>
+                                        <span class="menuLabel">
                                             <?php echo __($advancedCustom->CategoryLabel); ?>
                                     </a>
                                 </div>
@@ -201,7 +227,9 @@ global $avideoLayout;
                                 <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'comments');
                                                     return false;" class="btn btn-default btn-block" style="border-radius: 0 0 4px 4px;">
                                     <span class="fa fa-comment"></span>
+                                    <span class="menuLabel">
                                         <?php echo __("Comments"); ?>
+                                    </span>
                                 </a>
                             </div>
                         </li>
@@ -217,7 +245,9 @@ global $avideoLayout;
                         <div>
                             <a href="<?php echo $global['webSiteRootURL']; ?>user" class="btn btn-success btn-block line_<?php echo __LINE__; ?>">
                                 <i class="fas fa-sign-in-alt"></i>
+                                <span class="menuLabel">
                                     <?php echo __("Login"); ?>
+                                </span>
                             </a>
                         </div>
                     </li>
@@ -236,27 +266,34 @@ global $avideoLayout;
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'admin/');
                                         return false;">
                                 <i class="fas fa-star"></i>
+                                <span class="menuLabel">
                                     <?php echo __("Admin Panel"); ?>
+                                </span>
                             </a>
                         </li>
                         <li>
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'users');
                                         return false;">
                                 <i class="fa-solid fa-user"></i>
+                                <span class="menuLabel">
                                     <?php echo __("Users"); ?>
+                                </span>
                             </a>
                         </li>
                         <li>
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'usersGroups');
                                         return false;">
                                 <span class="fa fa-users"></span>
+                                <span class="menuLabel">
                                     <?php echo __("Users Groups"); ?>
+                                </span>
                             </a>
                         </li>
                         <li>
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'categories');
                                         return false;">
                                 <i class="fa-solid fa-list"></i>
+                                <span class="menuLabel">
                                     <?php echo __($advancedCustom->CategoryLabel); ?>
                             </a>
                         </li>
@@ -264,17 +301,23 @@ global $avideoLayout;
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'update');
                                         return false;">
                                 <i class="fa-solid fa-arrows-rotate"></i>
+                                <span class="menuLabel">
                                     <?php echo __("Update version"); ?>
                                     <?php
                                     if (!empty($updateFiles)) {
-                                ?><span class="label label-danger"><?php echo count($updateFiles); ?></span><?php }
                                     ?>
+                                        <span class="label label-danger"><?php echo count($updateFiles); ?></span>
+                                    <?php
+                                    }
+                                    ?>
+                                </span>
                             </a>
                         </li>
                         <li>
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'siteConfigurations');
                                         return false;">
                                 <i class="fa-solid fa-gear"></i>
+                                <span class="menuLabel">
                                     <?php echo __("Site Configurations"); ?>
                             </a>
                         </li>
@@ -282,28 +325,34 @@ global $avideoLayout;
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'plugins');
                                         return false;">
                                 <i class="fas fa-puzzle-piece"></i>
+                                <span class="menuLabel">
                                     <?php echo __("Plugins"); ?>
-                            </a>
+                                </span>
-                        </li>
-                        <li>
-                            <a href="#" class="clearCacheFirstPageButton">
-                                <i class="fa fa-trash"></i> <?php echo __("Clear First Page Cache"); ?>
                             </a>
                         </li>
                         <li>
                             <a href="#" class="clearCacheButton">
-                                <i class="fa fa-trash"></i> <?php echo __("Clear Cache Directory"); ?>
+                                <i class="fa fa-trash"></i>
+                                <span class="menuLabel">
+                                    <?php echo __("Clear Cache Directory"); ?>
+                                </span>
                             </a>
                         </li>
                         <li>
                             <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'i/log');
                                         return false;" class="">
-                                <i class="fas fa-clipboard-list"></i> <?php echo __("Log file"); ?>
+                                <i class="fas fa-clipboard-list"></i>
+                                <span class="menuLabel">
+                                    <?php echo __("Log file"); ?>
+                                </span>
                             </a>
                         </li>
                         <li>
                             <a href="#" class="generateSiteMapButton">
-                                <i class="fa fa-sitemap"></i> <?php echo __("Generate Sitemap"); ?>
+                                <i class="fa fa-sitemap"></i>
+                                <span class="menuLabel">
+                                    <?php echo __("Generate Sitemap"); ?>
+                                </span>
                             </a>
                         </li>
                     </ul>
@@ -317,7 +366,9 @@ global $avideoLayout;
                                 <li>
                                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL+\'users\');return false;">
                                         <i class="fa-solid fa-user"></i>
+                                        <span class="menuLabel">
                                         <?php echo __("Users"); ?>
+                                        </span>
                                     </a>
                                 </li>
                                 <?php
@@ -328,7 +379,9 @@ global $avideoLayout;
                                 <li>
                                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL+\'usersGroups\');return false;">
                                         <span class="fa fa-users"></span>
+                                        <span class="menuLabel">
                                         <?php echo __("Users Groups"); ?>
+                                        </span>
                                     </a>
                                 </li>
                                 <?php
@@ -336,14 +389,12 @@ global $avideoLayout;
                 }
                 if (Permissions::canClearCache()) {
                     $menus[] = '?>
-                                <li>
-                                    <a href="#" class="clearCacheFirstPageButton">
-                                        <i class="fa fa-trash"></i> <?php echo __("Clear First Page Cache"); ?>
-                                    </a>
-                                </li>
                                 <li>
                                     <a href="#" class="clearCacheButton">
-                                        <i class="fa fa-trash"></i> <?php echo __("Clear Cache Directory"); ?>
+                                        <i class="fa fa-trash"></i> 
+                                        <span class="menuLabel">
+                                        <?php echo __("Clear Cache Directory"); ?>
+                                        </span>
                                     </a>
                                 </li>
                                 <?php
@@ -353,7 +404,10 @@ global $avideoLayout;
                     $menus[] = ' ?>
                                 <li>
                                     <a  href="#" onclick="avideoModalIframeFull(webSiteRootURL+\'i/log\');return false;" class="">
-                                        <i class="fas fa-clipboard-list"></i> <?php echo __("Log file"); ?>
+                                        <i class="fas fa-clipboard-list"></i> 
+                                        <span class="menuLabel">
+                                        <?php echo __("Log file"); ?>
+                                        </span>
                                     </a>
                                 </li>
                                 <?php
@@ -363,7 +417,10 @@ global $avideoLayout;
                     $menus[] = '?>
                                 <li>
                                     <a href="#" class="generateSiteMapButton">
-                                        <i class="fa fa-sitemap"></i> <?php echo __("Generate Sitemap"); ?>
+                                        <i class="fa fa-sitemap"></i> 
+                                        <span class="menuLabel">
+                                        <?php echo __("Generate Sitemap"); ?>
+                                        </span>
                                     </a>
                                 </li>
                                 <?php
@@ -393,19 +450,25 @@ global $avideoLayout;
                 <li class="nav-item <?php echo empty($_SESSION['type']) ? "active" : ""; ?>">
                     <a class="nav-link " href="<?php echo $global['webSiteRootURL']; ?>?type=all">
                         <i class="fa-solid fa-star"></i>
+                        <span class="menuLabel">
                             <?php echo __("Audio and Video"); ?>
+                        </span>
                     </a>
                 </li>
                 <li class="nav-item <?php echo (!empty($_SESSION['type']) && $_SESSION['type'] == 'video' && empty($_REQUEST['catName'])) ? "active" : ""; ?>">
                     <a class="nav-link " href="<?php echo $global['webSiteRootURL']; ?>videoOnly">
                         <i class="fa-solid fa-video"></i>
+                        <span class="menuLabel">
                             <?php echo __("Videos"); ?>
+                        </span>
                     </a>
                 </li>
                 <li class="nav-item <?php echo (!empty($_SESSION['type']) && $_SESSION['type'] == 'audio' && empty($_REQUEST['catName'])) ? "active" : ""; ?>">
                     <a class="nav-link" href="<?php echo $global['webSiteRootURL']; ?>audioOnly">
                         <i class="fa-solid fa-headphones"></i>
+                        <span class="menuLabel">
                             <?php echo __("Audio"); ?>
+                        </span>
                     </a>
                 </li>
             <?php }
@@ -425,7 +488,9 @@ global $avideoLayout;
                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'channels');
                                 return false;">
                         <i class="fa fa-search"></i>
+                        <span class="menuLabel">
                             <?php echo __("Browse Channels"); ?>
+                        </span>
                     </a>
                 </li>
 
@@ -442,7 +507,9 @@ global $avideoLayout;
                     <strong>
                         <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'listCategories');
                                     return false;" class="text-danger">
+                            <span class="menuLabel">
                                 <?php echo __($advancedCustom->CategoryLabel); ?>
+                            </span>
                         </a>
                     </strong>
                 </li>
@@ -515,7 +582,8 @@ global $avideoLayout;
                         //$parsed_cats[] = $value['id'];
                         echo '<li class="navsub-toggle ' . ($value['clean_name'] == @$_REQUEST['catName'] ? "active" : "") . '">'
                             . '<a href="' . Category::getCategoryLinkFromName($value['clean_name']) . '" >';
-                        echo '<span class="' . (empty($value['iconClass']) ? "fa fa-folder" : $value['iconClass']) . '"></span>  ' . __($value['name']);
+                        echo '<span class="' . (empty($value['iconClass']) ? "fa fa-folder" : $value['iconClass']) . '"></span>  
+                        <span class="menuLabel">' . __($value['name']) . '</span>';
                         if (empty($advancedCustom->hideCategoryVideosCount)) {
                             echo ' <span class="badge">' . $total . '</span>';
                         }
@@ -536,7 +604,10 @@ global $avideoLayout;
                 <li class="nav-item ">
                     <a class="nav-link " href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'listCategories');return false;">
                         <i class="fas fa-list"></i>
-                        <?php echo __($advancedCustom->CategoryLabel); ?></a>
+                        <span class="menuLabel">
+                            <?php echo __($advancedCustom->CategoryLabel); ?>
+                        </span>
+                    </a>
                 </li>
             <?php
             }
@@ -554,7 +625,9 @@ global $avideoLayout;
                     <a class="nav-link" href="#" onclick="A2HSInstall();
                                 return false;">
                         <i class="fas fa-arrow-alt-circle-down"></i>
+                        <span class="menuLabel">
                             <?php echo __("Install"); ?>
+                        </span>
                     </a>
                 </li>
             <?php
@@ -565,7 +638,9 @@ global $avideoLayout;
                     <a class="nav-link" href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'playLink');
                                 return false;">
                         <i class="fas fa-play-circle"></i>
+                        <span class="menuLabel">
                             <?php echo __("Play a Link"); ?>
+                        </span>
                     </a>
                 </li>
             <?php
@@ -576,7 +651,9 @@ global $avideoLayout;
                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'help');
                                 return false;">
                         <i class="fa-solid fa-circle-question"></i>
+                        <span class="menuLabel">
                             <?php echo __("Help"); ?>
+                        </span>
                     </a>
                 </li>
             <?php
@@ -588,7 +665,9 @@ global $avideoLayout;
                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'about');
                                 return false;">
                         <i class="fa-solid fa-circle-info"></i>
+                        <span class="menuLabel">
                             <?php echo __("About"); ?>
+                        </span>
                     </a>
                 </li>
             <?php
@@ -600,7 +679,9 @@ global $avideoLayout;
                     <a href="#" onclick="avideoModalIframeFull(webSiteRootURL + 'contact');
                                 return false;">
                         <i class="fa-solid fa-comment"></i>
+                        <span class="menuLabel">
                             <?php echo __("Contact"); ?>
+                        </span>
                     </a>
                 </li>
             <?php }
@@ -608,3 +689,22 @@ global $avideoLayout;
         </ul>
     </div>
 </div>
+<script>
+    $(document).ready(function() {
+        // Loop through each li in the sidebar that directly contains a .menuLabel
+        $('#sideBarContainer ul.nav li').has('.menuLabel').each(function() {
+            // Since the .menuLabel might not be a direct child, let's adjust the selector to find it correctly
+            var menuLabelText = $(this).find('.menuLabel').first().text().trim();
+
+            // Set the title attribute of the li to the menuLabel text
+            $(this).attr('title', menuLabelText);
+
+            // Initialize tooltip for this li
+            $(this).tooltip({
+                container: 'body',
+                html: true,
+                placement: 'right' // Adjust the placement as needed
+            });
+        });
+    });
+</script>

view/include/playlist.php

@@ -72,9 +72,12 @@ if (!empty($videoSerie)) {
                 if ($count == $playlist_index) {
                     $class .= " active";
                     $indicator = '<span class="fa fa-play text-danger"></span>';
-                } ?>
+                } 
+                
+                $plURL = PlayLists::getURL($playlist_id, $count, $value["channelName"], $playlist->getName(), $value['clean_title']);
+                ?>
                 <li class="<?php echo $class; ?>">
-                    <a href="<?php echo $global['webSiteRootURL']; ?>program/<?php echo $playlist_id; ?>/<?php echo $count . "/" . urlencode(cleanURLName(@$value["channelName"])) . "/" . urlencode(cleanURLName($playlist->getName())) . "/" . (@$value['clean_title']); ?>" title="<?php echo $value['title']; ?>" class="videoLink row">
+                    <a href="<?php echo $plURL; ?>" title="<?php echo str_replace('"', '', $value['title']); ?>" class="videoLink row">
                         <div class="col-md-1 col-sm-1 col-xs-1">
                             <?php echo $indicator; ?>
                         </div>

view/modeYoutube.php

@@ -190,7 +190,6 @@ if (!empty($evideo)) {
         }
         TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
     }
-
     $modeYouTubeTimeLog['Code part 2'] = microtime(true) - $modeYouTubeTime;
     $modeYouTubeTime = microtime(true);
     if (!empty($video) && !empty($video['users_id'])) {
@@ -286,9 +285,9 @@ if (!empty($evideo)) {
     }
     TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 }
-
+//_error_log('AVideoPlugin::getModeYouTube');
 AVideoPlugin::getModeYouTube($videos_id);
-
+//var_dump(__LINE__);exit;
 TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 
 // video not found
@@ -352,25 +351,16 @@ if (!empty($video['users_id']) && User::hasBlockedUser($video['users_id'])) {
 
 TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 global $nonCriticalCSS;
-?>
-<!DOCTYPE html>
-<html lang="<?php echo getLanguage(); ?>" prefix="og: http://ogp.me/ns#">
-    <head>
-        <title><?php echo $titleTag; ?></title>
-        <link href="<?php echo getURL('node_modules/video.js/dist/video-js.min.css'); ?>" rel="stylesheet" type="text/css"  />
-        <link href="<?php echo getCDN('plugin/Gallery/style.css'); ?>" rel="stylesheet" type="text/css"/>
-        <?php
-        TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
-        include $global['systemRootPath'] . 'view/include/head.php';
-        ?>
-    </head>
 
-    <body class="<?php echo $global['bodyClass']; ?>">
+$_page = new Page(array($titleTag));
+$_page->setExtraStyles(
+    array(
+        'node_modules/video.js/dist/video-js.min.css',
+        'plugin/Gallery/style.css'
+    )
+);
+?>
 <?php
-        TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
-        include $global['systemRootPath'] . 'view/include/navbar.php';
-
-        TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 if (!empty($advancedCustomUser->showChannelBannerOnModeYoutube)) {
 ?>
     <div class="container" style="margin-bottom: 10px;">
@@ -389,7 +379,6 @@ global $nonCriticalCSS;
 
         TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
         require "{$global['systemRootPath']}view/modeYoutubeBundle.php";
-
         TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
     } else {
     ?>
@@ -401,29 +390,23 @@ global $nonCriticalCSS;
             <i class="fa-solid fa-video"></i>
             <strong><?php echo __("Attention"); ?>!</strong> <?php echo empty($advancedCustom->videoNotFoundText->value) ? __("We have not found any videos or audios to show") : $advancedCustom->videoNotFoundText->value; ?>.
         </div>
-                <?php }
+    <?php 
+    }
     ?>
 </div>
 <?php
 include $global['systemRootPath'] . 'view/include/video.min.js.php';
 echo AVideoPlugin::afterVideoJS();
-        include $global['systemRootPath'] . 'view/include/footer.php';
 TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 ?>
-        <script src="<?php echo getURL('view/js/BootstrapMenu.min.js'); ?>node_modules/videojs-playlist/dist/videojs-playlist.min.js"></script>
 <script>
     var fading = false;
 </script>
-
 <?php
 showCloseButton();
 
 TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 ?>
-    </body>
-</html>
 <?php
-include $global['systemRootPath'] . 'objects/include_end.php';
+$_page->print();
-
-TimeLogEnd($timeLogNameMY, __LINE__, $TimeLogLimitMY);
 ?>