Skip to content

Commit 954970f

Browse files
juliapigjuliapig
committed
Update config
1 parent c02f32e commit 954970f

File tree

12 files changed

+137
-50
lines changed

12 files changed

+137
-50
lines changed

‎_config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ 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://odataorg.github.io" # the base hostname & protocol for your site
9+
url: "http://localhost:4000/" # the base hostname & protocol for your site
1010
twitter_username: odataorg
1111
github_username: odataorg
1212

1313
permalink: /blog/:title
1414

15-
highlighter: pygments
15+
highlighter: rouge
1616

1717
# Build settings
1818
markdown: kramdown
1919

20-
gems:
21-
- jekyll-sitemap

‎_includes/head.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@
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-
<!--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 -->
19+
2320
</head>

‎_includes/navbar.html

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,49 @@
1010
<span class="icon-bar"></span>
1111
</button>
1212
<a class="brand" href="/">
13-
<img class="img-responsive" src="/assets/OData-logo-e1393393068350.png">
13+
<img class="img-responsive" src="/assets/odata-logo.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+
1925
<ul class="nav navbar-nav">
20-
<li><a href="/blog">Blog</a></li>
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>
2135
<li class="dropdown">
22-
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Developers <b class="caret"></b></a>
36+
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">DEVELOP <b class="caret"></b></a>
2337
<ul class="dropdown-menu">
24-
<li><a href="/getting-started">Getting Started</a></li>
2538
<li><a href="/documentation">Documentation</a></li>
2639
<li><a href="/libraries">Libraries</a></li>
27-
<li><a href="/odata-services">Reference Services</a></li>
28-
<li><a href="/odata-icon-usage-guidelines/">Icon Usage</a></li>
40+
<li><a href="/odata-services">Sample Services</a></li>
41+
<li><a href="/odata-icon-usage-guidelines/">Logo Usage</a></li>
2942
</ul>
3043
</li>
3144
<li class="dropdown">
32-
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Tools <b class="caret"></b></a>
45+
<a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">TOOL <b class="caret"></b></a>
3346
<ul class="dropdown-menu">
3447
<li><a href="//services.odata.org/validation/" target="_blank">OData Validator</a></li>
3548
<li><a href="//services.odata.org/ODataAPIExplorer/ODataAPIExplorer.html" target="_blank">OData API Explorer</a></li>
3649
<li><a href="//pragmatiqa.com/xodata/" target="_blank">XOData</a></li>
3750
</ul>
3851
</li>
39-
<li><a href="/ecosystem">Ecosystem</a></li>
40-
<li><a href="/contribution">Getting Involved</a></li>
52+
<li><a href="/ecosystem">ECOSYSTEM</a></li>
53+
<li><a href="/contribution">COMMUNITY</a></li>
4154
</ul>
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>
55+
4756

4857
</div>
4958

@@ -52,7 +61,9 @@
5261
</nav>
5362

5463
<!-- Fork me on GitHub ribbon -->
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>
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> -->
5667

5768

5869

‎_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 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 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>
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="nav">
6+
<body data-spy="scroll" data-target=".toc">
77

88
{% include navbar.html %}
99

‎_layouts/scrollspy.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
{% include head.html %}
5+
6+
<body data-spy="scroll" data-target="nav">
7+
8+
{% include navbar.html %}
9+
10+
<div class="container">
11+
<div class="page-header">
12+
<h1>{{ page.title }}</h1>
13+
</div>
14+
{{ content }}
15+
</div>
16+
17+
<script src="//code.jquery.com/jquery-2.1.0.min.js"></script>
18+
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
19+
<script src="/public/site.js"></script>
20+
</body>
21+
22+
{% include footer.html %}
23+
24+
</html>

‎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: page
2+
layout: scrollspy
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: page
2+
layout: scrollspy
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: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,6 @@
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>
227220
</table>
228221
</div>
229222
<div class="tab-pane table-responsive" id="cpp">
@@ -253,13 +246,6 @@
253246
<th width="10%">For server/client</th>
254247
<th width="10%">Download from</th>
255248
</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>
263249
<tr>
264250
<td>ODataPy (Python)</td>
265251
<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>

‎public/css/home.css

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
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+
129
.step-buttons{
230
font-size: 12px;
331
}

0 commit comments

Comments
 (0)