diff --git a/index.php b/index.php index c449bb8fd50ab66d45e7592875feea9374453165..0676609327d0c5b1c94d1495dbb747dcead38fb2 100644 --- a/index.php +++ b/index.php @@ -29,6 +29,7 @@ <?php require_once('src/html/dashboard.html'); ?> <?php require_once('src/html/members.html'); ?> <?php require_once('src/html/member.html'); ?> + <?php require_once('src/html/edit-profile.html'); ?> <?php require_once('src/html/projects.html'); ?> <?php require_once('src/html/project.html'); ?> <?php require_once('src/html/channels.html'); ?> @@ -60,13 +61,13 @@ } // Listen for changes - setInterval(function() { - if (currentRoute != window.location.href) { - currentRoute = getCurrentRoute(); + //setInterval(function() { + //if (currentRoute != window.location.href) { + //currentRoute = getCurrentRoute(); - insertChatIfNeeded(); - } - }, 15000); + //insertChatIfNeeded(); + //} + //}, 250); // Inserts a chat in the current view if needed function insertChatIfNeeded() { diff --git a/src/html/dashboard.html b/src/html/dashboard.html index 57878552a24f1ea61c146b89f00536408dd8a174..3d43d0e8ac7efe54e2d9ab29d728bf2cf0d822d8 100644 --- a/src/html/dashboard.html +++ b/src/html/dashboard.html @@ -1,8 +1,23 @@ <div id="dashboard" style="display: none"> - <form> - <div class="form-group"> - <input type="text" class="form-control form-control-sm" id="search-input" placeholder="Recherche" aria-describedby="search-help" autofocus /> - <small id="search-help" class="form-text text-muted">* parmi les membres, les projets et les groupes de discussion</small> - </div> - </form> + <!--<form>--> + <!--<div class="form-group">--> + <!--<input type="text" class="form-control form-control-sm" id="search-input" placeholder="Recherche" aria-describedby="search-help" autofocus />--> + <!--<small id="search-help" class="form-text text-muted">* parmi les membres, les projets et les groupes de discussion</small>--> + <!--</div>--> + <!--</form>--> + + <div class="list-condensed"> + <ldp-router> + <ldp-route name="edit-profile" id-prefix="<?php echo $sdn; ?>/members/"> + <ldp-display + data-src="<?php echo $sdn; ?>/members/1/" + set-name="firstname, name-separator, lastname" + value-name-separator=" " + data-fields="avatar, name" + widget-avatar="ldp-display-img" + next="edit-profile" + ></ldp-display> + </ldp-route> + </ldp-router> + </div> </div> diff --git a/src/html/edit-profile.html b/src/html/edit-profile.html new file mode 100644 index 0000000000000000000000000000000000000000..c48991ca13af1ea60710af4ab060fef67ab460fc --- /dev/null +++ b/src/html/edit-profile.html @@ -0,0 +1,8 @@ +<div id="edit-profile" style="display: none"> + <ldp-form + data-fields="" + bind-resources + ></ldp-form> + + <h1>BOOM</h1> +</div> diff --git a/src/js/hd-app.js b/src/js/hd-app.js index 2eefc59c50c970489315e7a2894db13201bebe83..7e1b390eac10a8db4931a283cd4458f56ac0896f 100644 --- a/src/js/hd-app.js +++ b/src/js/hd-app.js @@ -12,10 +12,11 @@ document.addEventListener("DOMContentLoaded", function(event) { if ((e.keyCode == 75 || e.keyCode == 80) && (e.ctrlKey === true || e.metaKey === true)) { e.preventDefault(); e.stopPropagation(); + openSearchBar(); } else if (e.keyCode == 27 && navBar.classList.contains("search-mode")) { - navBar.classList.remove("search-mode"); + closeSearchBar(); } }); diff --git a/src/scss/_menu.scss b/src/scss/_menu.scss index 682866c15c7270886b2a6127b30baef9d9f8b96e..d255e4a9a5b039e54f20d3d91c0b5b22296b9251 100644 --- a/src/scss/_menu.scss +++ b/src/scss/_menu.scss @@ -99,7 +99,7 @@ i { color: white; - background-color: $twitter-color; + background-color: $hd-color; &#search-icon { display : none; diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index b82659d26da7ebe31c52667fa670cdaedbbbdb24..ae35db0651df5977575383f55afae2841113300f 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -1,6 +1,6 @@ $hd-color: rgb(253, 200, 21); $hd-color-faded: rgba(253, 200, 21, 0.8); -$twitter-color: #1DA1F2; +$twitter-color: grey; $menu-height: 46px; $menu-font-size: 16px;