Changeset 0208bbd for resources/views
- Timestamp:
- 10/24/21 13:12:30 (3 years ago)
- Branches:
- develop, master
- Children:
- 8c71900
- Parents:
- 5e56e8a
- Location:
- resources/views
- Files:
-
- 1 deleted
- 8 edited
-
dashboard/departments/index.blade.php (modified) (1 diff)
-
dashboard/files/index.blade.php (modified) (2 diffs)
-
dashboard/folders/files.blade.php (modified) (2 diffs)
-
dashboard/folders/index.blade.php (modified) (1 diff)
-
dashboard/partials/avatar.blade.php (deleted)
-
dashboard/settings/index.blade.php (modified) (1 diff)
-
dashboard/users/index.blade.php (modified) (3 diffs)
-
layouts/app.blade.php (modified) (3 diffs)
-
layouts/pagination.blade.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
resources/views/dashboard/departments/index.blade.php
r5e56e8a r0208bbd 21 21 <div class="dropdown"> 22 22 <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white"> 23 Add department23 <i class="fa fa-plus pr-1"></i> New 24 24 </a> 25 25 <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white"> 26 <i class="fa fa-download pr-1"></i> Download files26 <i class="fa fa-download pr-1"></i> Download 27 27 </a> 28 <a href="{{ route('dashboard.departments.export') }}" class="btn btn-success text-white">Export table</a> 28 <a href="{{ route('dashboard.departments.export') }}" class="btn btn-success text-white"> 29 <i class="fa fa-table pr-1"></i> Export</a> 29 30 </div> 30 31 </div> -
resources/views/dashboard/files/index.blade.php
r5e56e8a r0208bbd 21 21 <div class="dropdown"> 22 22 <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white"> 23 Add files23 <i class="fa fa-upload pr-1"></i> Upload 24 24 </a> 25 25 <a href="{{ route("dashboard.departments.downloadAll") }}" class="btn btn-danger text-white"> 26 <i class="fa fa-download pr-1"></i> Download all26 <i class="fa fa-download pr-1"></i> Download 27 27 </a> 28 <a href="{{ route('dashboard.files.export') }}" class="btn btn-success text-white">Export table</a> 28 <a href="{{ route('dashboard.files.export') }}" class="btn btn-success text-white"> 29 <i class="fa fa-table pr-1"></i> Export 30 </a> 29 31 </div> 30 32 </div> … … 182 184 <div class="modal-content"> 183 185 <div class="modal-header"> 184 <h5 class="modal-title" id="exampleModalCenterTitle"> Add files</h5>186 <h5 class="modal-title" id="exampleModalCenterTitle">Upload</h5> 185 187 <button type="button" class="close" data-dismiss="modal" aria-label="Close"> 186 188 <i class="ti-close"></i> -
resources/views/dashboard/folders/files.blade.php
r5e56e8a r0208bbd 10 10 <div class="card-body"> 11 11 <a class="btn btn-secondary btn-block text-white" href="javascript:void(0)" data-target="#editModal_{{$folder->id}}" data-toggle="modal"> 12 Add files12 Upload 13 13 </a> 14 14 </div> … … 41 41 <div class="dropdown-menu"> 42 42 <a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#editModal_{{$folder->id}}"> 43 Add files43 Upload 44 44 </a> 45 45 -
resources/views/dashboard/folders/index.blade.php
r5e56e8a r0208bbd 69 69 <div class="dropdown-menu"> 70 70 <a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#createModal">Add folder</a> 71 <a href="{{ route('dashboard.folders.export') }}" class="dropdown-item text-success">Export table</a>71 <a href="{{ route('dashboard.folders.export') }}" class="dropdown-item text-success">Export</a> 72 72 </div> 73 73 </li> -
resources/views/dashboard/settings/index.blade.php
r5e56e8a r0208bbd 69 69 <div class="form-group"> 70 70 <label>Current</label> 71 @include('dashboard.partials.avatar') 71 <figure class="avatar avatar-sm mr-2"> 72 @if(auth()->user()->avatar==NULL) 73 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 74 @else 75 <img src="{{url('uploads/users/' . auth()->user()->avatar)}}" class="rounded-circle" alt="avatar"> 76 @endif 77 </figure> 78 72 79 </div> 73 80 </div> -
resources/views/dashboard/users/index.blade.php
r5e56e8a r0208bbd 22 22 <div class="dropdown"> 23 23 <a href="javascript:void(0)" data-toggle="modal" data-target="#createModal" class="btn btn-primary text-white"> 24 Add user24 <i class="fa fa-plus pr-1"></i> New 25 25 </a> 26 <a href="{{ route('dashboard.users.export') }}" class="btn btn-success text-white">Export table</a> 26 <a href="{{ route('dashboard.users.export') }}" class="btn btn-success text-white"> 27 <i class="fa fa-table pr-1"></i> Export 28 </a> 27 29 </div> 28 30 </div> … … 63 65 </td> 64 66 <td> 65 @include('dashboard.partials.avatar') 67 <figure class="avatar avatar-sm mr-2"> 68 @if($user->avatar==NULL) 69 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 70 @else 71 <img src="{{url('uploads/users/' . $user->avatar)}}" class="rounded-circle" alt="avatar"> 72 @endif 73 </figure> 66 74 {{$user->username}} 67 75 </td> … … 169 177 <div class="form-group"> 170 178 <label>Current</label> 171 @include('dashboard.partials.avatar') 179 <figure class="avatar avatar-sm mr-2"> 180 @if($user->avatar==NULL) 181 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 182 @else 183 <img src="{{url('uploads/users/' . $user->avatar)}}" class="rounded-circle" alt="avatar"> 184 @endif 185 </figure> 172 186 </div> 173 187 </div> -
resources/views/layouts/app.blade.php
r5e56e8a r0208bbd 54 54 <div class="mb-4"> 55 55 <h6 class="d-flex justify-content-between"> 56 Added d ocuments57 <span class="float-right"> 68</span>56 Added departments 57 <span class="float-right">{{ \App\Models\Department::where('user_id', auth()->user()->id)->count() }}</span> 58 58 </h6> 59 <div class="progress" style="height:5px;">60 <div class="progress-bar bg-secondary" role="progressbar" style="width: 68%;"61 aria-valuenow="68"62 aria-valuemin="0" aria-valuemax="100"></div>63 </div>64 59 </div> 65 60 <div class="mb-4"> 66 61 <h6 class="d-flex justify-content-between"> 67 Used space68 <span >%25</span>62 Added folders 63 <span class="float-right">{{ \App\Models\Folder::where('user_id', auth()->user()->id)->count() }}</span> 69 64 </h6> 70 <div class="progress" style="height: 5px;">71 <div class="progress-bar bg-info" role="progressbar" style="width: 40%;" aria-valuenow="40"72 aria-valuemin="0" aria-valuemax="100"></div>73 </div>74 65 </div> 75 66 <div class="mb-4"> … … 129 120 <a href="#" class="nav-link" title="User menu" data-sidebar-target="#user-menu"> 130 121 <span class="mr-2 d-sm-inline d-none">{{auth()->user()->getFullName()}}</span> 131 @include('dashboard.partials.avatar') 122 <figure class="avatar avatar-sm mr-2"> 123 @if(auth()->user()->avatar==NULL) 124 <img src="{{ url('assets/media/images/user.png') }}" class="rounded-circle" alt="avatar"> 125 @else 126 <img src="{{url('uploads/users/' . auth()->user()->avatar)}}" class="rounded-circle" alt="avatar"> 127 @endif 128 </figure> 132 129 </a> 133 130 </li> … … 197 194 </ul> 198 195 </div> 196 199 197 </div> 200 198 <!-- end::navigation --> -
resources/views/layouts/pagination.blade.php
r5e56e8a r0208bbd 18 18 19 19 @if (is_string($element)) 20 <li class="page-item disabled"><span>{{ $element }}</span></li>20 <li class="page-item-test disabled"><span>{{ $element }}</span></li> 21 21 @endif 22 22 … … 26 26 <li class="page-item active"><a class="page-link" href="#">{{ $page }} <span class="sr-only"></span></a></li> 27 27 @else 28 <li class="page-item "><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>28 <li class="page-item-test"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li> 29 29 @endif 30 30 @endforeach
Note:
See TracChangeset
for help on using the changeset viewer.
