Skip to content

Commit

Permalink
Update home pages.
Browse files Browse the repository at this point in the history 
Code changes are required now that 3.0-database has been merged.
Update ExtractTask tests as line numbers have changed.
  • Loading branch information
@markstory
markstory committed Apr 8, 2013
1 parent c9f1780 commit 50dd5fa
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 52 deletions.
9 changes: 4 additions & 5 deletions App/View/Pages/home.ctp
View file
Expand Up @@ -16,13 +16,13 @@
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
use Cake\Cache\Cache;
use Cake\Core\Configure;
use Cake\Core\Plugin;
use Cake\Model\ConnectionManager;
use Cake\Error;
use Cake\Utility\Debugger;
use Cake\Cache\Cache;
use Cake\Model\Datasource\Database\Connection;
use Cake\Utility\Validation;
use Cake\Error;

if (Configure::read('debug') == 0):
throw new Error\NotFoundException();
Expand Down Expand Up @@ -115,8 +115,7 @@ endif;
<?php
if (isset($filePresent)):
try {
require APP . 'Config/datasources.php';
$connection = new Connection(Configure::read('Datasource.default'));
$connection = ConnectionManager::getDataSource('default');
$connected = $connection->connect();
} catch (Exception $connectionError) {
$connected = false;
Expand Down
8 changes: 5 additions & 3 deletions lib/Cake/Console/Templates/skel/View/Pages/home.ctp
View file
Expand Up @@ -16,12 +16,13 @@
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
use Cake\Core\Configure;
use Cake\Utility\Debugger;
use Cake\Cache\Cache;
use Cake\Core\Configure;
use Cake\Core\Plugin;
use Cake\Model\ConnectionManager;
use Cake\Utility\Validation;
use Cake\Error;
use Cake\Utility\Debugger;
use Cake\Utility\Validation;

if (Configure::read('debug') == 0):
throw new Error\NotFoundException();
Expand Down Expand Up @@ -115,6 +116,7 @@ endif;
if (isset($filePresent)):
try {
$connected = ConnectionManager::getDataSource('default');
$connected = $connection->connect();
} catch (Exception $connectionError) {
$connected = false;
$errorMsg = $connectionError->getMessage();
Expand Down
76 changes: 39 additions & 37 deletions lib/Cake/Test/TestApp/View/Pages/home.ctp
View file
Expand Up @@ -12,34 +12,29 @@
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package cake.libs.view.templates.pages
* @package app.View.Pages
* @since CakePHP(tm) v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
use Cake\Core\Configure;
use Cake\Utility\Debugger;
use Cake\Cache\Cache;
use Cake\Core\Configure;
use Cake\Core\Plugin;
use Cake\Model\ConnectionManager;
use Cake\Utility\Validation;
use Cake\Error;
use Cake\Utility\Debugger;
use Cake\Utility\Validation;

if (Configure::read('debug') == 0):
throw new Error\NotFoundException();
endif;
?>
<iframe src="http://cakephp.org/bake-banner" width="830" height="160" style="overflow:hidden; border:none;">
<p>For updates and important announcements, visit http://cakefest.org</p>
</iframe>
<h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
<?php
if (Configure::read('debug') > 0):
// Debugger::checkSecurityKeys();
endif;
?>
<p>
<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
</p>
<p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/advanced-installation.html#apache-and-mod-rewrite-and-htaccess" style="color:#fff;">Help me configure it</a>
1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
</p>
<p>
Expand Down Expand Up @@ -113,38 +108,31 @@ endif;
?>
</p>
<?php
if (isset($filePresent)):
try {
$connected = ConnectionManager::getDataSource('default');
} catch (Exception $connectionError) {
$connected = false;
if (!Validation::alphaNumeric('cakephp')) {
echo '<p><span class="notice">';
echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
echo '<br/>';
echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
echo '</span></p>';
}
?>

<p>
<?php
if ($connected && $connected->isConnected()):
if (Plugin::loaded('DebugKit')):
echo '<span class="notice success">';
echo __d('cake_dev', 'Cake is able to connect to the database.');
echo __d('cake_dev', 'DebugKit plugin is present');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
echo '<br /><br />';
echo $connectionError->getMessage();
echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
echo '<br/>';
echo __d('cake_dev', 'You can install it from %s', $this->Html->link('github', 'https://github.com/cakephp/debug_kit'));
echo '</span>';
endif;
?>
</p>
<?php endif; ?>
<?php
if (!Validation::alphaNumeric('cakephp')) {
echo '<p><span class="notice">';
echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
echo '<br/>';
echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
echo '</span></p>';
}
?>

<h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3>
<p>
<?php
Expand Down Expand Up @@ -174,6 +162,20 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
?>
</p>

<h3><?php echo __d('cake_dev', 'Official Plugins'); ?></h3>
<p>
<ul>
<li>
<?php echo $this->Html->link('DebugKit', 'https://github.com/cakephp/debug_kit') ?>:
<?php echo __d('cake_dev', 'provides a debugging toolbar and enhanced debugging tools for CakePHP applications.'); ?>
</li>
<li>
<?php echo $this->Html->link('Localized', 'https://github.com/cakephp/localized') ?>:
<?php echo __d('cake_dev', 'contains various localized validation classes and translations for specific countries'); ?>
</li>
</ul>
</p>

<h3><?php echo __d('cake_dev', 'More about Cake'); ?></h3>
<p>
<?php echo __d('cake_dev', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
Expand All @@ -189,12 +191,12 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
<ul><li><?php echo __d('cake_dev', 'The Rapid Development Framework'); ?></li></ul></li>
<li><a href="http://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Your Rapid Development Cookbook'); ?></li></ul></li>
<li><a href="http://api20.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
<li><a href="http://api.cakephp.org/"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Quick Reference'); ?></li></ul></li>
<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Everything CakePHP'); ?></li></ul></li>
<li><a href="http://live.cakephp.org"><?php echo __d('cake_dev', 'The Show'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
<li><a href="http://plugins.cakephp.org"><?php echo __d('cake_dev', 'CakePHP plugins repo'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'A comprehensive list of all CakePHP plugins created by the community'); ?></li></ul></li>
<li><a href="http://groups.google.com/group/cake-php"><?php echo __d('cake_dev', 'CakePHP Google Group'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Community mailing list'); ?></li></ul></li>
<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
Expand Down
8 changes: 1 addition & 7 deletions lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
View file
Expand Up @@ -122,12 +122,6 @@ public function testExecute() {
$pattern .= 'APP\/Config\/datasources.php"\nmsgstr ""\n/';
$this->assertRegExp($pattern, $result);

$pattern = '/msgid "Cake is able to connect to the database."\nmsgstr ""\n/';
$this->assertRegExp($pattern, $result);

$pattern = '/msgid "Cake is NOT able to connect to the database."\nmsgstr ""\n/';
$this->assertRegExp($pattern, $result);

$pattern = '/msgid "Editing this Page"\nmsgstr ""\n/';
$this->assertRegExp($pattern, $result);

Expand All @@ -153,7 +147,7 @@ public function testExecute() {
$this->assertRegExp($pattern, $result);

$pattern = '/\#: (\\\\|\/)extract\.ctp:14\n';
$pattern .= '\#: (\\\\|\/)home\.ctp:148\n';
$pattern .= '\#: (\\\\|\/)home\.ctp:136\n';
$pattern .= 'msgid "Editing this Page"\nmsgstr ""/';
$this->assertRegExp($pattern, $result);

Expand Down

0 comments on commit 50dd5fa

Please sign in to comment.