Merge pull request #51 from ODataOrg/revert-50-logo-usage

Revert "logo usage page"

_config.yml

@@ -6,14 +6,16 @@ description: > # this means to ignore newlines until "baseurl:"
   to allow the creation and consumption of queryable and interoperable RESTful APIs 
   in a simple and standard way.
 baseurl: "" # the subpath of your site, e.g. /blog/
-url: "http://localhost:4000/" # the base hostname & protocol for your site
+url: "http://odataorg.github.io" # the base hostname & protocol for your site
 twitter_username: odataorg
 github_username:  odataorg
 
 permalink: /blog/:title
 
-highlighter: rouge
+highlighter: pygments
 
 # Build settings
 markdown: kramdown
 
+gems:
+  - jekyll-sitemap

_includes/head.html

@@ -16,5 +16,8 @@
   <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/syntax.css">
-
+  <!--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>

_includes/navbar.html

@@ -10,49 +10,40 @@
                 <span class="icon-bar"></span>
       </button>
       <a class="brand" href="/">
-        <img class="img-responsive" src="/assets/odata-logo.png">
+        <img class="img-responsive" src="/assets/OData-logo-e1393393068350.png">
       </a>
     </div>
 
     <div class="collapse navbar-collapse" id="odata-navbar-collapse">
 
-      <form class="navbar-form navbar-left" role="search" style="float: right !important; padding-top : 3px;">
-        <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">
-          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">LEARN <b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="/getting-started/understand-odata-in-6-steps">Understanding</a></li>
-            <li><a href="/getting-started">Tutorial</a></li>
-            <li><a href="/FAQ">FAQ</a></li>
-          </ul>
-        </li>
+        <li><a href="/blog">Blog</a></li>
         <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">DEVELOP <b class="caret"></b></a>
+          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Developers <b class="caret"></b></a>
           <ul class="dropdown-menu">
+            <li><a href="/getting-started">Getting Started</a></li>
             <li><a href="/documentation">Documentation</a></li>
             <li><a href="/libraries">Libraries</a></li>
-            <li><a href="/odata-services">Sample Services</a></li>
-            <li><a href="/odata-icon-usage-guidelines/">Logo Usage</a></li>
+            <li><a href="/odata-services">Reference Services</a></li>
+            <li><a href="/odata-icon-usage-guidelines/">Icon Usage</a></li>
           </ul>
         </li>
         <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">TOOL <b class="caret"></b></a>
+          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Tools <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="//services.odata.org/validation/" target="_blank">OData Validator</a></li>
             <li><a href="//services.odata.org/ODataAPIExplorer/ODataAPIExplorer.html" target="_blank">OData API Explorer</a></li>
             <li><a href="//pragmatiqa.com/xodata/" target="_blank">XOData</a></li>
           </ul>
         </li>
-        <li><a href="/ecosystem">ECOSYSTEM</a></li>
-        <li><a href="/contribution">COMMUNITY</a></li>
+        <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>
 
@@ -61,9 +52,7 @@
 </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="/assets/forkmeongithub.png"></a>
-
-<!-- <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> -->
+<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>
 
 
 

_includes/odata-in-6-steps.html

@@ -1163,7 +1163,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>

_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 %}
 

pages/getting-started/advanced-tutorial.html

@@ -1,5 +1,5 @@
 ---
-layout: scrollspy
+layout: page
 title: Advanced Tutorial
 date: 2014-08-01 03:53:28.000000000 +08:00
 permalink: /getting-started/advanced-tutorial/

pages/getting-started/basic-tutorial.html

@@ -1,5 +1,5 @@
 ---
-layout: scrollspy
+layout: page
 title: Basic Tutorial
 date: 2014-08-01 03:44:56.000000000 +08:00
 permalink: /getting-started/basic-tutorial/

pages/libraries.html

@@ -217,6 +217,13 @@
         <td>Client</td>
         <td><a href="http://openui5.org/">openui5.org</a></td>
       </tr>
+      <tr>
+        <td>DevExtreme</td>
+        <td>DevExtreme is cross-platform HTML 5/JS tools for next-generation mobile and web development.</td>
+        <td>V1-V4</td>
+        <td>Both</td>
+        <td><a href="http://js.devexpress.com/">js.devexpress.com</a></td>
+      </tr>
     </table>
   </div>
   <div class="tab-pane table-responsive" id="cpp">
@@ -246,6 +253,13 @@
         <th width="10%">For server/client</th>
         <th width="10%">Download from</th>
       </tr>
+      <tr>
+        <td>OData4ObjC</td>
+        <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>
+        <td>V1-3</td>
+        <td>Client</td>
+        <td><a href="http://odata.github.io/OData4ObjC/">GitHub</a></td>
+      </tr>
       <tr>
         <td>ODataPy (Python)</td>
         <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

@@ -1,49 +1,14 @@
 ---
 layout: page
-title: Logo Usage
+title: OData Icon Usage Guidelines
 date: 2014-05-27 09:39:22.000000000 +08:00
 permalink: /odata-icon-usage-guidelines/
 ---
