From 34868cb2c43cfef90a249a81209c3300141e3cb8 Mon Sep 17 00:00:00 2001 From: cake_67 Date: Wed, 18 Nov 2009 07:05:48 +0000 Subject: [PATCH] =?utf8?q?=3DHOME=E4=BD=9C=E6=88=90=E3=80=81=E4=B8=8D?= =?utf8?q?=E8=A6=81=E9=A0=85=E7=9B=AE=E9=9D=9E=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/trpgtools-onweb/src/trunk/members_framework/cakePHP_frame@129 46fa8b77-3530-0410-9d82-d95c44d28aba --- app/controllers/members_controller.php | 38 +++++++++++++--- app/views/elements/home.thtml | 29 ++++++++++++ app/views/elements/mobile_home.thtml | 34 ++++++++++++++ app/views/members/admin_index.ctp | 14 +++--- app/views/members/admin_view.ctp | 17 +++---- app/views/members/index.ctp | 83 +++------------------------------- app/views/members/listview.ctp | 54 ++++++++++++++++++++++ app/views/members/mobile_index.ctp | 83 +++------------------------------- app/views/members/mobile_listview.ctp | 45 ++++++++++++++++++ app/views/members/mobile_view.ctp | 65 +++----------------------- app/views/members/view.ctp | 65 +++----------------------- 11 files changed, 235 insertions(+), 292 deletions(-) create mode 100644 app/views/elements/home.thtml create mode 100644 app/views/elements/mobile_home.thtml create mode 100644 app/views/members/listview.ctp create mode 100644 app/views/members/mobile_listview.ctp diff --git a/app/controllers/members_controller.php b/app/controllers/members_controller.php index 0b6a91c..14680d3 100644 --- a/app/controllers/members_controller.php +++ b/app/controllers/members_controller.php @@ -28,15 +28,27 @@ class MembersController extends ModuleController { } function mobile_index() { - $this->Member->recursive = 0; - $this->set('members', $this->paginate()); + $this->set('member', $this->Member->read(null, $this->MemberAuth->user("id"))); } function mobile_view($id = null) { if (!$id) { $this->Session->setFlash(__('Invalid Member.', true)); + $this->redirect(array('action'=>'listview')); + } + if ($id == $this->MemberAuth->user("id")) { $this->redirect(array('action'=>'index')); } - $this->set('member', $this->Member->read(null, $id)); + $member = $this->Member->read(null, $id); + if (!$member['Member']) { + $this->Session->setFlash(__('Invalid Member.', true)); + $this->redirect(array('action'=>'listview')); + } + $this->set('member', $member); + } + + function mobile_listview() { + $this->Member->recursive = 0; + $this->set('members', $this->paginate()); } function mobile_add() { if (!empty($this->data)) { @@ -83,18 +95,32 @@ class MembersController extends ModuleController { function logout() { $this->MemberAuth->logout(); } + function index() { - $this->Member->recursive = 0; - $this->set('members', $this->paginate()); + $this->set('member', $this->Member->read(null, $this->MemberAuth->user("id"))); } function view($id = null) { if (!$id) { $this->Session->setFlash(__('Invalid Member.', true)); + $this->redirect(array('action'=>'listview')); + } + if ($id == $this->MemberAuth->user("id")) { $this->redirect(array('action'=>'index')); } - $this->set('member', $this->Member->read(null, $id)); + $member = $this->Member->read(null, $id); + if (!$member['Member']) { + $this->Session->setFlash(__('Invalid Member.', true)); + $this->redirect(array('action'=>'listview')); + } + $this->set('member', $member); } + + function listview() { + $this->Member->recursive = 0; + $this->set('members', $this->paginate()); + } + function add() { if (!empty($this->data)) { $this->Member->create(); diff --git a/app/views/elements/home.thtml b/app/views/elements/home.thtml new file mode 100644 index 0000000..4a12406 --- /dev/null +++ b/app/views/elements/home.thtml @@ -0,0 +1,29 @@ +
+

+
+ > + > + +   + + > + > + +   + + > + > + +   + +
+
+
+ +
diff --git a/app/views/elements/mobile_home.thtml b/app/views/elements/mobile_home.thtml new file mode 100644 index 0000000..c819cc6 --- /dev/null +++ b/app/views/elements/mobile_home.thtml @@ -0,0 +1,34 @@ +
+

+
+> +> + +  + +> +> + +  + +> +> + +  + +> +> + +  + +
+
+
+ +
diff --git a/app/views/members/admin_index.ctp b/app/views/members/admin_index.ctp index 43272ce..5795593 100644 --- a/app/views/members/admin_index.ctp +++ b/app/views/members/admin_index.ctp @@ -9,9 +9,8 @@ echo $paginator->counter(array( - - + @@ -32,16 +31,15 @@ foreach ($members as $member): -
sort('id');?>sort('username');?>sort('password');?> sort('nickname');?>sort('username');?> sort('uid');?> sort('career');?> sort('useragent');?> - - - + - + - + + + diff --git a/app/views/members/admin_view.ctp b/app/views/members/admin_view.ctp index 3648128..83b7963 100644 --- a/app/views/members/admin_view.ctp +++ b/app/views/members/admin_view.ctp @@ -6,24 +6,21 @@   - > - > - -   - - > + > > - +   - > + > > - +   > > - + + +   > diff --git a/app/views/members/index.ctp b/app/views/members/index.ctp index 43272ce..61ac687 100644 --- a/app/views/members/index.ctp +++ b/app/views/members/index.ctp @@ -1,76 +1,7 @@ -
-

-

-counter(array( -'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true) -)); -?>

- - - - - - - - - - - - - - - > - - - - - - - - - - - - -
sort('id');?>sort('username');?>sort('password');?>sort('nickname');?>sort('uid');?>sort('career');?>sort('useragent');?>sort('created');?>sort('modified');?>
- - - - - - - - - - - - - - - - - - - link(__('View', true), array('action' => 'view', $member['Member']['id'])); ?> - link(__('Edit', true), array('action' => 'edit', $member['Member']['id'])); ?> - link(__('Delete', true), array('action' => 'delete', $member['Member']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $member['Member']['id'])); ?> -
-
-
- prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> - | numbers();?> - next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?> -
-
-
    -
  • link(__('New Member', true), array('action' => 'add')); ?>
    • -
-
+renderElement('home', + array( + 'member' => $member, + 'owner' => true, + ) + ); \ No newline at end of file diff --git a/app/views/members/listview.ctp b/app/views/members/listview.ctp new file mode 100644 index 0000000..9622a1f --- /dev/null +++ b/app/views/members/listview.ctp @@ -0,0 +1,54 @@ +
+

+

+counter(array( +'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true) +)); +?>

+ + + + + + + + + + > + + + + + + + +
sort('id');?>sort('nickname');?>sort('created');?>sort('modified');?>
+ + + + + + + + + link(__('View', true), array('action' => 'view', $member['Member']['id'])); ?> +
+
+
+ prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> + | numbers();?> + next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?> +
+
+
    +
  • link(__('New Member', true), array('action' => 'add')); ?>
    • +
+
diff --git a/app/views/members/mobile_index.ctp b/app/views/members/mobile_index.ctp index 49c839b..19dffcf 100644 --- a/app/views/members/mobile_index.ctp +++ b/app/views/members/mobile_index.ctp @@ -1,76 +1,7 @@ -
-

-

-counter(array( -'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true) -)); -?>

- - - - - - - - - - - - - - - > - - - - - - - - - - - - -
sort('id');?>sort('username');?>sort('password');?>sort('nickname');?>sort('uid');?>sort('career');?>sort('useragent');?>sort('created');?>sort('modified');?>
- - - - - - - - - - - - - - - - - - - link(__('View', true), array('action' => 'mobile_view', $member['Member']['id'])); ?> - link(__('Edit', true), array('action' => 'mobile_edit', $member['Member']['id'])); ?> - link(__('Delete', true), array('action' => 'mobile_delete', $member['Member']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $member['Member']['id'])); ?> -
-
-
- prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> - | numbers();?> - next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?> -
-
-
    -
  • link(__('New Member', true), array('action' => 'mobile_add')); ?>
    • -
-
+renderElement('mobile_home', + array( + 'member' => $member, + 'owner' => true, + ) + ); \ No newline at end of file diff --git a/app/views/members/mobile_listview.ctp b/app/views/members/mobile_listview.ctp new file mode 100644 index 0000000..eba61a1 --- /dev/null +++ b/app/views/members/mobile_listview.ctp @@ -0,0 +1,45 @@ +
+

+

+counter(array( +'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true) +)); +?>

+ + + + + + + + +> + + + + + + +
sort('id');?>sort('nickname');?>sort('modified');?>
+ + + + + + +link(__('View', true), array('action' => 'mobile_view', $member['Member']['id'])); ?> +
+
+
+prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> + | numbers();?> +next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?> +
diff --git a/app/views/members/mobile_view.ctp b/app/views/members/mobile_view.ctp index b1920c1..48a8245 100644 --- a/app/views/members/mobile_view.ctp +++ b/app/views/members/mobile_view.ctp @@ -1,58 +1,7 @@ -
-

-
- > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - -
-
-
-
    -
  • link(__('Edit Member', true), array('action' => 'mobile_edit', $member['Member']['id'])); ?>
    • -
  • link(__('Delete Member', true), array('action' => 'mobile_delete', $member['Member']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $member['Member']['id'])); ?>
    • -
  • link(__('List Members', true), array('action' => 'mobile_index')); ?>
    • -
  • link(__('New Member', true), array('action' => 'mobile_add')); ?>
    • -
-
+renderElement('mobile_home', + array( + 'member' => $member, + 'owner' => false, + ) + ); \ No newline at end of file diff --git a/app/views/members/view.ctp b/app/views/members/view.ctp index 3648128..0501ac3 100644 --- a/app/views/members/view.ctp +++ b/app/views/members/view.ctp @@ -1,58 +1,7 @@ -
-

-
- > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   - -
-
-
-
    -
  • link(__('Edit Member', true), array('action' => 'edit', $member['Member']['id'])); ?>
    • -
  • link(__('Delete Member', true), array('action' => 'delete', $member['Member']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $member['Member']['id'])); ?>
    • -
  • link(__('List Members', true), array('action' => 'index')); ?>
    • -
  • link(__('New Member', true), array('action' => 'add')); ?>
    • -
-
+renderElement('home', + array( + 'member' => $member, + 'owner' => false, + ) + ); \ No newline at end of file -- 2.11.0