From fd2a85b5f3ed477301a415c81fcf94beb49342e6 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Thu, 6 Sep 2007 18:29:27 +0000 Subject: [PATCH] Fixes to get manual working. --- .../modules/manual/actions/actions.class.php | 2 + .../modules/manual/templates/indexSuccess.php | 20 +++--- .../modules/manual/templates/xhtml.tpl.php | 65 +------------------ website/apps/frontend/templates/layout.php | 2 +- website/web/css/manual.css | 5 ++ 5 files changed, 23 insertions(+), 71 deletions(-) diff --git a/website/apps/frontend/modules/manual/actions/actions.class.php b/website/apps/frontend/modules/manual/actions/actions.class.php index f307b3356..5191ad2ce 100644 --- a/website/apps/frontend/modules/manual/actions/actions.class.php +++ b/website/apps/frontend/modules/manual/actions/actions.class.php @@ -272,6 +272,8 @@ class manualActions extends sfActions case 'Xhtml': default: + $this->renderer->setOption('template', file_get_contents(dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR.'templates/xhtml.tpl.php')); + $viewIndex = true; if (isset($_GET['one-page'])) { diff --git a/website/apps/frontend/modules/manual/templates/indexSuccess.php b/website/apps/frontend/modules/manual/templates/indexSuccess.php index ff8d41682..a4d81b153 100644 --- a/website/apps/frontend/modules/manual/templates/indexSuccess.php +++ b/website/apps/frontend/modules/manual/templates/indexSuccess.php @@ -1,17 +1,21 @@ -

Doctrine Manual

+
+

Doctrine Manual

+
-

There are several different versions of this manual available online: -

-

+ +

There are several different versions of this manual available online: +

+

+

Table of Contents

renderToc(); ?> \ No newline at end of file diff --git a/website/apps/frontend/modules/manual/templates/xhtml.tpl.php b/website/apps/frontend/modules/manual/templates/xhtml.tpl.php index 5fff596d1..c83d67e45 100644 --- a/website/apps/frontend/modules/manual/templates/xhtml.tpl.php +++ b/website/apps/frontend/modules/manual/templates/xhtml.tpl.php @@ -1,62 +1,3 @@ - - - - - -%TITLE% - - - - - - - - - - - - - - - - - - - -
- - - -
- -%CONTENT% - -
- -
- - - - +
+ %CONTENT% +
\ No newline at end of file diff --git a/website/apps/frontend/templates/layout.php b/website/apps/frontend/templates/layout.php index 0737c634d..7745ea948 100644 --- a/website/apps/frontend/templates/layout.php +++ b/website/apps/frontend/templates/layout.php @@ -36,7 +36,7 @@ diff --git a/website/web/css/manual.css b/website/web/css/manual.css index ae4990e6a..cd8d57efd 100644 --- a/website/web/css/manual.css +++ b/website/web/css/manual.css @@ -199,4 +199,9 @@ ul.tree { #toc-toggles a { margin-left: 0.5em; +} + +#right ul li +{ + list-style-type: none; } \ No newline at end of file