Skip to content

Commit c7e5d55

Browse files
dingeinsdingeins
committed
Merge pull request #51 from ODataOrg/revert-50-logo-usage
Revert "logo usage page"
2 parents e5a720c + 3939b1b commit c7e5d55

13 files changed

+55
-178
lines changed

‎_config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ description: > # this means to ignore newlines until "baseurl:"
66
to allow the creation and consumption of queryable and interoperable RESTful APIs
77
in a simple and standard way.
88
baseurl: "" # the subpath of your site, e.g. /blog/
9-
url: "http://localhost:4000/" # the base hostname & protocol for your site
9+
url: "http://odataorg.github.io" # the base hostname & protocol for your site
1010
twitter_username: odataorg
1111
github_username: odataorg
1212

1313
permalink: /blog/:title
1414

15-
highlighter: rouge
15+
highlighter: pygments
1616

1717
# Build settings
1818
markdown: kramdown
1919

20+
gems:
21+
- jekyll-sitemap

‎_includes/head.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
<link rel="stylesheet" href="https://bootswatch.com/united/bootstrap.min.css"/>
1717
<link rel="stylesheet" href="/public/css/site.css">
1818
<link rel="stylesheet" href="/public/css/syntax.css">
19-
19+
<!--Below is for the adopters page-->
20+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/3.0.7/css/swiper.min.css">
21+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.0.0/magnific-popup.min.css">
22+
<!-- end -->
2023
</head>

‎_includes/navbar.html

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,40 @@
1010
<span class="icon-bar"></span>
1111
</button>
1212
<a class="brand" href="/">
13-
<img class="img-responsive" src="/assets/odata-logo.png">
13+
<img class="img-responsive" src="/assets/OData-logo-e1393393068350.png">
1414
</a>
1515
</div>
1616

1717
<div class="collapse navbar-collapse" id="odata-navbar-collapse">
1818

19-
<form class="navbar-form navbar-left" role="search" style="float: right !important; padding-top : 3px;">
20-
<div class="form-group">
21-
<input type="text" class="form-control st-default-search-input" placeholder="Search" >
22-
</div>
23-
</form>
24-
2519
<ul class="nav navbar-nav">
26-
<li><a href="/blog">BLOG</a></li>
27-
<li class="dropdown">
28-
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">LEARN <b class="caret"></b></a>
29-
<ul class="dropdown-menu">
30-
<li><a href="/getting-started/understand-odata-in-6-steps">Understanding</a></li>
31-
<li><a href="/getting-started">Tutorial</a></li>
32-
<li><a href="/FAQ">FAQ</a></li>
33-
</ul>
34-
</li>
20+
<li><a href="/blog">Blog</a></li>
3521
<li class="dropdown">
36-
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">DEVELOP <b class="caret"></b></a>
22+
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Developers <b class="caret"></b></a>
3723
<ul class="dropdown-menu">
24+
<li><a href="/getting-started">Getting Started</a></li>
3825
<li><a href="/documentation">Documentation</a></li>
3926
<li><a href="/libraries">Libraries</a></li>
40-
<li><a href="/odata-services">Sample Services</a></li>
41-
<li><a href="/odata-icon-usage-guidelines/">Logo Usage</a></li>
27+
<li><a href="/odata-services">Reference Services</a></li>
28+
<li><a href="/odata-icon-usage-guidelines/">Icon Usage</a></li>
4229
</ul>
4330
</li>
4431
<li class="dropdown">
45-
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">TOOL <b class="caret"></b></a>
32+
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Tools <b class="caret"></b></a>
4633
<ul class="dropdown-menu">
4734
<li><a href="//services.odata.org/validation/" target="_blank">OData Validator</a></li>
4835
<li><a href="//services.odata.org/ODataAPIExplorer/ODataAPIExplorer.html" target="_blank">OData API Explorer</a></li>
4936
<li><a href="//pragmatiqa.com/xodata/" target="_blank">XOData</a></li>
5037
</ul>
5138
</li>
52-
<li><a href="/ecosystem">ECOSYSTEM</a></li>
53-
<li><a href="/contribution">COMMUNITY</a></li>
39+
<li><a href="/ecosystem">Ecosystem</a></li>
40+
<li><a href="/contribution">Getting Involved</a></li>
5441
</ul>
55-
42+
<form class="navbar-form navbar-left" role="search">
43+
<div class="form-group">
44+
<input type="text" class="form-control st-default-search-input" placeholder="Search">
45+
</div>
46+
</form>
5647

