From b89b89c85be8abaf1d548d62695f7c11eb9ac74e Mon Sep 17 00:00:00 2001 From: arindam85 Date: Thu, 1 Dec 2016 14:41:53 +0530 Subject: [PATCH] Alphabets in phone number,Page design change --- app/Http/routes.php | 36 ++ resources/lang/en/lang.php | 2 + resources/views/auth/login.blade.php | 196 ++++++--- resources/views/auth/password.blade.php | 113 +++++- resources/views/auth/register.blade.php | 138 ++++++- .../helpdesk/agent/agents/create.blade.php | 6 +- .../helpdesk/agent/agents/edit.blade.php | 6 +- .../agent/helpdesk/user/create.blade.php | 6 +- .../agent/helpdesk/user/edit.blade.php | 6 +- .../agent/helpdesk/user/show.blade.php | 4 +- .../client/helpdesk/profile.blade.php | 8 +- .../default1/client/layout/client.blade.php | 6 +- .../client/layout/logclient.blade.php | 381 ++++++++++++++++++ 13 files changed, 813 insertions(+), 95 deletions(-) create mode 100644 resources/views/themes/default1/client/layout/logclient.blade.php diff --git a/app/Http/routes.php b/app/Http/routes.php index de8f01b00..899bd4332 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -20,6 +20,42 @@ Route::group(['middleware' => ['web']], function () { Route::get('social/login/{provider}', ['as' => 'social.login.callback', 'uses' => 'Auth\AuthController@handleProviderCallback']); Route::get('social-sync', ['as' => 'social.sync', 'uses' => 'Client\helpdesk\GuestController@sync']); }); + +/* + |------------------------------------------------------------------------------- + | @Arindam + |------------------------------------------------------------------------------- + | Here is defining entire routes for the Admin Panel + | + */ + Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']); + Breadcrumbs::register('password.email', function ($breadcrumbs) { + $breadcrumbs->parent('/'); + $breadcrumbs->push('Login', url('auth/login')); + $breadcrumbs->push('Forgot Password', url('password/email')); + }); + + + // register page + Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']); + Breadcrumbs::register('auth.register', function ($breadcrumbs) { + $breadcrumbs->parent('/'); + $breadcrumbs->push('Login', url('auth/login')); + $breadcrumbs->push('Create Account', url('auth/register')); + }); + + + // Auth login + Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']); + Breadcrumbs::register('auth.login', function ($breadcrumbs) { + $breadcrumbs->parent('/'); + $breadcrumbs->push('Create Account', url('auth/register')); + $breadcrumbs->push('Login', url('auth/login')); + + }); + + + Route::get('account/activate/{token}', ['as' => 'account.activate', 'uses' => 'Auth\AuthController@accountActivate']); Route::get('getmail/{token}', 'Auth\AuthController@getMail'); Route::get('verify-otp', ['as' => 'otp-verification', 'uses' => 'Auth\AuthController@getVerifyOTP']); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 13f2e1921..cc4325c4e 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1546,5 +1546,7 @@ return [ 'agent_delete_successfully' => 'Agent deleted successfully', 'select_another_agent' => 'Select another agent', 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', + //login,registration + 'enter_your_email_here'=>'Enter your email here', ]; diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 2d76f1cac..819e52332 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,78 +1,174 @@ -@extends('themes.default1.layouts.login') +@extends('themes.default1.client.layout.logclient') -@section('body') -

- @if (Session::has('login_require')) - {!! Session::get('login_require') !!} - @else - {!! Lang::get('lang.Login_to_start_your_session') !!} - @endif -

