Changes requested (#1429)

* Changes requested * Remove buy links * UI fixes * Don't display prices * More link adjustments * Remove price rendering * Only show buy links with titles --------- Co-authored-by: Philip Colmer <[email protected]>
96boards · Jul 29, 2024 · c0dfb30 · c0dfb30
1 parent edca2fb
commit c0dfb30
Show file tree

Hide file tree

Showing 21 changed files with 177 additions and 2,192 deletions.
diff --git a/_config.yml b/_config.yml
@@ -215,7 +215,7 @@ disqus:
   shortname: 96boards
 # Edit on GitHub Settings
 edit-on-github:
-  enabled: true
+  enabled: false
   docs: https://www.github.com/96Boards/documentation
   repo: https://www.github.com/96Boards/website
 # Shema.org settings used in the schema.html include.

diff --git a/_data/footer.yml b/_data/footer.yml
@@ -12,4 +12,4 @@ company_links:
   - name: Cookies
     url: /cookies/
   - name: Contact
-    url: /contact/
+    url: https://www.linaro.org/contact
diff --git a/_data/nav.yml b/_data/nav.yml
@@ -1,7 +1,7 @@
 search:
   enabled: true
   label: 96Boards
-universal_nav: true
+universal_nav: false
 expand_breakpoint: lg
 brand:
   path: /assets/images/logo.svg
@@ -13,10 +13,10 @@ pages:
         url: /about/
       - text: Specifications
         url: /specifications/
-      - text: Compliance
-        url: /compliance/
-      - text: News
-        url: /news/
+      # - text: Compliance
+      #   url: /compliance/
+      # - text: News
+      #   url: /news/
   - title: Products
     active_paths:
       - /product/
@@ -60,17 +60,9 @@ pages:
       - text: Blog
         url: /blog/
       - text: Projects
-        options:
-          - text: Projects
-            url: /projects/
-          - text: Contribute
-            url: /projects/contribute/
-          - text: FAQ
-            url: /projects/faq/
-          - text: Submit a Project
-            url: /projects/submit/
-      - text: Go Events
-        url: /go/
+        url: /projects/
+      # - text: Go Events
+      #   url: /go/
       - text: 96Boards Pinout
         url: /pinout/
   - title: Documentation
@@ -91,11 +83,11 @@ pages:
         url: /documentation/Specifications/
       - text: Contribution Policy
         url: /documentation/CONTRIBUTE.md.html
-  - title: Support
-    options:
-      - text: Discussion Forum
-        url: https://discuss.96boards.org/
-      - text: 96Boards Discord
-        url: https://discord.gg/x5uMn5d
-      - text: Partner Services
-        url: /services/
+  # - title: Support
+  #   options:
+  #     - text: Discussion Forum
+  #       url: https://discuss.96boards.org/
+  #     - text: 96Boards Discord
+  #       url: https://discord.gg/x5uMn5d
+  #     - text: Partner Services
+  #       url: /services/
diff --git a/_data/sticky_tab_bar.yml b/_data/sticky_tab_bar.yml
@@ -4,10 +4,10 @@ pages:
         url: __current_page__
       - title: Projects
         url: /projects/
-      - title: Contribute
-        url: /projects/contribute/
-      - title: FAQ
-        url: /projects/faq/
+      # - title: Contribute
+      #   url: /projects/contribute/
+      # - title: FAQ
+      #   url: /projects/faq/
     sub-pages-enabled: true
     urls: [/projects/]
   - list:
@@ -21,11 +21,11 @@ pages:
         url: /about/
       - title: Specifications
         url: /specifications/
-      - title: Compliance
-        url: /compliance/
-      - title: News
-        url: /news/
-    urls: [/about/,/specifications/,/compliance/,/news/]
+      # - title: Compliance
+      #   url: /compliance/
+      # - title: News
+      #   url: /news/
+    urls: [/about/,/specifications/]
   - list:
       - title: All
         url: /products/
@@ -49,17 +49,17 @@ pages:
         url: /products/accessories/
     urls: [/products/,/products/ce/,/products/ee/,/products/ie/,/products/mezzanine/,
     /products/accessories/, /products/archived/, /products/compare/, /products/se/, /products/se/modules/, /products/se/carrier-boards/, /products/ae/, /products/ae/pcu/, /products/ae/ccu/, /products/ae/drone/]
-  - list:
-      - title: Projects
-        url: /projects/
-      - title: Contribute
-        url: /projects/contribute/
-      - title: FAQ
-        url: /projects/faq/
-      - title: Submit a Project
-        url: /projects/submit/
-        right: true
-    urls: [/projects/,/projects/contribute/,/projects/faq/,/projects/submit/]
+  # - list:
+  #     - title: Projects
+  #       url: /projects/
+  #     - title: Contribute
+  #       url: /projects/contribute/
+  #     - title: FAQ
+  #       url: /projects/faq/
+  #     - title: Submit a Project
+  #       url: /projects/submit/
+  #       right: true
+  #   urls: [/projects/,/projects/contribute/,/projects/faq/,/projects/submit/]
   - list:
       - title: Thor96
         url: /product/thor96/

diff --git a/_includes/compare-boards-filters.html b/_includes/compare-boards-filters.html
@@ -58,7 +58,6 @@
 {% endfor %}
 
 <select id="compare-96boards-attribute-select" multiple="multiple">
-    <option value="price">Price</option>
     <option value="image">Image</option>
     {% for attr in tags %}
     <option value="{{attr}}">{{attr}}</option>

diff --git a/_includes/compare-boards-table.html b/_includes/compare-boards-table.html
@@ -25,8 +25,6 @@
                         <th class="attr attr-heading" data-attr="image">
                             Image <i data-toggle="tooltip" data-placement="top" title="Remove Attribute" class="icon-cancel removeAttribute"></i>
                         </th>
-                        <th class="attr attr-heading" data-attr="price"> Price <i data-toggle="tooltip" data-placement="top"
-                                title="Remove Attribute" class="icon-cancel removeAttribute"></i> </th>
                         {% for attr in tags %}
                         <th data-attr="{{attr}}" class="attr attr-heading">{{attr}} <i data-toggle="tooltip"
                                 data-placement="top" title="Remove Attribute" class="icon-cancel removeAttribute"></i>
@@ -42,7 +40,7 @@
                             {% endif %}
                         <tr>
                             <td class="board" data-board="{{board.url | replace: "/product/", "" | replace: "/", ""}}">
-                                {{board.title}} <a class="btn btn-default btn-xs" href="{{board.url}}">Buy Now</a> <i
+                                {{board.title}} <a class="btn btn-default btn-xs" href="{{board.url}}">Details</a> <i
                                     data-toggle="tooltip" data-placement="top" title="Remove Board" class="icon-cancel"></i>
                             </td>
                             {% assign product-url = board.permalink | split: "/" %}
@@ -56,37 +54,6 @@
                                     {% picture card_block_image {{image_path}} --alt {{image_alt}} %}
                                 </a>
                             </td>
-                            <td class="board" data-attr="price" data-board="{{board.url | replace: "/product/", "" | replace: "/", ""}}"
-                                class="data">
-                                <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
-                                        aria-haspopup="true" aria-expanded="false">
-                                        Buy Links
-                                        <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        {% for buy_link in board.product_buy_links %}
-                                        <li {% if buy_link.from %}data-toggle="tooltip" data-placement="right" title="Buy from {{buy_link.from}}"
-                                            {% endif %}>
-                                            <a href="{{ buy_link.link-url }}">
-                                                {% if buy_link.link-price %}
-                                                {% if buy_link.link-price-currency %}
-                                                {% if buy_link.link-price-currency == "JPY" %}
-                                                JP&yen;
-                                                {% else %}
-                                                {{buy_link.link-price-currency}}
-                                                {% endif %}
-                                                {% endif %}
-                                                {% endif %}
-                                                {{buy_link.link-price}}
-                                                {% if buy_link.type == "package" %}(Package Deal){% endif %}
-                                                {% if buy_link.type == "board" %}(Board){% endif %}
-                                            </a>
-                                        </li>
-                                        {% endfor %}
-                                    </ul>
-                                </div>
-                            </td>
                             {% for attr in tags %}
                             {% assign found = "false" %}
                             {% for each in board.attributes %}
@@ -116,7 +83,7 @@
                         <th data-attr="attr" class="attr attr-heading"></th>
                         {% for board in products_array %}
                         <th class="board" data-board="{{board.url | replace: "/product/", "" | replace: "/", ""}}">
-                            {{board.title}} <a class="btn btn-default btn-xs" href="{{board.url}}">Buy Now</a> <i
+                            {{board.title}} <a class="btn btn-default btn-xs" href="{{board.url}}">Details</a> <i
                                 data-toggle="tooltip" data-placement="top" title="Remove Board" class="icon-cancel"></i>
                         </th>
                         {% endfor %}
@@ -144,44 +111,6 @@
                             </td>
                             {% endfor %}
                         </tr>
-                        <tr data-attr-row="price">
-                            <td class="attr attr-heading" data-attr="price"> Price <i data-toggle="tooltip"
-                                    data-placement="top" title="Remove Attribute" class="icon-cancel removeAttribute"></i>
-                            </td>
-                            {% for board in products_array %}
-                            <td class="board" data-attr="price" data-board="{{board.url | replace: "/product/", "" | replace: "/", ""}}"
-                                class="data">
-                                <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
-                                        aria-haspopup="true" aria-expanded="false">
-                                        Buy Links
-                                        <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        {% for buy_link in board.product_buy_links %}
-                                        <li {% if buy_link.from %}data-toggle="tooltip" data-placement="right" title="Buy from {{buy_link.from}}"
-                                            {% endif %}>
-                                            <a href="{{ buy_link.link-url }}">
-                                                {% if buy_link.link-price %}
-                                                {% if buy_link.link-price-currency %}
-                                                {% if buy_link.link-price-currency == "JPY" %}
-                                                JP&yen;
-                                                {% else %}
-                                                {{buy_link.link-price-currency}}
-                                                {% endif %}
-                                                {% endif %}
-                                                {% endif %}
-                                                {{buy_link.link-price}}
-                                                {% if buy_link.type == "package" %}(Package Deal){% endif %}
-                                                {% if buy_link.type == "board" %}(Board){% endif %}
-                                            </a>
-                                        </li>
-                                        {% endfor %}
-                                    </ul>
-                                </div>
-                            </td>
-                            {% endfor %}
-                        </tr>
                         {% for attr in tags %}
                         <tr data-attr-row="{{attr}}">
                             <td data-attr="{{attr}}" class="attr attr-heading">{{attr}} <i data-toggle="tooltip"

diff --git a/_includes/display-products.html b/_includes/display-products.html
@@ -66,7 +66,8 @@ <h5 class="text-dark my-4">{{ product.title }}</h5>
                     </div>
                     <div class="separator clear-left">
                         <div class="dropdown dropdown-container btn-group dropup btn-block product-buy-dropdown d-flex flex-row align-items-center justify-content-center">
-                            <a href="{{ product.permalink }}" class="btn btn-primary btn-read-more">View Product</a>
+                            <a href="{{ product.permalink }}" class="btn btn-primary btn-read-more">Details</a>
+                            {% if product.product_buy_links %}
                             <button type="button" class="btn btn-primary dropdown-toggle btn-buy" data-toggle="dropdown"
                                 aria-haspopup="true" aria-expanded="false">
                                 Buy <i class="button-icon glyphicon glyphicon-shopping-cart"></i>
@@ -77,6 +78,7 @@ <h5 class="text-dark my-4">{{ product.title }}</h5>
                                 <li class="dropdown-item"><a href="{{ buy_link.link-url }}">{{ buy_link.link-title }}</a></li>
                                 {% endfor %}
                             </ul>
+                            {% endif %}
                             <input type="checkbox" class="board-checkbox"
                                 data-board-specification="{{product.product_specification}}"
                                 data-board-title="{{product.title}}"

diff --git a/_includes/products/featured_products.html b/_includes/products/featured_products.html
@@ -20,7 +20,6 @@
                 <div class="col col-12 col-sm-4 featured-product">
                 <a href="{{product.url}}">
                         <h3 class="featured-product-title text-dark">{{product.title}}</h3>
-                        {% if product.product_buy_links[0].link-price %}<span class="featured-product-price">From {{product.product_buy_links[0].link-price}}</span>{% endif %}
                         {% capture image_path %}_product/{{product.product_specification}}/{{url-slug}}/{{ product_image }}{% endcapture %}
                         {% capture image_alt %}{{ product.title }} image{% endcapture %}
                         {% picture card_block_image {{image_path}} --alt {{image_alt}} %}
@@ -30,7 +29,6 @@ <h3 class="featured-product-title text-dark">{{product.title}}</h3>
                 <div class="col col-12 col-sm-4 featured-product bottom">
                 <a href="{{product.url}}">
                         <h3 class="featured-product-title text-dark">{{product.title}}</h3>
-                        {% if product.product_buy_links[0].link-price %}<span class="featured-product-price">From {{product.product_buy_links[0].link-price}}</span>{% endif %}
                         {% capture image_path %}_product/{{product.product_specification}}/{{url-slug}}/{{ product_image }}{% endcapture %}
                         {% capture image_alt %}{{ product.title }} image{% endcapture %}
                         {% picture card_block_image {{image_path}} --alt {{image_alt}} %}
@@ -63,8 +61,6 @@ <h3 class="featured-product-title text-dark">{{product.title}}</h3>
                                 <div class="owl-item__inner">
                                     <div class="col col-12">
                                         <h3 class="featured-product-title">{{product.title}}</h3>
-                                        {% if product.product_buy_links[0].link-price %}<span class="featured-product-price">From
-                                            {{product.product_buy_links[0].link-price}}</span>{% endif %}
                                         {% capture image_path %}_product/{{product.product_specification}}/{{url-slug}}/{{ product_image }}{% endcapture %}
                                         {% capture image_alt %}{{ product.title }} image{% endcapture %}
                                         {% picture card_block_image {{image_path}} --alt {{image_alt}} %}

diff --git a/_layouts/product.html b/_layouts/product.html
@@ -42,28 +42,18 @@
                             <i class="glyphicon glyphicon-shopping-cart pull-right" style="margin-top:8px;"></i>
                         </li>
                         {% for buy_link in page.product_buy_links %}
+                        {% if buy_link.link-title %}
                             <li class="list-group-item">
                                 <a href="{{ buy_link.link-url }}">
                                     <span class="text-left">{{ buy_link.link-title }}</span>
-                                    {% if buy_link.link-price %}
-                                        <span class="pull-right buy-price">
-                                            {% if buy_link.link-price-currency %}
-                                                {% if buy_link.link-price-currency == "JPY" %}
-                                                    JP&yen;
-                                                {% else %}
-                                                    {{buy_link.link-price-currency}}
-                                                {% endif %}
-                                            {% endif %}
-                                            {{buy_link.link-price}}
-                                        </span>
-                                    {% endif %}
                                 </a>
                                 <small>
                                     {% if buy_link.type == "package" %}<span>Package Deal</span>{% endif %}
                                     {% if buy_link.type == "board" %}<span>Board</span>{% endif %}
                                     {% if buy_link.from %}<a href="{{ buy_link.link-url }}">Buy from {{buy_link.from}}</a>{% endif %}
                                 </small>
                             </li>
+                        {% endif %}
                         {% endfor %}
                     </ul>
                 {% endif %}