juliapig · juliapig · May 22, 2015 · May 25, 2015 · May 27, 2015 · Jun 1, 2015
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,6 +1,6 @@
 <footer class="content-info" role="contentinfo">
 
-<div class="container">
+<div class="container" style=" text-align: center;font-size:14px;">
   <p>&copy; 2015 OData – The Protocol for REST APIs </p>
 </div>
 

diff --git a/_includes/head.html b/_includes/head.html
@@ -15,6 +15,7 @@
 
   <link rel="stylesheet" href="https://bootswatch.com/united/bootstrap.min.css"/>
   <link rel="stylesheet" href="/public/css/site.css">
+  <link rel="stylesheet" href="/public/css/home.css">
   <link rel="stylesheet" href="/public/css/syntax.css">
 
 </head>
diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -3,19 +3,24 @@
   <div class="container container-fluid">
 
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#odata-navbar-collapse">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#odata-navbar-collapse"    style="border-color: transparent; 
+    background-color: #F18B1B;">
                 <span class="sr-only">Toggle navigation</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
       </button>
       <a class="brand" href="/">
-        <img class="img-responsive" src="/assets/OData-logo-e1393393068350.png">
+        <img src="/assets/odata-logo.png">
       </a>
     </div>
 
-    <div class="collapse navbar-collapse" id="odata-navbar-collapse">
-
+    <div class="collapse navbar-collapse" id="odata-navbar-collapse" style="border-color:transparent; color: #333333;">
+      <form class="navbar-form navbar-left" role="search" style="border-color:transparent; float: right!important;">
+        <div class="form-group">
+          <input type="text" class="form-control st-default-search-input" placeholder="Search">
+        </div>
+      </form>
       <ul class="nav navbar-nav">
         <li><a href="/blog">Blog</a></li>
         <li class="dropdown">
@@ -39,20 +44,14 @@
         <li><a href="/ecosystem">Ecosystem</a></li>
         <li><a href="/contribution">Getting Involved</a></li>
       </ul>
-      <form class="navbar-form navbar-left" role="search">
-        <div class="form-group">
-          <input type="text" class="form-control st-default-search-input" placeholder="Search">
-        </div>
-      </form>
+
 
     </div>
 
   </div> 
-
 </nav>
 
-<!-- Fork me on GitHub ribbon -->
-<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>
-
 
+<!-- Fork me on GitHub ribbon -->
+<a id="fork-me-on-github" href="https://github.com/odataorg/odataorg.github.io"><img style="position: absolute; top: 0; right: 0; border: 0;z-index: 9999;" src="/assets/forkmeongithub.png" alt="Fork me on GitHub"></a>
 
diff --git a/_includes/odata-in-6-steps.html b/_includes/odata-in-6-steps.html
@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="{{site.url}}/public/css/home.css">
-
 <div class="modal fade" id="step-collection-modal" tabindex="-1" role="dialog" aria-labelledby="step-collection-modal-label" aria-hidden="true">
 <div class="modal-dialog modal-lg">
 <div class="modal-content">
@@ -1163,7 +1161,7 @@ <h4>Contribute to "Understanding OData in 6 steps"</h4>
 <div class="bottom-border side-padding">
 <h3 class="top-margin bottom-margin text-center">Step 6: Invoking a function
         </h3>
-<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>
+<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>
 <div class="code-row bottom-margin">
 <ul class="nav nav-tabs" role="tablist">
 <li role="presentation" class="active"><a href="#http6" aria-controls="http6" role="tab" data-toggle="tab">HTTP request</a></li>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -3,7 +3,7 @@
 
   {% include head.html %}
 
-  <body data-spy="scroll" data-target=".toc">
+  <body data-spy="scroll" data-target="nav">
 
     {% include navbar.html %}
 

