Skip to content

Commit 46c5462

Browse files
gathogojrgathogojr
committed
Revert "Revert "Website redesign (#348)" (#354)"
This reverts commit ec80492.
1 parent ec80492 commit 46c5462

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3507
-2897
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ _site
33
_config.yml
44
.jekyll-cache
55
.vs/
6-
.vscode/
6+
.vscode/.jekyll-metadata

‎_config.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Site settings
2-
title: OData - the Best Way to REST
2+
title: OData - The Best Way to REST
33
email: [email protected]
44
description: > # this means to ignore newlines until "baseurl:"
55
OData, short for Open Data Protocol, is an open protocol
@@ -19,6 +19,8 @@ collections:
1919
tutorials:
2020
output: true
2121
permalink: /tutorials/:title/
22+
tools:
23+
output: true
2224

2325
permalink: /blog/:title/
2426

‎_data/ecosys-submissions.csv

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
id,product_category,product_name,product_link,download_link,brief_description
2+
2,Producer,test,testingg,,teaowjei aiwjeg oiajweoj gtaow eia weijgoja wiegjawe o
3+
3,Live Service,test2,https://www.odata.org/,,aweojgawejgjoewijoaw ejgaewg
4+
4,Consumer,test3,faowje,oaijgoijwe,awiejgoajwegiojawe

‎_includes/footer.html

+42-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,47 @@
11
<footer class="content-info" role="contentinfo">
22

3-
<div class="container" style=" text-align: center" aria-label="content-info">
4-
<p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
3+
<div class="footer" aria-label="content-info">
4+
<div class="container">
5+
<div class="items-container centered">
6+
<div>
7+
<p><strong>Follow</strong></p>
8+
<div class="icon-link">
9+
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-twitter" viewBox="0 0 16 16">
10+
<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" />
11+
</svg>
12+
<p><a href="https://twitter.com/odataorg">OData Org</a></p>
13+
</div>
14+
</div>
15+
<div>
16+
<p><strong>Contact</strong></p>
17+
<div class="icon-link">
18+
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-envelope-fill" viewBox="0 0 16 16">
19+
<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" />
20+
</svg>
21+
<p><a href="mailto:[email protected]">[email protected]</a></p>
22+
</div>
23+
</div>
24+
<div>
25+
<p><strong>Discuss</strong></p>
26+
<div class="icon-link">
27+
<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">
28+
<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" />
29+
</svg>
30+
<p><a href="https://groups.google.com/forum/#!forum/odata-discussion">OData Google Group Forum</a></p>
31+
</div>
32+
</div>
33+
<div>
34+
<p><strong>Contribute</strong></p>
35+
<div class="icon-link">
36+
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="white" class="bi bi-github" viewBox="0 0 16 16">
37+
<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" />
38+
</svg>
39+
<p><a href="https://github.com/OData">OData Org</a></p>
40+
</div>
41+
</div>
42+
</div>
43+
<p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
44+
</div>
545
</div>
646

747
</footer>

‎_includes/head.html

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
<head>
2-
<meta charset="utf-8"/>
3-
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
2+
<meta charset="utf-8" />
3+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
44

5-
<title>
6-
{% if page.title %}
7-
{{ page.title }} &middot; {{ site.title }}
8-
{% else %}
9-
{{ site.title }}
10-
{% endif %}
11-
</title>
5+
<title>
6+
{% if page.title %}
7+
{{ page.title }} &middot; {{ site.title }}
8+
{% else %}
9+
{{ site.title }}
10+
{% endif %}
11+
</title>
1212

13-
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
14-
<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">
13+
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
14+
<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">
1515

16-
<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.0.0.min.js"></script>
17-
<script>
18-
// Fallback to loading jQuery from a local path if the CDN is unavailable
19-
(window.jQuery || document.write('<script src="/public/jquery-3.0.0.min.js"><\/script>'));
20-
</script>
21-
<!--
22-
<script>
23-
$(document).ready(function(){
24-
$.getJSON("http://ipinfo.io/?callback=?", function(data) {
25-
if (data.country=="CN") {
26-
$("#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>');
27-
} else $("#GeoResults").html('<iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe>');
16+
<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.0.0.min.js"></script>
17+
<script>
18+
// Fallback to loading jQuery from a local path if the CDN is unavailable
19+
(window.jQuery || document.write('<script src="/public/jquery-3.0.0.min.js"><\/script>'));
20+
</script>
21+
<!--
22+
<script>
23+
$(document).ready(function(){
24+
$.getJSON("http://ipinfo.io/?callback=?", function(data) {
25+
if (data.country=="CN") {
26+
$("#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>');
27+
} else $("#GeoResults").html('<iframe width=100% height=230px src="https://www.youtube.com/embed/wH5TUwzlaWI"></iframe>');
28+
});
2829
});
29-
});
30-
</script>
31-
32-
-->
30+
</script>
3331
34-
<link rel="stylesheet" href="https://www.odata.org/public/css/bootstrap.min.css"/>
35-
<link rel="stylesheet" href="{{'/public/css/site.css' | prepend: site.baseurl | prepend: site.url}}">
36-
<link rel="stylesheet" href="{{'/public/css/syntax.css' | prepend: site.baseurl | prepend: site.url}}">
37-
<link rel="stylesheet" href="{{'/public/css/autocomplete.css' | prepend: site.baseurl | prepend: site.url}}">
38-
<!--Below is for the adopters page-->
39-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/3.0.7/css/swiper.min.css">
40-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.0.0/magnific-popup.min.css">
41-
<!-- end -->
32+
-->
33+
34+
<link rel="stylesheet" href="https://www.odata.org/public/css/bootstrap.min.css" />
35+
<link rel="stylesheet" href="{{'/public/css/site.css' | prepend: site.baseurl | prepend: site.url}}">
36+
<link rel="stylesheet" href="{{'/public/css/syntax.css' | prepend: site.baseurl | prepend: site.url}}">
37+
<link rel="stylesheet" href="{{'/public/css/autocomplete.css' | prepend: site.baseurl | prepend: site.url}}">
38+
<!--Below is for the adopters page-->
39+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/3.0.7/css/swiper.min.css">
40+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.0.0/magnific-popup.min.css">
41+
<!-- end -->
4242
</head>

‎_includes/navbar.html

+18-42
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<p role="presentation">Skip to main content</p>
44
</a>
55
<nav class="navbar navbar-default" role="navigation" aria-label="Main Navigation">
6-
<div class="container container-fluid">
6+
<div class="container container-fluid" style="display: flex; align-items: center">
77
<div class="navbar-header">
8-
<ul class="nav navbar-nav">
9-
<li>
10-
<a class="brand" href="/">
11-
<img class="img-responsive"
12-
alt="OData logo"
13-
src="{{'/assets/OData-logo-e1393393068350.png' | prepend: site.baseurl | prepend: site.url}}">
14-
</a>
15-
</li>
16-
</ul>
8+
<a class="navbar-brand" href="/" style="font-size: 2rem">
9+
<div style="display: flex; align-items: center">
10+
<img class="img-responsive"
11+
alt="OData logo"
12+
width="30"
13+
style="padding-right: 1rem"
14+
src="{{'/assets/ODataLogo-96.png' | prepend: site.baseurl | prepend: site.url}}">
15+
OData
16+
</div>
17+
</a>
1718
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#odata-navbar-collapse">
1819
<span class="sr-only">Toggle navigation</span>
1920
<span class="icon-bar"></span>
@@ -22,11 +23,7 @@
2223
</button>
2324
</div>
2425

25-
<div class="collapse navbar-collapse" id="odata-navbar-collapse" role="navigation">
2626
<ul class="nav navbar-nav" role="menubar">
27-
<li role="none">
28-
<a role="menuitem" href="/blog">Blog</a>
29-
</li>
3027
<li class="dropdown" role="none">
3128
<a role="menuitem"
3229
aria-haspopup="true"
@@ -39,7 +36,7 @@
3936
</a>
4037
<ul class="dropdown-menu" role="menu" aria-label="Developers dropdown.">
4138
<li role="none">
42-
<a role="menuitem" href="/getting-started">Getting Started</a>
39+
<a role="menuitem" href="/get-started">Get Started</a>
4340
</li>
4441
<li role="none">
4542
<a role="menuitem" href="/documentation">Documentation</a>
@@ -56,42 +53,22 @@
5653
</ul>
5754
</li>
5855
<li class="dropdown" role="none">
59-
<a role="menuitem"
60-
aria-haspopup="true"
61-
aria-expanded="false"
62-
class="dropdown-toggle"
63-
data-toggle="dropdown"
64-
data-target="#"
65-
href="#">
66-
Tools <b class="caret"></b>
67-
</a>
68-
<ul class="dropdown-menu" role="menu" aria-label="Tools dropdown.">
69-
<li role="none">
70-
<a role="menuitem"
71-
href="https://marketplace.visualstudio.com/items?itemName=stansw.vscode-odata"
72-
target="_blank">
73-
OData for Visual Studio Code
74-
</a>
75-
</li>
76-
<li role="none">
77-
<a role="menuitem" href="https://pragmatiqa.com/xodata/" target="_blank">XOData</a>
78-
</li>
79-
</ul>
56+
<a role="menuitem" href="/tools">Tools</a>
8057
</li>
8158
<li role="none">
82-
<a role="menuitem" href="/ecosystem">Ecosystem</a>
59+
<a role="menuitem" href="/blog">Blog</a>
8360
</li>
8461
<li role="none">
85-
<a role="menuitem" href="/contribution">Getting Involved</a>
62+
<a role="menuitem" href="/ecosystem">Ecosystem</a>
8663
</li>
8764
</ul>
8865

89-
<form class="navbar-form navbar-left" role="search">
90-
<div class="form-group combobox combobox-list">
66+
<form class="navbar-form navbar-right search-bar" role="search" style="margin-left: auto">
67+
<div class="search-bar form-group combobox combobox-list">
9168
<input id="main-search-input"
9269
type="text"
9370
aria-label="Search"
94-
class="form-control st-default-search-input"
71+
class="search-bar-input form-control"
9572
placeholder="Search"
9673
role="combobox"
9774
aria-autocomplete="list"
@@ -107,6 +84,5 @@
10784
</div>
10885
</form>
10986
</div>
110-
</div>
11187
</nav>
11288
</div>

‎_includes/typing-animation.html

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<div>
2+
<p class="typing-animation">
3+
<span class="typewrite" data-period="2000" data-type='[ "company/divisions/$count", "company/employees?$select=firstName,lastName", "company?$expand=employees"]'>
4+
<span class="wrap"></span>
5+
</span>
6+
</p>
7+
8+
<script type="text/javascript">
9+
var TxtType = function (el, toRotate, period) {
10+
this.toRotate = toRotate;
11+
this.el = el;
12+
this.loopNum = 0;
13+
this.period = parseInt(period, 10) || 2000;
14+
this.txt = '';
15+
this.tick();
16+
this.isDeleting = false;
17+
};
18+
19+
TxtType.prototype.tick = function () {
20+
var i = this.loopNum % this.toRotate.length;
21+
var fullTxt = this.toRotate[i];
22+
23+
if (this.isDeleting) {
24+
this.txt = '';
25+
} else {
26+
this.txt = fullTxt.substring(0, this.txt.length + 1);
27+
}
28+
29+
this.el.innerHTML = '<span class="wrap">' + this.txt + '</span>';
30+
31+
var that = this;
32+
var delta = 200 - Math.random() * 100;
33+
34+
if (this.isDeleting) { delta /= 2; }
35+
36+
if (!this.isDeleting && this.txt === fullTxt) {
37+
delta = this.period;
38+
this.isDeleting = true;
39+
} else if (this.isDeleting && this.txt === '') {
40+
this.isDeleting = false;
41+
this.loopNum++;
42+
delta = 500;
43+
}
44+
45+
setTimeout(function () {
46+
that.tick();
47+
}, delta);
48+
};
49+
50+
window.onload = function () {
51+
var elements = document.getElementsByClassName('typewrite');
52+
for (var i = 0; i < elements.length; i++) {
53+
var toRotate = elements[i].getAttribute('data-type');
54+
var period = elements[i].getAttribute('data-period');
55+
if (toRotate) {
56+
new TxtType(elements[i], JSON.parse(toRotate), period);
57+
}
58+
}
59+
60+
};
61+
</script>
62+
</div>

‎_layouts/documentation-archived.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
layout: default
3+
---
4+
<div>
5+
<div class="container">
6+
<div class="page-header">
7+
<h1>{{ page.title }}</h1>
8+
</div>
9+
</div>
10+
<div class="banner upgrade">
11+
<div class="container">
12+
<h2>Upgrade Your OData: Version 4.0 Available!</h2>
13+
<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>
14+
<br />
15+
<a class="big-action"
16+
href="/documentation/">
17+
Latest OData Version
18+
</a>
19+
</div>
20+
</div>
21+
<div class="container">
22+
{{ content }}
23+
</div>
24+
</div>

‎_libraries/ASP-NET-Web-API-OData.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
category: net
33
name: ASP.NET Web API OData
4+
featured: true
45
rownumber: 40
56
link: https://learn.microsoft.com/en-us/odata/webapi/getting-started
67
version: V4

‎_libraries/Apache-Olingo.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
category: java
3-
name: Apache Olingo <span class="label label-success">featured</span>
3+
name: Apache Olingo
4+
featured: true
45
rownumber: 13
56
version: V2 and V4
67
object: Both

‎_libraries/Model-Builder.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
category: net
3+
name: Model Builder
4+
link: https://learn.microsoft.com/en-us/odata/webapi/model-builder-abstract
5+
version: V1
6+
object: Server
7+
downloads:
8+
- source: nugetgallery
9+
link: https://www.nuget.org/packages/Microsoft.OData.ModelBuilder
10+
---
11+
APIs to create an OData Edm (Entity Data Model) using C# types, attributes and conventions.

‎_libraries/OData-Client-for-NET.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
category: net
33
name: OData Client for .NET
4+
featured: true
45
rownumber: 28
56
link: https://odata.github.io/odata.net/#04-01-basic-crud-operations
67
version: V4

‎_libraries/ODataCpp-Client.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
category: cpp
3-
name: ODataCpp-Client <span class="label label-success">featured</span>
3+
name: ODataCpp-Client
4+
featured: true
45
version: V4
56
object: Client
67
downloads:

0 commit comments

Comments
 (0)