updated link format

docs/_config.yml

@@ -67,7 +67,7 @@ amplify:
             - item_name: Quick Start
               item_url: '/media/quick_start'
             - item_name: Docs
-              item_url: '/media/developer_guide/'
+              item_url: '/media/developer_guide'
             - item_name: API
               item_url: '/api/'
             - item_name: Blog
@@ -115,7 +115,7 @@ category_list:
           excerpt: Drop-in analytics to track user sessions, custom user attributes, and in-app metrics.
           cta: Read more
           class: aws-icon-ps-60-pie-bar-charts 
-          url: '/media/analytics_guide/'
+          url: '/media/analytics_guide'
           services:
             - title: AWS Pinpoint,
               url: https://aws.amazon.com/pinpoint/
@@ -127,15 +127,15 @@ category_list:
           excerpt: A simple and secure solution for making HTTP requests.
           cta: Read more
           class: aws-icon-ps-60-database-server
-          url: '/media/api_guide/'    
+          url: '/media/api_guide'    
           services:
             - title: AWS API Gateway
               url: https://aws.amazon.com/api-gateway
         - title: Authentication
           excerpt:  Authentication APIs with pre-built UI components for your app.  
           cta: Read more
           class: aws-icon-ps-60-shield-circle
-          url: '/media/authentication_guide/'
+          url: '/media/authentication_guide'
           services:
             - title: AWS Cognito ,
               url: https://aws.amazon.com/cognito/
@@ -147,15 +147,15 @@ category_list:
           excerpt: A simple mechanism for managing user content in public or private storage.
           cta: Read more
           class: aws-icon-ps-60-file-box
-          url: '/media/storage_guide/'   
+          url: '/media/storage_guide'   
           services:
               - title: AWS S3
                 url: https://aws.amazon.com/s3/
         - title: Push Notifications 
           excerpt: Push notifications with campaign analytics and targeting.
           cta: Read more
           class: aws-icon-ps-60-bubble-gear
-          url: '/media/push_notifications_setup/'   
+          url: '/media/push_notifications_setup'   
           services:
               - title: AWS Pinpoint
                 url: https://aws.amazon.com/pinpoint/
@@ -165,26 +165,26 @@ category_list:
         - title: Cache 
           excerpt: A generic LRU cache for storing data with priority and expiration settings. 
           cta: Read more
-          url: '/media/cache_guide/'  
+          url: '/media/cache_guide'  
         - title: Hub  
           excerpt: A lightweight Pub-Sub system.
           cta: Read more
-          url: '/media/hub_guide/' 
+          url: '/media/hub_guide' 
         - title: I18n  
           excerpt: A lightweight internationalization solution.
           cta: Read more
-          url: '/media/i18n_guide/'  
+          url: '/media/i18n_guide'  
         - title: Logger  
           excerpt: Console logging utility.
           cta: Read more
-          url: '/media/logger_guide/'  
+          url: '/media/logger_guide'  
     -  category: CLI
        title: CLI
        subs:
         - title: AWS Mobile CLI
           excerpt: A CLI to create and manage your app's backend. 
           cta: Read more
-          url: '/media/cli_guide/'       
+          url: '/media/cli_guide'       
 
 defaults:
   -

docs/_posts/2018-03-05-AWS Amplify adds support for push notifications in React Native and provides new features for user authentication.1.md

