DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2135 from YetAnotherCodeMonkey/v3

Browse source 
Swap bgutter and sgutter as they seem to be reversed.
This commit is contained in:
snipe 2016-06-17 17:12:47 -07:00 committed by GitHub
parent 4a148ac069 7f22d3f486
commit 48595e3d76
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/hardware/labels.blade.php
View file

@ -9,7 +9,7 @@
<?php <?php
$settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter; $settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter;
$settings->labels_height = $settings->labels_height - $settings->labels_display_sgutter; $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter;
$qr_size = ($settings->labels_height - .25); $qr_size = ($settings->labels_height - .25);
$qr_txt_size = $settings->labels_width - $qr_size - $settings->labels_display_sgutter - .1; $qr_txt_size = $settings->labels_width - $qr_size - $settings->labels_display_sgutter - .1;
?> ?>

6
resources/views/settings/edit.blade.php
View file

@ -470,19 +470,19 @@
</div> </div>
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), array('class' => 'form-control')) }} {{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), array('class' => 'form-control')) }}
<div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
</div> </div>
</div> </div>
<div class="col-md-3 form-group" style="margin-left: 10px"> <div class="col-md-3 form-group" style="margin-left: 10px">
<div class="input-group"> <div class="input-group">
{{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), array('class' => 'form-control')) }} {{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), array('class' => 'form-control')) }}
<div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div> <div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
</div> </div>
</div> </div>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
{!! $errors->first('labels_display_bgutter', '<span class="alert-msg">:message</span>') !!}
{!! $errors->first('labels_display_sgutter', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('labels_display_sgutter', '<span class="alert-msg">:message</span>') !!}
{!! $errors->first('labels_display_bgutter', '<span class="alert-msg">:message</span>') !!}
</div> </div>
</div> </div>