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

Add right-aligned text icon on all minimal CKeditor toolbars - replace JustifyBlock by JustifyRight whenever needed to maintain display size to minimum - refs #2869

Browse Source
pull/2874/head
Yannick Warnier 7 years ago
parent abbda9981a
commit c5464953e8
20 changed files with 31 additions and 30 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. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/AgendaStudent.php
  2. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php
  3. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/DocumentsStudent.php
  4. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/FAQ.php
  5. 3
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Forum.php
  6. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ForumStudent.php
  7. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Glossary.php
  8. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Messages.php
  9. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Profile.php
  10. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php
  11. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php
  12. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectCommentStudent.php
  13. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectStudent.php
  14. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Register.php
  15. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Survey.php
  16. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php
  17. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
  18. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiStudent.php
  19. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiTask.php
  20. 4
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Work.php

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

@ -132,7 +132,7 @@ class AgendaStudent extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

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

@ -84,7 +84,7 @@ class Documents extends Basic
'/',
['Styles', 'Format', 'Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
api_get_setting('enabled_wiris') === 'true' ? ['ckeditor_wiris_formulaEditor', 'ckeditor_wiris_CAS'] : [''],
['Source'],
];
@ -112,7 +112,7 @@ class Documents extends Basic
'Asciisvg',
],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Styles',
'Format',
'Font',

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

@ -148,7 +148,7 @@ class DocumentsStudent extends Basic
'Asciisvg',
],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
[
'Format',
'Font',

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

@ -88,7 +88,7 @@ class FAQ extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

3
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Forum.php
Unescape View File

@ -56,6 +56,7 @@ class Forum extends Basic
'JustifyLeft',
'JustifyCenter',
'JustifyRight',
'JustifyBlock',
],
];
}
@ -72,7 +73,7 @@ class Forum extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
['Toolbarswitch'],
];

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

@ -99,7 +99,7 @@ class ForumStudent extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Oembed', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Glossary.php
Unescape View File

@ -42,7 +42,7 @@ class Glossary extends Basic
'/',
['Styles', 'Format', 'Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
];
}
@ -58,7 +58,7 @@ class Glossary extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
['Toolbarswitch'],
];

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Messages.php
Unescape View File

@ -85,7 +85,7 @@ class Messages extends Basic
'/',
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList'],
];
}
@ -101,7 +101,7 @@ class Messages extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Profile.php
Unescape View File

@ -78,7 +78,7 @@ class Profile extends Basic
'/',
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['Source'],
];
}
@ -95,7 +95,7 @@ class Profile extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Project.php
Unescape View File

@ -78,7 +78,7 @@ class Project extends Basic
['Table', 'leaflet'],
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['Source'],
];
}
@ -95,7 +95,7 @@ class Project extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor', 'BGColor', 'Source'],
['Toolbarswitch'],
];

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectComment.php
Unescape View File

@ -77,7 +77,7 @@ class ProjectComment extends Basic
['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
['Table', 'leaflet'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['Source'],
];
}
@ -94,7 +94,7 @@ class ProjectComment extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor'],
['Toolbarswitch'],
];

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

@ -77,7 +77,7 @@ class ProjectCommentStudent extends Basic
['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
['Table', 'leaflet'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['ShowBlocks'],
];
}

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectStudent.php
Unescape View File

@ -78,7 +78,7 @@ class ProjectStudent extends Basic
['Table', 'leaflet'],
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['Source'],
];
}
@ -95,7 +95,7 @@ class ProjectStudent extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor'],
['Toolbarswitch'],
];

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Register.php
Unescape View File

@ -40,7 +40,7 @@ class Register extends Basic
['Maximize', '-', 'PasteFromWord', '-', 'Undo', 'Redo'],
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
];
}
@ -55,7 +55,7 @@ class Register extends Basic
['Toolbarswitch', 'PasteFromWord', '-', 'Undo', 'Redo'],
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
];
}
}

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

@ -96,7 +96,7 @@ class Survey extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
['Toolbarswitch'],
];

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

@ -105,7 +105,7 @@ class TestFreeAnswer extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

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

@ -103,7 +103,7 @@ class TestMatching extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
['Source', 'Toolbarswitch'],
];

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

@ -135,7 +135,7 @@ class WikiStudent extends Basic
['Undo', 'Redo'],
['Wikilink', 'Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
api_get_setting('enabled_wiris') == 'true' ? ['ckeditor_wiris_formulaEditor', 'ckeditor_wiris_CAS'] : [''],
['Toolbarswitch'],

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/WikiTask.php
Unescape View File

@ -77,7 +77,7 @@ class WikiTask extends Basic
['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio'],
['Table'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
api_get_setting('enabled_wiris') == 'true' ? ['ckeditor_wiris_formulaEditor', 'ckeditor_wiris_CAS'] : [''],
['Source'],
];
@ -95,7 +95,7 @@ class WikiTask extends Basic
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table'],
['BulletedList', 'NumberedList', 'HorizontalRule'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Styles', 'Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
api_get_setting('enabled_wiris') == 'true' ? ['ckeditor_wiris_formulaEditor', 'ckeditor_wiris_CAS'] : [''],
['Toolbarswitch'],

4
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Work.php
Unescape View File

@ -82,7 +82,7 @@ class Work extends Basic
'/',
['Font', 'FontSize'],
['Bold', 'Italic', 'Underline'],
['JustifyLeft', 'JustifyCenter', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'TextColor', 'BGColor'],
['Source'],
];
}
@ -98,7 +98,7 @@ class Work extends Basic
$this->getNewPageBlock(),
['Undo', 'Redo'],
['Link', 'Image', 'Video', 'Flash', 'Youtube', 'Audio', 'Table', 'Asciimath'],
['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor', 'BGColor'],
['Toolbarswitch'],
];

Write Preview
Loading…
Cancel
Save