From 967224202386fe61dfb678de34b3bc4021ce605c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 18 Apr 2019 14:49:44 +0200 Subject: [PATCH] Update from 1.11.x --- main/lp/lp_controller.php | 2 +- main/messages/outbox.php | 1 + .../views/LearnPath/scorm_list.html.twig | 178 ++++---- .../Resources/views/LearnPath/view.html.twig | 403 +++++++++++------- 4 files changed, 329 insertions(+), 255 deletions(-) diff --git a/main/lp/lp_controller.php b/main/lp/lp_controller.php index 204462fc6b..446415a241 100755 --- a/main/lp/lp_controller.php +++ b/main/lp/lp_controller.php @@ -88,7 +88,7 @@ $htmlHeadXtra[] = ' connectWith: "#lp_item_list", placeholder: "ui-state-highlight", //defines the yellow highlight start: function(event, ui) { - $(ui.item).css("width", "160px"); + $(ui.item).css("width", "350px"); $(ui.item).find(".item_data").attr("style", ""); }, stop: function(event, ui) { diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 90b3eeac4f..af07c9ca8c 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -66,6 +66,7 @@ if (isset($_REQUEST['action'])) { $keyword = ''; $social_right_content = ''; if ($allowSocial) { + // Block Social Menu $social_menu_block = SocialManager::show_social_menu('messages'); $actionsLeft = ''. Display::return_icon('back.png', get_lang('Back'), [], 32).''; diff --git a/src/ThemeBundle/Resources/views/LearnPath/scorm_list.html.twig b/src/ThemeBundle/Resources/views/LearnPath/scorm_list.html.twig index 14d16d8a43..6e28eac9f4 100644 --- a/src/ThemeBundle/Resources/views/LearnPath/scorm_list.html.twig +++ b/src/ThemeBundle/Resources/views/LearnPath/scorm_list.html.twig @@ -1,101 +1,99 @@ {% autoescape false %} -{% if data_list is not empty %} -
-
-

{{ lp_title_scorm }}

-
-
-
- {% for item in data_list %} -
- {% if item.type == 'dir' %} -
- {{ item.title }} -
- {% else %} -
- - - {{ item.title }} - -
- {% endif %} -
- {% endfor %} + {% if data_list is not empty %} +
+
+

{{ lp_title_scorm }}

-
-
-{% endif %} -{% if data_panel is not empty %} -
-
-

- {{ lp_title_scorm }} -

-
-
- {% if data_panel.not_parents %} -
+ {% else %} +
+ + + {{ item.title }} + +
+ {% endif %} +
{% endfor %} - - {% endif %} +
+
+ + {% endif %} - {% for item in data_panel.are_parents %} + {% if data_panel is not empty %} +
+
+

+ {{ lp_title_scorm }} +

+
+
+ {% if data_panel.not_parents %} + + {% endif %} -
-
-
-
-{% endif %} + {% endif %} {% endautoescape %} \ No newline at end of file diff --git a/src/ThemeBundle/Resources/views/LearnPath/view.html.twig b/src/ThemeBundle/Resources/views/LearnPath/view.html.twig index ba8074df48..c955ce6734 100644 --- a/src/ThemeBundle/Resources/views/LearnPath/view.html.twig +++ b/src/ThemeBundle/Resources/views/LearnPath/view.html.twig @@ -1,184 +1,281 @@ {% extends '@ChamiloTheme/Layout/no_layout.html.twig' %} {% block content %} {% autoescape false %} -
- {% if show_left_column == 1 %} -