Skip to content

Commit

Permalink
fix assets and api url for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
streamtw committed Jun 29, 2016
1 parent 8db0457 commit 707a1fb
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions src/views/crop.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row fill">
<div class="col-md-8 fill">
<div class="crop-container">
<img src="{{ $img }}" class="img img-responsive">
<img src="{{ asset($img) }}" class="img img-responsive">
</div>
</div>
<div class="col-md-4 fill">
Expand Down Expand Up @@ -50,7 +50,7 @@ function performCrop() {
$.ajax({
type: "GET",
dataType: "text",
url: "/laravel-filemanager/cropimage",
url: "laravel-filemanager/cropimage",
data: {
img: '{{ $img }}',
working_dir: $("#working_dir").val(),
Expand Down
2 changes: 1 addition & 1 deletion src/views/files.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="col-sm-6 col-md-2">
<div class="thumbnail text-center" data-id="{{ $dir_name['long'] }}">
<a data-id="{{ $dir_name['long'] }}" class="folder-icon pointer folder-item">
<img src="/vendor/laravel-filemanager/img/folder.png">
<img src="{{ asset('vendor/laravel-filemanager/img/folder.png') }}">
</a>
</div>
<div class="caption text-center">
Expand Down
4 changes: 2 additions & 2 deletions src/views/images.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="col-sm-3 col-md-2">
<div class="thumbnail text-center" data-id="{{ $dir_name['long'] }}">
<a data-id="{{ $dir_name['long'] }}" class="folder-icon pointer folder-item">
<img src="/vendor/laravel-filemanager/img/folder.png">
<img src="{{ asset('vendor/laravel-filemanager/img/folder.png') }}">
</a>
</div>
<div class="caption text-center">
Expand Down Expand Up @@ -37,7 +37,7 @@
<div class="col-sm-3 col-md-2 img-row">

<div class="thumbnail thumbnail-img" data-id="{{ $file_name }}" id="img_thumbnail_{{ $key }}">
<img id="{{ $file }}" src="{{ $thumb_src }}" alt="" class="pointer" onclick="useFile('{{ $file_name }}')">
<img id="{{ $file }}" src="{{ asset($thumb_src) }}" alt="" class="pointer" onclick="useFile('{{ $file_name }}')">
</div>

<div class="caption text-center">
Expand Down
8 changes: 4 additions & 4 deletions src/views/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<title>{{ Lang::get('laravel-filemanager::lfm.title-page') }}</title>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="/vendor/laravel-filemanager/css/cropper.min.css">
<link rel="stylesheet" href="/vendor/laravel-filemanager/css/lfm.css">
<link rel="stylesheet" href="{{ asset('vendor/laravel-filemanager/css/cropper.min.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/laravel-filemanager/css/lfm.css') }}">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.css">
</head>
<body>
Expand Down Expand Up @@ -150,8 +150,8 @@
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
<script src="/vendor/laravel-filemanager/js/cropper.min.js"></script>
<script src="/vendor/laravel-filemanager/js/jquery.form.min.js"></script>
<script src="{{ asset('vendor/laravel-filemanager/js/cropper.min.js') }}"></script>
<script src="{{ asset('vendor/laravel-filemanager/js/jquery.form.min.js') }}"></script>
@include('laravel-filemanager::script')
</body>
</html>
4 changes: 2 additions & 2 deletions src/views/resize.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container">
<div class="row fill">
<div class="col-md-8 fill" id="containment">
<img id="resize" src="{{ $img }}" height="{{ $height }}" width="{{ $width }}">
<img id="resize" src="{{ asset($img) }}" height="{{ $height }}" width="{{ $width }}">
</div>
<div class="col-md-4 fill">

Expand Down Expand Up @@ -74,7 +74,7 @@ function doResize() {
$.ajax({
type: "GET",
dataType: "text",
url: "/laravel-filemanager/doresize",
url: "laravel-filemanager/doresize",
data: {
img: '{{ $img }}',
working_dir: $("#working_dir").val(),
Expand Down
20 changes: 10 additions & 10 deletions src/views/script.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
var ds = '/';
var home_dir = ds + "{{ (Config::get('lfm.allow_multi_user')) ? Auth::user()->user_field : '' }}";
var shared_folder = ds + "{{ Config::get('lfm.shared_folder_name') }}";
var image_url = "{{ Config::get('lfm.images_url') }}";
var file_url = "{{ Config::get('lfm.files_url') }}";
var image_url = "{{ asset(Config::get('lfm.images_url')) }}";
var file_url = "{{ asset(Config::get('lfm.files_url')) }}";
$(document).ready(function () {
bootbox.setDefaults({locale:"{{ Lang::get('laravel-filemanager::lfm.locale-bootbox') }}"});
Expand Down Expand Up @@ -108,7 +108,7 @@ function loadFolders() {
$.ajax({
type: 'GET',
dataType: 'html',
url: '/laravel-filemanager/folders',
url: 'laravel-filemanager/folders',
data: {
working_dir: $('#working_dir').val(),
show_list: $('#show_list').val(),
Expand All @@ -127,7 +127,7 @@ function loadItems() {
$.ajax({
type: 'GET',
dataType: 'html',
url: '/laravel-filemanager/jsonitems',
url: 'laravel-filemanager/jsonitems',
data: {
working_dir: working_dir,
show_list: $('#show_list').val(),
Expand All @@ -146,7 +146,7 @@ function createFolder(folder_name) {
$.ajax({
type: 'GET',
dataType: 'text',
url: '/laravel-filemanager/newfolder',
url: 'laravel-filemanager/newfolder',
data: {
name: folder_name,
working_dir: $('#working_dir').val(),
Expand All @@ -173,7 +173,7 @@ function rename(item_name) {
$.ajax({
type: 'GET',
dataType: 'text',
url: '/laravel-filemanager/rename',
url: 'laravel-filemanager/rename',
data: {
file: item_name,
working_dir: $('#working_dir').val(),
Expand All @@ -200,7 +200,7 @@ function trash(item_name) {
$.ajax({
type: 'GET',
dataType: 'text',
url: '/laravel-filemanager/delete',
url: 'laravel-filemanager/delete',
data: {
working_dir: $('#working_dir').val(),
items: item_name,
Expand All @@ -225,7 +225,7 @@ function cropImage(image_name) {
$.ajax({
type: 'GET',
dataType: 'text',
url: '/laravel-filemanager/crop',
url: 'laravel-filemanager/crop',
data: {
img: image_name,
working_dir: $('#working_dir').val(),
Expand All @@ -242,7 +242,7 @@ function resizeImage(image_name) {
$.ajax({
type: 'GET',
dataType: 'text',
url: '/laravel-filemanager/resize',
url: 'laravel-filemanager/resize',
data: {
img: image_name,
working_dir: $('#working_dir').val(),
Expand All @@ -256,7 +256,7 @@ function resizeImage(image_name) {
}
function download(file_name) {
location.href = '/laravel-filemanager/download?'
location.href = 'laravel-filemanager/download?'
+ 'working_dir='
+ $('#working_dir').val()
+ '&type='
Expand Down

0 comments on commit 707a1fb

Please sign in to comment.