@@ -45,5 +45,5 @@ PushNotification.onRegister(data => {
 });
 ```
 
-Please see our [Authentication User Guide]({% if jekyll.environment == 'production' %}{{ site.amplify.baseurl }}{% endif %}/media/push_notifications_setup/) for details.
+Please see our [Authentication User Guide]({% if jekyll.environment == 'production' %}{{ site.amplify.baseurl }}{% endif %}/media/push_notifications_setup) for details.
 {: .callout .callout--info}

docs/amplify-theme/_layouts/default.html

@@ -18,8 +18,7 @@
 				{% if site.category_list %}
 					{% for category in site.category_list %}
 						{% for item in category.subs %}
-							{% assign urlHtml = page.url | append: ".html" %}
-							{% if page.url == item.url or urlHtml == item.url %}
+							{% if page.url contains item.url %}
 								{% assign isPageInCategories = true %}	
 							{% endif %}	
 						{% endfor %}
@@ -40,8 +39,7 @@
 										<ul class="level-1 nav">
 											{% for category in site.category_list %}
 												{% for item in category.subs %}
-													{% assign urlHtml = page.url | append: "index.html" %}
-													{% if page.url == item.url or urlHtml == item.url  %}
+													{% if page.url contains item.url %}
 														<div class='in-this-page js-sections'></div>
 													{% else %}
 														<li class="section-link">

docs/amplify-theme/_sass/objects/_content.scss

@@ -46,7 +46,7 @@
 @media (min-width: $screen-md-min) {
 	.github-edit-link {
 		position: absolute;
-		margin-top: 50px;
+		margin-top: 0px;
 		right: 100px;
 		font-size:12px;
 		display: inherit;

docs/index.md

@@ -17,7 +17,7 @@ marketing_grid:
     - title: Declarative API
       excerpt: <p>AWS Amplify provides a declarative and easy-to-use interface across different categories of cloud operations.</p>
                <p>
-                    See our <a href='/aws-amplify/media/examples/'>code examples</a> to learn how you can 'cloud-enable' your app in under 5 minutes.
+                    See our <a href='/aws-amplify/media/examples'>code examples</a> to learn how you can 'cloud-enable' your app in under 5 minutes.
                 </p> 
     - title: Bring your own frontend 
       excerpt: <p>AWS Amplify goes well with any JavaScript based frontend worfklow, and React Native for mobile developers.</p> 
@@ -39,11 +39,11 @@ grid_navigation:
     - title: Installation
       excerpt:  Install and configurate AWS Amplify to start working with cloud services.
       cta: Read more
-      url: '/media/install_n_config/'
+      url: '/media/install_n_config'
     - title: Developer Guide
       excerpt: Discover our building blocks for frontend and mobile developers.
       cta: Read more
-      url: '/media/developer_guide/'
+      url: '/media/developer_guide'
     - title: API Reference
       excerpt: API Reference for the library.
       cta: Read more

docs/media/analytics_guide.md

@@ -7,7 +7,7 @@ AWS Amplify Analytics module helps you to easily collect analytics data for you
 
 ## Installation and Configuration
 
-Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/install_n_config/) for general setup. Here is how you can enable Analytics category for your app.
+Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/install_n_config) for general setup. Here is how you can enable Analytics category for your app.
 
 ### Automated Setup
 

docs/media/api_guide.md

@@ -8,7 +8,7 @@ AWS Amplify API module provides a simple solution when making HTTP requests. It
 
 The API module can be used out of the box for creating signed requests against Amazon API Gateway, when the API Authorization is set to `AWS_IAM`. 
 
-Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%} /media/install_n_config/) for initial setup.
+Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%} /media/install_n_config) for initial setup.
 {: .callout .callout--info}
 
 In API configuration, you are required to pass in an *Amazon Cognito Identity Pool ID*, allowing AWS Amplify to retrieve base credentials for a user even in an un-authenticated state. The configuration also requires a list of your APIs, comprised of a friendly name for the API and the endpoint URL. 

docs/media/authentication_guide.md

@@ -11,7 +11,7 @@ Depending on your needs, you can integrate Authentication module at different le
 
 ## Installation and Configuration
 
-Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/install_n_config/) for general setup. Here is how you can enable Authentication category for your app.
+Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/install_n_config) for general setup. Here is how you can enable Authentication category for your app.
 
 ### Automated Setup
 
@@ -263,7 +263,7 @@ in the component's constructor, then implement `showComponent(theme) {}` in lieu
 
 **Availibility Note**
 Currently, our federated identity components only support Google, Facebook and Amazon identities, and works with React. 
-Support for React Native is in progress. Please see our[ Setup Guide for Federated Identities]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/federated_identity_setup/). 
+Support for React Native is in progress. Please see our[ Setup Guide for Federated Identities]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/federated_identity_setup). 
 {: .callout .callout--info}
 
 
@@ -601,4 +601,4 @@ const map = (message) => {
 <Authenticator errorMessage={map} />
 ```
 
-You may notice in `AmplifyMessageMap.js` it also handles internationalization. This topic is covered in our [I18n Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/i18n_guide/).
+You may notice in `AmplifyMessageMap.js` it also handles internationalization. This topic is covered in our [I18n Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/i18n_guide).

docs/media/examples.md

@@ -3,7 +3,7 @@
 
 ## Code Examples
 
