Compare commits

...

4 Commits
0.3.3 ... 0.3.7

Author SHA1 Message Date
Deon George
c406c35ff7 User login updates 2019-04-11 22:30:03 +10:00
Deon George
6d84613158 Added custom css files 2019-03-28 11:16:50 +11:00
Deon George
05dbcaf6c4 Added creativeorange/gravatar to requirements 2019-03-26 17:23:46 +11:00
Deon George
867b42be91 Added acache/user to requirements 2019-03-26 17:18:40 +11:00
7 changed files with 62 additions and 46 deletions

View File

@@ -11,6 +11,8 @@
], ],
"require": { "require": {
"igaster/laravel-theme": "^2.0", "igaster/laravel-theme": "^2.0",
"acacha/user": "^0.2.2",
"creativeorange/gravatar": "^1.0",
"orchestra/asset": "^3.6" "orchestra/asset": "^3.6"
}, },
"require-dev": { "require-dev": {

View File

@@ -33,6 +33,7 @@ return [
'signLinkedin' => 'Sign in using Linkedin', 'signLinkedin' => 'Sign in using Linkedin',
'signW3id' => 'Sign in using W3id', 'signW3id' => 'Sign in using W3id',
'signIBMid' => 'Sign in using IBMid', 'signIBMid' => 'Sign in using IBMid',
'signMeetup' => 'Sign in using Meetup',
'sendpassword' => 'Send Password Reset Link', 'sendpassword' => 'Send Password Reset Link',
'passwordreset' => 'Reset password', 'passwordreset' => 'Reset password',
'pagenotfound' => 'Page not found', 'pagenotfound' => 'Page not found',

View File

@@ -14,7 +14,7 @@
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li> <li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
@endforeach @endforeach
@endisset @endisset
<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li> <li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
</ol> </ol>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->

View File

@@ -16,8 +16,14 @@
<link rel="stylesheet" href="/css/adminlte.min.css"> <link rel="stylesheet" href="/css/adminlte.min.css">
<!-- Google Font: Source Sans Pro --> <!-- Google Font: Source Sans Pro -->
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
@if(file_exists('css/social.css'))
<!-- Social Logins -->
<link rel="stylesheet" href="/css/social.css">
@endif
@if(file_exists('css/print.css'))
<!-- Printing Modifications --> <!-- Printing Modifications -->
<link rel="stylesheet" href="/css/print.css"> <link rel="stylesheet" href="/css/print.css">
@endif
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -45,4 +51,9 @@
<!-- STYLESHEETS --> <!-- STYLESHEETS -->
{!! Asset::styles() !!} {!! Asset::styles() !!}
@if(file_exists('css/fixes.css'))
<!-- CSS Fixes -->
<link rel="stylesheet" href="/css/fixes.css">
@endif
</head> </head>

View File

@@ -46,6 +46,8 @@
</a> </a>
</div> </div>
</li> </li>
@else
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
@endif @endif
<!-- Control Side Bar --> <!-- Control Side Bar -->

View File

@@ -5,9 +5,8 @@
<!-- AdminLTE --> <!-- AdminLTE -->
<script src="/js/adminlte.min.js"></script> <script src="/js/adminlte.min.js"></script>
<!-- Our our CSRF token to each interaction -->
{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
<script type="text/javascript"> <script type="text/javascript">
// Our CSRF token to each interaction
$.ajaxSetup({ $.ajaxSetup({
headers: { headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -31,6 +30,7 @@
} }
}); });
// @todo this is not firing.
$("body").on("expanded.lte.pushmenu", function(){ $("body").on("expanded.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember){ if($.AdminLTESidebarTweak.options.EnableRemember){
document.cookie = "toggleState=opened"; document.cookie = "toggleState=opened";

View File

@@ -11,10 +11,10 @@
<!-- Sidebar user panel (optional) --> <!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex"> <div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image"> <div class="image">
<img src="{{ Gravatar::get($user->exists ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User"> <img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
</div> </div>
<div class="info"> <div class="info">
<a class="d-block">{{ $user->name ?: 'Nobody' }}</a> <a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
</div> </div>
</div> </div>