diff --git a/plugin/CustomizeUser/CustomizeUser.php b/plugin/CustomizeUser/CustomizeUser.php index bf6e71746b..c175c06f28 100644 --- a/plugin/CustomizeUser/CustomizeUser.php +++ b/plugin/CustomizeUser/CustomizeUser.php @@ -1,6 +1,9 @@ userCanNotChangeUserGroup = false; $o = new stdClass(); - $o->type = array(0=>_("Default"))+UserGroups::getAllUsersGroupsArray(); + $o->type = array(0=>__("Default"))+UserGroups::getAllUsersGroupsArray(); $o->value = 0; $obj->userDefaultUserGroup = $o; $obj->userMustBeLoggedIn = !isset($advancedCustom->userMustBeLoggedIn) ? false : $advancedCustom->userMustBeLoggedIn; @@ -66,6 +69,7 @@ class CustomizeUser extends PluginAbstract { $obj->showChannelHomeTab = true; $obj->showChannelVideosTab = true; $obj->showChannelProgramsTab = true; + $obj->showBigVideoOnChannelVideosTab = true; $obj->encryptPasswordsWithSalt = !isset($advancedCustom->encryptPasswordsWithSalt) ? false : $advancedCustom->encryptPasswordsWithSalt; $obj->requestCaptchaAfterLoginsAttempts = !isset($advancedCustom->requestCaptchaAfterLoginsAttempts) ? 0 : $advancedCustom->requestCaptchaAfterLoginsAttempts; $obj->disableSignOutButton = false; diff --git a/plugin/YouPHPFlix2/view/BigVideo.php b/plugin/YouPHPFlix2/view/BigVideo.php index 026f6399a6..0cb90effa2 100644 --- a/plugin/YouPHPFlix2/view/BigVideo.php +++ b/plugin/YouPHPFlix2/view/BigVideo.php @@ -24,16 +24,14 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) { } $_GET = $get; ?> -
BigVideo && empty($_GET['showOnly'])) {
-
RemoveBigVideoDescription)) { - $colClass = "col-md-4 col-sm-4 col-xs-6"; + $colClass = "col-md-4 col-sm-6 col-xs-6"; } if (empty($obj->landscapePosters) && !empty($images->posterPortrait)) { ?> @@ -128,7 +126,7 @@ if ($obj->BigVideo && empty($_GET['showOnly'])) {
- <?php echo $video['title']; ?> + <?php echo $video['title']; ?> thumbsGif)) { ?> diff --git a/plugin/YouPHPFlix2/view/css/style.css b/plugin/YouPHPFlix2/view/css/style.css index 0b6b40d7ff..3ceb56b447 100644 --- a/plugin/YouPHPFlix2/view/css/style.css +++ b/plugin/YouPHPFlix2/view/css/style.css @@ -286,7 +286,7 @@ footer .btn-outline { height: 210px; } #bigVideo .posterPortrait { - height: 30vh; + height: auto; } #bigVideo .mainInfoText{ max-height: 29vh; @@ -323,6 +323,9 @@ footer .btn-outline { #carouselRows h2{ position: relative; } +#carouselRows{ + margin-top: -20%; +} body.fullscreen{ margin: 0; @@ -350,11 +353,6 @@ body.fullscreen{ overflow: hidden; height: 450px !important; } - #bigVideo .posterPortrait { - height: 20vh; - min-height: 193px; - min-width: 135px !important; - } } .paidOnlyLabel{ position: absolute; diff --git a/plugin/YouPHPFlix2/view/modeFlixFooter.php b/plugin/YouPHPFlix2/view/modeFlixFooter.php index bacba9244b..990295d9ac 100644 --- a/plugin/YouPHPFlix2/view/modeFlixFooter.php +++ b/plugin/YouPHPFlix2/view/modeFlixFooter.php @@ -17,5 +17,6 @@ TimeLogEnd($timeLog, __LINE__); ?>
+ \ No newline at end of file diff --git a/plugin/YouPHPFlix2/view/modeFlixHead.php b/plugin/YouPHPFlix2/view/modeFlixHead.php index 8ad5101bf9..db35ef2774 100644 --- a/plugin/YouPHPFlix2/view/modeFlixHead.php +++ b/plugin/YouPHPFlix2/view/modeFlixHead.php @@ -1,3 +1,2 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/view/channelBody.php b/view/channelBody.php index 86005012b9..cec99e2c85 100644 --- a/view/channelBody.php +++ b/view/channelBody.php @@ -98,7 +98,7 @@ TimeLogEnd($timeLog, __LINE__); } if ($advancedCustomUser->showChannelProgramsTab && !empty($palyListsObj)) { ?> -
  • +
    • + -
    - - - - - $(function () { - $('.removeVideo').click(function () { - currentObject = this; + $('.removeVideo').click(function () { + currentObject = this; + swal({ + title: "", + text: "", + icon: "warning", + buttons: true, + dangerMode: true, + }) + .then((willDelete) = > { + if (willDelete) { - swal({ - title: "", - text: "", - icon: "warning", - buttons: true, - dangerMode: true, - }) - .then((willDelete) => { - if (willDelete) { - - modal.showPleaseWait(); - var playlist_id = $(currentObject).attr('playlist_id'); - var video_id = $(currentObject).attr('video_id'); - $.ajax({ - url: 'objects/playlistRemoveVideo.php', - data: { - "playlist_id": playlist_id, - "video_id": video_id - }, - type: 'post', - success: function (response) { - reloadPlayLists(); - $(".playListsIds" + video_id).prop("checked", false); - $(currentObject).closest('.galleryVideo').fadeOut(); - modal.hidePleaseWait(); - } - }); - } - }); - }); - - $('.deletePlaylist').click(function () { - currentObject = this; - - swal({ - title: "", - text: "", - icon: "warning", - buttons: true, - dangerMode: true, - }) - .then((willDelete) => { - if (willDelete) { - - modal.showPleaseWait(); - var playlist_id = $(currentObject).attr('playlist_id'); - console.log(playlist_id); - $.ajax({ - url: 'objects/playlistRemove.php', - data: { - "playlist_id": playlist_id - }, - type: 'post', - success: function (response) { - $(currentObject).closest('.panel').slideUp(); - modal.hidePleaseWait(); - } - }); - } - }); - - }); - - $('.statusPlaylist').click(function () { - var playlist_id = $(this).attr('playlist_id'); - var status = "public"; - if ($('#statusPrivate' + playlist_id).is(":visible")) { - status = "public"; - $('.statusPlaylist' + playlist_id + ' span').hide(); - $('#statusPublic' + playlist_id).fadeIn(); - } else if ($('#statusPublic' + playlist_id).is(":visible")) { - status = "unlisted"; - $('.statusPlaylist' + playlist_id + ' span').hide(); - $('#statusUnlisted' + playlist_id).fadeIn(); - } else if ($('#statusUnlisted' + playlist_id).is(":visible")) { - status = "private"; - $('.statusPlaylist' + playlist_id + ' span').hide(); - $('#statusPrivate' + playlist_id).fadeIn(); - } modal.showPleaseWait(); - console.log(playlist_id); + var playlist_id = $(currentObject).attr('playlist_id'); + var video_id = $(currentObject).attr('video_id'); $.ajax({ - url: 'objects/playlistStatus.php', - data: { - "playlist_id": playlist_id, - "status": status - }, - type: 'post', - success: function (response) { - - modal.hidePleaseWait(); - } - }); - - }); - - $('.renamePlaylist').click(function () { - currentObject = this; - swal({ - title: "!", - text: "", - content: "input", - showCancelButton: true, - closeOnConfirm: true, - inputPlaceholder: "" - }).then(inputValue => { - - if (!inputValue || inputValue === false || inputValue === "") - return false; - - modal.showPleaseWait(); - var playlist_id = $(currentObject).attr('playlist_id'); - console.log(playlist_id); - $.ajax({ - url: 'objects/playlistRename.php', + url: 'objects/playlistRemoveVideo.php', data: { - "playlist_id": playlist_id, - "name": inputValue + "playlist_id": playlist_id, + "video_id": video_id }, type: 'post', success: function (response) { - $(currentObject).closest('.panel').find('.playlistName').text(inputValue); - modal.hidePleaseWait(); + reloadPlayLists(); + $(".playListsIds" + video_id).prop("checked", false); + $(currentObject).closest('.galleryVideo').fadeOut(); + modal.hidePleaseWait(); } - }); - return false; }); - - }); - - $('.sortNow').click(function () { - var $val = $(this).siblings("input").val(); - sortNow(this, $val); - }); - - $('.video_order').keypress(function (e) { - if (e.which == 13) { - sortNow(this, $(this).val()); } - }); + }); + }); + $('.deletePlaylist').click(function () { + currentObject = this; + swal({ + title: "", + text: "", + icon: "warning", + buttons: true, + dangerMode: true, + }) + .then((willDelete) = > { + if (willDelete) { + modal.showPleaseWait(); + var playlist_id = $(currentObject).attr('playlist_id'); + console.log(playlist_id); + $.ajax({ + url: 'objects/playlistRemove.php', + data: { + "playlist_id": playlist_id + }, + type: 'post', + success: function (response) { + $(currentObject).closest('.panel').slideUp(); + modal.hidePleaseWait(); + } + }); + } + }); + }); + $('.statusPlaylist').click(function () { + var playlist_id = $(this).attr('playlist_id'); + var status = "public"; + if ($('#statusPrivate' + playlist_id).is(":visible")) { + status = "public"; + $('.statusPlaylist' + playlist_id + ' span').hide(); + $('#statusPublic' + playlist_id).fadeIn(); + } else if ($('#statusPublic' + playlist_id).is(":visible")) { + status = "unlisted"; + $('.statusPlaylist' + playlist_id + ' span').hide(); + $('#statusUnlisted' + playlist_id).fadeIn(); + } else if ($('#statusUnlisted' + playlist_id).is(":visible")) { + status = "private"; + $('.statusPlaylist' + playlist_id + ' span').hide(); + $('#statusPrivate' + playlist_id).fadeIn(); + } + modal.showPleaseWait(); + console.log(playlist_id); + $.ajax({ + url: 'objects/playlistStatus.php', + data: { + "playlist_id": playlist_id, + "status": status + }, + type: 'post', + success: function (response) { + + modal.hidePleaseWait(); + } + }); + }); + $('.renamePlaylist').click(function () { + currentObject = this; + swal({ + title: "!", + text: "", + content: "input", + showCancelButton: true, + closeOnConfirm: true, + inputPlaceholder: "" + }).then(inputValue = > { + + if (!inputValue || inputValue === false || inputValue === "") + return false; + modal.showPleaseWait(); + var playlist_id = $(currentObject).attr('playlist_id'); + console.log(playlist_id); + $.ajax({ + url: 'objects/playlistRename.php', + data: { + "playlist_id": playlist_id, + "name": inputValue + }, + type: 'post', + success: function (response) { + $(currentObject).closest('.panel').find('.playlistName').text(inputValue); + modal.hidePleaseWait(); + } + }); + return false; + }); + }); + $('.sortNow').click(function () { + var $val = $(this).siblings("input").val(); + sortNow(this, $val); + }); + $('.video_order').keypress(function (e) { + if (e.which == 13) { + sortNow(this, $(this).val()); + } + }); });