Selectpubicヘルパー名を変更

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index 9a101ee..24c3173 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -38,7 +38,7 @@ class AppController extends Controller
                'Html',
                'Form',
                'Javascript',
-               'Selectpublic',
+               'Select',
                'Token'
        );
 

diff --git a/app/views/characters/add.ctp b/app/views/characters/add.ctp
index c143cd1..40183c1 100644 (file)
--- a/app/views/characters/add.ctp
+++ b/app/views/characters/add.ctp
@@ -25,7 +25,7 @@
                        'label' => __('Status', true)
                )
        );
-       echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
+       echo $select->create_publicflag_select($public_flags, 'public_flag', array(
                        'label' => __('Public Flag', true)
                )
        );

diff --git a/app/views/characters/admin_index.ctp b/app/views/characters/admin_index.ctp
index 6308f0e..ca1c421 100644 (file)
--- a/app/views/characters/admin_index.ctp
+++ b/app/views/characters/admin_index.ctp
@@ -47,7 +47,7 @@ foreach ($characters as $character):
                        <?php echo $character['Character']['status']; ?>
                </td>
                <td>
-                       <?php echo $selectpublic->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+                       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
                </td>
                <td>
                        <?php echo $html->link($character['User']['name'], array('controller' => 'users', 'action' => 'view', $character['User']['id']), array(), false, false); ?>

diff --git a/app/views/characters/admin_view.ctp b/app/views/characters/admin_view.ctp
index ce2b5c3..8fa8bed 100644 (file)
--- a/app/views/characters/admin_view.ctp
+++ b/app/views/characters/admin_view.ctp
@@ -16,7 +16,7 @@
                </dd>
                <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Public Flag'); ?></dt>
                <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $selectpublic->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+                       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
                </dd>
                <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
                <dd<?php if ($i++ % 2 == 0) echo $class;?>>

diff --git a/app/views/characters/edit.ctp b/app/views/characters/edit.ctp
index a3e8231..291af22 100644 (file)
--- a/app/views/characters/edit.ctp
+++ b/app/views/characters/edit.ctp
@@ -24,7 +24,7 @@
                        'label' => __('Status', true)
                )
        );
-       echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
+       echo $select->create_publicflag_select($public_flags, 'public_flag', array(
                        'label' => __('Public Flag', true)
                )
        );

diff --git a/app/views/characters/index.ctp b/app/views/characters/index.ctp
index b184f13..8c50ae0 100644 (file)
--- a/app/views/characters/index.ctp
+++ b/app/views/characters/index.ctp
@@ -29,7 +29,7 @@ foreach ($characters as $character):
                <td>
                        <?php echo $html->link('<img src="'.$character['Character']['image_filename'].'" alt="'.$character['Character']['name'].'">', array('action' => 'view', $character['Character']['id']), array(), false, false); ?><br>
                        <?php echo $html->link($character['Character']['name'], array('action' => 'view', $character['Character']['id'])); ?>
-                       <?php echo $selectpublic->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+                       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
                </td>
                <td>
                        <?php echo $character['Character']['sort_order']; ?>

diff --git a/app/views/characters/view.ctp b/app/views/characters/view.ctp
index aa4842b..a6e1579 100644 (file)
--- a/app/views/characters/view.ctp
+++ b/app/views/characters/view.ctp
@@ -18,7 +18,7 @@
                </dd>
                <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Public Flag'); ?></dt>
                <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $selectpublic->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+                       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
                        &nbsp;
                </dd>
                <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
@@ -40,8 +40,10 @@
 </div>
 <div class="actions">
        <ul>
+               <?php if ($editable): ?>
                <li><?php echo $html->link(__('Edit Character', true), array('action' => 'edit', $character['Character']['id'])); ?> </li>
                <li><?php echo $html->link(__('Delete Character', true), array('action' => 'delete', $character['Character']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $character['Character']['id'])); ?> </li>
+               <?php endif; ?>
                <li><?php echo $html->link(__('List Characters', true), array('action' => 'index')); ?> </li>
                <li><?php echo $html->link(__('New Character', true), array('action' => 'add')); ?> </li>
                <li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>

diff --git a/app/views/helpers/selectpublic.php b/app/views/helpers/select.php
similarity index 94%
rename from app/views/helpers/selectpublic.php
rename to app/views/helpers/select.php
index ac47392..499894f 100644 (file)
--- a/app/views/helpers/selectpublic.php
+++ b/app/views/helpers/select.php
@@ -1,12 +1,15 @@
 <?php
-class SelectpublicHelper extends Helper {
+/* 
+ * プルダウン表示用Helper
+ * i18n対応
+ */
+class SelectHelper extends Helper {
        var $helpers = array('Form');
 
        var $default_public_flags = array('public_flag', 'private');
 
        /**
         * public_flagの設定をview表示形式に変換
-        * i18n対応
         *
         * @param string $public_flag, array $public_flags
         * @return String

diff --git a/app/views/systems/admin_add.ctp b/app/views/systems/admin_add.ctp
index cea355a..65ac8d4 100644 (file)
--- a/app/views/systems/admin_add.ctp
+++ b/app/views/systems/admin_add.ctp
@@ -37,7 +37,7 @@
                                'selected' => true
                        )
                );
-               echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
+               echo $select->create_publicflag_select($public_flags, 'public_flag', array(
                                'label' => __('Public Flag', true),
                                'selected' => 'public',
                        )

diff --git a/app/views/systems/admin_edit.ctp b/app/views/systems/admin_edit.ctp
index cb0d058..a993671 100644 (file)
--- a/app/views/systems/admin_edit.ctp
+++ b/app/views/systems/admin_edit.ctp
@@ -37,7 +37,7 @@
                                'selected' => true
                        )
                );
-               echo $selectpublic->create_publicflag_select($public_flags, 'public_flag', array(
+               echo $select->create_publicflag_select($public_flags, 'public_flag', array(
                                'label' => __('Public Flag', true)
                        )
                );

diff --git a/app/views/systems/admin_index.ctp b/app/views/systems/admin_index.ctp
index a5578a2..042da1c 100644 (file)
--- a/app/views/systems/admin_index.ctp
+++ b/app/views/systems/admin_index.ctp
@@ -48,7 +48,7 @@ foreach ($systems as $system):
                        <?php endif; ?>
                </td>
                <td>
-                       <?php echo $selectpublic->get_i18n_public_flag($system['System']['public_flag'], $public_flags) ?>
+                       <?php echo $select->get_i18n_public_flag($system['System']['public_flag'], $public_flags) ?>
                </td>
                <td>
                        <?php echo $system['System']['detail']; ?>

diff --git a/app/views/systems/admin_view.ctp b/app/views/systems/admin_view.ctp
index ee6cc29..3a3837c 100644 (file)
--- a/app/views/systems/admin_view.ctp
+++ b/app/views/systems/admin_view.ctp
@@ -37,7 +37,7 @@
                </dd>
                <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Public'); ?></dt>
                <dd<?php if ($i++ % 2 == 0) echo $class;?>>
-                       <?php echo $selectpublic->get_i18n_public_flag($system['System']['public_flag'], $public_flags) ?>
+                       <?php echo $select->get_i18n_public_flag($system['System']['public_flag'], $public_flags) ?>
                </dd>
                <dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Detail'); ?></dt>
                <dd<?php if ($i++ % 2 == 0) echo $class;?>>