Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6DBBEAC3 for ; Thu, 3 Jan 2013 06:47:00 +0000 (UTC) Received: (qmail 27056 invoked by uid 500); 3 Jan 2013 06:47:00 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 27005 invoked by uid 500); 3 Jan 2013 06:46:59 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 26929 invoked by uid 99); 3 Jan 2013 06:46:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 06:46:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 06:46:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 668D523888CD; Thu, 3 Jan 2013 06:46:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428177 - /continuum/skin/trunk/src/main/resources/META-INF/maven/site.vm Date: Thu, 03 Jan 2013 06:46:36 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130103064636.668D523888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Thu Jan 3 06:46:36 2013 New Revision: 1428177 URL: http://svn.apache.org/viewvc?rev=1428177&view=rev Log: incorporate recent improvements from the Stylus Skin to relativize links in the banner, so that it works in paths like /development/ Modified: continuum/skin/trunk/src/main/resources/META-INF/maven/site.vm Modified: continuum/skin/trunk/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/continuum/skin/trunk/src/main/resources/META-INF/maven/site.vm?rev=1428177&r1=1428176&r2=1428177&view=diff ============================================================================== --- continuum/skin/trunk/src/main/resources/META-INF/maven/site.vm (original) +++ continuum/skin/trunk/src/main/resources/META-INF/maven/site.vm Thu Jan 3 06:46:36 2013 @@ -11,7 +11,17 @@ #macro ( banner $banner $id ) #if ( $banner ) #if( $banner.href ) - + #set ( $hrf = $banner.href ) + #if ( ! ( $hrf.toLowerCase().startsWith("http:/") || $hrf.toLowerCase().startsWith("https:/") || + $hrf.toLowerCase().startsWith("ftp:/") || $hrf.toLowerCase().startsWith("mailto:") || + $hrf.toLowerCase().startsWith("file:/") || ($hrf.toLowerCase().indexOf("://") != -1) ) ) + #set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) ) + #set ( $hrf = $hrf.replaceAll( '\\', '/' ) ) + #if ( ( $hrf == '' ) ) + #set ( $hrf = './' ) + #end + #end + #else #end