Skip to content

Commit

Permalink
Moved activities into their own css file.
Browse files Browse the repository at this point in the history
  • Loading branch information
mark committed Aug 16, 2009
1 parent fd53994 commit 6227a01
Show file tree
Hide file tree
Showing 4 changed files with 725 additions and 193 deletions.
4 changes: 4 additions & 0 deletions applications/garden/controllers/activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ class ActivityController extends GardenController {

public $Uses = array('Database', 'Form', 'Gdn_ActivityModel', 'Html');

public function Initialize() {
parent::Initialize();
$this->AddCssFile('activity.css');
}
public function Index() {
if ($this->Head) {
$this->Head->AddScript('/applications/garden/js/activity.js');
Expand Down
2 changes: 1 addition & 1 deletion applications/garden/controllers/appcontroller.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function Initialize() {
$this->AddCssFile('popup.css');
$this->AddModule('PoweredByVanillaModule');

if ($this->ControllerName != 'profilecontroller')
if (!in_array($this->ControllerName, array('profilecontroller', 'activitycontroller')))
$this->AddCssFile('garden.css');

parent::Initialize();
Expand Down
Loading

0 comments on commit 6227a01

Please sign in to comment.