5748
</div>
5849

@@ -61,9 +52,7 @@
6152
</nav>
6253

6354
<!-- Fork me on GitHub ribbon -->
64-
<a id="fork-me-on-github" href="https://github.com/odataorg/odataorg.github.io"><img style="position: absolute; top: 0; right: 0; border: 0;" src="/assets/forkmeongithub.png"></a>
65-
66-
<!-- <a id="fork-me-on-github" href="https://github.com/odataorg/odataorg.github.io"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"></a> -->
55+
<a id="fork-me-on-github" href="https://github.com/odataorg/odataorg.github.io"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/52760788cde945287fbb584134c4cbc2bc36f904/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f77686974655f6666666666662e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"></a>
6756

6857

6958

‎_includes/odata-in-6-steps.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ <h4>Contribute to "Understanding OData in 6 steps"</h4>
11631163
<div class="bottom-border side-padding">
11641164
<h3 class="top-margin bottom-margin text-center">Step 6: Invoking a function
11651165
</h3>
1166-
<p class="text-justify bottom-margin">In RESTful APIs, there can be some custom operations that contain complicated logic and can be frequently used. For that purpose, OData supports defining functions and actions to represent such operations. They are also resources themselves and can be bound to existing resources. After having explored the TripPin OData service, Russell finds out that the it has a function called GetInvolvedPeople from which he can find out the involved people of a specific trip. He invokes the function to find out who else other than him and Lewis goes to that trip in the U.S.</p>
1166+
<p class="text-justify bottom-margin">In RESTful APIs, there can be some custom operations that contain complicated logic and can be frequently used. For that purpose, OData supports defining functions and actions to represent such operations. They are also resources themselves and can be bound to existing resources. After having explored the TripPin OData service, Russell finds out that it has a function called GetInvolvedPeople from which he can find out the involved people of a specific trip. He invokes the function to find out who else other than him and Lewis goes to that trip in the U.S.</p>
11671167
<div class="code-row bottom-margin">
11681168
<ul class="nav nav-tabs" role="tablist">
11691169
<li role="presentation" class="active"><a href="#http6" aria-controls="http6" role="tab" data-toggle="tab">HTTP request</a></li>

‎_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% include head.html %}
55

6-
<body data-spy="scroll" data-target=".toc">
6+
<body data-spy="scroll" data-target="nav">
77

88
{% include navbar.html %}
99

‎_layouts/scrollspy.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎pages/getting-started/advanced-tutorial.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: scrollspy
2+
layout: page
33
title: Advanced Tutorial
44
date: 2014-08-01 03:53:28.000000000 +08:00
55
permalink: /getting-started/advanced-tutorial/

‎pages/getting-started/basic-tutorial.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: scrollspy
2+
layout: page
33
title: Basic Tutorial
44
date: 2014-08-01 03:44:56.000000000 +08:00
55
permalink: /getting-started/basic-tutorial/

‎pages/libraries.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,13 @@
217217
<td>Client</td>
218218
<td><a href="http://openui5.org/">openui5.org</a></td>
219219
</tr>
220+
<tr>
221+
<td>DevExtreme</td>
222+
<td>DevExtreme is cross-platform HTML 5/JS tools for next-generation mobile and web development.</td>
223+
<td>V1-V4</td>
224+
<td>Both</td>
225+
<td><a href="http://js.devexpress.com/">js.devexpress.com</a></td>
226+
</tr>
220227
</table>
221228
</div>
222229
<div class="tab-pane table-responsive" id="cpp">
@@ -246,6 +253,13 @@
246253
<th width="10%">For server/client</th>
247254
<th width="10%">Download from</th>
248255
</tr>
256+
<tr>
257+
<td>OData4ObjC</td>
258+
<td>This library makes it easy for iOS app developers to interact with data in any OData-compliant web service. It supports metadata-aware client-side code generation and full CRUD with query. If someone exposes a data model via OData, OData4ObjC makes it easy to get that model onto your iOS device.</td>
259+
<td>V1-3</td>
260+
<td>Client</td>
261+
<td><a href="http://odata.github.io/OData4ObjC/">GitHub</a></td>
262+
</tr>
249263
<tr>
250264
<td>ODataPy (Python)</td>
251265
<td>ODataPy is an open-source <b>Python</b> library that implements the Open Data Protocol (OData). It supports the OData protocol version 4.0. It is built on top of ODataCpp using language binding. It is under development and currently serves only parts of client and client side proxy generation (code gen) aspects of OData.</td>

