From 3cc0ed87438b632679ce8b61a7ea0fae48999438 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 25 Nov 2013 07:55:18 -0500
Subject: [PATCH 1/2] Fixed sorting weirdness

Sort of. Still need to revisit, but this works for now.
---
 app/views/backend/licenses/index.blade.php | 36 ++++++++--------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index de61e091f3..764348413d 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -23,17 +23,10 @@ Licenses ::
 			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
 			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
 			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
+			<th class="span2" tabindex="0" rowspan="1" colspan="1">In/Out</th>
 			<th class="span2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
 		</tr>
 	</thead>
-	<tfoot>
-		<tr>
-			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
-			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
-			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
-			<th class="span2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
-		</tr>
-	</tfoot>
 	<tbody>
 
 
@@ -51,8 +44,8 @@ Licenses ::
 					</td>
 					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 					<td></td>
+					<td></td>
 					<td>
-
 					<a href="{{ route('update/license', $license->id) }}" class="btn-flat white"> @lang('button.edit')</a>
 						<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/license', $license->id) }}" data-content="Are you sure you wish to delete the  {{ $license->name }} license?" data-title="Delete {{ $license->name }}?" onClick="return false;">@lang('button.delete')</a>
 
@@ -65,18 +58,9 @@ Licenses ::
 
 				<tr>
 
-
-					<td>
-					@if ($licensedto->assigned_to)
-						<a href="{{ route('checkin/license', $licensedto->id) }}" class="btn-flat info"> Checkin </a>
-					@else
-						<a href="{{ route('checkout/license', $licensedto->id) }}" class="btn-flat success">Checkout</a>
-					@endif
-					</td>
-					<td>{{ $license->name }} Seat {{ $count }}</td>
-
-
-
+					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->name }}</a>
+					 (Seat {{ $count }})</td>
+					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 					<td>
 					@if ($licensedto->assigned_to)
 						<a href="{{ route('view/user', $licensedto->id) }}">
@@ -84,10 +68,16 @@ Licenses ::
 					</a>
 					@endif
 					</td>
+					<td>
+					@if ($licensedto->assigned_to)
+						<a href="{{ route('checkin/license', $licensedto->id) }}" class="btn-flat info"> Checkin </a>
+					@else
+						<a href="{{ route('checkout/license', $licensedto->id) }}" class="btn-flat success">Checkout</a>
+					@endif
+					</td>
+
 					<td></td>
 
-
-
 				</tr>
 				<?php $count++; ?>
 				@endforeach

From acfda8dc821d9342bfb7c0c157b79e6f43f45e42 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 25 Nov 2013 07:57:43 -0500
Subject: [PATCH 2/2] One more change to tighten the sorting.

Still looks weird, still need to revisit.
---
 app/views/backend/licenses/index.blade.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php
index 764348413d..1b62426365 100755
--- a/app/views/backend/licenses/index.blade.php
+++ b/app/views/backend/licenses/index.blade.php
@@ -23,7 +23,6 @@ Licenses ::
 			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.title')</th>
 			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.serial')</th>
 			<th class="span3" tabindex="0" rowspan="1" colspan="1">@lang('admin/licenses/table.assigned_to')</th>
-			<th class="span2" tabindex="0" rowspan="1" colspan="1">In/Out</th>
 			<th class="span2" tabindex="0" rowspan="1" colspan="1">@lang('table.actions')</th>
 		</tr>
 	</thead>
@@ -44,7 +43,6 @@ Licenses ::
 					</td>
 					<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
 					<td></td>
-					<td></td>
 					<td>
 					<a href="{{ route('update/license', $license->id) }}" class="btn-flat white"> @lang('button.edit')</a>
 						<a class="btn-flat danger delete-asset" data-toggle="modal" href="{{ route('delete/license', $license->id) }}" data-content="Are you sure you wish to delete the  {{ $license->name }} license?" data-title="Delete {{ $license->name }}?" onClick="return false;">@lang('button.delete')</a>
@@ -76,7 +74,7 @@ Licenses ::
 					@endif
 					</td>
 
-					<td></td>
+
 
 				</tr>
 				<?php $count++; ?>