Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle

Conflicts:
	lib/upgrade.txt
  • Loading branch information...
commit df9bdfb0004e6e331faf9968840f023f10ae6802 2 parents 3b597dd + 6671fa7
@damyon damyon authored
View
3  lang/en/block.php
@@ -47,7 +47,8 @@
$string['hidedockpanel'] = 'Hide the dock panel';
$string['hidepanel'] = 'Hide panel';
$string['moveblock'] = 'Move {$a} block';
-$string['moveblockhere'] = 'Move block here';
+$string['moveblockafter'] = 'Move block to after {$a} block';
+$string['moveblockbefore'] = 'Move block to before {$a} block';
$string['movingthisblockcancel'] = 'Moving this block ({$a})';
$string['onthispage'] = 'On this page';
$string['pagetypes'] = 'Page types';
View
6 lib/blocklib.php
@@ -945,8 +945,6 @@ protected function create_block_contents($instances, $output, $region) {
if ($first) {
$lastweight = $first->instance->weight - 2;
}
-
- $strmoveblockhere = get_string('moveblockhere', 'block');
}
foreach ($instances as $instance) {
@@ -957,7 +955,7 @@ protected function create_block_contents($instances, $output, $region) {
if ($this->movingblock && $lastweight != $instance->instance->weight &&
$content->blockinstanceid != $this->movingblock && $lastblock != $this->movingblock) {
- $results[] = new block_move_target($strmoveblockhere, $this->get_move_target_url($region, ($lastweight + $instance->instance->weight)/2));
+ $results[] = new block_move_target($this->get_move_target_url($region, ($lastweight + $instance->instance->weight)/2));
}
if ($content->blockinstanceid == $this->movingblock) {
@@ -972,7 +970,7 @@ protected function create_block_contents($instances, $output, $region) {
}
if ($this->movingblock && $lastblock != $this->movingblock) {
- $results[] = new block_move_target($strmoveblockhere, $this->get_move_target_url($region, $lastweight + 1));
+ $results[] = new block_move_target($this->get_move_target_url($region, $lastweight + 1));
}
return $results;
}
View
9 lib/outputcomponents.php
@@ -2498,17 +2498,10 @@ class block_move_target {
public $url;
/**
- * @var string label
- */
- public $text;
-
- /**
* Constructor
- * @param string $text
* @param moodle_url $url
*/
- public function __construct($text, moodle_url $url) {
- $this->text = $text;
+ public function __construct(moodle_url $url) {
$this->url = $url;
}
}
View
22 lib/outputrenderers.php
@@ -1218,13 +1218,20 @@ public function list_block_contents($icons, $items) {
*/
public function blocks_for_region($region) {
$blockcontents = $this->page->blocks->get_content_for_region($region, $this);
-
+ $blocks = $this->page->blocks->get_blocks_for_region($region);
+ $lastblock = null;
+ $zones = array();
+ foreach ($blocks as $block) {
+ $zones[] = $block->title;
+ }
$output = '';
+
foreach ($blockcontents as $bc) {
if ($bc instanceof block_contents) {
$output .= $this->block($bc, $region);
+ $lastblock = $bc->title;
} else if ($bc instanceof block_move_target) {
- $output .= $this->block_move_target($bc);
+ $output .= $this->block_move_target($bc, $zones, $lastblock);
} else {
throw new coding_exception('Unexpected type of thing (' . get_class($bc) . ') found in list of block contents.');
}
@@ -1236,10 +1243,17 @@ public function blocks_for_region($region) {
* Output a place where the block that is currently being moved can be dropped.
*
* @param block_move_target $target with the necessary details.
+ * @param array $zones array of areas where the block can be moved to
+ * @param string $previous the block located before the area currently being rendered.
* @return string the HTML to be output.
*/
- public function block_move_target($target) {
- return html_writer::tag('a', html_writer::tag('span', $target->text, array('class' => 'accesshide')), array('href' => $target->url, 'class' => 'blockmovetarget'));
+ public function block_move_target($target, $zones, $previous) {
+ if ($previous == null) {
+ $position = get_string('moveblockbefore', 'block', $zones[0]);
+ } else {
+ $position = get_string('moveblockafter', 'block', $previous);
+ }
+ return html_writer::tag('a', html_writer::tag('span', $position, array('class' => 'accesshide')), array('href' => $target->url, 'class' => 'blockmovetarget'));
}
/**
View
1  lib/upgrade.txt
@@ -42,6 +42,7 @@ information provided here is intended especially for developers.
category_delete_move(), category_delete_full(), move_category(), course_category_hide(),
course_category_show(), get_course_category(), create_course_category(), get_all_subcategories(),
get_child_categories(), get_categories()
+* output renderer changed to support more verbose move-block-here descriptions.
Database (DML) layer:
* $DB->sql_empty() is deprecated, you have to use sql parameters with empty values instead,
View
11 theme/mymobile/renderers.php
@@ -697,16 +697,23 @@ public function notification($message, $classes = 'notifyproblem') {
*/
public function blocks_for_region($region) {
$blockcontents = $this->page->blocks->get_content_for_region($region, $this);
-
+ $blocks = $this->page->blocks->get_blocks_for_region($region);
+ $lastblock = null;
+ $zones = array();
+ foreach ($blocks as $block) {
+ $zones[] = $block->title;
+ }
+
$output = '';
foreach ($blockcontents as $bc) {
if ($bc instanceof block_contents) {
+ $lastblock = $bc->title;
// We don't want to print navigation and settings blocks here.
if ($bc->attributes['class'] != 'block_settings block' && $bc->attributes['class'] != 'block_navigation block') {
$output .= $this->block($bc, $region);
}
} else if ($bc instanceof block_move_target) {
- $output .= $this->block_move_target($bc);
+ $output .= $this->block_move_target($bc, $zones, $lastblock);
} else {
throw new coding_exception('Unexpected type of thing (' . get_class($bc) . ') found in list of block contents.');
}
View
3  theme/upgrade.txt
@@ -9,6 +9,9 @@ DOM changes:
allows themes to use different CSS reset normalisers such as cssnormalize YUI module
* Re-wrote the user profile views to definition lists.
+Renderer changes:
+* Mymobile theme changed to support more verbose move-block-here descriptions.
+
=== 2.4 ===
required changes:
Please sign in to comment.
Something went wrong with that request. Please try again.