Author: ornicar2
Date: 2010-01-27 22:38:48 +0100 (Wed, 27 Jan 2010)
New Revision: 27253
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmInlineAssetConfigHandler.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleView.php
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
Log:
[Diem]
- removed google map configuration from the core (moved to dmGoogleMapPlugin)
- made dmInlineAssetHandler handle external assets
- code style fixes
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml 2010-01-27
20:09:39 UTC (rev 27252)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml 2010-01-27
21:38:48 UTC (rev 27253)
@@ -11,12 +11,6 @@
cdn: # use cdn to load libraries
enabled: false # Will use cdn to load javascript
libraries faster
lib.jquery:
'http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'
- api: # external apis
- gmap: # google maps api
http://code.google.com/apis/maps/
- # to configure the api key, go to the
settings panel in the admin application.
- version: 3 # api version
- sensor: false # use a sensor to determine a user's
location
- url:
http://maps.google.com/maps?file=api&v=%version%&sensor=%sensor%&key=%key%
css:
compress: true # (RECOMMENDED) Performance : Minifies
stylesheets and put them into a single compressed file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmInlineAssetConfigHandler.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmInlineAssetConfigHandler.php
2010-01-27 20:09:39 UTC (rev 27252)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmInlineAssetConfigHandler.php
2010-01-27 21:38:48 UTC (rev 27253)
@@ -21,7 +21,14 @@
// loop through all key/value pairs
foreach ((array)$keys as $key => $value)
{
- $values[$prefix.$this->separator.$category.$this->separator.$key] =
self::getPathFromWebDir($prefix, $category.'.'.$value);
+ if (0 === strncmp($value, 'http://', 7))
+ {
+ $values[$prefix.$this->separator.$category.$this->separator.$key] =
$value;
+ }
+ else
+ {
+ $values[$prefix.$this->separator.$category.$this->separator.$key] =
self::getPathFromWebDir($prefix, $category.'.'.$value);
+ }
}
return $values;
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleView.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleView.php
2010-01-27 20:09:39 UTC (rev 27252)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/title/dmWidgetContentTitleView.php
2010-01-27 21:38:48 UTC (rev 27253)
@@ -23,7 +23,7 @@
{
$vars = $this->getViewVars();
- return $this->context->getHelper()->£($vars['tag'], array('class' =>
$vars['cssClass']), $vars['text']);
+ return $this->getHelper()->£($vars['tag'], array('class' =>
$vars['cssClass']), $vars['text']);
}
protected function doRenderForIndex()
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-27 20:09:39 UTC (rev 27252)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/modules/dmWidget/lib/BasedmWidgetActions.class.php
2010-01-27 21:38:48 UTC (rev 27253)
@@ -38,6 +38,11 @@
}
catch(Exception $e)
{
+ if(sfConfig::get('dm_debug'))
+ {
+ throw $e;
+ }
+
return $this->renderError();
}
--
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.
