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 branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent f362e0394a 065514f0c1
commit 17ca21055a
4 changed files with 39 additions and 50 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. 6
      documentation/changelog.html
  2. 68
      main/inc/lib/javascript/ckeditor/plugins/audio/dialogs/audio.js
  3. 13
      main/inc/lib/javascript/ckeditor/plugins/audio/plugin.js
  4. 2
      plugin/studentfollowup/StudentFollowUpPlugin.php

6
documentation/changelog.html
Unescape View File

@ -142,6 +142,12 @@
<h3>Improvements (minor features) and debug</h3>
<ul>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/e38ba5b7cbbf22cb80b5764e997a125fd98eaf33">e38ba5b7</a> - <a href="https://task.beeznest.com/issues/12748">BT#12748</a>) Fix fake-image for audio in CKEditor plugin</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1ef930f380d802805bca4dda0201489b2bacce70">1ef930f3</a> - <a href="https://task.beeznest.com/issues/12748">BT#12748</a>) Fix option to set autoplay to audio in CKEditor plugin</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/2ad1efe3b2ab04e14233bf504d75748460e85dd5">2ad1efe3</a> - <a href="https://task.beeznest.com/issues/12748">BT#12748</a>) Remove field to set height to audio in CKEditor plugin</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ed59aea31dfc58aef0976bc7447370a854321d47">ed59aea3</a>) Renaming a document now use the new doc title not the old title</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c3c3950f5b24e2d543e1b21fc63918361174b64a">c3c3950f</a>) General coach can get access to all courses inside a session</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/487703ebd655a0676c6a84c5fc84c9f5c45170d8">487703eb</a> - <a href="https://task.beeznest.com/issues/10887">BT#10887</a>) Fix document renaming in LP</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a896b8bcf0625accb325fff8c2480d8b6aded132">a896b8bc</a> - <a href="https://task.beeznest.com/issues/10896">BT#10896</a>) Fix dropbox breadcrumb to show the right title</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d1aba904f5c72c1be28579cfc95b04ec9fdb3627">d1aba904</a> - <a href="https://task.beeznest.com/issues/12755">BT#12755</a>) Fix css print.css in PDF export to use theme-specific CSS</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/684f709630af78262fb0a1848800daf9c35fc549">684f7096</a> - <a href="https://github.com/chamilo/chamilo-lms/issues/1787">GH#1787</a>) Use simpleWebRTC v2</li>

68
main/inc/lib/javascript/ckeditor/plugins/audio/dialogs/audio.js
Unescape View File

@ -9,35 +9,21 @@ CKEDITOR.dialog.add('audio', function(editor)
value = generateId();
}
if (this.id !== 'autoplay') {
audioNode.setAttribute(this.id, value);
switch (this.id) {
case 'width':
audioNode.setAttribute('style', 'width:' + value + 'px;');
break;
case 'height':
var styleAttr = audioNode.getAttribute('style');
audioNode.setAttribute('style', styleAttr + 'height:' + value + 'px;');
break;
}
} else {
if (value === true) {
audioNode.setAttribute(this.id, '');
}
}
if (!value) {
return;
}
switch (this.id) {
case 'width':
audioNode.setAttribute('style', 'width:' + value + 'px;');
extraStyles.width = value + 'px';
//no break
case 'id':
audioNode.setAttribute(this.id, value);
break;
case 'height':
extraStyles.height = value + 'px';
case 'autoplay':
if (value === true) {
audioNode.setAttribute('autoplay', 'autoplay');
break;
}
audioNode.removeAttribute('autoplay');
break;
}
}
@ -53,11 +39,21 @@ CKEDITOR.dialog.add('audio', function(editor)
function loadValue(audioNode) {
if (audioNode) {
this.setValue(audioNode.getAttribute(this.id));
} else {
if (this.id == 'id') {
this.setValue(generateId());
var value = audioNode.getAttribute(this.id);
if (this.id != 'autoplay') {
this.setValue(value);
return;
}
this.setValue(value === 'autoplay');
return;
}
if (this.id == 'id') {
this.setValue(generateId());
}
}
@ -165,7 +161,7 @@ CKEDITOR.dialog.add('audio', function(editor)
elements: [
{
type: 'hbox',
widths: ['33%', '33%', '33%'],
widths: ['20%', '80%'],
children: [
{
type: 'text',
@ -176,15 +172,6 @@ CKEDITOR.dialog.add('audio', function(editor)
commit: commitValue,
setup: loadValue
},
{
type: 'text',
id: 'height',
label: editor.lang.common.height,
'default': 300,
validate: CKEDITOR.dialog.validate.notEmpty(lang.heightRequired),
commit: commitValue,
setup: loadValue
},
{
type: 'text',
id: 'id',
@ -276,7 +263,8 @@ CKEDITOR.dialog.add('audio', function(editor)
type: 'checkbox',
label: lang.autoPlay,
'default': false,
commit: commitValue
commit: commitValue,
setup: loadValue
}
]
}

13
main/inc/lib/javascript/ckeditor/plugins/audio/plugin.js
Unescape View File

@ -33,7 +33,7 @@
'background-color:gray;' +
'border: 1px solid #a9a9a9;' +
'width: 80px;' +
'height: 80px;' +
'height: 40px;' +
'}';
},
onLoad: function() {
@ -118,18 +118,13 @@
}
}
var fakeElement = editor.createFakeParserElement(realElement, 'cke_video', 'audio', false),
var fakeElement = editor.createFakeParserElement(realElement, 'cke_audio', 'audio', false),
fakeStyle = fakeElement.attributes.style || '';
var width = realElement.attributes.width,
height = realElement.attributes.height;
var width = realElement.attributes.width;
if (typeof width != 'undefined') {
fakeStyle = fakeElement.attributes.style = fakeStyle + 'width:' + CKEDITOR.tools.cssLength(width) + ';';
}
if (typeof height != 'undefined') {
fakeStyle = fakeElement.attributes.style = fakeStyle + 'height:' + CKEDITOR.tools.cssLength(height) + ';';
fakeElement.attributes.style = fakeStyle + 'width:' + CKEDITOR.tools.cssLength(width) + ';';
}
return fakeElement;

2
plugin/studentfollowup/StudentFollowUpPlugin.php
Unescape View File

@ -67,7 +67,7 @@ class StudentFollowUpPlugin extends Plugin
$fs->remove($pluginEntityPath);
}
$table = Database::get_main_table('sfu_post');
$sql = "DROP TABLE $table";
$sql = "DROP TABLE IF EXISTS $table";
Database::query($sql);
}

Write Preview
Loading…
Cancel
Save