changes-2
This commit is contained in:
		| @@ -81,9 +81,9 @@ class="nav-link active" | ||||
|                     @endif | ||||
|                 <td> | ||||
|                     {!! Form::open(['route'=>['groups.destroy', $group->id],'method'=>'DELETE']) !!} | ||||
|                     <a href="{{route('groups.edit', $group->id)}}" class="btn btn-primary btn-xs"><i class="fas fa-edit"> </i> Edit</a> | ||||
|                     <a href="{{route('groups.edit', $group->id)}}" class="btn btn-primary btn-xs"><i class="fas fa-edit"> </i> {{trans('lang.edit')}}</a> | ||||
|                     <!-- To pop up a confirm Message --> | ||||
|                     {!! Form::button('<i class="fas fa-trash"> </i> Delete', | ||||
|                     {!! Form::button('<i class="fas fa-trash"> </i>'.trans('lang.delete'), | ||||
|                     ['type' => 'submit', | ||||
|                     'class'=> 'btn btn-danger btn-xs', | ||||
|                     'onclick'=>'return confirm("Are you sure?")']) | ||||
|   | ||||
| @@ -114,15 +114,15 @@ class="nav-link active" | ||||
| 				<td>{!! UTC::usertimezone($email->updated_at) !!}</td> | ||||
| 				<td> | ||||
| 				{!! Form::open(['route'=>['emails.destroy', $email->id],'method'=>'DELETE']) !!} | ||||
| 				<a href="{{route('emails.edit', $email->id)}}" class="btn btn-primary btn-xs"><i class="fas fa-edit"> </i> Edit</a> | ||||
| 				<a href="{{route('emails.edit', $email->id)}}" class="btn btn-primary btn-xs"><i class="fas fa-edit"> </i>{{Lang::get('lang.edit')}}</a> | ||||
| 				<!-- To pop up a confirm Message --> | ||||
|  | ||||
| 				@if($default_email == $email->id)  | ||||
| 					{!! Form::button('<i class="fas fa-trash"> </i> Delete', | ||||
| 					{!! Form::button('<i class="fas fa-trash"> </i>'.Lang::get('lang.delete'), | ||||
| 	            		['class'=> 'btn btn-danger btn-xs '. $disabled]) | ||||
| 	            	!!} | ||||
| 				@else | ||||
| 					{!! Form::button('<i class="fas fa-trash"> </i> Delete', | ||||
| 					{!! Form::button('<i class="fas fa-trash"> </i>'.Lang::get('lang.delete'), | ||||
| 	            		['type' => 'submit', | ||||
| 	            		'class'=> 'btn btn-danger btn-xs', | ||||
| 	            		'onclick'=>'return confirm("Are you sure?")']) | ||||
|   | ||||
| @@ -87,8 +87,8 @@ class="nav-link active" | ||||
|  | ||||
|                 <div class="form-group col-sm-3 {{ $errors->has('ispublic') ? 'has-error' : '' }}"> | ||||
|                     {!! Form::label('ispublic',Lang::get('lang.visibility')) !!} <span class="text-red"> *</span><br/> | ||||
|                     <input type="radio"  name="ispublic" value="1" checked>  Public   | ||||
|                     <input type="radio"  name="ispublic" value="0" >  Private | ||||
|                     <input type="radio"  name="ispublic" value="1" checked>{{Lang::get('lang.public')}} | ||||
|                     <input type="radio"  name="ispublic" value="0" >  {{Lang::get('lang.private')}} | ||||
|                 </div> | ||||
|             </div>   | ||||
|             <!-- Admin Note  : Textarea :  --> | ||||
|   | ||||
| @@ -66,8 +66,8 @@ class="nav-link active" | ||||
|            </a> | ||||
|  | ||||
|             <div class="btn-group" id="toggle_event_editing" style="float: right; margin-bottom: 10"> | ||||
|                 <button type="button"  class="btn {{$user_status->status == '0' ? 'btn-info' : 'btn-default'}} locked_active">Inactive</button> | ||||
|                 <button type="button"  class="btn {{$user_status->status == '1' ? 'btn-info' : 'btn-default'}} unlocked_inactive">Active</button> | ||||
|                 <button type="button"  class="btn {{$user_status->status == '0' ? 'btn-info' : 'btn-default'}} locked_active">{{Lang::get('lang.inactive')}}</button> | ||||
|                 <button type="button"  class="btn {{$user_status->status == '1' ? 'btn-info' : 'btn-default'}} unlocked_inactive">{{Lang::get('lang.active')}}</button> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="priority-table" style="padding-top: 10px"> | ||||
|   | ||||
| @@ -282,7 +282,7 @@ class="nav-link active" | ||||
|                                 <td> | ||||
|                                     <select class="form-control" onChange="selectdata({!! $i !!})" id="selected{!! $i !!}" name="action[{!! $i !!}][a]" required> | ||||
|                                         <option value="">-- {!! Lang::get('lang.select_an_action') !!} --</option> | ||||
|                                         <optgroup label="Ticket">         | ||||
|                                         <optgroup label={{trans('lang.ticket')}}> | ||||
|                                             <option value="reject" <?php | ||||
|                                             if ($workflow_action->condition == 'reject') { | ||||
|                                                 echo "selected='selected'"; | ||||
|   | ||||
| @@ -33,7 +33,7 @@ class="nav-link active" | ||||
| @section('content') | ||||
| @if (count($errors) > 0) | ||||
| <div class="alert alert-danger"> | ||||
|     <strong>Whoops!</strong> There were some problems with your input.<br><br> | ||||
|     <strong>{{Lang::get('lang.woops')}}</strong> {{Lang::get('lang.theirisproblem')}}<br><br> | ||||
|     <ul> | ||||
|         @foreach ($errors->all() as $error) | ||||
|         <li>{{ $error }}</li> | ||||
|   | ||||
| @@ -656,7 +656,7 @@ | ||||
| </div> | ||||
| <div class="card card-light"> | ||||
|     <div class="card-header"> | ||||
|         <h3 class="card-title">Logs</h3> | ||||
|         <h3 class="card-title">{{Lang::get('log::lang.logs')}}</h3> | ||||
|     </div> | ||||
|     <!-- /.box-header --> | ||||
|     <div class="card-body"> | ||||
| @@ -671,7 +671,7 @@ | ||||
|                             </span> | ||||
|                         </a> | ||||
|                     </div> | ||||
|                     <div class="text-center text-sm">Logs</div> | ||||
|                     <div class="text-center text-sm">{{Lang::get('log::lang.logs')}}</div> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -108,7 +108,7 @@ class="nav-link active" | ||||
|             <div class="col-md-2"> | ||||
|                 <!-- logo --> | ||||
|                 {!! Form::label('logo',Lang::get('lang.logo')) !!} | ||||
|                 <div class="btn bg-olive btn-file" style="color:blue"> {{trans('lang.upload_file')}} | ||||
|                 <div class="btn bg-olive btn-file" style="color:blue"> {{Lang::get('lang.upload_file')}} | ||||
|                     {!! Form::file('logo') !!} | ||||
|                 </div> | ||||
|             </div> | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| {!! Form::model($emails,['url' => 'post-scheduler', 'method' => 'PATCH']) !!} | ||||
| @if (count($errors) > 0) | ||||
| <div class="alert alert-danger"> | ||||
|     <strong>{{trans('lang.whoops')}}!</strong> {{\Illuminate\Support\Facades\Lang::get('lang.theirisproblem')}}<br><br> | ||||
|     <strong>{{Lang::get('lang.woops')}}</strong> {{Lang::get('lang.theirisproblem')}}<br><br> | ||||
|     <ul> | ||||
|         @foreach ($errors->all() as $error) | ||||
|         <li>{{ $error }}</li> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <div class="box-body table-responsive"style="overflow:hidden;"> | ||||
|         @if (count($errors) > 0) | ||||
|         <div class="alert alert-danger"> | ||||
|             <strong>Whoops!</strong> There were some problems with your input.<br><br> | ||||
|             <strong>{{Lang::get('lang.woops')}}</strong> {{Lang::get('lang.theirisproblem')}}<br><br> | ||||
|             <ul> | ||||
|                 @foreach ($errors->all() as $error) | ||||
|                 <li>{{ $error }}</li> | ||||
|   | ||||
| @@ -20,7 +20,7 @@ class="nav-link active" | ||||
| @stop | ||||
| <!-- header --> | ||||
| @section('PageHeader') | ||||
| <h1>{{\Illuminate\Support\Facades\Lang::get('lang.social-media')}}</h1> | ||||
|     <h1>{{\Illuminate\Support\Facades\Lang::get('lang.social-media')}}</h1> | ||||
| @stop | ||||
| <!-- /header --> | ||||
| <!-- breadcrumbs --> | ||||
| @@ -32,7 +32,7 @@ class="nav-link active" | ||||
| @section('content') | ||||
| @if (count($errors) > 0) | ||||
| <div class="alert alert-danger"> | ||||
|     <strong>Whoops!</strong> There were some problems with your input.<br><br> | ||||
|     <strong>{{Lang::get('lang.woops')}}</strong> {{Lang::get('lang.theirisproblem')}}<br><br> | ||||
|     <ul> | ||||
|         @foreach ($errors->all() as $error) | ||||
|         <li>{{ $error }}</li> | ||||
| @@ -77,14 +77,13 @@ class="nav-link active" | ||||
|                         <td>{{\Illuminate\Support\Facades\Lang::get('lang.facebook')}}</td> | ||||
|                         <td> | ||||
|                             @if($social->checkActive('facebook')===true) | ||||
|                             <span style="color: green">{{trans('lang.active')}}</span> | ||||
|                             @else  | ||||
|                             <span style="color: red">{{trans('lang.inactive')}}</span> | ||||
|                                 <span style="color: green">{{trans('lang.active')}}</span> | ||||
|                             @else | ||||
|                                 <span style="color: red">{{trans('lang.inactive')}}</span> | ||||
|                             @endif | ||||
|                         </td> | ||||
|                         <td> | ||||
|                             <a href="{{url('social/media/facebook')}}" class="btn btn-primary">{{trans('lang.settings')}}</a> | ||||
|                         </td> | ||||
|                             <a href="{{url('social/media/facebook')}}" class="btn btn-primary">{{trans('lang.settings')}}</a>                        </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td>{{\Illuminate\Support\Facades\Lang::get('lang.google')}}</td> | ||||
| @@ -94,11 +93,9 @@ class="nav-link active" | ||||
|                             @else | ||||
|                                 <span style="color: red">{{trans('lang.inactive')}}</span> | ||||
|                             @endif | ||||
|  | ||||
|                         </td> | ||||
|                         <td> | ||||
|                             <a href="{{url('social/media/google')}}" class="btn btn-primary">{{trans('lang.settings')}}</a> | ||||
|                         </td> | ||||
|                             <a href="{{url('social/media/google')}}" class="btn btn-primary">{{trans('lang.settings')}}</a>                        </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td>{{\Illuminate\Support\Facades\Lang::get('lang.github')}}</td> | ||||
| @@ -110,8 +107,7 @@ class="nav-link active" | ||||
|                             @endif | ||||
|                         </td> | ||||
|                         <td> | ||||
|                             <a href="{{url('social/media/github')}}" class="btn btn-primary">{{trans('lang.settings')}}</a> | ||||
|                         </td> | ||||
|                             <a href="{{url('social/media/github')}}" class="btn btn-primary">{{trans('lang.settings')}}</a>                        </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td>{{\Illuminate\Support\Facades\Lang::get('lang.twitter')}}</td> | ||||
| @@ -123,8 +119,7 @@ class="nav-link active" | ||||
|                             @endif | ||||
|                         </td> | ||||
|                         <td> | ||||
|                             <a href="{{url('social/media/twitter')}}" class="btn btn-primary">{{trans('lang.settings')}}</a> | ||||
|                         </td> | ||||
|                             <a href="{{url('social/media/twitter')}}" class="btn btn-primary">{{trans('lang.settings')}}</a>                        </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td>{{\Illuminate\Support\Facades\Lang::get('lang.linkedin')}}</td> | ||||
| @@ -136,8 +131,7 @@ class="nav-link active" | ||||
|                             @endif | ||||
|                         </td> | ||||
|                         <td> | ||||
|                             <a href="{{url('social/media/linkedin')}}" class="btn btn-primary">{{trans('lang.settings')}}</a> | ||||
|                         </td> | ||||
|                             <a href="{{url('social/media/linkedin')}}" class="btn btn-primary">{{trans('lang.settings')}}</a>                        </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td>{{\Illuminate\Support\Facades\Lang::get('lang.bitbucket')}}</td> | ||||
| @@ -149,8 +143,7 @@ class="nav-link active" | ||||
|                             @endif | ||||
|                         </td> | ||||
|                         <td> | ||||
|                             <a href="{{url('social/media/bitbucket')}}" class="btn btn-primary">{{trans('lang.settings')}}</a> | ||||
|                         </td> | ||||
|                             <a href="{{url('social/media/bitbucket')}}" class="btn btn-primary">{{trans('lang.settings')}}</a>                        </td> | ||||
|                     </tr> | ||||
|                 </tbody> | ||||
|             </table> | ||||
|   | ||||
| @@ -33,7 +33,7 @@ class="nav-link active" | ||||
| {!! Form::open(['url' => 'social/media/'.$provider, 'method' => 'POST']) !!} | ||||
| @if (count($errors) > 0) | ||||
| <div class="alert alert-danger"> | ||||
|     <strong>Whoops!</strong> There were some problems with your input.<br><br> | ||||
|     <strong>{{Lang::get('lang.woops')}}</strong> {{Lang::get('lang.theirisproblem')}}<br><br> | ||||
|     <ul> | ||||
|         @foreach ($errors->all() as $error) | ||||
|         <li>{{ $error }}</li> | ||||
| @@ -103,10 +103,10 @@ class="nav-link active" | ||||
|                             {!! Form::label('status',Lang::get('lang.status')) !!}  | ||||
|                         </div> | ||||
|                         <div class="col-md-6"> | ||||
|                             <p>{!! Form::radio('status',1,$social->checkActive($provider))!!} Active</p> | ||||
|                             <p>{!! Form::radio('status',1,$social->checkActive($provider)) .Lang::get('lang.active')!!}</p> | ||||
|                         </div> | ||||
|                         <div class="col-md-6"> | ||||
|                             <p>{!! Form::radio('status',0,$social->checkInactive($provider)) !!} Inactive</p> | ||||
|                             <p>{!! Form::radio('status',0,$social->checkInactive($provider)) .Lang::get('lang.inactive')!!} </p> | ||||
|                         </div> | ||||
|                         <div class="col-md-12"> | ||||
|                             <i>Activate login via {{ucfirst($provider)}}</i> | ||||
|   | ||||
| @@ -90,7 +90,7 @@ class="nav-link active" | ||||
|             <!-- Default Priority:	Required : manual : Dropdowm  --> | ||||
|             <div class="form-group col-md-6 {{ $errors->has('priority') ? 'has-error' : '' }}"> | ||||
|                 {!! Form::label('priority',Lang::get('lang.default_priority')) !!} | ||||
|                 {!!Form::select('priority', [''=>'select a priority','Priorities'=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!} | ||||
|                 {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!} | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row"> | ||||
|   | ||||
| @@ -34,7 +34,7 @@ class="nav-link active" | ||||
|  | ||||
| @if (count($errors) > 0) | ||||
| <div class="alert alert-danger"> | ||||
|     <strong>Whoops!</strong> There were some problems with your input.<br><br> | ||||
|     <strong>{{Lang::get('lang.woops')}}</strong> {{Lang::get('lang.theirisproblem')}} <br><br> | ||||
|     <ul> | ||||
|         @foreach ($errors->all() as $error) | ||||
|         <li>{{ $error }}</li> | ||||
|   | ||||
| @@ -690,7 +690,7 @@ | ||||
|                             <li class="nav-item"> | ||||
|                                 <a href="{{ url('logs') }}" @yield('Log') class="nav-link"> | ||||
|                                     <i class="nav-icon fas fa-lock"></i> | ||||
|                                     <p>Logs</p> | ||||
|                                     <p>{{Lang::get('log::lang.logs')}}</p> | ||||
|                                 </a> | ||||
|                             </li> | ||||
|                             @endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 KNaveenraj-ladybird
					KNaveenraj-ladybird