This commit is contained in:
Manish Verma
2016-12-13 18:18:25 +05:30
parent fc98add11c
commit 2d8e640e9b
2314 changed files with 97798 additions and 75664 deletions

View File

@@ -166,14 +166,22 @@
<div class="form-group has-feedback @if(isset($errors)) {!! $errors->has('password') ? 'has-error' : '' !!} @endif">
{!! Form::password('password',['placeholder'=>Lang::get('lang.password'),'class' => 'form-control']) !!}
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
<a href="{{url('password/email')}}" style="font-size: .8em" class="pull-left">{!! Lang::get('lang.forgot_password') !!}</a>
</div>
<ul class="list-unstyled pull-left">
<li><a href="{{url('password/email')}}">{!! Lang::get('lang.forgot_password') !!}</a><br></li>
<li><a href="{{url('auth/register')}}">{!! Lang::get('lang.create_account') !!}</a></li>
</ul>
<button type="submit" class="btn btn-custom pull-right">{!! Lang::get('lang.login') !!}</button>
<div class="form-group pull-left">
<input type="checkbox" name="remember"> {!! Lang::get("lang.remember") !!}
</div>
<button type="submit" class="btn btn-custom .btn-sm ">{!! Lang::get('lang.login') !!}</button>
{!! Form::close() !!}
</div>
{{Lang::get('lang.or')}}
<div class="row">
<div class="col-md-12">
<ul class="list-unstyled">
<a href="{{url('auth/register')}}" style="font-size: 1.2em">{!! Lang::get('lang.create_account') !!}</a>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">

View File

@@ -140,9 +140,7 @@
</header>
<!-- Left side column. contains the logo and sidebar -->
<!-- Right side column. Contains the navbar and content of the page -->
<div class="site-hero clearfix">
<div class="site-hero clearfix">
{!! Breadcrumbs::render() !!}
</div>
<!-- Main content -->

View File

@@ -2,6 +2,10 @@
$social = new \App\Model\helpdesk\Settings\SocialMedia();
?>
<br>
@if($social->checkActive('twitter') || $social->checkActive('facebook') || $social->checkActive('google') || $social->checkActive('linkedin') || $social->checkActive('bitbucket') || $social->checkActive('github'))
<center>{{Lang::get('lang.or')}}</center>
@endif
<br>
@if($social->checkActive('twitter'))
<a class="btn btn-block btn-social btn-twitter" href="{{ route('social.login', ['twitter']) }}" style="background-color: #55ACEE;color: white;">
<span class="fa fa-twitter"></span> Sign in with Twitter