スキン：ビュー表示

diff --git a/app/controllers/character_sheets_controller.php b/app/controllers/character_sheets_controller.php
index 994cffc..255565c 100644 (file)
--- a/app/controllers/character_sheets_controller.php
+++ b/app/controllers/character_sheets_controller.php
@@ -78,13 +78,37 @@ class CharacterSheetsController extends AppController {
                        $this->redirect(array('action'=>'index'));
                }
 
-               $characterSheet = $this->CharacterSheet->read(null, $id);
+               $characterSheet = $this->CharacterSheet->find('first', array(
+                       'conditions' => array('CharacterSheet.id' => $id),
+                       'fields' => '',
+                       'recursive' => 2,
+                       'contain' => array(
+                               'System' => array(
+                                       'Character',
+                               ),
+                       )
+               ));
                if (empty($characterSheet)) {
                        $this->Session->setFlash(__('Invalid CharacterSheet.', true));
                        $this->redirect(array('action'=>'index'));
                }
                $this->set('characterSheets', $characterSheet);
 
+               // キャラシビュー表示
+               $skin_dir = $this->getSkinDir($characterSheet['CharacterSheet']['key_name']);
+               $view_link = null;
+               if (is_readable($skin_dir. 'view.ctp') && !empty($characterSheet['System']['Character'])) {
+                       $view_link = Router::url(array(
+                               'controller' => 'characters',
+                               'action' => 'view',
+                               'prefix' => Configure::read('Routing.admin'),
+                               $characterSheet['System']['Character'][0]['id'],
+                               'mode:'. $characterSheet['CharacterSheet']['key_name']), true
+                       );
+               }
+               $this->set('view_link', $view_link);
+
+
                $this->pageTitle .= " - ". __('CharacterSheets', true);
        }
 

diff --git a/app/locale/jpn/LC_MESSAGES/default.po b/app/locale/jpn/LC_MESSAGES/default.po
index 0378662..ef3101b 100644 (file)
--- a/app/locale/jpn/LC_MESSAGES/default.po
+++ b/app/locale/jpn/LC_MESSAGES/default.po
@@ -190,6 +190,10 @@ msgstr "不正なデータです。"
 msgid "CharacterSheet deleted"
 msgstr "キャラクターシートを削除しました。"
 
+#: /controllers/character_sheets_controller.php:136
+msgid "Check View"
+msgstr "表示確認"
+
 #: /controllers/characters_controller.php:99;167;286
 msgid "%s has been saved."
 msgstr "%sを保存しました。"

diff --git a/app/views/character_sheets/admin_view.ctp b/app/views/character_sheets/admin_view.ctp
index d0bd7cc..cf68ee3 100644 (file)
--- a/app/views/character_sheets/admin_view.ctp
+++ b/app/views/character_sheets/admin_view.ctp
@@ -65,6 +65,19 @@
        $form->end('Submit').
        "</fieldset>\n";
 
+
+       if (!empty($view_link)) {
+               $body .= $html->div('leftLink', 
+                       $html->link(
+                               __('Check View', true), 
+                               $view_link , 
+                               array(
+                                       'target' => 'sampleView',
+                               )
+                       )
+               );
+       }
+
        $footer = null;
 
        echo $this->renderElement('box', array(
@@ -74,5 +87,5 @@
        ));
 
 ?>
-</div>
 
+</div>

diff --git a/app/webroot/css/base.css b/app/webroot/css/base.css
index df625a2..5bdb42a 100644 (file)
--- a/app/webroot/css/base.css
+++ b/app/webroot/css/base.css
@@ -557,4 +557,10 @@ div.noticeNarrow {
 .highlight {
        background-color: #ffff66;
        font-weight: bold;
+}
+
+/* リンク */
+.leftLink {
+       padding: 15px;
+       font-size: 16px;
 }
\ No newline at end of file