Просмотр исходного кода

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 7 лет назад
Родитель
Сommit
a781264f65

+ 6 - 1
main/admin/settings.lib.php

@@ -1094,7 +1094,12 @@ function addEditTemplate()
                 echo Display::return_message(get_lang('TemplateAdded'), 'confirm');
                 echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
             } else {
-                $content_template = '<head>{CSS}<style type="text/css">.text{font-weight: normal;}</style></head><body>'.Database::escape_string($values['template_text']).'</body>';
+                $cssFile = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/editor.css';
+                $style = '<link href="'.$cssFile.'" rel="stylesheet" media="screen" type="text/css" />';
+                $bootstrap = '<link href="'.api_get_path(WEB_PUBLIC_PATH).'assets/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" media="screen" type="text/css" />';
+                $viewport = '<meta name="viewport" content="width=device-width, initial-scale=1.0">';
+                $content_template = '<head>'.$viewport.'<title>'.$values['title'].'</title>'.$style.$bootstrap.'</head>'
+                    . '<body>'.Database::escape_string($values['template_text']).'</body>';
                 $sql = "UPDATE $table_system_template set title = '".Database::escape_string($values['title'])."', content = '".$content_template."'";
                 if (!empty($new_file_name)) {
                     $sql .= ", image = '".Database::escape_string($new_file_name)."'";

+ 9 - 9
src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -108,14 +108,14 @@ class CkEditor extends Editor
         }
         /** @var \Chamilo\CoreBundle\Entity\SystemTemplate $template */
         $templateList = array();
-
-        $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');
+        $cssTheme = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/';
+        $search = array('{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}','{CSS}');
         $replace = array(
-            '',
+            $cssTheme,
             api_get_path(REL_CODE_PATH).'img/',
             api_get_path(REL_PATH),
-            //api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
-            //api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH)
+            api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
+            ''
         );
 
         foreach ($templates as $template) {
@@ -176,14 +176,14 @@ class CkEditor extends Editor
     {
         $entityManager = \Database::getManager();
         $systemTemplates = $entityManager->getRepository('ChamiloCoreBundle:SystemTemplate')->findAll();
-
-        $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');
+        $cssTheme = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/';
+        $search = array('{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}','{CSS}');
         $replace = array(
-            '',
+            $cssTheme,
             api_get_path(REL_CODE_PATH).'img/',
             api_get_path(REL_PATH),
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
-            api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH)
+            '',
         );
 
         $templateList = array();