Author: ornicar2
Date: 2010-01-18 17:19:15 +0100 (Mon, 18 Jan 2010)
New Revision: 26824
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmFrontTestFunctional.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/db.sqlite
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/fresh_db.sqlite
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/front/dmEditPageTest.php
plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
Log:
[Diem]
- fixed front H1 replacement
- added functional tests for front h1 replacement
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmFrontTestFunctional.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmFrontTestFunctional.php
2010-01-18 16:02:59 UTC (rev 26823)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/test/dmFrontTestFunctional.php
2010-01-18 16:19:15 UTC (rev 26824)
@@ -53,7 +53,7 @@
->click('Save')
->checks(array('module_action' => 'dmPage/edit', 'method' => 'post'))
->testResponseContent('|^'.preg_quote('{"type":"redirect","url":"',
'|').'|', 'like')
- ->get('/'.$this->getPage()->slug);
+ ->get('/'.($this->getPage()->slug ? $this->getPage()->slug : 'index.php'));
}
public function editWidget(DmWidget $widget)
Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/db.sqlite
===================================================================
(Binary files differ)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/fresh_db.sqlite
===================================================================
(Binary files differ)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/front/dmEditPageTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/front/dmEditPageTest.php
2010-01-18 16:02:59 UTC (rev 26823)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/front/dmEditPageTest.php
2010-01-18 16:19:15 UTC (rev 26824)
@@ -18,7 +18,6 @@
'slug' => 'new-slug',
'name' => 'New name',
'title' => 'New title',
- 'h1' => 'New h1',
'description' => 'New description',
'keywords' => 'New keywords'
))
@@ -26,4 +25,13 @@
->has('title', 'New title | Project')
->testResponseContent('|<meta name="description" content="New description"
/>|', 'like')
->testResponseContent('|<meta name="keywords" content="New keywords" />|',
'like')
+
+->get('/index.php')
+->checks(array('page_module_action' => 'main/root'))
+->editPage()
+->updatePage(array(
+ 'h1' => 'New h1',
+))
+->checks(array('page_module_action' => 'main/root'))
+->has('h1', 'New h1')
;
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
===================================================================
--- plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
2010-01-18 16:02:59 UTC (rev 26823)
+++ plugins/diemPlugin/trunk/dmFrontPlugin/lib/filter/dmFrontInitFilter.php
2010-01-18 16:19:15 UTC (rev 26824)
@@ -27,8 +27,22 @@
}
$filterChain->execute();
+
+ $this->replaceH1();
}
+ protected function replaceH1()
+ {
+ if (($page = $this->context->getPage()) && ($h1 = $page->_getI18n('h1')))
+ {
+ $this->context->getResponse()->setContent(preg_replace(
+ '|<h1(.*)>.*</h1>|iuU',
+ '<h1$1>'.$h1.'</h1>',
+ $this->context->getResponse()->getContent()
+ ));
+ }
+ }
+
protected function redirectNoScriptName()
{
if (!sfConfig::get('sf_no_script_name') || dmConfig::isCli())
--
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.
