Merge pull request #451 from sgomez/fix-twig-extension

Removed html extension in Twig files

Merge pull request #451 from sgomez/fix-twig-extension
Removed html extension in Twig files
227e83f8 · Jaime Pérez Crespo · GitHub · 54e4791a · 6fecf93d · 227e83f8
Commit 227e83f8 authored 8 years ago by Jaime Pérez Crespo Committed by GitHub 8 years ago
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -38,6 +38,13 @@ class SimpleSAML_XHTML_Template
     */
    private $template = 'default.php';

+    /**
+     * The template name.
+     *
+     * @var string
+     */
+    private $twig_template;
+
    /*
     * Main Twig namespace, to avoid misspelling it *again*
     */
@@ -70,7 +77,7 @@ class SimpleSAML_XHTML_Template
     */
    private function normalizeTemplateName($templateName)
    {
-        if (strripos($templateName, '.twig.html')) {
+        if (strripos($templateName, '.twig')) {
            return $templateName;
        }
        $phppos = strripos($templateName, '.php');
@@ -81,7 +88,7 @@ class SimpleSAML_XHTML_Template
        if ($tplpos) {
            $templateName = substr($templateName, 0, $tplpos);
        }
-        return $templateName.'.twig.html';
+        return $templateName.'.twig';
    }



--- a/templates/_footer.twig.html
+++ b/templates/_footer.twig.html
--- a/templates/_header.twig.html
+++ b/templates/_header.twig.html
--- a/templates/base.twig.html
+++ b/templates/base.twig.html
@@ -15,14 +15,14 @@
 <body>
    <div id="wrap">

-        {% block header %}{% include "_header.twig.html" %}{% endblock %}
+        {% block header %}{% include "_header.twig" %}{% endblock %}

        <div id="content">
            {% block content %}{% endblock %}
        </div><!-- #content -->

        <div id="footer">
-            {% block footer %}{% include "_footer.twig.html" %}{% endblock %}
+            {% block footer %}{% include "_footer.twig" %}{% endblock %}
        </div>

    </div><!-- #wrap -->

--- a/templates/index.twig.html
+++ b/templates/index.twig.html
-{% extends "base.twig.html" %}
+{% extends "base.twig" %}
 {% block content %}
    <div id="portalmenu" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
        <ul class="tabset_tabs ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">

--- a/templates/sandbox.twig.html
+++ b/templates/sandbox.twig.html
-{% extends "base.twig.html" %}
+{% extends "base.twig" %}
 {% block content %}
    <p>This page exists as a sandbox to play with twig without affecting anything else. The template is in ./templates.</p>
    <p>{{ sometext }}</p>