Disable unused libs mopa_bootstrap, liip_theme, composer updates

pull/3215/head
Julio Montoya 6 years ago
parent 8dcd58126d
commit cd0b1f3199
  1. 14
      composer.json
  2. 2
      config/bundles.php
  3. 14
      config/packages/liip_theme.yaml
  4. 41
      config/packages/mopa_bootstrap.yaml
  5. 6
      config/routes.yaml
  6. 2
      src/CoreBundle/Menu/LeftMenuBuilder.php
  7. 12
      src/CoreBundle/Resources/config/services.yml
  8. 32
      src/ThemeBundle/Resources/views/Sidebar/left_menu.html.twig
  9. 7
      src/ThemeBundle/Resources/views/Sidebar/login.html.twig
  10. 62
      src/ThemeBundle/Resources/views/Sidebar/menu_knp.html.twig

@ -75,12 +75,14 @@
"ezyang/htmlpurifier": "~4.12",
"firebase/php-jwt": "^5.0",
"friendsofsymfony/jsrouting-bundle": "~2.0",
"friendsofsymfony/rest-bundle": "^2.7",
"graphp/algorithms": "~0.8",
"graphp/graphviz": "~0.2",
"gregwar/captcha-bundle": "^2.0",
"jbroadway/urlify": "~1.1",
"jeroendesloovere/vcard": "~1.7",
"jimmiw/php-time-ago": "~3.0",
"jms/serializer-bundle": "^3.5",
"kigkonsult/icalcreator": "~2.29",
"knplabs/doctrine-behaviors": "~2.0",
"knplabs/gaufrette": "~0.9",
@ -96,14 +98,12 @@
"league/csv": "^9.1",
"league/glide-symfony": "^1.0",
"liip/imagine-bundle": "^2.1",
"liip/theme-bundle": "^1.7",
"maennchen/zipstream-php": "^2.0",
"masterminds/html5": "^2.0",
"michelf/php-markdown": "~1.8",
"mopa/bootstrap-bundle": "~3.3",
"mpdf/mpdf": "~8.0",
"oneup/flysystem-bundle": "~3.0",
"oneup/uploader-bundle": "~2.0",
"oneup/uploader-bundle": "~3.0",
"overblog/graphql-bundle": "~0.11",
"paragonie/random-lib": "~2.0",
"patchwork/utf8": "~1.3",
@ -156,13 +156,11 @@
"symfony/twig-bundle": "^4.0|^5.0",
"symfony/validator": "^4.0|^5.0",
"symfony/webpack-encore-bundle": "^1.7",
"symfony/yaml": "^4.0|^5.0",
"symfony/yaml": "^5.0",
"tgalopin/html-sanitizer-bundle": "^1.1",
"twig/extensions": "^1.5",
"vich/uploader-bundle": "^1.13",
"webit/eval-math": "~1.0",
"jms/serializer-bundle": "^3.5",
"friendsofsymfony/rest-bundle": "^2.7"
"webit/eval-math": "~1.0"
},
"config": {
"component-dir": "public/assets"
@ -176,7 +174,7 @@
"php-translation/symfony-bundle": "^0.12",
"phpstan/phpstan": "^0.12",
"symfony/browser-kit": "^4.0|^5.0",
"symfony/css-selector": "^4.0|^5.0",
"symfony/css-selector": "^5.0",
"symfony/debug-pack": "*",
"symfony/phpunit-bridge": "^5.0",
"symfony/profiler-pack": "*",

@ -33,7 +33,6 @@ return [
Sonata\MediaBundle\SonataMediaBundle::class => ['all' => true],
FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
FOS\RestBundle\FOSRestBundle::class => ['all' => true],
Mopa\Bundle\BootstrapBundle\MopaBootstrapBundle::class => ['all' => true],
Chamilo\CoreBundle\ChamiloCoreBundle::class => ['all' => true],
Chamilo\ThemeBundle\ChamiloThemeBundle::class => ['all' => true],
Chamilo\SkillBundle\ChamiloSkillBundle::class => ['all' => true],
@ -55,7 +54,6 @@ return [
Oneup\FlysystemBundle\OneupFlysystemBundle::class => ['all' => true],
Sonata\CacheBundle\SonataCacheBundle::class => ['all' => true],
Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class => ['all' => true],
Liip\ThemeBundle\LiipThemeBundle::class => ['all' => true],
A2lix\AutoFormBundle\A2lixAutoFormBundle::class => ['all' => true],
A2lix\TranslationFormBundle\A2lixTranslationFormBundle::class => ['all' => true],
Oneup\UploaderBundle\OneupUploaderBundle::class => ['all' => true],

@ -1,8 +1,6 @@
liip_theme:
themes: ['default', 'my_theme']
active_theme: 'default'
path_patterns:
bundle_resource:
- '%kernel.root_dir%/../templates/themes/%%current_theme%%/%%bundle_name%%/%%template%%'
# %%current_theme%% is the variable representing active_theme defined above
# %%bundle_name%% and %%template%% are managed by liip depending on the page loaded
#liip_theme:
# themes: ['default', 'my_theme']
# active_theme: 'default'
# path_patterns:
# bundle_resource:
# - '%kernel.root_dir%/../templates/themes/%%current_theme%%/%%bundle_name%%/%%template%%'

@ -1,23 +1,20 @@
# see https://github.com/phiamo/MopaBootstrapBundle/blob/master/Resources/doc/misc/configuration-reference.md
mopa_bootstrap:
# Adds twig form theme support
# horizontal_label_class: 'aa'
# horizontal_input_wrapper_class: 'dd'
menu: ~ # enables twig helpers for menu
form:
show_legend: true # default is true
show_child_legend: false # default is true
error_type: block # or inline which is default
render_optional_text: true
collection:
widget_remove_btn:
icon: trash
attr:
class: btn btn-danger
widget_add_btn:
icon: plus-sign
attr:
class: btn btn-primary
icons:
icon_set: fontawesome4
shortcut: icon
#mopa_bootstrap:
# menu: ~ # enables twig helpers for menu
# form:
# show_legend: true # default is true
# show_child_legend: false # default is true
# error_type: block # or inline which is default
# render_optional_text: true
# collection:
# widget_remove_btn:
# icon: trash
# attr:
# class: btn btn-danger
# widget_add_btn:
# icon: plus-sign
# attr:
# class: btn btn-primary
# icons:
# icon_set: fontawesome4
# shortcut: icon

@ -111,6 +111,6 @@ resources:
# resource: routing_api.yml
# prefix: /api
liip_theme:
resource: "@LiipThemeBundle/Resources/config/routing.xml"
prefix: /theme
#liip_theme:
# resource: "@LiipThemeBundle/Resources/config/routing.xml"
# prefix: /theme

@ -26,7 +26,7 @@ class LeftMenuBuilder implements ContainerAwareInterface
$menu = $factory->createItem('root');
$translator = $this->container->get('translator');
$checked = $this->container->get('session')->get('IS_AUTHENTICATED_FULLY');
$settingsManager = $this->container->get('chamilo.settings.manager');
//$settingsManager = $this->container->get('chamilo.settings.manager');
if ($checked) {
$menu->setChildrenAttribute('class', 'nav nav-pills nav-stacked');

@ -226,12 +226,12 @@ services:
# - {name: mopa_bootstrap.menu, alias: chamilo_core.menu.nav}
- {name: knp_menu.menu_builder, method: menuApp, alias: menuApp}
chamilo_core.menu.course_menu_builder:
class: Chamilo\CoreBundle\Menu\LeftMenuBuilder
calls:
- [setContainer, ['@service_container']]
tags:
- {name: mopa_bootstrap.menu, alias: chamilo_core.left.nav}
# chamilo_core.menu.course_menu_builder:
# class: Chamilo\CoreBundle\Menu\LeftMenuBuilder
# calls:
# - [setContainer, ['@service_container']]
# tags:
# - {name: mopa_bootstrap.menu, alias: chamilo_core.left.nav}
# Auth listeners
chamilo_core.listener.login_success_handler:

@ -4,25 +4,25 @@
{% autoescape false %}
{% if is_granted('IS_AUTHENTICATED_FULLY') %}
{{ macro.panel(
'Profile' | trans,
mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:profileMenu', {'automenu': 'navbar', 'stacked':false})
) }}
{# {{ macro.panel(#}
{# 'Profile' | trans,#}
{# mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:profileMenu', {'automenu': 'navbar', 'stacked':false})#}
{# ) }}#}
{{ macro.panel(
'Courses' | trans,
mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:courseMenu', {'automenu': 'navbar', 'stacked':false})
) }}
{# {{ macro.panel(#}
{# 'Courses' | trans,#}
{# mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:courseMenu', {'automenu': 'navbar', 'stacked':false})#}
{# ) }}#}
{{ macro.panel(
'Sessions' | trans,
mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:sessionMenu', {'automenu': 'navbar', 'stacked':false})
) }}
{# {{ macro.panel(#}
{# 'Sessions' | trans,#}
{# mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:sessionMenu', {'automenu': 'navbar', 'stacked':false})#}
{# ) }}#}
{{ macro.panel(
'Skills' | trans,
mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:skillsMenu', {'automenu': 'navbar', 'stacked':false})
) }}
{# {{ macro.panel(#}
{# 'Skills' | trans,#}
{# mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:skillsMenu', {'automenu': 'navbar', 'stacked':false})#}
{# ) }}#}
{% else %}
{# Plugin login before/after tpls #}
{% if plugin_login_top is not null %}

@ -1,5 +1,4 @@
{% include '@ChamiloTheme/Admin/switcher_links.html.twig' %}
{#{% include '@ChamiloTheme/Admin/switcher_links.html.twig' %}#}
{{ render(controller('ChamiloUserBundle:Security:loginSideBar')) }}
{{ mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }}
{#{{ render(controller('ChamiloUserBundle:Security:loginSideBar')) }}#}
{#{{ mopa_bootstrap_menu('ChamiloCoreBundle:LeftMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }}#}

@ -1,37 +1,35 @@
<!-- sidebar menu: : style can be found in sidebar.less -->
{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
{#<!-- sidebar menu: : style can be found in sidebar.less -->#}
{#{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}#}
{% autoescape false %}
{#{% autoescape false %}#}
{#{% if is_granted('IS_AUTHENTICATED_FULLY') %}#}
{# #}{#'Profile' | trans,#}
{# #}{#mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:mainMenu', {'automenu': 'pills', 'stacked':true})) }}#}
{% if is_granted('IS_AUTHENTICATED_FULLY') %}
{#{{ macro.panel(#}
{#'Profile' | trans,#}
{#mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:mainMenu', {'automenu': 'pills', 'stacked':true})) }}#}
{# {{ macro.panel(#}
{# 'Courses' | trans,#}
{# mopa_bootstrap_menu('ChamiloCoreBundle:CourseMenuBuilder:courseMenu', {'automenu': 'pills', 'stacked':true})) }}#}
{{ macro.panel(
'Courses' | trans,
mopa_bootstrap_menu('ChamiloCoreBundle:CourseMenuBuilder:courseMenu', {'automenu': 'pills', 'stacked':true})) }}
{# {{ macro.panel(#}
{# 'Skills' | trans,#}
{# mopa_bootstrap_menu('ChamiloCoreBundle:CourseMenuBuilder:skillsMenu', {'automenu': 'pills', 'stacked':true})) }}#}
{{ macro.panel(
'Skills' | trans,
mopa_bootstrap_menu('ChamiloCoreBundle:CourseMenuBuilder:skillsMenu', {'automenu': 'pills', 'stacked':true})) }}
{#{% else %}#}
{# <div class="user-panel">switcher#}
{# </div>#}
{# <form action="{{ path("fos_user_security_check") }}" method="post" role="form" class="sidebar-form">#}
{# <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>#}
{# <div class="form-group">#}
{# <label for="username">{{ 'security.login.username' | trans({}, 'FOSUserBundle') }}</label>#}
{# <input type="text" class="form-control" id="username" name="_username" >#}
{# </div>#}
{# <div class="form-group">#}
{# <label for="password">{{ 'security.login.password' | trans({}, 'FOSUserBundle') }}</label>#}
{# <input type="password" class="form-control" id="password" name="_password">#}
{# </div>#}
{# <button type="submit" class="btn btn-default">{{ 'security.login.submit' | trans({}, 'FOSUserBundle') }}</button>#}
{# </form>#}
{# {{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:notLoginMenu', {'automenu': 'pills', 'stacked':true}) }}#}
{#{% endif %}#}
{% else %}
<div class="user-panel">switcher
</div>
<form action="{{ path("fos_user_security_check") }}" method="post" role="form" class="sidebar-form">
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
<div class="form-group">
<label for="username">{{ 'security.login.username' | trans({}, 'FOSUserBundle') }}</label>
<input type="text" class="form-control" id="username" name="_username" >
</div>
<div class="form-group">
<label for="password">{{ 'security.login.password' | trans({}, 'FOSUserBundle') }}</label>
<input type="password" class="form-control" id="password" name="_password">
</div>
<button type="submit" class="btn btn-default">{{ 'security.login.submit' | trans({}, 'FOSUserBundle') }}</button>
</form>
{{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:notLoginMenu', {'automenu': 'pills', 'stacked':true}) }}
{% endif %}
{% endautoescape %}
{#{% endautoescape %}#}

Loading…
Cancel
Save