From 18e62666f463ef702dbb50900af0c99cd02c941c Mon Sep 17 00:00:00 2001
From: Yann Gonidec
Date: Fri, 31 May 2019 17:41:12 +0200
Subject: [PATCH] =?UTF-8?q?front=20:=20popup=20edition=20m=C3=A9dia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Auth/LoginController.php | 2 +-
public/css/app.css | 80 ++++++++++++++++++-
public/js/app.js | 22 ++++-
resources/js/media.js | 26 +++++-
resources/sass/partials/common.scss | 2 +-
resources/sass/partials/media.scss | 76 +++++++++++++++++-
resources/views/layouts/app.blade.php | 29 ++++++-
7 files changed, 227 insertions(+), 10 deletions(-)
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6d49913..b6e0a4d 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -25,7 +25,7 @@ class LoginController extends Controller
*
* @var string
*/
- protected $redirectTo = '/home';
+ protected $redirectTo = '/';
/**
* Create a new controller instance.
diff --git a/public/css/app.css b/public/css/app.css
index fc98168..e15ebcc 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -12909,7 +12909,7 @@ readers do not read off random characters that represent icons */
color: #4a4a4a;
border: 0;
margin: 0;
- padding: 14px 48px 14px 14px;
+ padding: 14px 48px 16px 14px;
border-radius: 0;
overflow: hidden;
text-overflow: ellipsis;
@@ -13280,8 +13280,8 @@ table tfoot tr {
}
.media_manager .main_content header .action_wrapper a {
- font-size: 14px;
- padding: 15px 20px;
+ font-size: 13px;
+ padding: 15px 17px;
display: inline-block;
border-right: 1px solid #505050;
float: left;
@@ -13652,6 +13652,80 @@ table tfoot tr {
background: rgba(0, 0, 0, 0.2);
}
+/******************************************
+ POPUP EDITION MEDIA
+******************************************/
+
+#form_media {
+ width: 100%;
+ height: 100%;
+ background-color: #333333;
+ position: absolute;
+ z-index: 999999999999;
+ left: 0;
+ top: 0;
+}
+
+#form_media header {
+ background-color: #3b3b3b;
+}
+
+#form_media header a {
+ font-size: 13px;
+ padding: 15px 17px;
+ display: inline-block;
+ border-right: 1px solid #505050;
+ float: left;
+ transition: 0.3s ease-in-out;
+}
+
+#form_media header a:hover,
+#form_media header a.active {
+ background-color: #272626;
+}
+
+#form_media header .form_media_close {
+ float: right;
+ font-size: 18px;
+ position: relative;
+ padding: 12px;
+}
+
+#form_media header .form_media_close:after {
+ content: "";
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ background-color: #272626;
+ -webkit-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+ transition: 0.2s ease-in-out;
+ border-radius: 36px;
+ padding: 15px;
+}
+
+#form_media header .form_media_close:hover {
+ background-color: transparent;
+ color: #ffffff;
+}
+
+#form_media header .form_media_close:hover:after {
+ background-color: #2489D1;
+}
+
+#form_media header .form_media_close i {
+ position: relative;
+ z-index: 1;
+}
+
+#form_media .main_content .tab {
+ display: none;
+}
+
+#form_media .main_content .tab.active {
+ display: block;
+}
+
/******************************************
PAGE LOGIN
******************************************/
diff --git a/public/js/app.js b/public/js/app.js
index 33599dd..5bb91df 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -11387,12 +11387,32 @@ $(document).ready(function () {
if (event.target !== this) return;
$(".imageItem").attr("aria-grabbed", "false");
$(".imageItem").removeClass('flip');
- }); // ---- Gestion des média : déselectionne les éléments si on clique en dehors
+ }); // ---- Gestion des média : clique droit sur un média
$(".main_content .wrapper").on("contextmenu", '.imageItem', function (event) {
event.preventDefault();
$(".imageItem").removeClass('flip');
$(this).addClass('flip');
+ }); // ---- Edition des média : double-clique sur un média
+
+ $(".main_content .wrapper").on("dblclick", '.imageItem', function (event) {
+ event.preventDefault();
+ $(window).data('current_edit_media', $(this).attr('data-id'));
+ $("#form_media").fadeIn('fast');
+ }); // ---- Edition des média : fermeture de la popup
+
+ $(".form_media_close").on("click", function (event) {
+ event.preventDefault();
+ $("#form_media").fadeOut('fast');
+ }); // ---- Edition des média : gestion des onglets
+
+ $("#form_media .tabbtn").on("click", function (event) {
+ event.preventDefault();
+ var tabId = $(this).attr("data-tab");
+ $("#form_media .tabbtn").removeClass('active');
+ $(this).addClass('active');
+ $("#form_media .main_content .tab").removeClass('active');
+ $("#form_media .main_content .tab").eq(tabId).addClass('active');
}); // ---- Gestion des média : gère la sélection des éléments
var lastSelected;
diff --git a/resources/js/media.js b/resources/js/media.js
index aa87681..d9bca3b 100644
--- a/resources/js/media.js
+++ b/resources/js/media.js
@@ -303,13 +303,37 @@ $(document).ready(function() {
$(".imageItem").removeClass('flip');
});
- // ---- Gestion des média : déselectionne les éléments si on clique en dehors
+ // ---- Gestion des média : clique droit sur un média
$(".main_content .wrapper").on("contextmenu", '.imageItem' , function(event) {
event.preventDefault();
$(".imageItem").removeClass('flip');
$(this).addClass('flip')
});
+ // ---- Edition des média : double-clique sur un média
+ $(".main_content .wrapper").on("dblclick", '.imageItem' , function(event) {
+ event.preventDefault();
+ $(window).data('current_edit_media', $(this).attr('data-id'));
+ $("#form_media").fadeIn('fast');
+ });
+ // ---- Edition des média : fermeture de la popup
+ $(".form_media_close").on("click" , function(event) {
+ event.preventDefault();
+ $("#form_media").fadeOut('fast');
+ });
+ // ---- Edition des média : gestion des onglets
+ $("#form_media .tabbtn").on("click" , function(event) {
+ event.preventDefault();
+ var tabId = $(this).attr("data-tab");
+ $("#form_media .tabbtn").removeClass('active');
+ $(this).addClass('active')
+ $("#form_media .main_content .tab").removeClass('active');
+ $("#form_media .main_content .tab").eq(tabId).addClass('active');
+ });
+
+
+
+
// ---- Gestion des média : gère la sélection des éléments
var lastSelected ;
$("html").on("click", ".imageItem", function(event) {
diff --git a/resources/sass/partials/common.scss b/resources/sass/partials/common.scss
index 04f35e2..b3f24ec 100644
--- a/resources/sass/partials/common.scss
+++ b/resources/sass/partials/common.scss
@@ -472,7 +472,7 @@
color: #4a4a4a;
border: 0;
margin: 0;
- padding: 14px 48px 14px 14px;
+ padding: 14px 48px 16px 14px;
border-radius: 0;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/resources/sass/partials/media.scss b/resources/sass/partials/media.scss
index 14599a5..ee684ba 100644
--- a/resources/sass/partials/media.scss
+++ b/resources/sass/partials/media.scss
@@ -36,8 +36,8 @@
min-height: 45px;
a{
- font-size: 14px;
- padding: 15px 20px;
+ font-size: 13px;
+ padding: 15px 17px;
display: inline-block;
border-right: 1px solid #505050;
float: left;
@@ -396,3 +396,75 @@
}
}
+
+
+/******************************************
+ POPUP EDITION MEDIA
+******************************************/
+
+#form_media{
+ width: 100%;
+ height: 100%;
+ background-color: $grey3;
+ position: absolute;
+ z-index: 999999999999;
+ left: 0;
+ top: 0;
+
+ header{
+ background-color: $grey;
+
+ a{
+ font-size: 13px;
+ padding: 15px 17px;
+ display: inline-block;
+ border-right: 1px solid #505050;
+ float: left;
+ transition: 0.3s ease-in-out;
+
+ &:hover, &.active{
+ background-color: $lightdark;
+ }
+ }
+
+ .form_media_close{
+ float: right;
+ font-size: 18px;
+ position: relative;
+ padding: 12px;
+
+ &:after{
+ content: '';
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ background-color: $lightdark;
+ transform: translate(-50%,-50%);
+ transition: 0.2s ease-in-out;
+ border-radius: 36px;
+ padding: 15px;
+ }
+
+ &:hover{
+ background-color: transparent;
+ color: $white;
+
+ &:after{
+ background-color: $lightblue;
+ }
+ }
+ i{
+ position: relative;
+ z-index: 1;
+ }
+ }
+ }
+ .main_content{
+ .tab{
+ display: none;
+ &.active{
+ display: block;
+ }
+ }
+ }
+}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 9cef587..3393c0a 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -38,7 +38,34 @@
-
+
+
Déposez vos fichiers pour les téléverser