ナビなどデザイン修正

diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php
index f549023..b462c8a 100644 (file)
--- a/app/controllers/app_controller.php
+++ b/app/controllers/app_controller.php
@@ -63,6 +63,7 @@ class AppController extends Controller
                if (isset($this->params['prefix'])) {
                        if ($this->params['prefix'] == Configure::read('Routing.admin')) {
                                $this->isAdmin = true;
+                               $this->layout = 'admin_'.$this->layout;
                        } elseif ($this->params['prefix'] == 'm') {
                                $this->isMobile = true;
                        }
@@ -216,11 +217,6 @@ class PcAppController extends AppController
 
                        $this->redirect($pc_url);
                }
-
-               // 管理画面はテンプレート変更
-               if ($this->isAdmin) {
-                       $this->layout = 'admin_'.$this->layout;
-               }
         }
 
        function beforeRender()

diff --git a/app/controllers/characters_controller.php b/app/controllers/characters_controller.php
index a7a03d7..fa422e1 100644 (file)
--- a/app/controllers/characters_controller.php
+++ b/app/controllers/characters_controller.php
@@ -332,6 +332,7 @@ class CharactersController extends AppController {
                // キャラデータ取得
                $orig_character = $this->Character->find('first', array(
                        'conditions' => $conditions,
+                       'order' => array('Character.modified' => 'desc'),
                        'contain' => array(
                                'User',
                                'System' => array(

diff --git a/app/views/characters/admin_index.ctp b/app/views/characters/admin_index.ctp
index 3bf0369..ee3d291 100644 (file)
--- a/app/views/characters/admin_index.ctp
+++ b/app/views/characters/admin_index.ctp
@@ -11,14 +11,11 @@ echo $paginator->counter(array(
        <th><?php echo $paginator->sort('id');?></th>
        <th><?php echo $paginator->sort('name');?></th>
        <th><?php echo $paginator->sort('system_id');?></th>
+       <th><?php echo $paginator->sort('modified');?></th>
+       <th><?php echo $paginator->sort('user_id');?></th>
        <th><?php echo $paginator->sort('sort_order');?></th>
        <th><?php echo $paginator->sort('status');?></th>
        <th><?php echo $paginator->sort('public_flag');?></th>
-       <th><?php echo $paginator->sort('user_id');?></th>
-       <th><?php echo $paginator->sort('notes');?></th>
-       <th><?php echo $paginator->sort('created');?></th>
-       <th><?php echo $paginator->sort('modified');?></th>
-       <th><?php echo $paginator->sort('deleted_date');?></th>
 </th>
 </tr>
 <?php
@@ -41,28 +38,19 @@ echo $paginator->counter(array(
        <?php echo $html->link($character['System']['name'], array('controller' => 'systems', 'action' => 'view', $character['System']['id'])); ?>&nbsp;
 </td>
 <td>
-       <?php echo $character['Character']['sort_order']; ?>
-</td>
-<td>
-       <?php echo $select->get_i18n_status($character['Character']['status'], $status); ?>
-</td>
-<td>
-       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
+       <?php echo $character['Character']['modified']; ?>
 </td>
 <td>
        <?php echo $html->link($character['User']['name'], array('controller' => 'users', 'action' => 'view', $character['User']['id']), array(), false, false); ?>
 </td>
 <td>
-       <?php echo $character['Character']['notes']; ?>
-</td>
-<td>
-       <?php echo $character['Character']['created']; ?>
+       <?php echo $character['Character']['sort_order']; ?>
 </td>
 <td>
-       <?php echo $character['Character']['modified']; ?>
+       <?php echo $select->get_i18n_status($character['Character']['status'], $status); ?>
 </td>
 <td>
-       <?php echo $character['Character']['deleted_date']; ?>&nbsp;
+       <?php echo $select->get_i18n_public_flag($character['Character']['public_flag'], $public_flags) ?>
 </td>
 </tr>
 <?php endforeach; ?>
@@ -74,9 +62,3 @@ echo $paginator->counter(array(
  | <?php echo $paginator->numbers();?>
 <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
-
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-</ul>
-</div>

diff --git a/app/views/characters/admin_view.ctp b/app/views/characters/admin_view.ctp
index 7a7a56e..542513a 100644 (file)
--- a/app/views/characters/admin_view.ctp
+++ b/app/views/characters/admin_view.ctp
@@ -8,10 +8,3 @@ echo $this->renderElement(
        )
 );
 ?>
-
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('List Characters', true), array('action' => 'index')); ?> </li>
-<li><?php echo $html->link(__('List Systems', true), array('controller' => 'systems', 'action' => 'index')); ?> </li>
-</ul>
-</div>

diff --git a/app/views/elements/admin_character_sidenav.thtml b/app/views/elements/admin_character_sidenav.thtml
new file mode 100644 (file)
index 0000000..1b5f278
--- /dev/null
+++ b/app/views/elements/admin_character_sidenav.thtml
@@ -0,0 +1,3 @@
+<ul>
+<li><?php echo $html->link(__('List of Characters', true), '/admin/characters/index'); ?></li>
+</ul>

diff --git a/app/views/elements/admin_system_sidenav.thtml b/app/views/elements/admin_system_sidenav.thtml
new file mode 100644 (file)
index 0000000..d52e3dd
--- /dev/null
+++ b/app/views/elements/admin_system_sidenav.thtml
@@ -0,0 +1,4 @@
+<ul>
+<li><?php echo $html->link(__('List of Systems', true), '/admin/systems/index'); ?></li>
+<li><?php echo $html->link(__('Add New System', true), '/admin/systems/add'); ?></li>
+</ul>

diff --git a/app/views/elements/admin_user_sidenav.thtml b/app/views/elements/admin_user_sidenav.thtml
new file mode 100644 (file)
index 0000000..8de57c0
--- /dev/null
+++ b/app/views/elements/admin_user_sidenav.thtml
@@ -0,0 +1,4 @@
+<ul>
+<li><?php echo $html->link(__('List of Users', true), '/admin/users/listview'); ?></li>
+<li><?php echo $html->link(__('Add New User', true), '/admin/users/add'); ?></li>
+</ul>

diff --git a/app/views/elements/config_sidenav.thtml b/app/views/elements/config_sidenav.thtml
new file mode 100644 (file)
index 0000000..b3053f4
--- /dev/null
+++ b/app/views/elements/config_sidenav.thtml
@@ -0,0 +1,5 @@
+<ul>
+       <li><?php echo $html->link(__('Edit Your Infomation', true), array('action' => 'edit', $user['User']['id'])); ?> </li>
+       <li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $user['User']['id'])); ?> </li>
+       <li><?php echo $html->link(__('Delete Your Account', true), array('action' => 'delete', $user['User']['id'])); ?> </li>
+</ul>

diff --git a/app/views/helpers/profiledisp.php b/app/views/helpers/profiledisp.php
index bec81c5..7a6df7b 100644 (file)
--- a/app/views/helpers/profiledisp.php
+++ b/app/views/helpers/profiledisp.php
@@ -507,7 +507,6 @@ class ProfiledispHelper extends Helper {
                        echo '<table id="'.$tableId.'">';
                        $this->disp_th4profile_tables($profile['ProfileTable'], $tableId);
                        echo '<tbody>';
-                       echo "<BR><BR>";
                        if (!empty($profile['CharactersHasProfile'])) {
                                $this->disp_form_td4characters_has_profiles($profile['CharactersHasProfile']);
                        }

diff --git a/app/views/layouts/admin_default.ctp b/app/views/layouts/admin_default.ctp
index 5788cb5..1abda32 100644 (file)
--- a/app/views/layouts/admin_default.ctp
+++ b/app/views/layouts/admin_default.ctp
@@ -23,14 +23,15 @@
        // Javascript
        // jQuery
        echo $javascript->link('jquery-1.3.2.min.js');
+       // droppy
+       echo $javascript->link('jquery.droppy.js');
        // 独自ライブラリ
-       echo $javascript->link('common_100110.js');
        // readyイベント
 ?>
 <script type="text/javascript">
        $(document).ready(function(){
-       //サブメニューを表示
-       toggleSubMenu();
+               //サブメニューを表示
+               $('#nav').droppy({speed: 0});
 });
 </script>
 
@@ -51,33 +52,67 @@
 </ul>
 </div>
 
-<div id="subNavi">
-</div>
-
 <div class="mainNavi">
-<ul>
-<li><?php echo $html->link(__('Home', true), '/admin/users/index'); ?>
+<ul id="nav">
+<li><?php echo $html->link(__('Home', true), array('controller' => 'users', 'action' => 'index')); ?>
+
 <li>
-<?php echo $html->link(__('Users', true), '/admin/users/index'); ?>
-       <div class="subNavi">
-<ul>
-<li><?php echo $html->link(__('List of Users', true), '/admin/users/listview'); ?></li>
-<li><?php echo $html->link(__('Add New User', true), '/admin/users/add'); ?></li>
-</ul>
-       </div>
+<?php echo $html->link(__('Users', true), array('controller' => 'users', 'action' => 'index')); ?>
+<?php 
+echo $this->renderElement('admin_user_sidenav', array(
+       ));
+?>
 </li>
 
-<li><?php echo $html->link(__('Members', true), '/users/index'); ?></li>
+<li>
+<?php echo $html->link(__('Systems', true), array('controller' => 'systems', 'action' => 'index')); ?>
+<?php 
+echo $this->renderElement('admin_system_sidenav', array(
+       ));
+?>
+</li>
 
-<li><?php echo $html->link(__('Logout', true), '/users/logout'); ?></li>
+<li>
+<?php echo $html->link(__('Characters', true), array('controller' => 'characters', 'action' => 'index')); ?>
+<?php 
+echo $this->renderElement('admin_character_sidenav', array(
+       ));
+?>
+</li>
+
+
+<li><?php echo $html->link(__('Members', true), array('admin' => false, 'controller' => 'users', 'action' => 'index')); ?></li>
+
+<li><?php echo $html->link(__('Logout', true), array('admin' => false, 'controller' => 'users', 'action' => 'logout')); ?></li>
 </ul>
 </div>
+
 </div>
+
 <div id="content">
+
+<div id="subNavi">
+<?php
+switch ($this->params["controller"]) {
+       case 'users':
+               echo $this->renderElement('admin_user_sidenav', array());
+               break;
+       case 'systems':
+       case 'profiles':
+       case 'profile_selects':
+       case 'profile_tables':
+               echo $this->renderElement('admin_system_sidenav', array());
+               break;
+       case 'characters':
+               echo $this->renderElement('admin_character_sidenav', array());
+               break;
+}
+?>
+</div>
+
+<?php $session->flash('auth'); ?>
 <?php $session->flash(); ?>
-<?php if ($session->check('Message.auth')): ?>
-<div><?php $session->flash('auth'); ?></div>
-<?php endif; ?>
+
 <?php echo $content_for_layout; ?>
 </div>
 <div id="footer">

diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp
index 544b4cd..6d88bb6 100644 (file)
--- a/app/views/layouts/default.ctp
+++ b/app/views/layouts/default.ctp
@@ -23,14 +23,15 @@
        // Javascript
        // jQuery
        echo $javascript->link('jquery-1.3.2.min.js');
+       // droppy
+       echo $javascript->link('jquery.droppy.js');
        // 独自ライブラリ
-       echo $javascript->link('common_100110.js');
        // readyイベント
 ?>
 <script type="text/javascript">
        $(document).ready(function(){
-       //サブメニューを表示
-       toggleSubMenu();
+               //サブメニューを表示
+               $('#nav').droppy();
        });
 </script>
 
@@ -51,27 +52,25 @@
 </ul>
 </div>
 
-<div id="subNavi">
-</div>
-
 <div class="mainNavi">
-<ul>
+<ul id="nav">
 <?php if ($user['User']['id']): ?>
-       <li><?php echo $html->link(__('Home', true), '/users/index'); ?>
-       <li><?php echo $html->link(__('Users', true), '/users/listview'); ?></li>
+       <li><?php echo $html->link(__('Home', true), array('controller' => 'users', 'action' => 'index')); ?>
 
-       <li><?php echo $html->link(__('Configuration', true),  array('action' => 'edit', $user['User']['id'])); ?>
-       <div class="subNavi">
-<ul>
-       <li><?php echo $html->link(__('Edit Your Infomation', true), array('action' => 'edit', $user['User']['id'])); ?> </li>
-       <li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $user['User']['id'])); ?> </li>
-       <li><?php echo $html->link(__('Delete Your Account', true), array('action' => 'delete', $user['User']['id'])); ?> </li>
-</ul>
-       </div>
+       <li><?php echo $html->link(__('Users', true), array('controller' => 'users', 'action' => 'listview')); ?></li>
+<?php endif; ?>
+
+       <li><?php echo $html->link(__('Systems', true), array('controller' => 'systems', 'action' => 'index')); ?></li>
+
+       <li><?php echo $html->link(__('Characters', true), array('controller' => 'characters', 'action' => 'index')); ?></li>
+
+
+<?php if ($user['User']['id']): ?>
+       <li><?php echo $html->link(__('Configuration', true),  array('controller' => 'users', 'action' => 'edit', $user['User']['id'])); ?>
 <?php endif; ?>
 
 <?php if ($isAdministrator): ?>
-<li><?php echo $html->link(__('Administration', true), '/admin/users/index'); ?></li>
+<li><?php echo $html->link(__('Administration', true), array('admin' => true, 'controller' => 'users', 'action' => 'index')); ?></li>
 <?php endif; ?>
 
 <?php if ($user['User']['id']): ?>
@@ -81,10 +80,23 @@
 </div>
 </div>
 <div id="content">
+
+<div id="subNavi">
+<?php
+if ($this->params["controller"] == 'users') {
+       switch ($this->params["action"]) {
+               case 'edit':
+               case 'change_password':
+               case 'delete':
+                       echo $this->renderElement('config_sidenav', array());
+                       break;
+       }
+}
+?>
+</div>
+
+<?php $session->flash('auth'); ?>
 <?php $session->flash(); ?>
-<?php if ($session->check('Message.auth')): ?>
-<div><?php $session->flash('auth'); ?></div>
-<?php endif; ?>
 <?php echo $content_for_layout; ?>
 </div>
 <div id="footer">

diff --git a/app/views/profile_selects/admin_add.ctp b/app/views/profile_selects/admin_add.ctp
index c4331f8..241a861 100644 (file)
--- a/app/views/profile_selects/admin_add.ctp
+++ b/app/views/profile_selects/admin_add.ctp
@@ -25,9 +25,14 @@ echo $token->create();
 </fieldset>
 <?php echo $form->end('Submit');?>
 </div>
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('List ProfileSelects', true), array('action' => 'admin_listview', $profile['Profile']['id'])); ?> </li>
-<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profile['System']['id'])); ?> </li>
-</ul>
+
+<div class="backButton">
+<?php
+echo $form->create('', array('url' => array(
+       'action' => 'admin_listview', $profile['Profile']['id']),
+       'type' => 'GET',
+       'id' => 'CancelButton'
+));
+echo $form->end('Cancel');
+?>
 </div>

diff --git a/app/views/profile_selects/admin_edit.ctp b/app/views/profile_selects/admin_edit.ctp
index 838a346..d79daf5 100644 (file)
--- a/app/views/profile_selects/admin_edit.ctp
+++ b/app/views/profile_selects/admin_edit.ctp
@@ -21,10 +21,14 @@
 </fieldset>
 <?php echo $form->end('Submit');?>
 </div>
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('ProfileSelect.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('ProfileSelect.id'))); ?></li>
-<li><?php echo $html->link(__('List ProfileSelects', true), array('action' => 'admin_listview', $profileSelect['Profile']['id'])); ?> </li>
-<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profileSelect['Profile']['system_id'])); ?> </li>
-</ul>
+
+<div class="backButton">
+<?php
+echo $form->create('', array(
+       'url' => '/admin/profile_selects/listview/'. $this->data['ProfileSelect']['profile_id'],
+       'type' => 'GET',
+       'id' => 'CancelButton'
+));
+echo $form->end('Cancel');
+?>
 </div>

diff --git a/app/views/profile_selects/admin_listview.ctp b/app/views/profile_selects/admin_listview.ctp
index 3b25ee4..63eae3d 100644 (file)
--- a/app/views/profile_selects/admin_listview.ctp
+++ b/app/views/profile_selects/admin_listview.ctp
@@ -78,3 +78,17 @@
 
 </p>
 </div>
+
+<hr>
+<div class="back">
+<?php
+echo $form->create(
+       '', array(
+       'url' => array(
+       'controller' => 'systems', 'action' => 'admin_view', $profile['System']['id']),
+       'type' => 'GET',
+       'id' => 'CancelButton'
+));
+echo $form->end('Back');
+?>
+</div>

diff --git a/app/views/profile_tables/admin_add.ctp b/app/views/profile_tables/admin_add.ctp
index 45d5a66..06b7be2 100644 (file)
--- a/app/views/profile_tables/admin_add.ctp
+++ b/app/views/profile_tables/admin_add.ctp
@@ -62,9 +62,14 @@
 <?php echo $form->end('Submit');?>
 </div>
 
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('List ProfileTables', true), array('action' => 'admin_listview', $profile['Profile']['id'])); ?> </li>
-<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $profile['System']['id'])); ?> </li>
-</ul>
+
+<div class="backButton">
+<?php
+echo $form->create('', array('url' => array(
+       'action' => 'admin_listview', $profile['Profile']['id']),
+       'type' => 'GET',
+       'id' => 'CancelButton'
+));
+echo $form->end('Cancel');
+?>
 </div>

