webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Made social accounts attachable

Browse Source
This commit is contained in:
Dan Brown
2015-09-04 20:40:36 +01:00
parent 3d18a04c39
commit eac7378ce0
14 changed files with 265 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/sass/_variables.scss
View File

@@ -37,7 +37,7 @@ $primary: #0288D1;
$primary-dark: #0288D1;
$secondary: #e27b41;
$positive: #52A256;
$negative: #D32F2F;
$negative: #E84F4F;
// Item Colors
$color-book: #009688;

2
resources/views/auth/login.blade.php
View File

@@ -30,7 +30,7 @@
<a href="/login/service/google" style="color: #DC4E41;"><i class="zmdi zmdi-google-plus-box zmdi-hc-4x"></i></a>
@endif
@if(isset($socialDrivers['github']))
<a href="/login/service/github" style="color:#000;"><i class="zmdi zmdi-github zmdi-hc-4x"></i></a>
<a href="/login/service/github" style="color:#444;"><i class="zmdi zmdi-github zmdi-hc-4x"></i></a>
@endif
@endif
</div>

3
resources/views/base.blade.php
View File

@@ -55,6 +55,9 @@
@if($currentUser->can('settings-update'))
<a href="/settings"><i class="zmdi zmdi-settings"></i>Settings</a>
@endif
@if(!$signedIn)
<a href="/login"><i class="zmdi zmdi-sign-in"></i>Sign In</a>
@endif
</div>
@if($signedIn)
<img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">

47
resources/views/users/edit.blade.php
View File

@@ -42,22 +42,43 @@
<hr class="margin-top large">
<div class="row">
<div class="col-md-12">
<h3>Permissions</h3>
<p>User Role: <strong>{{$user->role->display_name}}</strong>.</p>
<ul class="text-muted">
@foreach($user->role->permissions as $permission)
<li>
{{ $permission->display_name }}
</li>
@endforeach
</ul>
@if($currentUser->id === $user->id)
<h3>Social Accounts</h3>
<p class="text-muted">
Here you can connect your other accounts for quicker and easier login. <br>
Disconnecting an account here does not previously authorized access. Revoke access from your profile settings on the connected social account.
</p>
<div class="row">
@if(isset($activeSocialDrivers['google']))
<div class="col-md-3 text-center">
<div><i class="zmdi zmdi-google-plus-box zmdi-hc-4x" style="color: #DC4E41;"></i></div>
<div>
@if($user->hasSocialAccount('google'))
<a href="/login/service/google/detach" class="button neg">Disconnect Account</a>
@else
<a href="/login/service/google" class="button pos">Attach Account</a>
@endif
</div>
</div>
@endif
@if(isset($activeSocialDrivers['github']))
<div class="col-md-3 text-center">
<div><i class="zmdi zmdi-github zmdi-hc-4x" style="color: #444;"></i></div>
<div>
@if($user->hasSocialAccount('github'))
<a href="/login/service/github/detach" class="button neg">Disconnect Account</a>
@else
<a href="/login/service/github" class="button pos">Attach Account</a>
@endif
</div>
</div>
@endif
</div>
</div>
@endif
</div>
<p class="margin-top large"><br></p>
@stop