Removed html extension on twig files

sgomez · sgomez · commit 6fecf93d6fc9 · 2016-08-25T09:09:26.000+02:00
diff --git 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 @@ public function __construct(\SimpleSAML_Configuration $configuration, $template,
      */
     private function normalizeTemplateName($templateName)
     {
-        if (strripos($templateName, '.twig.html')) {
+        if (strripos($templateName, '.twig')) {
             return $templateName;
         }
         $phppos = strripos($templateName, '.php');
@@ -81,7 +88,7 @@ private function normalizeTemplateName($templateName)
         if ($tplpos) {
             $templateName = substr($templateName, 0, $tplpos);
         }
-        return $templateName.'.twig.html';
+        return $templateName.'.twig';
     }
 
 
diff --git a/templates/_footer.twig b/templates/_footer.twig
diff --git a/templates/_header.twig b/templates/_header.twig
diff --git a/templates/base.twig b/templates/base.twig
@@ -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 -->
diff --git a/templates/index.twig b/templates/index.twig
@@ -1,4 +1,4 @@
-{% 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">
diff --git a/templates/sandbox.twig b/templates/sandbox.twig
@@ -1,4 +1,4 @@
-{% 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>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends "base.twig.html" %}`
	`1`	`+{% extends "base.twig" %}`
`2`	`2`	`{% block content %}`
`3`	`3`	`<div id="portalmenu" class="ui-tabs ui-widget ui-widget-content ui-corner-all">`
`4`	`4`	`<ul class="tabset_tabs ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">`