You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2012/10/31 20:56:26 UTC
svn commit: r1404322 - in /cayenne/site/cms/trunk/templates: markdown.html
menu.html skeleton.html
Author: aadamchik
Date: Wed Oct 31 19:56:26 2012
New Revision: 1404322
URL: http://svn.apache.org/viewvc?rev=1404322&view=rev
Log:
splitting menu into a separate file
Added:
cayenne/site/cms/trunk/templates/menu.html
- copied, changed from r1404321, cayenne/site/cms/trunk/templates/skeleton.html
Modified:
cayenne/site/cms/trunk/templates/markdown.html
cayenne/site/cms/trunk/templates/skeleton.html
Modified: cayenne/site/cms/trunk/templates/markdown.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/markdown.html?rev=1404322&r1=1404321&r2=1404322&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/markdown.html (original)
+++ cayenne/site/cms/trunk/templates/markdown.html Wed Oct 31 19:56:26 2012
@@ -1,3 +1,4 @@
{% extends "skeleton.html" %}
{% block title %}{{ headers.title }}{% endblock %}
+{% block menu %}{% include 'menu.html' %}{% endblock %}
{% block content %}{{ content|markdown }}{% endblock %}
Copied: cayenne/site/cms/trunk/templates/menu.html (from r1404321, cayenne/site/cms/trunk/templates/skeleton.html)
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/menu.html?p2=cayenne/site/cms/trunk/templates/menu.html&p1=cayenne/site/cms/trunk/templates/skeleton.html&r1=1404321&r2=1404322&rev=1404322&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/skeleton.html (original)
+++ cayenne/site/cms/trunk/templates/menu.html Wed Oct 31 19:56:26 2012
@@ -1,24 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head>
-<title>Apache Cayenne » {% block title %}{% endblock %}</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<meta name="robots" content="index,follow">
-<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
-<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
-<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
-<script type="text/javascript" src="/js/scripts.js"></script>
-</head>
-<body>
-<div id="wrap"><div id="wrap-inner">
-
-<div id="header">
- <h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
- <h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
-</div>
-
-<div id="container">
<div id="sidebar">
<ul id="nav">
@@ -82,24 +61,3 @@
</li>
</ul>
</div>
-
-<hr>
-<div id="content">
- {% block content %}{% endblock %}
- <hr>
- <p id="footer">Copyright © 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
-</div>
-</div>
-
-</div></div>
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-</body>
-</html>
Modified: cayenne/site/cms/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/skeleton.html?rev=1404322&r1=1404321&r2=1404322&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/skeleton.html (original)
+++ cayenne/site/cms/trunk/templates/skeleton.html Wed Oct 31 19:56:26 2012
@@ -20,68 +20,7 @@
<div id="container">
-<div id="sidebar">
-<ul id="nav">
- <li><a href="/about.html">About</a>
- <ul>
- <li><a href="/why-cayenne.html">Why Cayenne?</a></li>
- <li><a href="/download.html">Download</a></li>
- <li><a href="/success-stories.html">Success Stories</a></li>
- <li><a href="/commercial-support.html">Commercial Support</a></li>
- </ul>
- </li>
- <li><a href="/documentation.html">Documentation</a>
- <ul>
- <li><a href="/doc30/tutorial.html">Getting Started</a></li>
- <li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
- <ul>
- <li><a href="/doc/overview.html">Overview</a></li>
- <li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
- <li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
- <li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
- <li><a href="/doc/api/index.html">JavaDoc</a></li>
- </ul>
- </li>
- <li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
- <ul>
- <li><a href="/doc30/overview.html">Overview</a></li>
- <li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
- <li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
- <li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
- <li><a href="/doc30/api/index.html">JavaDoc</a></li>
- </ul>
- </li>
- <li class="trigger"><a href="/doc20/documentation.html">Version 2 (released)</a>
- <ul>
- <li><a href="/doc20/user-guide.html">User Guide</a></li>
- <li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
- <li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
- <li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
- </ul>
- </li>
- <li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (archived)</a>
- <ul>
- <li><a href="/doc12/user-guide.html">User Guide</a></li>
- <li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
- <li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
- <li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
- </ul>
- </li>
- </ul>
- </li>
- <li><a href="/collaboration.html">Collaboration</a>
- <ul>
- <li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
- <li><a href="/support.html">Support</a></li>
- <li><a href="http://cwiki.apache.org/CAY">Wiki</a></li>
- <li><a href="/code-repository.html">Code Repository</a></li>
- <li><a href="/developer-guide.html">Developer Guide</a></li>
- <li><a href="/how-can-i-help.html">How Can I Help?</a></li>
- <li><a href="/contributors.html">Contributors</a></li>
- </ul>
- </li>
-</ul>
-</div>
+ {% block menu %}{% endblock %}
<hr>
<div id="content">