You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/12/17 10:49:04 UTC
svn commit: r1422819 - in /incubator/deltaspike/site/trunk: lib/view.pm
templates/deltaspike-markdown.html templates/single_narrative.html
templates/sitemap.html templates/skeleton.html
Author: gpetracek
Date: Mon Dec 17 09:49:03 2012
New Revision: 1422819
URL: http://svn.apache.org/viewvc?rev=1422819&view=rev
Log:
DELTASPIKE-301 improved site layout - thx to Jean-Louis Monteiro
Removed:
incubator/deltaspike/site/trunk/templates/single_narrative.html
incubator/deltaspike/site/trunk/templates/skeleton.html
Modified:
incubator/deltaspike/site/trunk/lib/view.pm
incubator/deltaspike/site/trunk/templates/deltaspike-markdown.html
incubator/deltaspike/site/trunk/templates/sitemap.html
Modified: incubator/deltaspike/site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/deltaspike/site/trunk/lib/view.pm?rev=1422819&r1=1422818&r2=1422819&view=diff
==============================================================================
--- incubator/deltaspike/site/trunk/lib/view.pm (original)
+++ incubator/deltaspike/site/trunk/lib/view.pm Mon Dec 17 09:49:03 2012
@@ -77,7 +77,7 @@ sub basic {
read_text_file($filepath, \%args);
$args{path} =~ s/\.mdtext$/\.html/;
- $args{base} = _base($args{path});
+ $args{base} = _base($args{path}) . "deltaspike/";
$args{breadcrumbs} = _breadcrumbs($args{path}, $args{base});
my $template_path = "templates/$args{template}";
Modified: incubator/deltaspike/site/trunk/templates/deltaspike-markdown.html
URL: http://svn.apache.org/viewvc/incubator/deltaspike/site/trunk/templates/deltaspike-markdown.html?rev=1422819&r1=1422818&r2=1422819&view=diff
==============================================================================
--- incubator/deltaspike/site/trunk/templates/deltaspike-markdown.html (original)
+++ incubator/deltaspike/site/trunk/templates/deltaspike-markdown.html Mon Dec 17 09:49:03 2012
@@ -18,10 +18,10 @@
{% if headers.notice %}<!-- {{ headers.notice }} -->{% endif %}
<!-- Styles -->
- <link href="resources/css/bootstrap.css" rel="stylesheet">
- <!--<link href="resources/css/prettify.css" rel="stylesheet" /> -->
- <link href="resources/css/codehilite.css" rel="stylesheet" />
- <link href="resources/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="{{base}}resources/css/bootstrap.css" rel="stylesheet">
+ <!--<link href="{{base}}resources/css/prettify.css" rel="stylesheet" /> -->
+ <link href="{{base}}resources/css/codehilite.css" rel="stylesheet" />
+ <link href="{{base}}resources/css/bootstrap-responsive.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
@@ -53,17 +53,17 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a class="brand" href="index.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+ <a class="brand" href="index.html"><img src="{{base}}resources/images/deltaspike-logo-medium.png"/></a>
<div class="nav-collapse">
<ul class="nav">
- <li class="active"><a href="index.html">Home</a></li>
- <li><a href="documentation.html">Documentation</a></li>
- <li><a href="source.html">Source</a></li>
- <!-- <li><a href="download.html">Download</a></li> -->
- <li><a href="community.html">Community</a></li>
- <!-- <li><a href="support.html">Support</a></li> -->
- <li><a href="news.html">News</a></li>
- <li><a href="migration-guide.html">Migration</a></li>
+ <li class="active"><a href="{{base}}index.html">Home</a></li>
+ <li><a href="{{base}}documentation.html">Documentation</a></li>
+ <li><a href="{{base}}source.html">Source</a></li>
+ <!-- <li><a href="{{base}}download.html">Download</a></li> -->
+ <li><a href="{{base}}community.html">Community</a></li>
+ <!-- <li><a href="{{base}}support.html">Support</a></li> -->
+ <li><a href="{{base}}news.html">News</a></li>
+ <li><a href="{{base}}migration-guide.html">Migration</a></li>
</ul>
</div><!--/.nav-collapse -->
<form id="search-form" action="http://www.google.com/search" method="get" class="navbar-search pull-right" >
@@ -96,21 +96,21 @@
<!-- Javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <!--<script src="/resources/js/prettyfy.js"></script> -->
- <script src="/resources/js/prettyprint.js"></script>
- <script src="/resources/js/jquery.js"></script>
- <script src="/resources/js/bootstrap-transition.js"></script>
- <script src="/resources/js/bootstrap-alert.js"></script>
- <script src="/resources/js/bootstrap-modal.js"></script>
- <script src="/resources/js/bootstrap-dropdown.js"></script>
- <script src="/resources/js/bootstrap-scrollspy.js"></script>
- <script src="/resources/js/bootstrap-tab.js"></script>
- <script src="/resources/js/bootstrap-tooltip.js"></script>
- <script src="/resources/js/bootstrap-popover.js"></script>
- <script src="/resources/js/bootstrap-button.js"></script>
- <script src="/resources/js/bootstrap-collapse.js"></script>
- <script src="/resources/js/bootstrap-carousel.js"></script>
- <script src="/resources/js/bootstrap-typeahead.js"></script>
+ <!--<script src="{{base}}resources/js/prettyfy.js"></script> -->
+ <script src="{{base}}resources/js/prettyprint.js"></script>
+ <script src="{{base}}resources/js/jquery.js"></script>
+ <script src="{{base}}resources/js/bootstrap-transition.js"></script>
+ <script src="{{base}}resources/js/bootstrap-alert.js"></script>
+ <script src="{{base}}resources/js/bootstrap-modal.js"></script>
+ <script src="{{base}}resources/js/bootstrap-dropdown.js"></script>
+ <script src="{{base}}resources/js/bootstrap-scrollspy.js"></script>
+ <script src="{{base}}resources/js/bootstrap-tab.js"></script>
+ <script src="{{base}}resources/js/bootstrap-tooltip.js"></script>
+ <script src="{{base}}resources/js/bootstrap-popover.js"></script>
+ <script src="{{base}}resources/js/bootstrap-button.js"></script>
+ <script src="{{base}}resources/js/bootstrap-collapse.js"></script>
+ <script src="{{base}}resources/js/bootstrap-carousel.js"></script>
+ <script src="{{base}}resources/js/bootstrap-typeahead.js"></script>
</body>
</html>
\ No newline at end of file
Modified: incubator/deltaspike/site/trunk/templates/sitemap.html
URL: http://svn.apache.org/viewvc/incubator/deltaspike/site/trunk/templates/sitemap.html?rev=1422819&r1=1422818&r2=1422819&view=diff
==============================================================================
--- incubator/deltaspike/site/trunk/templates/sitemap.html (original)
+++ incubator/deltaspike/site/trunk/templates/sitemap.html Mon Dec 17 09:49:03 2012
@@ -1,2 +1 @@
-{% include "single_narrative.html" %}
-
+{% extends "deltaspike-markdown.html" %}
\ No newline at end of file