-AWS Amplify enables easy integration with cloud backend for common service categories such as authentication, analytics, API and storage as outlined in the [Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/developer_guide/). 
+AWS Amplify enables easy integration with cloud backend for common service categories such as authentication, analytics, API and storage as outlined in the [Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/developer_guide). 
 
 AWS Amplify focuses on data and service integration with your app's backend, and it works fine with any frontend JavaScript library or framework. However, the code examples provided here are specifically for *React* and *React Native*.
 {: .callout .callout--info}
@@ -72,7 +72,7 @@ export default withAuthenticator(App);
 </div>
 </div>
 
-For a complete guide for starting your app with AWS Amplify, please see our [Quick Start Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/quick_start/).
+For a complete guide for starting your app with AWS Amplify, please see our [Quick Start Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/quick_start).
 {: .next-link}
 
 ### Store Files on The Cloud
@@ -106,7 +106,7 @@ Amplify.configure(aws_exports);
 Analytics.record('myCustomEvent');
 ```
 
-See [here](https://aws.github.io/aws-amplify/media/analytics_guide.html) for the Analytics developer guide. 
+See [here](https://aws.github.io/aws-amplify/media/analytics_guide) for the Analytics developer guide. 
 
 ### Signing HTTP requests
 

docs/media/push_notifications_setup.md

@@ -17,7 +17,7 @@ Setup instructions are provided for Android and iOS, and configuration for both
 ### Requirements
 1. In order to use Amazon Pinpoint you need to setup credentials (keys or certificates) for your targeted mobile platform; e.g.:Android and/or iOS.
 2. Testing Push Notifications requires a physical device, because simulators or emulators wont' be able to handle push notifications.
-3. Push Notification module is integrated with [AWS Amplify Analytics module]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/analytics_guide/) to be able to track notifications. Make sure that you have configured the Analytics module in your app before configuring Push Notification module.
+3. Push Notification module is integrated with [AWS Amplify Analytics module]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/analytics_guide) to be able to track notifications. Make sure that you have configured the Analytics module in your app before configuring Push Notification module.
 3. For setting up iOS push notifications, you need to download and install Xcode from [Apple Developer Center](https://developer.apple.com/xcode/).
 
 ### Setup for Android devices
@@ -194,7 +194,7 @@ $ react-native link aws-amplify-react-native
 
 Push Notification module is integrated with `Analytics` module to be able to track notifications. Make sure that you have configured the Analytics module in your app before configuring Push Notification module.  
 
-If you don't have Analytics already enabled, see our [Analytics Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/analytics_guide/) to add Analytics to your app.
+If you don't have Analytics already enabled, see our [Analytics Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/analytics_guide) to add Analytics to your app.
 {: .callout .callout--info}
 
 First, import `PushNotification` module and configure it with `PushNotification.configure()`.

docs/media/quick_start.md

@@ -276,7 +276,7 @@ import { Analytics } from 'aws-amplify';
 
 This will record an **appRender** event every time a user launches your app.
 
-You can easily add custom analytics events to suit your purposes. For more information about Analytics Category, see [AWS Amplify Analytics Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/authentication_guide/)
+You can easily add custom analytics events to suit your purposes. For more information about Analytics Category, see [AWS Amplify Analytics Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/authentication_guide)
 {: .callout .callout--info}
 
 ## Add User Authentication to Your App
@@ -326,7 +326,7 @@ Reload your application on the physical device or emulator/simulator:
 </div>
 </div>
 
-For more information about Authentication Category, see [AWS Amplify Authentication Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/authentication_guide/)
+For more information about Authentication Category, see [AWS Amplify Authentication Developer Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/authentication_guide)
 {: .callout .callout--info}
 
 

docs/media/storage_guide.md

@@ -7,7 +7,7 @@ AWS Amplify Storage module gives a simple mechanism for managing user content in
 
 ## Installation and Configuration
 
-Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/install_n_config/) for general setup. Here is how you can enable Storage category for your app.
+Please refer to [AWS Amplify Installation Guide]({%if jekyll.environment == 'production'%}{{site.amplify.baseurl}}{%endif%}/media/install_n_config) for general setup. Here is how you can enable Storage category for your app.
 
 The default implementation of the Storage module leverages [Amazon S3](https://aws.amazon.com/s3).
 {: .callout .callout--info}