Adjust filemanager display

This commit is contained in:
Dane Everitt 2017-03-17 16:20:27 -04:00
parent 7e45f917c7
commit d5352e2b1e
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 25 additions and 18 deletions

File diff suppressed because one or more lines are too long

View file

@ -272,3 +272,7 @@ span[aria-labelledby="select2-pUserId-container"] {
.no-margin-bottom { .no-margin-bottom {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.btn-icon > i.fa {
line-height: 1.5;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -84,7 +84,7 @@ class FileManager {
} }
addFolderButton() { addFolderButton() {
$('i[data-action="add-folder"]').unbind().on('click', () => { $('[data-action="add-folder"]').unbind().on('click', () => {
new ActionsClass().folder($('#file_listing').data('current-dir') || '/'); new ActionsClass().folder($('#file_listing').data('current-dir') || '/');
}) })
} }

View file

@ -18,26 +18,29 @@
{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} {{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}}
{{-- SOFTWARE. --}} {{-- SOFTWARE. --}}
<div class="box-header"> <div class="box-header with-border">
<i class="fa fa-refresh muted muted-hover use-pointer" data-action="reload-files"></i> <h3 class="box-title">/home/container{{ $directory['header'] }}</h3>
<code class="box-title">/home/container{{ $directory['header'] }}</code>
<a class="text-muted">
<i class="fa fa-plus" data-action="add-folder" data-toggle="tooltip" data-placement="top" title="@lang('server.files.add_folder')"></i>
</a>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<a class="btn btn-primary btn-sm" href="/server/{{ $server->uuidShort }}/files/add/@if($directory['header'] !== '')?dir={{ $directory['header'] }}@endif"> <button class="btn btn-sm btn-success btn-icon" data-action="add-folder">
<i class="fa fa-file"></i> Create File <i class="fa fa-fw fa-folder-open-o"></i>
</a> </button>
<a class="btn btn-primary btn-sm btn-icon btn-file"> <a href="/server/{{ $server->uuidShort }}/files/add/@if($directory['header'] !== '')?dir={{ $directory['header'] }}@endif">
<i class="fa fa-upload"></i> Upload <input type="file" id="files_touch_target" style="display: none;"> <button class="btn btn-success btn-sm btn-icon">
<i class="fa fa-fw fa-file-text-o"></i>
</button>
</a> </a>
<label class="btn btn-primary btn-sm btn-icon">
<i class="fa fa-fw fa-upload"></i><input type="file" id="files_touch_target" class="hidden">
</label>
</div> </div>
</div> </div>
<div class="box-body table-responsive no-padding"> <div class="box-body table-responsive no-padding">
<table class="table table-hover" id="file_listing" data-current-dir="{{ $directory['header'] }}"> <table class="table table-hover" id="file_listing" data-current-dir="{{ $directory['header'] }}">
<thead> <thead>
<tr> <tr>
<th style="width:2%;" class="middle"></th> <th style="width:2%;" class="middle text-center">
<i class="fa fa-refresh muted muted-hover use-pointer" data-action="reload-files" style="font-size:14px;"></i>
</th>
<th style="width:55%">@lang('server.files.file_name')</th> <th style="width:55%">@lang('server.files.file_name')</th>
<th style="width:15%" class="hidden-xs">@lang('server.files.size')</th> <th style="width:15%" class="hidden-xs">@lang('server.files.size')</th>
<th style="width:20%" class="hidden-xs">@lang('server.files.last_modified')</th> <th style="width:20%" class="hidden-xs">@lang('server.files.last_modified')</th>