Removed manual module and redirected to existing manual.
This commit is contained in:
Jonathan.Wage
parent
93f452cde1
commit
5b94c846f9
@ -17,7 +17,7 @@ download:
|
||||
|
||||
manual:
|
||||
url: /documentation/manual
|
||||
param: { module: manual, action: index }
|
||||
param: { module: main, action: manual }
|
||||
|
||||
api_documentation:
|
||||
url: /documentation/api
|
||||
|
||||
@ -17,6 +17,11 @@ class mainActions extends sfActions
|
||||
public function executeIndex()
|
||||
{
|
||||
}
|
||||
|
||||
public function executeManual()
|
||||
{
|
||||
$this->redirect('http://doctrine.pengus.net/doctrine_trunk/manual/new');
|
||||
}
|
||||
|
||||
public function executeAbout()
|
||||
{
|
||||
|
||||
@ -1,104 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* manual actions.
|
||||
*
|
||||
* @package doctrine_website
|
||||
* @subpackage manual
|
||||
* @author Your name here
|
||||
* @version SVN: $Id: actions.class.php 2692 2006-11-15 21:03:55Z fabien $
|
||||
*/
|
||||
class manualActions extends sfActions
|
||||
{
|
||||
/**
|
||||
* Executes index action
|
||||
*
|
||||
*/
|
||||
public function executeIndex()
|
||||
{
|
||||
error_reporting(E_ALL);
|
||||
|
||||
$trunk = dirname(dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))));
|
||||
$vendorPath = $trunk.DIRECTORY_SEPARATOR.'vendor';
|
||||
$manualPath = $trunk.DIRECTORY_SEPARATOR.'manual';
|
||||
|
||||
$includePath = $vendorPath.PATH_SEPARATOR.$manualPath.DIRECTORY_SEPARATOR.'new'.DIRECTORY_SEPARATOR.'lib';
|
||||
|
||||
set_include_path($includePath);
|
||||
|
||||
require_once('Sensei/Sensei.php');
|
||||
require_once('DocTool.php');
|
||||
require_once('Cache.php');
|
||||
|
||||
spl_autoload_register(array('Sensei', 'autoload'));
|
||||
|
||||
// Executes the 'svn info' command for the current directory and parses the last
|
||||
// changed revision.
|
||||
$revision = 0;
|
||||
exec('svn info .', $output);
|
||||
foreach ($output as $line) {
|
||||
if (preg_match('/^Last Changed Rev: ([0-9]+)$/', $line, $matches)) {
|
||||
$revision = $matches[1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$cacheDir = './cache/';
|
||||
$cacheRevFile = $cacheDir . 'revision.txt';
|
||||
$cacheRev = 0;
|
||||
|
||||
$cache = new Cache($cacheDir, 'cache');
|
||||
|
||||
// Checks the revision cache files were created from
|
||||
if (file_exists($cacheRevFile)) {
|
||||
$cacheRev = (int) file_get_contents($cacheRevFile);
|
||||
}
|
||||
|
||||
// Empties the cache directory and saves the current revision to a file, if SVN
|
||||
// revision is greater than cache revision
|
||||
if ($revision > $cacheRev) {
|
||||
$cache->clear();
|
||||
@file_put_contents($cacheRevFile, $revision);
|
||||
}
|
||||
|
||||
|
||||
if ($cache->begin()) {
|
||||
|
||||
$this->tool = new DocTool($manualPath.'/new/docs/en.txt');
|
||||
// $this->tool->setOption('clean-url', true);
|
||||
|
||||
$baseUrl = '';
|
||||
$title = 'Doctrine Manual';
|
||||
$section = null;
|
||||
|
||||
if (isset($_GET['chapter'])) {
|
||||
$section = $this->tool->findByPath($_GET['chapter']);
|
||||
if ($this->tool->getOption('clean-url')) {
|
||||
$baseUrl = '../';
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($_GET['one-page'])) {
|
||||
$this->tool->setOption('one-page', true);
|
||||
$this->tool->setOption('max-level', 0);
|
||||
$section = null;
|
||||
$baseUrl = '';
|
||||
}
|
||||
|
||||
if ($section) {
|
||||
while ($section->getLevel() > 1) {
|
||||
$section = $section->getParent();
|
||||
}
|
||||
|
||||
$this->tool->setOption('section', $section);
|
||||
$title .= ' - Chapter ' . $section->getIndex() . ' ' . $section->getName();
|
||||
}
|
||||
|
||||
if ($this->tool->getOption('clean-url')) {
|
||||
$this->tool->setOption('base-url', $baseUrl);
|
||||
}
|
||||
|
||||
$cache->end();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
default:
|
||||
stylesheets: [main, layout, manual]
|
||||
javascripts: [manual_toc, manual_tree, mootools.v1.11]
|
||||
@ -1,22 +0,0 @@
|
||||
<?php if( $tool->getOption('section') || $tool->getOption('one-page') ): ?>
|
||||
|
||||
<h1>Table of Contents</h1>
|
||||
|
||||
<?php $tool->renderToc(); ?>
|
||||
|
||||
<p>
|
||||
<?php if($tool->getOption('one-page')): ?>
|
||||
<a href="<?php echo ($tool->getOption('clean-url') ? "chapter/" : '?chapter=') . $tool->findByIndex('1.')->getPath(); ?>">View one chapter per page</a>
|
||||
<?php else: ?>
|
||||
<a href="<?php echo ($tool->getOption('clean-url') ? "one-page" : '?one-page=1') . '#' . $tool->getOption('section')->getPath(); ?>">View all in one page</a>
|
||||
<?php endif; ?>
|
||||
</p>
|
||||
<?php else: ?>
|
||||
<p>
|
||||
You can view this manual online as
|
||||
<ul>
|
||||
<li><a href="<?php echo $tool->getOption('clean-url') ? "one-page" : '?one-page=1'; ?>">everything on a single page</a></li>
|
||||
<li><a href="<?php echo $tool->makeUrl($tool->findByIndex('1.')->getPath()); ?>">one chapter per page</a></li>
|
||||
</ul>
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
@ -1,13 +0,0 @@
|
||||
<div id="manual">
|
||||
<?php if( $tool->getOption('section') || $tool->getOption('one-page') ): ?>
|
||||
<?php $tool->render(); ?>
|
||||
<?php else: ?>
|
||||
<h1>Table of Contents</h1>
|
||||
|
||||
<?php $tool->renderToc(); ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
<?php slot('right'); ?>
|
||||
<?php echo get_partial('table_of_contents', array('tool' => $tool)); ?>
|
||||
<?php end_slot(); ?>
|
||||
@ -11388,3 +11388,148 @@ Sep 01 00:55:05 symfony [info] {sfTimerManager} View "Success" for "manual/index
|
||||
Sep 01 00:55:05 symfony [info] {sfTimerManager} Partial "manual/_table_of_contents" 0.95 ms (1)
|
||||
Sep 01 00:55:05 symfony [info] {sfTimerManager} Partial "global/_header" 1.13 ms (1)
|
||||
Sep 01 00:55:05 symfony [info] {sfTimerManager} Partial "global/_menu" 2.23 ms (1)
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/documentation/api/:q"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/about"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/download"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/documentation/manual"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/documentation/api"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/trac"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/symfony/:action/*"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/:module"
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} connect "/:module/:action/*"
|
||||
Sep 05 15:14:38 symfony [info] {sfContext} initialization
|
||||
Sep 05 15:14:38 symfony [info] {sfController} initialization
|
||||
Sep 05 15:14:38 symfony [info] {sfRouting} match route [homepage] "/"
|
||||
Sep 05 15:14:38 symfony [info] {sfRequest} request parameters array ( 'module' => 'main', 'action' => 'index',)
|
||||
Sep 05 15:14:38 symfony [info] {sfController} dispatch request
|
||||
Sep 05 15:14:38 symfony [info] {sfFilter} executing filter "sfRenderingFilter"
|
||||
Sep 05 15:14:38 symfony [info] {sfFilter} executing filter "sfWebDebugFilter"
|
||||
Sep 05 15:14:38 symfony [info] {sfFilter} executing filter "sfCommonFilter"
|
||||
Sep 05 15:14:38 symfony [info] {sfFilter} executing filter "sfFlashFilter"
|
||||
Sep 05 15:14:38 symfony [info] {sfFilter} executing filter "sfExecutionFilter"
|
||||
Sep 05 15:14:38 symfony [info] {sfAction} call "mainActions->executeIndex()"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} initialize view for "main/index"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/modules/main/templates/indexSuccess.php"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} decorate content with "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/layout.php"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/layout.php"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} initialize view for "global/_header"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/_header.php"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} initialize view for "global/_menu"
|
||||
Sep 05 15:14:38 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/_menu.php"
|
||||
Sep 05 15:14:38 symfony [info] {sfFilter} render to client
|
||||
Sep 05 15:14:38 symfony [info] {sfResponse} send status "HTTP/1.0 200 OK"
|
||||
Sep 05 15:14:38 symfony [info] {sfResponse} send header "Content-Type": "text/html; charset=utf-8"
|
||||
Sep 05 15:14:38 symfony [info] {sfResponse} send content (25193 o)
|
||||
Sep 05 15:14:38 symfony [info] {sfTimerManager} Configuration 84.42 ms (10)
|
||||
Sep 05 15:14:38 symfony [info] {sfTimerManager} Action "main/index" 0.20 ms (1)
|
||||
Sep 05 15:14:38 symfony [info] {sfTimerManager} View "Success" for "main/index" 34.84 ms (1)
|
||||
Sep 05 15:14:38 symfony [info] {sfTimerManager} Partial "global/_header" 0.90 ms (1)
|
||||
Sep 05 15:14:38 symfony [info] {sfTimerManager} Partial "global/_menu" 1.71 ms (1)
|
||||
Sep 05 15:14:42 symfony [info] {sfContext} initialization
|
||||
Sep 05 15:14:42 symfony [info] {sfController} initialization
|
||||
Sep 05 15:14:42 symfony [info] {sfRouting} match route [manual] "/documentation/manual"
|
||||
Sep 05 15:14:42 symfony [info] {sfRequest} request parameters array ( 'module' => 'manual', 'action' => 'index',)
|
||||
Sep 05 15:14:42 symfony [info] {sfController} dispatch request
|
||||
Sep 05 15:14:42 symfony [info] {sfFilter} executing filter "sfRenderingFilter"
|
||||
Sep 05 15:14:42 symfony [info] {sfFilter} executing filter "sfWebDebugFilter"
|
||||
Sep 05 15:14:42 symfony [info] {sfFilter} executing filter "sfCommonFilter"
|
||||
Sep 05 15:14:42 symfony [info] {sfFilter} executing filter "sfFlashFilter"
|
||||
Sep 05 15:14:42 symfony [info] {sfFilter} executing filter "sfExecutionFilter"
|
||||
Sep 05 15:14:42 symfony [info] {sfAction} call "manualActions->executeIndex()"
|
||||
Sep 05 15:18:04 symfony [info] {sfContext} initialization
|
||||
Sep 05 15:18:04 symfony [info] {sfController} initialization
|
||||
Sep 05 15:18:04 symfony [info] {sfRouting} match route [homepage] "/"
|
||||
Sep 05 15:18:04 symfony [info] {sfRequest} request parameters array ( 'module' => 'main', 'action' => 'index',)
|
||||
Sep 05 15:18:04 symfony [info] {sfController} dispatch request
|
||||
Sep 05 15:18:04 symfony [info] {sfFilter} executing filter "sfRenderingFilter"
|
||||
Sep 05 15:18:04 symfony [info] {sfFilter} executing filter "sfWebDebugFilter"
|
||||
Sep 05 15:18:04 symfony [info] {sfFilter} executing filter "sfCommonFilter"
|
||||
Sep 05 15:18:04 symfony [info] {sfFilter} executing filter "sfFlashFilter"
|
||||
Sep 05 15:18:04 symfony [info] {sfFilter} executing filter "sfExecutionFilter"
|
||||
Sep 05 15:18:04 symfony [info] {sfAction} call "mainActions->executeIndex()"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} initialize view for "main/index"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/modules/main/templates/indexSuccess.php"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} decorate content with "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/layout.php"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/layout.php"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} initialize view for "global/_header"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/_header.php"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} initialize view for "global/_menu"
|
||||
Sep 05 15:18:04 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/_menu.php"
|
||||
Sep 05 15:18:04 symfony [info] {sfFilter} render to client
|
||||
Sep 05 15:18:04 symfony [info] {sfResponse} send status "HTTP/1.0 200 OK"
|
||||
Sep 05 15:18:04 symfony [info] {sfResponse} send header "Content-Type": "text/html; charset=utf-8"
|
||||
Sep 05 15:18:04 symfony [info] {sfResponse} send content (22372 o)
|
||||
Sep 05 15:18:04 symfony [info] {sfTimerManager} Configuration 4.34 ms (11)
|
||||
Sep 05 15:18:04 symfony [info] {sfTimerManager} Action "main/index" 0.15 ms (1)
|
||||
Sep 05 15:18:04 symfony [info] {sfTimerManager} View "Success" for "main/index" 19.82 ms (1)
|
||||
Sep 05 15:18:04 symfony [info] {sfTimerManager} Partial "global/_header" 0.66 ms (1)
|
||||
Sep 05 15:18:04 symfony [info] {sfTimerManager} Partial "global/_menu" 1.68 ms (1)
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/documentation/api/:q"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/about"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/download"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/documentation/manual"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/documentation/api"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/trac"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/symfony/:action/*"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/:module"
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} connect "/:module/:action/*"
|
||||
Sep 05 15:28:27 symfony [info] {sfContext} initialization
|
||||
Sep 05 15:28:27 symfony [info] {sfController} initialization
|
||||
Sep 05 15:28:27 symfony [info] {sfRouting} match route [homepage] "/"
|
||||
Sep 05 15:28:27 symfony [info] {sfRequest} request parameters array ( 'module' => 'main', 'action' => 'index',)
|
||||
Sep 05 15:28:27 symfony [info] {sfController} dispatch request
|
||||
Sep 05 15:28:27 symfony [info] {sfFilter} executing filter "sfRenderingFilter"
|
||||
Sep 05 15:28:27 symfony [info] {sfFilter} executing filter "sfWebDebugFilter"
|
||||
Sep 05 15:28:27 symfony [info] {sfFilter} executing filter "sfCommonFilter"
|
||||
Sep 05 15:28:27 symfony [info] {sfFilter} executing filter "sfFlashFilter"
|
||||
Sep 05 15:28:27 symfony [info] {sfFilter} executing filter "sfExecutionFilter"
|
||||
Sep 05 15:28:27 symfony [info] {sfAction} call "mainActions->executeIndex()"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} initialize view for "main/index"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/modules/main/templates/indexSuccess.php"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} decorate content with "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/layout.php"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/layout.php"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} initialize view for "global/_header"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/_header.php"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} initialize view for "global/_menu"
|
||||
Sep 05 15:28:27 symfony [info] {sfView} render "/Users/jwage/Sites/doctrine_trunk/website/apps/frontend/templates/_menu.php"
|
||||
Sep 05 15:28:27 symfony [info] {sfFilter} render to client
|
||||
Sep 05 15:28:27 symfony [info] {sfResponse} send status "HTTP/1.0 200 OK"
|
||||
Sep 05 15:28:27 symfony [info] {sfResponse} send header "Content-Type": "text/html; charset=utf-8"
|
||||
Sep 05 15:28:27 symfony [info] {sfResponse} send content (25469 o)
|
||||
Sep 05 15:28:27 symfony [info] {sfTimerManager} Configuration 32.80 ms (12)
|
||||
Sep 05 15:28:27 symfony [info] {sfTimerManager} Action "main/index" 0.14 ms (1)
|
||||
Sep 05 15:28:27 symfony [info] {sfTimerManager} View "Success" for "main/index" 18.36 ms (1)
|
||||
Sep 05 15:28:27 symfony [info] {sfTimerManager} Partial "global/_header" 0.64 ms (1)
|
||||
Sep 05 15:28:27 symfony [info] {sfTimerManager} Partial "global/_menu" 1.33 ms (1)
|
||||
Sep 05 15:28:29 symfony [info] {sfContext} initialization
|
||||
Sep 05 15:28:29 symfony [info] {sfController} initialization
|
||||
Sep 05 15:28:29 symfony [info] {sfRouting} match route [manual] "/documentation/manual"
|
||||
Sep 05 15:28:29 symfony [info] {sfRequest} request parameters array ( 'module' => 'main', 'action' => 'manual',)
|
||||
Sep 05 15:28:29 symfony [info] {sfController} dispatch request
|
||||
Sep 05 15:28:29 symfony [info] {sfFilter} executing filter "sfRenderingFilter"
|
||||
Sep 05 15:28:29 symfony [info] {sfFilter} executing filter "sfWebDebugFilter"
|
||||
Sep 05 15:28:29 symfony [info] {sfFilter} executing filter "sfCommonFilter"
|
||||
Sep 05 15:28:29 symfony [info] {sfFilter} executing filter "sfFlashFilter"
|
||||
Sep 05 15:28:29 symfony [info] {sfFilter} executing filter "sfExecutionFilter"
|
||||
Sep 05 15:28:29 symfony [info] {sfAction} call "mainActions->executeManual()"
|
||||
Sep 05 15:28:29 symfony [info] {sfAction} redirect to "http://doctrine.pengus.net/doctrine_trunk/manual/new"
|
||||
Sep 05 15:28:29 symfony [info] {sfResponse} send status "HTTP/1.0 302 Found"
|
||||
Sep 05 15:28:29 symfony [info] {sfResponse} send header "Location": "http://doctrine.pengus.net/doctrine_trunk/manual/new"
|
||||
Sep 05 15:28:29 symfony [info] {sfResponse} send content (123 o)
|
||||
Sep 05 15:29:00 symfony [info] {sfContext} initialization
|
||||
Sep 05 15:29:00 symfony [info] {sfController} initialization
|
||||
Sep 05 15:29:00 symfony [info] {sfRouting} match route [manual] "/documentation/manual"
|
||||
Sep 05 15:29:00 symfony [info] {sfRequest} request parameters array ( 'module' => 'main', 'action' => 'manual',)
|
||||
Sep 05 15:29:00 symfony [info] {sfController} dispatch request
|
||||
Sep 05 15:29:00 symfony [info] {sfFilter} executing filter "sfRenderingFilter"
|
||||
Sep 05 15:29:00 symfony [info] {sfFilter} executing filter "sfWebDebugFilter"
|
||||
Sep 05 15:29:00 symfony [info] {sfFilter} executing filter "sfCommonFilter"
|
||||
Sep 05 15:29:00 symfony [info] {sfFilter} executing filter "sfFlashFilter"
|
||||
Sep 05 15:29:00 symfony [info] {sfFilter} executing filter "sfExecutionFilter"
|
||||
Sep 05 15:29:00 symfony [info] {sfAction} call "mainActions->executeManual()"
|
||||
Sep 05 15:29:00 symfony [info] {sfAction} redirect to "http://doctrine.pengus.net/doctrine/manual/new"
|
||||
Sep 05 15:29:00 symfony [info] {sfResponse} send status "HTTP/1.0 302 Found"
|
||||
Sep 05 15:29:00 symfony [info] {sfResponse} send header "Location": "http://doctrine.pengus.net/doctrine/manual/new"
|
||||
Sep 05 15:29:00 symfony [info] {sfResponse} send content (117 o)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user