From aa0b48ea65f693ae191950b1b3b9e01fe2963aab Mon Sep 17 00:00:00 2001 From: Cake Date: Tue, 16 Mar 2010 22:56:42 +0900 Subject: [PATCH] =?utf8?q?Character=E5=91=A8=E3=82=8AsubNav=E4=BF=AE?= =?utf8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/controllers/character_pictures_controller.php | 3 +- app/controllers/characters_controller.php | 7 ++++ app/views/character_pictures/edit.ctp | 1 + app/views/characters/add_milti_profiles.ctp | 3 -- app/views/characters/edit.ctp | 26 ++++++++++---- app/views/characters/view.ctp | 5 --- app/views/elements/admin_character_sidenav.ctp | 11 ++++++ app/views/elements/character_picture_sidenav.ctp | 29 --------------- app/views/elements/character_sidenav.ctp | 44 +++++++++++++++++++++++ app/views/layouts/admin_default.ctp | 1 + app/views/layouts/default.ctp | 36 +++++++++---------- 11 files changed, 103 insertions(+), 63 deletions(-) delete mode 100644 app/views/elements/character_picture_sidenav.ctp create mode 100644 app/views/elements/character_sidenav.ctp diff --git a/app/controllers/character_pictures_controller.php b/app/controllers/character_pictures_controller.php index db71860..9e96f88 100644 --- a/app/controllers/character_pictures_controller.php +++ b/app/controllers/character_pictures_controller.php @@ -150,6 +150,7 @@ class CharacterPicturesController extends AppController { $this->data = $character_picture; } + $this->set('isOwner', true); } function delete($id = null) { @@ -216,7 +217,7 @@ class CharacterPicturesController extends AppController { return $this->_delete($character_picture); } - $this->set('isOwner', true); + $this->set('isOwner', false); $this->set('isAdmin', true); $this->set('isDelete', true); $this->set('characterPicture', $character_picture); diff --git a/app/controllers/characters_controller.php b/app/controllers/characters_controller.php index 8efc887..82e855d 100644 --- a/app/controllers/characters_controller.php +++ b/app/controllers/characters_controller.php @@ -86,6 +86,7 @@ class CharactersController extends AppController { } $systems = $this->Character->System->find('list'); $this->set('systems', $systems); + $this->set('isOwner', false); } function edit($id = null) { @@ -170,6 +171,7 @@ class CharactersController extends AppController { $this->data['System']['Profile'] = $this->_restore_html_characters_has_profiles($this->data['System']['Profile']); } + $this->set('isOwner', true); } function add_milti_profiles($id = null) { @@ -262,6 +264,7 @@ class CharactersController extends AppController { $this->data['System']['Profile'] = $this->_restore_html_characters_has_profiles($this->data['System']['Profile']); } + $this->set('isOwner', true); } function set_status($id = null) { @@ -332,6 +335,8 @@ class CharactersController extends AppController { $this->Session->setFlash(__('Character deleted', true)); $this->redirect(array('action'=>'index')); } + + $this->set('isOwner', true); } @@ -374,6 +379,8 @@ class CharactersController extends AppController { function _index() { $this->Character->recursive = 0; $this->set('characters', $this->HtmlEscape->nl_unescape($this->paginate())); + + $this->set('isOwner', false); } function _view($id, $conditions) { diff --git a/app/views/character_pictures/edit.ctp b/app/views/character_pictures/edit.ctp index 2abc71c..98f457a 100644 --- a/app/views/character_pictures/edit.ctp +++ b/app/views/character_pictures/edit.ctp @@ -60,4 +60,5 @@ ); echo $form->end(null); ?> + \ No newline at end of file diff --git a/app/views/characters/add_milti_profiles.ctp b/app/views/characters/add_milti_profiles.ctp index 22d2e80..742b304 100644 --- a/app/views/characters/add_milti_profiles.ctp +++ b/app/views/characters/add_milti_profiles.ctp @@ -54,7 +54,4 @@ echo $form->end('Cancel');
-
diff --git a/app/views/characters/edit.ctp b/app/views/characters/edit.ctp index 0bd5335..f478859 100644 --- a/app/views/characters/edit.ctp +++ b/app/views/characters/edit.ctp @@ -162,9 +162,23 @@ echo $form->end('Cancel');
- -
+create('Character'); +?> +
+ +
  • +link( + $form->button(__('Delete', true), array( + 'label' => null, + )), + array('action' => 'delete', $form->value('Character.id')), + null, + sprintf(__('Are you sure you want to delete # %s?', true), $form->value('Character.id')), + false + ); + echo $form->end(null); +?> +
    • + \ No newline at end of file diff --git a/app/views/characters/view.ctp b/app/views/characters/view.ctp index 54ae9e2..2fac161 100644 --- a/app/views/characters/view.ctp +++ b/app/views/characters/view.ctp @@ -13,11 +13,6 @@ echo $this->renderElement( diff --git a/app/views/elements/admin_character_sidenav.ctp b/app/views/elements/admin_character_sidenav.ctp index 1b5f278..99e6317 100644 --- a/app/views/elements/admin_character_sidenav.ctp +++ b/app/views/elements/admin_character_sidenav.ctp @@ -1,3 +1,14 @@ + +params["action"] == 'index' || $this->params["action"] == 'add') { + $character_id = $character['Character']['id']; +} + ?> diff --git a/app/views/elements/character_picture_sidenav.ctp b/app/views/elements/character_picture_sidenav.ctp deleted file mode 100644 index f99ce16..0000000 --- a/app/views/elements/character_picture_sidenav.ctp +++ /dev/null @@ -1,29 +0,0 @@ -params["action"] == 'index' || $this->params["action"] == 'add') { - $character_id = $character['Character']['id']; -} - ?> - - - - diff --git a/app/views/elements/character_sidenav.ctp b/app/views/elements/character_sidenav.ctp new file mode 100644 index 0000000..3a89cdd --- /dev/null +++ b/app/views/elements/character_sidenav.ctp @@ -0,0 +1,44 @@ +params["controller"] == 'character_pictures' && ($this->params["action"] == 'index' || $this->params["action"] == 'add')) { + $character_id = $character['Character']['id']; +} + ?> + + diff --git a/app/views/layouts/admin_default.ctp b/app/views/layouts/admin_default.ctp index e60214e..eeadacd 100644 --- a/app/views/layouts/admin_default.ctp +++ b/app/views/layouts/admin_default.ctp @@ -116,6 +116,7 @@ switch ($this->params["controller"]) { echo $this->renderElement('admin_system_sidenav', array()); break; case 'characters': + case 'character_pictures': echo $this->renderElement('admin_character_sidenav', array()); break; default: diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp index f6092b3..3b14045 100644 --- a/app/views/layouts/default.ctp +++ b/app/views/layouts/default.ctp @@ -101,25 +101,23 @@ echo $this->renderElement('pc_header_intro', array( -- 2.11.0