From 4359bdfb3572ab1d810f84a192eee77823a11047 Mon Sep 17 00:00:00 2001
From: Alexandre Bourlier <alexandre@happy-dev.fr>
Date: Sun, 18 Mar 2018 16:29:31 +0100
Subject: [PATCH] ready to display members
---
index.php | 18 ++++++++----------
src/html/members.html | 10 +++-------
src/html/menu.html | 6 +++---
src/scss/_menu.scss | 3 +++
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/index.php b/index.php
index d189ffb1..de32572a 100644
--- a/index.php
+++ b/index.php
@@ -28,16 +28,14 @@
<body>
<?php require_once('src/html/menu.html'); ?>
- <div id="mainContainer" class="container-fluid">
- <main id="ldp-root" class="col-md-10">
- <?php require_once('src/html/home.html'); ?>
- <?php require_once('src/html/members.html'); ?>
- <?php require_once('src/html/projects.html'); ?>
- <?php require_once('src/html/groups.html'); ?>
- <?php require_once('src/html/calendar.html'); ?>
- <?php require_once('src/html/drive.html'); ?>
- </main>
- </div>
+ <main id="mainContainer" class="container-fluid">
+ <?php require_once('src/html/home.html'); ?>
+ <?php require_once('src/html/members.html'); ?>
+ <?php require_once('src/html/projects.html'); ?>
+ <?php require_once('src/html/groups.html'); ?>
+ <?php require_once('src/html/calendar.html'); ?>
+ <?php require_once('src/html/drive.html'); ?>
+ </main>
<!--Profil Modal-->
<div id="profileDiv" style="display: none;">
diff --git a/src/html/members.html b/src/html/members.html
index b9364d7a..590e71db 100644
--- a/src/html/members.html
+++ b/src/html/members.html
@@ -1,14 +1,10 @@
<div id="members" style="display: none">
- <h1 class="page-title">Membres</h1>
+ <div class="page-header">
+ <h1>Membres</h1>
+ </div>
<ldp-display id="profilesList" data-src="http://lucky.alwaysdata.net/api/users/" data-fields="miniature" set-miniature="picture, name" widget-picture="ldp-display-img"></ldp-display>
- <!-- <ldp-display id="profilesList" data-src="https://djangoldp.happy-dev.fr/skippers/" data-fields="miniature, name" set-miniature="picture" widget-picture="ldp-display-img"
- set-name="name, testmdr" value-testmdr="C'est trés amusant"></ldp-display> -->
-
- <!-- test direct dans data-fields -->
- <!-- <ldp-display id="profilesList" data-src="https://djangoldp.happy-dev.fr/skippers/" data-fields="picture, name" widget-picture="ldp-display-img"></ldp-display> -->
-
<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function (event) {
var profilesListElt = document.querySelector('#profilesList');
diff --git a/src/html/menu.html b/src/html/menu.html
index 7f68046b..3df09a0a 100644
--- a/src/html/menu.html
+++ b/src/html/menu.html
@@ -1,10 +1,10 @@
-<nav class="navbar navbar-expand-md navbar-dark bg-dark">
- <div id="menu-title" class="navbar-brand">HAPPY APP</div>
-
+<nav class="navbar navbar-expand-md navbar-dark bg-dark sticky-top">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
+ <div id="menu-title" class="navbar-brand">HAPPY APP</div>
+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ldp-router class="navbar-nav mr-auto" root="ldp-root" default-route="home">
<ldp-route class="nav-item active" name="members">Membres</ldp-route>
diff --git a/src/scss/_menu.scss b/src/scss/_menu.scss
index e8373aef..5a10d5fb 100644
--- a/src/scss/_menu.scss
+++ b/src/scss/_menu.scss
@@ -6,6 +6,9 @@
ldp-route:hover {
text-decoration: underline;
}
+ ldp-route[active] {
+ font-weight: bold;
+ }
}
--
GitLab