From 28274a33b36c151fa61ef2af1df59638e9ba5ea7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 2 Jan 2013 21:36:35 +0200 Subject: [PATCH] Box Plugins: layout fixes. --- plugins/box/menu/views/backend/add.view.php | 11 ++-- plugins/box/menu/views/backend/edit.view.php | 11 ++-- plugins/box/menu/views/backend/index.view.php | 12 ++-- plugins/box/themes/views/backend/add.view.php | 2 +- .../box/themes/views/backend/edit.view.php | 7 +-- .../box/themes/views/backend/index.view.php | 58 +++++++++++-------- plugins/box/users/views/backend/add.view.php | 8 +-- plugins/box/users/views/backend/edit.view.php | 18 +++--- .../box/users/views/backend/index.view.php | 16 ++--- 9 files changed, 78 insertions(+), 65 deletions(-) diff --git a/plugins/box/menu/views/backend/add.view.php b/plugins/box/menu/views/backend/add.view.php index 6abccf3..f5dbff1 100644 --- a/plugins/box/menu/views/backend/add.view.php +++ b/plugins/box/menu/views/backend/add.view.php @@ -10,22 +10,21 @@ /

- (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'span3 error-field' : 'span3')); + echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'input-xlarge error-field' : 'input-xlarge')); if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).''.$errors['menu_item_name_empty'].''; echo ( Form::label('menu_item_link', __('Item link', 'menu')). - Form::input('menu_item_link', $menu_item_link, array('class' => 'span3')) + Form::input('menu_item_link', $menu_item_link, array('class' => 'input-xlarge')) ); echo ( Form::label('menu_item_category', __('Item category', 'menu')). - Form::input('menu_item_category', $menu_item_category, array('class' => 'span3')) + Form::input('menu_item_category', $menu_item_category, array('class' => 'input-xlarge')) ); ?> @@ -33,13 +32,13 @@ echo ( Html::br(). Form::label('menu_item_target', __('Item target', 'menu')). - Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'span3')) + Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'input-xlarge')) ); echo ( Html::br(). Form::label('menu_item_order', __('Item order', 'menu')). - Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'span3')) + Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'input-xlarge')) ); echo ( diff --git a/plugins/box/menu/views/backend/edit.view.php b/plugins/box/menu/views/backend/edit.view.php index 42f597d..b73bbb5 100644 --- a/plugins/box/menu/views/backend/edit.view.php +++ b/plugins/box/menu/views/backend/edit.view.php @@ -10,22 +10,21 @@ /

- (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'span3 error-field' : 'span3')); + echo Form::input('menu_item_name', $menu_item_name, array('class' => (isset($errors['menu_item_name_empty']) || isset($errors['menu_item_name_empty'])) ? 'input-xlarge error-field' : 'input-xlarge')); if (isset($errors['menu_item_name_empty'])) echo Html::nbsp(4).''.$errors['menu_item_name_empty'].''; echo ( Form::label('menu_item_link', __('Item link', 'menu')). - Form::input('menu_item_link', $menu_item_link, array('class' => 'span3')) + Form::input('menu_item_link', $menu_item_link, array('class' => 'input-xlarge')) ); echo ( Form::label('menu_item_category', __('Item category', 'menu')). - Form::input('menu_item_category', $menu_item_category, array('class' => 'span3')) + Form::input('menu_item_category', $menu_item_category, array('class' => 'input-xlarge')) ); ?> @@ -33,13 +32,13 @@ echo ( Html::br(). Form::label('menu_item_target', __('Item target', 'menu')). - Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'span3')) + Form::select('menu_item_target', $menu_item_target_array, $menu_item_target, array('class' => 'input-xlarge')) ); echo ( Html::br(). Form::label('menu_item_order', __('Item order', 'menu')). - Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'span3')) + Form::select('menu_item_order', $menu_item_order_array, $menu_item_order, array('class' => 'input-xlarge')) ); echo ( diff --git a/plugins/box/menu/views/backend/index.view.php b/plugins/box/menu/views/backend/index.view.php index 623b0ac..d7dca46 100644 --- a/plugins/box/menu/views/backend/index.view.php +++ b/plugins/box/menu/views/backend/index.view.php @@ -37,9 +37,9 @@ - - - + + + @@ -64,11 +64,13 @@ diff --git a/plugins/box/themes/views/backend/add.view.php b/plugins/box/themes/views/backend/add.view.php index 0be72fc..0207062 100644 --- a/plugins/box/themes/views/backend/add.view.php +++ b/plugins/box/themes/views/backend/add.view.php @@ -15,7 +15,7 @@
- (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?> + (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?> .chunk.php .template.php .css diff --git a/plugins/box/themes/views/backend/edit.view.php b/plugins/box/themes/views/backend/edit.view.php index 250e65d..28df5a9 100644 --- a/plugins/box/themes/views/backend/edit.view.php +++ b/plugins/box/themes/views/backend/edit.view.php @@ -12,7 +12,6 @@ if (isset($errors['file_empty_name']) or isset($errors['file_exists'])) $error_class = 'error'; else $error_class = ''; echo (Form::open(null, array('class' => 'form-horizontal'))); - echo (Form::hidden('csrf', Security::token())); ?> @@ -26,7 +25,7 @@
- (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xlarge error-field' : 'input-xlarge'))); ?> + (isset($errors['file_empty_name']) || isset($errors['file_exists'])) ? 'input-xxlarge error-field' : 'input-xxlarge'))); ?> .chunk.php .template.php .css @@ -50,8 +49,8 @@ echo ( Form::textarea('content', Html::toText($content), array('style' => 'width:100%;height:400px;', 'class' => 'source-editor')). Html::br(2). - Form::submit('edit_file_and_exit', __('Save and exit', 'themes'), array('class' => 'btn default')).Html::nbsp(2). - Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn default')). Html::nbsp(). + Form::submit('edit_file_and_exit', __('Save and exit', 'themes'), array('class' => 'btn')).Html::nbsp(2). + Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn')). Html::nbsp(). Form::close() ); diff --git a/plugins/box/themes/views/backend/index.view.php b/plugins/box/themes/views/backend/index.view.php index 2cf8f44..087e3b3 100755 --- a/plugins/box/themes/views/backend/index.view.php +++ b/plugins/box/themes/views/backend/index.view.php @@ -11,7 +11,7 @@ Form::open(). Form::hidden('csrf', Security::token()). Form::label('themes', __('Select theme', 'themes')). - Form::select('themes', $themes_site, $current_site_theme, array('class' => 'span6')). Html::br(). + Form::select('themes', $themes_site, $current_site_theme, array('class' => 'input-xlarge')). Html::br(). Form::submit('save_site_theme', __('Save', 'themes'), array('class' => 'btn')). Form::close() ); @@ -32,7 +32,7 @@ Form::open(). Form::hidden('csrf', Security::token()). Form::label('themes', __('Select theme', 'themes')). - Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'span6')). Html::br(). + Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'input-xlarge')). Html::br(). Form::submit('save_admin_theme', __('Save', 'themes'), array('class' => 'btn')). Form::close() ); @@ -61,23 +61,26 @@
- 'btn btn-actions')); ?> +
+ 'btn btn-small')); ?> 'btn btn-actions', 'onclick' => "return confirmDelete('".__('Delete item :name', 'menu', array(':name' => $item['name']))."')")); + array('class' => 'btn btn-small', 'onclick' => "return confirmDelete('".__('Delete item :name', 'menu', array(':name' => $item['name']))."')")); ?> +
- + + + + -
-
+
+
- 'btn btn-actions')); ?> - + 'btn btn-small')); ?> +
  • __('Clone'))); ?>
