Changeset 21503

Show
Ignore:
Timestamp:
10/17/08 18:31:37 (5 years ago)
Author:
gen
Message:

updating config/database.yml

Location:
events/phpframework/akelos/trunk
Files:
9 added
10 modified

Legend:

Unmodified
Added
Removed
  • events/phpframework/akelos/trunk/app/locales/account/en.php

    r21394 r21503  
    3333$dictionary['Invalid user name or password, please try again'] = 'Invalid user name or password, please try again'; 
    3434 
     35// 2008-10-17 12:57:05 
     36 
     37 
     38$dictionary['Title'] = 'Title'; 
     39 
    3540 
    3641?> 
  • events/phpframework/akelos/trunk/app/locales/account/ja.php

    r21394 r21503  
    3333$dictionary['Invalid user name or password, please try again'] = 'Invalid user name or password, please try again'; 
    3434 
     35// 2008-10-17 12:57:05 
     36 
     37 
     38$dictionary['Title'] = 'Title'; 
     39 
    3540 
    3641?> 
  • events/phpframework/akelos/trunk/app/views/layouts/account.tpl

    r21289 r21503  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
    2     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
    3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    4   <head> 
    5     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    6     <title> 
    7       {settings-application_name} 
    8     </title> 
    9     <%= javascript_include_tag %> 
     1<%= render :partial => 'layouts/header' %> 
     2  <body> 
    103    <%= javascript_for_current_controller %> 
    11     <%= stylesheet_link_tag "account.css", :media=>'print,screen' %> 
    12   </head> 
    13   <body> 
    144    <div id="layout"> 
    155      <div id="canvas" class="login"> 
     
    3828      </div> 
    3929    </div> 
    40   </body> 
    41 </html> 
     30<%= render :partial => 'layouts/footer' %> 
  • events/phpframework/akelos/trunk/config/cache/development/database.php

    r21274 r21503  
    44 */ 
    55$config = array ( 
     6  'database_name' => 'phwittr_dev', 
    67  'type' => 'mysql', 
    7   'database_file' => NULL, 
    88  'host' => 'localhost', 
    99  'port' => NULL, 
    10   'database_name' => 'phwittr_dev', 
    1110  'user' => 'root', 
    1211  'password' => NULL, 
  • events/phpframework/akelos/trunk/config/cache/production/database.php

    r21274 r21503  
    44 */ 
    55$config = array ( 
     6  'database_name' => 'phwittr', 
    67  'type' => 'mysql', 
    7   'database_file' => NULL, 
    88  'host' => 'localhost', 
    99  'port' => NULL, 
    10   'database_name' => 'phwittr', 
    1110  'user' => 'root', 
    1211  'password' => NULL, 
  • events/phpframework/akelos/trunk/config/cache/testing/database.php

    r21274 r21503  
    44 */ 
    55$config = array ( 
     6  'database_name' => 'phwittr_tests', 
    67  'type' => 'mysql', 
    7   'database_file' => NULL, 
    88  'host' => 'localhost', 
    99  'port' => NULL, 
    10   'database_name' => 'phwittr_tests', 
    1110  'user' => 'root', 
    1211  'password' => NULL, 
  • events/phpframework/akelos/trunk/config/database.yml

    r21274 r21503  
     1default: 
     2    type: mysql 
     3    host: localhost 
     4    port:  
     5    user: root 
     6    password:  
     7    options:  
     8 
    19production: 
    2         type: mysql 
    3         database_file:  
    4         host: localhost 
    5         port:  
    6         database_name: phwittr 
    7         user: root 
    8         password:  
    9         options:  
     10    database_name: phwittr 
    1011 
     12development: 
     13    database_name: phwittr_dev 
    1114     
    12 development: 
    13         type: mysql 
    14         database_file:  
    15         host: localhost 
    16         port:  
    17         database_name: phwittr_dev 
    18         user: root 
    19         password:  
    20         options:  
    21      
    22 # Warning: The database defined as 'testing' will be erased and 
    23 # re-generated from your development database when you run './script/test app'. 
    24 # Do not set this db to the same as development or production. 
    2515testing: 
    26         type: mysql 
    27         database_file:  
    28         host: localhost 
    29         port: 
    30         database_name: phwittr_tests 
    31         user: root 
    32         password:  
    33         options: 
     16    database_name: phwittr_tests 
  • events/phpframework/akelos/trunk/config/locales/en.php

    r21464 r21503  
    279279'; 
    280280 
     281// 2008-10-17 15:06:09 
     282 
     283 
     284$dictionary['Could not find %namespace settings file in %path.'] = 'Could not find %namespace settings file in %path.'; 
     285 
    281286 
    282287?> 
  • events/phpframework/akelos/trunk/config/locales/ja.php

    r21464 r21503  
    277277'; 
    278278 
     279// 2008-10-17 15:06:09 
     280 
     281 
     282$dictionary['Could not find %namespace settings file in %path.'] = 'Could not find %namespace settings file in %path.'; 
     283 
    279284 
    280285?> 
  • events/phpframework/akelos/trunk/tmp/views/app/views/layouts/compiled/account.tpl.php

    r21289 r21503  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
    2     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
    3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    4   <head> 
    5     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    6     <title> 
    7       <?php echo $settings['application_name']; ?> 
    8     </title> 
    9     <?php echo $asset_tag_helper->javascript_include_tag(); ?> 
     1<?php echo $controller->render( array('partial' => 'layouts/header')); ?> 
     2  <body> 
    103    <?php echo $asset_tag_helper->javascript_for_current_controller(); ?> 
    11     <?php echo $asset_tag_helper->stylesheet_link_tag("account.css", array('media' => 'print,screen')); ?> 
    12   </head> 
    13   <body> 
    144    <div id="layout"> 
    155      <div id="canvas" class="login"> 
     
    3828      </div> 
    3929    </div> 
    40   </body> 
    41 </html> 
     30<?php echo $controller->render( array('partial' => 'layouts/footer')); ?>