navbar update

app + site buttons ; contact page removed ; search button and form added on fixed navbar
sheaft-app · Feb 13, 2021 · 65665b8 · 65665b8
1 parent ba71236
commit 65665b8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 77 deletions.
diff --git a/user/config/site.yaml b/user/config/site.yaml
@@ -8,8 +8,10 @@ metadata:
 mainmenu:
   - text: Accueil
     url: page:accueil
-  - text: Contact
-    url:  page:contact
+  - text: Notre site
+    url: https://www.sheaft.com/
+  - text: Notre app
+    url: https://app.sheaft.com/
 copyright:
   text1: Sheaft
   year: 2021

diff --git a/user/pages/03.contact/form.md b/user/pages/03.contact/form.md
diff --git a/user/pages/03.contact/thankyou/formdata.md b/user/pages/03.contact/thankyou/formdata.md
diff --git a/user/themes/sheaft-theme/css/style.css b/user/themes/sheaft-theme/css/style.css
@@ -318,7 +318,6 @@ display:none;
     -moz-box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.15);
     -webkit-box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.15);
     box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.15); }
-.gdlr-fixed-nav .top-search-button{ opacity: 0; filter: alpha(opacity=0); cursor: auto; }
 .admin-bar .gdlr-fixed-nav{ top: 32px }
 
 .gdlr-navigation-container{ position: relative; }

diff --git a/user/themes/sheaft-theme/templates/partials/base.html.twig b/user/themes/sheaft-theme/templates/partials/base.html.twig
@@ -51,7 +51,7 @@
                         {% if item.url | contains('page:') %}
                             <li class='menu-item menu-item-type-post_type'><a href='{{ base_url_absolute }}/{{ item.url|replace({"page:":''}) }}'>{{ item.text }}</a></li>
                         {% else %}
-                            <li class='menu-item menu-item-type-post_type'><a href='{{ item.url }}'>{{ item.text }}</a></li>
+                            <li class='menu-item menu-item-type-post_type'><a href='{{ item.url }}' target="_blank">{{ item.text }}</a></li>
                         {% endif %}
                     {% endfor %}
                 </ul></div>

diff --git a/user/themes/sheaft-theme/templates/partials/navigation.html.twig b/user/themes/sheaft-theme/templates/partials/navigation.html.twig
@@ -7,28 +7,31 @@
                 {% if item.url | contains('page:') %}
                     <li class='menu-item menu-item-type-post_type gdlr-normal-menu'><a href='{{ base_url_absolute }}/{{ item.url|replace({"page:":''}) }}'>{{ item.text }}</a></li>
                     {% else %}
-                    <li class='menu-item menu-item-type-post_type gdlr-normal-menu'><a href='{{ item.url }}'>{{ item.text }}</a></li>
+                    <li class='menu-item menu-item-type-post_type gdlr-normal-menu'><a href='{{ item.url }}' target="_blank">{{ item.text }}</a></li>
                 {% endif %}
             {% endfor %}
-    </ul></nav>
-    <div class='top-search-button' id='top-search-button'>
-        <i class='icon-search'></i>
-    </div>
-    <div class='clear'></div></div>
-</div>
-</div>
-<div id='gdlr-navigation-substitute'></div>
-<div class='gdlr-nav-search-form' id='gdlr-nav-search-form'>
-    <div class='gdlr-nav-search-container container'>
-        <form>
+            </ul></nav>
+        <div class='top-search-button' id='top-search-button'>
             <i class='icon-search'></i>
-            <div class='search-text' id='search-text2'>
-                <input autocomplete='off' data-default='Rechercher...' name='q' type='text' value="{{ query }}" data-search-input2="{{ base_url_relative }}{{ config.plugins.simplesearch.route}}/query"/><input type='hidden' value='max-results=6'/>
-            </div>
-            <div class='clear'></div>
-        </form>
+        </div>
+        <div class='clear'></div>
+        </div>
+    </div>
+
+    <div class='gdlr-nav-search-form' id='gdlr-nav-search-form'>
+        <div class='gdlr-nav-search-container container'>
+            <form>
+                <i class='icon-search'></i>
+                <div class='search-text' id='search-text2'>
+                    <input autocomplete='off' data-default='Rechercher...' name='q' type='text' value="{{ query }}" data-search-input2="{{ base_url_relative }}{{ config.plugins.simplesearch.route}}/query"/><input type='hidden' value='max-results=6'/>
+                </div>
+                <div class='clear'></div>
+            </form>
+        </div>
     </div>
 </div>
+<div id='gdlr-navigation-substitute'></div>
+
 
 <script>
 jQuery(document).ready(function($){