DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-02 12:40:06 -07:00
parent 1c09479d5f 03c2c267bc
commit 30c45442f9
5 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Console/Commands/ObjectImportCommand.php
View file

@ -660,7 +660,12 @@ class ObjectImportCommand extends Command
$last_name = $user_email_array['last_name'];
if ($user_email=='') {
$user_email = $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=='') {

2
resources/views/auth/passwords/email.blade.php
View file

@ -12,7 +12,7 @@
<div class="col-md-4 col-md-offset-4">
<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>

2
resources/views/auth/passwords/reset.blade.php
View file

@ -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">

24
resources/views/layouts/basic.blade.php
View file

@ -33,12 +33,36 @@
<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)
<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">
@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')

2
resources/views/layouts/default.blade.php
View file

@ -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 {