'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')")); + array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')")); ?>
@@ -93,23 +96,26 @@ - + + + +
-
+
- 'btn btn-actions')); ?> - + 'btn btn-small')); ?> +
  • __('Clone', 'themes'))); ?>
'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')")); + array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')")); ?>
@@ -125,23 +131,26 @@ - + + +
+
-
+
- 'btn btn-actions')); ?> - + 'btn btn-small')); ?> +
  • __('Clone', 'themes'))); ?>
'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')")); + array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')")); ?>
@@ -157,23 +166,26 @@ - + + + +
-
+
- 'btn btn-actions')); ?> - + 'btn btn-small')); ?> +
  • __('Clone', 'themes'))); ?>
'btn btn-actions btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')")); + array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')")); ?>
diff --git a/plugins/box/users/views/backend/add.view.php b/plugins/box/users/views/backend/add.view.php index 20955f2..0c9e5eb 100644 --- a/plugins/box/users/views/backend/add.view.php +++ b/plugins/box/users/views/backend/add.view.php @@ -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).''.$errors['users_this_user_alredy_exists'].''; @@ -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).''.$errors['users_empty_password'].''; 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).''.$errors['users_this_email_alredy_exists'].''; @@ -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() ); diff --git a/plugins/box/users/views/backend/edit.view.php b/plugins/box/users/views/backend/edit.view.php index 1557d92..270e938 100644 --- a/plugins/box/users/views/backend/edit.view.php +++ b/plugins/box/users/views/backend/edit.view.php @@ -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() ); diff --git a/plugins/box/users/views/backend/index.view.php b/plugins/box/users/views/backend/index.view.php index d3551c1..964cf1d 100755 --- a/plugins/box/users/views/backend/index.view.php +++ b/plugins/box/users/views/backend/index.view.php @@ -19,11 +19,11 @@ - - - - - + + + + + @@ -42,11 +42,13 @@
- 'btn btn-actions')); ?> +
+ 'btn btn-small')); ?> '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'])))."')")); ?> +