renderElement廃止対応

diff --git a/app/controllers/character_sheets_controller.php b/app/controllers/character_sheets_controller.php
index 4129351..f477e3c 100644 (file)
--- a/app/controllers/character_sheets_controller.php
+++ b/app/controllers/character_sheets_controller.php
@@ -385,7 +385,7 @@ class CharacterSheetsController extends AppController {
                                                        $class = $arr[3];
                                                }
 
-                                               $replacement = '\$this->renderElement(\''. $element. '\', array(\'basename\' => \$character[\'Character\'][\''. $filename. '\'], \'classname\' => \''.$classname.'\', \'options\' => array(\'previewVersion\' => \''. $size. '\', \'class\' => \''. $class. '\', \'nodata\' => \'image\')));';
+                                               $replacement = '\$this->element(\''. $element. '\', array(\'basename\' => \$character[\'Character\'][\''. $filename. '\'], \'classname\' => \''.$classname.'\', \'options\' => array(\'previewVersion\' => \''. $size. '\', \'class\' => \''. $class. '\', \'nodata\' => \'image\')));';
 
                                        $data = $this->__changeSkin($data, "echo ".$replacement, $pattern, 1);
                                        }

diff --git a/app/vendors/qdmail.php b/app/vendors/qdmail.php
index a3c24e9..2538070 100644 (file)
--- a/app/vendors/qdmail.php
+++ b/app/vendors/qdmail.php
@@ -3820,7 +3820,7 @@ class QdmailComponent extends QdmailUserFunc{
                $view = & new $this->Controller->view( $this->Controller , false );\r
                $view->layout = $this->layout;\r
                $mess = null;\r
-               $content = $view->renderElement( $this->view_dir . DS . $type . DS . $this->template , array('content' => $content ) , true );\r
+               $content = $view->element( $this->view_dir . DS . $type . DS . $this->template , array('content' => $content ) , true );\r
                if( 1.2 > (float) substr(Configure::version(),0,3) ){\r
                        $view->subDir = $this->layout_dir . DS . $type . DS ;\r
                }else{\r
@@ -4117,4 +4117,4 @@ class QdDeco{
                }\r
        return true;\r
        }\r
-}?>
\ No newline at end of file
+}?>\r

diff --git a/app/views/character_pictures/admin_delete.ctp b/app/views/character_pictures/admin_delete.ctp
index 6a6e1d5..d923eed 100644 (file)
--- a/app/views/character_pictures/admin_delete.ctp
+++ b/app/views/character_pictures/admin_delete.ctp
@@ -22,7 +22,7 @@
 <p>
 <div class="image">
 <?php 