diff --git a/app/views/profile_tables/admin_edit.ctp b/app/views/profile_tables/admin_edit.ctp
index 5ef02fa..66318d4 100644 (file)
--- a/app/views/profile_tables/admin_edit.ctp
+++ b/app/views/profile_tables/admin_edit.ctp
@@ -62,11 +62,13 @@
 <?php echo $form->end('Submit');?>
 </div>
 
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('ProfileTable.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('ProfileTable.id'))); ?></li>
-<li><?php echo $html->link(__('List ProfileTables', true), array('action' => 'index'));?></li>
-<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
-<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
-</ul>
+<div class="backButton">
+<?php
+echo $form->create('', array(
+       'url' => '/admin/profile_tables/listview/'. $this->data['ProfileTable']['profile_id'],
+       'type' => 'GET',
+       'id' => 'CancelButton'
+));
+echo $form->end('Cancel');
+?>
 </div>

diff --git a/app/views/profile_tables/admin_listview.ctp b/app/views/profile_tables/admin_listview.ctp
index 2229382..1029171 100644 (file)
--- a/app/views/profile_tables/admin_listview.ctp
+++ b/app/views/profile_tables/admin_listview.ctp
@@ -83,3 +83,17 @@
 
 </p>
 </div>
+
+<hr>
+<div class="back">
+<?php
+echo $form->create(
+       '', array(
+       'url' => array(
+       'controller' => 'systems', 'action' => 'admin_view', $profile['System']['id']),
+       'type' => 'GET',
+       'id' => 'CancelButton'
+));
+echo $form->end('Back');
+?>
+</div>

diff --git a/app/views/profiles/admin_add.ctp b/app/views/profiles/admin_add.ctp
index b1c0539..37a6451 100644 (file)
--- a/app/views/profiles/admin_add.ctp
+++ b/app/views/profiles/admin_add.ctp
@@ -73,17 +73,12 @@
 <div class="backButton">
 <?php
 echo $form->create(
-       '', 
-       array('url' => array('controller' => 'systems', 'action' => 'admin_index'),
+       '', array(
+       'url' => array(
+               'controller' => 'systems', 'action' => 'admin_view', $System['System']['id']),
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
 echo $form->end('Cancel');
 ?>
 </div>
-
-<div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $System['System']['id']));?></li>
-       </ul>
-</div>

diff --git a/app/views/profiles/admin_edit.ctp b/app/views/profiles/admin_edit.ctp
index 357933d..22da135 100644 (file)
--- a/app/views/profiles/admin_edit.ctp
+++ b/app/views/profiles/admin_edit.ctp
@@ -76,8 +76,10 @@
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
-       'controller' => 'systems', 'action' => 'admin_view', $this->data['System']['id']),
+echo $form->create(
+       '', 
+       array(
+       'url' => '/admin/systems/view/'.$this->data['System']['id'],
        'type' => 'GET',
        'id' => 'CancelButton'
 ));
@@ -85,9 +87,3 @@ echo $form->end('Cancel');
 ?>
 </div>
 
-<div class="actions">
-       <ul>
-               <li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('Profile.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('Profile.id'))); ?></li>
-               <li><?php echo $html->link(__('List Profiles', true), array('controller' => 'systems', 'action' => 'admin_view', $this->data['System']['id']));?></li>
-       </ul>
-</div>

diff --git a/app/views/systems/admin_add.ctp b/app/views/systems/admin_add.ctp
index 5d811bf..1e8cae5 100644 (file)
--- a/app/views/systems/admin_add.ctp
+++ b/app/views/systems/admin_add.ctp
@@ -54,12 +54,3 @@
 ?>
 </div>
 
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('List Systems', true), array('action' => 'index'));?></li>
-<li><?php echo $html->link(__('List Characters', true), array('controller' => 'characters', 'action' => 'index')); ?> </li>
-<li><?php echo $html->link(__('New Character', true), array('controller' => 'characters', 'action' => 'add')); ?> </li>
-<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
-<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
-</ul>
-</div>

diff --git a/app/views/systems/admin_edit.ctp b/app/views/systems/admin_edit.ctp
index 516f1d4..1291d23 100644 (file)
--- a/app/views/systems/admin_edit.ctp
+++ b/app/views/systems/admin_edit.ctp
@@ -55,9 +55,3 @@
 ?>
 </div>
 
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('System.id')), null, sprintf(__('Are you sure you want to delete %s?', true), $form->value('System.name'))); ?></li>
-<li><?php echo $html->link(__('List Systems', true), array('action' => 'index'));?></li>
-</ul>
-</div>

