Add bottom vertical alignment - refs BT#13016

pull/2487/head
Angel Fernando Quiroz Campos 8 years ago
parent 8a361a7219
commit 24c5ee4cdc
  1. 3
      app/Resources/public/css/editor.css
  2. 11
      main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/dialogs/image2_chamilo.js
  3. 1
      main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/en.js
  4. 10
      main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/lang/es.js
  5. 25
      main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js
  6. 1
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php

@ -244,6 +244,9 @@ blockquote p {
.img-va-top {
vertical-align: top;
}
.img-va-bottom {
vertical-align: bottom;
}
.img-va-middle {
vertical-align: middle;
}

@ -504,11 +504,12 @@ CKEDITOR.dialog.add( 'image2_chamilo', function( editor ) {
[ commonLang.alignRight, 'right' ],
[ lang.alignBaseline, 'baseline'],
[ lang.alignTop, 'top'],
[ lang.alignMiddle, 'middle'],
[ lang.alignSuper, 'super'],
[ lang.alignSub, 'sub'],
[ lang.alignTextTop, 'text-top'],
[ lang.alignTextBottom, 'text-bottom'],
[ lang.alignBottom, 'bottom'],
[ lang.alignMiddle, 'middle'],
[ lang.alignSuper, 'super'],
[ lang.alignSub, 'sub'],
[ lang.alignTextTop, 'text-top'],
[ lang.alignTextBottom, 'text-bottom'],
],
label: commonLang.align,
setup: function( widget ) {

@ -21,6 +21,7 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'en', {
responsive: 'Responsive image',
alignBaseline: 'Baseline',
alignTop: 'Top',
alignBottom: 'Bottom',
alignMiddle: 'Middle',
alignSuper: 'Super',
alignSub: 'Sub',

@ -18,5 +18,13 @@ CKEDITOR.plugins.setLang( 'image2_chamilo', 'es', {
uploadTab: 'Cargar',
urlMissing: 'Debe indicar la URL de la imagen.',
altMissing: 'Falta el texto alternativo.',
responsive: 'Imagen responsiva'
responsive: 'Imagen responsiva',
alignBaseline: 'Línea base',
alignTop: 'Parte superior de la fuente',
alignBottom: 'Parte inferior de la fuente',
alignMiddle: 'Parte central',
alignSuper: 'Superíndice',
alignSub: 'Subíndice',
alignTextTop: 'Parte superior de la línea',
alignTextBottom: 'Parte inferior de la línea'
} );

@ -19,11 +19,12 @@
'right': 2,
'baseline': 3,
'top': 4,
'middle': 5,
'super': 6,
'sub': 7,
'text-top': 8,
'text-bottom': 9
'bottom': 5,
'middle': 6,
'super': 7,
'sub': 8,
'text-top': 9,
'text-bottom': 10
},
regexPercent = /^\s*(\d+\%)\s*$/i;
@ -410,14 +411,16 @@
} else if ( alignElement.hasClass( alignClasses[ 4 ] ) ) {
data.align = 'top';
} else if ( alignElement.hasClass( alignClasses[ 5 ] ) ) {
data.align = 'middle';
data.align = 'bottom';
} else if ( alignElement.hasClass( alignClasses[ 6 ] ) ) {
data.align = 'super';
data.align = 'middle';
} else if ( alignElement.hasClass( alignClasses[ 7 ] ) ) {
data.align = 'sub';
data.align = 'super';
} else if ( alignElement.hasClass( alignClasses[ 8 ] ) ) {
data.align = 'text-top';
data.align = 'sub';
} else if ( alignElement.hasClass( alignClasses[ 9 ] ) ) {
data.align = 'text-top';
} else if ( alignElement.hasClass( alignClasses[ 10 ] ) ) {
data.align = 'text-bottom';
}
@ -883,7 +886,7 @@
if ( alignClasses ) {
// Remove all align classes first.
for ( var i = 10; i--; )
for ( var i = 11; i--; )
wrapper.removeClass( alignClasses[ i ] );
if ( align == 'center' ) {
@ -1594,7 +1597,7 @@
// Left/right classes from the config.
rules.img.classes = alignClasses[ 0 ];
for (var classI = 2; classI <= 10; classI++) {
for (var classI = 2; classI <= 11; classI++) {
rules.img.classes += ',' + alignClasses[ classI ];
}
rules.figure.classes += ',' + rules.img.classes;

@ -182,6 +182,7 @@ class Basic extends Toolbar
'pull-right',
'img-va-baseline',
'img-va-top',
'img-va-bottom',
'img-va-middle',
'img-va-super',
'img-va-sub',

Loading…
Cancel
Save