diff --git a/_layouts/scrollspy.html b/_layouts/scrollspy.html
diff --git a/_posts/2015-5-25-new-odata-org.md b/_posts/2015-5-25-new-odata-org.md
@@ -0,0 +1,70 @@
+---
+layout: post
+title: "OData.org Update"
+date: 2015-05-25
+author: Qian Li
+---
+
+# Introduction
+
+OData.org is the community website for OData lovers. We have re-factored the site on **2015-5-15** for better **user experience**, better **performance** and easier **contribution flow**. Our previous architecture is WordPress + Windows Azure and the new architecture is **Jekyll + GitHub + Windows Azure**. Jekyll and GitHub are open-source solutions which benefit a lot from community contribution and are popular in the industry (just like the way we want to build the OData community :smiley:). 
+
+# Audiences for OData.org
+
+The website is built with the following target audiences in mind:
+
+- Developers who seek technologies to build good RESTful APIs
+- Business decision makers who investigate solutions to empower their products
+- RESTful API advocators
+
+# What we are working on
+
+OData.org is very important for OData community. We have been working hard on improving both the contents and performance of the site and we will continually improving it according to your feedback. Below are current content structure of OData.org, and for future plans, please check [issues on GitHub](https://github.com/odataorg/odataorg.github.io/issues)
+
+
+#### [Blog](http://www.odata.org/blog)
+Posts including subjects (but not limited) below, and except for site announcements, most posts are written by contributors.
+
+- Site announcement
+- Library introduction and tutorials
+- Discussion and learnings about OData protocol
+- Case study
+- Industry success stories
+- OData ecosystem
+- Tools of OData
+- ...
+
+#### [Getting Started (for developers)](http://www.odata.org/getting-started)
+OData has specifications that cover almost every aspect of a RESTful API. But for starters, you don't need to go through all the details of OData specifications. In this part, we provide various tutorials for developers of OData.
+
+#### [Documentation](http://www.odata.org/documentation)
+OData protocol specification. Including the latest OASIS standardized OData Version 4.0 as well as OData Version 3.0 and OData Version 2.0.
+
+#### [Libraries](http://www.odata.org/libraries)
+Matrix of OData libraries of  different platforms (.Net, JAVA, JavaScript, C++, Python, Ruby and etc.) for server and client. You are warmly welcomed to add your OData libraries here.
+
+#### [Reference Services](http://www.odata.org/odata-services)
+Services built to demonstrate the features of OData.
+
+#### Tools
+Tools that can help you better understand OData services
+
+#### [Ecosystem](http://www.odata.org/ecosystem)
+Consumers, providers and use cases of OData in the industry. We will improve the page with better UI experience and more up-to-date contents.
+
+#### [Getting Involved](http://www.odata.org/contribution) 
+Guidelines of how to getting involved in the OData community.
+
+#### Search
+Improved the search functionality in the navigation menu with full-text search.
+
+**Besides above, we are actively working on producing more contents for business decision makers and RESTfu API advocators and better organize contents for developers. Please let us know if you have any ideas.**
+
+# [Call to action](http://www.odata.org/contribution)
+
+### Provide feedback
+As always, your feedback to OData.org is warmly welcomed. Please let us know your feedback either email to our mailing list or [create issues](https://github.com/odataorg/odataorg.github.io/issues) directly.
+
+### Contribute directly
+All the code for OData.org is open-sources on GitHub and it's very easy for you to contribute directly to [OData.org Repository](https://github.com/odataorg/odataorg.github.io).
+
diff --git a/assets/customer (1).png b/assets/customer (1).png
diff --git a/assets/customer (2).png b/assets/customer (2).png
diff --git a/assets/customer (3).png b/assets/customer (3).png
diff --git a/assets/customer (4).png b/assets/customer (4).png
diff --git a/assets/customer (5).png b/assets/customer (5).png
diff --git a/assets/customer (6).png b/assets/customer (6).png
diff --git a/assets/forkmeongithub.png b/assets/forkmeongithub.png
diff --git a/assets/getinvolved (1).png b/assets/getinvolved (1).png
diff --git a/assets/getinvolved (2).png b/assets/getinvolved (2).png
diff --git a/assets/getinvolved (3).png b/assets/getinvolved (3).png
diff --git a/assets/getinvolved (4).png b/assets/getinvolved (4).png
diff --git a/assets/home (1).png b/assets/home (1).png
diff --git a/assets/home (2).png b/assets/home (2).png
diff --git a/assets/home (3).png b/assets/home (3).png
diff --git a/assets/home (4).png b/assets/home (4).png
diff --git a/assets/howtouse-01.png b/assets/howtouse-01.png
diff --git a/assets/howtouse-02.png b/assets/howtouse-02.png
diff --git a/assets/howtouse-03.png b/assets/howtouse-03.png
diff --git a/assets/howtouse-04.png b/assets/howtouse-04.png
diff --git a/assets/howtouse-05.png b/assets/howtouse-05.png
diff --git a/assets/odata-logo.png b/assets/odata-logo.png
diff --git a/assets/pic1.jpg b/assets/pic1.jpg
diff --git a/assets/pic2.jpg b/assets/pic2.jpg
diff --git a/assets/pic2.psd b/assets/pic2.psd
diff --git a/assets/pic3.jpg b/assets/pic3.jpg
diff --git a/assets/pic4.jpg b/assets/pic4.jpg