Fix contribution page & put footer center

_includes/footer.html

@@ -1,6 +1,6 @@
 <footer class="content-info" role="contentinfo">
 
-<div class="container">
+<div class="container" style=" text-align: center">
   <p>&copy; 2015 OData – The Protocol for REST APIs </p>
 </div>
 

_includes/navbar.html

@@ -10,38 +10,45 @@
                 <span class="icon-bar"></span>
       </button>
       <a class="brand" href="/">
-        <img class="img-responsive" src="/assets/OData-logo-e1393393068350.png">
+        <img class="img-responsive" src="/assets/odata-logo.png">
       </a>
     </div>
 
     <div class="collapse navbar-collapse" id="odata-navbar-collapse">
 
       <ul class="nav navbar-nav">
-        <li><a href="/blog">Blog</a></li>
+        <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 class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Developers <b class="caret"></b></a>
+          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">DEVELOP <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">Reference Services</a></li>
-            <li><a href="/odata-icon-usage-guidelines/">Icon Usage</a></li>
+            <li><a href="/odata-services">Sample Services</a></li>
+            <li><a href="/odata-icon-usage-guidelines/">Logo Usage</a></li>
           </ul>
         </li>
         <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">Tools <b class="caret"></b></a>
+          <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">TOOL <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">Getting Involved</a></li>
+        <li><a href="/ecosystem">ECOSYSTEM</a></li>
+        <li><a href="/contribution">COMMUNITY</a></li>
       </ul>
-      <form class="navbar-form navbar-left" role="search">
+      <form class="navbar-form navbar-left" role="search" style="float: right !important;">
         <div class="form-group">
-          <input type="text" class="form-control st-default-search-input" placeholder="Search">
+          <input type="text" class="form-control st-default-search-input" placeholder="Search" >
         </div>
       </form>
 
@@ -52,7 +59,9 @@
 </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>
+<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> -->
 
 
 

pages/contribution.html

@@ -1,45 +1,46 @@
 ---
 layout: page
-title: Getting Involved
+title: Community
 permalink: /contribution/
 ---
 
-<div class="row">
-<h1 class="text-center">Contribute to OData.org</h1>
 
-<div class="col-md-2">
-	<a href="https://github.com/ODataOrg/odataorg.github.io"><img src="/assets/Octocat.png" alt="OData.org on GitHub" height="166px" width="200px"></a>
-</div>
-
-<div class="col-md-1"></div>
-
-<div class="col-md-9">
-	<p><strong>Post blogs: </strong>Blogs on OData.org are for OData lovers to share their experiances of OData. If you want to promote your work (related with OData), as long as it's not overt-selling , send a pull request following the <a href="https://github.com/ODataOrg/odataorg.github.io" target="_blank">contribution guidelines</a>. After a light review process, we will publish your blog.</p>
+<h1 class="text-center" >Contribute to OData.org</h1>
+<div class="row" style="height:210px ; text-align:center">
 
-	<p><strong>Other improvements: </strong>OData.org is always open to any kind of contribution, including adding contents to <strong>Ecosystem</strong> and <strong>Libraries</strong>. Please visit <a href="https://github.com/ODataOrg/odataorg.github.io">OData.org repo on GitHub</a> for more details. Or if you have any further questions / feedback, please create <a href="https://github.com/ODataOrg/odataorg.github.io/issues">GitHub issues</a> or send email to <a href="[email protected]">[email protected]</a>.</p>
+<div>
+		<p class="text-center">OData.org is always open to any kind of contribution, including <strong>Post blogs</strong>,adding contents to <strong>Ecosystem</strong> ,<strong>Libraries</strong> and <strong>other improvements </strong>. Please visit OData.org repo on GitHub for more details. Or if you have any further questions / feedback, please create <a href="https://github.com/ODataOrg/odataorg.github.io/issues">GitHub issues</a> or send email to <a href="[email protected]">[email protected]</a>.</p>
+	<a href="https://github.com/ODataOrg/odataorg.github.io"><img src="/assets/github.png" alt="OData.org on GitHub" height="136px" ></a>
 </div>