diff --git a/app/views/systems/admin_index.ctp b/app/views/systems/admin_index.ctp
index 6d2ed18..7bbc427 100644 (file)
--- a/app/views/systems/admin_index.ctp
+++ b/app/views/systems/admin_index.ctp
@@ -62,11 +62,3 @@ foreach ($systems as $system):
  |     <?php echo $paginator->numbers();?>
 <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('New System', true), array('action' => 'add')); ?></li>
-<li><?php echo $html->link(__('List Characters', true), array('controller' => 'characters', 'action' => 'index')); ?> </li>
-<li><?php echo $html->link(__('List Profiles', true), array('controller' => 'profiles', 'action' => 'index')); ?> </li>
-<li><?php echo $html->link(__('New Profile', true), array('controller' => 'profiles', 'action' => 'add')); ?> </li>
-</ul>
-</div>

diff --git a/app/views/systems/admin_view.ctp b/app/views/systems/admin_view.ctp
index a2f7a45..4bc053e 100644 (file)
--- a/app/views/systems/admin_view.ctp
+++ b/app/views/systems/admin_view.ctp
@@ -64,7 +64,6 @@
 <ul>
 <li><?php echo $html->link(__('Edit System', true), array('action' => 'edit', $system['System']['id'])); ?> </li>
 <li><?php echo $html->link(__('Delete System', true), array('action' => 'delete', $system['System']['id']), null, sprintf(__('Are you sure you want to delete %s?', true), $system['System']['name'])); ?> </li>
