Merge Branch

This commit is contained in:
Sada Shiva
2016-02-02 18:39:22 +05:30
parent a302235274
commit 11f4b086b7
20 changed files with 542 additions and 78 deletions

View File

@@ -8,6 +8,30 @@
<!-- Bootstrap 3.3.2 -->
<link href="{{asset("lb-faveo/css/bootstrap.min.css")}}" rel="stylesheet" type="text/css" />
<!-- Font Awesome Icons -->
<style>
span.stars, span.stars span {
display: block;
background: url({!! URL::asset('lb-faveo/dist/images/stars.png'); !!}) 0 -16px repeat-x;
width: 80px;
height: 16px;
}
span.stars span {
background-position: 0 0;
}
</style>
<style>
span.stars2, span.stars2 span {
display: block;
background: url({!! URL::asset('lb-faveo/dist/images/stars.png'); !!}) 0 -16px repeat-x;
width: 80px;
height: 16px;
}
span.stars2 span {
background-position: 0 0;
}
</style>
<link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
<!-- Ionicons -->
<link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet">
@@ -33,10 +57,10 @@
<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>
<![endif]-->
{{-- // <script src="https://code.jquery.com/jquery-2.1.4.js" type="text/javascript"></script> --}}
{{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
<script src="{{asset("lb-faveo/js/jquery-2.1.4.js")}}" type="text/javascript"></script>
<script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
<script src="https://code.jquery.com/jquery-2.1.4.js" type="text/javascript"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<!-- <script src="{{asset("lb-faveo/js/jquery-2.1.4.js")}}" type="text/javascript"></script>
<script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>-->
@yield('HeadInclude')
</head>
@@ -287,9 +311,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where(
<strong>{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!} <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/">Faveo</a>
</footer>
</div><!-- ./wrapper -->
{{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
<script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}"></script>
{{-- // <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.7.14/js/bootstrap-datetimepicker.min.js"></script> --}}