Author: ornicar2
Date: 2010-01-28 22:48:18 +0100 (Thu, 28 Jan 2010)
New Revision: 27289
Added:
plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/doctrine/PluginDmLockFormFilter.class.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/form/doctrine/PluginDmLockForm.class.php
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/layout/dmAdminLayoutHelper.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/layout/dmFrontLayoutHelper.php
Log:
[Diem]
- made current user appear on page loading in admin tool bar
- fixed javascript warning on login page
- applied the law of demeter on layout_helper service implementations
- added missing form and filter classes
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/layout/dmAdminLayoutHelper.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/layout/dmAdminLayoutHelper.php
2010-01-28 21:07:01 UTC (rev 27288)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/lib/view/html/layout/dmAdminLayoutHelper.php
2010-01-28 21:48:18 UTC (rev 27289)
@@ -17,14 +17,14 @@
public function renderEditBars()
{
- $user = $this->serviceContainer->getService('user');
+ $user = $this->getService('user');
if (!$user->can('admin'))
{
return '';
}
- $helper = $this->serviceContainer->getService('helper');
+ $helper = $this->getService('helper');
$cacheKey = sfConfig::get('sf_cache') ? $user->getCacheHash() : null;
@@ -52,7 +52,7 @@
{
$config = parent::getJavascriptConfig();
- $config['record_id'] =
$this->serviceContainer->getService('request')->getParameter('pk', 0);
+ $config['record_id'] = $this->getService('request')->getParameter('pk', 0);
return $config;
}
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-01-28 21:07:01 UTC (rev 27288)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-01-28 21:48:18 UTC (rev 27289)
@@ -27,7 +27,7 @@
echo £link('app:front')->textTitle(__('Go to site'))->set('.widget16.ml10');
- echo £('div.dm_active_users');
+ echo £('div.dm_active_users', £('span',
$sf_user->getUser()->get('username')));
if (sfConfig::get('sf_web_debug'))
{
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-01-28 21:07:01 UTC (rev 27288)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-01-28 21:48:18 UTC (rev 27289)
@@ -19,11 +19,10 @@
{
$form.dmAdminForm(this.options);
}
- else
- if ($("body").hasClass('list'))
- {
- this.listPage();
- }
+ else if ($("body").hasClass('list'))
+ {
+ this.listPage();
+ }
this.liveEvents();
@@ -31,7 +30,10 @@
this.checkVersion();
- this.launchPing();
+ if(this.options.authenticated)
+ {
+ this.launchPing();
+ }
},
checkVersion: function()
Added:
plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/doctrine/PluginDmLockFormFilter.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/doctrine/PluginDmLockFormFilter.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/doctrine/PluginDmLockFormFilter.class.php
2010-01-28 21:48:18 UTC (rev 27289)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginDmLock form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginDmLockFormFilter extends BaseDmLockFormFilter
+{
+}
Added:
plugins/diemPlugin/trunk/dmCorePlugin/lib/form/doctrine/PluginDmLockForm.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/form/doctrine/PluginDmLockForm.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/form/doctrine/PluginDmLockForm.class.php
2010-01-28 21:48:18 UTC (rev 27289)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginDmLock form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage form
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormPluginTemplate.php 23810 2009-11-12
11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginDmLockForm extends BaseDmLockForm
+{
+}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
2010-01-28 21:07:01 UTC (rev 27288)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/layout/dmCoreLayoutHelper.php
2010-01-28 21:48:18 UTC (rev 27289)
@@ -95,7 +95,7 @@
protected function getMetas()
{
return array(
- 'title' =>
$this->serviceContainer->getService('response')->getTitle(),
+ 'title' => $this->getService('response')->getTitle(),
'language' => $this->serviceContainer->getParameter('user.culture'),
);
}
@@ -130,7 +130,7 @@
public function renderHttpMetas()
{
- $httpMetas =
$this->serviceContainer->getService('response')->getHttpMetas();
+ $httpMetas = $this->getService('response')->getHttpMetas();
$html = '';
@@ -150,7 +150,7 @@
*/
$stylesheets = $this->dispatcher->filter(
new sfEvent($this, 'dm.layout.filter_stylesheets'),
- $this->serviceContainer->getService('response')->getStylesheets()
+ $this->getService('response')->getStylesheets()
)->getReturnValue();
$relativeUrlRoot =
dmArray::get($this->serviceContainer->getParameter('request.context'),
'relative_url_root');
@@ -181,7 +181,7 @@
*/
$javascripts = $this->dispatcher->filter(
new sfEvent($this, 'dm.layout.filter_javascripts'),
- $this->serviceContainer->getService('response')->getJavascripts()
+ $this->getService('response')->getJavascripts()
)->getReturnValue();
sfConfig::set('symfony.asset.javascripts_included', true);
@@ -211,14 +211,15 @@
{
$requestContext = $this->serviceContainer->getParameter('request.context');
- return
array_merge($this->serviceContainer->getService('response')->getJavascriptConfig(),
array(
+ return array_merge($this->getService('response')->getJavascriptConfig(),
array(
'relative_url_root' => $requestContext['relative_url_root'],
'dm_core_asset_root' =>
$requestContext['relative_url_root'].'/'.sfConfig::get('dm_core_asset').'/',
'script_name' => sfConfig::get('sf_no_script_name') ?
trim($requestContext['relative_url_root'], '/').'/' :
$requestContext['script_name'].'/',
'debug' => sfConfig::get('sf_debug') ? true : false,
'culture' =>
$this->serviceContainer->getParameter('user.culture'),
'module' =>
$this->serviceContainer->getParameter('controller.module'),
- 'action' =>
$this->serviceContainer->getParameter('controller.action')
+ 'action' =>
$this->serviceContainer->getParameter('controller.action'),
+ 'authenticated' => $this->getService('user')->isAuthenticated()
));
}
@@ -259,4 +260,9 @@
{
return $this->serviceContainer->getService('helper');
}
+
+ protected function getService($name, $class = null)
+ {
+ return $this->serviceContainer->getService($name, $class);
+ }
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/layout/dmFrontLayoutHelper.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/layout/dmFrontLayoutHelper.php
2010-01-28 21:07:01 UTC (rev 27288)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/view/html/layout/dmFrontLayoutHelper.php
2010-01-28 21:48:18 UTC (rev 27289)
@@ -55,7 +55,7 @@
public function renderEditBars()
{
- $user = $this->serviceContainer->getService('user');
+ $user = $this->getService('user');
if (!$user->can('admin'))
{
@@ -95,7 +95,7 @@
public function renderGoogleAnalytics()
{
- if (($gaKey = dmConfig::get('ga_key')) &&
!$this->serviceContainer->getService('user')->can('admin') &&
!dmOs::isLocalhost())
+ if (($gaKey = dmConfig::get('ga_key')) &&
!$this->getService('user')->can('admin') && !dmOs::isLocalhost())
{
return $this->getGoogleAnalyticsCode($gaKey);
}
--
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.