-
 </div>
 
-<br /><br />
 
 <h1 class="text-center">Participate elsewhere</h1>
-<div class="row">
-	<div class="col-md-9">
-		<p><strong>OASIS community:</strong> You can view and create issues related to OData protocol directy at <a href="https://issues.oasis-open.org/browse/ODATA/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel">OASIS OData TC</a>. </p>
-		<p><strong>Mailing list:</strong> For any question related to OData, please join the <a href="https://groups.google.com/forum/#!forum/odata-discussion">OData Discussion Group</a>. For questions related to specific stacks, you can also send email directly to :
-			<ul>
-				<li>Microsoft OData Team: [email protected]</li>
-				<li>Apache Olingo: <a href="http://olingo.apache.org/support.html">Apache Olingo Support</a></li>
-			</ul>
-		</p>
-		<p><strong>Twitter:</strong> Follow us (@odataorg) on Twitter and tweets #odata</p>
-		<p><strong>StackOverflow:</strong> <a href="http://stackoverflow.com/questions/ask?tags=odata">Ask questions on with OData tag StackOverflow</a></p>
-	</div>
-
-	<div class="col-md-1"></div>
+<div class="row" style="height:210px;text-align:center">
 
-	<div class="col-md-2">
-		<img src="/assets/contribution.png" alt="Getting Involved " height="200px" width="200px">
+	<div>
+		<p class="text-center">You can also view issues and discuss OData in other communities. You can participate or follow the standardization technical committee progress at OASIS, ask questions at StackOverflow and tweet #OData at Twitter.</p>
 	</div>
+		<div class="col-md-4">
+		<a href="https://groups.google.com/forum/#!forum/odata-discussion"><img src="/assets/OASIS.png" height="125px"  ></a></div>
+		<div class="col-md-4">
+		<a href="http://stackoverflow.com/questions/ask?tags=odata"><img src="/assets/StackOverflow.png" height="125px" ></a></div>
+		<div class="col-md-4">
+		<a href="https://twitter.com/odataorg"><img src="/assets/Twitter.png" height="125px" ></a></div>
 </div>
+
+<h1 class="text-center">Join discussion groups</h1>
+<div class="row" style="height:210px; text-align:center">
+	<div>
+		<p class="text-center">Join the new mailing list for OData discussion. You can ask or answer questions about the OData protocol.</p>
+	</div>
+	<div class="col-md-4">
+		<a href="https://groups.google.com/forum/#!forum/odata-discussion"><img src="/assets/ODataDiscussionGroup.png" height="125px"></a>
+	</div>
+	<div class="col-md-4">
+		<a href="http://stackoverflow.com/questions/ask?tags=odata"><img src="/assets/MSODataTeam.png" height="125px"></a>
+	</div>
+	<div class="col-md-4">
+		<a href="https://http://olingo.apache.org/support.html"><img src="/assets/ApacheOlingoSupport.png" height="125px" ></a>
+	</div>
+</div>			

pages/odata-icon-usage-guidelines.html

@@ -1,14 +1,49 @@
 ---
 layout: page
-title: OData Icon Usage Guidelines
+title: Logo Usage
 date: 2014-05-27 09:39:22.000000000 +08:00
 permalink: /odata-icon-usage-guidelines/
 ---
-<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>
+<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>  -->
 </div>
-<p></p>
+<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>
 <div>
 <span style="font-size: 18px;">The OData Icon represents all versions of the OData technical specification </span> as published by:</p>
 <ul>
@@ -33,6 +68,7 @@ <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,3 +1,28 @@
+body {
+    font-family: "Microsoft Yahei Light";
+    background-color:#FEF9F7;
+}
+
+.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 {
+  text-align: center;
+}
+
+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,3 +1,27 @@
+body {
+    font-family: "Microsoft Yahei Light";
+    background-color:#FEF9F7;
+}
+
+.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 {
+  text-align: center;
+}
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: "Microsoft Yahei";
+}
+
 .theme-font{
   color: #dd4814;
 }