diff --git a/app/Resources/views/layout.html.twig b/app/Resources/views/layout.html.twig index 8df8164d2a..ce1b640106 100644 --- a/app/Resources/views/layout.html.twig +++ b/app/Resources/views/layout.html.twig @@ -46,8 +46,16 @@ {% endblock %} {% block javascripts_head %} + {% javascripts '@admin_lte_all' %} + + {% endjavascripts %} + {{ parent() }} + {% javascripts 'bundles/chamilolmscore/js/app.js'%} {% endjavascripts %} {% endblock %} + +{% block javascripts %} +{% endblock %} diff --git a/app/config/sonata/sonata_admin.yml b/app/config/sonata/sonata_admin.yml index 08f677847a..37656d1ef8 100644 --- a/app/config/sonata/sonata_admin.yml +++ b/app/config/sonata/sonata_admin.yml @@ -15,8 +15,8 @@ sonata_admin: # default global templates # the layout template include javascript/stylesheet to the formatter bundle, # if you don't need it use the default one: SonataAdminBundle::standard_layout.html.twig - #layout: ApplicationSonataAdminBundle::layout.html.twig - layout: SonataAdminBundle::standard_layout.html.twig + layout: ApplicationSonataAdminBundle::standard_layout.html.twig + #layout: SonataAdminBundle::standard_layout.html.twig ajax: SonataAdminBundle::ajax_layout.html.twig # default value if done set, actions templates, should extends a global templates @@ -41,17 +41,17 @@ sonata_admin: # sonata_page: # items: # - sonata.page.admin.page - sonata.admin.group.content: - label: sonata_content - label_catalogue: SonataDemoBundle - icon: '' - items: - #- sonata.page.admin.page - - sonata.news.admin.comment - - sonata.news.admin.post - - sonata.media.admin.media - - sonata.media.admin.gallery - - sonata.comment.admin.thread +# sonata.admin.group.content: +# label: sonata_content +# label_catalogue: SonataDemoBundle +# icon: '' +# items: +# #- sonata.page.admin.page +# - sonata.news.admin.comment +# - sonata.news.admin.post +# - sonata.media.admin.media +# - sonata.media.admin.gallery +# - sonata.comment.admin.thread #sonata.admin.group.ecommerce: # label: sonata_ecommerce # label_catalogue: SonataAdminBundle @@ -60,21 +60,21 @@ sonata_admin: # - sonata.invoice.admin.invoice # - sonata.order.admin.order # - sonata.product.admin.product - sonata.admin.group.classification: - label: sonata_classification - label_catalogue: SonataClassificationBundle - icon: '' - items: - - sonata.classification.admin.category - - sonata.classification.admin.tag - - sonata.classification.admin.collection - sonata.admin.group.site_builder: - label: Site Builder - label_catalogue: SonataDemoBundle - icon: '' - items: - - sonata.page.admin.page - - sonata.page.admin.site +# sonata.admin.group.classification: +# label: sonata_classification +# label_catalogue: SonataClassificationBundle +# icon: '' +# items: +# - sonata.classification.admin.category +# - sonata.classification.admin.tag +# - sonata.classification.admin.collection +# sonata.admin.group.site_builder: +# label: Site Builder +# label_catalogue: SonataDemoBundle +# icon: '' +# items: +# - sonata.page.admin.page +# - sonata.page.admin.site sonata.admin.group.administration: label: sonata_administration label_catalogue: SonataAdminBundle diff --git a/app/config/sonata/sonata_media.yml b/app/config/sonata/sonata_media.yml index d1f22be602..d80e191979 100644 --- a/app/config/sonata/sonata_media.yml +++ b/app/config/sonata/sonata_media.yml @@ -80,7 +80,7 @@ sonata_media: pixlr: enabled: true - referrer: Demo - Sonata Project + referrer: App resizer: simple: diff --git a/app/config/sonata/sonata_seo.yml b/app/config/sonata/sonata_seo.yml index 8258e75e43..03865778b7 100644 --- a/app/config/sonata/sonata_seo.yml +++ b/app/config/sonata/sonata_seo.yml @@ -5,7 +5,7 @@ sonata_seo: encoding: UTF-8 page: default: sonata.seo.page.default - title: Sonata Project + title: Chamilo LMS metas: name: keywords: foo bar @@ -19,8 +19,8 @@ sonata_seo: # Open Graph information # see http://developers.facebook.com/docs/opengraphprotocol/#types or http://ogp.me/ - 'og:site_name': Sonata Project Sandbox - 'og:description': A demo of the some rich bundles for your Symfony2 projects + 'og:site_name': Chamilo + 'og:description': Chamilo LMS http-equiv: 'Content-Type': text/html; charset=utf-8 diff --git a/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig b/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig new file mode 100644 index 0000000000..0f7925e7f5 --- /dev/null +++ b/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig @@ -0,0 +1,7 @@ +{% extends 'SonataAdminBundle::standard_layout.html.twig' %} + +{% block side_bar_after_nav %} +
+ Chamilo +
+{% endblock %} diff --git a/src/ChamiloLMS/CoreBundle/Menu/SimpleMenuBuilder.php b/src/ChamiloLMS/CoreBundle/Menu/SimpleMenuBuilder.php index 9738b28fab..667eacee40 100644 --- a/src/ChamiloLMS/CoreBundle/Menu/SimpleMenuBuilder.php +++ b/src/ChamiloLMS/CoreBundle/Menu/SimpleMenuBuilder.php @@ -73,7 +73,7 @@ class SimpleMenuBuilder extends ContainerAware ) ); - $child = $menu->addChild( + $menu->addChild( 'Progress', array( 'route' => 'main',