cvs: phd(PHD_0_4) / build.php /include PhDMediaManager.class.php PhDTheme.class.php PhDThemeXhtml.class.php

From: Date: Wed, 18 Feb 2009 12:57:11 +0000
Subject: cvs: phd(PHD_0_4) / build.php /include PhDMediaManager.class.php PhDTheme.class.php PhDThemeXhtml.class.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-3311@lists.php.net to get a copy of this message
rquadling Wed Feb 18 12:57:11 2009 UTC Modified files: (Branch: PHD_0_4) /phd build.php /phd/include PhDMediaManager.class.php PhDTheme.class.php PhDThemeXhtml.class.php Log: Revert. Christian will explain later. http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.54.2.3.2.5&r2=1.54.2.3.2.6&diff_format=u Index: phd/build.php diff -u phd/build.php:1.54.2.3.2.5 phd/build.php:1.54.2.3.2.6 --- phd/build.php:1.54.2.3.2.5 Wed Feb 18 12:24:30 2009 +++ phd/build.php Wed Feb 18 12:57:10 2009 @@ -1,6 +1,6 @@ #!@php_bin@ <?php -/* $Id: build.php,v 1.54.2.3.2.5 2009/02/18 12:24:30 rquadling Exp $ */ +/* $Id: build.php,v 1.54.2.3.2.6 2009/02/18 12:57:10 rquadling Exp $ */ /* {{{ Find the $ROOT directory of PhD @php_dir@ will be replaced by the pear package manager @@ -116,7 +116,7 @@ $themes[$themename] = new $themename(array($IDs, $REFS, $CLASSES, $VARS)); } - $themes[$themename]->postConstruct($OPTIONS["xml_root"]); + $themes[$themename]->postConstruct(); $themes[$themename]->registerFormat($format); http://cvs.php.net/viewvc.cgi/phd/include/PhDMediaManager.class.php?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: phd/include/PhDMediaManager.class.php diff -u phd/include/PhDMediaManager.class.php:1.1.2.3 phd/include/PhDMediaManager.class.php:1.1.2.4 --- phd/include/PhDMediaManager.class.php:1.1.2.3 Wed Feb 18 12:24:30 2009 +++ phd/include/PhDMediaManager.class.php Wed Feb 18 12:57:10 2009 @@ -1,5 +1,5 @@ <?php -/* $Id: PhDMediaManager.class.php,v 1.1.2.3 2009/02/18 12:24:30 rquadling Exp $ */ +/* $Id: PhDMediaManager.class.php,v 1.1.2.4 2009/02/18 12:57:10 rquadling Exp $ */ /** * Handles images (and other media objects) referenced in the docbook files. @@ -18,7 +18,7 @@ public $output_dir = null; /** - * Path the media files are referenced relative to in xml. + * Path the media files are referenced relative to in html. * Trailing slash required. * * @var string @@ -48,13 +48,12 @@ { $basename = basename($filename); $newname = md5(substr($filename, 0, -strlen($basename))) . '-' . $basename; - //FIXME: make images dynamic according to file type (e.g. video) $newpath = 'images/' . $newname; - $this->copyOver($this->relative_path . $filename, $newpath); + $this->copyOver($filename, $newpath); - return $newpath; + return $this->relative_path . $newpath; }//public function handleFile(..) http://cvs.php.net/viewvc.cgi/phd/include/PhDTheme.class.php?r1=1.1.10.4&r2=1.1.10.5&diff_format=u Index: phd/include/PhDTheme.class.php diff -u phd/include/PhDTheme.class.php:1.1.10.4 phd/include/PhDTheme.class.php:1.1.10.5 --- phd/include/PhDTheme.class.php:1.1.10.4 Wed Feb 18 12:24:30 2009 +++ phd/include/PhDTheme.class.php Wed Feb 18 12:57:10 2009 @@ -1,5 +1,5 @@ <?php -/* $Id: PhDTheme.class.php,v 1.1.10.4 2009/02/18 12:24:30 rquadling Exp $ */ +/* $Id: PhDTheme.class.php,v 1.1.10.5 2009/02/18 12:57:10 rquadling Exp $ */ require $ROOT. "/include/PhDMediaManager.class.php"; abstract class PhDTheme extends PhDHelper implements iPhDTheme { @@ -24,7 +24,7 @@ * * @see PhDThemeXhtml::postConstruct() */ - public function postConstruct($relative_path) {} + public function postConstruct() {} http://cvs.php.net/viewvc.cgi/phd/include/PhDThemeXhtml.class.php?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: phd/include/PhDThemeXhtml.class.php diff -u phd/include/PhDThemeXhtml.class.php:1.1.2.3 phd/include/PhDThemeXhtml.class.php:1.1.2.4 --- phd/include/PhDThemeXhtml.class.php:1.1.2.3 Wed Feb 18 12:24:30 2009 +++ phd/include/PhDThemeXhtml.class.php Wed Feb 18 12:57:10 2009 @@ -1,5 +1,5 @@ <?php -/* $Id: PhDThemeXhtml.class.php,v 1.1.2.3 2009/02/18 12:24:30 rquadling Exp $ */ +/* $Id: PhDThemeXhtml.class.php,v 1.1.2.4 2009/02/18 12:57:10 rquadling Exp $ */ /** * Base class for XHTML themes @@ -37,11 +37,9 @@ * Each theme needs its own media manager, since the manager contains * the output path. * - * @param string $relative_path Path the media files are referenced relative to in xml. - * * @return void */ - public function postConstruct($relative_path) + public function postConstruct() { $this->mediamanager = new PhDMediaManager(); @@ -49,8 +47,8 @@ $this->mediamanager->output_dir = $this->outputdir; } else { $this->mediamanager->output_dir = $this->outputfile . '-data/'; + $this->mediamanager->relative_path = basename($this->mediamanager->output_dir) . '/'; } - $this->mediamanager->relative_path = $relative_path . '/'; }//public function postConstruct()

« previous php.doc.cvs (#3311) next »