Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons

Nav actions updated

3 files changed, 52 insertions, 51 deletions

diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss
index 99a048b0..147f163f 100644
--- a/app/Resources/static/themes/material/css/nav.scss
+++ b/app/Resources/static/themes/material/css/nav.scss
@@ -2,8 +2,7 @@
 /* ==========================================================================
    Nav
    ========================================================================== */
-nav,
-.nav-wrapper {
+nav {
   height: auto;
   line-height: initial;
 }
@@ -18,25 +17,25 @@ nav {
   }
 }
 
-.nav-wrapper {
+.nav-panel-item .button-collapse {
+  margin-left: 0;
+  margin-right: 0.5rem;
+  padding: 0 0.5rem;
+  height: auto;
+  line-height: 1;
+  background-color: transparent;
+  border: none;
+}
+
+.nav-panel-item {
   display: flex;
   padding: 0.6rem 0.4rem 0.6rem 0.75rem;
   flex-wrap: wrap;
   justify-content: space-between;
   align-items: center;
-
-  .button-collapse {
-    margin-left: 0;
-    margin-right: 0.5rem;
-    padding: 0 0.5rem;
-    height: auto;
-    line-height: 1;
-    background-color: transparent;
-    border: none;
-  }
 }
 
-nav .nav-wrapper i {
+.nav-panel-item .material-icons {
   height: 46px;
   line-height: 46px;
 }
@@ -51,8 +50,8 @@ nav .nav-wrapper i {
   justify-content: flex-end;
 }
 
-.nav-panel-add .add,
-.nav-panel-search .search,
+.nav-panel-item .add,
+.nav-panel-item .search,
 .nav-panels .close {
   color: #444 !important;
 }
@@ -68,9 +67,7 @@ nav .nav-wrapper i {
   .input-field input {
     display: block;
     line-height: inherit;
-    padding-left: 4rem !important;
-    width: calc(100% - 8rem);
-    height: 4.1rem;
+    height: 3rem;
   }
 
   .input-field input:focus {
@@ -87,36 +84,45 @@ nav .nav-wrapper i {
 }
 
 .input-field {
-  &.nav-panel-add label,
-  &.nav-panel-search label {
+  &.nav-panel-item label {
     left: 1rem;
   }
 
-  &.nav-panel-add .close,
-  &.nav-panel-search .close {
-    position: absolute;
-    top: 0;
-    right: 1rem;
+  &.nav-panel-item .close {
     color: transparent;
     cursor: pointer;
     font-size: 2rem;
     transition: 0.3s color;
   }
 
-  &.nav-panel-add,
-  &.nav-panel-add form,
-  &.nav-panel-search,
-  &.nav-panel-search form {
+  &.nav-panel-item {
     display: flex;
     flex: 1;
+    flex-wrap: nowrap;
+    align-items: center;
   }
 
-  &.nav-panel-add form.disabled,
-  &.nav-panel-add form.disabled input {
+  &.nav-panel-add.disabled,
+  &.nav-panel-add.disabled input {
     background-color: whitesmoke;
   }
 }
 
+.nav-form-button {
+  padding: 0;
+  background-color: transparent;
+  border: none;
+
+  &:focus {
+    background-color: inherit;
+  }
+}
+
+.nav-form-button,
+.nav-panel-item .close {
+  margin: 0 1%;
+}
+
 #button_filters {
   display: none;
 }
diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss
index 7daf40ec..ba6570f2 100644
--- a/app/Resources/static/themes/material/css/various.scss
+++ b/app/Resources/static/themes/material/css/various.scss
@@ -21,6 +21,7 @@ div.settings div.file-field {
 
 nav .input-field input {
   margin: 0;
+  padding-left: 0.5rem;
 }
 
 .tabs {
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js
index 36505d71..96310d81 100755
--- a/app/Resources/static/themes/material/index.js
+++ b/app/Resources/static/themes/material/index.js
@@ -35,6 +35,13 @@ $(document).ready(() => {
   initFilters();
   initExport();
 
+  const toggleNav = (toShow, toFocus) => {
+    $('.nav-panel-actions').hide(100);
+    $(toShow).show(100);
+    $('.nav-panels').css('background', 'white');
+    $(toFocus).focus();
+  };
+
   $('#nav-btn-add-tag').on('click', () => {
     $('.nav-panel-add-tag').toggle(100);
     $('.nav-panel-menu').addClass('hidden');
@@ -42,34 +49,21 @@ $(document).ready(() => {
     return false;
   });
   $('#nav-btn-add').on('click', () => {
-    $('.nav-panel-buttom').hide(100);
-    $('.nav-panel-add').show(100);
-    $('.nav-panels .action').hide(100);
-    $('.nav-panel-menu').addClass('hidden');
-    $('.nav-panels').css('background', 'white');
-    $('#entry_url').focus();
+    toggleNav('.nav-panel-add', '#entry_url');
     return false;
   });
-  const materialAddForm = $('.nav-panel-add form[name=entry]');
+  const materialAddForm = $('.nav-panel-add');
   materialAddForm.on('submit', () => {
     materialAddForm.addClass('disabled');
     $('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur');
   });
   $('#nav-btn-search').on('click', () => {
-    $('.nav-panel-buttom').hide(100);
-    $('.nav-panel-search').show(100);
-    $('.nav-panels .action').hide(100);
-    $('.nav-panel-menu').addClass('hidden');
-    $('.nav-panels').css('background', 'white');
-    $('#search_entry_term').focus();
+    toggleNav('.nav-panel-search', '#search_entry_term');
     return false;
   });
-  $('.close').on('click', () => {
-    $('.nav-panel-add').hide(100);
-    $('.nav-panel-search').hide(100);
-    $('.nav-panel-buttom').show(100);
-    $('.nav-panels .action').show(100);
-    $('.nav-panel-menu').removeClass('hidden');
+  $('.close').on('click', (e) => {
+    $(e.target).parent('.nav-panel-item').hide(100);
+    $('.nav-panel-actions').show(100);
     $('.nav-panels').css('background', 'transparent');
     return false;
   });