Commit 2662681e authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Changed 'column' to 'cell' in dropdown (Bug #1482473)" into 15.10_STABLE

parents 231dcf4b e3859b77
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
var position = $(this).val().split('-'), var position = $(this).val().split('-'),
element = workspace.find('.js-col-row').eq(parseInt(position[0], 10) - 1).find('.column').eq(parseInt(position[1], 10) - 1), element = workspace.find('.js-col-row').eq(parseInt(position[0], 10) - 1).find('.column').eq(parseInt(position[1], 10) - 1),
options = [get_string('blockordertop')], options = [get_string('blockordertopcell')],
selectbox = $('#addblock_position'); selectbox = $('#addblock_position');
element.find('.column-content .blockinstance .blockinstance-header').each(function() { element.find('.column-content .blockinstance .blockinstance-header').each(function() {
......
...@@ -261,7 +261,7 @@ $string['addblock'] = 'Add block: %s'; ...@@ -261,7 +261,7 @@ $string['addblock'] = 'Add block: %s';
$string['blockcell'] = 'Cell'; $string['blockcell'] = 'Cell';
$string['cellposition'] = 'Row %s Column %s'; $string['cellposition'] = 'Row %s Column %s';
$string['blockorder'] = 'Position'; $string['blockorder'] = 'Position';
$string['blockordertop'] = 'Top of column'; $string['blockordertopcell'] = 'Top of cell';
$string['blockorderafter'] = 'After "%s"'; $string['blockorderafter'] = 'After "%s"';
$string['rownr'] = 'Row %s'; $string['rownr'] = 'Row %s';
$string['nrrows'] = array( $string['nrrows'] = array(
......
...@@ -196,7 +196,7 @@ $smarty = smarty($javascript, $stylesheets, array( ...@@ -196,7 +196,7 @@ $smarty = smarty($javascript, $stylesheets, array(
'view' => array( 'view' => array(
'addblock', 'addblock',
'cellposition', 'cellposition',
'blockordertop', 'blockordertopcell',
'blockorderafter', 'blockorderafter',
'moveblock', 'moveblock',
), ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment