From 00f7717142e11b90764ffce2d554c566f8ad219f Mon Sep 17 00:00:00 2001 From: Splaer Date: Wed, 11 Feb 2015 23:38:59 -0500 Subject: [PATCH] Fix #475 and styling Cleaned up styling to break lines with larger notes on hardware view and asset view. Changed column type to text. --- ...02_12_024100_change_license_notes_type.php | 27 +++++++++++++++++++ app/models/License.php | 2 +- app/views/backend/hardware/view.blade.php | 4 +-- app/views/backend/licenses/view.blade.php | 4 +-- public/assets/css/compiled/index.css | 6 +++++ 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 app/database/migrations/2015_02_12_024100_change_license_notes_type.php diff --git a/app/database/migrations/2015_02_12_024100_change_license_notes_type.php b/app/database/migrations/2015_02_12_024100_change_license_notes_type.php new file mode 100644 index 0000000000..285fbeeb15 --- /dev/null +++ b/app/database/migrations/2015_02_12_024100_change_license_notes_type.php @@ -0,0 +1,27 @@ + 'email|min:0|max:120', 'license_name' => 'alpha_space|min:0|max:100', 'note' => 'alpha_space', - 'notes' => 'alpha_space|min:0|max:255', + 'notes' => 'alpha_space|min:0', ); /** diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index 4e3aa260bd..dab9fcce24 100755 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -190,7 +190,7 @@ - +
@@ -256,7 +256,7 @@ @if ($asset->notes)
@lang('admin/hardware/form.notes'):
- {{ nl2br(e($asset->notes)) }} +
{{ nl2br(e($asset->notes)) }}
@endif diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php index 0d32e4796f..470c72626b 100755 --- a/app/views/backend/licenses/view.blade.php +++ b/app/views/backend/licenses/view.blade.php @@ -245,7 +245,7 @@
@lang('admin/licenses/general.checkout_history')
-
@lang('general.date')
+
@@ -335,7 +335,7 @@ @if ($license->notes)
  • @lang('admin/licenses/form.notes'): -
  • {{ nl2br(e($license->notes)) }}
  • +
  • {{ nl2br(e($license->notes)) }}
  • @endif diff --git a/public/assets/css/compiled/index.css b/public/assets/css/compiled/index.css index 36ea0a37a6..b3e27a0e99 100755 --- a/public/assets/css/compiled/index.css +++ b/public/assets/css/compiled/index.css @@ -197,6 +197,12 @@ float: right; margin-top: 35px; } +.table-fixed { + table-layout: fixed; +} +.break-word { + word-wrap: break-word; +} /* responsive */ @media (max-width: 768px) {
    @lang('general.date')