Skip to content

Commit 95a5908

Browse files
committed
change position for loading
1 parent 79a6548 commit 95a5908

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

public/css/lfm.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ a {
195195

196196
.list .item_name {
197197
font-size: 1.25rem;
198-
padding: 10px 0 5px;
198+
padding: 5px 0 5px;
199199
}
200200

201201
time {

public/js/script.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $(document).ready(function () {
6565
});
6666

6767
actions.reverse().forEach(function (action) {
68-
$('#nav-buttons #loading').after(
68+
$('#nav-buttons > ul').append(
6969
$('<li>').addClass('nav-item').append(
7070
$('<a>').addClass('nav-link d-none').attr('data-action', action.name)
7171
.append($('<i>').addClass('fa fa-fw fa-' + action.icon))
@@ -503,7 +503,6 @@ function use(item) {
503503
var field_name = getUrlParam('field_name');
504504
var is_ckeditor = getUrlParam('CKEditor');
505505
var is_fcke = typeof data != 'undefined' && data['Properties']['Width'] != '';
506-
var file_path = url.replace(route_prefix, '');
507506

508507
if (window.opener || window.tinyMCEPopup || field_name || getUrlParam('CKEditorCleanUpFuncNum') || is_ckeditor) {
509508
if (window.tinyMCEPopup) { // use TinyMCE > 3.0 integration method

src/views/index.blade.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,12 @@
3434
<i class="fa fa-bars fa-fw"></i>
3535
</a>
3636
<a class="navbar-brand">{{ trans('laravel-filemanager::lfm.title-panel') }}</a>
37+
<a id="loading" class="nav-brand"><i class="fa fa-spinner fa-spin"></i></a>
3738
<a class="navbar-toggler collapsed border-0 p-2 m-0 ml-auto" data-toggle="collapse" data-target="#nav-buttons">
3839
<i class="fa fa-cog fa-fw"></i>
3940
</a>
4041
<div class="collapse navbar-collapse" id="nav-buttons">
4142
<ul class="navbar-nav ml-auto">
42-
<li id="loading" class="nav-item">
43-
<a class="nav-link">
44-
<i class="fa fa-spinner fa-spin"></i>
45-
</a>
46-
</li>
4743
{{-- <li>
4844
<a id="multi_selection_toggle">
4945
<i class="fa fa-check-square fa-fw"></i>
@@ -128,9 +124,9 @@
128124
</div>
129125
</div>
130126

131-
<div id="lfm-loader">
127+
{{-- <div id="lfm-loader">
132128
<img src="{{asset('vendor/laravel-filemanager/img/loader.svg')}}">
133-
</div>
129+
</div> --}}
134130

135131
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
136132
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"></script>
@@ -141,7 +137,6 @@
141137
<script src="{{ asset('vendor/laravel-filemanager/js/jquery.form.min.js') }}"></script>
142138
<script src="{{ asset('vendor/laravel-filemanager/js/dropzone.min.js') }}"></script>
143139
<script>
144-
var route_prefix = "{{ url('/') }}";
145140
var lfm_route = "{{ url(config('lfm.url_prefix')) }}";
146141
var lang = {!! json_encode(trans('laravel-filemanager::lfm')) !!};
147142
var actions = [

0 commit comments

Comments
 (0)