From 9da26db73019c6050a626a0b2498fb1f65005ab8 Mon Sep 17 00:00:00 2001
From: daniel <daniel@daniel-DC1A-S>
Date: Sun, 18 Mar 2018 18:28:25 -0300
Subject: [PATCH 1/3] Fix bottom scroll bar

---
 plugin/Gallery/view/modeGallery.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php
index c3e90f189860..c23fe18278f8 100644
--- a/plugin/Gallery/view/modeGallery.php
+++ b/plugin/Gallery/view/modeGallery.php
@@ -60,12 +60,12 @@
         <?php
         include 'include/navbar.php';
         ?>
-        <div class="row text-center" style="padding: 10px;">
-            <?php
-            echo $config->getAdsense();
-            ?>
-        </div>
         <div class="container-fluid gallery" itemscope itemtype="http://schema.org/VideoObject">
+            <div class="row text-center" style="padding: 10px;">
+                <?php
+                echo $config->getAdsense();
+                ?>
+            </div>
             <div class="col-xs-12 col-sm-1 col-md-1 col-lg-1"></div>
             <div class="col-xs-12 col-sm-10 col-md-10 col-lg-10 list-group-item">
                 <?php

From 78021b24bdaeab749f9679afd7b04161c465ce49 Mon Sep 17 00:00:00 2001
From: Vinzenz Hersche <hersche@openmailbox.org>
Date: Mon, 19 Mar 2018 16:58:18 +0100
Subject: [PATCH 2/3] - html-fail fixed - make nr of videos variable

---
 plugin/Gallery/Gallery.php          |   4 +
 plugin/Gallery/view/modeGallery.php | 119 ++++++++++++----------------
 2 files changed, 56 insertions(+), 67 deletions(-)

diff --git a/plugin/Gallery/Gallery.php b/plugin/Gallery/Gallery.php
index a30862055c37..ea87b1e85992 100644
--- a/plugin/Gallery/Gallery.php
+++ b/plugin/Gallery/Gallery.php
@@ -28,10 +28,14 @@ public function getEmptyDataObject() {
         $obj = new stdClass();
         $obj->Description = false;
         $obj->SortByName = false;
+        $obj->SortByNameRowCount = 12;
         $obj->BigVideo = true;
         $obj->MostPopular = true;
+        $obj->MostPopularRowCount = 12;
         $obj->MostWatched = true;
+        $obj->MostWatchedRowCount = 12;
         $obj->DateAdded = true;
+        $obj->DateAddedRowCount = 12;
         return $obj;
     }
     
diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php
index 811b6dfcec2c..ba830c548385 100644
--- a/plugin/Gallery/view/modeGallery.php
+++ b/plugin/Gallery/view/modeGallery.php
@@ -203,7 +203,7 @@
                             unset($_POST['sort']);
                             $_POST['sort']['title'] = "ASC";
                             $_POST['current'] = $_GET['page'];
