From 199333208d16ffe734ee85ef4a00d7d34cce252d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Luca=20B=C3=B6sch?= Date: Wed, 1 May 2019 11:54:09 +0200 Subject: [PATCH] MDL-65448 block_social_activities: Restyle moving. --- .../social_activities/block_social_activities.php | 13 +++++++------ theme/boost/scss/moodle/grade.scss | 11 +++++++++++ theme/boost/style/moodle.css | 9 +++++++++ theme/classic/style/moodle.css | 9 +++++++++ 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index 2e5ec902fd9..35c651b94fe 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -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.' ('.$strcancel.')'; + $cancelurl = new moodle_url('/course/mod.php', array('cancelcopy' => 'true', 'sesskey' => sesskey())); + $this->content->items[] = $USER->activitycopyname . ' (' . $strcancel . ')'; } 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[] = ''. - ''.$strmovehere.''; + $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[] = ''. - ''.$strmovehere.''; + $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[] = ''; } diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss index a97af4d458a..4d09195e602 100644 --- a/theme/boost/scss/moodle/grade.scss +++ b/theme/boost/scss/moodle/grade.scss @@ -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, diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 6576a026e56..896afdc41bc 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -18360,6 +18360,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, diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index cfb53dc13fb..99673a9d56f 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -18592,6 +18592,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, -- 2.43.0