Update v1.0.6.5

This commit is contained in:
sujitprasad
2016-03-02 12:25:21 +05:30
parent 7011553462
commit c56ff86194
218 changed files with 17161 additions and 2358 deletions

View File

@@ -49,6 +49,7 @@ class="active"
{{-- <a class="btn btn-default btn-sm" id="click"><i class="fa fa-refresh"></i></a> --}}
<input type="submit" class="btn btn-default text-orange btn-sm" name="submit" value="{!! Lang::get('lang.delete') !!}">
<input type="submit" class="btn btn-default text-yellow btn-sm" name="submit" value="{!! Lang::get('lang.close') !!}">
<button type="button" class="btn btn-sm btn-default text-yellow" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-chain"> </i> {!! Lang::get('lang.merge') !!}</button>
</div>
<div class="mailbox-messages" id="refresh">
@@ -73,7 +74,74 @@ class="active"
</div><!-- /.box-body -->
</div><!-- /. box -->
<!-- merge tickets modal -->
<div class="modal fade" id="MergeTickets">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" id="merge-close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{!! Lang::get('lang.merge-ticket') !!} </h4>
</div><!-- /.modal-header-->
<div class ="modal-body">
<div class="row">
<div class="col-md-4">
</div>
<div class="col-md-6" id="merge_loader" style="display:none;">
<img src="{{asset("lb-faveo/media/images/gifloader.gif")}}"><br/><br/><br/>
</div><!-- /.merge-loader -->
</div>
<div id="merge_body">
<div id="merge-body-alert">
<div class="row">
<div class="col-md-12">
<div id="merge-succ-alert" class="alert alert-success alert-dismissable" style="display:none;" >
<button id="dismiss-merge" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-check"></i>Alert!</h4>
<div id="message-merge-succ"></div>
</div>
<div id="merge-err-alert" class="alert alert-danger alert-dismissable" style="display:none;">
<button id="dismiss-merge2" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-ban"></i>Alert!</h4>
<div id="message-merge-err"></div>
</div>
</div>
</div>
</div><!-- /.merge-alert -->
<div id="merge-body-form">
<div class="row">
<div class="col-md-6">
{!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!}
<label>{!! Lang::get('lang.title') !!}</label>
<input type="text" name='title' class="form-control" value="" placeholder="Optional" />
</div>
<div class="col-md-6">
<label>{!! Lang::get('lang.select-pparent-ticket') !!}</label>
<select class="form-control" id="select-merge-parent" name='p_id' data-placeholder="{!! Lang::get('lang.select_tickets') !!}" style="width: 100%;"><option value=""></option></select>
</div>
</div>
<div class="row">
<div class="col-md-8">
<label>{!! Lang::get('lang.merge-reason') !!}</label>
<textarea name="reason" class="form-control"></textarea>
</div>
</div>
</div><!-- mereg-body-form -->
</div><!-- merge-body -->
</div><!-- /.modal-body -->
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<input type="submit" id="merge-btn" class="btn btn-primary pull-right" value="{!! Lang::get('lang.merge') !!}"></input>
{!! Form::close() !!}
</div><!-- /.modal-footer -->
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<script>
var t_id =[];
$(function () {
//Enable check and uncheck all functionality
$(".checkbox-toggle").click(function () {
@@ -93,6 +161,7 @@ class="active"
$(function() {
// Enable check and uncheck all functionality
$(".checkbox-toggle").click(function() {
var clicks = $(this).data('clicks');
if (clicks) {
@@ -113,7 +182,145 @@ class="active"
$('#count_refresh').load('inbox #count_refresh');
$("#show").show();
});
$(".select2").select2();
//checking merging tickets
$('#MergeTickets').on('show.bs.modal', function () {
// alert("hi");
$.ajax({
type: "GET",
url: "../check-merge-ticket/"+0,
dataType: "html",
data:{data1: t_id},
beforeSend: function() {
$("#merge_body").hide();
$("#merge_loader").show();
},
success: function(response) {
if(response == 0) {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.select-tickets-to merge')}}";
$("#merge-err-alert").show();
$('#message-merge-err').html(message);
} else if(response == 2) {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.different-users')}}";
$("#merge-err-alert").show();
$('#message-merge-err').html(message);
} else {
$("#merge_body").show();
$("#merge-body-alert").hide();
$("#merge-body-form").show();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', false);
$("#merge_loader").hide();
$.ajax({
url: "../get-merge-tickets/"+0,
dataType: "html",
data:{data1: t_id},
success: function(data) {
$('#select-merge-parent').html(data);
}
// return false;
});
}
}
});
});
//submit merging form
$('#merge-form').on('submit', function(){
$.ajax({
type: "POST",
url: "../merge-tickets/"+t_id,
dataType: "json",
data: $(this).serialize(),
beforeSend: function() {
$("#merge_body").hide();
$("#merge_loader").show();
},
success: function(response) {
if(response == 0) {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.merge-error')}}";
$("#merge-err-alert").show();
$('#message-merge-err').html(message);
} else {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.merge-success')}}";
$("#merge-succ-alert").show();
$('#message-merge-succ').html(message);
setInterval(function(){
$("#alert11").hide();
setTimeout(function() {
var link = document.querySelector('#load-inbox');
if(link) {
link.click();
}
}, 500);
},2000);
}
}
})
return false;
});
});
function someFunction(id){
if(document.getElementById(id).checked) {
t_id.push(id);
// alert(t_id);
} else {
var index = t_id.indexOf(id);
t_id.splice(index, 1);
// alert(t_id);
}
// thisid.push(id);
// alert(thisid);
// document.getElementById("demo").innerHTML = thisid;
// push.thisid;
// alert(thisid);
// document.getElementByID('demo').innerHTML = thisid;
}
</script>
@stop

View File

@@ -113,7 +113,7 @@ active
</button>
<ul class="dropdown-menu pull-right">
<li data-toggle="modal" data-target="#ChangeOwner"><a href="#"><i class="fa fa-users" style="color:green;"> </i>Change Owner</a></li>
<!-- <li><a href="#"><i class="fa fa-edit" style="color:blue;"> </i>Manage Forms</a></li> -->
<li data-toggle="modal" data-target="#MergeTickets"><a href="#"><i class="fa fa-chain" style="color:teal;"> </i>{!! Lang::get('lang.merge-ticket') !!}</a></li>
<?php if ($group->can_delete_ticket == 1) {?>
<li id="delete"><a href="#"><i class="fa fa-trash-o" style="color:red;"> </i>{!! Lang::get('lang.delete_ticket') !!}</a></li>
<?php }
@@ -1140,6 +1140,89 @@ $count_teams = count($teams);
</div>
</div>
<!-- merge tickets modal -->
<div class="modal fade" id="MergeTickets">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" id="merge-close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{!! Lang::get('lang.merge-ticket') !!} </h4>&nbsp;<b>#{!! $tickets->ticket_number !!}</b>
</div><!-- /.modal-header-->
<div class ="modal-body">
<div class="row">
<div class="col-md-4">
</div>
<div class="col-md-6" id="merge_loader" style="display:none;">
<img src="{{asset("lb-faveo/media/images/gifloader.gif")}}"><br/><br/><br/>
</div><!-- /.merge-loader -->
</div>
<div id="merge_body">
<div id="merge-body-alert">
<div class="row">
<div class="col-md-12">
<div id="merge-succ-alert" class="alert alert-success alert-dismissable" style="display:none;" >
<button id="dismiss-merge" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-check"></i>Alert!</h4>
<div id="message-merge-succ"></div>
</div>
<div id="merge-err-alert" class="alert alert-danger alert-dismissable" style="display:none;">
<button id="dismiss-merge2" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-ban"></i>Alert!</h4>
<div id="message-merge-err"></div>
</div>
</div>
</div>
</div><!-- /.merge-alert -->
<div id="merge-body-form">
<div class="row">
<div class="col-md-6">
{!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!}
<label>{!! Lang::get('lang.title') !!}</label>
<input type="text" name='title' class="form-control" value="<?php $ticket_data = App\Model\helpdesk\Ticket\Ticket_Thread::select('title')->where('ticket_id', "=", $tickets->id)->first(); echo $ticket_data->title;?>"/>
</div>
<div class="col-md-6">
<label>{!! Lang::get('lang.select-pparent-ticket') !!}</label>
<div id="parent-loader" style="display:none;">
<img src="{{asset("lb-faveo/media/images/gifloader.gif")}}" height="30px" width="30px">
</div>
<div id="parent-body" >
<select class="form-control" id="select-merge-parent" name='p_id' data-placeholder="{!! Lang::get('lang.select_tickets') !!}" style="width: 100%;"><option value="{{$tickets->id}}"><?php $ticket_data = App\Model\helpdesk\Ticket\Ticket_Thread::select('title')->where('ticket_id', "=", $tickets->id)->first(); echo $ticket_data->title;?></option></select>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8">
<label>{!! Lang::get('lang.select_tickets') !!}</label>
<select class="form-control select2" id="select-merge-tickts" name="t_id[]" multiple="multiple" data-placeholder="{!! Lang::get('lang.select_tickets') !!}" style="width: 100%;">
</select>
</div>
</div>
<div class="row">
<div class="col-md-8">
<label>{!! Lang::get('lang.merge-reason') !!}</label>
<textarea name="reason" class="form-control"></textarea>
</div>
</div>
</div><!-- mereg-body-form -->
</div><!-- merge-body -->
</div><!-- /.modal-body -->
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<input type="submit" id="merge-btn" class="btn btn-primary pull-right" value="{!! Lang::get('lang.merge') !!}"></input>
{!! Form::close() !!}
</div><!-- /.modal-footer -->
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<?php $var=App\Model\helpdesk\Settings\Ticket::where('id', '=', 1)->first(); ?>
<!-- scripts used on page -->
@@ -1151,7 +1234,7 @@ $count_teams = count($teams);
jQuery('.star').attr('disabled', true);
$(function () {
$(function () {
// $('#cand').wysihtml5();
var wysihtml5Editor = $('#reply_content').wysihtml5().data("wysihtml5").editor;
@@ -1181,7 +1264,7 @@ jQuery('.star').attr('disabled', true);
return false;
});
});
});
@@ -1192,6 +1275,10 @@ $(function() {
});
$(document).ready(function () {
//Initialize Select2 Elements
$(".select2").select2();
setInterval(function(){
$("#auto-submit").submit(function(){
$.ajax({
@@ -1205,7 +1292,7 @@ $(document).ready(function () {
jQuery(document).ready(function() {
jQuery(document).ready(function() {
// Close a ticket
$('#close').on('click', function(e) {
$.ajax({
@@ -1448,7 +1535,7 @@ $(document).ready(function () {
if(response != 1)
{
// $("#assign_body").show();
var message = "User not found. Try again or add a new user.";
var message = "{{Lang::get('lang.user-not-found')}}";
$('#change_alert').show();
$('#message-success42').html(message);
setInterval(function(){$("#change_alert").hide(); },5000);
@@ -1466,7 +1553,7 @@ $(document).ready(function () {
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
$("#refreshTo").load("../thread/{{$tickets->id}} #refreshTo");
var message = "Success! owner has been changed for this ticket.";
var message = "{{Lang::get('lang.change-success')}}";
$("#alert11").show();
$('#message-success1').html(message);
setInterval(function(){$("#alert11").hide(); },4000);
@@ -1498,15 +1585,15 @@ $(document).ready(function () {
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
$("#refreshTo").load("../thread/{{$tickets->id}} #refreshTo");
var message = "Success! owner has been changed for this ticket.";
var message = "{{Lang::get('lang.change-success')}}";
$("#alert11").show();
$('#message-success1').html(message);
setInterval(function(){$("#alert11").hide(); },4000);
} else {
if(response == 4){
var message = "User already exists. Try search existing user.";
var message = "{{Lang::get('lang.user-exists')}}";
} else if(response == 5){
var message = "Enter a valid email address.";
var message = "{{Lang::get('lang.valid-email')}}";
} else {
//var message = "Can't process your request. Try after some time.";
}
@@ -1702,7 +1789,106 @@ $(document).ready(function () {
return false;
});
});
// checking merge
$('#MergeTickets').on('show.bs.modal', function (id) {
$.ajax({
type: "GET",
url: "../check-merge-ticket/{{ $tickets->id }}",
dataType: "html",
data:$(this).serialize(),
beforeSend: function() {
$("#merge_body").hide();
$("#merge_loader").show();
},
success: function(response) {
if(response == 0) {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.no-tickets-to-merge')}}";
$("#merge-err-alert").show();
$('#message-merge-err').html(message);
} else {
$("#merge_body").show();
$("#merge-body-alert").hide();
$("#merge-body-form").show();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', false);
$("#merge_loader").hide();
$.ajax({
url: "../get-merge-tickets/{{ $tickets->id}}",
type: 'GET',
data: $(this).serialize(),
success: function(data) {
$('#select-merge-tickts').html(data);
}
// return false;
});
}
}
});
});
//submit merging form
$('#merge-form').on('submit', function(){
$.ajax({
type: "POST",
url: "../merge-tickets/{{ $tickets->id }}",
dataType: "html",
data: $(this).serialize(),
beforeSend: function() {
$("#merge_body").hide();
$("#merge_loader").show();
},
success: function(response) {
if(response == 0) {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.merge-error')}}";
$("#merge-err-alert").show();
$('#message-merge-err').html(message);
} else if(response == 2) {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
var message = "{{Lang::get('lang.merge-error2')}}";
$("#merge-err-alert").show();
$('#message-merge-err').html(message);
} else {
$("#merge_body").show();
$("#merge-body-alert").show();
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
$("#refreshTo").load("../thread/{{$tickets->id}} #refreshTo");
var message = "{{Lang::get('lang.merge-success')}}";
$("#merge-succ-alert").show();
$('#message-merge-succ').html(message);
}
}
})
return false;
});
});
@@ -1729,6 +1915,42 @@ $(document).ready(function () {
}
$(document).ready(function() {
var Vardata="";
var count = 0;
$(".select2").on('select2:select', function(){
parentAjaxCall();
});
$(".select2").on('select2:unselect', function(){
parentAjaxCall();
});
function parentAjaxCall(){
// alert();
var arr = $("#select-merge-tickts").val();
if(arr == null) {
document.getElementById("select-merge-parent").innerHTML = "<option value='{{$tickets->id}}'><?php $ticket_data = App\Model\helpdesk\Ticket\Ticket_Thread::select('title')->where('ticket_id', "=", $tickets->id)->first(); echo $ticket_data->title;?></option>"
} else {
$.ajax({
type: "GET",
url: "../get-parent-tickets/{{ $tickets->id }}",
dataType: "html",
data:{data1:arr},
beforeSend: function() {
$("#parent-loader").show();
$("#parent-body").hide();
},
success: function(data) {
$("#parent-loader").hide();
$("#parent-body").show();
// $("#select-merge-parent").focus();
$('#select-merge-parent').html(data);
// $( this ).off( event );
}
});
}
}
var locktime = '<?php echo $var->collision_avoid;?>'*60*1000;
lockAjaxCall(locktime);
setInterval(function() {// to call ajax for ticket lock repeatedly after defined lock time interval

View File

@@ -33,6 +33,9 @@
<link rel="stylesheet" type="text/css" href="{{asset("lb-faveo/css/faveo-css.css")}}">
<link href="{{asset("lb-faveo/css/jquery.rating.css")}}" rel="stylesheet" type="text/css" />
<!-- Select2 -->
<link rel="stylesheet" href="{{asset("lb-faveo/plugins/select2/select2.min.css")}}">
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
@@ -329,6 +332,8 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where(
<script type="text/javascript" src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}"></script>
<script src="{{asset("lb-faveo/js/jquery.rating.pack.js")}}" type="text/javascript"></script>
<script src="{{asset("lb-faveo/plugins/select2/select2.full.min.js")}}" ></script>
<script>
$(function() {
// Enable iCheck plugin for checkboxes

View File

@@ -1,7 +1,9 @@
@extends('themes.default1.installer.layout.installer')
@section('serial')
active
@stop
@section('content')
<div class="wc-setup-content" ng-app="myApp">
<h1 style="text-align: center;">Faveo HELPDESK Serial Key</h1>
@@ -42,7 +44,7 @@ active
</td>
<td style="">
{!! $errors->first('order_no', '<spam class="help-block">:message</spam>') !!}
<input type="text" name="order_no" style="margin-left:180px;width:274px;" value="010451236">
<input type="text" name="order_no" style="margin-left:180px;width:274px;" value="">
<br/><br/>
</td>
</tr>

View File

@@ -14,7 +14,10 @@ active
@section('content')
<div ng-app="myApp">
@if(Session::has('fails'))
<h1 style="text-align: center;">Database Setup</h1>
<p class="wc-setup-content">Below you should enter your database connection details. If youre not sure about these, contact your host.</p>
@if(Session::has('fails'))
<div class="wc-setup-content">
<div class="woocommerce-message woocommerce-tracker">
<div class="fail">
@@ -23,10 +26,23 @@ active
</div>
</div>
@endif
<h1 style="text-align: center;">Database Setup</h1>
<p class="wc-setup-content">Below you should enter your database connection details. If youre not sure about these, contact your host.</p>
@if($errors->has('default') || $errors->has('host') || $errors->has('port') || $errors->has('databasename') || $errors->has('username') || $errors->has('password'))
<div class="wc-setup-content">
<div class="woocommerce-message woocommerce-tracker">
<div class="fail">
{!! $errors->first('default', '<spam id="fail">:message</spam><br/>') !!}
{!! $errors->first('host', '<spam id="fail">:message</spam><br/>') !!}
{!! $errors->first('port', '<spam id="fail">:message</spam><br/>') !!}
{!! $errors->first('databasename', '<spam id="fail">:message</spam><br/>') !!}
{!! $errors->first('username', '<spam id="fail">:message</spam><br/>') !!}
{!! $errors->first('password', '<spam id="fail">:message</spam><br/>') !!}
<br/>
</div>
</div>
</div>
@endif
{!! Form::open(['url'=> '/step4post']) !!}
<table ng-controller="MainController">
@@ -40,8 +56,6 @@ active
<div>
<select name="default" data-placeholder="Choose a SQL format..." class="chosen-select" style="width:290px;" tabindex="2">
<option value="mysql">MySQL</option>
<option value="pgsql">PgSQL</option>
<option value="sqlsrv">SQLSRV</option>
</select>
</div>
</div>
@@ -57,7 +71,7 @@ active
: red;font-size:12px;">*</span></label>
</td>
<td>
<input type="text" name="host" required>
<input type="text" name="host">
</td>
<td>
<button type="button" data-toggle="popover" data-placement="right" data-arrowcolor="#eeeeee" data-bordercolor="#bbbbbb" data-title-backcolor="#cccccc" data-title-bordercolor="#bbbbbb" data-title-textcolor="#444444" data-content-backcolor="#eeeeee" data-content-textcolor="#888888" title="@{{Hosttitle}}" data-content="@{{Hostcontent}}" style="padding: 0px;border: 0px; border-radius: 5px;"><i class="fa fa-question-circle" style="padding: 0px;"></i>
@@ -69,7 +83,7 @@ active
<label for="box2">Port</label>
</td>
<td>
<input type="text" name="port">
<input type="number" name="port">
</td>
<td>
<button type="button" data-toggle="popover" data-placement="right" data-arrowcolor="#eeeeee" data-bordercolor="#bbbbbb" data-title-backcolor="#cccccc" data-title-bordercolor="#bbbbbb" data-title-textcolor="#444444" data-content-backcolor="#eeeeee" data-content-textcolor="#888888" title="@{{Porttitle}}" data-content="@{{Portcontent}}" style="padding: 0px;border: 0px; border-radius: 5px;"><i class="fa fa-question-circle" style="padding: 0px;"></i>
@@ -82,7 +96,7 @@ active
: red;font-size:12px;">*</span></label>
</td>
<td>
<input type="text" name="databasename" required>
<input type="text" name="databasename">
</td>
<td>
<button type="button" data-toggle="popover" data-placement="right" data-arrowcolor="#eeeeee" data-bordercolor="#bbbbbb" data-title-backcolor="#cccccc" data-title-bordercolor="#bbbbbb" data-title-textcolor="#444444" data-content-backcolor="#eeeeee" data-content-textcolor="#888888" title="@{{Databasenametitle}}" data-content="@{{Databasenamecontent}}" style="padding: 0px;border: 0px; border-radius: 5px;"><i class="fa fa-question-circle" style="padding: 0px;"></i>
@@ -95,7 +109,7 @@ active
: red; font-size: 12px;">*</span></label>
</td>
<td>
<input type="text" name="username" required>
<input type="text" name="username">
</td>
<td>
<button type="button" data-toggle="popover" data-placement="right" data-arrowcolor="#eeeeee" data-bordercolor="#bbbbbb" data-title-backcolor="#cccccc" data-title-bordercolor="#bbbbbb" data-title-textcolor="#444444" data-content-backcolor="#eeeeee" data-content-textcolor="#888888" title="@{{Usertitle}}" data-content="@{{Usercontent}}" style="padding: 0px;border: 0px; border-radius: 5px;"><i class="fa fa-question-circle" style="padding: 0px;"></i>

View File

@@ -58,13 +58,10 @@ active
@endif
<div ng-controller="MainController">
<table>
<table>
<p>Welcome to the five-minute Faveo installation process! Just fill in the information below.</p>
<h1 style="border-top:1px solid #dedede; border-bottom:1px solid #dedede; padding: 10px 0px 10px 0px;">Personal Information</h1>
<p>Please provide the following information. Dont worry, you can always change these settings later.</p>
<div>
<tr>
<td>
@@ -107,9 +104,7 @@ active
</tr>
</div>
</table>
<table>
<h1>Login Information</h1>
<div>
@@ -338,7 +333,7 @@ active
<br>
<p class="wc-setup-actions step">
<input type="submit" id="submitme" class="button-primary button button-large button-next" value="Install">
<a href="step4.html" class="button button-large button-next" style="float: left">Previous</a>
<a href="{{url('step4')}}" class="button button-large button-next" style="float: left">Previous</a>
</p>
</form>
</div>