-                            $_POST['rowCount'] = 12;
+                            $_POST['rowCount'] = $obj->SortByNameRowCount;
                             $videos = Video::getAllVideos();
                             foreach ($videos as $value) {
                                 $name = User::getNameIdentificationById($value['users_id']);
@@ -295,6 +295,7 @@
                                 $countCols = 0;
                                 unset($_POST['sort']);
                                 $_POST['sort']['created'] = 'desc';
+                                $_POST['rowCount'] = $obj->DateAddedRowCount;
                                 $videos = Video::getAllVideos();
                                 foreach ($videos as $value) {
                                     $img_portrait = ($value['rotation'] === "90" || $value['rotation'] === "270") ? "img-portrait" : "";
@@ -378,15 +379,15 @@
                     <?php } if($obj->MostWatched) { ?>
                     <div class="clear clearfix">
                         <h3 class="galleryTitle">
-                            <i class="glyphicon glyphicon-eye-open"></i> <?php echo __("Most Watched"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
+                            <i class="glyphicon glyphicon-eye-open"></i> <?php echo __("Most watched"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
                         </h3>
                         <div class="row">
                             <?php
                             $countCols = 0;
                             unset($_POST['sort']);
-                            $_POST['sort']['views_count'] = "DESC";
+                            $_POST['sort']['views_count'] = "desc";
                             $_POST['current'] = $_GET['page'];
-                            $_POST['rowCount'] = 12;
+                            $_POST['rowCount'] = $obj->MostWatchedRowCount;
                             $videos = Video::getAllVideos();
                             foreach ($videos as $value) {
                                 $name = User::getNameIdentificationById($value['users_id']);
@@ -417,42 +418,42 @@
                                     <a href="<?php echo $global['webSiteRootURL']; ?>video/<?php echo $value['clean_title']; ?>" title="<?php echo $value['title']; ?>">
                                         <h2><?php echo $value['title']; ?></h2>
                                     </a>
-
-
-                                    <div class="text-muted galeryDetails">
-                                        <div>
-                                            <?php
-                                            $value['tags'] = Video::getTags($value['id']);
-                                            foreach ($value['tags'] as $value2) {
-                                                if ($value2->label === __("Group")) {
-                                                    ?>
-                                                    <span class="label label-<?php echo $value2->type; ?>"><?php echo $value2->text; ?></span>
-                <?php
-            }
-        }
-        ?>
-                                        </div>
-                                        <div>
-                                            <i class="fa fa-eye"></i>
-                                            <span itemprop="interactionCount">
-                                            <?php echo number_format($value['views_count'], 0); ?> <?php echo __("Views"); ?>
-                                            </span>
-                                        </div>
-                                        <div>
-                                            <i class="fa fa-clock-o"></i>
-                                            <?php
-                                            echo humanTiming(strtotime($value['videoCreation'])), " ", __('ago');
-                                            ?>
-                                        </div>
-                                        <div>
-                                            <i class="fa fa-user"></i>
-                                <?php
-                                echo $name;
-                                if((!empty($value['description']))&&($obj->Description)){
+                                     
+                                        <div class="text-muted galeryDetails">
+                                            <div>
+                                                <?php
+                                                $value['tags'] = Video::getTags($value['id']);
+                                                foreach ($value['tags'] as $value2) {
+                                                    if ($value2->label === __("Group")) {
+                                                        ?>
+                                                        <span class="label label-<?php echo $value2->type; ?>"><?php echo $value2->text; ?></span>
+                                                        <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </div>
+                                            <div>
+                                                <i class="fa fa-eye"></i>
+                                                <span itemprop="interactionCount">
+                                                    <?php echo number_format($value['views_count'], 0); ?> <?php echo __("Views"); ?>
+                                                </span>
+                                            </div>
+                                            <div>
+                                                <i class="fa fa-clock-o"></i>
+                                                <?php
+                                                echo humanTiming(strtotime($value['videoCreation'])), " ", __('ago');
+                                                ?>
+                                            </div>
+                                            <div class="userName">
+                                                <i class="fa fa-user"></i>
+                                                <?php
+                                                echo $name;
+                                                if((!empty($value['description']))&&($obj->Description)){
                                                 ?>
                                                 <button type="button" class="btn btn-xs" data-trigger="focus" data-toggle="popover" data-placement="top" data-html="true" title="<?php echo $value['title']; ?>" data-content="<div><?php echo str_replace('"','&quot;',nl2br(textToLink($value['description'])));  ?></div>">Description</button>
                                                 <?php } ?>
-                                ?>
+                                            </div>
+                
                                         </div>
                                     </div>
                                 
@@ -460,22 +461,23 @@
     }
     ?>
                         </div>
-
-                    </div>                        <div class="row">
+                        <div class="row">
                             <ul class="pages">
                             </ul>
-                        </div></div>
+                        </div>
+                    </div>
                     <?php } if($obj->MostPopular) { ?>    
                     <div class="clear clearfix">
                         <h3 class="galleryTitle">
-                            <i class="glyphicon glyphicon-thumbs-up"></i> <?php echo __("Most Popular"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
+                            <i class="glyphicon glyphicon-eye-open"></i> <?php echo __("Most popular"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
                         </h3>
                         <div class="row">
                             <?php
                             $countCols = 0;
                             unset($_POST['sort']);
-                            $_POST['sort']['likes'] = "DESC";
+                            $_POST['sort']['likes'] = "desc";
                             $_POST['current'] = $_GET['page'];
+                            $_POST['rowCount'] = $obj->MostPopularRowCount;
                             $videos = Video::getAllVideos();
                             foreach ($videos as $value) {
                                 $name = User::getNameIdentificationById($value['users_id']);
@@ -493,7 +495,7 @@
         $poster = $images->thumbsJpg;
         ?>
                                         <div class="aspectRatio16_9">
-                                            <img src="<?php echo $poster; ?>" alt="<?php echo $value['title']; ?>" class="thumbsJPG img img-responsive <?php echo $img_portrait; ?>  rotate<?php echo $value['rotation']; ?>" id="thumbsJPG<?php echo $value['id']; ?>"/>
+                                            <img src="<?php echo $poster; ?>" alt="<?php echo $value['title']; ?>" class="thumbsJPG img img-responsive <?php echo $img_portrait; ?>  rotate<?php echo $value['rotation']; ?>" id="thumbsJPG<?php echo $value['id']; ?>" />
 
         <?php
         if (!empty($imgGif)) {
@@ -541,36 +543,19 @@
                                                 <button type="button" class="btn btn-xs" data-trigger="focus" data-toggle="popover" data-placement="top" data-html="true" title="<?php echo $value['title']; ?>" data-content="<div><?php echo str_replace('"','&quot;',nl2br(textToLink($value['description'])));  ?></div>">Description</button>
                                                 <?php } ?>
                                             </div>
-
-                                        </div>
-                                        <div>
-                                            <i class="fa fa-eye"></i>
-                                            <span itemprop="interactionCount">
-                                            <?php echo number_format($value['views_count'], 0); ?> <?php echo __("Views"); ?>
-                                            </span>
-                                        </div>
-                                        <div>
-                                            <i class="fa fa-clock-o"></i>
-                                            <?php
-                                            echo humanTiming(strtotime($value['videoCreation'])), " ", __('ago');
-                                            ?>
-                                        </div>
-                                        <div>
-                                            <i class="fa fa-user"></i>
-                                <?php
-                                echo $name;
-                                ?>
+                
                                         </div>
                                     </div>
-                                </div>
-                        <?php
-                    }
-                    ?>
-                        </div>                        
+                                
+        <?php
+    }
+    ?>
+                        </div>
                         <div class="row">
                             <ul class="pages">
                             </ul>
                         </div>
+                    </div>
                         <?php } ?>
                     </div>
                     <?php

From 015a9ca3179ca2655e7fa5615c17771fe0b11bea Mon Sep 17 00:00:00 2001
From: Vinzenz Hersche <hersche@openmailbox.org>
Date: Mon, 19 Mar 2018 17:11:54 +0100
Subject: [PATCH 3/3] fix glyphicons

---
 plugin/Gallery/view/modeGallery.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/Gallery/view/modeGallery.php b/plugin/Gallery/view/modeGallery.php
index ba830c548385..b2993d198cdc 100644
--- a/plugin/Gallery/view/modeGallery.php
+++ b/plugin/Gallery/view/modeGallery.php
@@ -195,7 +195,7 @@
                         
                     <div class="clear clearfix">
                         <h3 class="galleryTitle">
-                            <i class="glyphicon glyphicon-eye-open"></i> <?php echo __("Sort by name"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
+                            <i class="glyphicon glyphicon-list-alt"></i> <?php echo __("Sort by name"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
                         </h3>
                         <div class="row">
                             <?php
@@ -469,7 +469,7 @@
                     <?php } if($obj->MostPopular) { ?>    
                     <div class="clear clearfix">
                         <h3 class="galleryTitle">
-                            <i class="glyphicon glyphicon-eye-open"></i> <?php echo __("Most popular"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
+                            <i class="glyphicon glyphicon-thumbs-up"></i> <?php echo __("Most popular"); if(!empty($_GET['page'])){ echo " (Page ".$_GET['page'].")"; } ?>
                         </h3>
                         <div class="row">
                             <?php