chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #876 from aragonc/bootstrap

Browse Source 
fix document width htmleditor and templates refs - CT#7539
1.10.x
Yannick Warnier 10 years ago
parent 810c1dce0b b84cd85ca4
commit e3e60b80ea
8 changed files with 98 additions and 73 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      app/Resources/public/css/base.css
  2. 57
      main/document/create_document.php
  3. 14
      main/gradebook/index.php
  4. 2
      main/gradebook/lib/GradebookUtils.php
  5. 4
      main/gradebook/lib/be/category.class.php
  6. 76
      main/gradebook/lib/fe/displaygradebook.php
  7. 8
      main/gradebook/lib/fe/gradebooktable.class.php
  8. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php

8
app/Resources/public/css/base.css
Unescape View File

@ -2794,6 +2794,10 @@ form .formw .freeze {
height:550px;
position:relative;
}
.items-templates{
display:block;
height:750px;
}
.editor-lp{
margin-bottom: 20px;
}
@ -5629,6 +5633,10 @@ a.sessionView {
text-align:center;
vertical-align:middle;
}
#gradebook_list .score{
font-weight: bold;
color: #8A6E4E;
}
#gradebook_list .centered .badge-group {
width: auto;
}

57
main/document/create_document.php
Unescape View File

@ -21,15 +21,30 @@ 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() {
if ($(window).width() <= 785 ) {
hide_bar();
}
$("#doc_form").removeClass( "col-md-8" ).addClass( "col-md-7" );
$("#hide_bar_template").click(function() {
$("#template_col").toggleClass("hide");
if ($("#doc_form").is(".col-md-8")) {
$("#doc_form").removeClass("col-md-8");
$("#doc_form").addClass("col-md-11");
} else {
$("#doc_form").removeClass("col-md-11");
$("#doc_form").addClass("col-md-8");
}
$("#hide_bar_template").toggleClass("hide_bar_template_not_hide");
});
CKEDITOR.on("instanceReady", function (e) {
@ -157,7 +172,8 @@ $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$editorConfig = array(
'ToolbarSet' => ($is_allowed_to_edit ? 'Documents' : 'DocumentsStudent'),
'Width' => '100%',
'Height' => '500',
'Height' => '400',
'cols-size' => [2, 10, 0],
'FullPage' => true,
'InDocument' => true,
'CreateDocumentDir' => $relative_url,
@ -226,8 +242,7 @@ $form = new FormValidator(
'create_document',
'post',
api_get_self().'?'.api_get_cidreq().'&dir='.Security::remove_XSS(urlencode($dir)).'&selectcat='.$select_cat,
null,
array('class' =>'form-vertical')
null
);
// form title
@ -269,9 +284,9 @@ function document_exists($filename)
// Add group to the form
if ($is_certificate_mode) {
$form->addText('title', get_lang('CertificateName'), true, array('autofocus'));
$form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
} else {
$form->addText('title', get_lang('Title'), true, array('autofocus'));
$form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
}
// Show read-only box only in groups
@ -282,7 +297,7 @@ $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
$current_session_id = api_get_session_id();
$form->addHtmlEditor('content','', true, true, $editorConfig);
$form->addHtmlEditor('content','', true, true, $editorConfig, true);
// Comment-field
$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
@ -295,8 +310,8 @@ if (!$is_certificate_mode &&
) {
$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
$parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
// Following two conditions copied from document.inc.php::build_directory_selector()
$folder_titles = array();
@ -575,16 +590,18 @@ if ($form->validate()) {
Display :: display_header($nameTools, "Doc");
// actions
echo '<div class="actions">';
// link back to the documents overview
if ($is_certificate_mode)
echo '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
if ($is_certificate_mode) {
$actionsLeft = '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
else
echo '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
} else {
$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
}
echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
if ($is_certificate_mode) {
$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
@ -598,13 +615,17 @@ if ($form->validate()) {
}
// HTML-editor
echo '<div class="row" style="overflow:hidden">
<div id="template_col" class="col-md-2">
<div id="frmModel" ></div>
<div id="template_col" class="col-md-3">
<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-9">
<div id="doc_form" class="col-md-8">
'.$form->returnForm().'
</div>
</div>';

14
main/gradebook/index.php
Unescape View File

@ -755,7 +755,7 @@ $no_qualification = false;
// Show certificate link.
$certificate = array();
echo '<div class="actions" align="right">';
$actionsLeft = '';
if ($category != '0') {
$cat = new Category();
@ -771,7 +771,7 @@ if ($category != '0') {
$stud_id
);
if (isset($certificate['pdf_url'])) {
echo Display::url(
$actionsLeft .= Display::url(Display::returnFontAswesomeIcon('file-pdf-o') .
get_lang('DownloadCertificatePdf'),
$certificate['pdf_url'],
['class' => 'btn btn-default']
@ -785,14 +785,14 @@ if ($category != '0') {
}
if (!api_is_allowed_to_edit(null, true)) {
echo Display::url(
get_lang('DownloadReportPdf'),
api_get_self()."?".api_get_self()."&action=export_table",
['class' => 'btn btn-default']
$actionsLeft .= Display::url(
Display::returnFontAswesomeIcon('file-pdf-o') . get_lang('DownloadReportPdf'),
api_get_self()."?".api_get_self()."&action=export_table",
['class' => 'btn btn-default']
);
}
echo '</div>';
echo $toolbar = Display::toolbarAction('gradebook-student-actions', array(0 => $actionsLeft, 1 => ''));
if (api_is_allowed_to_edit(null, true)) {
// Tool introduction

2
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -953,7 +953,7 @@ class GradebookUtils
$counter = 1;
$badges = array();
foreach ($list_values as $value) {
$class = 'info';
$class = 'warning';
if ($counter == 1) {
$class = 'success';
}

4
main/gradebook/lib/be/category.class.php
Unescape View File

@ -1998,11 +1998,11 @@ class Category implements GradebookItem
$url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $my_certificate['id'];
$certificates = Display::url(
'&nbsp;'.get_lang('DownloadCertificate'),
Display::returnFontAswesomeIcon('download').' '.get_lang('DownloadCertificate'),
$url,
array(
'target' => '_blank',
'class' => 'btn btn-default'
'class' => 'btn btn-sm btn-primary'
)
);

76
main/gradebook/lib/fe/displaygradebook.php
Unescape View File

@ -474,12 +474,12 @@ class DisplayGradebook
if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) {
$aditionalButtons = null;
if (!empty($certificateLinkInfo)) {
$aditionalButtons = '<div class="btn-group pull-right">';
$aditionalButtons .= '<div class="btn-group pull-right">';
$aditionalButtons .= isset($certificateLinkInfo['certificate_link']) ? $certificateLinkInfo['certificate_link'] : '';
$aditionalButtons .= isset($certificateLinkInfo['badge_link']) ? $certificateLinkInfo['badge_link'] : '';
$aditionalButtons .= '</div>';
}
$scoreinfo .= '<h4>' . sprintf(get_lang('TotalX'), $scorecourse_display . $aditionalButtons). '</h4>';
$scoreinfo .= '<strong>' . sprintf(get_lang('TotalX'), $scorecourse_display . $aditionalButtons). '</strong>';
}
Display :: display_normal_message($scoreinfo, false);
@ -539,15 +539,15 @@ class DisplayGradebook
}
// for course admin & platform admin add item buttons are added to the header
$header .= '<div class="actions">';
$actionsLeft = '';
$my_category = $catobj->shows_all_information_an_category($catobj->get_id());
$user_id = api_get_user_id();
$my_api_cidreq = api_get_cidreq();
if (api_is_allowed_to_edit(null, true)) {
if (empty($grade_model_id) || $grade_model_id == -1) {
$header .= '<a href="gradebook_add_cat.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' .
$actionsLeft .= '<a href="gradebook_add_cat.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('new_folder.png', get_lang('AddGradebook'), array(), ICON_SIZE_MEDIUM) . '</a></td>';
}
if ($selectcat == '0') {
@ -558,70 +558,66 @@ class DisplayGradebook
$my_api_cidreq = 'cidReq=' . $my_category['course_code'];
}
if ($show_add_link && !$message_resource) {
$header .= '<td><a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
$actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
$cats = Category :: load($selectcat);
if ($cats[0]->get_course_code() != null && !$message_resource) {
$header .= '<td><a href="gradebook_add_link.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
$actionsLeft .= '<a href="gradebook_add_link.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM) . '</a>';
} else {
$header .= '<td><a href="gradebook_add_link_select_course.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
$actionsLeft .= '<a href="gradebook_add_link_select_course.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM) . '</a>';
}
}
if (!$message_resource) {
$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
$actionsLeft .= '<a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
if ($my_category['generate_certificates'] == 1) {
$header .= "<td style=\"vertical-align: top;\">"
. Display::url(
$actionsLeft .= Display::url(
Display::return_icon(
'certificate_list.png',
get_lang('GradebookSeeListOfStudentsCertificates'),
'',
ICON_SIZE_MEDIUM
),
'certificate_list.png',
get_lang('GradebookSeeListOfStudentsCertificates'),
'',
ICON_SIZE_MEDIUM
),
"gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . intval($_GET['selectcat'])
)
. "</td>";
);
}
$header .= "<td style=\"vertical-align: top;\">"
. Display::url(
$actionsLeft .= Display::url(
Display::return_icon(
'user.png',
get_lang('GradebookListOfStudentsReports'),
'',
ICON_SIZE_MEDIUM
),
'user.png',
get_lang('GradebookListOfStudentsReports'),
'',
ICON_SIZE_MEDIUM
),
"gradebook_display_summary.php?$my_api_cidreq&selectcat=" . intval($_GET['selectcat'])
)
. "</td>";
);
// Right icons
$modify_icons = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
$actionsRight = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM) . '</a>';
$modify_icons .= '<a href="../document/document.php?curdirpath=/certificates&' . $my_api_cidreq . '&origin=gradebook&selectcat=' . $catobj->get_id() . '">' .
$actionsRight .= '<a href="../document/document.php?curdirpath=/certificates&' . $my_api_cidreq . '&origin=gradebook&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('certificate.png', get_lang('AttachCertificate'), '', ICON_SIZE_MEDIUM) . '</a>';
if (empty($categories)) {
$modify_icons .= '<a href="gradebook_edit_all.php?id_session=' . api_get_session_id() . '&amp;' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
$actionsRight .= '<a href="gradebook_edit_all.php?id_session=' . api_get_session_id() . '&amp;' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('percentage.png', get_lang('EditAllWeights'), '', ICON_SIZE_MEDIUM) . '</a>';
}
$score_display_custom = api_get_setting('gradebook_score_display_custom');
if (api_get_setting('teachers_can_change_score_settings') == 'true' && $score_display_custom['my_display_custom'] == 'true') {
$modify_icons .= '<a href="gradebook_scoring_system.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
$actionsRight .= '<a href="gradebook_scoring_system.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('ranking.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM) . '</a>';
}
$header .= Display::div($modify_icons, array('class' => 'right'));
}
}
} elseif (isset($_GET['search'])) {
$header .= '<b>' . get_lang('SearchResults') . ' :</b>';
echo $header = '<b>' . get_lang('SearchResults') . ' :</b>';
}
$isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
@ -630,24 +626,24 @@ class DisplayGradebook
);
if ($isDrhOfCourse) {
$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
$$actionsLeft .= '<a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
}
$header .= '</div>';
echo $header;
if (api_is_allowed_to_edit(null, true)){
echo $toolbar = Display::toolbarAction('gradebook-actions', array(0 => $actionsLeft, 1 => $actionsRight ));
}
if (api_is_allowed_to_edit(null, true)) {
$weight = intval($catobj->get_weight()) > 0 ? $catobj->get_weight() : 0;
$weight = get_lang('TotalWeight') . ' : ' . $weight;
$weight = '<strong>' . get_lang('TotalWeight') . ' : </strong>' . $weight;
$min_certification = (intval($catobj->get_certificate_min_score() > 0) ? $catobj->get_certificate_min_score() : 0);
$min_certification = get_lang('CertificateMinScore') . ' : ' . $min_certification;
$edit_icon = '<a class="right_link" href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
$edit_icon = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
//$msg = Display::tag('h3', $weight.' - '.$min_certification);
$msg = Display::tag('h4', $weight . ' - ' . $min_certification . $edit_icon);
$msg = $weight . ' - ' . $min_certification . $edit_icon;
//@todo show description
$description = (($catobj->get_description() == "" || is_null($catobj->get_description())) ? '' : '<strong>' . get_lang('GradebookDescriptionLog') . '</strong>' . ': ' . $catobj->get_description());
Display::display_normal_message($msg, false);

8
main/gradebook/lib/fe/gradebooktable.class.php
Unescape View File

@ -279,7 +279,7 @@ class GradebookTable extends SortableTable
// Name.
if (get_class($item) == 'Category') {
$row[] = $invisibility_span_open.'<h3>'.$item->get_name().'</h3>'.$invisibility_span_close;
$row[] = $invisibility_span_open.'<strong>'.$item->get_name().'</strong>'.$invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $item->get_name();
} else {
$name = $this->build_name_link($item, $type);
@ -309,7 +309,7 @@ class GradebookTable extends SortableTable
);
if ($this->teacherView) {
$row[] = $invisibility_span_open .Display::tag('h4', $weight).$invisibility_span_close;
$row[] = $invisibility_span_open .Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
} else {
$row[] = $invisibility_span_open .$weight.$invisibility_span_close;
}
@ -593,7 +593,7 @@ class GradebookTable extends SortableTable
$row = array(
null,
null,
'<h3>' . get_lang('Total') . '</h3>',
'<strong>' . get_lang('Total') . '</strong>',
null,
$total
);
@ -708,7 +708,7 @@ class GradebookTable extends SortableTable
$weight_total_links > $weight_category
) {
$warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
$modify_icons = '<a class="right_link" href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
$modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
$warning_message .= $modify_icons;
Display::display_warning_message($warning_message, false);

2
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php
Unescape View File

@ -118,7 +118,7 @@ class Documents extends Basic
'BGColor',
'Source',
],
['Toolbarswitch', 'ShowBlocks']
['Toolbarswitch']
];
}
}

Write Preview
Loading…
Cancel
Save