Browse Source

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

aragonc 9 years ago
parent
commit
73cd549622

+ 4 - 6
main/document/create_document.php

@@ -21,11 +21,9 @@ var hide_bar = function() {
     $("#hide_bar_template").css({"background-image" : \'url("../img/hide2.png")\'})
 }
 
-jQuery(document).ready(function(){
-    jQuery(".scrollbar-macosx").scrollbar();
-});
-
 $(document).ready(function() {
+    $(".scrollbar-macosx").scrollbar();
+
     if ($(window).width() <= 785 ) {
         hide_bar();
     }
@@ -635,7 +633,7 @@ if ($form->validate()) {
 	}
     // HTML-editor
     echo '<div class="row" style="overflow:hidden">
-            <div id="template_col" class="col-md-3">
+            <div id="template_col" class="col-md-2">
                 <div class="panel panel-default">
                 <div class="panel-body">
                     <div id="frmModel" class="items-templates scrollbar-macosx"></div>
@@ -645,7 +643,7 @@ if ($form->validate()) {
             <div class="col-md-1">
                 <div id="hide_bar_template"></div>
             </div>
-            <div id="doc_form" class="col-md-8">
+            <div id="doc_form" class="col-md-9">
                 '.$form->returnForm().'
             </div>
           </div>';

+ 13 - 6
main/document/edit_document.php

@@ -38,6 +38,8 @@ var hide_bar = function() {
 }
 
 $(document).ready(function() {
+    $(".scrollbar-macosx").scrollbar();
+
     if ($(window).width() <= 785 ) {
         hide_bar();
     }
@@ -124,7 +126,8 @@ for ($i = 0; $i < ($count_dir); $i++) {
 $editorConfig = array(
     'ToolbarSet' => (api_is_allowed_to_edit(null, true) ? 'Documents' :'DocumentsStudent'),
     'Width' => '100%',
-    'Height' => '600',
+    'Height' => '400',
+    'cols-size' => [2, 10, 0],
     'FullPage' => true,
     'InDocument' => true,
     'CreateDocumentDir' => $relative_url,
@@ -440,7 +443,7 @@ if ($owner_id == api_get_user_id() ||
 	$form->addElement('hidden', 'showedit');
 	$form->addElement('hidden', 'origin');
 	$form->addElement('hidden', 'origin_opt');
-    $form->addText('title', get_lang('Title'));
+    $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 
 	$defaults['title'] = $document_data['title'];
 
@@ -474,7 +477,7 @@ if ($owner_id == api_get_user_id() ||
 		$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);
 	}
 
-	$form->addElement('textarea', 'comment', get_lang('Comment'));
+	$form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]);
 
 	if ($owner_id == api_get_user_id() || api_is_platform_admin()) {
 		$checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly'));
@@ -527,14 +530,18 @@ if ($owner_id == api_get_user_id() ||
 	if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
 		Display::display_warning_message(get_lang('BrowserDontSupportsSVG'));
 	}
-	echo '<div class="row-fluid" style="overflow:hidden">
+    echo '<div class="row" style="overflow:hidden">
             <div id="template_col" class="col-md-2">
-                <div id="frmModel"></div>
+                <div class="panel panel-default">
+                <div class="panel-body">
+                    <div id="frmModel" class="items-templates scrollbar-macosx"></div>
+                </div>
+                </div>
             </div>
             <div class="col-md-1">
                 <div id="hide_bar_template"></div>
             </div>
-            <div id="doc_form" class="col-md-8">
+            <div id="doc_form" class="col-md-9">
 				'.$form->returnForm().'
             </div>
           </div>';

+ 2 - 0
main/lang/english/trad4all.inc.php

@@ -7580,4 +7580,6 @@ $AverageRating = "Average rating";
 $GradebookTeacherResultsNotShown = "Teachers results are not shown nor taken into account in the gradebook.";
 $SocialWallWriteNewPostToFriend = "Write something on your friend's wall";
 $EmptyTemplate = "Blank template";
+$BaseCourse = "Base course";
+$BaseCourses = "Base courses";
 ?>

+ 2 - 0
main/lang/french/trad4all.inc.php

@@ -7567,4 +7567,6 @@ $AverageRating = "Score moyen";
 $GradebookTeacherResultsNotShown = "Les résultats des enseignants ne sont pas affichés ni pris en compte dans l'outil d'évaluations.";
 $SocialWallWriteNewPostToFriend = "Écris quelque chose d'intéressant sur le mur de ton ami...";
 $EmptyTemplate = "Modèle blanc";
+$BaseCourse = "Cours de base";
+$BaseCourses = "Cours de base";
 ?>

+ 2 - 0
main/lang/spanish/trad4all.inc.php

@@ -7605,4 +7605,6 @@ $AverageRating = "Promedio de la valoración";
 $GradebookTeacherResultsNotShown = "Los resultados de los profesores no se muestran ni están tomados en cuenta en los cálculos de la herramienta de evaluaciones.";
 $SocialWallWriteNewPostToFriend = "Escribe algo interesante en el muro de tu amigo...";
 $EmptyTemplate = "Plantilla vacía";
+$BaseCourse = "Curso base";
+$BaseCourses = "Cursos base";
 ?>

+ 2 - 1
src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -240,7 +240,8 @@ class CkEditor extends Editor
             $templateItem['html'] = file_get_contents(api_get_path(SYS_COURSE_PATH)
                 . $courseDirectory . '/document' . $templateData['path']);
 
-            if (!empty($template->getImage())) {
+            $image = $template->getImage();
+            if (!empty($image)) {
                 $templateItem['image'] = api_get_path(WEB_COURSE_PATH)
                     . $courseDirectory . '/upload/template_thumbnails/' . $template->getImage();
             }

+ 1 - 1
src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php

@@ -45,7 +45,7 @@ class PersonalDriver extends Driver implements DriverInterface
                 // Adding user personal files
                 $dir = \UserManager::getUserPathById($userId, 'system');
 
-                $dirWeb = \UserManager::getUserPathById($userId, 'web');
+                $dirWeb = \UserManager::getUserPathById($userId, 'rel');
 
                 $driver = array(
                     'driver' => 'PersonalDriver',