Permalink
Browse files

Update jquery & dashboard

  • Loading branch information...
1 parent 5965b5c commit 1bb964291ea1de3bfa961effecd61a4297d2c09e @vincentchalamon committed Feb 26, 2012
@@ -22,15 +22,15 @@ public function configure() {
$response->addStylesheet($css, 'first', array('media' => 'all'));
}
// Javascripts
- $javascripts = is_dir(sfConfig::get('sf_plugins_dir').'/sfEPFactoryFormPlugin') ? array('/sfEPFactoryFormPlugin/js/jquery.min.js') : array('/sfAdminTemplatePlugin/js/jquery-1.5.1.min.js');
+ $javascripts = is_dir(sfConfig::get('sf_plugins_dir').'/sfEPFactoryFormPlugin') ? array('/sfEPFactoryFormPlugin/js/jquery.min.js') : array('/sfAdminTemplatePlugin/js/jquery.min.js');
$javascripts[] = '/sfAdminTemplatePlugin/js/autoresize.jquery.js';
$javascripts[] = '/sfAdminTemplatePlugin/js/jqtransformplugin/jquery.jqtransform.js';
$javascripts[] = '/sfAdminTemplatePlugin/js/jquery.fancybox-1.3.4.pack.js';
$javascripts[] = '/sfAdminTemplatePlugin/js/admin.js';
$javascripts[] = '/sfAdminTemplatePlugin/js/validationEngine/jquery.validationEngine-fr.js';
$javascripts[] = '/sfAdminTemplatePlugin/js/validationEngine/jquery.validationEngine.js';
foreach($javascripts as $js) {
- $response->addJavascript($js, preg_match('/(jquery\.min\.js|jquery\-1\.5\.1\.min\.js)/i', $js) ? 'first' : '');
+ $response->addJavascript($js, preg_match('/(jquery\.min\.js)/i', $js) ? 'first' : '');
}
if($this->decoratorTemplate == "clean".$this->getExtension()) {
$response->addStylesheet('/sfAdminTemplatePlugin/css/login.css', '', array('media' => 'all'));
@@ -42,7 +42,7 @@
<td><?php echo $ga->getRawValue()->getPageviews() ?></td>
<td><?php echo $ga->getRawValue()->getPageviews() > 0 && $ga->getRawValue()->getVisits() > 0 ? round($ga->getRawValue()->getPageviews() / $ga->getRawValue()->getVisits()) : 0 ?></td>
<td><?php echo round(($ga->getRawValue()->getBounces() * 100) / $ga->getRawValue()->getVisits(), 2) ?>%</td>
- <td><?php echo format_datetime($ga->getRawValue()->getTimeOnSite() / $ga->getRawValue()->getVisits(), "s", $sf_user->getCulture()) ?></td>
+ <td><?php echo gmdate("H:i:s", round($ga->getRawValue()->getTimeOnSite() / $ga->getRawValue()->getVisits(), 0)) ?></td>
<td><?php echo $ga->getRawValue()->getNewVisits() ?></td>
</tr>
</tbody>
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 1bb9642

Please sign in to comment.