Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 4016ed4

Browse files
committed
update view
rdme cleanup view names, add modal partial v2.0.1
1 parent 694b1e4 commit 4016ed4

File tree

8 files changed

+38
-29
lines changed

8 files changed

+38
-29
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,14 @@ npm install vue dropzone keycode vue-tippy vue2-filters vuemit vue-notif --save
183183

184184
> ***Or Use another Framework***
185185
>
186-
> - duplicate `views/vendor/MediaManager/media-bulma` and rename it to the framework you want ex.`media-bootstrap`
186+
> - edit `views/vendor/MediaManager` files.
187187
> - duplicate `assets/vendor/MediaManager/js/components/media-bulma.vue` and rename it to the framework you want ex.`media-bootstrap.vue`
188188
> - duplicate `assets/vendor/MediaManager/sass/media-bulma.scss` and rename it to the framework you want ex.`media-bootstrap.scss`
189189
> - set `MIX_MM_FRAMEWORK` to the framework name ex.`MIX_MM_FRAMEWORK=bootstrap`
190190
> - start editing the new files.
191191
192192
- add this one liner to your main js file and run `npm run watch` to compile your `js/css` files.
193-
+ if you are having issues with `npm run production`, [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/)
193+
+ if you are having issues [Check](https://ctf0.wordpress.com/2017/09/12/laravel-mix-es6/)
194194

195195
```js
196196
// ex. "resources/assets/js/app.js"

logs/v2.0.0.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

logs/v2.0.1.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- add `_modal` partial
2+
- renamed `_partial` to `_manager`
3+
- renamed `media-bulma` to `media`
4+
- updated `media` view with the correct html headers
5+
- renamed `animated` to `mm-animated` to avoid conflict with container page `animated`
6+
- update wiki
7+
- update readme

src/Controllers/MediaController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public function __construct()
3030
$this->sanitizedText = config('mediaManager.sanitized_text');
3131
$this->unallowed_mimes = config('mediaManager.unallowed_mimes');
3232
$this->LMF = config('mediaManager.last_modified_format');
33-
$this->fw = config('mediaManager.framework');
3433
}
3534

3635
/**
@@ -40,7 +39,7 @@ public function __construct()
4039
*/
4140
public function index()
4241
{
43-
return view("MediaManager::media-{$this->fw}");
42+
return view('MediaManager::media');
4443
}
4544

4645
/**

src/resources/assets/sass/shared/animate.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.animated {
1+
.mm-animated {
22
animation-duration: 600ms;
33
animation-timing-function: cubic-bezier(1, 0, 0, 1);
44
animation-fill-mode: both;

src/resources/views/_partial.blade.php renamed to src/resources/views/_manager.blade.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@ class="button"
329329
<template v-if="selectedFile">
330330
<div class="detail_img">
331331
<template v-if="selectedFileIs('image')">
332-
<div class="modal animated fadeIn mm-modal" id="img_modal">
332+
<div class="modal mm-animated fadeIn mm-modal" id="img_modal">
333333
<div class="modal-background pointer" @click="toggleModal()"></div>
334-
<div class="modal-content animated fadeInDown">
334+
<div class="modal-content mm-animated fadeInDown">
335335
<p class="image">
336336
<img :src="selectedFile.path">
337337
</p>
@@ -406,10 +406,10 @@ class="button"
406406
{{-- ====================================================================== --}}
407407

408408
{{-- modals --}}
409-
<div class="modal animated fadeIn mm-modal" id="new_folder_modal">
409+
<div class="modal mm-animated fadeIn mm-modal" id="new_folder_modal">
410410
{{ Form::open(['route' => 'media.new_folder', '@submit.prevent'=>'NewFolderForm($event)']) }}
411411
<div class="modal-background pointer" @click="toggleModal()"></div>
412-
<div class="modal-card animated fadeInDown">
412+
<div class="modal-card mm-animated fadeInDown">
413413
<header class="modal-card-head is-link">
414414
<p class="modal-card-title">
415415
<span class="icon"><i class="fa fa-folder"></i></span>
@@ -434,10 +434,10 @@ class="button"
434434
{{ Form::close() }}
435435
</div>
436436

437-
<div class="modal animated fadeIn mm-modal" id="rename_file_modal">
437+
<div class="modal mm-animated fadeIn mm-modal" id="rename_file_modal">
438438
{{ Form::open(['route' => 'media.rename_file', '@submit.prevent'=>'RenameFileForm($event)']) }}
439439
<div class="modal-background pointer" @click="toggleModal()"></div>
440-
<div class="modal-card animated fadeInDown">
440+
<div class="modal-card mm-animated fadeInDown">
441441
<header class="modal-card-head is-warning">
442442
<p class="modal-card-title">
443443
<span class="icon"><i class="fa fa-i-cursor"></i></span>
@@ -464,10 +464,10 @@ class="button"
464464
{{ Form::close() }}
465465
</div>
466466

467-
<div class="modal animated fadeIn mm-modal" id="move_file_modal">
467+
<div class="modal mm-animated fadeIn mm-modal" id="move_file_modal">
468468
{{ Form::open(['route' => 'media.move_file', '@submit.prevent'=>'MoveFileForm($event)']) }}
469469
<div class="modal-background pointer" @click="toggleModal()"></div>
470-
<div class="modal-card animated fadeInDown">
470+
<div class="modal-card mm-animated fadeInDown">
471471
<header class="modal-card-head is-warning">
472472
<p class="modal-card-title">
473473
<span class="icon"><i class="fa fa-share"></i></span>
@@ -505,10 +505,10 @@ class="button"
505505
{{ Form::close() }}
506506
</div>
507507

508-
<div class="modal animated fadeIn mm-modal" id="confirm_delete_modal">
508+
<div class="modal mm-animated fadeIn mm-modal" id="confirm_delete_modal">
509509
{{ Form::open(['route' => 'media.delete_file', '@submit.prevent'=>'DeleteFileForm($event)']) }}
510510
<div class="modal-background pointer" @click="toggleModal()"></div>
511-
<div class="modal-card animated fadeInDown">
511+
<div class="modal-card mm-animated fadeInDown">
512512
<header class="modal-card-head is-danger">
513513
<p class="modal-card-title">
514514
<span class="icon"><i class="fa fa-warning"></i></span>

src/resources/views/_modal.blade.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{-- manager --}}
2+
<div class="modal mm-animated fadeIn is-active" v-if="showModal">
3+
<div class="modal-background" @click="toggleModal()"></div>
4+
<div class="modal-content mm-animated fadeInDown" style="width: 70%;">
5+
<div class="box">
6+
@include('MediaManager::_manager')
7+
</div>
8+
</div>
9+
<button class="modal-close is-large" @click="toggleModal()"></button>
10+
</div>

src/resources/views/media-bulma.blade.php renamed to src/resources/views/media.blade.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="x-ua-compatible" content="ie=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta name="csrf-token" content="{{ csrf_token() }}">
48
<title>Media Manager</title>
5-
{{-- bulma --}}
9+
10+
{{-- Styles --}}
611
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bulma/0.6.0/css/bulma.min.css">
712
</head>
813
<body>
@@ -17,7 +22,7 @@
1722
<div class="columns">
1823
{{-- media manager --}}
1924
<div class="column">
20-
@include('MediaManager::_partial')
25+
@include('MediaManager::_manager')
2126
</div>
2227
</div>
2328
</div>

0 commit comments

Comments
 (0)