Tim Almdal 612bc3f091 Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev ...

Conflicts:
	modules/gallery/helpers/block_manager.php
	modules/gallery/libraries/Theme_View.php
	modules/image_block/helpers/image_block_block.php
	modules/image_block/helpers/image_block_theme.php
	modules/info/helpers/info_block.php
	modules/info/helpers/info_installer.php

2009-09-30 07:48:19 -07:00

..

image_block_block.php

Use the block_manager to manage site sidebar panels. Fixes ticket #110.

2009-09-30 07:31:12 -07:00

image_block_installer.php

Refactor sidebar_blocks into a separate function and then call block_manager::get_html(site.sidebar). Convert image_block to use block management instead of theme::sidebar_blocks

2009-09-29 14:35:15 -07:00