-       echo $this->renderElement('character_picture_image', array(
+       echo $this->element('character_picture_image', array(
                'attachment' => $characterPicture['Attachment'][0],
                'options' => array(
                        'previewVersion' => 'orig',

diff --git a/app/views/character_pictures/admin_index.ctp b/app/views/character_pictures/admin_index.ctp
index 517d91e..5cc65dd 100644 (file)
--- a/app/views/character_pictures/admin_index.ctp
+++ b/app/views/character_pictures/admin_index.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement('character_picture_index', array(
+echo $this->element('character_picture_index', array(
        'character' => $character,
        'characterPictures' => $characterPictures,
        'isOwner' => false,

diff --git a/app/views/character_pictures/admin_view.ctp b/app/views/character_pictures/admin_view.ctp
index 31658ba..15b1aca 100644 (file)
--- a/app/views/character_pictures/admin_view.ctp
+++ b/app/views/character_pictures/admin_view.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement('character_picture_view', array(
+echo $this->element('character_picture_view', array(
        'characterPicture' => $characterPicture,
        'isOwner' => false,
        'isAdmin' => true,

diff --git a/app/views/character_pictures/delete.ctp b/app/views/character_pictures/delete.ctp
index 6a6e1d5..d923eed 100644 (file)
--- a/app/views/character_pictures/delete.ctp
+++ b/app/views/character_pictures/delete.ctp
@@ -22,7 +22,7 @@
 <p>
 <div class="image">
 <?php 
-       echo $this->renderElement('character_picture_image', array(
+       echo $this->element('character_picture_image', array(
                'attachment' => $characterPicture['Attachment'][0],
                'options' => array(
                        'previewVersion' => 'orig',

diff --git a/app/views/character_pictures/index.ctp b/app/views/character_pictures/index.ctp
index b00552c..180b179 100644 (file)
--- a/app/views/character_pictures/index.ctp
+++ b/app/views/character_pictures/index.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement('character_picture_index', array(
+echo $this->element('character_picture_index', array(
        'character' => $character,
        'characterPictures' => $characterPictures,
        'isOwner' => false,

diff --git a/app/views/character_pictures/listview.ctp b/app/views/character_pictures/listview.ctp
index 65efb68..ea0a067 100644 (file)
--- a/app/views/character_pictures/listview.ctp
+++ b/app/views/character_pictures/listview.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement('character_picture_index', array(
+echo $this->element('character_picture_index', array(
        'character' => $character,
        'characterPictures' => $characterPictures,
        'isOwner' => true,

diff --git a/app/views/character_pictures/view.ctp b/app/views/character_pictures/view.ctp
index 5d5e7ed..44d44ce 100644 (file)
--- a/app/views/character_pictures/view.ctp
+++ b/app/views/character_pictures/view.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement('character_picture_view', array(
+echo $this->element('character_picture_view', array(
        'characterPicture' => $characterPicture,
        'isOwner' => $isOwner,
        'isAdmin' => false,

diff --git a/app/views/character_profile_archives/admin_index.ctp b/app/views/character_profile_archives/admin_index.ctp
index ab8cc39..1ed2b8f 100644 (file)
--- a/app/views/character_profile_archives/admin_index.ctp
+++ b/app/views/character_profile_archives/admin_index.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_profile_archive_index',
        array(
                'characterProfileArchives' => $characterProfileArchives,

diff --git a/app/views/character_profile_archives/admin_view.ctp b/app/views/character_profile_archives/admin_view.ctp
index 7241b1a..8e86724 100644 (file)
--- a/app/views/character_profile_archives/admin_view.ctp
+++ b/app/views/character_profile_archives/admin_view.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_profile_archive_view',
        array(
                'characterProfileArchive' => $characterProfileArchive,

diff --git a/app/views/character_profile_archives/index.ctp b/app/views/character_profile_archives/index.ctp
index 091f524..c1188a3 100644 (file)
--- a/app/views/character_profile_archives/index.ctp
+++ b/app/views/character_profile_archives/index.ctp
@@ -7,7 +7,7 @@ if ($isOwner) {
 }
 $cacheSet['key'] .= "_".$character['Character']['id'];
 
-echo $this->renderElement(
+echo $this->element(
        'character_profile_archive_index',
        array(
                'characterProfileArchives' => $characterProfileArchives,

diff --git a/app/views/character_profile_archives/multi_edit.ctp b/app/views/character_profile_archives/multi_edit.ctp
index 381080b..7757aea 100644 (file)
--- a/app/views/character_profile_archives/multi_edit.ctp
+++ b/app/views/character_profile_archives/multi_edit.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_profile_archive_confirm',
        array(
                'characterProfileArchives' => $this->data,

diff --git a/app/views/character_profile_archives/view.ctp b/app/views/character_profile_archives/view.ctp
index 7164a64..7b17bdd 100644 (file)
--- a/app/views/character_profile_archives/view.ctp
+++ b/app/views/character_profile_archives/view.ctp
@@ -7,7 +7,7 @@ if ($isOwner) {
 }
 $cacheSet['key'] .= "_".$characterProfileArchive['CharacterProfileArchive']['id'];
 
-echo $this->renderElement(
+echo $this->element(
        'character_profile_archive_view',
        array(
                'characterProfileArchive' => $characterProfileArchive,

diff --git a/app/views/character_sheets/admin_view.ctp b/app/views/character_sheets/admin_view.ctp
index 0ccd056..7877ca1 100644 (file)
--- a/app/views/character_sheets/admin_view.ctp
+++ b/app/views/character_sheets/admin_view.ctp
@@ -63,7 +63,7 @@
 
        $footer = null;
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'header' => $header,
                'body' => $body,
                'footer' => $footer,
@@ -131,7 +131,7 @@
 
        $footer = null;
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'header' => $header,
                'body' => $body,
                'footer' => $footer,

diff --git a/app/views/characters/admin_delete.ctp b/app/views/characters/admin_delete.ctp
index b9e1f73..fc815ed 100644 (file)
--- a/app/views/characters/admin_delete.ctp
+++ b/app/views/characters/admin_delete.ctp
@@ -4,7 +4,7 @@
 </legend>
 
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_view',
        array(
                'character' => $character,

diff --git a/app/views/characters/admin_edit.ctp b/app/views/characters/admin_edit.ctp
index e1222fc..9b34a87 100644 (file)
--- a/app/views/characters/admin_edit.ctp
+++ b/app/views/characters/admin_edit.ctp
@@ -40,7 +40,7 @@ echo $form->end(array('label' => __('Cancel', true)));
 </div>
 
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_view',
        array(
                'character' => $this->data,

diff --git a/app/views/characters/admin_index.ctp b/app/views/characters/admin_index.ctp
index 3ed7718..652654a 100644 (file)
--- a/app/views/characters/admin_index.ctp
+++ b/app/views/characters/admin_index.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_index',
        array(
                'character' => $characters,

diff --git a/app/views/characters/admin_view.ctp b/app/views/characters/admin_view.ctp
index 983bc35..58cd9ae 100644 (file)
--- a/app/views/characters/admin_view.ctp
+++ b/app/views/characters/admin_view.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_view',
        array(
                'character' => $character,

diff --git a/app/views/characters/delete.ctp b/app/views/characters/delete.ctp
index b9e1f73..fc815ed 100644 (file)
--- a/app/views/characters/delete.ctp
+++ b/app/views/characters/delete.ctp
@@ -4,7 +4,7 @@
 </legend>
 
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_view',
        array(
                'character' => $character,

diff --git a/app/views/characters/edit.ctp b/app/views/characters/edit.ctp
index 04acf80..6870367 100644 (file)
--- a/app/views/characters/edit.ctp
+++ b/app/views/characters/edit.ctp
@@ -41,7 +41,7 @@
 <td style="text-align: center;" class="image160" rowspan="3">
 <div id="CharacterMainPicture" class="image150">
 <?php 
-       echo $this->renderElement('character_picture_image', array(
+       echo $this->element('character_picture_image', array(
                'basename' => $this->data['Character']['main_picture'],
                'options' => array(
                        'class' => 'mainImage',

diff --git a/app/views/characters/index.ctp b/app/views/characters/index.ctp
index 7c739ae..3af31b9 100644 (file)
--- a/app/views/characters/index.ctp
+++ b/app/views/characters/index.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_index',
        array(
                'character' => $characters,

diff --git a/app/views/characters/mycharacter.ctp b/app/views/characters/mycharacter.ctp
index 4edf95d..bc009b6 100644 (file)
--- a/app/views/characters/mycharacter.ctp
+++ b/app/views/characters/mycharacter.ctp
@@ -1,5 +1,5 @@
 <?php 
-echo $this->renderElement(
+echo $this->element(
        'character_index',
        array(
                'character' => $characters,

diff --git a/app/views/characters/view.ctp b/app/views/characters/view.ctp
index 96cdbfd..282660f 100644 (file)
--- a/app/views/characters/view.ctp
+++ b/app/views/characters/view.ctp
@@ -7,7 +7,7 @@ if ($isOwner) {
 }
 $cacheSet['key'] .= "_".$character['Character']['id'];
 
-echo $this->renderElement(
+echo $this->element(
        'character_view',
        array(
                'character' => $character,

diff --git a/app/views/elements/admin_character_sidenav.ctp b/app/views/elements/admin_character_sidenav.ctp
index 25efcc0..cac6363 100644 (file)
--- a/app/views/elements/admin_character_sidenav.ctp
+++ b/app/views/elements/admin_character_sidenav.ctp
@@ -48,7 +48,7 @@ if (isset($character['Character']['name'])) {
 
 <?php if (isset($character['Character'])): ?>
 <?php
-       echo $this->renderElement(
+       echo $this->element(
                'character_skinchanger',
                array(
                        'character' => $character,

diff --git a/app/views/elements/character_index.ctp b/app/views/elements/character_index.ctp
index d3b09df..41357cc 100644 (file)
--- a/app/views/elements/character_index.ctp
+++ b/app/views/elements/character_index.ctp
@@ -94,7 +94,7 @@ foreach ($characters as $character):
 <td class="center">
 <?php if ($site_configs['Character.listImage']['value'] == 2): ?>
 <?php
-       $picture = $this->renderElement('character_picture_image', array(
+       $picture = $this->element('character_picture_image', array(
                'basename' => $character['Character']['main_picture'],
                'options' => array(
                        'previewVersion' => 's',

diff --git a/app/views/elements/character_picture_index.ctp b/app/views/elements/character_picture_index.ctp
index 7137389..faa91b8 100644 (file)
--- a/app/views/elements/character_picture_index.ctp
+++ b/app/views/elements/character_picture_index.ctp
@@ -147,7 +147,7 @@ foreach ($characterPictures as $characterPicture):
 
 <div class="picture">
 <?php 
-       echo $this->renderElement('character_picture_tumbnail', array(
+       echo $this->element('character_picture_tumbnail', array(
                'basename' => $characterPicture['Attachment'][0]['basename'],
                'name' => $characterPicture['Attachment'][0]['alternative'],
                'options' => array(

diff --git a/app/views/elements/character_picture_list.ctp b/app/views/elements/character_picture_list.ctp
index e389a02..aaa9278 100644 (file)
--- a/app/views/elements/character_picture_list.ctp
+++ b/app/views/elements/character_picture_list.ctp
@@ -18,7 +18,7 @@ foreach ($characters as $character):
 <td id="Character<?php echo $i ?>Picture" class="picture_<?php echo $previewVersion ?>">
 <div class="CharacterThmbnailCol picture">
 <?php 
-       echo $this->renderElement('character_picture_tumbnail', array(
+       echo $this->element('character_picture_tumbnail', array(
                'basename' => $character['Character']['main_picture'],
                'name' => $text->truncate($character['Character']['name'], 32),
                'options' => array(

diff --git a/app/views/elements/character_picture_table.ctp b/app/views/elements/character_picture_table.ctp
index 7c2ccaf..7ac7117 100644 (file)
--- a/app/views/elements/character_picture_table.ctp
+++ b/app/views/elements/character_picture_table.ctp
@@ -40,7 +40,7 @@ foreach ($characters as $character):
 <td id="Character<?php echo $i ?>Picture" class="picture_<?php echo $previewVersion ?>">
 <div class="CharacterThmbnailCol picture">
 <?php 
-       echo $this->renderElement('character_picture_tumbnail', array(
+       echo $this->element('character_picture_tumbnail', array(
                'basename' => $character['Character']['main_picture'],
                'name' => $text->truncate($character['Character']['name'], 32),
                'options' => array(

diff --git a/app/views/elements/character_picture_view.ctp b/app/views/elements/character_picture_view.ctp
index 601d4aa..1a665d8 100644 (file)
--- a/app/views/elements/character_picture_view.ctp
+++ b/app/views/elements/character_picture_view.ctp
@@ -21,7 +21,7 @@ echo sprintf(__("%s's Picture", true), $html->link($characterPicture['Character'
 
 <div class="image">
 <?php 
-       echo $this->renderElement('character_picture_image', array(
+       echo $this->element('character_picture_image', array(
                'attachment' => $characterPicture['Attachment'][0],
                'options' => array(
                        'previewVersion' => 'orig',

diff --git a/app/views/elements/character_profile_archive_view.ctp b/app/views/elements/character_profile_archive_view.ctp
index c7cfd39..070fe82 100644 (file)
--- a/app/views/elements/character_profile_archive_view.ctp
+++ b/app/views/elements/character_profile_archive_view.ctp
@@ -55,7 +55,7 @@
 
        $footer .= '</ul></div>';
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'id' => $id,
                'header' => $title. $date. $public,
                'body' => $characterProfileArchive['CharacterProfileArchive']['memo']. "&nbsp;",
@@ -68,7 +68,7 @@
 <?php
        $character = $characterProfileArchive['CharacterProfileArchive']['value'];
 
-       echo $this->renderElement(
+       echo $this->element(
                'character_view',
                array(
                        'character' => $character,

diff --git a/app/views/elements/character_sidenav.ctp b/app/views/elements/character_sidenav.ctp
index 30cbed7..1c4b994 100644 (file)
--- a/app/views/elements/character_sidenav.ctp
+++ b/app/views/elements/character_sidenav.ctp
@@ -83,7 +83,7 @@ if (isset($character['Character']['name'])) {
 
 <?php if (isset($character['Character'])): ?> 
 <?php
-       echo $this->renderElement(
+       echo $this->element(
                'character_skinchanger',
                array(
                        'character' => $character,

diff --git a/app/views/elements/character_view.ctp b/app/views/elements/character_view.ctp
index 76be7e7..9d1295b 100644 (file)
--- a/app/views/elements/character_view.ctp
+++ b/app/views/elements/character_view.ctp
@@ -1,6 +1,6 @@
 <?php if (isset($character['Character']['full_length']) && !empty($character['Character']['full_length'])): ?>
 <?php 
-echo $this->renderElement('character_picture_full', array(
+echo $this->element('character_picture_full', array(
        'basename' => $character['Character']['full_length'],
        'options' => array(
                'previewVersion' => 'orig',
@@ -118,7 +118,7 @@ fullLength<?php endif; ?>">
 <td rowspan="4" class="image160" style="text-align:center;">
 <div class="image150" id="CharacterMainPicture">
 <?php 
-       $main_picture = $this->renderElement('character_picture_image', array(
+       $main_picture = $this->element('character_picture_image', array(
                'basename' => $character['Character']['main_picture'],
                'options' => array(
                        'class' => 'mainImage',
@@ -127,7 +127,7 @@ fullLength<?php endif; ?>">
        ));
 
        if (!$main_picture) {
-               $main_picture = $this->renderElement('character_picture_image', array(
+               $main_picture = $this->element('character_picture_image', array(
                        'basename' => '',
                        'options' => array(
                                'class' => 'mainImage',
@@ -201,7 +201,7 @@ fullLength<?php endif; ?>">
                if ($num > 4) {
                        break;
                }
-               $picture = $this->renderElement('character_picture_image', array(
+               $picture = $this->element('character_picture_image', array(
                        'attachment' => $v['Attachment'][0],
                        'options' => array(
                                'previewVersion' => 's',

diff --git a/app/views/elements/characterskin_sidenav.ctp b/app/views/elements/characterskin_sidenav.ctp
index d61c4a3..bf4ca3d 100644 (file)
--- a/app/views/elements/characterskin_sidenav.ctp
+++ b/app/views/elements/characterskin_sidenav.ctp
@@ -4,7 +4,7 @@
 <?php if (isset($chracter['Character'])): ?>
 <li>
 <?php
-       echo $this->renderElement(
+       echo $this->element(
                'character_skinchanger',
                array(
                        'character' => $character,

diff --git a/app/views/elements/home_right.ctp b/app/views/elements/home_right.ctp
index 419e8cd..6738ecc 100644 (file)
--- a/app/views/elements/home_right.ctp
+++ b/app/views/elements/home_right.ctp
@@ -23,7 +23,7 @@
                $key .= "_". $target_user['User']['id'];
        }
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => sprintf(__("%s's Characters", true), $target_user['User']['name']),
                'characters' => $target_user_characters,
                'previewVersion' => 'm',
@@ -45,7 +45,7 @@
 <?php if (CorePlus::is_valid($public_characters, '0')): ?>
 <!-- All Latest Characters -->
 <?php
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => __('Latest Characters', true),
                'characters' => $public_characters,
                'previewVersion' => 'm',

diff --git a/app/views/errors/missing_action.ctp b/app/views/errors/missing_action.ctp
index 4d13372..cd8aac9 100644 (file)
--- a/app/views/errors/missing_action.ctp
+++ b/app/views/errors/missing_action.ctp
@@ -1,4 +1,4 @@
 <?php 
-echo $this->renderElement('error', array(
+echo $this->element('error', array(
        'message' => __('There is no page.', true),
        ));

diff --git a/app/views/errors/missing_controller.ctp b/app/views/errors/missing_controller.ctp
index 4d13372..cd8aac9 100644 (file)
--- a/app/views/errors/missing_controller.ctp
+++ b/app/views/errors/missing_controller.ctp
@@ -1,4 +1,4 @@
 <?php 
-echo $this->renderElement('error', array(
+echo $this->element('error', array(
        'message' => __('There is no page.', true),
        ));

diff --git a/app/views/layouts/admin_default.ctp b/app/views/layouts/admin_default.ctp
index 7c12289..15aa681 100644 (file)
--- a/app/views/layouts/admin_default.ctp
+++ b/app/views/layouts/admin_default.ctp
@@ -61,7 +61,7 @@ echo $site_configs['Design.customCss']['value'];
 <div id="container">
 <div id="header">
 <?php 
-echo $this->renderElement('pc_header_intro', array(
+echo $this->element('pc_header_intro', array(
        'site_configs' => $site_configs,
        ));
 ?>
@@ -73,7 +73,7 @@ echo $this->renderElement('pc_header_intro', array(
 <li>
 <?php echo $html->link(__('Characters', true), array('controller' => 'characters', 'action' => 'index')); ?>
 <?php 
-echo $this->renderElement('admin_character_sidenav', array(
+echo $this->element('admin_character_sidenav', array(
        ));
 ?>
 </li>
@@ -82,7 +82,7 @@ echo $this->renderElement('admin_character_sidenav', array(
 <?php echo $html->link(__('Systems', true), array('controller' => 'systems', 'action' => 'index')); ?>
 <?php 
 if (!$site_configs['System.singleSystem']['value']) {
-       echo $this->renderElement('admin_system_sidenav', array(
+       echo $this->element('admin_system_sidenav', array(
        ));
 }
 ?>
@@ -91,7 +91,7 @@ if (!$site_configs['System.singleSystem']['value']) {
 <li>
 <?php echo $html->link(__('Users', true), array('controller' => 'users', 'action' => 'index')); ?>
 <?php 
-echo $this->renderElement('admin_user_sidenav', array(
+echo $this->element('admin_user_sidenav', array(
        ));
 ?>
 </li>
@@ -123,7 +123,7 @@ echo $this->renderElement('admin_user_sidenav', array(
 switch ($this->params["controller"]) {
        case 'users':
        case 'regist_mails':
-               echo $this->renderElement('admin_user_sidenav', array());
+               echo $this->element('admin_user_sidenav', array());
                break;
        case 'systems':
        case 'character_sheets':
@@ -132,19 +132,19 @@ switch ($this->params["controller"]) {
        case 'profile_tables':
        case 'profile_table_statics':
                if (!$site_configs['System.singleSystem']['value'] || (isset($selected_system) && !empty($selected_system))) {
-                       echo $this->renderElement('admin_system_sidenav', array());
+                       echo $this->element('admin_system_sidenav', array());
                }
                break;
        case 'characters':
        case 'character_profile_archives':
        case 'character_pictures':
-               echo $this->renderElement('admin_character_sidenav', array());
+               echo $this->element('admin_character_sidenav', array());
                break;
        case 'site_configs':
                switch ($this->params["action"]) {
                        case 'admin_edit_customcss':
                        case 'admin_delete_allcache':
-                               echo $this->renderElement('admin_config_sidenav', array());
+                               echo $this->element('admin_config_sidenav', array());
                                break;
                        default:
                                echo null;
@@ -166,7 +166,7 @@ switch ($this->params["controller"]) {
 
 <div id="footer">
 <?php 
-       echo $this->renderElement('version', 
+       echo $this->element('version', 
                array(
                        'version' => Configure::read('Version'),
                )

diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp
index 427d79c..9aa167c 100644 (file)
--- a/app/views/layouts/default.ctp
+++ b/app/views/layouts/default.ctp
@@ -69,7 +69,7 @@ echo $site_configs['Design.customCss']['value'];
 
 <div id="header">
 <?php 
-echo $this->renderElement('pc_header_intro', array(
+echo $this->element('pc_header_intro', array(
        'site_configs' => $site_configs,
        ));
 ?>
@@ -108,7 +108,7 @@ switch ($this->params["controller"]) {
                        case 'change_password':
                        case 'delete':
                                if ($user['User']['id']) {
-                                       echo $this->renderElement('config_sidenav', array());
+                                       echo $this->element('config_sidenav', array());
                                }
                                break;
                        default:
@@ -118,18 +118,18 @@ switch ($this->params["controller"]) {
                break;
        case 'regist_mails':
                        if ($user['User']['id']) {
-                               echo $this->renderElement('config_sidenav', array());
+                               echo $this->element('config_sidenav', array());
                        }
                break;
        case 'systems':
                if (!$site_configs['System.singleSystem']['value']) {
-                       echo $this->renderElement('system_sidenav', array());
+                       echo $this->element('system_sidenav', array());
                }
                break;
        case 'characters':
        case 'character_profile_archives':
        case 'character_pictures':
-               echo $this->renderElement('character_sidenav', array());
+               echo $this->element('character_sidenav', array());
                break;
        default:
                echo null;
@@ -161,7 +161,7 @@ if (isset($character['System']['copyright'])) {
 <?php endif; ?>
 
 <?php 
-       echo $this->renderElement('version', 
+       echo $this->element('version', 
                array(
                        'version' => Configure::read('Version'),
                )

diff --git a/app/views/systems/admin_delete.ctp b/app/views/systems/admin_delete.ctp
index 47d70b4..4fe96b0 100644 (file)
--- a/app/views/systems/admin_delete.ctp
+++ b/app/views/systems/admin_delete.ctp
@@ -70,7 +70,7 @@
 
        $footer = null;
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'header' => $system_img. $system_name. $public. $npc_use,
                'body' => $system['System']['detail']." ",
                'footer' => $footer,
@@ -82,7 +82,7 @@
 <?php
        $total =  $html->tag('span', sprintf(__('Total Characters %d', true), $system['System']['character_num']), array('class' => 'total_chara_num'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => __('Characters', true). $total,
                'characters' => $system['Character'],
                'previewVersion' => 'xs',

diff --git a/app/views/systems/admin_index.ctp b/app/views/systems/admin_index.ctp
index 1efed07..a3e5489 100644 (file)
--- a/app/views/systems/admin_index.ctp
+++ b/app/views/systems/admin_index.ctp
@@ -31,7 +31,7 @@ foreach ($systems as $system):
 
        $total =  $html->tag('span', sprintf(__('Total Characters %d', true), $system['System']['character_num']), array('class' => 'total_chara_num'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => $system_name. $total,
                'characters' => $system['Character'],
                'previewVersion' => 's',

diff --git a/app/views/systems/admin_view.ctp b/app/views/systems/admin_view.ctp
index 86a08ce..e58b571 100644 (file)
--- a/app/views/systems/admin_view.ctp
+++ b/app/views/systems/admin_view.ctp
@@ -76,7 +76,7 @@
                '<li>'.$html->link(__('Delete System', true), array('action' => 'delete', $system['System']['id'])).'</li>'.
                '</ul>';
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'header' => $system_name. $public. $system_link. $npc_use,
                'body' => $body,
                'footer' => $footer,
@@ -88,7 +88,7 @@
 <?php
        $total =  $html->tag('span', sprintf(__('Total Characters %d', true), $system['System']['character_num']), array('class' => 'total_chara_num'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => __('Characters', true). $total,
                'characters' => $system['Character'],
                'previewVersion' => 'xs',
@@ -163,7 +163,7 @@ $characterSheet['id'],
 
        $footer = null;
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'header' =>$header,
                'body' => $body,
                'footer' => $footer,

diff --git a/app/views/systems/index.ctp b/app/views/systems/index.ctp
index 7209002..6e3cc76 100644 (file)
--- a/app/views/systems/index.ctp
+++ b/app/views/systems/index.ctp
@@ -20,7 +20,7 @@ echo $paginator->counter(array(
 
        $total =  $html->tag('span', sprintf(__('Total Characters %d', true), $system['System']['character_num']), array('class' => 'total_chara_num'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => $system_name. $total,
                'characters' => $system['Character'],
                'previewVersion' => 's',

diff --git a/app/views/systems/view.ctp b/app/views/systems/view.ctp
index 7c5fc9b..2fc4301 100644 (file)
--- a/app/views/systems/view.ctp
+++ b/app/views/systems/view.ctp
@@ -48,7 +48,7 @@
 
        $footer = null;
 
-       echo $this->renderElement('box', array(
+       echo $this->element('box', array(
                'header' => $system_name. $system_link,
                'body' => $body,
                'footer' => $footer,
@@ -62,7 +62,7 @@
 
        $add_link =  $html->tag('span', $html->link(__('New Character', true), array('controller' => 'characters', 'action' => 'add', 'system_id:'.$system['System']['id'])), array('class' => 'addLink'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => __('Characters', true). $total. $add_link,
                'characters' => $system['Character'],
                'previewVersion' => 'xs',

diff --git a/app/views/users/admin_delete.ctp b/app/views/users/admin_delete.ctp
index 9444b6d..e4f4f68 100644 (file)
--- a/app/views/users/admin_delete.ctp
+++ b/app/views/users/admin_delete.ctp
@@ -90,7 +90,7 @@
 <?php
        $total =  $html->tag('span', sprintf(__('Total Characters %d', true), count($target_user['Character'])), array('class' => 'total_chara_num'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => __('Characters', true). $total,
                'characters' => $target_user['Character'],
                'previewVersion' => 'xs',

diff --git a/app/views/users/admin_listview.ctp b/app/views/users/admin_listview.ctp
index 9a594f7..3550bed 100644 (file)
--- a/app/views/users/admin_listview.ctp
+++ b/app/views/users/admin_listview.ctp
@@ -63,7 +63,7 @@ foreach ($users as $user):
 <?php
 if (!empty($user['Character'])) {
        foreach ($user['Character'] as $v) {
-               $picture = $this->renderElement('character_picture_image', array(
+               $picture = $this->element('character_picture_image', array(
                        'basename' => $v['main_picture'],
                        'options' => array(
                                'previewVersion' => 'xs',

diff --git a/app/views/users/admin_view.ctp b/app/views/users/admin_view.ctp
index 301942e..468075d 100644 (file)
--- a/app/views/users/admin_view.ctp
+++ b/app/views/users/admin_view.ctp
@@ -106,7 +106,7 @@
 <?php
        $total =  $html->tag('span', sprintf(__('Total Characters %d', true), count($target_user['Character'])), array('class' => 'total_chara_num'));
 
-       echo $this->renderElement('character_picture_table', array(
+       echo $this->element('character_picture_table', array(
                'header' => __('Characters', true). $total,
                'characters' => $target_user['Character'],
                'previewVersion' => 'xs',

diff --git a/app/views/users/listview.ctp b/app/views/users/listview.ctp
index 7ed3122..422be11 100644 (file)
--- a/app/views/users/listview.ctp
+++ b/app/views/users/listview.ctp
@@ -44,7 +44,7 @@ $paginator->options(array('url' => $this->passedArgs));
 <?php
 if (!empty($user['Character'])) {
        foreach ($user['Character'] as $v) {
-               $picture = $this->renderElement('character_picture_image', array(
+               $picture = $this->element('character_picture_image', array(
                        'basename' => $v['main_picture'],
                        'options' => array(
                                'previewVersion' => 'xs',

diff --git a/app/views/users/view.ctp b/app/views/users/view.ctp
index 8cb4a09..f783538 100644 (file)
--- a/app/views/users/view.ctp
+++ b/app/views/users/view.ctp
@@ -1,11 +1,11 @@
 <div id="home" class="layout2colums users view">
 <?php 
-       echo $this->renderElement('home_left', array(
+       echo $this->element('home_left', array(
                'user' => $user,
                'owner' => false,
        ));
 
-       echo $this->renderElement('home_right', array(
+       echo $this->element('home_right', array(
                'user' => $user,
                'owner' => false,
                'public_characters' => $public_characters,