From ffee24ca29eb5b4c96adf81b1483108ec1a3c8f3 Mon Sep 17 00:00:00 2001
From: hveficent <hector.villarreal@eficent.com>
Date: Fri, 3 Aug 2018 12:21:59 +0200
Subject: [PATCH] remove unused css and js tags + add Product nav overwriting
 shop

---
 forksand_website/__manifest__.py              |  6 ++---
 .../static/src/css/scrolling-nav.css          | 22 +--------------
 ...crolling-nav.js => scrollreveal-custom.js} | 12 ---------
 forksand_website/views/assets.xml             |  2 +-
 forksand_website/views/nav_menu_entries.xml   | 27 +++++++++++++++++++
 5 files changed, 32 insertions(+), 37 deletions(-)
 rename forksand_website/static/src/js/{scrolling-nav.js => scrollreveal-custom.js} (85%)

diff --git a/forksand_website/__manifest__.py b/forksand_website/__manifest__.py
index 3542833..b4d0fbd 100644
--- a/forksand_website/__manifest__.py
+++ b/forksand_website/__manifest__.py
@@ -7,9 +7,9 @@
     'description': """
         This module add forksand content to Odoo website
     """,
-    'author': "Héctor Villarreal Ortega",
+    'author': "Eficent",
     'website': "https://eficent.io",
-    'category': 'Uncategorized',
+    'category': 'Website Page',
     'version': '11.0.1.0.0',
     'depends': ['theme_default', 'website',
                 'website_anchor_smooth_scroll',
@@ -20,7 +20,6 @@
                 'cms_product_form',
                 ],
     'data': [
-        'views/assets.xml',
         'views/homepage.xml',
         'views/home/init_header.xml',
         'views/home/about.xml',
@@ -29,5 +28,6 @@
         'views/nav_menu_entries.xml',
         'views/aboutus.xml',
         'views/footer.xml',
+        'views/assets.xml',
     ],
 }
\ No newline at end of file
diff --git a/forksand_website/static/src/css/scrolling-nav.css b/forksand_website/static/src/css/scrolling-nav.css
index 88efb47..1ab23c3 100644
--- a/forksand_website/static/src/css/scrolling-nav.css
+++ b/forksand_website/static/src/css/scrolling-nav.css
@@ -98,10 +98,6 @@
 .custom-radio .custom-control-input:checked ~ .custom-control-label::before {
   background-color: #ff7e00;
 }
-.nav-pills .nav-link.active,
-.nav-pills .show > .nav-link {
-  background-color: #ff7e00;
-}
 .page-link {
   color: #ff7e00;
   border: 1px solid #dee2e6;
@@ -160,14 +156,6 @@ button.bg-primary:focus {
 a.text-primary:hover, a.text-primary:focus {
   color: #cc6500 !important;
 }
-.nav-link {
-  font-weight: 500;
-}
-
-
-
-
-
 
 .case-study .col-md-12 {
   transform: translateY(-130px);
@@ -353,19 +341,11 @@ h1 {
   margin-left: 25%;
 }
 
-
-
 .myHeading{
     font-size: 20px;
     font-weight: 400;
 }
 
-
-.navbar-expand-lg .navbar-nav .nav-link {
-  padding-right: 1.5rem;
-  padding-left: 1.5rem;
-}
-
 .btnRoundded {
   border-radius: 0.8rem;
   width: 208px !important;
@@ -373,7 +353,7 @@ h1 {
 .buttonMargin{
   margin: 13px 12px 12px 10px;
 }
-a{
+ body a{
   color: #000;
   font-weight: 400;
 }
diff --git a/forksand_website/static/src/js/scrolling-nav.js b/forksand_website/static/src/js/scrollreveal-custom.js
similarity index 85%
rename from forksand_website/static/src/js/scrolling-nav.js
rename to forksand_website/static/src/js/scrollreveal-custom.js
index 6fc61bf..d5437d6 100644
--- a/forksand_website/static/src/js/scrolling-nav.js
+++ b/forksand_website/static/src/js/scrollreveal-custom.js
@@ -36,10 +36,6 @@
     delay: 600,
     origin:'bottom'
   });
-  sr.reveal('#testimonial div', {
-    duration: 600,
-    origin:'bottom'
-  });
   sr.reveal('.info-left', {
     duration: 600,
     origin:'left',
@@ -52,12 +48,6 @@
     distance:'300px',
     viewFactor: 0.2
   });
-
-  sr.reveal('.sr-icons', {
-    duration: 600,
-    scale: 0.3,
-    distance: '0px'
-  }, 200);
   sr.reveal('.sr-button', {
     duration: 1000,
     delay: 600
@@ -67,11 +57,9 @@
     scale: 0.3,
     distance: '0px'
   }, 300);
-
   sr.reveal('footer', {
     duration: 600,
     origin:'bottom'
   });
-  
 
 })(jQuery); // End of use strict
\ No newline at end of file
diff --git a/forksand_website/views/assets.xml b/forksand_website/views/assets.xml
index 6a7acdc..17fb49d 100644
--- a/forksand_website/views/assets.xml
+++ b/forksand_website/views/assets.xml
@@ -9,7 +9,7 @@
             <script type="text/javascript"
                     src="/forksand_website/static/vendor/scrollreveal/js/scrollreveal.min.js"></script>
             <script type="text/javascript"
-                    src="/forksand_website/static/src/js/scrolling-nav.js"></script>
+                    src="/forksand_website/static/src/js/scrollreveal-custom.js"></script>
         </xpath>
     </template>
 
diff --git a/forksand_website/views/nav_menu_entries.xml b/forksand_website/views/nav_menu_entries.xml
index 4a05768..73804ed 100644
--- a/forksand_website/views/nav_menu_entries.xml
+++ b/forksand_website/views/nav_menu_entries.xml
@@ -9,4 +9,31 @@
         <field name="website_id" ref="website.default_website"/>
     </record>
 
+    <record id="website_sale.menu_shop" model="website.menu">
+            <field name="name">Products</field>
+            <field name="parent_id" ref="website.main_menu"/>
+            <field name="sequence" type="int">20</field>
+    </record>
+
+    <record id="menu_search_products" model="website.menu">
+            <field name="name">Search Products</field>
+            <field name="url">/products</field>
+            <field name="parent_id" ref="website_sale.menu_shop"/>
+            <field name="sequence" type="int">5</field>
+    </record>
+
+    <record id="menu_search_boms" model="website.menu">
+            <field name="name">Search Bill of Materials</field>
+            <field name="url">/mrp_boms</field>
+            <field name="parent_id" ref="website_sale.menu_shop"/>
+            <field name="sequence" type="int">10</field>
+    </record>
+
+    <record id="menu_shop" model="website.menu">
+            <field name="name">Shop</field>
+            <field name="url">/shop</field>
+            <field name="parent_id" ref="website_sale.menu_shop"/>
+            <field name="sequence" type="int">15</field>
+    </record>
+
 </odoo>
\ No newline at end of file