キャラクター写真編集関連の表示など修正

diff --git a/app/controllers/character_pictures_controller.php b/app/controllers/character_pictures_controller.php
index bacf805..bef6fb3 100644 (file)
--- a/app/controllers/character_pictures_controller.php
+++ b/app/controllers/character_pictures_controller.php
@@ -308,6 +308,7 @@ class CharacterPicturesController extends AppController {
                        $isOwner = false;
                }
                $this->set('isOwner', $isOwner);
+               $this->set('isAdmin', $isAdmin);
 
                return $character_picture;
        }

diff --git a/app/views/character_pictures/edit.ctp b/app/views/character_pictures/edit.ctp
index 704aa45..e5ca6ec 100644 (file)
--- a/app/views/character_pictures/edit.ctp
+++ b/app/views/character_pictures/edit.ctp
@@ -33,32 +33,10 @@
 <div class="backButton">
 <?php
        echo $form->create('CharacterPicture', array('url' => array(
-               'controller' => 'character_pictures', 'action' => 'view', $this->data['CharacterPicture']['id']),
+               'controller' => 'character_pictures', 'action' => 'view'),
                'type' => 'GET',
                'id' => 'CancelButton'
        ));
        echo $form->end('Cancel');
 ?>
 </div>
-
-<div class="actions">
-<?php
-       echo $form->create('CharacterPicture');
-?>
-<fieldset>
-<legend><?php __('Delete Picture');?></legend>
-<li>
-<?php
-       echo $html->link(
-               $form->button(__('Delete', true), array(
-                       'label' => null,
-               )), 
-               array('action' => 'delete', $this->data['CharacterPicture']['id']),
-               null,
-               null,
-               false
-       );
-       echo $form->end(null);
-?>
-</fieldset>
-</div>
\ No newline at end of file

diff --git a/app/views/elements/character_picture_view.ctp b/app/views/elements/character_picture_view.ctp
index 9b3e440..de0323f 100644 (file)
--- a/app/views/elements/character_picture_view.ctp
+++ b/app/views/elements/character_picture_view.ctp
@@ -5,9 +5,12 @@
 <?php if ($characterPicture['Attachment'][0]['alternative']):?>
 <span class="alternative"><?php echo $characterPicture['Attachment'][0]['alternative']; ?></span>
 <?php endif; ?>
+
+<?php if ($isOwner || $isAdmin): ?>
+<span class="publicFlag"><?php echo $select->get_i18n_unpublic_flag($characterPicture['CharacterPicture']['public_flag'], $public_flags); ?></span>
+<?php endif; ?>
 </h2>
 
-<p>
 <div class="image">
 <?php 
        echo $this->renderElement('character_picture_image', array(
@@ -18,8 +21,16 @@
                )
        ));
  ?>
-</div>
+
+<div class="action">
+<ul>
+<?php if ($isOwner): ?>
+<li><?php echo $html->link(__('Edit', true), array('controller' => 'character_pictures', 'action' => 'edit', $characterPicture['CharacterPicture']['id'])); ?></li>
+<?php endif; ?>
 <?php if ($isOwner || $isAdmin): ?>
-<div class="publicFlag"><?php echo $select->get_i18n_public_flag($characterPicture['CharacterPicture']['public_flag'], $public_flags); ?></div>
+<li><?php echo $html->link(__('Delete', true), array('controller' => 'character_pictures', 'action' => 'delete', $characterPicture['CharacterPicture']['id'])); ?></li>
 <?php endif; ?>
-</p>
+</ul>
+</div>
+
+</div>

diff --git a/app/views/helpers/select.php b/app/views/helpers/select.php
index f3139c0..00b5468 100644 (file)
--- a/app/views/helpers/select.php
+++ b/app/views/helpers/select.php
@@ -35,6 +35,21 @@ class SelectHelper extends Helper {
        }
 
        /**
+        * public_flag=public以外のみ状態を表示
+        *
+        * @param string $public_flag, array $public_flags, $header
+        * @return String
+        */
+       function get_i18n_unpublic_flag($public_flag, $public_flags, $header = '* ')
+       {
+               if (empty($public_flag) || $public_flag =='public') {
+                       return null;
+               }
+
+               $public_flags = $this->set_publicflag($public_flags);
+               return $header. $public_flags[$public_flag];
+       }
+       /**
         * public_flagの選択プルダウン出力
         * i18n対応
         *

diff --git a/app/webroot/css/base.css b/app/webroot/css/base.css
index 811869c..590391e 100644 (file)
--- a/app/webroot/css/base.css
+++ b/app/webroot/css/base.css
@@ -475,3 +475,10 @@ a.shadow {
        text-align: center;
 }
 
+/* 公開表示 */
+.publicFlag {
+       color: #900;
+}
+h2 .publicFlag {
+       font-size: 80%;
+}

diff --git a/app/webroot/css/character-sheet.css b/app/webroot/css/character-sheet.css
index 2a6b496..d83234b 100644 (file)
--- a/app/webroot/css/character-sheet.css
+++ b/app/webroot/css/character-sheet.css
@@ -114,3 +114,11 @@ div.view div.attachments {
        background-position: right top;
 }
 
+/* キャラクターPicture View */
+div.image div.action {
+       padding-top: 5px;
+}
+div.image div.action li {
+       margin: 10px;
+       font-size: 120%;
+}