diff --git a/core/modules/block/block.install b/core/modules/block/block.install index 6afbc9f..c16e50a 100644 --- a/core/modules/block/block.install +++ b/core/modules/block/block.install @@ -9,163 +9,6 @@ * Implements hook_schema(). */ function block_schema() { - $schema['block'] = array( - 'description' => 'Stores block settings, such as region and visibility settings.', - 'fields' => array( - 'bid' => array( - 'type' => 'serial', - 'not null' => TRUE, - 'description' => 'Primary Key: Unique block ID.', - ), - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => "The module from which the block originates; for example, 'user' for the Who's Online block, and 'block' for any custom blocks.", - ), - 'delta' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'default' => '0', - 'description' => 'Unique ID for block within a module.', - ), - 'theme' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'The theme under which the block settings apply.', - ), - 'status' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Block enabled status. (1 = enabled, 0 = disabled)', - ), - 'weight' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => 'Block weight within region.', - ), - 'region' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Theme region within which the block is set.', - ), - 'custom' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Flag to indicate how users may control visibility of the block. (0 = Users cannot control, 1 = On by default, but can be hidden, 2 = Hidden by default, but can be shown)', - ), - 'visibility' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'size' => 'tiny', - 'description' => 'Flag to indicate how to show blocks on pages. (0 = Show on all pages except listed pages, 1 = Show only on listed pages, 2 = Use custom PHP code to determine visibility)', - ), - 'pages' => array( - 'type' => 'text', - 'not null' => TRUE, - 'description' => 'Contents of the "Pages" block; contains either a list of paths on which to include/exclude the block or PHP code, depending on "visibility" setting.', - ), - 'title' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'description' => 'Custom title for the block. (Empty string will use block default title, will remove the title, text will cause block to use specified title.)', - 'translatable' => TRUE, - ), - 'cache' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 1, - 'size' => 'tiny', - 'description' => 'Binary flag to indicate block cache mode. (-2: Custom cache, -1: Do not cache, 1: Cache per role, 2: Cache per user, 4: Cache per page, 8: Block cache global) See DRUPAL_CACHE_* constants in ../includes/common.inc for more detailed information.', - ), - ), - 'primary key' => array('bid'), - 'unique keys' => array( - 'tmd' => array('theme', 'module', 'delta'), - ), - 'indexes' => array( - 'list' => array('theme', 'status', 'region', 'weight', 'module'), - ), - ); - - $schema['block_role'] = array( - 'description' => 'Sets up access permissions for blocks based on user roles', - 'fields' => array( - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'description' => "The block's origin module, from {block}.module.", - ), - 'delta' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'description' => "The block's unique delta within module, from {block}.delta.", - ), - 'rid' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'description' => "The user's role ID from {users_roles}.rid.", - ), - ), - 'primary key' => array('module', 'delta', 'rid'), - 'indexes' => array( - 'rid' => array('rid'), - ), - 'foreign keys' => array( - 'role' => array( - 'table' => 'role', - 'columns' => array('rid' => 'rid'), - ), - ), - ); - - $schema['block_language'] = array( - 'description' => 'Sets up display criteria for blocks based on langcode', - 'fields' => array( - 'module' => array( - 'type' => 'varchar', - 'length' => 64, - 'not null' => TRUE, - 'description' => "The block's origin module, from {block}.module.", - ), - 'delta' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'description' => "The block's unique delta within module, from {block}.delta.", - ), - 'type' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'description' => "Language type name. Applied to filter the block by that type.", - ), - 'langcode' => array( - 'type' => 'varchar', - 'length' => 32, - 'not null' => TRUE, - 'description' => "The machine-readable name of this language from {language}.langcode.", - ), - ), - 'primary key' => array('module', 'delta', 'type', 'langcode'), - ); $schema['cache_block'] = drupal_get_schema_unprocessed('system', 'cache'); $schema['cache_block']['description'] = 'Cache table for the Block module to store already built blocks, identified by module, delta, and various contexts which may change the block, such as theme, locale, and caching mode defined for the block.'; diff --git a/core/profiles/standard/config/plugin.core.block.bartik.footer.yml b/core/profiles/standard/config/plugin.core.block.bartik.footer.yml index d1c0c36..7b6f9b7 100644 --- a/core/profiles/standard/config/plugin.core.block.bartik.footer.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.footer.yml @@ -1,7 +1,7 @@ id: 'system_menu_block:menu-footer' status: '1' cache: '-1' -subject: 'System Menu: Footer menu' +subject: 'Footer menu' visibility: path: visibility: '0' diff --git a/core/profiles/standard/config/plugin.core.block.bartik.login.yml b/core/profiles/standard/config/plugin.core.block.bartik.login.yml index 6eeeb34..8d8923a 100644 --- a/core/profiles/standard/config/plugin.core.block.bartik.login.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.login.yml @@ -13,7 +13,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'User login' module: user region: sidebar_first weight: '0' diff --git a/core/profiles/standard/config/plugin.core.block.bartik.navigation.yml b/core/profiles/standard/config/plugin.core.block.bartik.navigation.yml index a20b790..f16c6f4 100644 --- a/core/profiles/standard/config/plugin.core.block.bartik.navigation.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.navigation.yml @@ -12,7 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'Main navigation' module: system region: sidebar_first weight: '0' diff --git a/core/profiles/standard/config/plugin.core.block.bartik.search.yml b/core/profiles/standard/config/plugin.core.block.bartik.search.yml index 52a5788..466659b 100644 --- a/core/profiles/standard/config/plugin.core.block.bartik.search.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.search.yml @@ -12,7 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'Search' module: search region: sidebar_first weight: '0' diff --git a/core/profiles/standard/config/plugin.core.block.bartik.tools.yml b/core/profiles/standard/config/plugin.core.block.bartik.tools.yml index 5e8b188..d6a38c9 100644 --- a/core/profiles/standard/config/plugin.core.block.bartik.tools.yml +++ b/core/profiles/standard/config/plugin.core.block.bartik.tools.yml @@ -12,7 +12,7 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'Tools' module: system region: sidebar_first weight: '0' diff --git a/core/profiles/standard/config/plugin.core.block.seven.login.yml b/core/profiles/standard/config/plugin.core.block.seven.login.yml index dbbcfac..8352fab 100644 --- a/core/profiles/standard/config/plugin.core.block.seven.login.yml +++ b/core/profiles/standard/config/plugin.core.block.seven.login.yml @@ -14,6 +14,6 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'User login' module: user weight: '-3' diff --git a/core/profiles/standard/config/plugin.core.block.seven.navigation.yml b/core/profiles/standard/config/plugin.core.block.seven.navigation.yml index 879191e..7fc3e2c 100644 --- a/core/profiles/standard/config/plugin.core.block.seven.navigation.yml +++ b/core/profiles/standard/config/plugin.core.block.seven.navigation.yml @@ -13,6 +13,6 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'Main navigation' module: system weight: '-2' diff --git a/core/profiles/standard/config/plugin.core.block.seven.search.yml b/core/profiles/standard/config/plugin.core.block.seven.search.yml index e3cf4c3..081dfca 100644 --- a/core/profiles/standard/config/plugin.core.block.seven.search.yml +++ b/core/profiles/standard/config/plugin.core.block.seven.search.yml @@ -13,6 +13,6 @@ visibility: article: '0' page: '0' visibility__active_tab: edit-visibility-path -subject: '' +subject: 'Search' module: search weight: '-1' diff --git a/core/profiles/standard/standard.info b/core/profiles/standard/standard.info index fae6d76..4d6e85b 100644 --- a/core/profiles/standard/standard.info +++ b/core/profiles/standard/standard.info @@ -11,6 +11,7 @@ dependencies[] = config dependencies[] = comment dependencies[] = contextual dependencies[] = contact +dependencies[] = custom_block dependencies[] = help dependencies[] = image dependencies[] = menu