yetangitu/Oinktube
1
0
Fork 0
mirror of https://github.com/DanielnetoDotCom/YouPHPTube synced 2025-10-05 02:39:46 +02:00
Code Issues Releases Wiki Activity

Last menu bar layout improvement and download button review

Browse source
This commit is contained in:
daniel 2020-04-17 00:50:19 -03:00
parent bde347fff3
commit 91e86a454f
7 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugin/CustomizeAdvanced/menuRight.php
View file

@ -1,6 +1,6 @@
<li class="dropdown"> <li class="dropdown" data-toggle="tooltip" title="<?php echo __("R Rating"); ?>" data-placement="bottom">
<a href="#" class=" btn btn-default dropdown-toggle navbar-btn" data-toggle="dropdown"> <a href="#" class=" btn btn-default dropdown-toggle navbar-btn" data-toggle="dropdown">
<i class="fas fa-filter"></i><span class="hidden-sm hidden-md hidden-mdx"><?php echo __("R Rating"); ?></span> <i class="fas fa-filter"></i>
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">

2
plugin/Gallery/functions.php
View file

@ -270,7 +270,7 @@ function createGallerySection($videos, $crc = "", $get = array(), $ignoreAds=fal
$files = getVideosURL($value['filename']); $files = getVideosURL($value['filename']);
@$timesG[__LINE__] += microtime(true) - $startG; @$timesG[__LINE__] += microtime(true) - $startG;
$startG = microtime(true); $startG = microtime(true);
if (!(!empty($files['m3u8']) && empty($files['mp4']))) { if (!empty($files['mp4']) || !empty($files['mp3'])) {
?> ?>
<div style="position: relative; overflow: visible; z-index: 3;" class="dropup"> <div style="position: relative; overflow: visible; z-index: 3;" class="dropup">

2
plugin/Gallery/view/BigVideo.php
View file

@ -156,7 +156,7 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) {
$files = getVideosURL($videoRow['filename']); $files = getVideosURL($videoRow['filename']);
@$timesG[__LINE__] += microtime(true) - $startG; @$timesG[__LINE__] += microtime(true) - $startG;
$startG = microtime(true); $startG = microtime(true);
if (!(!empty($files['m3u8']) && empty($files['mp4']))) { if (!empty($files['mp4']) || !empty($files['mp3'])) {
?> ?>
<div style="position: relative; overflow: visible;"> <div style="position: relative; overflow: visible;">
<button type="button" class="btn btn-default btn-sm btn-xs" data-toggle="dropdown"> <button type="button" class="btn btn-default btn-sm btn-xs" data-toggle="dropdown">

4
plugin/YPTWallet/view/menuRight.php
View file

@ -9,9 +9,9 @@ $balance = $plugin->getBalance(User::getId());
<style> <style>
</style> </style>
<li> <li>
<div class="btn-group"> <div class="btn-group" data-toggle="tooltip" title="<?php echo __($obj->wallet_button_title); ?>" data-placement="bottom" >
<button type="button" class="btn btn-default dropdown-toggle navbar-btn pull-left" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle navbar-btn pull-left" data-toggle="dropdown">
<span class="hidden-md hidden-sm hidden-mdx"><?php echo $obj->wallet_button_title; ?></span> <span class="badge"><?php echo $obj->currency_symbol; ?> <span class="walletBalance"><?php echo number_format($balance, $obj->decimalPrecision); ?></span> <?php echo $obj->currency; ?></span></span> <span class="caret"></span> <span class="badge"><?php echo $obj->currency_symbol; ?> <span class="walletBalance"><?php echo number_format($balance, $obj->decimalPrecision); ?></span> <?php echo $obj->currency; ?></span></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<?php <?php

4
view/css/main.css
View file

@ -508,10 +508,6 @@ nav ul.items-container {
padding: 0px; padding: 0px;
} }
nav ul.items-container .tooltip{
min-width: 150px;
}
nav ul.items-container, nav ul.items-container,
nav ul.items-container li { nav ul.items-container li {
list-style: none; list-style: none;

31
view/include/navbar.php
View file

@ -151,11 +151,30 @@ if (!$includeDefaultNavBar) {
right: 0; right: 0;
top: 50px; top: 50px;
background-color: #FFF; background-color: #FFF;
padding: 4px;
width: 50%;
} }
#myNavbar ul.right-menus{ #myNavbar ul.right-menus{
display: block; display: block;
} }
#myNavbar ul.right-menus li{
margin: 0;
padding: 0;
}
#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;
}
.globalsearchfield { .globalsearchfield {
width: 90% !important; width: 90% !important;
} }
@ -198,7 +217,7 @@ if (((empty($advancedCustomUser->userMustBeLoggedIn) && empty($advancedCustom->d
<li> <li>
<ul class="left-side"> <ul class="left-side">
<li> <li>
<button class="btn btn-default navbar-btn pull-left" id="buttonMenu" ><span class="fa fa-bars"></span></button> <button class="btn btn-default navbar-btn pull-left" id="buttonMenu" data-toggle="tooltip" title="<?php echo __("Main Menu"); ?>" data-placement="bottom" ><span class="fa fa-bars"></span></button>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#buttonMenu').on("click.sidebar", function (event) { $('#buttonMenu').on("click.sidebar", function (event) {
@ -310,7 +329,7 @@ if (((empty($advancedCustomUser->userMustBeLoggedIn) && empty($advancedCustom->d
if (User::canUpload() && empty($advancedCustom->doNotShowUploadButton)) { if (User::canUpload() && empty($advancedCustom->doNotShowUploadButton)) {
?> ?>
<li> <li>
<div class="btn-group"> <div class="btn-group" data-toggle="tooltip" title="<?php echo __("Submit your videos"); ?>" data-placement="bottom" >
<button type="button" class="btn btn-default dropdown-toggle navbar-btn pull-left" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle navbar-btn pull-left" data-toggle="dropdown">
<i class="<?php echo isset($advancedCustom->uploadButtonDropdownIcon) ? $advancedCustom->uploadButtonDropdownIcon : "fas fa-video"; ?>"></i> <?php echo!empty($advancedCustom->uploadButtonDropdownText) ? $advancedCustom->uploadButtonDropdownText : ""; ?> <span class="caret"></span> <i class="<?php echo isset($advancedCustom->uploadButtonDropdownIcon) ? $advancedCustom->uploadButtonDropdownIcon : "fas fa-video"; ?>"></i> <?php echo!empty($advancedCustom->uploadButtonDropdownText) ? $advancedCustom->uploadButtonDropdownText : ""; ?> <span class="caret"></span>
</button> </button>
@ -434,7 +453,7 @@ if (((empty($advancedCustomUser->userMustBeLoggedIn) && empty($advancedCustom->d
min-width: 20px; min-width: 20px;
} }
</style> </style>
<div id="navBarFlag" data-input-name="country" data-selected-country="<?php echo $lang; ?>"></div> <div id="navBarFlag" data-input-name="country" data-selected-country="<?php echo $lang; ?>" data-toggle="tooltip" title="<?php echo __('Change Language'); ?>" data-placement="bottom"></div>
<script> <script>
$(function () { $(function () {
$("#navBarFlag").flagStrap({ $("#navBarFlag").flagStrap({
@ -506,7 +525,11 @@ if (((empty($advancedCustomUser->userMustBeLoggedIn) && empty($advancedCustom->d
<li class="rightProfile" > <li class="rightProfile" >
<div class="btn-group" > <div class="btn-group" >
<button type="button" class="btn btn-default dropdown-toggle navbar-btn pull-left" data-toggle="dropdown" id="rightProfileButton" style=""> <button type="button" class="btn btn-default dropdown-toggle navbar-btn pull-left" data-toggle="dropdown" id="rightProfileButton" style="">
<img src="<?php echo User::getPhoto(); ?>" style="width: 32px; height: 32px; max-width: 32px;" class="img img-responsive img-circle"/> <img src="<?php echo User::getPhoto(); ?>"
style="width: 32px; height: 32px; max-width: 32px;"
class="img img-responsive img-circle"
data-toggle="tooltip" data-html="true" title="<b><?php echo User::getName(); ?></b><br><small><?php echo User::getMail(); ?></small>" data-placement="left"
/>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" style=""> <ul class="dropdown-menu dropdown-menu-right" role="menu" style="">

4
view/js/script.js
View file

@ -171,6 +171,10 @@ $(document).ready(function () {
$('[data-toggle="popover"]').popover(); $('[data-toggle="popover"]').popover();
$('[data-toggle="tooltip"]').tooltip({container: 'body'}); $('[data-toggle="tooltip"]').tooltip({container: 'body'});
$('[data-toggle="tooltip"]').on('click', function () {
var t = this;
setTimeout(function(){$(t).tooltip('hide');}, 2000);
});
$(".thumbsImage").on("mouseenter", function () { $(".thumbsImage").on("mouseenter", function () {
gifId = $(this).find(".thumbsGIF").attr('id'); gifId = $(this).find(".thumbsGIF").attr('id');