Profile設定のサンプル表示など修正

diff --git a/app/views/profile_selects/admin_listview.ctp b/app/views/profile_selects/admin_listview.ctp
index bed0e93..66776e1 100644 (file)
--- a/app/views/profile_selects/admin_listview.ctp
+++ b/app/views/profile_selects/admin_listview.ctp
@@ -50,3 +50,32 @@ foreach ($profile['ProfileSelect'] as $profileSelect):
 </table>
 </p>
 </div>
+
+
+<hr>
+
+<div class="profile_tables view">
+<h2><?php __('Sample');?></h2>
+<p>
+<table class="Character">
+<tbody>
+<!-- Profiles -->
+<?php 
+       $profiledisp->set_profile_type4view($profile['Profile']);
+ ?>
+<tr>
+<th style="width: 100px;">
+       <?php echo $profile['Profile']['name']; ?>
+</th>
+<td colspan="3"<?php if ($profiledisp->profile_type['is_table']): ?> class="table"<?php endif; ?>>
+<?php 
+       $profiledisp->disp_forms4profile_type($profile, 3, 0);
+ ?>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+</p>
+</div>

diff --git a/app/views/profile_tables/admin_listview.ctp b/app/views/profile_tables/admin_listview.ctp
index aea166b..0d244fc 100644 (file)
--- a/app/views/profile_tables/admin_listview.ctp
+++ b/app/views/profile_tables/admin_listview.ctp
@@ -51,3 +51,31 @@ foreach ($profile['ProfileTable'] as $profileTable):
 </table>
 </p>
 </div>
+
+<hr>
+
+<div class="profile_tables view">
+<h2><?php __('Sample');?></h2>
+<p>
+<table class="Character">
+<tbody>
+<!-- Profiles -->
+<?php 
+       $profiledisp->set_profile_type4view($profile['Profile']);
+ ?>
+<tr>
+<th style="width: 100px;">
+       <?php echo $profile['Profile']['name']; ?>
+</th>
+<td colspan="3"<?php if ($profiledisp->profile_type['is_table']): ?> class="table"<?php endif; ?>>
+<?php 
+       $profiledisp->disp_forms4profile_type($profile, 3, 0);
+ ?>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+</p>
+</div>

diff --git a/app/views/profiles/admin_edit.ctp b/app/views/profiles/admin_edit.ctp
index baa6d30..357933d 100644 (file)
--- a/app/views/profiles/admin_edit.ctp
+++ b/app/views/profiles/admin_edit.ctp
@@ -50,13 +50,11 @@
                        'label' => __('Profile Type', true),
                );
                $profiledisp->set_profile_type4view($this->data['Profile']);
-               if ($profiledisp->profile_type['is_subsetting']) {
-                       $profile_type_select_options['after'] = $html->tag(
-                               'div',
-                               __('If change, Profile Selects/Table Settings will be deleted.', true),
-                               array('class' => 'notice')
-                       );
-               }
+               $profile_type_select_options['after'] = $html->tag(
+                       'div',
+                       __('If change, Profile Selects/Table Settings or Character Profiles will be deleted.', true),
+                       array('class' => 'notice')
+               );
                echo $profiledisp->create_profile_type_select($profile_type, 'profile_type', $profile_type_select_options); 
                echo $form->input('required', array(
                        'label' => __('Required', true),

diff --git a/app/views/systems/admin_view.ctp b/app/views/systems/admin_view.ctp
index 64aef19..db992c6 100644 (file)
--- a/app/views/systems/admin_view.ctp
+++ b/app/views/systems/admin_view.ctp
@@ -169,7 +169,7 @@ foreach ($system['Profile'] as $profile):
 <?php endif; ?>
 <tr>
 <td colspan="6" class="actions">
-<?php if ($profiledisp->profile_type['is_select']): ?> 
+<?php if ($profiledisp->profile_type['is_select'] || $profiledisp->profile_type['is_radio'] || $profiledisp->profile_type['is_checkbox']): ?> 
 <?php 
        echo $html->link(
                __('Edit Items', true),