From a5467ba25d7692566b444e1538833ba3e00f7428 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 11:12:28 -0700
Subject: [PATCH 1/5] Slug the username to handle spaces, etc.

---
 app/Console/Commands/ObjectImportCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index b0a3e6ad22..84bb0a6fa6 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -660,7 +660,7 @@ class ObjectImportCommand extends Command
             $last_name = $user_email_array['last_name'];
 
             if ($user_email=='') {
-                $user_email = $user_email_array['username'].'@'.Setting::getSettings()->email_domain;
+                $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
             }
 
             if ($user_username=='') {

From 6fe639f490ca07ac08c5922989fc564932bc7bb9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 12:30:02 -0700
Subject: [PATCH 2/5] Skip email if no email domain is given

---
 app/Console/Commands/ObjectImportCommand.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index 84bb0a6fa6..09011d49ae 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -660,7 +660,12 @@ class ObjectImportCommand extends Command
             $last_name = $user_email_array['last_name'];
 
             if ($user_email=='') {
-                $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
+                if (Setting::getSettings()->email_domain) {
+                    $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
+                } else {
+                    $user_email = '';
+                }
+
             }
 
             if ($user_username=='') {

From 9e43a44d203fbf3a2c4dacc43b6dc4130661e727 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 12:30:22 -0700
Subject: [PATCH 3/5] Better styling for forgotten password screens

---
 .../views/auth/passwords/email.blade.php      |  4 ++--
 .../views/auth/passwords/reset.blade.php      |  2 +-
 resources/views/layouts/basic.blade.php       | 22 +++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 3c1d7fffbe..b6c3e1b21c 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -10,9 +10,9 @@
 
 
 
-            <div class="col-md-4 col-md-offset-4">
+            <div class="col-md-6 col-md-offset-3">
 
-                    <div class="box login-box">
+                <div class="box login-box" style="width: 100%">
                         <div class="box-header">
                             <h3 class="box-title"> {{ trans('auth/general.send_password_link')  }}</h3>
                         </div>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index b3f12e467e..af14a2a6fc 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -13,7 +13,7 @@
 
 
 
-                <div class="col-md-4 col-md-offset-4">
+                <div class="col-md-6 col-md-offset-3">
 
                     <div class="box login-box" style="width: 100%">
                         <div class="box-header">
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index e08c11ba9d..6acad92322 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -35,10 +35,32 @@
     <link rel="stylesheet" href="{{ elixir('assets/css/app.css') }}">
 
 
+    @if (\App\Models\Setting::getSettings()->header_color)
+        <style>
+        .main-header .navbar, .main-header .logo {
+        background-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        background: -webkit-linear-gradient(top,  {{ \App\Models\Setting::getSettings()->header_color }} 0%,{{ \App\Models\Setting::getSettings()->header_color }} 100%);
+        background: linear-gradient(to bottom, {{ \App\Models\Setting::getSettings()->header_color }} 0%,{{ \App\Models\Setting::getSettings()->header_color }} 100%);
+        border-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+        .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
+        border-left-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+
+        .btn-primary {
+        background-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        border-color: {{ \App\Models\Setting::getSettings()->header_color }};
+        }
+        </style>
+
+    @endif
+
 </head>
 
 <body class="hold-transition login-page">
 
+
+  <center><img class="logo" style="padding-top: 20px; padding-bottom: 20px;" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}"></center>
   <!-- Content -->
   @yield('content')
 

From a76fe98b2d5d709d0060b5173a778bd05fe44e77 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 12:34:08 -0700
Subject: [PATCH 4/5] Only show a logo if a logo is uploaded

---
 resources/views/layouts/basic.blade.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index 6acad92322..af4e8bdbae 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -59,8 +59,9 @@
 
 <body class="hold-transition login-page">
 
-
-  <center><img class="logo" style="padding-top: 20px; padding-bottom: 20px;" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}"></center>
+    @if (\App\Models\Setting::getSettings()->logo!='')
+    <center><img class="logo" style="padding-top: 20px; padding-bottom: 10px;" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}"></center>
+    @endif
   <!-- Content -->
   @yield('content')
 

From 03c2c267bc45b1a31582a595fbb28eb438006cfb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 2 Aug 2016 12:39:49 -0700
Subject: [PATCH 5/5] Added favicon explicit link

---
 resources/views/auth/passwords/email.blade.php | 2 +-
 resources/views/layouts/basic.blade.php        | 1 +
 resources/views/layouts/default.blade.php      | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index b6c3e1b21c..853b6e0108 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -10,7 +10,7 @@
 
 
 
-            <div class="col-md-6 col-md-offset-3">
+            <div class="col-md-4 col-md-offset-4">
 
                 <div class="box login-box" style="width: 100%">
                         <div class="box-header">
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index af4e8bdbae..850b6c3fdd 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -33,6 +33,7 @@
     <link rel="stylesheet" href="{{ asset('assets/css/bootstrap-table.css') }}">
 
     <link rel="stylesheet" href="{{ elixir('assets/css/app.css') }}">
+    <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
 
 
     @if (\App\Models\Setting::getSettings()->header_color)
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index d76e42585c..a91470a829 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -32,6 +32,8 @@
 
     <link rel="stylesheet" href="{{ asset(elixir('assets/css/app.css')) }}">
 
+    <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
+
     <style>
     @if (\App\Models\Setting::getSettings()->header_color)
     .main-header .navbar, .main-header .logo {