DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Reformatted help popover

Browse source
This commit is contained in:
snipe 2018-10-04 20:51:50 -07:00
parent 54d916fd05
commit db765e4a0b
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,7 @@
<input type="checkbox" value="1" name="update_location" class="minimal" {{ Input::old('update_location') == '1' ? ' checked="checked"' : '' }}> Update asset location
</label>
@include ('partials.more-info', ['helpText' => trans('help.audit_help')])
@include ('partials.more-info', ['helpText' => trans('help.audit_help'), 'helpPosition' => 'right'])

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

@ -2,8 +2,8 @@
@extends('layouts/edit-form', [
'createText' => trans('admin/hardware/form.create'),
'updateText' => trans('admin/hardware/form.update'),
'helpTitle' => trans('admin/hardware/general.about_assets_title'),
'helpText' => trans('admin/hardware/general.about_assets_text'),
'helpPosition' => 'right',
'formAction' => ($item) ? route('hardware.update', ['hardware' => $item->id]) : route('hardware.store'),
])

22
resources/views/layouts/edit-form.blade.php
View file

@ -27,15 +27,21 @@
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title" style="min-height: 20px;">
@if (isset($helpText))
@include ('partials.more-info',
[
'helpText' => trans('help.audit_help'),
'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
])
@endif
@if ($item->id)
{{ $item->display_name }}
@endif
</h3>
<div class="box-tools pull-right">
@if (isset($helpText))
<button class="slideout-menu-toggle btn btn-box-tool btn-box-tool-lg" data-toggle="tooltip" title="Help"><i class="fa fa-question"></i></button>
@endif
@include('partials.forms.edit.submit-button')
</div>
</div><!-- /.box-header -->
@ -55,16 +61,6 @@
</div>
</div>
</form>
@if ((isset($helpText)) && (isset($helpTitle)))
<div class="slideout-menu">
<a href="#" class="slideout-menu-toggle pull-right">×</a>
<h3>
{{ $helpTitle}}
</h3>
<p>{{ $helpText }} </p>
</div>
@endif
</div>
@stop

2
resources/views/partials/more-info.blade.php
View file

@ -1 +1 @@
<a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='fa fa-life-ring'></i> {{ trans('help.more_info_title') }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Info Missing' }}"><i class="fa fa-life-ring"></i></a>
<a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='fa fa-life-ring'></i> {{ trans('help.more_info_title') }}" data-placement="{{ (isset($helpPosition)) ? $helpPosition : 'left' }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Info Missing' }}"><i class="fa fa-life-ring"></i></a>