summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Huynh <jimmy.huynh@etu.unistra.fr>2021-02-19 15:30:19 +0100
committerSean Molenaar <SMillerDev@users.noreply.github.com>2021-04-08 23:17:31 +0200
commita6dba240c96a619af1de29cb923fe4a49c3a3dae (patch)
tree5a4a79ba893ba78d011352517f7c5a0a97375f8f
parent63dddc342e33b8e92ffc95df3768ff6d505a47b7 (diff)
(+) ui : dropdown on click (i.t of hover)
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
-rw-r--r--css/app.css3
-rw-r--r--js/controller/ShareController.js6
-rw-r--r--templates/part.content.php12
3 files changed, 12 insertions, 9 deletions
diff --git a/css/app.css b/css/app.css
index fa6f5e8c1..d2ed8e53d 100644
--- a/css/app.css
+++ b/css/app.css
@@ -66,7 +66,6 @@
}
.dropdown-content {
- display: none;
position: absolute;
background-color: #f1f1f1;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
@@ -84,8 +83,6 @@
.dropdown-content a:hover {background-color: #ddd;}
-.dropdown:hover .dropdown-content {display: block;}
-
.dropdown:hover .dropbtn {background-color: #3e8e41;}
/* Override hidden before angular is loaded */
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
diff --git a/js/controller/ShareController.js b/js/controller/ShareController.js
index b0b199ef9..66d3ce217 100644
--- a/js/controller/ShareController.js
+++ b/js/controller/ShareController.js
@@ -9,6 +9,12 @@
app.controller('ShareController', function (ShareResource, Loading) {
'use strict';
+ this.showDropDown = false;
+
+ this.toggleDropdown = function() {
+ this.showDropDown = !this.showDropDown;
+ };
+
this.userList = [];
/**
diff --git a/templates/part.content.php b/templates/part.content.php
index 170bc77ad..a2b2de26c 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -89,19 +89,19 @@
</button>
</li>
<!-- DROPDOWN SHARE -->
- <div class="dropdown">
- <li ng-click=""
+ <div class="dropdown"
+ ng-controller="ShareController as Share">
+ <li ng-click="Share.toggleDropdown()"
class="util"
- dropdownToggle
news-stop-propagation>
<button class="share svg dropbtn"
title="Partager">
</button>
</li>
<div
+ ng-if="Share.showDropDown"
style="margin-top: 2.8em;"
- class="dropdown-content"
- ng-controller="ShareController as Share">
+ class="dropdown-content">
<!-- Contact -->
<p class="label-group"><?php p($l->t('Users')) ?></p>
<form ng-submit="" name="contactForm" autocomplete="off">
@@ -130,7 +130,7 @@
<a
class="icon-category-installed pr-3"
ng-repeat="user in Share.userList"
- ng-click="Share.shareItem(item.id, user.value.shareWith)">
+ ng-click="Share.shareItem(item.id, user.value.shareWith)">
{{ user.value.shareWith }}
<span class="right" style="margin-top: 1.4em; margin-right: 1em"
ng-class="{'icon-loading-small': App.loading.isLoading(user.value.shareWith), 'icon-checkmark': !App.loading.isLoading(user.value.shareWith) && Share.usersSharedArticles[item.id].includes(user.value.shareWith)}">