Move assets to assets-dir + PSR-2

modules/oauth/templates/registry.edit.tpl.php

@@ -10,12 +10,11 @@ $(document).ready(function() {
 
 $this->includeAtTemplateBase('includes/header.php');
 
+echo '<h1>OAuth Client</h1>';
 
-echo('<h1>OAuth Client</h1>');
+echo $this->data['form'];
 
-echo($this->data['form']);
-
-echo('<p style="float: right"><a href="registry.php">Return to entity listing <strong>without saving...</strong></a></p>');
+echo '<p style="float: right"><a href="registry.php">Return to entity listing <strong>without saving...</strong></a></p>';
 
 $this->includeAtTemplateBase('includes/footer.php');
 

modules/oauth/templates/registry.edit.twig

@@ -2,21 +2,11 @@
 {% extends "base.twig" %}
 
 {% block preload %}
-    <link href="{{ baseurlpath }}resources/style.css" rel="stylesheet" />
+    <link href="{{ baseurlpath }}assets/css/oauth.css" rel="stylesheet">
 {% endblock %}
 
 {% block postload %}
-<script type="text/javascript">
-    $(document).ready(function() {
-	$("#tabdiv").tabs();
-        $('ul.tabset_tabs li').click(
-            function() {
-                $("html, body").animate({ scrollTop: 0 }, "slow");
-            }
-        )
-
-    });
-</script>
+    <script src="{{ baseurlpath}}assets/js/oauth.js"></script>
 {% endblock %}
 
 {% block content %}

modules/oauth/templates/registry.list.php

 <?php
 
-$this->data['jquery'] = array('core' => TRUE, 'ui' => TRUE, 'css' => TRUE);
-$this->data['head']  = '<link rel="stylesheet" type="text/css" href="/' . $this->data['baseurlpath'] . 'module.php/oauth/resources/style.css" />' . "\n";
+$this->data['jquery'] = array('core' => true, 'ui' => true, 'css' => true);
+$this->data['head']  = '<link rel="stylesheet" type="text/css" href="/'.$this->data['baseurlpath'].'module.php/oauth/assets/oauth.css" />'."\n";
 $this->includeAtTemplateBase('includes/header.php');
 
-
-echo('<h1>OAuth Client Registry</h1>');
-
-echo('<p>Here you can register new OAuth Clients. You are successfully logged in as ' . htmlspecialchars($this->data['userid']) . '</p>');
-
-echo('<h2>Your clients</h2>');
-echo('<table class="metalist" style="width: 100%">');
-$i = 0; $rows = array('odd', 'even');
-foreach($this->data['entries']['mine'] AS $entryc ) {
-	$entry = $entryc['value'];
-	$i++; 
-	echo('<tr class="' . $rows[$i % 2] . '">
-		<td>' . htmlspecialchars($entry['name']) . '</td>
-		<td><tt>' . htmlspecialchars($entry['key']) . '</tt></td>
-		<td>
-			<a href="registry.edit.php?editkey=' . urlencode($entry['key']) . '">edit</a>
-			<a href="registry.php?delete=' . urlencode($entry['key']) . '">delete</a>
-		</td></tr>');
+echo '<h1>OAuth Client Registry</h1>';
+echo '<p>Here you can register new OAuth Clients. You are successfully logged in as '.htmlspecialchars($this->data['userid']).'</p>';
+
+echo '<h2>Your clients</h2>';
+echo '<table class="metalist" style="width: 100%">';
+$i = 0;
+$rows = array('odd', 'even');
+foreach ($this->data['entries']['mine'] as $entryc) {
+    $entry = $entryc['value'];
+    $i++; 
+    echo '<tr class="'.$rows[$i % 2].'"><td>'.
+        htmlspecialchars($entry['name']).'</td>	<td><tt>'.htmlspecialchars($entry['key']).
+        '</tt></td><td><a href="registry.edit.php?editkey='.urlencode($entry['key']).
+        '">edit</a><a href="registry.php?delete='.urlencode($entry['key']).'">delete</a></td></tr>';
 }
 if ($i == 0) {
-	echo('<tr><td colspan="3">No entries registered</td></tr>');
+    echo'<tr><td colspan="3">No entries registered</td></tr>';
 }
-echo('</table>');
-
-echo('<p><a href="registry.edit.php">Add new client</a></p>');
-
-echo('<h2>Other clients</h2>');
-echo('<table class="metalist" style="width: 100%">');
-$i = 0; $rows = array('odd', 'even');
-foreach($this->data['entries']['others'] AS $entryc ) {
-	$entry = $entryc['value'];
-	$i++; 
-	echo('<tr class="' . $rows[$i % 2] . '">
-		<td>' . htmlspecialchars($entry['name']) . '</td>
-		<td><tt>' . htmlspecialchars($entry['key']) . '</tt></td>
-		<td>' . (isset($entry['owner']) ? htmlspecialchars($entry['owner']) : 'No owner') . '
-		</td></tr>');
+echo '</table>';
+
+echo '<p><a href="registry.edit.php">Add new client</a></p>';
+
+echo '<h2>Other clients</h2>';
+echo '<table class="metalist" style="width: 100%">';
+$i = 0;
+$rows = array('odd', 'even');
+foreach ($this->data['entries']['others'] as $entryc) {
+    $entry = $entryc['value'];
+    $i++; 
+    echo '<tr class="'.$rows[$i % 2].'"><td>'.
+        htmlspecialchars($entry['name']).'</td><td><tt>'.htmlspecialchars($entry['key']).
+        '</tt></td><td>'.(isset($entry['owner']) ? htmlspecialchars($entry['owner']) : 'No owner').
+        '</td></tr>';
 }
 if ($i == 0) {
-	echo('<tr><td colspan="3">No entries registered</td></tr>');
+    echo '<tr><td colspan="3">No entries registered</td></tr>';
 }
-echo('</table>');
+echo '</table>';
 
 $this->includeAtTemplateBase('includes/footer.php');
 

modules/oauth/templates/registry.list.twig

@@ -2,7 +2,7 @@
 {% extends "base.twig" %}
 
 {% block preload %}
-    <link href="{{ baseurlpath }}style.css" rel="stylesheet" />
+    <link href="{{ baseurlpath }}assets/css/oauth.css" rel="stylesheet" />
 {% endblock %}
 
 {% block content %}

modules/oauth/templates/registry.saved.php

@@ -12,4 +12,3 @@ echo('<p><a href="registry.php">Go back to OAuth client listing</a></p>');
 
 
 $this->includeAtTemplateBase('includes/footer.php');
-

modules/oauth/www/assets/js/oauth.js

+document.addEventListener('DOMContentLoaded', function () {
+    $("#tabdiv").tabs();
+});

modules/statistics/templates/statistics.tpl.php

@@ -3,8 +3,8 @@ $this->data['header'] = 'SimpleSAMLphp Statistics';
 
 $this->data['jquery'] = array('core' => true, 'ui' => true, 'css' => true);
 
-$this->data['head'] = '<link rel="stylesheet" type="text/css" href="' . SimpleSAML\Module::getModuleURL("statistics/assets/statistics.css") . '" />' . "\n";
-$this->data['head'] .= '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleURL("statistics/assets/statistics.js") . '"></script>' . "\n";
+$this->data['head'] = '<link rel="stylesheet" type="text/css" href="' . SimpleSAML\Module::getModuleURL("statistics/assets/css/statistics.css") . '" />' . "\n";
+$this->data['head'] .= '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleURL("statistics/assets/js/statistics.js") . '"></script>' . "\n";
 
 $this->includeAtTemplateBase('includes/header.php');
 

modules/statistics/templates/statistics.twig

@@ -2,11 +2,11 @@
 {% extends "base.twig" %}
 
 {% block preload %}
-    <link href="{{ baseurlpath }}assets/statistics.css" rel="stylesheet" />
+    <link href="{{ baseurlpath }}assets/css/statistics.css" rel="stylesheet" />
 {% endblock %}
 
 {% block postload %}
-<script type="text/javascript" src="{{ baseurlpath }}assets/statistics.js"></script>
+<script type="text/javascript" src="{{ baseurlpath }}assets/js/statistics.js"></script>
 {% endblock %}
 
 {% block content %}

modules/statistics/templates/statmeta.tpl.php

 <?php
 $this->data['header'] = 'SimpleSAMLphp Statistics Metadata';
-$this->data['head'] = '<link rel="stylesheet" type="text/css" href="' . SimpleSAML\Module::getModuleURL("statistics/style.css") . '" />';
+$this->data['head'] = '<link rel="stylesheet" type="text/css" href="' . SimpleSAML\Module::getModuleURL("statistics/assets/css/statistics.css") . '" />';
 $this->includeAtTemplateBase('includes/header.php');
 
 echo '<table id="statmeta">' ;

modules/statistics/templates/statmeta.twig

@@ -2,7 +2,7 @@
 {% extends "base.twig" %}
 
 {% block preload %}
-    <link href="{{ baseurlpath }}style.css" rel="stylesheet" />
+    <link href="{{ baseurlpath }}assets/css/statistics.css" rel="stylesheet" />
 {% endblock %}
 
 {% block content %}