diff --git a/plugin/Gallery/style.css b/plugin/Gallery/style.css index efdd7d74ec..0f14ded9e2 100644 --- a/plugin/Gallery/style.css +++ b/plugin/Gallery/style.css @@ -101,3 +101,25 @@ h3.galleryTitle{ .fixPadding{ padding: 0 5px; } + + +.popover { + left: 5px !important; + color: inherit !important; +} +.popover-content { + height: 160px !important; +} +.popover-content, .popover-content>div{ + font-size: 1.3em !important; + white-space: normal !important; + width: auto; + color: inherit !important; +} +.popover-content>div{ + overflow-y: auto; + height: 140px; +} +.aligned-row{ + overflow: visible !important; +} \ No newline at end of file diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php index d05dbe7f59..58c1841f83 100644 --- a/plugin/Gallery/view/modeGallery.php +++ b/plugin/Gallery/view/modeGallery.php @@ -11,8 +11,6 @@ require_once '../videos/configuration.php'; require_once $global['systemRootPath'] . 'objects/user.php'; require_once $global['systemRootPath'] . 'objects/functions.php'; -$obj = YouPHPTubePlugin::getObjectData("Gallery"); - if (!empty($_GET['type'])) { if ($_GET['type'] == 'audio') { $_SESSION['type'] = 'audio'; @@ -56,37 +54,13 @@ $totalPages = ceil($total / $_POST['rowCount']); - - - -
+
getAdsense(); ?> @@ -99,12 +73,7 @@ $totalPages = ceil($total / $_POST['rowCount']); $name = User::getNameIdentificationById($video['users_id']); $img_portrait = ($video['rotation'] === "90" || $video['rotation'] === "270") ? "img-portrait" : ""; ?> - BigVideo) { ?> -

-
- - BigVideo) { ?>
@@ -131,7 +100,7 @@ $totalPages = ceil($total / $_POST['rowCount']);

-

+

@@ -169,129 +138,13 @@ $totalPages = ceil($total / $_POST['rowCount']);
- SortByName) { ?> - -
-

- -

-
-
'; - } - $countCols++; - ?> -
- - thumbsGif; - $poster = $images->thumbsJpg; - ?> -
- <?php echo $value['title']; ?> - - - - -
- -
- -

-
- -
-
- label === __("Group")) { - ?> - text; ?> - -
-
- - - - -
-
- - -
-
- - Description)){ - ?> -
">Description - -
- -
-
- - - - -
-
- - -
-
- - -
-
- - -
-
-
    -
-
-
- - - -

- +

Description)){ ?> -
">Description -
@@ -362,7 +212,7 @@ $totalPages = ceil($total / $_POST['rowCount']); ?>
- +
-
- -

- +

video/" title="">

- -
-
- label === __("Group")) { - ?> - text; ?> - -
-
- - - - -
-
- - -
-
- - Description)){ - ?> -
">Description - -
+
+
+ label === __("Group")) { + ?> + text; ?> +
@@ -590,13 +389,13 @@ $totalPages = ceil($total / $_POST['rowCount']); - +
-
+ +?> \ No newline at end of file diff --git a/view/js/script.js b/view/js/script.js index da7895ab7d..9d84c27bd2 100644 --- a/view/js/script.js +++ b/view/js/script.js @@ -56,8 +56,8 @@ $(document).ready(function () { $(".thumbsImage").on("mouseenter", function () { gifId = $(this).find(".thumbsGIF").attr('id'); id = gifId.replace('thumbsGIF',''); - //$(this).find(".thumbsGIF").height($(this).find(".aspectRatio16_9").height()); - //(this).find(".thumbsGIF").width($(this).find(".aspectRatio16_9").width()); + $(this).find(".thumbsGIF").height($(this).find(".thumbsJPG").height()); + $(this).find(".thumbsGIF").width($(this).find(".thumbsJPG").width()); /* try { @@ -251,8 +251,8 @@ function closeFloatVideo() { function mouseEffect(){ $(".thumbsImage").on("mouseenter", function () { - //$(this).find(".thumbsGIF").height($(this).find(".aspectRatio16_9").height()); - //$(this).find(".thumbsGIF").width($(this).find(".aspectRatio16_9").width()); + $(this).find(".thumbsGIF").height($(this).find(".thumbsJPG").height()); + $(this).find(".thumbsGIF").width($(this).find(".thumbsJPG").width()); $(this).find(".thumbsGIF").stop(true, true).fadeIn(); });