Changeset aab55f4


Ignore:
Timestamp:
10/26/21 22:58:47 (3 years ago)
Author:
Berat Kjufliju <kufliju@…>
Branches:
develop, master
Children:
68b1a22
Parents:
cbb901a
Message:

bug fixes

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • app/Http/Controllers/Dashboard/FoldersController.php

    rcbb901a raab55f4  
    288288                $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
    289289
    290                 $filesInDoc = $FileSystem->allFiles($path);
    291 
    292290                foreach ($files as $file) {
    293291                    if (!$file->isDir()) {
  • resources/views/auth/login.blade.php

    rcbb901a raab55f4  
    1818        @csrf
    1919
    20             <div class="alert alert-error fade show" role="alert">
    21                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
    22                 </button>
    23             </div>
    2420        <div class="form-group">
    2521            <input id="username" type="text" tabindex="1" class="form-control" value="{{ old('username') }}" name="username" placeholder="Username" autocomplete="off" required autofocus>
     
    3935                <span class="custom-control-label">Remember me</span>
    4036            </label>
    41             <a href="/auth/forgot">Reset password</a>
     37            <a class="pr-2" href="/auth/forgot">Reset password</a>
    4238        </div>
    4339
    4440        <input type="submit" value="Sign in" class="btn btn-primary btn-block">
    45         <hr>
    4641    </form>
     42    <br/>
     43    <br/>
    4744
    4845@endsection
  • resources/views/dashboard/departments/index.blade.php

    rcbb901a raab55f4  
    2020        <div class="dropdown">
    2121            @if(auth()->user()->hasPermission('manage_all_departments'))
    22             <button data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white">
    23                 <i class="fa fa-plus pr-1"></i> New
    24             </button>
     22            <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white">
     23                New
     24            </a>
    2525            @endif
    2626
    2727                @if(auth()->user()->hasPermission('download_data'))
    2828            <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white">
    29                 <i class="fa fa-download pr-1"></i> Download
     29              Download
    3030            </a>
    3131                @endif
    3232            @if(auth()->user()->hasPermission('export_data'))
    3333            <a href="{{ route('dashboard.departments.export') }}" class="btn btn-success text-white">
    34                 <i class="fa fa-table pr-1"></i> Export</a>
     34              Export</a>
    3535            @endif
    3636        </div>
  • resources/views/dashboard/files/index.blade.php

    rcbb901a raab55f4  
    1515                    <a href="{{ url('/') }}">Dashboard</a>
    1616                </li>
    17                 <li class="breadcrumb-item active" aria-current="page">Files</li>
     17                <li class="breadcrumb-item active" aria-current="page">Departments</li>
    1818            </ol>
    1919        </nav>
    2020        <div class="dropdown">
    2121            @if(auth()->user()->hasPermission('manage_all_files'))
    22             <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white">
    23                 <i class="fa fa-upload pr-1"></i> Upload
    24             </a>
     22            <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white">Add</a>
    2523            @endif
    2624            @if(auth()->user()->hasPermission('download_data'))
    27             <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white">
    28                 <i class="fa fa-download pr-1"></i> Download
    29             </a>
     25            <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white">Download</a>
    3026            @endif
    3127            @if(auth()->user()->hasPermission('export_data'))
    32             <a href="{{ route('dashboard.files.export') }}" class="btn btn-success text-white">
    33                 <i class="fa fa-table pr-1"></i> Export
    34             </a>
     28            <a href="{{ route('dashboard.files.export') }}" class="btn btn-success text-white">Export</a>
    3529                @endif
    3630        </div>
  • resources/views/dashboard/folders/index.blade.php

    rcbb901a raab55f4  
    255255
    256256                    <div class="modal fade" id="deleteModal_{{$folder->id}}" tabindex="-1" role="dialog" aria-hidden="true">
    257                         <div class="modal-dialog modal-dialog-centered" role="document">
     257                        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
    258258                            <div class="modal-content">
    259259                                <div class="modal-header">
  • resources/views/dashboard/users/index.blade.php

    rcbb901a raab55f4  
    2323            @if(auth()->user()->hasPermission('manage_all_users'))
    2424            <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white">
    25                 <i class="fa fa-plus pr-1"></i> New
     25                New
    2626            </a>
    2727            @endif
    2828            @if(auth()->user()->hasPermission('export_data'))
    2929            <a href="{{ route('dashboard.users.export') }}" class="btn btn-success text-white">
    30                 <i class="fa fa-table pr-1"></i> Export
     30            Export
    3131            </a>
    3232                @endif
Note: See TracChangeset for help on using the changeset viewer.