-<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>
-<div style="display: block; height: 350px;">
-	<div class="grid_1" style="display: inline;  float: left;  margin-left: 10px;  margin-right: 10px; height:340px">
-		<div data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:340px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-250.png" class="logo" style=" margin: 40px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">250x250</div>
-			<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>
-	<div class="grid_1" style="display: inline;  float: left;  margin-left: 10px;  margin-right: 10px;; height:340px">
-		<div data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:340px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-150.png" class="logo" style=" margin:75px 38px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">150x150</div>
-			<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>
-	<div class="grid_1" style="display: inline;  float: left;  margin-left: 10px;  margin-right: 10px;; height:340px">
-		<div data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:340px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-96.png" class="logo" style=" margin:100px 36px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">96x96</div>
-			<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>
-	<div class="grid_1" style="display: inline;  float: left;  margin-left: 10px;  margin-right: 10px;; height:340px">
-		<div data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:160px;margin-bottom:22px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-24.png" class="logo" style=" margin:58px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">24x24</div>
-			<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 data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:160px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-48.png" class="logo" style=" margin:40px 48px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">48x48</div>
-			<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>
-		<div class="grid_1" style="display: inline;  float: left;  margin-left: 10px;  margin-right: 10px;; height:340px">
-		<div data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:160px;margin-bottom:22px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-16.png" class="logo" style=" margin:58px 58px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">16x16</div>
-			<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 data-hover-class="hover-glyph" class="logo-container" style="  border-radius: 3px;  border: 1px solid #eceded;  position: relative; height:160px">
-			<img data-js-component-id="component3154740898228252780" src="/assets/ODataLogo-32.png" class="logo" style=" margin:50px 54px;">
-			<div class="subsection-highlight" style="position:absolute ; bottom: 10px; left: 10px">32x32</div>
-			<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>
-<!-- <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>  -->
+<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>
+<div align="center">
+<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>
 </div>
-<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>
+<p></p>
 <div>
 <span style="font-size: 18px;">The OData Icon represents all versions of the OData technical specification </span> as published by:</p>
 <ul>
@@ -68,7 +33,6 @@ <h4>Visual Guidelines:</h4>
 <li>The color version of the OData Icon must be used if possible; if not, a grayscale version may be used.</li>
 <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>
 <li>The OData Icon may not be used as a repeating pattern or background element.</li>
-<p style="text-align:left ;margin:10px 0 30px 0"><a href="" ><img src="/assets/dodont.png" height="250px"></p></a>
 </ul>
 <h4>Protecting the Value of the Mark</h4>
 <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

@@ -1,31 +1,3 @@
-body {
-    font-family: "Microsoft Yahei Light";
-    background-color:#FEF9F7;
-    font-size: 16px;
-    color: #6F6F6E;
-}
-
-.navbar-default {
-    background-color: #FFFFFF;
-    border-color: #ffffff;
-    border-radius: 0;
-    box-shadow: 0 3px 5px rgba(0,0,0,0.1); 
-}
-
-.navbar-default .navbar-nav>li>a {
-  color: #F18B1B;
-}
-
-.navbar-default .navbar-nav {
-  float: right;
-  width: 60% ;
-}
-
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: "Microsoft Yahei";
-}
-
-
 .step-buttons{
     font-size: 12px;
 }

public/css/site.css

@@ -1,49 +1,3 @@
-body {
-    font-family: "Microsoft Yahei Light";
-    background-color:#FEF9F7;
-    font-size: 16px;
-    color: #6F6F6E;
-}
-
-.navbar-default {
-    background-color: #FFFFFF;
-    border-color: #ffffff;
-    border-radius: 0;
-    box-shadow: 0 3px 5px rgba(0,0,0,0.1); 
-}
-
-.navbar-default .navbar-nav>li>a {
-  color: #F18B1B;
-}
-
-.navbar-default .navbar-nav {
-  float: right;
-  width: 60% ;
-}
-
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: "Microsoft Yahei";
-}
-
-h1, .h1 {
-  font-size: 34px;
-  color: #F18918;
-  font-family: "Microsoft Yahei light"!important;
-}
-
-h2, .h2 {
-  font-size: 28px;
-  color: #6F6F6E;
-  font-weight: 300;
-}
-
-h3, .h3 {
-  font-size: 24px;
-  color: #6F6F6E;
-  font-weight: 400;
-  text-align: center;
-}
-
 .theme-font{
   color: #dd4814;
 }

public/site.js

@@ -12,14 +12,17 @@ $(function () {
 
 
 $(document).ready(function(){
+  if ($(window).width() < 768) {
+    $('#fork-me-on-github').hide();
+  }
   // Window width change
   $( window ).resize(function() {
-      if ($(window).width() < 768) {
-        $('#fork-me-on-github').hide();
-      }
-      else{
-        $('#fork-me-on-github').show(); 
-      }
+    if ($(window).width() < 768) {
+      $('#fork-me-on-github').hide();
+    }
+    else{
+      $('#fork-me-on-github').show(); 
+    }
   });
 });