-<li><?php echo $html->link(__('List Systems', true), array('action' => 'index')); ?> </li>
 </ul>
 </div>
 

diff --git a/app/views/users/admin_delete.ctp b/app/views/users/admin_delete.ctp
index c071bcf..5a97a74 100644 (file)
--- a/app/views/users/admin_delete.ctp
+++ b/app/views/users/admin_delete.ctp
@@ -36,7 +36,6 @@
         
 </dd>
 </dl>
-</div>
 
 <?php
        echo $token->create();
@@ -47,17 +46,11 @@
 
 <div class="backButton">
 <?php
-echo $form->create('', array('url' => array(
+       echo $form->create('', array('url' => array(
        'controller' => 'users', 'action' => 'admin_view', $this->data['User']['id']),
-       'type' => 'GET',
-       'id' => 'CancelButton'
-));
-echo $form->end('Cancel');
+               'type' => 'GET',
+               'id' => 'CancelButton'
+       ));
+       echo $form->end('Cancel');
 ?>
 </div>
-
-<div class="actions">
-<ul>
-<li><?php echo $html->link(__('Back', true), array('action' => 'view', $target_user['User']['id'])); ?> </li>
-</ul>
-</div>

diff --git a/app/views/users/admin_listview.ctp b/app/views/users/admin_listview.ctp
index b734324..5d39072 100644 (file)
--- a/app/views/users/admin_listview.ctp
+++ b/app/views/users/admin_listview.ctp
@@ -1,7 +1,4 @@
 <div class="users listview">
-<h2><?php __('Users');?></h2>
-
-<h4><?php //todo:toggle echo $html->link(__('Search Users', true)); ?></h4>
 <fieldset class="searchFieldset" id="adminSearchFieldset">
 <legend><?php __('Search User');?></legend>
 <div class="search form">
@@ -11,13 +8,17 @@
 </div>
 <?php $paginator->options(array('url' => $searchword)); ?>
 </fieldset>
-<br>
 
+<h2><?php __('Users List'); ?></h2>
+<p>
 <div class="paging">
        <?php echo $paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
  |     <?php echo $paginator->numbers();?>
        <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
+</p>
+
+<p>
 <table>
 <tr>
        <th><?php echo $paginator->sort('id');?></th>
@@ -79,3 +80,4 @@ foreach ($users as $user):
  |     <?php echo $paginator->numbers();?>
        <?php echo $paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 </div>
+</p>

diff --git a/app/views/users/admin_view.ctp b/app/views/users/admin_view.ctp
index 1ad0826..8a7639d 100644 (file)
--- a/app/views/users/admin_view.ctp
+++ b/app/views/users/admin_view.ctp
@@ -53,6 +53,7 @@
 </dd>
 </dl>
 </div>
+
 <div class="actions">
 <ul>
 <li><?php echo $html->link(__('Change Password', true), array('action' => 'change_password', $target_user['User']['id'])); ?> </li>

diff --git a/app/webroot/css/base.css b/app/webroot/css/base.css
index 17d5d6c..9c6a09b 100644 (file)
--- a/app/webroot/css/base.css
+++ b/app/webroot/css/base.css
@@ -145,63 +145,97 @@ table{
 
 .mainNavi {
        background-color: #616161;
-       font-size: 120%;
+       font-size: 110%;
        height: 27px;
        padding-left: 5px;
        clear: both;
 }
-.mainNavi ul {
+#nav {
+       position: relative;
+       display: block;
        margin: 0;
+       padding: 0;
+       background-color: transparent;
+       height: 27px;
 }
-.mainNavi ul li:hover {
+#nav li {
+       position: relative;
+       display: block;
+       list-style: none;
+       margin: 0;
+       padding: 0;
+       float: left;
 }
-
-.mainNavi a {
+#nav *:hover {
+       background-color: none;
+}
+#nav li a {
        display: block;
        color: #fff;
        padding: 5px;
 }
-.mainNavi a:visited {
+#nav li a:visited {
        color: #fff;
 }
-.mainNavi a:hover {
+#nav li a:hover {
        color: #FFFF44;
 }
-
-.subNavi {
+#nav ul {
+       position: absolute;
        display: none;
+       margin: 0;
+       padding: 0;
+       width: 145px;
+       top: 25px;
+}
+* html #nav ul { line-height: 0; } /* IE6 "fix" */
+#nav ul a { zoom: 1; } /* IE6/7 fix */
+#nav ul li {
+       float: none;
 }
+#nav ul ul {
+       top: 0;
+       left: 146px;
+       font-size: 100%;
+}
+
+#nav ul li a {
+       border-right: 2px ridge #eee;
+       border-left: 2px ridge #eee;
+       background-color: #222;
+}
+#nav ul a.hover {
+       background-color: #222;
+}
+#nav ul a {
+       border-bottom: 2px groove #eee;
+       border-right: none;
+}
+* html #nav ul li  { margin-bottom: -3px; } /* IE6ハック */
+*:first-child+html #nav ul li  { margin-bottom: -4px; }/*IE7ハック */
+
 #subNavi {
-       background-color: transparent;
+       background-color: #FFFFFF;
        color: #333333;
-       font-size: 110%;
+       font-size: 90%;
        width: 100%;
        height: 26px;
-       padding-left: 5px;
        clear: both;
 }
 #subNavi ul {
 }
 #subNavi ul li {
-       background-color: #cccccc;
-       color: #333333;
-       padding: 5px 8px;
-}
-#subNavi ul li:hover {
-       background-color: #eeeeee;
-       color: #333333;
-       text-decoration: none;
+       padding-right: 5px;
 }
 #subNavi ul li a {
-       color: #333333;
+       color: #003399;
 }
 #subNavi ul li a:visited {
