diff --git a/app/config/version.php b/app/config/version.php index dc774bd192..31e5dabbaf 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-89', - 'hash_version' => 'v1.2.6.1-89-gb66f553', + 'app_version' => 'v1.2.6.1-116', + 'hash_version' => 'v1.2.6.1-116-g85b6571', ); \ No newline at end of file diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index dc48effedd..454429de79 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -819,9 +819,10 @@ class AssetsController extends AdminController if (Input::get('bulk_actions')=='labels') { $assets = Asset::find($asset_ids); $assetcount = count($assets); + $count = 0; $settings = Setting::getSettings(); - return View::make('backend/hardware/labels')->with('assets',$assets)->with('settings',$settings); + return View::make('backend/hardware/labels')->with('assets',$assets)->with('settings',$settings)->with('count',$count); // Bulk edit diff --git a/app/views/backend/hardware/labels.blade.php b/app/views/backend/hardware/labels.blade.php index 6afec696d2..2a64d5b587 100644 --- a/app/views/backend/hardware/labels.blade.php +++ b/app/views/backend/hardware/labels.blade.php @@ -20,30 +20,31 @@ overflow: hidden; - outline: 1px dotted /* outline doesn't occupy space like border does */ + outline: none; /* outline doesn't occupy space like border does */ } .page-break { clear: left; display:block; page-break-after:always; } - .qr_img { + .qr_img { float: left; } - .qr_text { + .qr_text { margin-left: 5px; float: left; font-family: arial, helvetica, sans-serif; - font-size: 14px; + font-size: 15px; } - + @foreach ($assets as $asset) +
@@ -51,10 +52,7 @@ {{ $settings->qr_text }}

@endif - @if ($asset->name!='') - N: {{ $asset->name }} -
- @endif + @if ($asset->asset_tag!='') T: {{ $asset->asset_tag }}
@@ -66,11 +64,16 @@
+ @if ($count % 18 == 0) +
+ + @endif + @endforeach -
(Repeat 30 times)
-
+ +