1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-01 10:50:37 +02:00

Box Plugins: layout fixes.

This commit is contained in:
Awilum
2013-01-02 21:36:35 +02:00
parent 08e9e8a6b3
commit 28274a33b3
9 changed files with 78 additions and 65 deletions

View File

@@ -7,7 +7,7 @@
Form::open().
Form::hidden('csrf', Security::token()).
Form::label('login', __('Username', 'users')).
Form::input('login', null, array('class' => (isset($errors['users_this_user_alredy_exists']) || isset($errors['users_empty_login'])) ? 'span3 error-field' : 'span3'))
Form::input('login', null, array('class' => (isset($errors['users_this_user_alredy_exists']) || isset($errors['users_empty_login'])) ? 'input-xlarge error-field' : 'input-xlarge'))
);
if (isset($errors['users_this_user_alredy_exists'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_this_user_alredy_exists'].'</span>';
@@ -15,14 +15,14 @@
echo (
Form::label('password', __('Password', 'users')).
Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'span3 error-field' : 'span3'))
Form::password('password', null, array('class' => (isset($errors['users_empty_password'])) ? 'input-xlarge error-field' : 'input-xlarge'))
);
if (isset($errors['users_empty_password'])) echo Html::nbsp(3).'<span style="color:red">'.$errors['users_empty_password'].'</span>';
echo (
Form::label('email', __('Email', 'users')).
Form::input('email', null, array('class' => (isset($errors['users_this_email_alredy_exists']) || isset($errors['users_empty_email'])) ? 'span3 error-field' : 'span3'))
Form::input('email', null, array('class' => (isset($errors['users_this_email_alredy_exists']) || isset($errors['users_empty_email'])) ? 'input-xlarge error-field' : 'input-xlarge'))
);
if (isset($errors['users_this_email_alredy_exists'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_this_email_alredy_exists'].'</span>';
@@ -30,7 +30,7 @@
echo(
Form::label('role', __('Role', 'users')).
Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), null, array('class' => 'span3')). Html::br(2).
Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), null, array('class' => 'input-xlarge')). Html::br(2).
Form::submit('register', __('Register', 'users'), array('class' => 'btn default')).
Form::close()
);

View File

@@ -26,7 +26,7 @@
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
echo Form::label('login', __('Username', 'users'));
echo Form::input('login', $user['login'], array('class' => 'span6'));
echo Form::input('login', $user['login'], array('class' => 'input-xlarge'));
} else {
echo Form::hidden('login', $user['login']);
}
@@ -34,22 +34,22 @@
echo (
Html::br().
Form::label('firstname', __('Firstname', 'users')).
Form::input('firstname', $user_firstname, array('class' => 'span6')).Html::br().
Form::input('firstname', $user_firstname, array('class' => 'input-xlarge')).Html::br().
Form::label('lastname', __('Lastname', 'users')).
Form::input('lastname', $user_lastname, array('class' => 'span6')).Html::br().
Form::input('lastname', $user_lastname, array('class' => 'input-xlarge')).Html::br().
Form::label('email', __('Email', 'users')).
Form::input('email', $user_email, array('class' => 'span6')).Html::br().
Form::input('email', $user_email, array('class' => 'input-xlarge')).Html::br().
Form::label('twitter', __('Twitter', 'users')).
Form::input('twitter', $user_twitter, array('class' => 'span6')).Html::br().
Form::input('twitter', $user_twitter, array('class' => 'input-xlarge')).Html::br().
Form::label('skype', __('Skype', 'users')).
Form::input('skype', $user_skype, array('class' => 'span6')).Html::br().
Form::input('skype', $user_skype, array('class' => 'input-xlarge')).Html::br().
Form::label('about_me', __('About Me', 'users')).
Form::textarea('about_me', $user_about_me, array('class' => 'span6')).Html::br()
Form::textarea('about_me', $user_about_me, array('class' => 'input-xlarge')).Html::br()
);
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
echo Form::label('role', __('Role', 'users'));
echo Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), $user['role'], array('class' => 'span3')). Html::br();
echo Form::select('role', array('admin' => __('Admin', 'users'), 'editor' => __('Editor', 'users'), 'user' => __('User', 'users')), $user['role'], array('class' => 'input-xlarge')). Html::br();
} else {
echo Form::hidden('role', $_SESSION['user_role']);
}
@@ -72,7 +72,7 @@
Form::hidden('csrf', Security::token()).
Form::hidden('user_id', Request::get('user_id')).
Form::label('new_password', __('New password', 'users')).
Form::password('new_password', null, array('class' => 'span6')).Html::br().Html::br().
Form::password('new_password', null, array('class' => 'input-xlarge')).Html::br().Html::br().
Form::submit('edit_profile_password', __('Save', 'users'), array('class' => 'btn')).
Form::close()
);

View File

@@ -19,11 +19,11 @@
<table class="table table-bordered">
<thead>
<tr>
<td><?php echo __('Username', 'users'); ?></td>
<td><?php echo __('Email', 'users'); ?></td>
<td><?php echo __('Registered', 'users'); ?></td>
<td><?php echo __('Role', 'users'); ?></td>
<td width="30%"><?php echo __('Actions', 'users'); ?></td>
<th><?php echo __('Username', 'users'); ?></th>
<th><?php echo __('Email', 'users'); ?></th>
<th><?php echo __('Registered', 'users'); ?></th>
<th><?php echo __('Role', 'users'); ?></th>
<th></th>
</tr>
</thead>
<tbody>
@@ -42,11 +42,13 @@
<?php echo $roles["{$user['role']}"]; ?>
</td>
<td>
<?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-actions')); ?>
<div class="pull-right">
<?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-small')); ?>
<?php echo Html::anchor(__('Delete', 'users'),
'index.php?id=users&action=delete&user_id='.$user['id'].'&token='.Security::token(),
array('class' => 'btn btn-actions', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
?>
</div>
</td>
</tr>
<?php } ?>