Author: fmeschbe
Date: Sun May 20 15:17:52 2012
New Revision: 1340751
URL: http://svn.apache.org/viewvc?rev=1340751&view=rev
Log:
SLING-2002 Remove unneeded templates and properly extend templates
Removed:
sling/site/trunk/templates/standard.html
sling/site/trunk/templates/standard_markdown.html
Modified:
sling/site/trunk/templates/single_narrative.html
sling/site/trunk/templates/skeleton.html
Modified: sling/site/trunk/templates/single_narrative.html
URL:
http://svn.apache.org/viewvc/sling/site/trunk/templates/single_narrative.html?rev=1340751&r1=1340750&r2=1340751&view=diff
==============================================================================
--- sling/site/trunk/templates/single_narrative.html (original)
+++ sling/site/trunk/templates/single_narrative.html Sun May 20 15:17:52 2012
@@ -1 +1,3 @@
{% extends "skeleton.html" %}
+{% block title %}{{ headers.title }}{% endblock %}</h1>
+{% block content %}{{ content|markdown }}{% endblock %}
Modified: sling/site/trunk/templates/skeleton.html
URL:
http://svn.apache.org/viewvc/sling/site/trunk/templates/skeleton.html?rev=1340751&r1=1340750&r2=1340751&view=diff
==============================================================================
--- sling/site/trunk/templates/skeleton.html (original)
+++ sling/site/trunk/templates/skeleton.html Sun May 20 15:17:52 2012
@@ -18,7 +18,7 @@
limitations under the License.
-->
<head>
- <title>Apache Sling - {% block title %}{{ headers.title }}{% endblock
%}</title>
+ <title>Apache Sling - {% block title %}{% endblock %}</title>
<link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
<link rel="icon"
href="http://sling.apache.org/site/media.data/favicon.ico">
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
@@ -45,11 +45,8 @@
<div class="breadcrump" style="font-size: 80%;">
{{ breadcrumbs|safe }}
</div>
- <h1>{% block title %}{{ headers.title }}{% endblock %}</h1>
-<!-- {% block content %}{% endblock %}-->
-
- {% block content %}{{ content|markdown }}{% endblock %}
-
+ <h1>{% block title %}{% endblock %}</h1>
+ {% block content %}{% endblock %}
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
Rev. {{ svninfo.rev }} by {{ svninfo.author|safe }} on {{
svninfo.date|date:"D, j M Y H:i:s O" }}
</div>