Skip to content

Revert "Website redesign" #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ _site
_config.yml
.jekyll-cache
.vs/
.vscode/.jekyll-metadata
.vscode/
4 changes: 1 addition & 3 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,8 +19,6 @@ collections:
tutorials:
output: true
permalink: /tutorials/:title/
tools:
output: true

permalink: /blog/:title/

Expand Down
4 changes: 0 additions & 4 deletions _data/ecosys-submissions.csv

This file was deleted.

44 changes: 2 additions & 42 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,7 @@
<footer class="content-info" role="contentinfo">

<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 class="container" style=" text-align: center" aria-label="content-info">
<p>&copy; 2015-{{ 'now' | date: "%Y" }} OData – The Protocol for REST APIs </p>
</div>

</footer>
70 changes: 35 additions & 35 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -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>
60 changes: 42 additions & 18 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
<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" style="display: flex; align-items: center">
<div class="container container-fluid">
<div class="navbar-header">
<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>
<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>
<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>
Expand All @@ -23,7 +22,11 @@
</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"
Expand All @@ -36,7 +39,7 @@
</a>
<ul class="dropdown-menu" role="menu" aria-label="Developers dropdown.">
<li role="none">
<a role="menuitem" href="/get-started">Get Started</a>
<a role="menuitem" href="/getting-started">Getting Started</a>
</li>
<li role="none">
<a role="menuitem" href="/documentation">Documentation</a>
Expand All @@ -53,22 +56,42 @@
</ul>
</li>
<li class="dropdown" role="none">
<a role="menuitem" href="/tools">Tools</a>
<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>
</li>
<li role="none">
<a role="menuitem" href="/blog">Blog</a>
<a role="menuitem" href="/ecosystem">Ecosystem</a>
</li>
<li role="none">
<a role="menuitem" href="/ecosystem">Ecosystem</a>
<a role="menuitem" href="/contribution">Getting Involved</a>
</li>
</ul>

<form class="navbar-form navbar-right search-bar" role="search" style="margin-left: auto">
<div class="search-bar form-group combobox combobox-list">
<form class="navbar-form navbar-left" role="search">
<div class="form-group combobox combobox-list">
<input id="main-search-input"
type="text"
aria-label="Search"
class="search-bar-input form-control"
class="form-control st-default-search-input"
placeholder="Search"
role="combobox"
aria-autocomplete="list"
Expand All @@ -84,5 +107,6 @@
</div>
</form>
</div>
</div>
</nav>
</div>
62 changes: 0 additions & 62 deletions _includes/typing-animation.html

This file was deleted.

24 changes: 0 additions & 24 deletions _layouts/documentation-archived.html

This file was deleted.

1 change: 0 additions & 1 deletion _libraries/ASP-NET-Web-API-OData.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
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
Expand Down
3 changes: 1 addition & 2 deletions _libraries/Apache-Olingo.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
category: java
name: Apache Olingo
featured: true
name: Apache Olingo <span class="label label-success">featured</span>
rownumber: 13
version: V2 and V4
object: Both
Expand Down
11 changes: 0 additions & 11 deletions _libraries/Model-Builder.md

This file was deleted.

1 change: 0 additions & 1 deletion _libraries/OData-Client-for-NET.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
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
Expand Down
3 changes: 1 addition & 2 deletions _libraries/ODataCpp-Client.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
category: cpp
name: ODataCpp-Client
featured: true
name: ODataCpp-Client <span class="label label-success">featured</span>
version: V4
object: Client
downloads:
Expand Down
Loading