You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by bo...@apache.org on 2015/11/09 03:02:23 UTC

svn commit: r1713334 - /tapestry/tapestry-site/trunk/template/template.vm

Author: bobharner
Date: Mon Nov  9 02:02:22 2015
New Revision: 1713334

URL: http://svn.apache.org/viewvc?rev=1713334&view=rev
Log:
Removed shape="rect" tags on elements (all pages) and fixed whitespace issues in template

Modified:
    tapestry/tapestry-site/trunk/template/template.vm

Modified: tapestry/tapestry-site/trunk/template/template.vm
URL: http://svn.apache.org/viewvc/tapestry/tapestry-site/trunk/template/template.vm?rev=1713334&r1=1713333&r2=1713334&view=diff
==============================================================================
--- tapestry/tapestry-site/trunk/template/template.vm (original)
+++ tapestry/tapestry-site/trunk/template/template.vm Mon Nov  9 02:02:22 2015
@@ -23,72 +23,78 @@
   <meta http-equiv="x-ua-compatible" content="IE=9">
   <meta name="viewport" content="width=device-width, initial-scale=1">	
   <title>
-#if (! $page.title.equals("Index") && ! $page.title.equals("IndexV2"))
-    $page.title -- Apache Tapestry
-#else
-    Apache Tapestry Home Page
-#end
+    #if (! $page.title.equals("Index") && ! $page.title.equals("IndexV2"))
+      $page.title -- Apache Tapestry
+    #else
+      Apache Tapestry Home Page
+    #end
   </title>
-  <link type="text/css" rel="stylesheet" href="/resources/space.css">
+  <link type="text/css" rel="stylesheet" href="/resources/space.css" />
 
-#if($page.hasCode)
-  ## CSS files for SyntaxHighlighter:
-  <link href='/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
-  <link href='/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
-  <script src='/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
-#foreach ($hscript in $page.CodeScripts)
-  <script src='/resources/highlighter/scripts/$hscript' type='text/javascript'></script>
-#end
-  <script type="text/javascript">
-  SyntaxHighlighter.defaults['toolbar'] = false;
-  SyntaxHighlighter.all();
-  </script>
-#end
+  #if($page.hasCode)
+    ## CSS files for SyntaxHighlighter:
+    <link href='/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+    <link href='/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+    <script src='/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+    #foreach ($hscript in $page.CodeScripts)
+      <script src='/resources/highlighter/scripts/$hscript' type='text/javascript'></script>
+    #end
+    <script>
+      SyntaxHighlighter.defaults['toolbar'] = false;
+      SyntaxHighlighter.all();
+    </script>
+  #end
 
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
 
 </head>
+
 <body>
+
   <div class="wrapper bs">
 
-#set($content = $exporter.getPageContent("Navigation","navigation"))
-$content.replaceAll('rel="nofollow"', "")
+    #set($content = $exporter.getPageContent("Navigation","navigation"))
+    $content.replaceAll('shape="rect"', "")
 
-#if (! $page.title.equals("Index") && ! $page.title.equals("IndexV2"))
-<div id="top">
-#set($content = $exporter.getPageContent("Small Banner","smallbanner"))
-$content.replaceAll("Page Title", $page.title).replaceAll('rel="nofollow"', "")
-<div class="clearer"></div>
-</div>
-
-<div class="clearer"></div>
-
-  <div id="breadcrumbs">
-    #set($content = $exporter.breadcrumbs($page))
-    $content.replaceAll('<a href="https://cwiki.apache.org/confluence/display/TAPESTRY/Index" title="Index">Index</a>&nbsp;&gt;&nbsp;',"").replaceAll("Home", "Index")
-    <a class="edit" title="Edit this page (requires approval -- just ask on the mailing list)" href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit</a>
-  </div>
+    #if (! $page.title.equals("Index") && ! $page.title.equals("IndexV2"))
+      <div id="top">
+      #set($content = $exporter.getPageContent("Small Banner","smallbanner"))
+      $content.replaceAll("Page Title", $page.title).replaceAll('shape="rect"', "")
+      <div class="clearer"></div>
+      </div>
+
+      <div class="clearer"></div>
+
+      <div id="breadcrumbs">
+        #set($content = $exporter.breadcrumbs($page))
+        $content.replaceAll('<a href="https://cwiki.apache.org/confluence/display/TAPESTRY/Index" title="Index">Index</a>&nbsp;&gt;&nbsp;',"").replaceAll("Home", "Index")
+        <a class="edit" title="Edit this page (requires approval -- just ask on the mailing list)" href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit</a>
+      </div>
+
+      <div id="content">
+        #set($body = $page.getContent())
+        $body.replaceAll('shape="rect"', "")
+      </div>
+
+      <div class="clearer"></div>
+    #else
+      #set($body = $page.getContent())
+      $body.replaceAll('shape="rect"', "")
+    #end
+
+    <div id="footer">
+      #set($content = $exporter.getPageContent("Footer","footer"))
+      $content.replaceAll('shape="rect"', "")
+    </div>
+
+    <div id="comments_thread"></div>
+    <script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/$page.createFileName()" async="true">
+    </script>
+    <noscript>
+      <iframe width="100%" height="500" src="https://comments.apache.org/iframe.lua?site=tapestry&amp;page=http://tapestry.apache.org/$page.createFileName()"></iframe>
+    </noscript>
 
-<div id="content">
-#set($body = $page.getContent())
-$body.replaceAll('rel="nofollow"', "")
-</div>
-
-<div class="clearer"></div>
-#else
-#set($body = $page.getContent())
-$body.replaceAll('rel="nofollow"', "")
-#end
-<div id="footer">
-#set($content = $exporter.getPageContent("Footer","footer"))
-$content.replaceAll('rel="nofollow"', "")
-</div>
-		<div id="comments_thread"></div>
-		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/$page.createFileName()" async="true">
-		</script>
-		<noscript>
-		<iframe width="100%" height="500" src="https://comments.apache.org/iframe.lua?site=tapestry&amp;page=http://tapestry.apache.org/$page.createFileName()"></iframe>
-		</noscript>
   </div>
+
 </body>
 </html>