+@section('home') + class = "active" +@stop + +@section('HeadInclude') + + + + + {{-- --}} + + +@stop @if(Session::has('status'))
- + {!! Lang::get('lang.success') !!} {{Session::get('status')}}
@endif - -@if(Session::has('errors')) -
- {!! Lang::get('lang.alert') !!}! - - @if(Session::has('error')) -
  • {!! Session::get('error') !!}
    • - @else -
  • {!! Lang::get('lang.please_fill_all_required_feilds') !!}
    • - @endif -
    -@endif - -@if(Session::has('fails')) -
    - {!! Lang::get('lang.alert') !!}! - -
  • {!! Session::get('fails') !!}
    • -
    -@endif + + + + +@section('breadcrumb') +
    +
      +
    1. {!! Lang::get('lang.you_are_here') !!}:
      2. +
    2. {!! Lang::get('lang.home') !!}
      3. +
    +
    +@stop +@section('content') +@if (count($errors) > 0) +
    + + {!! Lang::get('lang.alert') !!} ! + + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
    +@endif +
    +
    +
    + @if(Auth::user()) + @else + + + {!! Lang::get('lang.register') !!} + + + @endif + first(); + ?> + @if($system != null) + @if($system->status) + @if($system->status == 1) + + + {!! Lang::get('lang.submit_a_ticket') !!} + + + @endif + @endif + @endif + + + {!! Lang::get('lang.my_tickets') !!} + + + + + {!! Lang::get('lang.knowledge_base') !!} + + +
    +
    + + +
    +
    +
    + +
    +

    +

    + +
    + +
    +

    {{Lang::get('lang.login_to_start_your_session')}}

    + +
    + + {!! Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!} +
    {!! Form::text('email',null,['placeholder'=> Lang::get("lang.email") ,'class' => 'form-control']) !!} - + {!! $errors->first('email', ':message') !!} +
    +
    +
    - {!! Form::password('password',['placeholder'=>Lang::get("lang.password"),'class' => 'form-control']) !!} - + + {!! Form::password('password',['placeholder'=>Lang::get("lang.password"),'class' => 'form-control']) !!} + {!! $errors->first('password', ':message') !!} +
    -@if (Session::has('referer')) - -@elseif(Session::has('errors')) - -@endif +
    + + +
    + +
    + + + + + +
    -
    -
    +
    + +
    + +
    -
    -
    -
    - -
    +
    + + +
    + +{!! Lang::get("lang.iforgot") !!}
    +
    - - -{!! Lang::get("lang.iforgot") !!}
    +
    + {!! Lang::get("lang.register") !!} - -@include('themes.default1.client.layout.social-login') + +
    + +
    +
    + + +{!! Form::close()!!} + @stop diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php index 6366e37e2..8230a2b43 100644 --- a/resources/views/auth/password.blade.php +++ b/resources/views/auth/password.blade.php @@ -1,6 +1,42 @@ -@extends('themes.default1.layouts.login') +@extends('themes.default1.client.layout.logclient') + +@section('home') + class = "active" +@stop + + + + + +@section('HeadInclude') + + + + + {{-- --}} + + +@stop +@section('breadcrumb') +
    +
      +
    1. {!! Lang::get('lang.you_are_here') !!}:
      2. +
    2. {!! Lang::get('lang.home') !!}
      3. +
    +
    +@stop + +@section('content') -@section('body') @if(Session::has('status'))
    {!! Lang::get('lang.success') !!} @@ -18,15 +54,62 @@ @endforeach
    @endif -@if(Session::has('fails')) -
    - - {!! Lang::get('lang.alert') !!} ! - -
  • {{Session::get('fails')}}
    • -
    -@endif - +
    +
    +
    + @if(Auth::user()) + @else + + + {!! Lang::get('lang.register') !!} + + + @endif + first(); + ?> + @if($system != null) + @if($system->status) + @if($system->status == 1) + + + {!! Lang::get('lang.submit_a_ticket') !!} + + + @endif + @endif + @endif + + + {!! Lang::get('lang.my_tickets') !!} + + + + + {!! Lang::get('lang.knowledge_base') !!} + + +
    +
    +
    + + + +
    + +
    + + diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index f56eea7cb..ccc87ec71 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,8 +1,19 @@ -@extends('themes.default1.layouts.login') -@section('body') +@extends('themes.default1.client.layout.logclient') -

    {!! Lang::get('lang.registration') !!}

    +@section('home') + class = "active" +@stop + +@section('HeadInclude') + + + + + {{-- --}} + + +@stop @if(Session::has('status'))
    {!! Lang::get('lang.success') !!} @@ -11,6 +22,29 @@
    @endif + + + +@section('breadcrumb') +
    +
      +
    1. {!! Lang::get('lang.you_are_here') !!}:
      2. +
    2. {!! Lang::get('lang.home') !!}
      3. +
    +
    +@stop +@section('content') + @if (count($errors) > 0)
    @@ -21,25 +55,83 @@ @endforeach
    @endif +
    +
    +
    + @if(Auth::user()) + @else + + + {!! Lang::get('lang.login') !!} + + + @endif + first(); + ?> + @if($system != null) + @if($system->status) + @if($system->status == 1) + + + {!! Lang::get('lang.submit_a_ticket') !!} + + + @endif + @endif + @endif + + + {!! Lang::get('lang.my_tickets') !!} + + + + + {!! Lang::get('lang.knowledge_base') !!} + + +
    +
    - + +{!! Form::close()!!} + +@stop diff --git a/resources/views/themes/default1/admin/helpdesk/agent/agents/create.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/agents/create.blade.php index 34702b02f..157dd0c01 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/agents/create.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/agents/create.blade.php @@ -132,12 +132,14 @@ class="active"
    {!! Form::label('phone_number',Lang::get('lang.phone')) !!} - {!! Form::text('phone_number',null,['class' => 'form-control']) !!} + + {!! Form::input('number','phone_number',null,['class' => 'form-control', 'id' => 'phone_number']) !!}
    {!! Form::label('mobile',Lang::get('lang.mobile_number')) !!}@if($send_otp->status ==1) *@endif - {!! Form::text('mobile',null,['class' => 'form-control']) !!} + + {!! Form::input('number','mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!}
    diff --git a/resources/views/themes/default1/admin/helpdesk/agent/agents/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/agents/edit.blade.php index 0462e7997..d69b5e7f9 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/agents/edit.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/agents/edit.blade.php @@ -155,7 +155,8 @@ class="active" {!! Form::label('phone_number',Lang::get('lang.phone')) !!} - {!! Form::text('phone_number',null,['class' => 'form-control']) !!} + + {!! Form::input('number','phone_number',null,['class' => 'form-control', 'id' => 'phone_number']) !!}
    @@ -163,8 +164,9 @@ class="active"
    {!! Form::label('mobile',Lang::get('lang.mobile_number')) !!} + {!! Form::input('number','mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!} - {!! Form::text('mobile',null,['class' => 'form-control']) !!} +
    diff --git a/resources/views/themes/default1/agent/helpdesk/user/create.blade.php b/resources/views/themes/default1/agent/helpdesk/user/create.blade.php index 964275315..381d5766d 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/create.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/create.blade.php @@ -121,7 +121,8 @@ class="active" @if ($email_mandatory->status == 0 || $settings->status == 1) * @endif - {!! Form::text('mobile',null,['class' => 'form-control']) !!} + {!! Form::input('number','mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!} +
    @@ -129,7 +130,8 @@ class="active"
    - {!! Form::text('phone_number',null,['class' => 'form-control']) !!} + {!! Form::input('number','phone_number',null,['class' => 'form-control', 'id' => 'phone_number']) !!} +
    {!! Form::label('active',Lang::get('lang.status')) !!} diff --git a/resources/views/themes/default1/agent/helpdesk/user/edit.blade.php b/resources/views/themes/default1/agent/helpdesk/user/edit.blade.php index b8de994f8..e41de617d 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/edit.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/edit.blade.php @@ -108,7 +108,8 @@ class="active"
    {!! Form::label('mobile',Lang::get('lang.mobile')) !!} - {!! Form::text('mobile',null,['class' => 'form-control']) !!} + {!! Form::input('number','mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!} +
    @@ -116,7 +117,8 @@ class="active"
    - {!! Form::text('phone_number',null,['class' => 'form-control']) !!} + + {!! Form::input('number','phone_number',null,['class' => 'form-control', 'id' => 'phone_number']) !!}
    {!! Form::label('active',Lang::get('lang.status')) !!} diff --git a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php index 50c3b3f69..f37631ada 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php @@ -78,14 +78,14 @@ class="active" @if($users->user_name)
    {{Lang::get('lang.user_name')}} - + {{str_limit($users->user_name,10) }}
    @endif
    {{Lang::get('lang.email')}} - + {{str_limit($users->email,10) }}
    diff --git a/resources/views/themes/default1/client/helpdesk/profile.blade.php b/resources/views/themes/default1/client/helpdesk/profile.blade.php index 6e80f0813..a5007b00e 100644 --- a/resources/views/themes/default1/client/helpdesk/profile.blade.php +++ b/resources/views/themes/default1/client/helpdesk/profile.blade.php @@ -100,15 +100,15 @@ class="active"
    {!! Form::label('phone_number',Lang::get('lang.phone')) !!} - - {!! Form::text('phone_number',null,['class' => 'form-control']) !!} + {!! Form::input('number','phone_number',null,['class' => 'form-control', 'id' => 'phone_number']) !!} +
    {!! Form::label('mobile',Lang::get('lang.mobile_number')) !!} - - {!! Form::text('mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!} + {!! Form::input('number','mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!} +
    diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php index 96de48fc3..85fc86223 100644 --- a/resources/views/themes/default1/client/layout/client.blade.php +++ b/resources/views/themes/default1/client/layout/client.blade.php @@ -199,8 +199,10 @@
    - -
    + +
    + + {!! Breadcrumbs::render() !!}
    diff --git a/resources/views/themes/default1/client/layout/logclient.blade.php b/resources/views/themes/default1/client/layout/logclient.blade.php new file mode 100644 index 000000000..387577a39 --- /dev/null +++ b/resources/views/themes/default1/client/layout/logclient.blade.php @@ -0,0 +1,381 @@ + + + + + first(); + if (isset($title->name)) { + $title_name = $title->name; + } else { + $title_name = "SUPPORT CENTER"; + } + ?> + @yield('title') {!! strip_tags($title_name) !!} + + + + + + + + + + + + + + + + + + + + + + + + @yield('HeadInclude') + + +
    + + + + +
    + + {!! Breadcrumbs::render() !!} +
    + +
    +
    +
    +
    + @if(Session::has('success')) +
    + + + {{Session::get('success')}} +
    + @endif + @if(Session::has('warning')) +
    + + + {!! Session::get('warning') !!} +
    + @endif + + @if(Session::has('fails')) + @if(Session::has('check')) + + @endif +
    + + {!! Lang::get('lang.alert') !!} ! + + {{Session::get('fails')}} +
    + + @endif + @yield('content') + +
    +
    +
    +
    + + first(); + $footer2 = App\Model\helpdesk\Theme\Widgets::where('name', '=', 'footer2')->first(); + $footer3 = App\Model\helpdesk\Theme\Widgets::where('name', '=', 'footer3')->first(); + $footer4 = App\Model\helpdesk\Theme\Widgets::where('name', '=', 'footer4')->first(); + ?> +
    +
    +
    + @if($footer1->title == null) + @else +
    +
    +
    +

    {!!$footer1->title!!}

    +
    +

    {!!$footer1->value!!}

    +
    +
    +
    +
    + @endif + @if($footer2->title == null) + @else +
    +
    +
    +

    {!!$footer2->title!!}

    +
    +

    {!! $footer2->value !!}

    +
    +
    +
    +
    + @endif + @if($footer3->title == null) + @else +
    +
    +
    +

    {!!$footer3->title!!}

    +
    +

    {!! $footer3->value !!}

    +
    +
    +
    +
    + @endif + @if($footer4->title == null) + @else +
    +
    +
    +

    {{$footer4->title}}

    +
    +

    {!! $footer4->value !!}

    +
    +
    +
    +
    + @endif +
    +
    +
    +
    +
    +

    {!! Lang::get('lang.copyright') !!} © {!! date('Y') !!} {!! $company->company_name !!}. {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} Faveo

    +
    +
    + +
      + @foreach($socials as $social) + @if($social->name == 'facebook') + @if($social->value) +
      • + @endif + @endif + @if($social->name == "twitter") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "google") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "linkedin") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "vimeo") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "youtube") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "pinterest") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "dribbble") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "flickr") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "instagram") + @if($social->value) +
      • + @endif + @endif + @if($social->name == "rss") + @if($social->value) +
      • + @endif + @endif + @endforeach +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file