‎pages/odata-icon-usage-guidelines.html

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
11
---
22
layout: page
3-
title: Logo Usage
3+
title: OData Icon Usage Guidelines
44
date: 2014-05-27 09:39:22.000000000 +08:00
55
permalink: /odata-icon-usage-guidelines/
66
---
7-
<p>These logo usage guidelines will help you determine the best way to use our logo. Click the <img src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" > to download any individual version. </p>
8-
<div style="display: block; height: 350px;">
9-
<div class="grid_1" style="display: inline; float: left; margin-left: 10px; margin-right: 10px; height:340px">
10-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:340px">
11-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-250.png" class="logo" style=" margin: 40px;">
12-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">250x250</div>
13-
<a href="http://www.odata.org/assets/ODataLogo-250.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div></div>
14-
<div class="grid_1" style="display: inline; float: left; margin-left: 10px; margin-right: 10px;; height:340px">
15-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:340px">
16-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-150.png" class="logo" style=" margin:75px 38px;">
17-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">150x150</div>
18-
<a href="http://www.odata.org/assets/ODataLogo-150.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div></div>
19-
<div class="grid_1" style="display: inline; float: left; margin-left: 10px; margin-right: 10px;; height:340px">
20-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:340px">
21-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-96.png" class="logo" style=" margin:100px 36px;">
22-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">96x96</div>
23-
<a href="http://www.odata.org/assets/ODataLogo-96.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div></div>
24-
<div class="grid_1" style="display: inline; float: left; margin-left: 10px; margin-right: 10px;; height:340px">
25-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:160px;margin-bottom:22px">
26-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-24.png" class="logo" style=" margin:58px;">
27-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">24x24</div>
28-
<a href="http://www.odata.org/assets/ODataLogo-96.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div>
29-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:160px">
30-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-48.png" class="logo" style=" margin:40px 48px;">
31-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">48x48</div>
32-
<a href="http://www.odata.org/assets/ODataLogo-96.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div>
33-
</div>
34-
<div class="grid_1" style="display: inline; float: left; margin-left: 10px; margin-right: 10px;; height:340px">
35-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:160px;margin-bottom:22px">
36-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-16.png" class="logo" style=" margin:58px 58px;">
37-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">16x16</div>
38-
<a href="http://www.odata.org/assets/ODataLogo-96.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div>
39-
<div data-hover-class="hover-glyph" class="logo-container" style=" border-radius: 3px; border: 1px solid #eceded; position: relative; height:160px">
40-
<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-32.png" class="logo" style=" margin:50px 54px;">
41-
<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">32x32</div>
42-
<a href="http://www.odata.org/assets/ODataLogo-96.png" class="dl-link" style="position:absolute ; bottom: 5px; right: 5px"><img data-js-component-id="component327059555825528542" src="https://cf.dropboxstatic.com/static/images/brand/link-vflcPjU1_.png" data-hi-res="https://cf.dropboxstatic.com/static/images/brand/[email protected]" style="margin-bottom: 10px; margin-right: 10px;"></a></div>
43-
</div>
44-
<!-- <a href="/assets/ODataLogo-96.png"><img class="alignnone size-full wp-image-12008" src="/assets/ODataLogo-96.png" alt="ODataLogo-96" width="97" height="96" /></a> -->
7+
<p>You may download the OData icon (“OData Icon”) pictured below and may use it to identify conforming implementations of the OData specification in accordance with these guidelines. Or you can directly download the zip file <a href="/assets/OData-Icons.zip">OData Icons</a> which contains OData Icons of different sizes.</p>
8+
<div align="center">
9+
<a href="/assets/ODataLogo-96.png"><img class="alignnone size-full wp-image-12008" src="/assets/ODataLogo-96.png" alt="ODataLogo-96" width="97" height="96" /></a>
4510
</div>
46-
<p style="text-align:right ; margin-right: 30px"><a href="/assets/OData-Icons.zip" ><img src="/assets/downloadall.png" height="20px"> <u>Download all</u></a></p>
11+
<p></p>
4712
<div>
4813
<span style="font-size: 18px;">The OData Icon represents all versions of the OData technical specification </span> as published by:</p>
4914
<ul>
@@ -68,7 +33,6 @@ <h4>Visual Guidelines:</h4>
6833
<li>The color version of the OData Icon must be used if possible; if not, a grayscale version may be used.</li>
6934
<li>The OData Icon must be used in its original 1:1 aspect ratio and may not be rotated, inverted, animated, or otherwise distorted.</li>
7035
<li>The OData Icon may not be used as a repeating pattern or background element.</li>
71-
<p style="text-align:left ;margin:10px 0 30px 0"><a href="" ><img src="/assets/dodont.png" height="250px"></p></a>
7236
</ul>
7337
<h4>Protecting the Value of the Mark</h4>
7438
<p>You agree to correct promptly any improper use of the OData Icon. Any party authorized to enforce the mark may take action against any use that does not conform to these guidelines or that violates applicable law.</p>

