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
moodle
moodle
Commits
d1c884a5
Commit
d1c884a5
authored
May 01, 2019
by
Luca Bösch
Browse files
MDL-65448 block_social_activities: Restyle moving.
parent
411432c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
blocks/social_activities/block_social_activities.php
View file @
d1c884a5
...
...
@@ -83,7 +83,6 @@ class block_social_activities extends block_list {
$section
=
$modinfo
->
get_section_info
(
0
);
if
(
$ismoving
)
{
$strmovehere
=
get_string
(
'movehere'
);
$strmovefull
=
strip_tags
(
get_string
(
'movefull'
,
''
,
"'
$USER->activitycopyname
'"
));
$strcancel
=
get_string
(
'cancel'
);
}
else
{
...
...
@@ -92,7 +91,8 @@ class block_social_activities extends block_list {
if
(
$ismoving
)
{
$this
->
content
->
icons
[]
=
' '
.
$OUTPUT
->
pix_icon
(
't/move'
,
get_string
(
'move'
));
$this
->
content
->
items
[]
=
$USER
->
activitycopyname
.
' (<a href="'
.
$CFG
->
wwwroot
.
'/course/mod.php?cancelcopy=true&sesskey='
.
sesskey
()
.
'">'
.
$strcancel
.
'</a>)'
;
$cancelurl
=
new
moodle_url
(
'/course/mod.php'
,
array
(
'cancelcopy'
=>
'true'
,
'sesskey'
=>
sesskey
()));
$this
->
content
->
items
[]
=
$USER
->
activitycopyname
.
' (<a href="'
.
$cancelurl
.
'">'
.
$strcancel
.
'</a>)'
;
}
if
(
!
empty
(
$modinfo
->
sections
[
0
]))
{
...
...
@@ -123,8 +123,9 @@ class block_social_activities extends block_list {
if
(
$mod
->
id
==
$USER
->
activitycopy
)
{
continue
;
}
$this
->
content
->
items
[]
=
'<a title="'
.
$strmovefull
.
'" href="'
.
$CFG
->
wwwroot
.
'/course/mod.php?moveto='
.
$mod
->
id
.
'&sesskey='
.
sesskey
()
.
'">'
.
'<img style="height:16px; width:80px; border:0px" src="'
.
$OUTPUT
->
image_url
(
'movehere'
)
.
'" alt="'
.
$strmovehere
.
'" /></a>'
;
$movingurl
=
new
moodle_url
(
'/course/mod.php'
,
array
(
'moveto'
=>
$mod
->
id
,
'sesskey'
=>
sesskey
()));
$this
->
content
->
items
[]
=
html_writer
::
link
(
$movingurl
,
''
,
array
(
'title'
=>
$strmovefull
,
'class'
=>
'movehere'
));
$this
->
content
->
icons
[]
=
''
;
}
if
(
!
$mod
->
url
)
{
...
...
@@ -140,8 +141,8 @@ class block_social_activities extends block_list {
}
if
(
$ismoving
)
{
$
this
->
content
->
items
[]
=
'<a title="'
.
$strmovefull
.
'" href="'
.
$CFG
->
wwwroot
.
'/course/mod.php
?
movetosection
='
.
$section
->
id
.
'&
sesskey
='
.
sesskey
()
.
'">'
.
'<img style="height:16px; width:80px; border:0px" src="'
.
$OUTPUT
->
image_url
(
'movehere'
)
.
'" alt="'
.
$strmovehere
.
'" /></a>'
;
$
movingurl
=
new
moodle_url
(
'/course/mod.php
'
,
array
(
'
movetosection
'
=>
$section
->
id
,
'
sesskey
'
=>
sesskey
()
));
$this
->
content
->
items
[]
=
html_writer
::
link
(
$movingurl
,
''
,
array
(
'title'
=>
$strmovefull
,
'class'
=>
'movehere'
))
;
$this
->
content
->
icons
[]
=
''
;
}
...
...
theme/boost/scss/moodle/grade.scss
View file @
d1c884a5
...
...
@@ -276,6 +276,17 @@
padding-left
:
24px
;
}
td
.movehere
{
padding
:
0
;
}
td
.movehere
a
.movehere
{
display
:
block
;
width
:
100%
;
height
:
2rem
;
border
:
2px
dashed
$brand-primary
;
}
.category
input
[
type
=
"text"
],
.category
.column-range
,
.categoryitem
,
...
...
theme/boost/style/moodle.css
View file @
d1c884a5
...
...
@@ -18351,6 +18351,15 @@ p.arrow_button {
.path-grade-edit-tree
.setup-grades
td
.column-name
{
padding-left
:
24px
;
}
.path-grade-edit-tree
.setup-grades
td
.movehere
{
padding
:
0
;
}
.path-grade-edit-tree
.setup-grades
td
.movehere
a
.movehere
{
display
:
block
;
width
:
100%
;
height
:
2rem
;
border
:
2px
dashed
#1177d1
;
}
.path-grade-edit-tree
.setup-grades
.category
input
[
type
=
"text"
],
.path-grade-edit-tree
.setup-grades
.category
.column-range
,
.path-grade-edit-tree
.setup-grades
.categoryitem
,
...
...
theme/classic/style/moodle.css
View file @
d1c884a5
...
...
@@ -18583,6 +18583,15 @@ p.arrow_button {
.path-grade-edit-tree
.setup-grades
td
.column-name
{
padding-left
:
24px
;
}
.path-grade-edit-tree
.setup-grades
td
.movehere
{
padding
:
0
;
}
.path-grade-edit-tree
.setup-grades
td
.movehere
a
.movehere
{
display
:
block
;
width
:
100%
;
height
:
2rem
;
border
:
2px
dashed
#1177d1
;
}
.path-grade-edit-tree
.setup-grades
.category
input
[
type
=
"text"
],
.path-grade-edit-tree
.setup-grades
.category
.column-range
,
.path-grade-edit-tree
.setup-grades
.categoryitem
,
...
...
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