? CHANGELOG.000 ? CHANGELOG.001 Index: database/database.mysql =================================================================== RCS file: /cvs/drupal/drupal/database/database.mysql,v retrieving revision 1.177 diff -u -r1.177 database.mysql --- database/database.mysql 12 Apr 2005 18:52:47 -0000 1.177 +++ database/database.mysql 18 Apr 2005 14:50:20 -0000 @@ -122,7 +122,7 @@ delta varchar(32) NOT NULL default '0', status tinyint(2) DEFAULT '0' NOT NULL, weight tinyint(1) DEFAULT '0' NOT NULL, - region tinyint(1) DEFAULT '0' NOT NULL, + region varchar(64) DEFAULT '' NOT NULL, custom tinyint(2) DEFAULT '0' NOT NULL, throttle tinyint(1) DEFAULT '0' NOT NULL, visibility tinyint(1) DEFAULT '0' NOT NULL, Index: database/updates.inc =================================================================== RCS file: /cvs/drupal/drupal/database/updates.inc,v retrieving revision 1.108 diff -u -r1.108 updates.inc --- database/updates.inc 16 Apr 2005 08:01:48 -0000 1.108 +++ database/updates.inc 18 Apr 2005 14:53:49 -0000 @@ -109,6 +109,7 @@ "2005-04-10" => "update_130", "2005-04-11" => "update_131", "2005-04-14" => "update_132" + "2005-04-18" => "update_133" ); function update_32() { @@ -2405,6 +2406,16 @@ return $ret; } +function update_133() { + $ret = array(); + + $ret[] = update_sql("ALTER TABLE {blocks} CHANGE region region varchar(64) default '' NOT NULL"); + $ret[] = update_sql("UPDATE {blocks} SET region = 'left' WHERE region = '0'"); + $ret[] = update_sql("UPDATE {blocks} SET region = 'right' WHERE region = '1'"); + + return $ret; +} + function update_sql($sql) { $edit = $_POST["edit"]; $result = db_query($sql); Index: modules/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block.module,v retrieving revision 1.163 diff -u -r1.163 block.module --- modules/block.module 12 Apr 2005 18:52:47 -0000 1.163 +++ modules/block.module 18 Apr 2005 15:10:34 -0000 @@ -14,7 +14,7 @@ case 'admin/help#block': return t('

Blocks are the boxes visible in the sidebar(s) of your web site. These are usually generated automatically by modules (e.g. recent forum topics), but you can also create your own blocks.

-

The sidebar each block appears in depends on both which theme you are using (some are left-only, some right, some both), and on the settings in block management.

+

The region each block appears in depends on both which theme you are using (some are left-only, some right, some both, and some may offer other regions), and on the settings in block management.

The block management screen lets you specify the vertical sort-order of the blocks within a sidebar. You do this by assigning a weight to each block. Lighter blocks (smaller weight) "float up" towards the top of the sidebar. Heavier ones "sink down" towards the bottom of it.

A block\'s visibility depends on: