From 268a9190f04f213a6face85a2310c863a11a874c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Sun, 24 Nov 2019 16:32:34 +0100
Subject: [PATCH] Add icon, fix pagination, fix video preview

---
 config/services.yaml                          | 12 +++---
 .../Controller/ResourceController.php         | 17 ++++++++-
 .../views/Resource/grid_theme.html.twig       | 38 ++++++++++---------
 .../Resources/views/Resource/index.html.twig  | 36 ++++++++++--------
 4 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/config/services.yaml b/config/services.yaml
index 3ae024d8e3..0996c37dcb 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -156,12 +156,12 @@ apy_data_grid:
 #    actions_columns_size: -1
 #    actions_columns_title: "Actions"
 #    actions_columns_separator: "<br />"
-#    pagerfanta:
-#        enable: false
-#        view_class: "Pagerfanta\View\DefaultView"
-#        options:
-#            prev_message: "«"
-#            next_message: "»"
+    pagerfanta:
+        enable: true
+        view_class: 'Pagerfanta\View\TwitterBootstrap4View'
+        options:
+            prev_message: "«"
+            next_message: "»"
 
 # Course settings
 chamilo_course:
diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php
index bef611d257..b24902acee 100644
--- a/src/CoreBundle/Controller/ResourceController.php
+++ b/src/CoreBundle/Controller/ResourceController.php
@@ -121,6 +121,19 @@ class ResourceController extends AbstractResourceController implements CourseCon
         $source->initQueryBuilder($qb);
         $grid->setSource($source);
 
+        $grid->setRouteUrl(
+            $this->generateUrl(
+                'chamilo_core_resource_list',
+                [
+                    'tool' => $tool,
+                    'type' => $type,
+                    'cidReq' => $this->getCourse()->getCode(),
+                    'id_session' => $this->getSessionId(),
+                    'id' => $request->get('id'),
+                ]
+            )
+        );
+
         $title = $grid->getColumn('title');
         $title->setSafe(false);
 
@@ -180,7 +193,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
                         );
 
                         return '
-                        <video width="640" height="320" controls id="video'.$id.'" style="display:none;">
+                        <video width="640" height="320" controls id="video'.$id.'" controls preload="metadata" style="display:none;">
                             <source src="'.$url.'" type="video/mp4">
                             Your browser doesn\'t support HTML5 video tag.
                         </video>
@@ -232,7 +245,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
             'chamilo_core_resource_show',
             false,
             '_self',
