Author: ornicar2
Date: 2010-02-08 11:44:12 +0100 (Mon, 08 Feb 2010)
New Revision: 27722
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/service/dmFrontBaseServiceContainer.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmPage/actions/actions.class.php
Log:
[Diem]
- more updates for new login actions and theming API
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/service/dmFrontBaseServiceContainer.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/service/dmFrontBaseServiceContainer.php
2010-02-08 10:42:59 UTC (rev 27721)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/service/dmFrontBaseServiceContainer.php
2010-02-08 10:44:12 UTC (rev 27722)
@@ -6,14 +6,11 @@
protected function loadParameters(array $parameters = array())
{
parent::loadParameters();
+
+ $this->addParameters(array('theme_manager.options' => array(
+ 'list' => sfConfig::get('dm_theming_themes',
sfConfig::get('dm_theme_list')) // BC 5.0_BETA6
+ )));
- $this->addParameters(array(
- 'theme_manager.options' => array(
- 'list' => sfConfig::get('dm_theme_list'),
- 'default' => sfConfig::get('dm_theme_default')
- )
- ));
-
$this->setParameter('context.page', null);
}
Modified: plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
2010-02-08 10:42:59 UTC (rev 27721)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/lib/user/dmFrontUser.php
2010-02-08 10:44:12 UTC (rev 27722)
@@ -29,14 +29,14 @@
return $this->getCache('theme');
}
- $themeKey = $this->getAttribute('dm_theme');
+ $themeName = $this->getAttribute('dm_theme');
- if (!$this->themeManager->themeKeyExists($themeKey))
+ if (!$this->themeManager->themeNameExists($themeName))
{
- $themeKey = $this->themeManager->getDefaultThemeKey();
+ $themeName = $this->themeManager->getDefaultThemeName();
}
- return $this->setTheme($themeKey);
+ return $this->setTheme($themeName);
}
public function setTheme($theme)
@@ -51,9 +51,9 @@
throw new dmException(sprintf('%s is not a valid dmTheme', $theme));
}
- if ($theme->getKey() != $this->getAttribute('dm_theme'))
+ if ($theme->getName() != $this->getAttribute('dm_theme'))
{
- $this->setAttribute('dm_theme', $theme->getKey());
+ $this->setAttribute('dm_theme', $theme->getName());
}
$this->dispatcher->notify(new sfEvent($this, 'user.change_theme',
array('theme' => $theme)));
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmPage/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmPage/actions/actions.class.php
2010-02-08 10:42:59 UTC (rev 27721)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmPage/actions/actions.class.php
2010-02-08 10:44:12 UTC (rev 27722)
@@ -35,7 +35,7 @@
$this->form->removeCsrfProtection();
- if ($this->page->isModuleAction('main', 'login'))
+ if ($this->page->isModuleAction('main', 'signin'))
{
$this->form->changeToDisabled('is_secure')->setDefault('is_secure',
false);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
