Commit 7780a148 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes from topic 'WR 303474'

* changes:
  Bug 1813987: removing static class in blocks
  Bug 1813987:testing removing float mode in grid layout
  Bug 1813987: many fixes for gridstack
parents b206c8ef 0e7ce5c1
......@@ -45,10 +45,6 @@ class PluginBlocktypeAnnotation extends MaharaCoreBlocktype {
return $view->get('group') == null;
}
public static function has_static_content() {
return false;
}
/**
* defines if the title should be shown if there is no content in the block
*
......
......@@ -278,5 +278,4 @@ class PluginBlocktypeBlog extends MaharaCoreBlocktype {
. $configdata['artefactid'] . '&view=' . $instance->get('view');
}
}
}
......@@ -550,11 +550,6 @@ EOF;
public static function allowed_in_view(View $view) {
return $view->get('owner') != null;
}
public static function has_static_content() {
return false;
}
}
function translate_ids_to_tags(array $ids) {
......
......@@ -108,8 +108,4 @@ class PluginBlocktypeComment extends MaharaCoreBlocktype {
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -447,8 +447,4 @@ class PluginBlocktypeProfileinfo extends MaharaCoreBlocktype {
public static function import_create_blockinstance_leap(array $biconfig, array $viewconfig) {
return PluginArtefactInternal::import_create_blockinstance_leap($biconfig, $viewconfig);
}
public static function has_static_content() {
return false;
}
}
......@@ -243,8 +243,4 @@ class PluginBlocktypeSocialprofile extends MaharaCoreBlocktype {
return PluginArtefactInternal::import_create_blockinstance_leap($biconfig, $viewconfig);
}
public static function has_static_content() {
return false;
}
}
......@@ -174,8 +174,4 @@ class PluginBlocktypePeerassessment extends MaharaCoreBlocktype {
$artefacts = get_records_sql_array($sql, $values);
return $artefacts;
}
public static function has_static_content() {
return false;
}
}
......@@ -234,8 +234,4 @@ class PluginBlocktypePlans extends MaharaCoreBlocktype {
}
return $artefacts;
}
public static function has_static_content() {
return false;
}
}
......@@ -173,8 +173,4 @@ class PluginBlocktypeEntireresume extends MaharaCoreBlocktype {
public static function allowed_in_view(View $view) {
return true;
}
public static function has_static_content() {
return false;
}
}
......@@ -636,8 +636,4 @@ class PluginBlocktypeExternalfeed extends MaharaCoreBlocktype {
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -475,8 +475,4 @@ class PluginBlocktypeGroupViews extends MaharaCoreBlocktype {
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -177,7 +177,4 @@ class PluginBlocktypeInbox extends MaharaCoreBlocktype {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -777,10 +777,6 @@ EOF;
public static function display_for_roles($roles) {
return !(count($roles) == 1 && $roles[0] == 'peer');
}
public static function has_static_content() {
return true;
}
}
......@@ -1252,7 +1248,7 @@ class BlockInstance {
$smarty->assign('strremovetitletexttooltip', get_string('removeblock2', 'view'));
$smarty->assign('lockblocks', ($this->get_view()->get('lockblocks') && $this->get_view()->get('owner'))); // Only lock blocks for user's portfolio pages
if (!$configure && $title) {
if ( $title) {
$configdata = $this->get('configdata');
if (isset($configdata['retractable']) && $configdata['retractable']) {
$smarty->assign('retractable', true);
......
......@@ -178,8 +178,4 @@ class PluginBlocktypeMyfriends extends MaharaCoreBlocktype {
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -181,7 +181,4 @@ class PluginBlocktypeMyGroups extends MaharaCoreBlocktype {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -148,8 +148,4 @@ class PluginBlocktypeMyviews extends MaharaCoreBlocktype {
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -98,7 +98,4 @@ class PluginBlocktypeNewViews extends MaharaCoreBlocktype {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -240,8 +240,4 @@ class PluginBlocktypeRecentForumPosts extends MaharaCoreBlocktype {
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
......@@ -345,10 +345,6 @@ EOF;
public static function get_artefacts(BlockInstance $instance) {
return array();
}
public static function has_static_content() {
return false;
}
}
class ActivityTypeBlocktypeWallWallpost extends ActivityTypePlugin {
......
......@@ -396,8 +396,4 @@ class PluginBlocktypeWatchlist extends MaharaCoreBlocktype {
return array($views, count($views));
}
public static function has_static_content() {
return false;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment