afterをタグで括る

diff --git a/app/views/users/add.ctp b/app/views/users/add.ctp
index 5a85871..042aadf 100644 (file)
--- a/app/views/users/add.ctp
+++ b/app/views/users/add.ctp
@@ -10,20 +10,28 @@
                echo $form->input('username', array(
                                'label' => __('UserId', true),
                                'maxlength' => $idLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                               'after' => $html->tag(
+                                       'div',
+                                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                                       array('class' => 'attention')
+                               )
                        )
                );
                echo $form->input('password1', array(
+                               'type' => 'password',
                                'label' => __('Password', true),
                                'maxlength' => $passwordLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                               'type' => 'password',
+                               'after' => $html->tag(
+                                       'div',
+                                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+                                       array('class' => 'attention')
+                               )
                        )
                );
                echo $form->input('password2', array(
+                               'type' => 'password',
                                'label' => __('Password [confirm]', true),
                                'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
                        )
                );
        ?>

diff --git a/app/views/users/admin_add.ctp b/app/views/users/admin_add.ctp
index 579733c..443c680 100644 (file)
--- a/app/views/users/admin_add.ctp
+++ b/app/views/users/admin_add.ctp
@@ -10,7 +10,11 @@
                echo $form->input('username', array(
                                'label' => __('UserId', true),
                                'maxlength' => $idLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                               'after' => $html->tag(
+                                       'div',
+                                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                                       array('class' => 'attention')
+                               )
                        )
                );
                echo $form->input('group_id', array(
@@ -18,16 +22,20 @@
                        )
                );
                echo $form->input('password1', array(
+                               'type' => 'password',
                                'label' => __('Password', true),
                                'maxlength' => $passwordLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                               'type' => 'password',
+                               'after' => $html->tag(
+                                       'div',
+                                       sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
+                                       array('class' => 'attention')
+                               )
                        )
                );
                echo $form->input('password2', array(
+                               'type' => 'password',
                                'label' => __('Password [confirm]', true),
                                'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
                        )
                );
                echo $token->create();

diff --git a/app/views/users/admin_change_password.ctp b/app/views/users/admin_change_password.ctp
index 8e2aab1..4103a1e 100644 (file)
--- a/app/views/users/admin_change_password.ctp
+++ b/app/views/users/admin_change_password.ctp
@@ -4,16 +4,20 @@
                <legend><?php __('Change Password');?></legend>
        <?php
                echo $form->input('password1', array(
+                               'type' => 'password',
                                'label' => __('New Password', true),
                                'maxlength' => $passwordLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                               'type' => 'password',
+                               'after' => $html->tag(
+                                       'div',
+                                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                                       array('class' => 'attention')
+                               )
                        )
                );
                echo $form->input('password2', array(
+                               'type' => 'password',
                                'label' => __('New Password [confirm]', true),
                                'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
                        )
                );
                echo $token->create();

diff --git a/app/views/users/change_password.ctp b/app/views/users/change_password.ctp
index 87e101f..d7e202c 100644 (file)
--- a/app/views/users/change_password.ctp
+++ b/app/views/users/change_password.ctp
@@ -4,22 +4,26 @@
                <legend><?php __('Change Password');?></legend>
        <?php
                echo $form->input('password', array(
+                               'type' => 'password',
                                'label' => __('Old Password', true),
                                'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
                        )
                );
                echo $form->input('password1', array(
+                               'type' => 'password',
                                'label' => __('New Password', true),
                                'maxlength' => $passwordLength['max'],
-                               'after' => sprintf(__('Between %d to %d characters', true), $passwordLength['min'], $passwordLength['max']),
-                               'type' => 'password',
+                               'after' => $html->tag(
+                                       'div',
+                                       sprintf(__('Between %d to %d characters', true), $idLength['min'], $idLength['max']),
+                                       array('class' => 'attention')
+                               )
                        )
                );
                echo $form->input('password2', array(
+                               'type' => 'password',
                                'label' => __('New Password [confirm]', true),
                                'maxlength' => $passwordLength['max'],
-                               'type' => 'password',
                        )
                );
                echo $token->create();

diff --git a/app/webroot/css/base.css b/app/webroot/css/base.css
index 03408b8..546ce4c 100644 (file)
--- a/app/webroot/css/base.css
+++ b/app/webroot/css/base.css
@@ -293,8 +293,9 @@ dt {
 }
 dd {
        margin-left: 10em;
-       margin-top: -2em;
+       margin-top: -1.8em;
        vertical-align: top;
+       line-height: 1.4em;
 }
 
 /* Forms */
@@ -347,6 +348,12 @@ form div.submit {
        margin-top: 10px;
        margin-left: 140px;
 }
+form div.attention {
+       font-weight: bold;
+       margin-bottom: 0;
+       padding: 0.5em 0.5em 0;
+}
+
 label {
        display: block;
        font-size: 110%;