From 34ecb654571b05a81202269de99711b24f363062 Mon Sep 17 00:00:00 2001
From: chinafzy <chinafzy1978@gmail.com>
Date: Fri, 28 Mar 2014 17:00:52 +0800
Subject: [PATCH] Fix these issues: 1. Active status in nav bar does not show.
 2. Active status in sample tab bar does not show correctly. The tab label
 shows active, but the content does not show. 3. Page width is greater than
 current screen. A X-scroll always shows there.

Signed-off-by: chinafzy <chinafzy1978@gmail.com>
---
 .../webapp/WEB-INF/decorators/main-layout.jsp | 13 ++++++++----
 .../WEB-INF/views/errors-validations.jsp      |  2 +-
 src/main/webapp/WEB-INF/views/getstarted.jsp  |  2 +-
 src/main/webapp/WEB-INF/views/tags/navbar.jsp | 20 +++++++++++++------
 src/main/webapp/resources/js/active-first.js  |  8 ++++++++
 5 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 src/main/webapp/resources/js/active-first.js

diff --git a/src/main/webapp/WEB-INF/decorators/main-layout.jsp b/src/main/webapp/WEB-INF/decorators/main-layout.jsp
index 095100d4e..63f82c57c 100644
--- a/src/main/webapp/WEB-INF/decorators/main-layout.jsp
+++ b/src/main/webapp/WEB-INF/decorators/main-layout.jsp
@@ -13,6 +13,8 @@
         rel="stylesheet"  type="text/css" />
   <link href="<c:url value="/resources/css/main.css" />"
         rel="stylesheet"  type="text/css" />
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <script type="text/javascript" src="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
 
   <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
   <!--[if lt IE 9]>
@@ -41,9 +43,12 @@
 
                     <div class="row">
                       <div class="col-md-12">
-                          <div class="container">
+                          <div class="container-fluid">
+                          <% if(!request.getHeader("Accept-Language").contains("zh-CN")) { %>
                             <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=priyatam&repo=springmvc-twitterbootstrap-showcase&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-
+                          <%} else { %>
+                            <!-- China GFW will do "cycle redirecting" for some url like "http://ghbtns.com"  -->
+                          <%} %>
                             <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://springmvc-twitterbootstrap-showcase.cloudfoundry.com" data-text="Spring MVC Twitter Bootstrap Showcase!">Tweet</a>
                             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
                           </div>
@@ -64,10 +69,10 @@
     <c:import url="/WEB-INF/views/tags/footer.jsp"/>
 
 	<!-- Placed at the end of the document so the pages load faster -->
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-	<script type="text/javascript" src="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
+    <!-- Place the base js files in header to ensure they have been loaded before app js files execute. -->
   <script type="text/javascript" src="<c:url value="/resources/js/demo.js" />"></script>
 	<script type="text/javascript" src="<c:url value="/resources/js/json2.js" />"></script>
   <script type="text/javascript" src="<c:url value="/resources/js/date.format.js" />"></script>
+  <script type="text/javascript" src="<c:url value="/resources/js/active-first.js" />"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/errors-validations.jsp b/src/main/webapp/WEB-INF/views/errors-validations.jsp
index cec8e1418..e5f981462 100644
--- a/src/main/webapp/WEB-INF/views/errors-validations.jsp
+++ b/src/main/webapp/WEB-INF/views/errors-validations.jsp
@@ -8,7 +8,7 @@
   <div class="tabbable" id="demo-tab"> <!-- Only required for left/right tabs -->
     <!-- Tab Definitions-->               
     <ul class="nav nav-tabs">
-      <li class="active"><a href="#validation" data-toggle="tab">Validation</a></li>
+      <li><a href="#validation" data-toggle="tab">Validation</a></li>
       <li><a href="#exceptions" data-toggle="tab">Exception Handling</a></li>      
     </ul>  
 
diff --git a/src/main/webapp/WEB-INF/views/getstarted.jsp b/src/main/webapp/WEB-INF/views/getstarted.jsp
index 8d5984cda..b2899bfe4 100644
--- a/src/main/webapp/WEB-INF/views/getstarted.jsp
+++ b/src/main/webapp/WEB-INF/views/getstarted.jsp
@@ -8,7 +8,7 @@
   <div class="tabbable" id="demo-tab"> <!-- Only required for left/right tabs -->
     <!-- Tab Definitions-->               
     <ul class="nav nav-tabs" id="getStartedTab">
-      <li class="active"><a href="#simple" data-toggle="tab">Simple Ajax</a></li>
+      <li><a href="#simple" data-toggle="tab">Simple Ajax</a></li>
       <li><a href="#mapping" data-toggle="tab">Mapping Requests</a></li>
       <li><a href="#data" data-toggle="tab">Obtaining Request Data</a></li>
       <li><a href="#responses" data-toggle="tab">Writing Responses</a></li>
diff --git a/src/main/webapp/WEB-INF/views/tags/navbar.jsp b/src/main/webapp/WEB-INF/views/tags/navbar.jsp
index a821cb14e..4bc50db50 100644
--- a/src/main/webapp/WEB-INF/views/tags/navbar.jsp
+++ b/src/main/webapp/WEB-INF/views/tags/navbar.jsp
@@ -11,12 +11,20 @@
         </div>
         <div class="navbar-collapse collapse">  
           <ul class="nav navbar-nav">
-            <li class="active"><a href="<c:url value="/" />">Home</a></li>
-            <li><a href="<c:url value="/getstarted" />">Get started</a></li>
-            <li><a href="<c:url value="/errors-validations" />">Errors &amp; Validations</a></li>
-            <li><a href="<c:url value="/form" />">Forms</a></li>
-            <li><a href="<c:url value="/fileupload" />">File Upload</a></li>
-            <li><a href="<c:url value="/misc" />">Misc</a></li>
+            <c:set var="cur" value="${pageContext.request.requestURI }" />
+
+            <c:url var="href" value="/" />
+            <li <c:if test="${cur.equals(href) }">class="active"</c:if> ><a href="${href }">Home</a></li>
+            <c:url var="href" value="/getstarted" />
+            <li <c:if test="${cur.equals(href) }">class="active"</c:if> ><a href="${href }">Get started</a></li>
+            <c:url var="href" value="/errors-validations" />
+            <li <c:if test="${cur.equals(href) }">class="active"</c:if> ><a href="${href }">Errors &amp; Validations</a></li>
+            <c:url var="href" value="/form" />
+            <li <c:if test="${cur.equals(href) }">class="active"</c:if> ><a href="${href }">Forms</a></li>
+            <c:url var="href" value="/fileupload" />
+            <li <c:if test="${cur.equals(href) }">class="active"</c:if> ><a href="${href }">File Upload</a></li>
+            <c:url var="href" value="/misc" />
+            <li <c:if test="${cur.equals(href) }">class="active"</c:if> ><a href="${href }">Misc</a></li>
           </ul>
         </div>   			      		 
   </div>
diff --git a/src/main/webapp/resources/js/active-first.js b/src/main/webapp/resources/js/active-first.js
new file mode 100644
index 000000000..b5557df25
--- /dev/null
+++ b/src/main/webapp/resources/js/active-first.js
@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+$(function() {
+	var tab0 = $('#demo-tab > ul > li > a:eq(0)');
+	if (tab0)
+		tab0.tab('show');
+});