Merge remote-tracking branch 'origin/develop'

resources/views/partials/forms/edit/uploadLogo.blade.php

@@ -1,15 +1,35 @@
 <div class="form-group {{ $errors->has($logoVariable) ? 'has-error' : '' }}">
-    <label class="col-md-3" for="{{ $logoVariable }}">
+    <div class="col-md-3">
-        {{ Form::label($logoVariable, $logoLabel) }}</label>
+        <strong>{{ $logoLabel }}</strong>
+    </div>
 
-        @if ($setting->$logoVariable!='')
+        @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
+        <div class="col-md-9">
 
-            <div class="col-md-9">
+            <label for="{{ $logoClearVariable }}" style="font-weight: normal">
-                {{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable),array('class' => 'minimal')) }} Remove current {{ str_replace('_', ' ', $logoVariable) }} image
+                {{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable),array('class' => 'minimal')) }}
-            </div>
+                Remove current {{ str_replace('_', ' ', $logoVariable) }} image
+
+            </label>
+
+
+                <br>
+                @if ($logoVariable!='favicon')
+                    <a href="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}" data-toggle="lightbox">
+                        <img style="max-height: 60px; padding-top: 10px; padding-bottom: 10px; " alt="" src="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}">
+                    </a>
+                @else
+                    <img style="max-height: 50px; padding-top: 10px; padding-bottom: 10px; " alt="" src="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}">
+                @endif
+
+        </div>
+        <div class="col-md-9 col-md-offset-3">
+            @else
+                <div class="col-md-9">
         @endif
 
-    <div class="col-md-9 col-md-offset-3">
+
+
 
         <label class="btn btn-default">
             {{ trans('button.select_file')  }}

resources/views/vendor/mail/html/message.blade.php

@@ -5,18 +5,27 @@
 @if (isset($snipeSettings) && ($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
 
 @if ($snipeSettings->brand == '3')
-@if ($snipeSettings->logo!='')
+
-    <img class="navbar-brand-img logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+@if ($snipeSettings->email_logo!='')
+<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
+@elseif ($snipeSettings->logo!='')
+<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
 @endif
 {{ $snipeSettings->site_name }}
+<br><br>
 
 @elseif ($snipeSettings->brand == '2')
-@if ($snipeSettings->logo!='')
+@if ($snipeSettings->email_logo!='')
-    <img class="navbar-brand-img logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
+
+<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
+@elseif ($snipeSettings->logo!='')
+<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
 @endif
+
 @else
 {{ $snipeSettings->site_name }}
 @endif
+
 @else
 Snipe-IT
 @endif
@@ -41,7 +50,7 @@ Snipe-IT
 @if($snipeSettings::setupCompleted())
 © {{ date('Y') }} {{ $snipeSettings->site_name }}. All rights reserved.
 @else
-© {{ date('Y') }} Snipe-it. All rights reserved.
+© {{ date('Y') }} Snipe-IT. All rights reserved.
 @endif
 
 @if ($snipeSettings->privacy_policy_link!='')

resources/views/vendor/mail/html/themes/default.css

@@ -107,14 +107,16 @@ img {
 .header {
     padding: 25px 0;
     text-align: center;
+    vertical-align: middle;
 }
 
 .header a {
-    color: #bbbfc3;
+    color: #2b2d30;
-    font-size: 19px;
+    font-size: 25px;
     font-weight: bold;
     text-decoration: none;
     text-shadow: 0 1px 0 white;
+    vertical-align: middle;
 }
 
 /* Body */