You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/03/31 05:48:06 UTC

[04/13] struts-site git commit: Makes url with leading slash to work with subfolders

Makes url with leading slash to work with subfolders


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/80cb88fd
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/80cb88fd
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/80cb88fd

Branch: refs/heads/master
Commit: 80cb88fda74880c1828e80a321066a6044757db8
Parents: 2de635d
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Mar 30 09:07:20 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Mar 30 09:07:20 2017 +0200

----------------------------------------------------------------------
 source/_includes/header.html   | 40 +++++++++++++++++++------------------
 source/_layouts/default.html   |  8 ++++----
 source/_layouts/main-page.html |  6 +++---
 3 files changed, 28 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/80cb88fd/source/_includes/header.html
----------------------------------------------------------------------
diff --git a/source/_includes/header.html b/source/_includes/header.html
index a4dd636..f12d608 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -14,7 +14,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a href="index.html" class="navbar-brand logo"><img src="img/struts-logo.svg"></a>
+          <a href="index.html" class="navbar-brand logo"><img src="/img/struts-logo.svg"></a>
         </div>
         <div id="struts-menu" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
@@ -23,9 +23,9 @@
                 Home<b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="index.html">Welcome</a></li>
-                <li><a href="downloads.html">Downloads</a></li>
-                <li><a href="announce.html">Announcements</a></li>
+                <li><a href="/index.html">Welcome</a></li>
+                <li><a href="/downloads.html">Downloads</a></li>
+                <li><a href="/announce.html">Announcements</a></li>
                 <li><a href="http://www.apache.org/licenses/">License</a></li>
                 <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li>
                 <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li>
@@ -36,9 +36,9 @@
                 Support<b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="mail.html">User Mailing List</a></li>
+                <li><a href="/mail.html">User Mailing List</a></li>
                 <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li>
-                <li><a href="security.html">Reporting Security Issues</a></li>
+                <li><a href="/security.html">Reporting Security Issues</a></li>
                 <li class="divider"></li>
                 <li><a href="/maven/project-info.html">Project info</a></li>
                 <li><a href="/maven/struts2-core/dependencies.html">Struts Core dependencies</a></li>
@@ -50,9 +50,9 @@
                 Documentation<b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="birdseye.html">Birds Eye</a></li>
-                <li><a href="primer.html">Key Technologies</a></li>
-                <li><a href="kickstart.html">Kickstart FAQ</a></li>
+                <li><a href="/birdseye.html">Birds Eye</a></li>
+                <li><a href="/primer.html">Key Technologies</a></li>
+                <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
                 <li><a href="/docs/home.html">Getting started</a></li>
@@ -64,6 +64,8 @@
                 <li><a href="/docs/plugins.html">Plugin APIs</a></li>
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
+                <li class="divider"></li>
+                <li><a href="/new-docs/getting-started.html">Getting Started (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">
@@ -71,21 +73,21 @@
                 Contributing<b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="youatstruts.html">You at Struts</a></li>
-                <li><a href="helping.html">How to Help FAQ</a></li>
-                <li><a href="dev-mail.html">Development Lists</a></li>
+                <li><a href="/youatstruts.html">You at Struts</a></li>
+                <li><a href="/helping.html">How to Help FAQ</a></li>
+                <li><a href="/dev-mail.html">Development Lists</a></li>
                 <li class="divider"></li>
-                <li><a href="submitting-patches.html">Submitting patches</a></li>
-                <li><a href="builds.html">Source Code</a></li>
-                <li><a href="coding-standards.html">Coding standards</a></li>
+                <li><a href="/submitting-patches.html">Submitting patches</a></li>
+                <li><a href="/builds.html">Source Code</a></li>
+                <li><a href="/coding-standards.html">Coding standards</a></li>
                 <li class="divider"></li>
-                <li><a href="releases.html">Release Guidelines</a></li>
-                <li><a href="bylaws.html">PMC Charter</a></li>
-                <li><a href="volunteers.html">Volunteers</a></li>
+                <li><a href="/releases.html">Release Guidelines</a></li>
+                <li><a href="/bylaws.html">PMC Charter</a></li>
+                <li><a href="/volunteers.html">Volunteers</a></li>
                 <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li>
               </ul>
             </li>
-            <li class="apache"><a href="http://www.apache.org/"><img src="img/apache.png"></a></li>
+            <li class="apache"><a href="http://www.apache.org/"><img src="/img/apache.png"></a></li>
           </ul>
         </div>
       </div>

http://git-wip-us.apache.org/repos/asf/struts-site/blob/80cb88fd/source/_layouts/default.html
----------------------------------------------------------------------
diff --git a/source/_layouts/default.html b/source/_layouts/default.html
index e855045..ecd349e 100644
--- a/source/_layouts/default.html
+++ b/source/_layouts/default.html
@@ -11,12 +11,12 @@
 
   <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-  <link href="css/main.css" rel="stylesheet">
-  <link href="css/custom.css" rel="stylesheet">
+  <link href="/css/main.css" rel="stylesheet">
+  <link href="/css/custom.css" rel="stylesheet">
 
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-  <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script>
-  <script type="text/javascript" src="js/community.js"></script>
+  <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
+  <script type="text/javascript" src="/js/community.js"></script>
 </head>
 <body>
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/80cb88fd/source/_layouts/main-page.html
----------------------------------------------------------------------
diff --git a/source/_layouts/main-page.html b/source/_layouts/main-page.html
index 2b3c8bd..b61a183 100644
--- a/source/_layouts/main-page.html
+++ b/source/_layouts/main-page.html
@@ -11,11 +11,11 @@
 
   <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-  <link href="css/main.css" rel="stylesheet">
+  <link href="/css/main.css" rel="stylesheet">
 
   <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-  <script type="text/javascript" src="bootstrap/js/bootstrap.js"></script>
-  <script type="text/javascript" src="js/community.js"></script>
+  <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
+  <script type="text/javascript" src="/js/community.js"></script>
 </head>
 <body>