Merge remote-tracking branch 'origin/develop'

Author: snipe

app/database/migrations/2015_02_12_024100_change_license_notes_type.php

@@ -0,0 +1,27 @@
+<?php
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+class ChangeLicenseNotesType extends Migration {
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes TEXT');
+	}
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN notes VARCHAR(255)');
+	}
+}

app/models/License.php

@@ -16,7 +16,7 @@ class License extends Elegant
             'license_email'   => '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',
         );
 
     /**

app/views/backend/hardware/edit.blade.php

@@ -90,7 +90,7 @@
                 </div>
             </div>
 
-			@if ($asset->model->show_mac_address != 0)
+			@if (isset($asset->model)) && ($asset->model->show_mac_address != 0)
             <!-- MAC Address -->
             <div class="form-group {{ $errors->has('mac_address') ? ' has-error' : '' }}">
                 <label for="mac_address" class="col-md-2 control-label">@lang('admin/hardware/form.mac_address')</label>

app/views/backend/hardware/view.blade.php

@@ -190,7 +190,7 @@
 
         <!-- checked out assets table -->
 
-        <table class="table table-hover">
+        <table class="table table-hover table-fixed break-word">
             <thead>
                 <tr>
                     <th class="col-md-3"><span class="line"></span>@lang('general.date')</th>
@@ -262,7 +262,7 @@
 @if ($asset->notes)
 
 		<h6>@lang('admin/hardware/form.notes'):</h6>
-		 {{ nl2br(e($asset->notes)) }}
+		 <div class="break-word">{{ nl2br(e($asset->notes)) }}</div>
 
 @endif
 

app/views/backend/licenses/view.blade.php

@@ -245,7 +245,7 @@
 <div class="col-md-12">
                 <h6>@lang('admin/licenses/general.checkout_history')</h6>
 
-                <table class="table table-hover">
+                <table class="table table-hover table-fixed break-word">
                     <thead>
                         <tr>
                             <th class="col-md-3">@lang('general.date')</th>
@@ -335,7 +335,7 @@
 
                     @if ($license->notes)
                     	 <li><strong>@lang('admin/licenses/form.notes'):</strong>
-                        <li>{{ nl2br(e($license->notes)) }}</li>
+                        <li class="break-word">{{ nl2br(e($license->notes)) }}</li>
                     @endif
                 </ul>
         </div>

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) {

public/assets/css/scss/index.scss

@@ -211,6 +211,12 @@
 		margin-top: 35px;
 	} 
 }
+.table-fixed {
+  table-layout: fixed;
+}
+.break-word {
+  word-wrap:  break-word;
+}
 
 
 /* responsive */