From 1e38ced8859f99fee26d772fea5285ad21956aab Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 11:58:45 -0700 Subject: [PATCH] Nicer display of "add new" inline functionality. TODO: Handle validation failures in a less fugly way --- app/views/backend/hardware/edit.blade.php | 10 +++--- app/views/backend/layouts/default.blade.php | 3 +- .../css/bootstrap/bootstrap-overrides.css | 32 +++++++++++-------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 653acad3cb..e32c5a8751 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -163,7 +163,7 @@ @endif - Add new Model... + {{ $errors->first('model_id', '
:message') }} @@ -192,7 +192,7 @@
{{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $asset->supplier_id), array('class'=>'select2', 'style'=>'min-width:350px','id'=>'supplier_select_id')) }} - Add new Supplier... + {{ $errors->first('supplier_id', '
:message') }}
@@ -242,7 +242,7 @@
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2 status_id', 'style'=>'width:350px','id'=>'status_select_id')) }} - Add new Status... +

@lang('admin/hardware/form.help_checkout')

@@ -257,7 +257,7 @@
{{ Form::select('assigned_to', $assigned_to , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'min-width:350px')) }} - Add new User... + {{ $errors->first('assigned_to', '
:message') }}
@@ -277,7 +277,7 @@
{{ Form::select('rtd_location_id', $location_list , Input::old('rtd_location_id', $asset->rtd_location_id), array('class'=>'select2', 'style'=>'width:350px','id'=>'rtd_location_select')) }} - Add new Location... + {{ $errors->first('rtd_location_id', '
:message') }}
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 3f3bdea3a7..5eed5f7f71 100644 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -19,7 +19,7 @@ - + @@ -40,6 +40,7 @@ + diff --git a/public/assets/css/bootstrap/bootstrap-overrides.css b/public/assets/css/bootstrap/bootstrap-overrides.css index b56c31e231..8a906fb557 100644 --- a/public/assets/css/bootstrap/bootstrap-overrides.css +++ b/public/assets/css/bootstrap/bootstrap-overrides.css @@ -21,7 +21,7 @@ h1,h2,h3,h4,h5,h6{ } /* alerts */ -.alert [class^="icon-"], +.alert [class^="icon-"], .alert [class*=" icon-"] { font-size: 27px; position: relative; @@ -31,15 +31,15 @@ h1,h2,h3,h4,h5,h6{ display: inline-block; color: #f1c359; } -.alert-success [class^="icon-"], +.alert-success [class^="icon-"], .alert-success [class*=" icon-"] { color: #81ad53; } -.alert-info [class^="icon-"], +.alert-info [class^="icon-"], .alert-info [class*=" icon-"] { color: #4993c6; } -.alert-danger [class^="icon-"], +.alert-danger [class^="icon-"], .alert-danger [class*=" icon-"] { color: #d5393e; } @@ -60,7 +60,7 @@ textarea { } input[type="text"], input[type="password"], -textarea { +textarea { font-size: 13px; -webkit-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075); @@ -105,7 +105,7 @@ input[type="password"].inline-input:hover { input[type="text"]:focus, input[type="password"]:focus, -textarea:focus{ +textarea:focus{ border-color: #A2CEF0; -webkit-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075), 0 0 4px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075), 0 0 4px rgba(82, 168, 236, 0.6); @@ -173,9 +173,9 @@ textarea::-webkit-input-placeholder { /* PREPEND & APPEND INPUT */ -.input-group input, -.input-group input, -.input-group .uneditable-input, +.input-group input, +.input-group input, +.input-group .uneditable-input, .input-group .uneditable-input { border: 1px solid #d6e2eb; } @@ -240,11 +240,11 @@ textarea::-webkit-input-placeholder { /* dropdown caret */ .dropdown .caret { position: relative; - top: -1px; + top: -1px; } /* dropdown active */ -.dropdown.open > a, -.dropdown.open > a:hover, +.dropdown.open > a, +.dropdown.open > a:hover, .dropdown.open > a:focus { border-color: #101417; } @@ -273,7 +273,7 @@ textarea::-webkit-input-placeholder { border-bottom-color: #333e4a; border-right-color: #566676; border-left-color: #566676; -} +} .pagination.inverse a:hover, .pagination.inverse span:hover { background-color: #000; @@ -344,4 +344,8 @@ table th span.line{ } } - +.verticon { + font-size:30px; + vertical-align: middle; + padding-left: 5px; +}