Author: ornicar2
Date: 2010-01-19 15:36:20 +0100 (Tue, 19 Jan 2010)
New Revision: 26879
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmServer/templates/apcSuccess.php
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/webService/dmWebBrowser.php
Log:
[Diem]
- improved apc monitor interface
- added web_browser service base on sfWebBrowser
- fixed user_agent in dmWebBrowser
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmServer/templates/apcSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmServer/templates/apcSuccess.php
2010-01-19 13:45:42 UTC (rev 26878)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmServer/templates/apcSuccess.php
2010-01-19 14:36:20 UTC (rev 26879)
@@ -1,19 +1,11 @@
<style type="text/css">
iframe {
width: 100%;
- height: 500px;
+ height: 550px;
+ background: none;
+ border: none;
}
</style>
<?php
-echo £o('div.dm_box.big.apc_monitor');
-
-echo £('h1.title', __('Apc monitor'));
-
-echo £o('div.dm_box_inner');
-
-echo £('iframe src='.£link('dmServer/includeApc')->getHref());
-
-echo £c('div');
-
-echo £c('div');
\ No newline at end of file
+echo £('iframe.mt10 src='.£link('dmServer/includeApc')->getHref());
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
2010-01-19 13:45:42 UTC (rev 26878)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
2010-01-19 14:36:20 UTC (rev 26879)
@@ -162,6 +162,8 @@
doctrine_pager.class: dmDoctrinePager # Responsible for
paginating the doctrine collections
+ web_browser.class: dmWebBrowser # Basic HTTP client,
overrides sfWebBrowser
+
services:
text_diff:
@@ -396,4 +398,9 @@
doctrine_pager:
class: %doctrine_pager.class%
shared: false
- arguments: [ %doctrine_pager.model% ]
\ No newline at end of file
+ arguments: [ %doctrine_pager.model% ]
+
+ web_browser:
+ class: %web_browser.class%
+ shared: true
+ arguments: []
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/webService/dmWebBrowser.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/webService/dmWebBrowser.php
2010-01-19 13:45:42 UTC (rev 26878)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/webService/dmWebBrowser.php
2010-01-19 14:36:20 UTC (rev 26879)
@@ -2,16 +2,16 @@
class dmWebBrowser extends sfWebBrowser
{
- public function __construct($userAgent = null)
+
+ public function __construct($defaultHeaders = array(), $adapterClass = null,
$adapterOptions = array())
{
- parent::__construct(array(), null, array());
+ parent::__construct($defaultHeaders, $adapterClass, $adapterOptions);
- $this->setUserAgent(
- dmConfig::get('site_name').
- " (".dm::getRequest()->getAbsoluteUrlRoot().")".
- " powered by Diem/".DIEM_VERSION.
- " (http://diem.iliaz.com)".
- ($userAgent ? " - ".$userAgent : "")
+ $this->setUserAgent(sprintf('%s (%s) powered by Diem/%s (%s)'),
+ dmConfig::get('site_name'),
+ dmArray::get($_SERVER, 'HTTP_HOST'),
+ DIEM_VERSION,
+ 'http://diem-project.org'
);
}
}
\ No newline at end of file
--
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.
