Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
9e665299
Commit
9e665299
authored
Nov 13, 2015
by
Sarah Cotton
Committed by
Robert Lyon
Nov 15, 2015
Browse files
Changed 'column' to 'cell' in dropdown (Bug #1482473)
behatnotneeded Change-Id: Iffe40a00d119efca936a40500b762a625e5f348a
parent
f694b824
Changes
3
Hide whitespace changes
Inline
Side-by-side
htdocs/js/views.js
View file @
9e665299
...
...
@@ -404,7 +404,7 @@
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
),
options
=
[
get_string
(
'
blockordertop
'
)],
options
=
[
get_string
(
'
blockordertop
cell
'
)],
selectbox
=
$
(
'
#addblock_position
'
);
element
.
find
(
'
.column-content .blockinstance .blockinstance-header
'
).
each
(
function
()
{
...
...
htdocs/lang/en.utf8/view.php
View file @
9e665299
...
...
@@ -264,7 +264,7 @@ $string['addblock'] = 'Add block: %s';
$string
[
'blockcell'
]
=
'Cell'
;
$string
[
'cellposition'
]
=
'Row %s Column %s'
;
$string
[
'blockorder'
]
=
'Position'
;
$string
[
'blockordertop'
]
=
'Top of c
olumn
'
;
$string
[
'blockordertop
cell
'
]
=
'Top of c
ell
'
;
$string
[
'blockorderafter'
]
=
'After "%s"'
;
$string
[
'rownr'
]
=
'Row %s'
;
$string
[
'nrrows'
]
=
array
(
...
...
htdocs/view/blocks.php
View file @
9e665299
...
...
@@ -196,7 +196,7 @@ $smarty = smarty($javascript, $stylesheets, array(
'view'
=>
array
(
'addblock'
,
'cellposition'
,
'blockordertop'
,
'blockordertop
cell
'
,
'blockorderafter'
,
'moveblock'
,
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment