mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 18:46:17 +00:00
Removing unused directories from app/pages.
Merging changes from app/ to skel/ git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6314 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
93f034b9bd
commit
53ff7d9904
13 changed files with 42 additions and 31 deletions
|
@ -1,6 +1,6 @@
|
|||
# $Id$
|
||||
#
|
||||
# Copyright 2005-2007, Cake Software Foundation, Inc.
|
||||
# Copyright 2005-2008, Cake Software Foundation, Inc.
|
||||
# 1785 E. Sahara Avenue, Suite 490-204
|
||||
# Las Vegas, Nevada 89104
|
||||
#
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# $Id$
|
||||
#
|
||||
# Copyright 2005-2007, Cake Software Foundation, Inc.
|
||||
# Copyright 2005-2008, Cake Software Foundation, Inc.
|
||||
# 1785 E. Sahara Avenue, Suite 490-204
|
||||
# Las Vegas, Nevada 89104
|
||||
#
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# $Id$
|
||||
#
|
||||
# Copyright 2005-2007, Cake Software Foundation, Inc.
|
||||
# Copyright 2005-2008, Cake Software Foundation, Inc.
|
||||
# 1785 E. Sahara Avenue, Suite 490-204
|
||||
# Las Vegas, Nevada 89104
|
||||
#
|
||||
|
|
|
@ -41,6 +41,10 @@
|
|||
* In development mode, you need to click the flash message to continue.
|
||||
*/
|
||||
Configure::write('debug', 2);
|
||||
/**
|
||||
* Application wide charset encoding
|
||||
*/
|
||||
Configure::write('App.encoding', 'UTF-8');
|
||||
/**
|
||||
* To configure CakePHP *not* to use mod_rewrite and to
|
||||
* use CakePHP pretty URLs, remove these .htaccess
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# $Id$
|
||||
#
|
||||
# Copyright 2005-2007, Cake Software Foundation, Inc.
|
||||
# Copyright 2005-2008, Cake Software Foundation, Inc.
|
||||
# 1785 E. Sahara Avenue, Suite 490-204
|
||||
# Las Vegas, Nevada 89104
|
||||
#
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# $Id$
|
||||
#
|
||||
# Copyright 2005-2007, Cake Software Foundation, Inc.
|
||||
# Copyright 2005-2008, Cake Software Foundation, Inc.
|
||||
# 1785 E. Sahara Avenue, Suite 490-204
|
||||
# Las Vegas, Nevada 89104
|
||||
#
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# $Id$
|
||||
#
|
||||
# Copyright 2005-2007, Cake Software Foundation, Inc.
|
||||
# Copyright 2005-2008, Cake Software Foundation, Inc.
|
||||
# 1785 E. Sahara Avenue, Suite 490-204
|
||||
# Las Vegas, Nevada 89104
|
||||
#
|
||||
|
|
|
@ -33,7 +33,7 @@ body {
|
|||
background-color: #003d4c;
|
||||
color: #fff;
|
||||
font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
|
||||
font-size:13px;
|
||||
font-size:90%;
|
||||
margin: 0;
|
||||
}
|
||||
a {
|
||||
|
@ -56,7 +56,7 @@ h1, h2, h3, h4 {
|
|||
}
|
||||
h1 {
|
||||
color: #003d4c;
|
||||
font-size: 130%;
|
||||
font-size: 100%;
|
||||
margin: 0.1em 0;
|
||||
}
|
||||
h2 {
|
||||
|
@ -92,7 +92,6 @@ ul, li {
|
|||
#header h1 {
|
||||
background: url('../img/cake.icon.gif') no-repeat left;
|
||||
color: #ffffff;
|
||||
font-size: 110%;
|
||||
padding: 0px 30px;
|
||||
}
|
||||
#header h1 a {
|
||||
|
@ -325,6 +324,7 @@ p.error {
|
|||
p.error em {
|
||||
color: #000;
|
||||
font-weight: normal;
|
||||
line-height: 140%;
|
||||
}
|
||||
.notice {
|
||||
background-color: #ffcc00;
|
||||
|
|
|
@ -62,6 +62,13 @@ ini_set('display_errors', 1);
|
|||
if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
|
||||
trigger_error("Can't find CakePHP core. Check the value of CAKE_CORE_INCLUDE_PATH in app/webroot/test.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
|
||||
}
|
||||
|
||||
$corePath = Configure::corePaths('cake');
|
||||
if (isset($corePath[0])) {
|
||||
define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
|
||||
} else {
|
||||
define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
|
||||
}
|
||||
require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_manager.php';
|
||||
|
||||
if (Configure::read('debug') < 1) {
|
||||
|
|
Loading…
Add table
Reference in a new issue