-       color: #333333;
+       color: #003399;
 }
 #subNavi ul li a:hover {
-       background-color: #eeeeee;
-       color: #333333;
-       text-decoration: none;
+       color: #0033cc;
+       text-decoration: underline;
 }
 
 #content {
@@ -317,7 +351,6 @@ form {
 }
 fieldset {
        border: 1px solid #ccc;
-       margin-top: 30px;
        padding: 16px 20px;
 }
 fieldset legend {

diff --git a/app/webroot/js/common_100110.js b/app/webroot/js/common_100110.js
deleted file mode 100644 (file)
index 4ca5a55..0000000
--- a/app/webroot/js/common_100110.js
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/* ナビ */
-//サブメニューを表示
-function toggleSubMenu() {
-       $(".mainNavi ul li").hover(function() {
-               var subMenu = $(this).find("div").html();
-
-               $('#subNavi').html(subMenu);
-               //サブメニュー隠す
-               $('#subNavi').hover(function() {
-               }, function() {
-                       $('#subNavi').html(''); 
-               });
-               $('#mainNavi').hover(function() {
-                       $('#subNavi').html('');
-               });
-               $('#content').hover(function() {
-                       $('#subNavi').html('');
-               });
-       });
-}
-

diff --git a/app/webroot/js/jquery.droppy.js b/app/webroot/js/jquery.droppy.js
new file mode 100644 (file)
index 0000000..7e1f9e1
--- /dev/null
+++ b/app/webroot/js/jquery.droppy.js
@@ -0,0 +1,75 @@
+/*
+ * Droppy 0.1.2
+ * (c) 2008 Jason Frame (jason@onehackoranother.com)
+ */
+(function($) {
+  
+  $.fn.droppy = function(options) {
+
+    options = $.extend({speed: 250, className: 'droppy'}, options || {});
+
+    this.each(function() {
+
+      var root = this, zIndex = 1000;
+
+      $(root).addClass(options.className);
+                       $(root).find('li:has(> ul) > a').addClass('has-subnav');
+
+      function getSubnav(ele) {
+        if (ele.nodeName.toLowerCase() == 'li') {
+          var subnav = $('> ul', ele);
+          return subnav.length ? subnav[0] : null;
+        } else {
+          return ele;
+        }
+      };
+
+      function getActuator(ele) {
+        if (ele.nodeName.toLowerCase() == 'ul') {
+          return $(ele).parents('li')[0];
+        } else {
+          return ele;
+        }
+      };
+
+      function hide() {
+        var subnav = getSubnav(this);
+        if (!subnav) return;
+        $.data(subnav, 'cancelHide', false);
+        setTimeout(function() {
+          if (!$.data(subnav, 'cancelHide')) {
+            $(subnav).slideUp(options.speed);
+          }
+        }, 500);
+      };
+
+      function show() {
+        var subnav = getSubnav(this);
+        if (!subnav) return;
+        $.data(subnav, 'cancelHide', true);
+        $(subnav).css({zIndex: zIndex++}).slideDown(options.speed);
+        if (this.nodeName.toLowerCase() == 'ul') {
+          var li = getActuator(this);
+          $(li).addClass('hover');
+          $('> a', li).addClass('hover');
+        }
+      };
+      
+      if (typeof $.fn.hoverIntent == 'function') {
+          $('ul, li', this).hoverIntent($.extend({
+              sensitivity: 2, interval: 50, timeout: 100
+          }, options.hoverIntent || {}, {over: show, out: hide}));
+      } else {
+          $('ul, li', this).hover(show, hide);
+      }
+      
+        $('li', this).hover(
+        function() { $(this).addClass('hover'); $('> a', this).addClass('hover'); },
+        function() { $(this).removeClass('hover'); $('> a', this).removeClass('hover'); }
+      );
+
+    });
+
+  };
+
+})(jQuery);