diff --git a/app/config/assetic.yml b/app/config/assetic.yml index e541fca415..b0c8c8f4d8 100755 --- a/app/config/assetic.yml +++ b/app/config/assetic.yml @@ -1,9 +1,9 @@ assetic: - debug: false # %kernel.debug% + debug: true # %kernel.debug% use_controller: false read_from: %kernel.root_dir%/../web write_to: %kernel.root_dir%/../web - bundles: [] # disable bundles parsing + bundles: [ChamiloLMSCoreBundle, ChamiloLMSInstallerBundle] # disable bundles parsing filters: cssrewrite: ~ @@ -125,10 +125,10 @@ assetic: inputs: - %kernel.root_dir%/../web/bundles/sonataadmin/vendor/jquery/dist/jquery.js - %kernel.root_dir%/../web/bundles/sonataadmin/vendor/bootstrap/dist/js/bootstrap.js - - %kernel.root_dir%/../web/bundles/sonataproduct/js/product.js +# - %kernel.root_dir%/../web/bundles/sonataproduct/js/product.js - %kernel.root_dir%/../web/bundles/sonatacore/js/base.js - %kernel.root_dir%/../web/bundles/sonatacore/select2/select2.min.js - - %kernel.root_dir%/../web/bundles/sonatademo/js/demo.js +# - %kernel.root_dir%/../web/bundles/sonatademo/js/demo.js filters: - yui_js @@ -142,4 +142,4 @@ assetic: filters: - cssrewrite - - yui_css \ No newline at end of file + - yui_css diff --git a/app/config/config.yml b/app/config/config.yml index e7167b479e..71a191d5f7 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -114,22 +114,22 @@ twig: welcome_to_course_block: # Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ ] - #java: /usr/bin/java - filters: - cssrewrite: ~ - #closure: - # jar: "%kernel.root_dir%/Resources/java/compiler.jar" - #yui_css: - # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" - - lessphp: - file: %kernel.root_dir%/../vendor/oyejorge/less.php/lessc.inc.php - apply_to: "\.less$" - cssrewrite: ~ +#assetic: +# debug: "%kernel.debug%" +# use_controller: false +# bundles: [ ChamiloLMSCoreBundle, ChamiloLMSInstallerBundle ] +# #java: /usr/bin/java +# filters: +# cssrewrite: ~ +# #closure: +# # jar: "%kernel.root_dir%/Resources/java/compiler.jar" +# #yui_css: +# # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" +# +# lessphp: +# file: %kernel.root_dir%/../vendor/oyejorge/less.php/lessc.inc.php +# apply_to: "\.less$" +# cssrewrite: ~ #braincrafted_bootstrap: #less_filter: lessphp @@ -224,3 +224,24 @@ stof_doctrine_extensions: avanzu_admin_theme: bower_bin: /usr/bin/bower # that's the default value +sylius_resource: + resources: + chamilolms.notebook: + driver: doctrine/orm + templates: ChamiloLMSNotebookBundle:Notebook + classes: + model: ChamiloLMS\NotebookBundle\Entity\CNotebook + +sylius_settings: + driver: doctrine/orm + +doctrine_cache: + providers: + sylius_settings: + type: file_system + +sp_bower: + assetic: true + install_on_warmup: true + bundles: + ChamiloLMSCoreBundle: ~ diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index cac8db39d6..bcb9c18291 100755 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -28,7 +28,7 @@ monolog: # level: info assetic: - use_controller: true + use_controller: false #swiftmailer: # delivery_address: me@example.com diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f273244aad..58056351df 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -11,6 +11,7 @@ parameters: mailer_password: null locale: en secret: ThisTokenIsNotSoSecretChangeIt + installed: ~ path.data: null path.temp: null path.courses: null diff --git a/src/ChamiloLMS/CoreBundle/Resources/config/bower/bower.json b/src/ChamiloLMS/CoreBundle/Resources/config/bower/bower.json new file mode 100644 index 0000000000..54cfd70140 --- /dev/null +++ b/src/ChamiloLMS/CoreBundle/Resources/config/bower/bower.json @@ -0,0 +1,28 @@ +{ + "name": "Chamilo LMS", + "ignore" : [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "jquery" : "*", + "jquery-ui" : "*", + "momentjs" : "*", + "backbone" : "*", + "underscore" : "*", + "modernizr" : "*", + "spinjs" : "*", + "marionette" : "*", + "pickadate" : "*", + "holderjs" : "*", + "bootflat" : "*", + + "bootstrap": "latest", + "admin-lte": "latest", + "modernizr": "latest", + "ajaxQueue": "https://github.com/gnarf/jquery-ajaxQueue.git" + } +} diff --git a/src/ChamiloLMS/CoreBundle/Resources/config/services.yml b/src/ChamiloLMS/CoreBundle/Resources/config/services.yml index d107869787..c06c474470 100644 --- a/src/ChamiloLMS/CoreBundle/Resources/config/services.yml +++ b/src/ChamiloLMS/CoreBundle/Resources/config/services.yml @@ -95,7 +95,6 @@ services: arguments: [@knp_menu.factory, @chamilolms.coursebundle.course, @router] # Blocks - chamilolms.corebundle.block.main_menu: class: ChamiloLMS\CoreBundle\Block\MainMenuBlockService arguments: ["chamilolms.corebundle.block.main_menu", @templating, @knp_menu.menu_provider, @chamilolms.corebundle.menu.main_menu_builder ] @@ -112,3 +111,9 @@ services: chamilolms.userbundle.encoder: class: Application\Sonata\UserBundle\Security\Encoder + + # Settings + chamilolms.settings_schema.platform: + class: ChamiloLMS\CoreBundle\Settings\PlatformSettingsSchema + tags: + - { name: sylius.settings_schema, namespace: meta }