Skip to content
GitLab
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
421c5790
Commit
421c5790
authored
Jun 12, 2018
by
Liam
Committed by
Rebecca Blundell
Feb 26, 2019
Browse files
Bug #1765276: More dashboard fixes - changed pull-* to float-*
behatnotneeded Change-Id: I8203c25d5e94eba370fa0dc81ed3bf9ec21bc698
parent
bdbbd6e4
Changes
40
Hide whitespace changes
Inline
Side-by-side
htdocs/admin/extensions/iframesites.php
View file @
421c5790
...
...
@@ -95,7 +95,7 @@ foreach ($iframesources as $url => $name) {
'name'
=>
'deleteurl_'
.
$i
,
'successcallback'
=>
'deleteurl_submit'
,
'renderer'
=>
'div'
,
'class'
=>
'form-inline form-as-button
pull
-right btn-group'
,
'class'
=>
'form-inline form-as-button
float
-right btn-group'
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'button'
,
...
...
htdocs/admin/users/suspended.php
View file @
421c5790
...
...
@@ -184,7 +184,7 @@ $form = pieform_instance(array(
'elements'
=>
array
(
'buttons'
=>
array
(
'type'
=>
'fieldset'
,
'class'
=>
'btn-group
pull
-right'
,
'class'
=>
'btn-group
float
-right'
,
'isformgroup'
=>
false
,
'elements'
=>
array
(
'unsuspend'
=>
array
(
...
...
htdocs/artefact/annotation/lib.php
View file @
421c5790
...
...
@@ -1385,7 +1385,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'renderer'
=>
'oneline'
,
'plugintype'
=>
'artefact'
,
'pluginname'
=>
'annotation'
,
'class'
=>
'form-as-button
pull
-left delete-comment btn-group-item'
,
'class'
=>
'form-as-button
float
-left delete-comment btn-group-item'
,
'jsform'
=>
true
,
'successcallback'
=>
'delete_annotation_feedback_submit'
,
'jssuccesscallback'
=>
'modifyAnnotationFeedbackSuccess'
,
...
...
htdocs/artefact/blog/lib.php
View file @
421c5790
...
...
@@ -593,7 +593,7 @@ class ArtefactTypeBlog extends ArtefactType {
'name'
=>
'delete_'
.
$id
,
'successcallback'
=>
'delete_blog_submit'
,
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-left btn-group-item'
,
'class'
=>
'form-as-button
float
-left btn-group-item'
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'button'
,
...
...
@@ -1241,7 +1241,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'jsform'
=>
true
,
'jssuccesscallback'
=>
'delete_success'
,
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-left'
,
'class'
=>
'form-as-button
float
-left'
,
'elements'
=>
array
(
'delete'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/artefact/comment/lib.php
View file @
421c5790
...
...
@@ -1030,7 +1030,7 @@ class ArtefactTypeComment extends ArtefactType {
'name'
=>
'delete_comment'
.
$id
,
'successcallback'
=>
'delete_comment_submit'
,
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-left delete-comment btn-group-item'
,
'class'
=>
'form-as-button
float
-left delete-comment btn-group-item'
,
'elements'
=>
array
(
'comment'
=>
array
(
'type'
=>
'hidden'
,
'value'
=>
$id
),
'submit'
=>
array
(
...
...
htdocs/artefact/internal/blocktype/textbox/lib.php
View file @
421c5790
...
...
@@ -402,7 +402,7 @@ EOF;
'managenotes'
=>
array
(
'type'
=>
'html'
,
'class'
=>
'd-none text-right'
,
'value'
=>
'<a href="'
.
$manageurl
.
'" class="
pull
-right">'
'value'
=>
'<a href="'
.
$manageurl
.
'" class="
float
-right">'
.
get_string
(
'managealltextboxcontent1'
,
'blocktype.internal/textbox'
)
.
' <span class="icon icon-arrow-right right" role="presentation"></span></a>'
,
),
'artefactid'
=>
self
::
artefactchooser_element
(
isset
(
$artefactid
)
?
$artefactid
:
null
),
...
...
htdocs/artefact/internal/index.php
View file @
421c5790
...
...
@@ -224,7 +224,7 @@ function get_desired_fields(&$allfields, $section) {
if
(
$section
==
'about'
)
{
$r
=
get_record_select
(
'view'
,
'type = ? AND owner = ?'
,
array
(
'profile'
,
$USER
->
id
),
'id'
);
$label
=
'<div id="profileicon" class="profile-icon pseudolabel
pull
-left"><a href="'
.
get_config
(
'wwwroot'
)
.
'artefact/file/profileicons.php" class="user-icon"><img src="'
$label
=
'<div id="profileicon" class="profile-icon pseudolabel
float
-left"><a href="'
.
get_config
(
'wwwroot'
)
.
'artefact/file/profileicons.php" class="user-icon"><img src="'
.
profile_icon_url
(
$USER
,
100
,
100
)
.
'" alt="'
.
get_string
(
"editprofileicon"
,
"artefact.file"
)
.
'"></a></div>'
;
$descr
=
''
.
get_string
(
'aboutprofilelinkdescription'
,
'artefact.internal'
,
get_config
(
'wwwroot'
)
.
'view/blocks.php?id='
.
$r
->
id
);
$descr
.
=
'<p>'
.
get_string
(
'aboutdescription'
,
'artefact.internal'
)
.
'</p>'
;
...
...
htdocs/collection/views.json.php
View file @
421c5790
...
...
@@ -137,7 +137,7 @@ if ($views) {
foreach
(
$views
[
'views'
]
as
&
$v
)
{
$v
->
remove
=
pieform
(
array
(
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-right'
,
'class'
=>
'form-as-button
float
-right'
,
'name'
=>
'removeview_'
.
$v
->
view
,
'successcallback'
=>
'removeview_submit'
,
'elements'
=>
array
(
...
...
htdocs/collection/views.php
View file @
421c5790
...
...
@@ -105,7 +105,7 @@ if ($views) {
foreach
(
$views
[
'views'
]
as
&
$v
)
{
$v
->
remove
=
pieform
(
array
(
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-right'
,
'class'
=>
'form-as-button
float
-right'
,
'name'
=>
'removeview_'
.
$v
->
view
,
'successcallback'
=>
'removeview_submit'
,
'elements'
=>
array
(
...
...
@@ -146,7 +146,7 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname)
);
$elements
[
'submit'
]
=
array
(
'class'
=>
'btn-primary
pull
-right add-pages'
,
'class'
=>
'btn-primary
float
-right add-pages'
,
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'value'
=>
'<span class="icon icon-arrow-right left" role="presentation" aria-hidden="true"></span>'
.
get_string
(
'addviews'
,
'collection'
),
...
...
htdocs/interaction/forum/view.php
View file @
421c5790
...
...
@@ -179,7 +179,7 @@ if ($membership && ( !isset($allowunsubscribe) || $allowunsubscribe == 1)) {
'plugintype'
=>
'interaction'
,
'pluginname'
=>
'forum'
,
'autofocus'
=>
false
,
'class'
=>
'form-as-button
pull
-left'
,
'class'
=>
'form-as-button
float
-left'
,
'elements'
=>
array
(
'submit'
=>
array
(
'type'
=>
'button'
,
...
...
htdocs/js/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
View file @
421c5790
...
...
@@ -203,7 +203,7 @@
if
(
d
.
inline
)
return
void
(
b
=
c
.
append
(
o
));
b
=
c
,
c
.
children
().
first
().
after
(
o
)
}
if
(
"
auto
"
===
g
&&
(
g
=
f
.
top
+
1.5
*
o
.
height
()
>=
a
(
window
).
height
()
+
a
(
window
).
scrollTop
()
&&
o
.
height
()
+
c
.
outerHeight
()
<
f
.
top
?
"
top
"
:
"
bottom
"
),
"
auto
"
===
h
&&
(
h
=
b
.
width
()
<
f
.
left
+
o
.
outerWidth
()
/
2
&&
f
.
left
+
o
.
outerWidth
()
>
a
(
window
).
width
()
?
"
right
"
:
"
left
"
),
"
top
"
===
g
?
o
.
addClass
(
"
top
"
).
removeClass
(
"
bottom
"
)
:
o
.
addClass
(
"
bottom
"
).
removeClass
(
"
top
"
),
"
right
"
===
h
?
o
.
addClass
(
"
pull
-right
"
)
:
o
.
removeClass
(
"
pull
-right
"
),
"
static
"
===
b
.
css
(
"
position
"
)
&&
(
b
=
b
.
parents
().
filter
(
function
()
{
if
(
"
auto
"
===
g
&&
(
g
=
f
.
top
+
1.5
*
o
.
height
()
>=
a
(
window
).
height
()
+
a
(
window
).
scrollTop
()
&&
o
.
height
()
+
c
.
outerHeight
()
<
f
.
top
?
"
top
"
:
"
bottom
"
),
"
auto
"
===
h
&&
(
h
=
b
.
width
()
<
f
.
left
+
o
.
outerWidth
()
/
2
&&
f
.
left
+
o
.
outerWidth
()
>
a
(
window
).
width
()
?
"
right
"
:
"
left
"
),
"
top
"
===
g
?
o
.
addClass
(
"
top
"
).
removeClass
(
"
bottom
"
)
:
o
.
addClass
(
"
bottom
"
).
removeClass
(
"
top
"
),
"
right
"
===
h
?
o
.
addClass
(
"
float
-right
"
)
:
o
.
removeClass
(
"
float
-right
"
),
"
static
"
===
b
.
css
(
"
position
"
)
&&
(
b
=
b
.
parents
().
filter
(
function
()
{
return
"
static
"
!==
a
(
this
).
css
(
"
position
"
)
}).
first
()),
0
===
b
.
length
)
throw
new
Error
(
"
datetimepicker component should be placed within a non-static positioned container
"
);
o
.
css
({
...
...
htdocs/js/customlayout.js
View file @
421c5790
...
...
@@ -26,11 +26,11 @@
newrow
.
find
(
'
label[for="selectcollayoutrow_
'
+
numrows
+
'
"]
'
).
attr
(
'
for
'
,
newid
).
html
(
labelValue2
);
if
((
oldremovebutton
=
$
(
newrow
).
find
(
'
button
'
)).
length
!=
0
)
{
oldremovebutton
.
attr
(
'
class
'
,
'
pull
-left btn btn-sm btn-secondary removecustomrow_
'
+
(
numrows
+
1
));
oldremovebutton
.
attr
(
'
class
'
,
'
float
-left btn btn-sm btn-secondary removecustomrow_
'
+
(
numrows
+
1
));
}
else
{
// warning: classes are modified above for any subsequent button instances
newrow
.
append
(
'
<button name="removerow" class="
pull
-left btn btn-sm btn-secondary removecustomrow_
'
+
(
numrows
+
1
)
+
'
" onclick="CustomLayoutManager.customlayout_remove_row(
\'
'
+
pieformname
+
'
\'
, this)"><span class="icon icon-lg icon-trash text-danger"></span><span class="d-none d-sm-block pls">
'
+
get_string
(
'
removethisrow
'
,
'
view
'
)
+
'
</span></button>
'
);
newrow
.
append
(
'
<button name="removerow" class="
float
-left btn btn-sm btn-secondary removecustomrow_
'
+
(
numrows
+
1
)
+
'
" onclick="CustomLayoutManager.customlayout_remove_row(
\'
'
+
pieformname
+
'
\'
, this)"><span class="icon icon-lg icon-trash text-danger"></span><span class="d-none d-sm-block pls">
'
+
get_string
(
'
removethisrow
'
,
'
view
'
)
+
'
</span></button>
'
);
}
$
(
'
#customrow_
'
+
numrows
).
after
(
newrow
);
$
(
'
#
'
+
pieformname
+
'
_customlayoutnumrows
'
).
val
(
numrows
+
1
);
...
...
htdocs/js/mahara.js
View file @
421c5790
...
...
@@ -554,7 +554,7 @@ function contextualHelp(formName, helpName, pluginType, pluginName, page, sectio
*/
function
buildContextualHelpBox
(
content
)
{
contextualHelpContainer
.
html
(
'
<div class="
pull
-right pts">
'
+
'
<div class="
float
-right pts">
'
+
'
<a href="" class="help-dismiss" onclick="return false;">
'
+
'
<span class="icon icon-remove"></span>
'
+
'
<span class="sr-only">
'
+
get_string
(
'
closehelp
'
)
+
'
</span>
'
+
...
...
htdocs/lib/form/elements/layout.php
View file @
421c5790
...
...
@@ -70,8 +70,8 @@ function pieform_element_layout(Pieform $form, $element) {
.
'</div>'
.
'<div id="customrows" class="col-xs-12 col-sm-10">'
.
'<div id="customrow_1" class="customrow form-group five-across multi-label clearfix" style="border-bottom: 0px !important;">'
.
'<div class="customrowtitle
pull
-left field"><strong>'
.
get_string
(
'Row'
,
'view'
)
.
' 1</strong></div>'
.
'<div class="
pull
-left field field-selectnumcols">'
.
'<div class="customrowtitle
float
-left field"><strong>'
.
get_string
(
'Row'
,
'view'
)
.
' 1</strong></div>'
.
'<div class="
float
-left field field-selectnumcols">'
.
'<label for="selectnumcolsrow_1"><span class="sr-only">'
.
get_string
(
'Row'
,
'view'
)
.
' 1: </span>'
.
get_string
(
'numberofcolumns'
,
'view'
)
.
'</label>'
.
'<select name="selectnumcols" id="selectnumcolsrow_1" class="selectnumcols input-sm" onchange="CustomLayoutManager.customlayout_change_numcolumns(\''
.
$form
->
get_property
(
'name'
)
.
'\', this)">'
;
foreach
(
$element
[
'clnumcolumnsoptions'
]
as
$value
=>
$data
)
{
...
...
@@ -79,7 +79,7 @@ function pieform_element_layout(Pieform $form, $element) {
}
$output
.
=
'</select></div>'
.
'<div class="
pull
-left field">'
.
'<div class="
float
-left field">'
.
'<label for="selectcollayoutrow_1"><span class="sr-only">'
.
get_string
(
'Row'
,
'view'
)
.
' 1: </span>'
.
get_string
(
'columnlayout'
,
'view'
)
.
'</label>'
.
'<select name="selectcollayout" id="selectcollayoutrow_1" class="selectcollayout input-sm" onchange="CustomLayoutManager.customlayout_change_column_layout(\''
.
$form
->
get_property
(
'name'
)
.
'\')">'
;
foreach
(
$element
[
'columnlayoutoptions'
]
as
$value
=>
$data
)
{
...
...
htdocs/lib/group.php
View file @
421c5790
...
...
@@ -1313,13 +1313,13 @@ function group_get_accept_form($name, $groupid) {
'accept'
=>
array
(
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn-secondary form-as-button
pull
-left'
,
'class'
=>
'btn-secondary form-as-button
float
-left'
,
'value'
=>
'<span class="icon icon-lg icon-check text-success left" role="presentation" aria-hidden="true"></span> '
.
get_string
(
'acceptinvitegroup'
,
'group'
)
),
'decline'
=>
array
(
'type'
=>
'button'
,
'usebuttontag'
=>
true
,
'class'
=>
'btn-secondary form-as-button
pull
-left'
,
'class'
=>
'btn-secondary form-as-button
float
-left'
,
'value'
=>
'<span class="icon icon-lg icon-ban text-danger left" role="presentation" aria-hidden="true"></span> '
.
get_string
(
'declineinvitegroup'
,
'group'
)
)
),
...
...
@@ -1340,7 +1340,7 @@ function group_get_adduser_form($userid, $groupid) {
'name'
=>
'adduser'
.
$userid
,
'successcallback'
=>
'group_adduser_submit'
,
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-left'
,
'class'
=>
'form-as-button
float
-left'
,
'elements'
=>
array
(
'group'
=>
array
(
'type'
=>
'hidden'
,
...
...
@@ -1373,7 +1373,7 @@ function group_get_removeuser_form($userid, $groupid) {
'validatecallback'
=>
'group_removeuser_validate'
,
'successcallback'
=>
'group_removeuser_submit'
,
'renderer'
=>
'div'
,
'class'
=>
'
pull
-left'
,
'class'
=>
'
float
-left'
,
'elements'
=>
array
(
'group'
=>
array
(
'type'
=>
'hidden'
,
...
...
@@ -1405,7 +1405,7 @@ function group_get_denyuser_form($userid, $groupid) {
'name'
=>
'denyuser'
.
$userid
,
'successcallback'
=>
'group_denyuser_submit'
,
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-left'
,
'class'
=>
'form-as-button
float
-left'
,
'elements'
=>
array
(
'group'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/lib/pieforms/pieform/elements/fieldset.php
View file @
421c5790
...
...
@@ -74,7 +74,7 @@ function pieform_element_fieldset(Pieform $form, $element) {
$legendcontent
.
=
'<span class="icon-fieldset icon icon-'
.
$element
[
'iconclass'
]
.
'" role="presentation" aria-hidden="true"> </span>'
;
}
$legendcontent
.
=
Pieform
::
hsc
(
$element
[
'legend'
]);
$legendcontent
.
=
'<span class="icon icon-chevron-down collapse-indicator right
pull
-right" role="presentation" aria-hidden="true"> </span> '
;
$legendcontent
.
=
'<span class="icon icon-chevron-down collapse-indicator right
float
-right" role="presentation" aria-hidden="true"> </span> '
;
$legendcontent
.
=
'</a>'
;
}
...
...
htdocs/lib/statistics.php
View file @
421c5790
...
...
@@ -4379,7 +4379,7 @@ function report_config_form($extra, $institutionelement) {
'plugintype'
=>
'core'
,
'pluginname'
=>
'admin'
,
'renderer'
=>
'div'
,
'class'
=>
'form-as-button
pull
-left'
,
'class'
=>
'form-as-button
float
-left'
,
'elements'
=>
array
(
'type'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/lib/upgrade.php
View file @
421c5790
...
...
@@ -1496,7 +1496,7 @@ function activate_plugin_form($plugintype, $plugin) {
'renderer'
=>
'div'
,
'elementclasses'
=>
false
,
'successcallback'
=>
'activate_plugin_submit'
,
'class'
=>
'form-inline form-as-button
pull
-left last btn-group-item'
,
'class'
=>
'form-inline form-as-button
float
-left last btn-group-item'
,
'jsform'
=>
false
,
'action'
=>
get_config
(
'wwwroot'
)
.
'admin/extensions/pluginconfig.php'
,
'elements'
=>
array
(
...
...
htdocs/lib/user.php
View file @
421c5790
...
...
@@ -2362,7 +2362,7 @@ function addfriend_form($friendid) {
'successcallback'
=>
'addfriend_submit'
,
'renderer'
=>
'div'
,
'autofocus'
=>
'false'
,
'class'
=>
'form-as-button
pull
-right'
,
'class'
=>
'form-as-button
float
-right'
,
'elements'
=>
array
(
'addfriend_submit'
=>
array
(
'type'
=>
'button'
,
...
...
htdocs/lib/view.php
View file @
421c5790
...
...
@@ -7277,7 +7277,7 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
'pluginname'
=>
'view'
,
'renderer'
=>
'div'
,
'successcallback'
=>
'createview_submit'
,
'class'
=>
'form-as-button
pull
-left'
,
'class'
=>
'form-as-button
float
-left'
,
'elements'
=>
array
(
'new'
=>
array
(
'type'
=>
'hidden'
,
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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