diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php index 83adfce4d9..0a553e9246 100644 --- a/main/create_course/add_course.php +++ b/main/create_course/add_course.php @@ -236,7 +236,7 @@ if ($form->validate()) { $tpl->assign('course_title', Display::url($title, $link)); $tpl->assign('course_id', $course_info['code']); - $template = $tpl->get_template('create_course/add_course.tpl'); + $template = $tpl->getTemplate('create_course/add_course.tpl'); $tpl->display($template); } else { $message = Display :: return_message(get_lang('CourseCreationFailed'), 'error', false); diff --git a/main/document/document_lite.php b/main/document/document_lite.php index 12d9344901..ccb791e2f6 100644 --- a/main/document/document_lite.php +++ b/main/document/document_lite.php @@ -1029,7 +1029,7 @@ $(function() { require_once 'controller.php'; $controller = new DocumentController(); -$tpl = $controller->tpl->get_template('layout/layout_2_col.tpl'); +$tpl = $controller->tpl->getTemplate('layout/layout_2_col.tpl'); $content = Display::grid_html('documents'); if (!is_null($docs_and_folders)) { diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index ae226194e1..06c89876ce 100644 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -25,6 +25,9 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Yaml\Parser; +use Symfony\Component\Translation\Loader\PoFileLoader; +use Symfony\Component\Translation\Loader\MoFileLoader; +use Symfony\Component\Finder\Finder; // Determine the directory path for this file. $includePath = dirname(__FILE__); @@ -290,11 +293,8 @@ $cidReset = null; /** Silex Middlewares. */ -/** A "before" middleware allows you to tweak the Request before the controller is executed. */ - -use Symfony\Component\Translation\Loader\PoFileLoader; -use Symfony\Component\Translation\Loader\MoFileLoader; -use Symfony\Component\Finder\Finder; +/* A "before" middleware allows you to tweak the Request + * before the controller is executed. */ $app->before( @@ -555,37 +555,6 @@ $app->before( var_dump(api_get_course_id());exit; }*/ - // Setting course entity for controllers and templates. - - - // The course parameter is loaded. - $courseCode = $request->get('course'); - - if (empty($courseCode)) { - $courseCode = api_get_course_id(); - } - - if (!empty($courseCode)) { - - // Converting /courses/XXX/ to a Entity/Course object. - $course = $app['orm.em']->getRepository('Entity\Course')->findOneByCode($courseCode); - $app['course'] = $course; - $app['template']->assign('course', $course); - - $sessionId = $request->get('id_session'); - - if (empty($sessionId)) { - $sessionId = api_get_session_id(); - } - - $courseSession = $app['orm.em']->getRepository('Entity\Session')->findOneById($sessionId); - $app['course_session'] = $courseSession; - $app['template']->assign('course_session', $courseSession); - } else { - $app['course'] = null; - } - $app['session']->set('course_session', $app['course']); - $studentView = $request->get('isStudentView'); if (!empty($studentView)) { if ($studentView == 'true') { diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index e6579f828b..fc53aac113 100644 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -63,7 +63,7 @@ class Display { global $app; global $tool_name, $show_learnpath; - $disable_js_and_css_files = true; + $app['template']->disableJsAndCss = true; $app['template.show_header'] = false; $app['template.show_footer'] = false; $app['template.show_learnpath'] = $show_learnpath; diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php index 7ce11c1c7f..ed050376ed 100644 --- a/main/inc/lib/pdf.lib.php +++ b/main/inc/lib/pdf.lib.php @@ -86,7 +86,7 @@ class PDF Display::$global_template->assign('add_signatures', $this->params['add_signatures']); //Getting template - $tpl = Display::$global_template->get_template('export/table_pdf.tpl'); + $tpl = Display::$global_template->getTemplate('export/table_pdf.tpl'); $html = Display::$global_template->fetch($tpl); $html = api_utf8_encode($html); diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 46fabed7ef..7313684ab4 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -11,6 +11,7 @@ use Silex\Application; use Symfony\Component\Security\Core\SecurityContext; use Symfony\Component\Translation\Translator; use Symfony\Component\Routing\Router; +use ChamiloLMS\Component\Editor\Editor; class Template { @@ -31,6 +32,8 @@ class Template public $force_plugin_load = true; public $navigation_array; public $loadBreadcrumb = true; + public $resources = array(); + public $disableJsAndCss = false; /** @var SecurityContext */ private $security; @@ -38,6 +41,8 @@ class Template private $translator; /** @var Router */ private $urlGenerator; + /** @var Editor */ + private $htmlEditor; /** * @param Application $app @@ -52,11 +57,13 @@ class Template SecurityContext $security, Translator $translator, Router $urlGenerator + //Editor $htmlEditor ) { $this->app = &$app; $this->security = $security; $this->translator = $translator; $this->urlGenerator = $urlGenerator; + //$this->htmlEditor = $htmlEditor; $this->app['classic_layout'] = true; $this->navigation_array = $this->returnNavigationArray(); @@ -199,7 +206,7 @@ class Template * */ public function display_one_col_template() { - $tpl = $this->get_template('layout/layout_1_col.tpl'); + $tpl = $this->getTemplate('layout/layout_1_col.tpl'); $this->display($tpl); } @@ -208,7 +215,7 @@ class Template * */ public function display_two_col_template() { - $tpl = $this->get_template('layout/layout_2_col.tpl'); + $tpl = $this->getTemplate('layout/layout_2_col.tpl'); $this->display($tpl); } @@ -217,7 +224,7 @@ class Template */ public function display_blank_template() { - $tpl = $this->get_template('layout/blank.tpl'); + $tpl = $this->getTemplate('layout/blank.tpl'); $this->display($tpl); } @@ -226,7 +233,7 @@ class Template */ public function display_no_layout_template() { - $tpl = $this->get_template('layout/no_layout.tpl'); + $tpl = $this->getTemplate('layout/no_layout.tpl'); $this->display($tpl); } @@ -316,8 +323,6 @@ class Template $this->course_id = api_get_course_int_id(); $this->app['course_code'] = api_get_course_id(); $this->app['session_id'] = api_get_session_id(); - - //$this->app['page_controller']->return_welcome_to_course_block($this->app['template']); } /** @@ -392,9 +397,7 @@ class Template */ private function setCssFiles() { - global $disable_js_and_css_files; $css = array(); - $this->theme = api_get_visual_theme(); if (isset($_POST['style']) && api_is_platform_admin()) { $this->preview_theme = $_POST['style']; @@ -430,7 +433,6 @@ class Template } $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'jquery-ui/css/'.$this->jquery_ui_theme.'/jquery-ui-custom.css'; - //$css[] = api_get_path(WEB_LIBRARY_JS_PATH).'jquery-ui/default.css'; } $css[] = api_get_path(WEB_LIBRARY_JS_PATH).'font-awesome/css/font-awesome.css'; @@ -442,68 +444,16 @@ class Template // Default theme CSS. $css[] = api_get_cdn_path($cssPath.'themes/'.$this->theme.'/default.css'); - $css_file_to_string = null; - foreach ($css as $file) { - $css_file_to_string .= api_get_css($file); - } - - // @todo move this somewhere else. Special fix when using tablets in order to see the text near icons - if (SHOW_TEXT_NEAR_ICONS == true) { - //hack in order to fix the actions buttons - $css_file_to_string .= ''; - } - - $navigator_info = api_get_navigator(); - if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') { - $css_file_to_string .= 'img, div { behavior: url('.api_get_path( - WEB_LIBRARY_JS_PATH - ).'iepngfix/iepngfix.htc) } '."\n"; - } - - if (!$disable_js_and_css_files) { - $style_print = api_get_css(api_get_cdn_path($cssPath.'themes/'.$this->theme.'/print.css'), 'print'); - $this->assign('css_style_print', $style_print); - - $this->assign('css_file_to_string', $css_file_to_string); - } - } - - /** - * @param array $htmlHeadXtra - */ - public function addJsFiles($htmlHeadXtra = array()) - { - $extra_headers = null; - if (isset($htmlHeadXtra) && $htmlHeadXtra) { - foreach ($htmlHeadXtra as $this_html_head) { - $extra_headers .= $this_html_head."\n"; - } - } + $this->addResource($css, 'css'); - if (isset($this->app['extraJS'])) { - foreach ($this->app['extraJS'] as $this_html_head) { - $extra_headers .= $this_html_head."\n"; - } + if (!$this->disableJsAndCss) { + $style = api_get_css(api_get_cdn_path($cssPath.'themes/'.$this->theme.'/print.css'), 'print'); + $this->addResource($style, 'no_js_css'); } - $this->assign('extra_headers', $extra_headers); } - /** - * Sets JS files - */ - private function setJsFiles() + public function setJsFiles() { - global $disable_js_and_css_files, $htmlHeadXtra; - $jsFolder = api_get_path(WEB_LIBRARY_JS_PATH); if ($this->app['assetic.enabled']) { @@ -530,7 +480,7 @@ class Template ); } - $this->app['html_editor']->getJavascriptToInclude($jsFiles); + //$this->app['html_editor']->getJavascriptToInclude(); if (api_is_global_chat_enabled()) { //Do not include the global chat in LP @@ -550,35 +500,74 @@ class Template if (api_get_setting('disable_copy_paste') == 'true') { $jsFiles[] = $jsFolder.'jquery.nocutcopypaste.js'; } + $this->addResource($jsFiles, 'js'); + } - $js_file_to_string = null; - - foreach ($jsFiles as $js_file) { - $js_file_to_string .= api_get_js_simple($js_file); - } - - // Loading email_editor js. - if (!api_is_anonymous() && api_get_setting('allow_email_editor') == 'true') { - $js_file_to_string .= $this->fetch($this->app['template_style'].'/mail_editor/email_link.js.tpl'); - } - - if (!$disable_js_and_css_files) { - $this->assign('js_file_to_string', $js_file_to_string); + /** + * Get resource list. + * @return array + */ + public function getResources() + { + return $this->resources; + } - $extra_headers = null; - if (isset($htmlHeadXtra) && $htmlHeadXtra) { - foreach ($htmlHeadXtra as $this_html_head) { - $extra_headers .= $this_html_head."\n"; - } + /** + * Add an item to the resources array. + * @param string $resource + * @param string $type js or css + */ + public function addResource($resource, $type) + { + if (is_array($resource)) { + if (isset($this->resources[$type])) { + $this->resources[$type] = array_merge($this->resources[$type], $resource); + } else { + $this->resources[$type] = $resource; } + } else { + $this->resources[$type][] = $resource; + } + } - if (isset($this->app['extraJS'])) { - foreach ($this->app['extraJS'] as $this_html_head) { - $extra_headers .= $this_html_head."\n"; - } + /** + * @return string + */ + public function parseResources() + { + $resourceToString = null; + + foreach ($this->resources as $type => $resources) { + switch($type) { + case 'js': + if ($this->disableJsAndCss == false) { + foreach($resources as $resource) { + $resourceToString .= api_get_js_simple($resource); + } + } + break; + case 'css': + if ($this->disableJsAndCss == false) { + foreach($resources as $resource) { + $resourceToString .= api_get_css($resource); + } + } + break; + case 'string': + if ($this->disableJsAndCss == false) { + foreach($resources as $resource) { + $resourceToString .= $resource; + } + } + break; + case 'no_js_css': + foreach($resources as $resource) { + $resourceToString .= $resource; + } + break; } - $this->assign('extra_headers', $extra_headers); } + $this->assign('resources', $resourceToString); } /** @@ -955,7 +944,7 @@ class Template if (empty($layout)) { $layout = $this->app['default_layout']; } - $this->addJsFiles(); + $this->parseResources(); return $this->app['twig']->render($this->app['template_style'].'/layout/'.$layout); } @@ -987,7 +976,7 @@ class Template */ public function renderTemplate($template, $elements = array()) { - $this->addJsFiles(); + $this->parseResources(); return $this->app['twig']->render($this->app['template_style'].'/'.$template, $elements); } diff --git a/main/inc/services.php b/main/inc/services.php index 32f7039fb7..65bb5c7d5f 100644 --- a/main/inc/services.php +++ b/main/inc/services.php @@ -35,10 +35,8 @@ $app->register(new Flint\Provider\RoutingServiceProvider(), array( if (isset($app['configuration']['services']['media-alchemyst'])) { $app->register(new MediaAlchemystServiceProvider()); - $app->register(new PHPExiftoolServiceProvider()); $app->register(new FFMpegServiceProvider()); - $app->register(new MediaVorusServiceProvider(), array( 'media-alchemyst.configuration' => array( 'ffmpeg.threads' => 4, @@ -197,6 +195,7 @@ $app['allow_admin_toolbar'] = array( 'ROLE_QUESTION_MANAGER', 'ROLE_SESSION_MANAGER' ); + /* use ChamiloLMS\Component\Auth\CourseVoter; use ChamiloLMS\Component\Auth\CourseAccessDecisionManager; @@ -236,8 +235,6 @@ if (!empty($strategies)) { $app->register(new OpauthExtension()); } - - /* $app['security.access_manager'] = $app->share(function($app) { return new AccessDecisionManager($app['security.voters'], 'unanimous'); @@ -256,12 +253,12 @@ $app->register(new Silex\Provider\TranslationServiceProvider(), array( // Validator provider. $app->register(new Silex\Provider\ValidatorServiceProvider()); -// Form provider +// Form provider. $app->register(new Silex\Provider\FormServiceProvider(), array( 'form.secret' => sha1(__DIR__) )); -// URL generator provider +// URL generator provider. //$app->register(new Silex\Provider\UrlGeneratorServiceProvider()); class ManagerRegistry extends AbstractManagerRegistry @@ -294,14 +291,14 @@ class ManagerRegistry extends AbstractManagerRegistry } } -// Setting up the Manager registry +// Setting up the Manager registry in order to use entity in forms. $app['manager_registry'] = $app->share(function() use ($app) { $managerRegistry = new ManagerRegistry(null, array('db'), array('orm.em'), null, null, $app['orm.proxies_namespace']); $managerRegistry->setContainer($app); return $managerRegistry; }); -// Needed to use the "entity" option in Symfony forms +// Needed to use the "entity" option in Symfony forms. $app['form.extensions'] = $app->share($app->extend('form.extensions', function ($extensions, $app) { $extensions[] = new \Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension($app['manager_registry']); return $extensions; @@ -315,7 +312,7 @@ $app['validator.validator_factory'] = $app->share(function ($app) { return $factory; }); -// Setting Doctrine service provider (DBAL) +// Setting Doctrine service provider (DBAL). if (isset($app['configuration']['main_database'])) { /* The database connection can be overwritten if you set $_configuration['db.options'] @@ -360,6 +357,7 @@ if (isset($app['configuration']['main_database'])) { $defaultDatabaseOptions = $app['configuration']['db.options']; } + // Doctrine service provider. $app->register( new Silex\Provider\DoctrineServiceProvider(), array( @@ -418,7 +416,7 @@ $app->register( new Silex\Provider\TwigServiceProvider(), array( 'twig.path' => array( - $app['sys_root'].'main/template', //template folder + $app['sys_root'].'src/ChamiloLMS/Resources/views', //template folder $app['sys_root'].'plugin' //plugin folder ), // twitter bootstrap form twig templates @@ -434,7 +432,7 @@ $app->register( ) ); -// Setting Twig options +// Setting Twig options. $app['twig'] = $app->share( $app->extend('twig', function ($twig) { $twig->addFilter('get_lang', new Twig_Filter_Function('get_lang')); @@ -500,9 +498,9 @@ $app->register(new Grom\Silex\ImagineServiceProvider(), array( // Prompts Doctrine SQL queries using Monolog. -$app['dbal_logger'] = $app->share(function() { - //return new Doctrine\DBAL\Logging\DebugStack(); -}); +/*$app['dbal_logger'] = $app->share(function() { + return new Doctrine\DBAL\Logging\DebugStack(); +});*/ if ($app['debug']) { /*$logger = new Doctrine\DBAL\Logging\DebugStack(); @@ -593,7 +591,7 @@ $app->register(new GaufretteServiceProvider(), array( )); */ -// Use Symfony2 filesystem instead of custom scripts +// Use Symfony2 filesystem instead of custom scripts. $app->register(new Neutron\Silex\Provider\FilesystemServiceProvider()); /** Chamilo service provider. */ @@ -610,6 +608,35 @@ class ChamiloServiceProvider implements ServiceProviderInterface $database = $app['database']; + $app['html_editor'] = $app->share(function($app) { + $editor = new ChamiloLMS\Component\Editor\CkEditor\CkEditor( + $app['translator'], + $app['url_generator'], + $app['template'], + $app['course'] + ); + $editor->setJavascriptToInclude(); + return $editor; + /*return new ChamiloLMS\Component\Editor\TinyMce\TinyMce( + $app['translator'], $app['url_generator'] + );*/ + }); + + $app['editor_connector'] = $app->share(function ($app) { + $token = $app['security']->getToken(); + $user = $token->getUser(); + + return new Connector( + $app['orm.em'], + $app['paths'], + $app['url_generator'], + $app['translator'], + $app['security'], + $user, + $app['course'] + ); + }); + // Template class $app['template'] = $app->share(function () use ($app) { $template = new Template( @@ -635,6 +662,41 @@ class ChamiloServiceProvider implements ServiceProviderInterface ); }); + $app['course'] = $app->share(function () use ($app) { + $request = $app['request']; + $session = $request->getSession(); + $courseCode = $request->get('course'); + + if (empty($courseCode)) { + $courseCode = $session->get('_cid'); + } + + if (!empty($courseCode)) { + // Converting /courses/XXX/ to a Entity/Course object. + return $app['orm.em']->getRepository('Entity\Course')->findOneByCode($courseCode); + //$app['template']->assign('course', $course); + return $course; + } + return null; + }); + + $app['course_session'] = $app->share(function () use ($app) { + $request = $app['request']; + $session = $request->getSession(); + $sessionId = $request->get('id_session'); + if (empty($sessionId)) { + $sessionId = $session->get('id_session'); + } + if (!empty($sessionId)) { + return $app['orm.em']->getRepository('Entity\Session')->findOneById($sessionId); +// $app['template']->assign('course_session', $courseSession); + return $courseSession; + } + return null; + }); + + + // Chamilo data filesystem. $app['chamilo.filesystem'] = $app->share(function () use ($app) { $filesystem = new ChamiloLMS\Component\DataFilesystem\DataFilesystem( @@ -854,26 +916,6 @@ $app['introduction.controller'] = $app->share( } ); -$app['html_editor'] = $app->share(function($app) { - return new ChamiloLMS\Component\Editor\CkEditor\CkEditor($app['translator'], $app['url_generator'], $app['course']); - //return new ChamiloLMS\Component\Editor\TinyMce\TinyMce($app['translator'], $app['url_generator']); -}); - -$app['editor_connector'] = $app->share(function ($app) { - $token = $app['security']->getToken(); - $user = $token->getUser(); - $course = $app['session']->get('course_session'); - - return new Connector( - $app['orm.em'], - $app['paths'], - $app['url_generator'], - $app['translator'], - $app['security'], - $user, - $course - ); -}); $app->register(new Unoconv\UnoconvServiceProvider(), array( diff --git a/main/social/friends.php b/main/social/friends.php index c1ec138c27..96724d9976 100644 --- a/main/social/friends.php +++ b/main/social/friends.php @@ -126,5 +126,5 @@ $tpl = $app['template']; $tpl->assign('social_left_content', $social_left_content); $tpl->assign('social_right_content', $social_right_content); -$social_layout = $tpl->get_template('layout/social_layout.tpl'); +$social_layout = $tpl->getTemplate('layout/social_layout.tpl'); $tpl->display($social_layout); diff --git a/src/ChamiloLMS/Component/Editor/CkEditor/CkEditor.php b/src/ChamiloLMS/Component/Editor/CkEditor/CkEditor.php index 6d86d7470f..79f8ad4298 100644 --- a/src/ChamiloLMS/Component/Editor/CkEditor/CkEditor.php +++ b/src/ChamiloLMS/Component/Editor/CkEditor/CkEditor.php @@ -21,12 +21,12 @@ class CkEditor extends Editor } /** - * @param array $files + * Set js to be include in the template */ - public function getJavascriptToInclude(& $files) + public function setJavascriptToInclude() { $jsFolder = api_get_path(WEB_LIBRARY_JS_PATH); - $files[] = $jsFolder.'ckeditor/ckeditor.js'; + $this->template->addResource($jsFolder.'ckeditor/ckeditor.js', 'js'); } /** diff --git a/src/ChamiloLMS/Component/Editor/Connector.php b/src/ChamiloLMS/Component/Editor/Connector.php index d79be21e5e..94740231dd 100644 --- a/src/ChamiloLMS/Component/Editor/Connector.php +++ b/src/ChamiloLMS/Component/Editor/Connector.php @@ -128,6 +128,7 @@ class Connector $roots = array(); /** @var Driver $driver */ $drivers = $this->getDrivers(); + foreach ($drivers as $driver) { if ($processDefaultValues) { $plugin = array( @@ -152,7 +153,7 @@ class Connector */ public function updateWithDefaultValues($driver) { - if (empty($driver)) { + if (empty($driver) || !isset($driver['driver'])) { return array(); } @@ -165,6 +166,7 @@ class Connector } $driverUpdated = array_merge($defaultDriver, $driver); + $driverUpdated['driver'] = 'ChamiloLMS\Component\Editor\Driver\\'.$driver['driver']; $driverUpdated['attributes'] = $attributes; return $driverUpdated; diff --git a/src/ChamiloLMS/Component/Editor/Driver/DropBoxDriver.php b/src/ChamiloLMS/Component/Editor/Driver/DropBoxDriver.php index 987cdcb68e..e37a8c0725 100644 --- a/src/ChamiloLMS/Component/Editor/Driver/DropBoxDriver.php +++ b/src/ChamiloLMS/Component/Editor/Driver/DropBoxDriver.php @@ -221,7 +221,7 @@ class DropBoxDriver extends \elFinderVolumeMySQL implements InterfaceDriver { return array( //'id' => $file->getId().$file->getCId(), - 'name' => 'dd', + 'name' => 'Dropbox', //'ts' => $file->getUploadDate(), 'mime' => 'directory', 'read' => true, diff --git a/src/ChamiloLMS/Component/Editor/Editor.php b/src/ChamiloLMS/Component/Editor/Editor.php index 418ac10c13..facb8c4ae2 100644 --- a/src/ChamiloLMS/Component/Editor/Editor.php +++ b/src/ChamiloLMS/Component/Editor/Editor.php @@ -45,13 +45,21 @@ class Editor /** @var Router */ public $urlGenerator; + /** @var \Template */ + public $template; + /** * @param Translator $translator * @param Router $urlGenerator + * @param \Template $template * @param Course $course */ - public function __construct(Translator $translator, Router $urlGenerator, $course) - { + public function __construct( + Translator $translator, + Router $urlGenerator, + \Template $template, + $course + ) { $this->toolbarSet = 'Basic'; $this->value = ''; $this->config = array(); @@ -61,6 +69,7 @@ class Editor $this->translator = $translator; $this->urlGenerator = $urlGenerator; $this->course = $course; + $this->template = $template; } /** diff --git a/src/ChamiloLMS/Component/Editor/TinyMce/TinyMce.php b/src/ChamiloLMS/Component/Editor/TinyMce/TinyMce.php index c08359047d..64c88a127a 100644 --- a/src/ChamiloLMS/Component/Editor/TinyMce/TinyMce.php +++ b/src/ChamiloLMS/Component/Editor/TinyMce/TinyMce.php @@ -12,12 +12,12 @@ use ChamiloLMS\Component\Editor\TinyMce\Toolbar; class TinyMce extends Editor { /** - * @param array $files + * Set js to be include in the template */ - public function getJavascriptToInclude(& $files) + public function setJavascriptToInclude() { $jsFolder = api_get_path(WEB_LIBRARY_JS_PATH); - $files[] = $jsFolder.'tinymce/tinymce.min.js'; + $this->template->addResource($jsFolder.'tinymce/tinymce.min.js', 'js'); } /** diff --git a/src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php b/src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php index 4da1f982c7..7745c62b0e 100644 --- a/src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php +++ b/src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php @@ -206,10 +206,7 @@ class QuestionManagerController */ public function questionsAction(Application $app) { - $extraJS = array(); - //@todo improve this JS includes should be added using twig - $extraJS[] = api_get_jqgrid_js(); - $app['extraJS'] = $extraJS; + $app['template']->addResource(api_get_jqgrid_js()); // Getting CQuizCategory repo. /** @var \Gedmo\Tree\Entity\Repository\NestedTreeRepository $repo */ diff --git a/src/ChamiloLMS/Controller/BaseController.php b/src/ChamiloLMS/Controller/BaseController.php index 3124437265..9c053f6a91 100644 --- a/src/ChamiloLMS/Controller/BaseController.php +++ b/src/ChamiloLMS/Controller/BaseController.php @@ -82,9 +82,9 @@ abstract class BaseController extends FlintController */ protected function getCourse() { - if (isset($this->app['course']) && !empty($this->app['course'])) { + //if (isset($this->app['course'])) { return $this->app['course']; - } + //} return false; } diff --git a/src/ChamiloLMS/Controller/ExerciseController.php b/src/ChamiloLMS/Controller/ExerciseController.php index c378d78ab3..fe105757ae 100644 --- a/src/ChamiloLMS/Controller/ExerciseController.php +++ b/src/ChamiloLMS/Controller/ExerciseController.php @@ -102,10 +102,7 @@ class ExerciseController extends CommonController */ public function questionPoolAction(Application $app, $cidReq = null, $exerciseId = null) { - $extraJS = array(); - //@todo improve this JS includes should be added using twig - $extraJS[] = api_get_jqgrid_js(); - $app['extraJS'] = $extraJS; + $app['template']->addResource(api_get_jqgrid_js()); // @todo this should be auto diff --git a/src/ChamiloLMS/Controller/IndexController.php b/src/ChamiloLMS/Controller/IndexController.php index 040d14a8f1..10481d4a47 100644 --- a/src/ChamiloLMS/Controller/IndexController.php +++ b/src/ChamiloLMS/Controller/IndexController.php @@ -80,7 +80,8 @@ class IndexController extends CommonController $extra[] = api_get_js('keyboard/jquery.keyboard.js'); } - $app['extraJS'] = $extra; + $app['template']->addResource(api_get_jqgrid_js(), 'string'); + $app['this_section'] = SECTION_CAMPUS; $request = $app['request']; @@ -168,7 +169,7 @@ class IndexController extends CommonController $extra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH).'keyboard/keyboard.css'); $extra[] = api_get_js('keyboard/jquery.keyboard.js'); } - $app['extraJS'] = $extra; + $app['template']->addResource($extra); $response = $app['template']->render_template('auth/login.tpl'); return new Response($response, 200, array('Cache-Control' => 's-maxage=3600, public')); } diff --git a/src/ChamiloLMS/Controller/LegacyController.php b/src/ChamiloLMS/Controller/LegacyController.php index 619e1fa51d..8c04df40d8 100644 --- a/src/ChamiloLMS/Controller/LegacyController.php +++ b/src/ChamiloLMS/Controller/LegacyController.php @@ -71,7 +71,7 @@ class LegacyController extends CommonController $app['template']->setHeader($app['template.show_header']); if (isset($htmlHeadXtra)) { - $app['template']->addJsFiles($htmlHeadXtra); + $app['template']->addResource($htmlHeadXtra, 'string'); } if (isset($interbreadcrumb)) { @@ -79,6 +79,8 @@ class LegacyController extends CommonController $app['template']->loadBreadcrumbToTemplate(); } + $app['template']->parseResources(); + if (isset($tpl)) { $response = $app['twig']->render($app['default_layout']); } else { diff --git a/main/template/default/admin/administrator/branches/add.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/branches/add.tpl similarity index 100% rename from main/template/default/admin/administrator/branches/add.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/branches/add.tpl diff --git a/main/template/default/admin/administrator/branches/add_from_parent.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/branches/add_from_parent.tpl similarity index 100% rename from main/template/default/admin/administrator/branches/add_from_parent.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/branches/add_from_parent.tpl diff --git a/main/template/default/admin/administrator/branches/edit.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/branches/edit.tpl similarity index 100% rename from main/template/default/admin/administrator/branches/edit.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/branches/edit.tpl diff --git a/main/template/default/admin/administrator/branches/list.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/branches/list.tpl similarity index 100% rename from main/template/default/admin/administrator/branches/list.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/branches/list.tpl diff --git a/main/template/default/admin/administrator/branches/read.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/branches/read.tpl similarity index 100% rename from main/template/default/admin/administrator/branches/read.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/branches/read.tpl diff --git a/main/template/default/admin/administrator/juries/add.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/juries/add.tpl similarity index 100% rename from main/template/default/admin/administrator/juries/add.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/juries/add.tpl diff --git a/main/template/default/admin/administrator/juries/add_members.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/juries/add_members.tpl similarity index 100% rename from main/template/default/admin/administrator/juries/add_members.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/juries/add_members.tpl diff --git a/main/template/default/admin/administrator/juries/edit.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/juries/edit.tpl similarity index 100% rename from main/template/default/admin/administrator/juries/edit.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/juries/edit.tpl diff --git a/main/template/default/admin/administrator/juries/list.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/juries/list.tpl similarity index 100% rename from main/template/default/admin/administrator/juries/list.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/juries/list.tpl diff --git a/main/template/default/admin/administrator/juries/read.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/juries/read.tpl similarity index 100% rename from main/template/default/admin/administrator/juries/read.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/juries/read.tpl diff --git a/main/template/default/admin/administrator/question_score/add.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/add.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score/add.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/add.tpl diff --git a/main/template/default/admin/administrator/question_score/edit.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/edit.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score/edit.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/edit.tpl diff --git a/main/template/default/admin/administrator/question_score/list.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/list.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score/list.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/list.tpl diff --git a/main/template/default/admin/administrator/question_score/read.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/read.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score/read.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score/read.tpl diff --git a/main/template/default/admin/administrator/question_score_name/add.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/add.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score_name/add.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/add.tpl diff --git a/main/template/default/admin/administrator/question_score_name/edit.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/edit.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score_name/edit.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/edit.tpl diff --git a/main/template/default/admin/administrator/question_score_name/list.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/list.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score_name/list.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/list.tpl diff --git a/main/template/default/admin/administrator/question_score_name/read.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/read.tpl similarity index 100% rename from main/template/default/admin/administrator/question_score_name/read.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/question_score_name/read.tpl diff --git a/main/template/default/admin/administrator/role/add.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/role/add.tpl similarity index 100% rename from main/template/default/admin/administrator/role/add.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/role/add.tpl diff --git a/main/template/default/admin/administrator/role/edit.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/role/edit.tpl similarity index 100% rename from main/template/default/admin/administrator/role/edit.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/role/edit.tpl diff --git a/main/template/default/admin/administrator/role/list.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/role/list.tpl similarity index 100% rename from main/template/default/admin/administrator/role/list.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/role/list.tpl diff --git a/main/template/default/admin/administrator/role/read.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/role/read.tpl similarity index 100% rename from main/template/default/admin/administrator/role/read.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/role/read.tpl diff --git a/main/template/default/admin/administrator/role_index.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/role_index.tpl similarity index 100% rename from main/template/default/admin/administrator/role_index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/role_index.tpl diff --git a/main/template/default/admin/administrator/upgrade/index.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/upgrade/index.tpl similarity index 100% rename from main/template/default/admin/administrator/upgrade/index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/upgrade/index.tpl diff --git a/main/template/default/admin/administrator/upgrade/upgrade.tpl b/src/ChamiloLMS/Resources/views/default/admin/administrator/upgrade/upgrade.tpl similarity index 100% rename from main/template/default/admin/administrator/upgrade/upgrade.tpl rename to src/ChamiloLMS/Resources/views/default/admin/administrator/upgrade/upgrade.tpl diff --git a/main/template/default/admin/director/branches/list.tpl b/src/ChamiloLMS/Resources/views/default/admin/director/branches/list.tpl similarity index 100% rename from main/template/default/admin/director/branches/list.tpl rename to src/ChamiloLMS/Resources/views/default/admin/director/branches/list.tpl diff --git a/main/template/default/admin/director/branches/read.tpl b/src/ChamiloLMS/Resources/views/default/admin/director/branches/read.tpl similarity index 100% rename from main/template/default/admin/director/branches/read.tpl rename to src/ChamiloLMS/Resources/views/default/admin/director/branches/read.tpl diff --git a/main/template/default/admin/index.tpl b/src/ChamiloLMS/Resources/views/default/admin/index.tpl similarity index 100% rename from main/template/default/admin/index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/index.tpl diff --git a/main/template/default/admin/jury_member/index.tpl b/src/ChamiloLMS/Resources/views/default/admin/jury_member/index.tpl similarity index 100% rename from main/template/default/admin/jury_member/index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/jury_member/index.tpl diff --git a/main/template/default/admin/jury_member/score_user.tpl b/src/ChamiloLMS/Resources/views/default/admin/jury_member/score_user.tpl similarity index 100% rename from main/template/default/admin/jury_member/score_user.tpl rename to src/ChamiloLMS/Resources/views/default/admin/jury_member/score_user.tpl diff --git a/main/template/default/admin/jury_president/assign_members.tpl b/src/ChamiloLMS/Resources/views/default/admin/jury_president/assign_members.tpl similarity index 100% rename from main/template/default/admin/jury_president/assign_members.tpl rename to src/ChamiloLMS/Resources/views/default/admin/jury_president/assign_members.tpl diff --git a/main/template/default/admin/jury_president/check_answers.tpl b/src/ChamiloLMS/Resources/views/default/admin/jury_president/check_answers.tpl similarity index 100% rename from main/template/default/admin/jury_president/check_answers.tpl rename to src/ChamiloLMS/Resources/views/default/admin/jury_president/check_answers.tpl diff --git a/main/template/default/admin/jury_president/index.tpl b/src/ChamiloLMS/Resources/views/default/admin/jury_president/index.tpl similarity index 100% rename from main/template/default/admin/jury_president/index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/jury_president/index.tpl diff --git a/main/template/default/admin/questionmanager/edit_category.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/edit_category.tpl similarity index 100% rename from main/template/default/admin/questionmanager/edit_category.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/edit_category.tpl diff --git a/main/template/default/admin/questionmanager/edit_question.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/edit_question.tpl similarity index 100% rename from main/template/default/admin/questionmanager/edit_question.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/edit_question.tpl diff --git a/main/template/default/admin/questionmanager/question_categories.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/question_categories.tpl similarity index 100% rename from main/template/default/admin/questionmanager/question_categories.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/question_categories.tpl diff --git a/main/template/default/admin/questionmanager/questionmanager.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/questionmanager.tpl similarity index 100% rename from main/template/default/admin/questionmanager/questionmanager.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/questionmanager.tpl diff --git a/main/template/default/admin/questionmanager/questions.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/questions.tpl similarity index 100% rename from main/template/default/admin/questionmanager/questions.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/questions.tpl diff --git a/main/template/default/admin/questionmanager/role_index.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/role_index.tpl similarity index 100% rename from main/template/default/admin/questionmanager/role_index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/role_index.tpl diff --git a/main/template/default/admin/questionmanager/show_category.tpl b/src/ChamiloLMS/Resources/views/default/admin/questionmanager/show_category.tpl similarity index 100% rename from main/template/default/admin/questionmanager/show_category.tpl rename to src/ChamiloLMS/Resources/views/default/admin/questionmanager/show_category.tpl diff --git a/main/template/default/admin/session_manager/role_index.tpl b/src/ChamiloLMS/Resources/views/default/admin/session_manager/role_index.tpl similarity index 100% rename from main/template/default/admin/session_manager/role_index.tpl rename to src/ChamiloLMS/Resources/views/default/admin/session_manager/role_index.tpl diff --git a/main/template/default/agenda/month.tpl b/src/ChamiloLMS/Resources/views/default/agenda/month.tpl similarity index 100% rename from main/template/default/agenda/month.tpl rename to src/ChamiloLMS/Resources/views/default/agenda/month.tpl diff --git a/main/template/default/app/session_path/add.tpl b/src/ChamiloLMS/Resources/views/default/app/session_path/add.tpl similarity index 100% rename from main/template/default/app/session_path/add.tpl rename to src/ChamiloLMS/Resources/views/default/app/session_path/add.tpl diff --git a/main/template/default/app/session_path/edit.tpl b/src/ChamiloLMS/Resources/views/default/app/session_path/edit.tpl similarity index 100% rename from main/template/default/app/session_path/edit.tpl rename to src/ChamiloLMS/Resources/views/default/app/session_path/edit.tpl diff --git a/main/template/default/app/session_path/list.tpl b/src/ChamiloLMS/Resources/views/default/app/session_path/list.tpl similarity index 100% rename from main/template/default/app/session_path/list.tpl rename to src/ChamiloLMS/Resources/views/default/app/session_path/list.tpl diff --git a/main/template/default/app/session_path/read.tpl b/src/ChamiloLMS/Resources/views/default/app/session_path/read.tpl similarity index 100% rename from main/template/default/app/session_path/read.tpl rename to src/ChamiloLMS/Resources/views/default/app/session_path/read.tpl diff --git a/main/template/default/app/session_path/session_tree/add.tpl b/src/ChamiloLMS/Resources/views/default/app/session_path/session_tree/add.tpl similarity index 100% rename from main/template/default/app/session_path/session_tree/add.tpl rename to src/ChamiloLMS/Resources/views/default/app/session_path/session_tree/add.tpl diff --git a/main/template/default/app/session_path/session_tree/list.tpl b/src/ChamiloLMS/Resources/views/default/app/session_path/session_tree/list.tpl similarity index 100% rename from main/template/default/app/session_path/session_tree/list.tpl rename to src/ChamiloLMS/Resources/views/default/app/session_path/session_tree/list.tpl diff --git a/main/template/default/auth/categories_list.php b/src/ChamiloLMS/Resources/views/default/auth/categories_list.php similarity index 100% rename from main/template/default/auth/categories_list.php rename to src/ChamiloLMS/Resources/views/default/auth/categories_list.php diff --git a/main/template/default/auth/courses_categories.php b/src/ChamiloLMS/Resources/views/default/auth/courses_categories.php similarity index 100% rename from main/template/default/auth/courses_categories.php rename to src/ChamiloLMS/Resources/views/default/auth/courses_categories.php diff --git a/main/template/default/auth/courses_list.php b/src/ChamiloLMS/Resources/views/default/auth/courses_list.php similarity index 100% rename from main/template/default/auth/courses_list.php rename to src/ChamiloLMS/Resources/views/default/auth/courses_list.php diff --git a/main/template/default/auth/layout.php b/src/ChamiloLMS/Resources/views/default/auth/layout.php similarity index 100% rename from main/template/default/auth/layout.php rename to src/ChamiloLMS/Resources/views/default/auth/layout.php diff --git a/main/template/default/auth/login.tpl b/src/ChamiloLMS/Resources/views/default/auth/login.tpl similarity index 100% rename from main/template/default/auth/login.tpl rename to src/ChamiloLMS/Resources/views/default/auth/login.tpl diff --git a/main/template/default/course_description/edit.tpl b/src/ChamiloLMS/Resources/views/default/course_description/edit.tpl similarity index 94% rename from main/template/default/course_description/edit.tpl rename to src/ChamiloLMS/Resources/views/default/course_description/edit.tpl index a7930106b5..66347e3f70 100644 --- a/main/template/default/course_description/edit.tpl +++ b/src/ChamiloLMS/Resources/views/default/course_description/edit.tpl @@ -1,34 +1,34 @@ -{{javascript}} - -{% for message in messages %} - {{ message }} -{% endfor %} - -{% if is_allowed_to_edit %} -
-
- - - -
-
- {% for type in types %} - - {{type.title}} - - {% endfor %} -
-
-{% endif %} - - -{% if type.question %} -
-
- {{'QuestionPlan'|get_lang}} -
- {{type.question}} -
-{% endif %} - +{{javascript}} + +{% for message in messages %} + {{ message }} +{% endfor %} + +{% if is_allowed_to_edit %} +
+
+ + + +
+
+ {% for type in types %} + + {{type.title}} + + {% endfor %} +
+
+{% endif %} + + +{% if type.question %} +
+
+ {{'QuestionPlan'|get_lang}} +
+ {{type.question}} +
+{% endif %} + {{form.return_form()}} \ No newline at end of file diff --git a/main/template/default/course_description/index.tpl b/src/ChamiloLMS/Resources/views/default/course_description/index.tpl similarity index 97% rename from main/template/default/course_description/index.tpl rename to src/ChamiloLMS/Resources/views/default/course_description/index.tpl index b3ae416f9f..8799582b32 100644 --- a/main/template/default/course_description/index.tpl +++ b/src/ChamiloLMS/Resources/views/default/course_description/index.tpl @@ -1,109 +1,109 @@ -{{javascript}} - - - -{% for message in messages %} - {{ message }} -{% endfor %} - -{% if is_allowed_to_edit %} -
-
- {% for type in types %} - - {{type.title}} - - {% endfor %} -
-
- - - - - - - - - -
-
-{% endif %} - -