unnecessary duplication

Author: Billy Clark

themes/material/common-head-elements.php

@@ -3,6 +3,8 @@
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+<base href="<?= SimpleSAML_Module::getModuleURL('material/') ?>">
+
 <?php
 $trackingId = htmlentities($this->configuration->getValue('analytics.trackingId'));
 if (! empty($trackingId)) {
@@ -29,9 +31,9 @@
 <?php
 $colors = htmlentities($this->configuration->getValue('theme.color-scheme', 'indigo-purple'));
 ?>
-<link rel="stylesheet" href="/module.php/material/material.<?= $colors ?>.1.2.1.min.css">
-<link rel="stylesheet" href="/module.php/material/styles.2.2.1.css">
+<link rel="stylesheet" href="material.<?= $colors ?>.1.2.1.min.css">
+<link rel="stylesheet" href="styles.2.2.1.css">
 
-<script async src="/module.php/material/material.1.2.1.min.js"></script>
+<script async src="material.1.2.1.min.js"></script>
 
 <link rel="icon" href="/favicon.png">

themes/material/default/selectidp-links.php

@@ -66,7 +66,7 @@ function clickedAnyway(idpName) {
                 <div class="mdl-card__media white-bg fixed-height">
                     <button class="mdl-button fill-parent" onclick="setSelectedIdp('<?= $idpId ?>')">
                         <img class="scale-to-parent" id="<?= $idpId ?>"
-                             src="<?= empty($idp['logoURL']) ? '/module.php/material/default-logo.png'
+                             src="<?= empty($idp['logoURL']) ? 'default-logo.png'
                                                              : $idp['logoURL'] ?>">
                     </button>
                 </div>
@@ -86,7 +86,7 @@ function clickedAnyway(idpName) {
                 <div class="mdl-card__media white-bg fixed-height" layout-children="row"
                      child-spacing="center">
                     <img class="scale-to-parent" id="<?= $idpId ?>"
-                         src="<?= empty($idp['logoURL']) ? '/module.php/material/default-logo.png'
+                         src="<?= empty($idp['logoURL']) ? 'default-logo.png'
                                                          : $idp['logoURL'] ?>">
                 </div>
             </div>

themes/material/mfa/must-set-up-mfa.php

@@ -26,8 +26,7 @@
             ?>
             <div class="mdl-card mdl-shadow--8dp">
                 <div class="mdl-card__media white-bg margin" layout-children="column">
-                    <img src="/module.php/material/mfa-shield.svg"
-                         alt="<?= $this->t('{material:mfa:shield_icon}') ?>">
+                    <img src="mfa-shield.svg" alt="<?= $this->t('{material:mfa:shield_icon}') ?>">
                 </div>
 
                 <div class="mdl-card__title center">

themes/material/mfa/nag-for-mfa.php

@@ -26,8 +26,7 @@
             ?>
             <div class="mdl-card mdl-shadow--8dp">
                 <div class="mdl-card__media white-bg margin" layout-children="column">
-                    <img src="/module.php/material/mfa-shield.svg"
-                         alt="<?= $this->t('{material:mfa:shield_icon}') ?>">
+                    <img src="mfa-shield.svg" alt="<?= $this->t('{material:mfa:shield_icon}') ?>">
                 </div>
 
                 <div class="mdl-card__title center">

themes/material/mfa/other_mfas.php

@@ -17,8 +17,7 @@ function excludeSelf($others, $selfId) {
 
     foreach (excludeSelf($mfaOptions, $currentMfaId) as $otherOption) {
     ?>
-    <li class="mdl-menu__item"
-        onclick="location.href += '&mfaId=<?= $otherOption['id'] ?>'">
+    <li class="mdl-menu__item" onclick="location.href += '&mfaId=<?= $otherOption['id'] ?>'">
         <span class="mdl-typography--caption">
             <?= $this->t('{material:mfa:use_'.$otherOption['type'].'}') ?>
         </span>

themes/material/mfa/prompt-for-mfa-backupcode.php

@@ -26,7 +26,7 @@
             ?>
             <div class="mdl-card mdl-shadow--8dp">
                 <div class="mdl-card__media white-bg margin" layout-children="column">
-                    <img src="/module.php/material/mfa-backup-codes.svg"
+                    <img src="mfa-backup-codes.svg"
                          alt="<?= $this->t('{material:mfa:backup_code_icon}') ?>">
                 </div>
 

themes/material/mfa/prompt-for-mfa-totp.php

@@ -26,8 +26,7 @@
             ?>
             <div class="mdl-card mdl-shadow--8dp">
                 <div class="mdl-card__media white-bg margin" layout-children="column">
-                    <img src="/module.php/material/mfa-totp-app.svg"
-                         alt="<?= $this->t('{material:mfa:totp_icon}') ?>">
+                    <img src="mfa-totp-app.svg" alt="<?= $this->t('{material:mfa:totp_icon}') ?>">
                 </div>
 
                 <div class="mdl-card__title center">

themes/material/mfa/prompt-for-mfa-u2f.php

@@ -5,7 +5,7 @@
 
     <?php include __DIR__ . '/../common-head-elements.php' ?>
 
-    <script src="/module.php/material/mfa-u2f-api.js"></script>
+    <script src="mfa-u2f-api.js"></script>
     <script>
         function verifyU2f() {
             // TODO: need feature sniff and error handling
@@ -86,8 +86,7 @@ function createHiddenInput(name) {
             ?>
             <div class="mdl-card mdl-shadow--8dp">
                 <div class="mdl-card__media white-bg margin" layout-children="column">
-                    <img src="/module.php/material/mfa-u2f.png"
-                         alt="<?= $this->t('{material:mfa:u2f_icon}') ?>">
+                    <img src="mfa-u2f.png" alt="<?= $this->t('{material:mfa:u2f_icon}') ?>">
                 </div>
 
                 <div class="mdl-card__title center">

www/styles.2.2.1.css

@@ -209,6 +209,6 @@ form p.error > i {
   font-weight: 400;
   src: local('Material Icons'),
        local('MaterialIcons-Regular'),
-       url(/module.php/material/material-icons.woff2) format('woff2'),
-       url(/module.php/material/material-icons.woff) format('woff');
+       url(material-icons.woff2) format('woff2'),
+       url(material-icons.woff) format('woff');
 }