diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2008-12-16 17:30:18 +0000 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2008-12-16 17:30:18 +0000 |
| commit | 04441e11cccceea92454d3fcbc54e0e103fb8bd6 (patch) | |
| tree | 06ce3eb18eb156b736cb3510ac92e1af3aa4bb94 /core | |
| parent | 931d8c6bdce9fa4656d36c2f07ff6a38d0b47c5d (diff) | |
1) Remove the load watermark from the scaffolding... use the menu option
2) The set watermark dialog is now sizing properly. @todo is recenter in the window
Diffstat (limited to 'core')
| -rw-r--r-- | core/controllers/welcome.php | 10 | ||||
| -rw-r--r-- | core/views/welcome.html.php | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index 5afe094e..7235e2c0 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -35,18 +35,12 @@ class Welcome_Controller extends Template_Controller { ->where("type", "photo")->orderby("level", "desc")->find(); $this->template->album_tree = $this->_load_album_tree(); $this->template->add_photo_html = $this->_get_add_photo_html(); - if (module::is_installed("watermark")) { - $this->template->add_watermark_html = $this->_get_add_watermark_html(); - } else { - $this->template->add_watermark_html = ""; - } } catch (Exception $e) { $this->template->album_count = 0; $this->template->photo_count = 0; $this->template->deepest_photo = null; $this->template->album_tree = array(); $this->template->add_photo_html = ""; - $this->template->add_watermark_html = ""; } $this->_load_user_info(); @@ -518,8 +512,4 @@ class Welcome_Controller extends Template_Controller { $parent = ORM::factory("item", $parent_id); return photo::get_add_form($parent); } - - public function _get_add_watermark_html() { - return watermark::get_watermark_form(); - } } diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index d41b81c2..7f3d27a9 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -160,9 +160,6 @@ <? if (module::is_installed("rearrange")): ?> <?= rearrange_block::head(null) ?> <? endif ?> - <? if (module::is_installed("watermark")): ?> - <?= watermark_block::head(null) ?> - <? endif ?> </head> <body> <div class="outer"> @@ -287,9 +284,6 @@ <?= new View("rearrange.html") ?> </fieldset> <? endif ?> - <? if (module::is_installed("watermark")): ?> - <?= $add_watermark_html ?> - <? endif ?> </div> <? if (module::is_installed("user")): ?> |