Revert "Revert "Website redesign (#348)" (#354)"

This reverts commit ec80492.
OData · Aug 11, 2023 · 46c5462 · 46c5462
1 parent ec80492
commit 46c5462
Show file tree

Hide file tree

Showing 63 changed files with 3,507 additions and 2,897 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ _site
 _config.yml
 .jekyll-cache
 .vs/
-.vscode/
+.vscode/.jekyll-metadata 
diff --git a/_config.yml b/_config.yml
@@ -1,5 +1,5 @@
 # Site settings
-title: OData - the Best Way to REST
+title: OData - The Best Way to REST
 email: [email protected]
 description: > # this means to ignore newlines until "baseurl:"
   OData, short for Open Data Protocol, is an open protocol
@@ -19,6 +19,8 @@ collections:
   tutorials:
     output: true
     permalink: /tutorials/:title/
+  tools:
+    output: true
 
 permalink: /blog/:title/
 

diff --git a/_data/ecosys-submissions.csv b/_data/ecosys-submissions.csv
@@ -0,0 +1,4 @@
+id,product_category,product_name,product_link,download_link,brief_description
+2,Producer,test,testingg,,teaowjei aiwjeg oiajweoj gtaow eia weijgoja wiegjawe o
+3,Live Service,test2,https://www.odata.org/,,aweojgawejgjoewijoaw ejgaewg
+4,Consumer,test3,faowje,oaijgoijwe,awiejgoajwegiojawe
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,7 +1,47 @@
 <footer class="content-info" role="contentinfo">
 
-<div class="container" style=" text-align: center" aria-label="content-info">
-  <p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
+<div class="footer" aria-label="content-info">
+    <div class="container">
+        <div class="items-container centered">
+            <div>
+                <p><strong>Follow</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-twitter" viewBox="0 0 16 16">
+                        <path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z" />
+                    </svg>
+                    <p><a href="https://twitter.com/odataorg">OData Org</a></p>
+                </div>
+            </div>
+            <div>
+                <p><strong>Contact</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-envelope-fill" viewBox="0 0 16 16">
+                        <path d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555ZM0 4.697v7.104l5.803-3.558L0 4.697ZM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757Zm3.436-.586L16 11.801V4.697l-5.803 3.546Z" />
+                    </svg>
+                    <p><a href="mailto:[email protected]">[email protected]</a></p>
+                </div>
+            </div>
+            <div>
+                <p><strong>Discuss</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-chat-right-text-fill" viewBox="0 0 16 16">
+                        <path d="M16 2a2 2 0 0 0-2-2H2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h9.586a1 1 0 0 1 .707.293l2.853 2.853a.5.5 0 0 0 .854-.353V2zM3.5 3h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1 0-1zm0 2.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1 0-1zm0 2.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1z" />
+                    </svg>
+                    <p><a href="https://groups.google.com/forum/#!forum/odata-discussion">OData Google Group Forum</a></p>
+                </div>
+            </div>
+            <div>
+                <p><strong>Contribute</strong></p>
+                <div class="icon-link">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-github" viewBox="0 0 16 16">
+                        <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z" />
+                    </svg>
+                    <p><a href="https://github.com/OData">OData Org</a></p>
+                </div>
+            </div>
+        </div>
+        <p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
+    </div>
 </div>
 
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,42 +1,42 @@
 <head>
-  <meta charset="utf-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>
-    {% if page.title %}
-      {{ page.title }} &middot; {{ site.title }}
-    {% else %}
-      {{ site.title }}
-    {% endif %}
-  </title>
+    <title>
+        {% if page.title %}
+            {{ page.title }} &middot; {{ site.title }}
+        {% else %}
+            {{ site.title }}
+        {% endif %}
+    </title>
 
-  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
-  <meta name="keywords" content="odata, open data, open data protocol, rest, restful, rest api, rest apis, restful api, restful apis, rest service, rest services, restful service, restful services, http, oasis, oasis tc">
+    <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+    <meta name="keywords" content="odata, open data, open data protocol, rest, restful, rest api, rest apis, restful api, restful apis, rest service, rest services, restful service, restful services, http, oasis, oasis tc">
 
-  <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.0.0.min.js"></script>
-  <script>
-  // Fallback to loading jQuery from a local path if the CDN is unavailable
-  (window.jQuery || document.write('<script src="/public/jquery-3.0.0.min.js"><\/script>'));
-  </script>
-  <!--
-  <script>
-  $(document).ready(function(){
-    $.getJSON("http://ipinfo.io/?callback=?", function(data) {
-      if (data.country=="CN") {
-        $("#GeoResults").html('<embed src="https://player.youku.com/player.php/sid/XMTU5MzU2MDU0NA==/v.swf" allowFullScreen="true" quality="high" width=100% height="230" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>');
-      } else $("#GeoResults").html('<iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe>');
+    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.0.0.min.js"></script>
+    <script>
+        // Fallback to loading jQuery from a local path if the CDN is unavailable
+        (window.jQuery || document.write('<script src="/public/jquery-3.0.0.min.js"><\/script>'));
+    </script>
+    <!--
+    <script>
+    $(document).ready(function(){
+      $.getJSON("http://ipinfo.io/?callback=?", function(data) {
+        if (data.country=="CN") {
+          $("#GeoResults").html('<embed src="https://player.youku.com/player.php/sid/XMTU5MzU2MDU0NA==/v.swf" allowFullScreen="true" quality="high" width=100% height="230" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>');
+        } else $("#GeoResults").html('<iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe>');
+      });
     });
-  });
-  </script>
-  
-  -->
+    </script>
 
-  <link rel="stylesheet" href="https://www.odata.org/public/css/bootstrap.min.css"/>
-  <link rel="stylesheet" href="{{'/public/css/site.css' | prepend: site.baseurl | prepend: site.url}}">
-  <link rel="stylesheet" href="{{'/public/css/syntax.css' | prepend: site.baseurl | prepend: site.url}}">
-  <link rel="stylesheet" href="{{'/public/css/autocomplete.css' | prepend: site.baseurl | prepend: site.url}}">
-  <!--Below is for the adopters page-->
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/3.0.7/css/swiper.min.css">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.0.0/magnific-popup.min.css">
-  <!-- end -->
+    -->
+
+    <link rel="stylesheet" href="https://www.odata.org/public/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="{{'/public/css/site.css' | prepend: site.baseurl | prepend: site.url}}">
+    <link rel="stylesheet" href="{{'/public/css/syntax.css' | prepend: site.baseurl | prepend: site.url}}">
+    <link rel="stylesheet" href="{{'/public/css/autocomplete.css' | prepend: site.baseurl | prepend: site.url}}">
+    <!--Below is for the adopters page-->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/3.0.7/css/swiper.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.0.0/magnific-popup.min.css">
+    <!-- end -->
 </head>
diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -3,17 +3,18 @@
         <p role="presentation">Skip to main content</p>
     </a>
     <nav class="navbar navbar-default" role="navigation" aria-label="Main Navigation">
-        <div class="container container-fluid">
+        <div class="container container-fluid" style="display: flex; align-items: center">
             <div class="navbar-header">
-                <ul class="nav navbar-nav">
-                    <li>
-                        <a class="brand" href="/">
-                            <img class="img-responsive"
-                                 alt="OData logo"
-                                 src="{{'/assets/OData-logo-e1393393068350.png' | prepend: site.baseurl | prepend: site.url}}">
-                        </a>
-                    </li>
-                </ul>
+                <a class="navbar-brand" href="/" style="font-size: 2rem">
+                    <div style="display: flex; align-items: center">
+                        <img class="img-responsive"
+                                alt="OData logo"
+                                width="30"
+                                style="padding-right: 1rem"
+                                src="{{'/assets/ODataLogo-96.png' | prepend: site.baseurl | prepend: site.url}}">
+                        OData
+                    </div>
+                </a>
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#odata-navbar-collapse">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
@@ -22,11 +23,7 @@
                 </button>
             </div>
 
-            <div class="collapse navbar-collapse" id="odata-navbar-collapse" role="navigation">
                 <ul class="nav navbar-nav" role="menubar">
-                    <li role="none">
-                        <a role="menuitem" href="/blog">Blog</a>
-                    </li>
                     <li class="dropdown" role="none">
                         <a role="menuitem"
                            aria-haspopup="true"
@@ -39,7 +36,7 @@
                         </a>
                         <ul class="dropdown-menu" role="menu" aria-label="Developers dropdown.">
                             <li role="none">
-                                <a role="menuitem" href="/getting-started">Getting Started</a>
+                                <a role="menuitem" href="/get-started">Get Started</a>
                             </li>
                             <li role="none">
                                 <a role="menuitem" href="/documentation">Documentation</a>
@@ -56,42 +53,22 @@
                         </ul>
                     </li>
                     <li class="dropdown" role="none">
-                        <a role="menuitem"
-                           aria-haspopup="true"
-                           aria-expanded="false"
-                           class="dropdown-toggle"
-                           data-toggle="dropdown"
-                           data-target="#"
-                           href="#">
-                            Tools <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu" role="menu" aria-label="Tools dropdown.">
-                            <li role="none">
-                                <a role="menuitem"
-                                   href="https://marketplace.visualstudio.com/items?itemName=stansw.vscode-odata"
-                                   target="_blank">
-                                    OData for Visual Studio Code
-                                </a>
-                            </li>
-                            <li role="none">
-                                <a role="menuitem" href="https://pragmatiqa.com/xodata/" target="_blank">XOData</a>
-                            </li>
-                        </ul>
+                        <a role="menuitem" href="/tools">Tools</a>
                     </li>
                     <li role="none">
-                        <a role="menuitem"  href="/ecosystem">Ecosystem</a>
+                        <a role="menuitem" href="/blog">Blog</a>
                     </li>
                     <li role="none">
-                        <a role="menuitem" href="/contribution">Getting Involved</a>
+                        <a role="menuitem" href="/ecosystem">Ecosystem</a>
                     </li>
                 </ul>
 
-                <form class="navbar-form navbar-left" role="search">
-                    <div class="form-group combobox combobox-list">
+                <form class="navbar-form navbar-right search-bar" role="search" style="margin-left: auto">
+                    <div class="search-bar form-group combobox combobox-list">
                         <input id="main-search-input"
                                type="text"
                                aria-label="Search"
-                               class="form-control st-default-search-input"
+                               class="search-bar-input form-control"
                                placeholder="Search"
                                role="combobox"
                                aria-autocomplete="list"
@@ -107,6 +84,5 @@
                     </div>
                 </form>
             </div>
-        </div>
     </nav>
 </div>
diff --git a/_includes/typing-animation.html b/_includes/typing-animation.html
@@ -0,0 +1,62 @@
+<div>
+     <p class="typing-animation">
+        <span class="typewrite" data-period="2000" data-type='[ "company/divisions/$count", "company/employees?$select=firstName,lastName", "company?$expand=employees"]'>
+            <span class="wrap"></span>
+        </span>
+    </p>
+
+    <script type="text/javascript">
+        var TxtType = function (el, toRotate, period) {
+            this.toRotate = toRotate;
+            this.el = el;
+            this.loopNum = 0;
+            this.period = parseInt(period, 10) || 2000;
+            this.txt = '';
+            this.tick();
+            this.isDeleting = false;
+        };
+
+        TxtType.prototype.tick = function () {
+            var i = this.loopNum % this.toRotate.length;
+            var fullTxt = this.toRotate[i];
+
+            if (this.isDeleting) {
+                this.txt = '';
+            } else {
+                this.txt = fullTxt.substring(0, this.txt.length + 1);
+            }
+
+            this.el.innerHTML = '<span class="wrap">' + this.txt + '</span>';
+
+            var that = this;
+            var delta = 200 - Math.random() * 100;
+
+            if (this.isDeleting) { delta /= 2; }
+
+            if (!this.isDeleting && this.txt === fullTxt) {
+                delta = this.period;
+                this.isDeleting = true;
+            } else if (this.isDeleting && this.txt === '') {
+                this.isDeleting = false;
+                this.loopNum++;
+                delta = 500;
+            }
+
+            setTimeout(function () {
+                that.tick();
+            }, delta);
+        };
+
+        window.onload = function () {
+            var elements = document.getElementsByClassName('typewrite');
+            for (var i = 0; i < elements.length; i++) {
+                var toRotate = elements[i].getAttribute('data-type');
+                var period = elements[i].getAttribute('data-period');
+                if (toRotate) {
+                    new TxtType(elements[i], JSON.parse(toRotate), period);
+                }
+            }
+
+        };
+    </script>
+</div>
diff --git a/_layouts/documentation-archived.html b/_layouts/documentation-archived.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+<div>
+    <div class="container">
+        <div class="page-header">
+            <h1>{{ page.title }}</h1>
+        </div>
+    </div>
+    <div class="banner upgrade">
+        <div class="container">
+            <h2>Upgrade Your OData: Version 4.0 Available!</h2>
+            <p>OData Version 4.0 is the current recommended version of OData. OData V4 has been standardized by OASIS and has many features not included in previous versions.</p>
+            <br />
+            <a class="big-action"
+               href="/documentation/">
+                Latest OData Version
+            </a>
+        </div>
+    </div>
+    <div class="container">
+        {{ content }}
+    </div>
+</div>
diff --git a/_libraries/ASP-NET-Web-API-OData.md b/_libraries/ASP-NET-Web-API-OData.md
@@ -1,6 +1,7 @@
 ---
 category: net
 name: ASP.NET Web API OData
+featured: true
 rownumber: 40
 link: https://learn.microsoft.com/en-us/odata/webapi/getting-started
 version: V4

diff --git a/_libraries/Apache-Olingo.md b/_libraries/Apache-Olingo.md
@@ -1,6 +1,7 @@
 ---
 category: java
-name: Apache Olingo <span class="label label-success">featured</span>
+name: Apache Olingo
+featured: true
 rownumber: 13
 version: V2 and V4
 object: Both

diff --git a/_libraries/Model-Builder.md b/_libraries/Model-Builder.md
@@ -0,0 +1,11 @@
+---
+category: net
+name: Model Builder
+link: https://learn.microsoft.com/en-us/odata/webapi/model-builder-abstract
+version: V1
+object: Server
+downloads:
+  - source: nugetgallery
+    link: https://www.nuget.org/packages/Microsoft.OData.ModelBuilder
+---
+APIs to create an OData Edm (Entity Data Model) using C# types, attributes and conventions.
diff --git a/_libraries/OData-Client-for-NET.md b/_libraries/OData-Client-for-NET.md
@@ -1,6 +1,7 @@
 ---
 category: net
 name: OData Client for .NET
+featured: true
 rownumber: 28
 link: https://odata.github.io/odata.net/#04-01-basic-crud-operations
 version: V4

diff --git a/_libraries/ODataCpp-Client.md b/_libraries/ODataCpp-Client.md
@@ -1,6 +1,7 @@
 ---
 category: cpp
-name: ODataCpp-Client <span class="label label-success">featured</span>
+name: ODataCpp-Client
+featured: true
 version: V4
 object: Client
 downloads: