You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/10/30 17:39:04 UTC
svn commit: r1537169 - in /jmeter/branches/docs-2.10/xdocs:
images/asf-logo.png images/twitter.png stylesheets/project.xml
stylesheets/site.vsl
Author: milamber
Date: Wed Oct 30 16:39:04 2013
New Revision: 1537169
URL: http://svn.apache.org/r1537169
Log:
Port on docs 2.10 branch changes from r1537165
URL: http://svn.apache.org/r1537165
Log:
Changing the header of website (new arrangement)
Adding twitter link into menu
Putting the ApacheCon link in the bottom of menu
Ref. The thread started from this message:
http://mail-archives.apache.org/mod_mbox/jmeter-dev/201310.mbox/%3CCAOGo0VZemLq4LkWSK8WVU14-vJGxOH3AHHbA1QQqN0DvUX6GSg%40mail.gmail.com%3E
Added:
jmeter/branches/docs-2.10/xdocs/images/asf-logo.png (with props)
jmeter/branches/docs-2.10/xdocs/images/twitter.png (with props)
Modified:
jmeter/branches/docs-2.10/xdocs/stylesheets/project.xml
jmeter/branches/docs-2.10/xdocs/stylesheets/site.vsl
Added: jmeter/branches/docs-2.10/xdocs/images/asf-logo.png
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.10/xdocs/images/asf-logo.png?rev=1537169&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jmeter/branches/docs-2.10/xdocs/images/asf-logo.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: jmeter/branches/docs-2.10/xdocs/images/twitter.png
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.10/xdocs/images/twitter.png?rev=1537169&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jmeter/branches/docs-2.10/xdocs/images/twitter.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: jmeter/branches/docs-2.10/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.10/xdocs/stylesheets/project.xml?rev=1537169&r1=1537168&r2=1537169&view=diff
==============================================================================
--- jmeter/branches/docs-2.10/xdocs/stylesheets/project.xml (original)
+++ jmeter/branches/docs-2.10/xdocs/stylesheets/project.xml Wed Oct 30 16:39:04 2013
@@ -20,13 +20,14 @@
<title>Apache JMeter</title>
<!---->
- <logo width="221" height="102" href="/images/logo.jpg">Apache JMeter</logo>
+ <logo width="182" height="88" href="/images/logo.jpg">Apache JMeter</logo>
<!---->
<body>
<menu name="About">
<item name="Overview" href="/index.html"/>
<item name="Changes" href="/changes.html"/>
<item name="Subscribe to What's New" href="http://projects.apache.org/feeds/rss/jmeter.xml"/>
+ <item name="JMeter on Twitter" href="http://twitter.com/ApacheJMeter" icon="twitter.png"/>
<item name="Issue Tracking" href="/issues.html"/>
<item name="License" href="http://www.apache.org/licenses/"/>
<item name="Contributors" href="http://wiki.apache.org/jmeter/JMeterCommitters"/>
Modified: jmeter/branches/docs-2.10/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.10/xdocs/stylesheets/site.vsl?rev=1537169&r1=1537168&r2=1537169&view=diff
==============================================================================
--- jmeter/branches/docs-2.10/xdocs/stylesheets/site.vsl (original)
+++ jmeter/branches/docs-2.10/xdocs/stylesheets/site.vsl Wed Oct 30 16:39:04 2013
@@ -438,16 +438,24 @@ $node.getText()
#end
#macro ( makeProject )
+<table border="0" width="100%" cellspacing="0">
+<tr><td>
#set ($menus = $project.getChild("body").getChildren("menu"))
#foreach ( $menu in $menus )
<p><strong>$menu.getAttributeValue("name")</strong></p>
<ul>
#foreach ( $item in $menu.getChildren() )
+#set ($icon = $item.getAttributeValue("icon"))
#set ($name = $item.getAttributeValue("name"))
-<li>#projectanchor($name $item.getAttributeValue("href"))</li>
+<li>#projectanchor($name $item.getAttributeValue("href"))#if($icon)<img src="$imgdir/$icon" align="top"/>#end</li>
#end
</ul>
#end
+</td></tr>
+<tr><td>
+<iframe src="http://www.apache.org/ads/button.html" style="border-width:0; float: left;" frameborder="0" scrolling="no"></iframe>
+</td></tr>
+</table>
#end
#macro (makeIndex $subsections)
@@ -472,32 +480,20 @@ $node.getText()
#set ( $logoString = $project.getChild("logo").getAttributeValue("href") )
#set ( $logoHeight = $project.getChild("logo").getAttributeValue("height") )
#set ( $logoWidth = $project.getChild("logo").getAttributeValue("width") )
-<td>
-<!-- Need to specify height otherwise iframe seems to grab extra -->
-<iframe src="http://www.apache.org/ads/halfbanner.html" height="$logoHeight"
-style="border-width:0; float: left" frameborder="0" scrolling="no"></iframe>
+<td width="10%">
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="290" height="75" src="$imgdir/asf-logo.png" border="0"/></a>
</td>
-<td align="left">
-<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="$imgdir/asf-logo.gif" border="0"/></a>
-</td>
-<td align="right">
+<td align="left" width="40%">
+
#if ( $logoString.startsWith("/") )
<a href="$project.getAttributeValue("href")"><img width="$logoWidth" height="$logoHeight" src="$relativePath$logoString" alt="$project.getChild("logo").getText()" title="$project.getChild("logo").getText()" border="0"/></a>
#else
<a href="$project.getAttributeValue("href")"><img width="$logoWidth" height="$logoHeight" src="$relativePath/$logoString" alt="$project.getChild("logo").getText()" title="$project.getChild("logo").getText()" border="0"/></a>
#end
</td>
-<td>
-<a href="https://twitter.com/share" class="twitter-share-button" data-text="Powerful Load Testing with Apache #JMeter http://jmeter.apache.org" data-via="ApacheJMeter" data-lang="en-gb" data-size="large">Tweet</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-</td>
-<td>
-<a href="https://twitter.com/ApacheJMeter" class="twitter-follow-button" data-show-count="false" data-lang="en-gb" data-size="large">Follow @ApacheJMeter</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-</td>
#else
<td colspan="2">
-<a href="http://www.apache.org"><img title="Apache Software Foundation" width="387" height="100" src="$imgdir/asf-logo.gif" border="0"/></a>
+<a href="http://www.apache.org"><img title="Apache Software Foundation" width="290" height="75" src="$imgdir/asf-logo.png" border="0"/></a>
</td>
#end
#end
@@ -525,12 +521,38 @@ style="border-width:0; float: left" fram
</head>
<body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">
+<table width="100%" cellspacing="0" border="0">
+<tr>
+<td width="90%" align="left">
<table border="0" cellspacing="0">
##<!-- TOP IMAGE -->
<tr>
#getProjectImage()
</tr>
</table>
+</td>
+<td align="left" width="50%">
+<table cellspacing="0" align="right" border="0">
+<tr>
+<td align="left"> <a href="https://twitter.com/share"
+class="twitter-share-button"
+data-text="Powerful Load Testing with
+Apache #JMeter" data-via="ApacheJMeter"
+data-lang="en-gb" data-size="large">Tweet</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+</td>
+<td align="right"> <a
+href="https://twitter.com/ApacheJMeter"
+class="twitter-follow-button"
+data-show-count="false" data-lang="en-gb"
+data-size="large">Follow</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+</td>
+</tr>
+</table>
+</td></tr>
+</table>
+
<table border="0" width="100%" cellspacing="4">
<tr><td colspan="2">
<hr noshade size="1"/>