-            ['class' => 'btn btn-secondary']
+            ['class' => 'btn btn-secondary', 'icon' => 'fa-info-circle']
         );
 
         $setNodeParameters = function (RowAction $action, Row $row) use ($routeParams) {
diff --git a/src/ThemeBundle/Resources/views/Resource/grid_theme.html.twig b/src/ThemeBundle/Resources/views/Resource/grid_theme.html.twig
index 2516e81804..776c15ee28 100644
--- a/src/ThemeBundle/Resources/views/Resource/grid_theme.html.twig
+++ b/src/ThemeBundle/Resources/views/Resource/grid_theme.html.twig
@@ -63,7 +63,11 @@
           target="{{ action.target }}" {% if action.confirm %} onclick="return confirm('{{ action.confirmMessage }}')"{% endif %}
           {% for name, value in action.attributes %} {{ name }}="{{ value }}" {% endfor %}
         >
-          {{ action.title|trans }}
+          {% if action.attributes.icon is defined and action.attributes.icon %}
+              <i class="fas {{ action.attributes.icon }} "></i>
+          {% else %}
+              {{ action.title|trans }}
+          {% endif %}
         </a>
       {% endif %}
     {% endfor %}
@@ -168,21 +172,21 @@
 
 
 {# ---------------------------------------------------- grid_pager_selectpage -------------------------------------------------- #}
-{% block grid_pager_selectpage %}
-  {{ 'Page'|trans }}
-  {% spaceless %}
-    <input type="button" class="btn btn-secondary prev" {% if grid.page <= 0 %}disabled="disabled"{% endif %} value="<" onclick="return {{ grid.hash }}_previousPage();"/>
-    <input type="text" class="current" value="{{ grid.page + 1 }}" size="2" onkeypress="return {{ grid.hash }}_enterPage(event, parseInt(this.value)-1);"/>
-    <input type="button" value=">" class="btn btn-secondary next" {% if grid.page >= grid.pageCount-1 %}disabled="disabled"{% endif %} onclick="return {{ grid.hash }}_nextPage();"/> {{ 'of %count%'|trans({ '%count%' : grid.pageCount }) }}
-  {% endspaceless %}
-{% endblock grid_pager_selectpage %}
+{#{% block grid_pager_selectpage %}#}
+{#  {{ 'Page'|trans }}#}
+{#  {% spaceless %}#}
+{#    <input type="button" class="btn btn-secondary prev" {% if grid.page <= 0 %}disabled="disabled"{% endif %} value="<" onclick="return {{ grid.hash }}_previousPage();"/>#}
+{#    <input type="text" class="form-control current" value="{{ grid.page + 1 }}" size="2" onkeypress="return {{ grid.hash }}_enterPage(event, parseInt(this.value)-1);"/>#}
+{#    <input type="button" value=">" class="btn btn-secondary next" {% if grid.page >= grid.pageCount-1 %}disabled="disabled"{% endif %} onclick="return {{ grid.hash }}_nextPage();"/> {{ 'of %count%'|trans({ '%count%' : grid.pageCount }) }}#}
+{#  {% endspaceless %}#}
+{#{% endblock grid_pager_selectpage %}#}
 {# ---------------------------------------------------- grid_pager_results_perpage -------------------------------------------------- #}
-{% block grid_pager_results_perpage %}
-  {{ ', Display'|trans }}
-  <select onchange="return {{ grid.hash }}_resultsPerPage(this.value);">
-    {% for key, value in grid.limits %}
-      <option value="{{ key }}"{% if (key == grid.limit) %} selected="selected"{% endif %}>{{ value }}</option>
-    {% endfor %}
-  </select> {{ 'Items per page'|trans }}
-{% endblock grid_pager_results_perpage %}
+{#{% block grid_pager_results_perpage %}#}
+{#  {{ ', Display'|trans }}#}
+{#  <select onchange="return {{ grid.hash }}_resultsPerPage(this.value);">#}
+{#    {% for key, value in grid.limits %}#}
+{#      <option value="{{ key }}"{% if (key == grid.limit) %} selected="selected"{% endif %}>{{ value }}</option>#}
+{#    {% endfor %}#}
+{#  </select> {{ 'Items per page'|trans }}#}
+{#{% endblock grid_pager_results_perpage %}#}
 
diff --git a/src/ThemeBundle/Resources/views/Resource/index.html.twig b/src/ThemeBundle/Resources/views/Resource/index.html.twig
index 135ccaf4cd..c10939c8dc 100644
--- a/src/ThemeBundle/Resources/views/Resource/index.html.twig
+++ b/src/ThemeBundle/Resources/views/Resource/index.html.twig
@@ -17,22 +17,26 @@
       </a>
     </div>
   {% endif %}
-  <script>
-    $(function () {
-      $('[data-fancybox="gallery"]').fancybox({
-        toolbar: "true",
-        buttons: [
-          "zoom",
-          //"share",
-          "slideShow",
-          //"fullScreen",
-          "download",
-          "thumbs",
-          "close"
-        ],
-      });
-    });
-  </script>
+
+    <script>
+        $(function () {
+            $('[data-fancybox="gallery"]').fancybox({
+                toolbar: "true",
+                buttons: [
+                    "zoom",
+                    //"share",
+                    "slideShow",
+                    //"fullScreen",
+                    "download",
+                    "thumbs",
+                    "close"
+                ],
+                video: {
+                    autoStart: false
+                }
+            });
+        });
+    </script>
 
   {% include '@ChamiloTheme/Resource/grid.html.twig' %}
 {% endblock %}