‎public/css/home.css

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
body {
2-
font-family: "Microsoft Yahei Light";
3-
background-color:#FEF9F7;
4-
font-size: 16px;
5-
color: #6F6F6E;
6-
}
7-
8-
.navbar-default {
9-
background-color: #FFFFFF;
10-
border-color: #ffffff;
11-
border-radius: 0;
12-
box-shadow: 0 3px 5px rgba(0,0,0,0.1);
13-
}
14-
15-
.navbar-default .navbar-nav>li>a {
16-
color: #F18B1B;
17-
}
18-
19-
.navbar-default .navbar-nav {
20-
float: right;
21-
width: 60% ;
22-
}
23-
24-
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
25-
font-family: "Microsoft Yahei";
26-
}
27-
28-
291
.step-buttons{
302
font-size: 12px;
313
}

‎public/css/site.css

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,3 @@
1-
body {
2-
font-family: "Microsoft Yahei Light";
3-
background-color:#FEF9F7;
4-
font-size: 16px;
5-
color: #6F6F6E;
6-
}
7-
8-
.navbar-default {
9-
background-color: #FFFFFF;
10-
border-color: #ffffff;
11-
border-radius: 0;
12-
box-shadow: 0 3px 5px rgba(0,0,0,0.1);
13-
}
14-
15-
.navbar-default .navbar-nav>li>a {
16-
color: #F18B1B;
17-
}
18-
19-
.navbar-default .navbar-nav {
20-
float: right;
21-
width: 60% ;
22-
}
23-
24-
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
25-
font-family: "Microsoft Yahei";
26-
}
27-
28-
h1, .h1 {
29-
font-size: 34px;
30-
color: #F18918;
31-
font-family: "Microsoft Yahei light"!important;
32-
}
33-
34-
h2, .h2 {
35-
font-size: 28px;
36-
color: #6F6F6E;
37-
font-weight: 300;
38-
}
39-
40-
h3, .h3 {
41-
font-size: 24px;
42-
color: #6F6F6E;
43-
font-weight: 400;
44-
text-align: center;
45-
}
46-
471
.theme-font{
482
color: #dd4814;
493
}

‎public/site.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ $(function () {
1212

1313

1414
$(document).ready(function(){
15+
if ($(window).width() < 768) {
16+
$('#fork-me-on-github').hide();
17+
}
1518
// Window width change
1619
$( window ).resize(function() {
17-
if ($(window).width() < 768) {
18-
$('#fork-me-on-github').hide();
19-
}
20-
else{
21-
$('#fork-me-on-github').show();
22-
}
20+
if ($(window).width() < 768) {
21+
$('#fork-me-on-github').hide();
22+
}
23+
else{
24+
$('#fork-me-on-github').show();
25+
}
2326
});
2427
});
2528

0 commit comments

Comments
 (0)